Re: [PATCH net-next v4 5/7] vmxnet3: add support for get_coalesce, set_coalesce ethtool operations

From: Ben Hutchings
Date: Tue Jun 14 2016 - 15:38:19 EST

Next message: Sergei Shtylyov: "Re: [PATCH v2 net-next v2 10/12] net: dsa: mv88e6xxx: iterate on compatible info"
Previous message: Linus Walleij: "Re: [PATCH] mfd: qcom_rpm: fix offset error for msm8660"
In reply to: Shrikrishna Khare: "[PATCH net-next v4 5/7] vmxnet3: add support for get_coalesce, set_coalesce ethtool operations"
Next in thread: Shrikrishna Khare: "[PATCH net-next v4 4/7] vmxnet3: add receive data ring support"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Tue, 2016-06-14 at 11:52 -0700, Shrikrishna Khare wrote:
> Signed-off-by: Keyong Sun <sunk@xxxxxxxxxx>
> Signed-off-by: Manoj Tammali <tammalim@xxxxxxxxxx>
> Signed-off-by: Shrikrishna Khare <skhare@xxxxxxxxxx>

Reviewed-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>

> ---
> v1-v2: v1 patch used special values of rx-usecs to differentiate between
> coalescing modes. v2 uses relevant fields in struct ethtool_coalesce
> to choose modes. Also, a new command VMXNET3_CMD_GET_COALESCE is
> introduced which allows driver to query the device for default coalescing
> configuration.
>
> v3-v4: address Ben's review comments: remove unnecessary memset from
> vmxnet3_get_coalesce.
>
> ---
> Âdrivers/net/vmxnet3/vmxnet3_defs.hÂÂÂÂ|ÂÂ33 ++++++-
> Âdrivers/net/vmxnet3/vmxnet3_drv.cÂÂÂÂÂ|ÂÂ54 ++++++++++++
> Âdrivers/net/vmxnet3/vmxnet3_ethtool.c | 158 ++++++++++++++++++++++++++++++++++
> Âdrivers/net/vmxnet3/vmxnet3_int.hÂÂÂÂÂ|ÂÂÂ9 ++
> Â4 files changed, 253 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/vmxnet3/vmxnet3_defs.h b/drivers/net/vmxnet3/vmxnet3_defs.h
> index f3b31c2..274e145 100644
> --- a/drivers/net/vmxnet3/vmxnet3_defs.h
> +++ b/drivers/net/vmxnet3/vmxnet3_defs.h
> @@ -80,6 +80,7 @@ enum {
> Â VMXNET3_CMD_LOAD_PLUGIN,
> Â VMXNET3_CMD_RESERVED2,
> Â VMXNET3_CMD_RESERVED3,
> + VMXNET3_CMD_SET_COALESCE,
> Â
> Â VMXNET3_CMD_FIRST_GET = 0xF00D0000,
> Â VMXNET3_CMD_GET_QUEUE_STATUS = VMXNET3_CMD_FIRST_GET,
> @@ -92,7 +93,8 @@ enum {
> Â VMXNET3_CMD_GET_DEV_EXTRA_INFO,
> Â VMXNET3_CMD_GET_CONF_INTR,
> Â VMXNET3_CMD_GET_RESERVED1,
> - VMXNET3_CMD_GET_TXDATA_DESC_SIZE
> + VMXNET3_CMD_GET_TXDATA_DESC_SIZE,
> + VMXNET3_CMD_GET_COALESCE,
> Â};
> Â
> Â/*
> @@ -637,6 +639,35 @@ struct Vmxnet3_SetPolling {
> Â u8 enablePolling;
> Â};
> Â
> +#define VMXNET3_COAL_STATIC_MAX_DEPTH 128
> +#define VMXNET3_COAL_RBC_MIN_RATE 100
> +#define VMXNET3_COAL_RBC_MAX_RATE 100000
> +
> +enum Vmxnet3_CoalesceMode {
> + VMXNET3_COALESCE_DISABLEDÂÂÂ= 0,
> + VMXNET3_COALESCE_ADAPTÂÂÂÂÂÂ= 1,
> + VMXNET3_COALESCE_STATICÂÂÂÂÂ= 2,
> + VMXNET3_COALESCE_RBCÂÂÂÂÂÂÂÂ= 3
> +};
> +
> +struct Vmxnet3_CoalesceRbc {
> + u32 rbc_rate;
> +};
> +
> +struct Vmxnet3_CoalesceStatic {
> + u32 tx_depth;
> + u32 tx_comp_depth;
> + u32 rx_depth;
> +};
> +
> +struct Vmxnet3_CoalesceScheme {
> + enum Vmxnet3_CoalesceMode coalMode;
> + union {
> + struct Vmxnet3_CoalesceRbc coalRbc;
> + struct Vmxnet3_CoalesceStatic coalStatic;
> + } coalPara;
> +};
> +
> Â/* If the command data <= 16 bytes, use the shared memory directly.
> Â * otherwise, use variable length configuration descriptor.
> Â */
> diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
> index 6449d2e..d0bcc1d9 100644
> --- a/drivers/net/vmxnet3/vmxnet3_drv.c
> +++ b/drivers/net/vmxnet3/vmxnet3_drv.c
> @@ -2491,6 +2491,32 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
> Â /* the rest are already zeroed */
> Â}
> Â
> +static void
> +vmxnet3_init_coalesce(struct vmxnet3_adapter *adapter)
> +{
> + struct Vmxnet3_DriverShared *shared = adapter->shared;
> + union Vmxnet3_CmdInfo *cmdInfo = &shared->cu.cmdInfo;
> + unsigned long flags;
> +
> + if (!VMXNET3_VERSION_GE_3(adapter))
> + return;
> +
> + spin_lock_irqsave(&adapter->cmd_lock, flags);
> + cmdInfo->varConf.confVer = 1;
> + cmdInfo->varConf.confLen =
> + cpu_to_le32(sizeof(*adapter->coal_conf));
> + cmdInfo->varConf.confPAÂÂ= cpu_to_le64(adapter->coal_conf_pa);
> +
> + if (adapter->default_coal_mode) {
> + VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
> + ÂÂÂÂÂÂÂVMXNET3_CMD_GET_COALESCE);
> + } else {
> + VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
> + ÂÂÂÂÂÂÂVMXNET3_CMD_SET_COALESCE);
> + }
> +
> + spin_unlock_irqrestore(&adapter->cmd_lock, flags);
> +}
> Â
> Âint
> Âvmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
> @@ -2540,6 +2566,8 @@ vmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
> Â goto activate_err;
> Â }
> Â
> + vmxnet3_init_coalesce(adapter);
> +
> Â for (i = 0; i < adapter->num_rx_queues; i++) {
> Â VMXNET3_WRITE_BAR0_REG(adapter,
> Â VMXNET3_REG_RXPROD + i * VMXNET3_REG_ALIGN,
> @@ -3345,6 +3373,22 @@ vmxnet3_probe_device(struct pci_dev *pdev,
> Â goto err_ver;
> Â }
> Â
> + if (VMXNET3_VERSION_GE_3(adapter)) {
> + adapter->coal_conf =
> + dma_alloc_coherent(&adapter->pdev->dev,
> + ÂÂÂsizeof(struct Vmxnet3_CoalesceScheme)
> + ÂÂÂ,
> + ÂÂÂ&adapter->coal_conf_pa,
> + ÂÂÂGFP_KERNEL);
> + if (!adapter->coal_conf) {
> + err = -ENOMEM;
> + goto err_ver;
> + }
> + memset(adapter->coal_conf, 0, sizeof(*adapter->coal_conf));
> + adapter->coal_conf->coalMode = VMXNET3_COALESCE_DISABLED;
> + adapter->default_coal_mode = true;
> + }
> +
> Â SET_NETDEV_DEV(netdev, &pdev->dev);
> Â vmxnet3_declare_features(adapter, dma64);
> Â
> @@ -3407,6 +3451,11 @@ vmxnet3_probe_device(struct pci_dev *pdev,
> Â return 0;
> Â
> Âerr_register:
> + if (VMXNET3_VERSION_GE_3(adapter)) {
> + dma_free_coherent(&adapter->pdev->dev,
> + ÂÂsizeof(struct Vmxnet3_CoalesceScheme),
> + ÂÂadapter->coal_conf, adapter->coal_conf_pa);
> + }
> Â vmxnet3_free_intr_resources(adapter);
> Âerr_ver:
> Â vmxnet3_free_pci_resources(adapter);
> @@ -3457,6 +3506,11 @@ vmxnet3_remove_device(struct pci_dev *pdev)
> Â
> Â vmxnet3_free_intr_resources(adapter);
> Â vmxnet3_free_pci_resources(adapter);
> + if (VMXNET3_VERSION_GE_3(adapter)) {
> + dma_free_coherent(&adapter->pdev->dev,
> + ÂÂsizeof(struct Vmxnet3_CoalesceScheme),
> + ÂÂadapter->coal_conf, adapter->coal_conf_pa);
> + }
> Â#ifdef VMXNET3_RSS
> Â dma_free_coherent(&adapter->pdev->dev, sizeof(struct UPT1_RSSConf),
> Â ÂÂadapter->rss_conf, adapter->rss_conf_pa);
> diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
> index 38f7c79..aabc6ef 100644
> --- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
> +++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
> @@ -725,6 +725,162 @@ vmxnet3_set_rss(struct net_device *netdev, const u32 *p, const u8 *key,
> Â}
> Â#endif
> Â
> +static int
> +vmxnet3_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec)
> +{
> + struct vmxnet3_adapter *adapter = netdev_priv(netdev);
> +
> + if (!VMXNET3_VERSION_GE_3(adapter))
> + return -EOPNOTSUPP;
> +
> + switch (adapter->coal_conf->coalMode) {
> + case VMXNET3_COALESCE_DISABLED:
> + /* struct ethtool_coalesce is already initialized to 0 */
> + break;
> + case VMXNET3_COALESCE_ADAPT:
> + ec->use_adaptive_rx_coalesce = true;
> + break;
> + case VMXNET3_COALESCE_STATIC:
> + ec->tx_max_coalesced_frames =
> + adapter->coal_conf->coalPara.coalStatic.tx_comp_depth;
> + ec->rx_max_coalesced_frames =
> + adapter->coal_conf->coalPara.coalStatic.rx_depth;
> + break;
> + case VMXNET3_COALESCE_RBC: {
> + u32 rbc_rate;
> +
> + rbc_rate = adapter->coal_conf->coalPara.coalRbc.rbc_rate;
> + ec->rx_coalesce_usecs = VMXNET3_COAL_RBC_USECS(rbc_rate);
> + }
> + break;
> + default:
> + return -EOPNOTSUPP;
> + }
> +
> + return 0;
> +}
> +
> +static int
> +vmxnet3_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec)
> +{
> + struct vmxnet3_adapter *adapter = netdev_priv(netdev);
> + struct Vmxnet3_DriverShared *shared = adapter->shared;
> + union Vmxnet3_CmdInfo *cmdInfo = &shared->cu.cmdInfo;
> + unsigned long flags;
> +
> + if (!VMXNET3_VERSION_GE_3(adapter))
> + return -EOPNOTSUPP;
> +
> + if (ec->rx_coalesce_usecs_irq ||
> + ÂÂÂÂec->rx_max_coalesced_frames_irq ||
> + ÂÂÂÂec->tx_coalesce_usecs ||
> + ÂÂÂÂec->tx_coalesce_usecs_irq ||
> + ÂÂÂÂec->tx_max_coalesced_frames_irq ||
> + ÂÂÂÂec->stats_block_coalesce_usecs ||
> + ÂÂÂÂec->use_adaptive_tx_coalesce ||
> + ÂÂÂÂec->pkt_rate_low ||
> + ÂÂÂÂec->rx_coalesce_usecs_low ||
> + ÂÂÂÂec->rx_max_coalesced_frames_low ||
> + ÂÂÂÂec->tx_coalesce_usecs_low ||
> + ÂÂÂÂec->tx_max_coalesced_frames_low ||
> + ÂÂÂÂec->pkt_rate_high ||
> + ÂÂÂÂec->rx_coalesce_usecs_high ||
> + ÂÂÂÂec->rx_max_coalesced_frames_high ||
> + ÂÂÂÂec->tx_coalesce_usecs_high ||
> + ÂÂÂÂec->tx_max_coalesced_frames_high ||
> + ÂÂÂÂec->rate_sample_interval) {
> + return -EINVAL;
> + }
> +
> + if ((ec->rx_coalesce_usecs == 0) &&
> + ÂÂÂÂ(ec->use_adaptive_rx_coalesce == 0) &&
> + ÂÂÂÂ(ec->tx_max_coalesced_frames == 0) &&
> + ÂÂÂÂ(ec->rx_max_coalesced_frames == 0)) {
> + memset(adapter->coal_conf, 0, sizeof(*adapter->coal_conf));
> + adapter->coal_conf->coalMode = VMXNET3_COALESCE_DISABLED;
> + goto done;
> + }
> +
> + if (ec->rx_coalesce_usecs != 0) {
> + u32 rbc_rate;
> +
> + if ((ec->use_adaptive_rx_coalesce != 0) ||
> + ÂÂÂÂ(ec->tx_max_coalesced_frames != 0) ||
> + ÂÂÂÂ(ec->rx_max_coalesced_frames != 0)) {
> + return -EINVAL;
> + }
> +
> + rbc_rate = VMXNET3_COAL_RBC_RATE(ec->rx_coalesce_usecs);
> + if (rbc_rate < VMXNET3_COAL_RBC_MIN_RATE ||
> + ÂÂÂÂrbc_rate > VMXNET3_COAL_RBC_MAX_RATE) {
> + return -EINVAL;
> + }
> +
> + memset(adapter->coal_conf, 0, sizeof(*adapter->coal_conf));
> + adapter->coal_conf->coalMode = VMXNET3_COALESCE_RBC;
> + adapter->coal_conf->coalPara.coalRbc.rbc_rate = rbc_rate;
> + goto done;
> + }
> +
> + if (ec->use_adaptive_rx_coalesce != 0) {
> + if ((ec->rx_coalesce_usecs != 0) ||
> + ÂÂÂÂ(ec->tx_max_coalesced_frames != 0) ||
> + ÂÂÂÂ(ec->rx_max_coalesced_frames != 0)) {
> + return -EINVAL;
> + }
> + memset(adapter->coal_conf, 0, sizeof(*adapter->coal_conf));
> + adapter->coal_conf->coalMode = VMXNET3_COALESCE_ADAPT;
> + goto done;
> + }
> +
> + if ((ec->tx_max_coalesced_frames != 0) ||
> + ÂÂÂÂ(ec->rx_max_coalesced_frames != 0)) {
> + if ((ec->rx_coalesce_usecs != 0) ||
> + ÂÂÂÂ(ec->use_adaptive_rx_coalesce != 0)) {
> + return -EINVAL;
> + }
> +
> + if ((ec->tx_max_coalesced_frames >
> + ÂÂÂÂVMXNET3_COAL_STATIC_MAX_DEPTH) ||
> + ÂÂÂÂ(ec->rx_max_coalesced_frames >
> + ÂÂÂÂÂVMXNET3_COAL_STATIC_MAX_DEPTH)) {
> + return -EINVAL;
> + }
> +
> + memset(adapter->coal_conf, 0, sizeof(*adapter->coal_conf));
> + adapter->coal_conf->coalMode = VMXNET3_COALESCE_STATIC;
> +
> + adapter->coal_conf->coalPara.coalStatic.tx_comp_depth =
> + (ec->tx_max_coalesced_frames ?
> + Âec->tx_max_coalesced_frames :
> + ÂVMXNET3_COAL_STATIC_DEFAULT_DEPTH);
> +
> + adapter->coal_conf->coalPara.coalStatic.rx_depth =
> + (ec->rx_max_coalesced_frames ?
> + Âec->rx_max_coalesced_frames :
> + ÂVMXNET3_COAL_STATIC_DEFAULT_DEPTH);
> +
> + adapter->coal_conf->coalPara.coalStatic.tx_depth =
> + ÂVMXNET3_COAL_STATIC_DEFAULT_DEPTH;
> + goto done;
> + }
> +
> +done:
> + adapter->default_coal_mode = false;
> + if (netif_running(netdev)) {
> + spin_lock_irqsave(&adapter->cmd_lock, flags);
> + cmdInfo->varConf.confVer = 1;
> + cmdInfo->varConf.confLen =
> + cpu_to_le32(sizeof(*adapter->coal_conf));
> + cmdInfo->varConf.confPAÂÂ= cpu_to_le64(adapter->coal_conf_pa);
> + VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
> + ÂÂÂÂÂÂÂVMXNET3_CMD_SET_COALESCE);
> + spin_unlock_irqrestore(&adapter->cmd_lock, flags);
> + }
> +
> + return 0;
> +}
> +
> Âstatic const struct ethtool_ops vmxnet3_ethtool_ops = {
> Â .get_settingsÂÂÂÂÂÂ= vmxnet3_get_settings,
> Â .get_drvinfoÂÂÂÂÂÂÂ= vmxnet3_get_drvinfo,
> @@ -733,6 +889,8 @@ static const struct ethtool_ops vmxnet3_ethtool_ops = {
> Â .get_wolÂÂÂÂÂÂÂÂÂÂÂ= vmxnet3_get_wol,
> Â .set_wolÂÂÂÂÂÂÂÂÂÂÂ= vmxnet3_set_wol,
> Â .get_linkÂÂÂÂÂÂÂÂÂÂ= ethtool_op_get_link,
> + .get_coalesceÂÂÂÂÂÂ= vmxnet3_get_coalesce,
> + .set_coalesceÂÂÂÂÂÂ= vmxnet3_set_coalesce,
> Â .get_stringsÂÂÂÂÂÂÂ= vmxnet3_get_strings,
> Â .get_sset_count ÂÂÂ= vmxnet3_get_sset_count,
> Â .get_ethtool_stats = vmxnet3_get_ethtool_stats,
> diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
> index c46bf09..63df4f2 100644
> --- a/drivers/net/vmxnet3/vmxnet3_int.h
> +++ b/drivers/net/vmxnet3/vmxnet3_int.h
> @@ -358,6 +358,7 @@ struct vmxnet3_adapter {
> Â int rx_buf_per_pkt;ÂÂ/* only apply to the 1st ring */
> Â dma_addr_t shared_pa;
> Â dma_addr_t queue_desc_pa;
> + dma_addr_t coal_conf_pa;
> Â
> Â /* Wake-on-LAN */
> Â u32ÂÂÂÂÂwol;
> @@ -384,6 +385,9 @@ struct vmxnet3_adapter {
> Â
> Â int share_intr;
> Â
> + struct Vmxnet3_CoalesceScheme *coal_conf;
> + boolÂÂÂdefault_coal_mode;
> +
> Â dma_addr_t adapter_pa;
> Â dma_addr_t pm_conf_pa;
> Â dma_addr_t rss_conf_pa;
> @@ -429,6 +433,11 @@ struct vmxnet3_adapter {
> Â (rqID >= 2 * adapter->num_rx_queues && \
> Â rqID < 3 * adapter->num_rx_queues) \
> Â
> +#define VMXNET3_COAL_STATIC_DEFAULT_DEPTH 64
> +
> +#define VMXNET3_COAL_RBC_RATE(usecs) (1000000 / usecs)
> +#define VMXNET3_COAL_RBC_USECS(rbc_rate) (1000000 / rbc_rate)
> +
> Âint
> Âvmxnet3_quiesce_dev(struct vmxnet3_adapter *adapter);
> Â
--
Ben Hutchings
We get into the habit of living before acquiring the habit of thinking.
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ- Albert
Camus

Attachment: signature.asc
Description: This is a digitally signed message part

Next message: Sergei Shtylyov: "Re: [PATCH v2 net-next v2 10/12] net: dsa: mv88e6xxx: iterate on compatible info"
Previous message: Linus Walleij: "Re: [PATCH] mfd: qcom_rpm: fix offset error for msm8660"
In reply to: Shrikrishna Khare: "[PATCH net-next v4 5/7] vmxnet3: add support for get_coalesce, set_coalesce ethtool operations"
Next in thread: Shrikrishna Khare: "[PATCH net-next v4 4/7] vmxnet3: add receive data ring support"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]