From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EA962A0548 for ; Thu, 16 Jul 2020 09:30:40 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C3FDA1BEA3; Thu, 16 Jul 2020 09:30:40 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 007AA1BEB2; Thu, 16 Jul 2020 09:30:35 +0200 (CEST) IronPort-SDR: +ACz0rOQUq3Hnm38QT+24ouKsZi05sJRpuga6NTgvMIaN/L1oydCirEiqQogELtYNGV5vJ/Kdu /yQls7rR0Ngw== X-IronPort-AV: E=McAfee;i="6000,8403,9683"; a="234191559" X-IronPort-AV: E=Sophos;i="5.75,358,1589266800"; d="scan'208";a="234191559" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jul 2020 00:30:34 -0700 IronPort-SDR: BA+z/JZ17QB9/oTNnwUYX9UYBNVrekDc00H2r2bMq0kxNeDMCDTQRiWqdl2cphXEkQbqs1VdEL ZIQXPDedHtuA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,358,1589266800"; d="scan'208";a="486515850" Received: from jguo15x-mobl.ccr.corp.intel.com (HELO [10.67.68.165]) ([10.67.68.165]) by fmsmga005.fm.intel.com with ESMTP; 16 Jul 2020 00:30:33 -0700 To: alvinx.zhang@intel.com, qiming.yang@intel.com Cc: dev@dpdk.org, stable@dpdk.org References: <20200716051203.2108-1-alvinx.zhang@intel.com> <20200716063336.7088-1-alvinx.zhang@intel.com> From: Jeff Guo Message-ID: Date: Thu, 16 Jul 2020 15:30:32 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200716063336.7088-1-alvinx.zhang@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [dpdk-stable] [PATCH v5] net/i40e: fix qps configuration in VF X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Acked-by: Jeff Guo On 7/16/2020 2:33 PM, alvinx.zhang@intel.com wrote: > From: Alvin Zhang > > If a VF request PF to allocate more number of queue pairs, the PF will > free the queue pairs which have been allocated and reset the VF. So, > VF should stop to work until all the process is done. This patch modify > the process of the request queue pairs. To improve efficiency and > eliminate code redundancy, the promiscuous ops were also updated. > > Fixes: c48eb308ed13 ("net/i40e: support VF request more queues") > Cc: stable@dpdk.org > > Signed-off-by: Alvin Zhang > --- > > V2: Update git log and modify codes according to comments. > V3: All the code was refactored. > V4, V5: Modify codes according to comments. > --- > drivers/net/i40e/i40e_ethdev_vf.c | 104 ++++++++++++++++++++------------------ > 1 file changed, 54 insertions(+), 50 deletions(-) > > diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c > index eca716a..69cab8e 100644 > --- a/drivers/net/i40e/i40e_ethdev_vf.c > +++ b/drivers/net/i40e/i40e_ethdev_vf.c > @@ -91,7 +91,8 @@ static int i40evf_vlan_filter_set(struct rte_eth_dev *dev, > uint16_t vlan_id, int on); > static int i40evf_vlan_offload_set(struct rte_eth_dev *dev, int mask); > static void i40evf_dev_close(struct rte_eth_dev *dev); > -static int i40evf_dev_reset(struct rte_eth_dev *dev); > +static int i40evf_dev_reset(struct rte_eth_dev *dev); > +static int i40evf_check_vf_reset_done(struct rte_eth_dev *dev); > static int i40evf_dev_promiscuous_enable(struct rte_eth_dev *dev); > static int i40evf_dev_promiscuous_disable(struct rte_eth_dev *dev); > static int i40evf_dev_allmulticast_enable(struct rte_eth_dev *dev); > @@ -519,10 +520,19 @@ struct rte_i40evf_xstats_name_off { > > err = i40evf_execute_vf_cmd(dev, &args); > > - if (err) > + if (err) { > PMD_DRV_LOG(ERR, "fail to execute command " > "CONFIG_PROMISCUOUS_MODE"); > - return err; > + > + if (err == I40E_NOT_SUPPORTED) > + return -ENOTSUP; > + > + return -EAGAIN; > + } > + > + vf->promisc_unicast_enabled = enable_unicast; > + vf->promisc_multicast_enabled = enable_multicast; > + return 0; > } > > static int > @@ -1081,12 +1091,28 @@ static int i40evf_dev_xstats_get(struct rte_eth_dev *dev, > args.out_size = I40E_AQ_BUF_SZ; > > rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev); > + > err = i40evf_execute_vf_cmd(dev, &args); > - if (err) > + > + rte_eal_alarm_set(I40EVF_ALARM_INTERVAL, i40evf_dev_alarm_handler, dev); > + > + if (err != I40E_SUCCESS) { > PMD_DRV_LOG(ERR, "fail to execute command OP_REQUEST_QUEUES"); > + return err; > + } > + > + /* The PF will issue a reset to the VF when change the number of > + * queues. The PF will set I40E_VFGEN_RSTAT to COMPLETE first, then > + * wait 10ms and set it to ACTIVE. In this duration, vf may not catch > + * the moment that COMPLETE is set. So, for vf, we'll try to wait a > + * long time. > + */ > + rte_delay_ms(100); > + > + err = i40evf_check_vf_reset_done(dev); > + if (err) > + PMD_DRV_LOG(ERR, "VF is still resetting"); > > - rte_eal_alarm_set(I40EVF_ALARM_INTERVAL, > - i40evf_dev_alarm_handler, dev); > return err; > } > > @@ -1514,7 +1540,7 @@ static int i40evf_dev_xstats_get(struct rte_eth_dev *dev, > hw->bus.device = pci_dev->addr.devid; > hw->bus.func = pci_dev->addr.function; > hw->hw_addr = (void *)pci_dev->mem_resource[0].addr; > - hw->adapter_stopped = 0; > + hw->adapter_stopped = 1; > hw->adapter_closed = 0; > > /* Pass the information to the rte_eth_dev_close() that it should also > @@ -1610,7 +1636,20 @@ static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev) > ad->tx_vec_allowed = true; > > if (num_queue_pairs > vf->vsi_res->num_queue_pairs) { > - int ret = 0; > + struct i40e_hw *hw; > + int ret; > + > + if (rte_eal_process_type() != RTE_PROC_PRIMARY) { > + PMD_DRV_LOG(ERR, > + "For secondary processes, change queue pairs is not supported!"); > + return -ENOTSUP; > + } > + > + hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); > + if (!hw->adapter_stopped) { > + PMD_DRV_LOG(ERR, "Device must be stopped first!"); > + return -EBUSY; > + } > > PMD_DRV_LOG(INFO, "change queue pairs from %u to %u", > vf->vsi_res->num_queue_pairs, num_queue_pairs); > @@ -2182,68 +2221,32 @@ static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev) > i40evf_dev_promiscuous_enable(struct rte_eth_dev *dev) > { > struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); > - int ret; > - > - ret = i40evf_config_promisc(dev, 1, vf->promisc_multicast_enabled); > - if (ret == 0) > - vf->promisc_unicast_enabled = TRUE; > - else if (ret == I40E_NOT_SUPPORTED) > - ret = -ENOTSUP; > - else > - ret = -EAGAIN; > > - return ret; > + return i40evf_config_promisc(dev, true, vf->promisc_multicast_enabled); > } > > static int > i40evf_dev_promiscuous_disable(struct rte_eth_dev *dev) > { > struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); > - int ret; > - > - ret = i40evf_config_promisc(dev, 0, vf->promisc_multicast_enabled); > - if (ret == 0) > - vf->promisc_unicast_enabled = FALSE; > - else if (ret == I40E_NOT_SUPPORTED) > - ret = -ENOTSUP; > - else > - ret = -EAGAIN; > > - return ret; > + return i40evf_config_promisc(dev, false, vf->promisc_multicast_enabled); > } > > static int > i40evf_dev_allmulticast_enable(struct rte_eth_dev *dev) > { > struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); > - int ret; > - > - ret = i40evf_config_promisc(dev, vf->promisc_unicast_enabled, 1); > - if (ret == 0) > - vf->promisc_multicast_enabled = TRUE; > - else if (ret == I40E_NOT_SUPPORTED) > - ret = -ENOTSUP; > - else > - ret = -EAGAIN; > > - return ret; > + return i40evf_config_promisc(dev, vf->promisc_unicast_enabled, true); > } > > static int > i40evf_dev_allmulticast_disable(struct rte_eth_dev *dev) > { > struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); > - int ret; > - > - ret = i40evf_config_promisc(dev, vf->promisc_unicast_enabled, 0); > - if (ret == 0) > - vf->promisc_multicast_enabled = FALSE; > - else if (ret == I40E_NOT_SUPPORTED) > - ret = -ENOTSUP; > - else > - ret = -EAGAIN; > > - return ret; > + return i40evf_config_promisc(dev, vf->promisc_unicast_enabled, false); > } > > static int > @@ -2365,8 +2368,9 @@ static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev) > * it is a workaround solution when work with kernel driver > * and it is not the normal way > */ > - i40evf_dev_promiscuous_disable(dev); > - i40evf_dev_allmulticast_disable(dev); > + if (vf->promisc_unicast_enabled || vf->promisc_multicast_enabled) > + i40evf_config_promisc(dev, false, false); > + > rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev); > > i40evf_reset_vf(dev);