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 5BFBFA051E for ; Wed, 10 Jun 2020 14:09:17 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4655E1BF73; Wed, 10 Jun 2020 14:09:17 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id A7E4F1BEE7; Wed, 10 Jun 2020 14:09:13 +0200 (CEST) IronPort-SDR: 62cJFyfNMMK16gEGpZLbgfyReevre/uZ39ms3OD8nCi9lw0rv3adwJjpe3oX/GWPYQj/x4PBgd 2VP5lCYPQ3Lg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2020 05:09:12 -0700 IronPort-SDR: MaE0pMmJO3RuIVEgE+EFreZ0RRr6/FIfCqKZkffz4Y9hWhX0uHgrKU80QaB+Q6gmMDVHfJgIM4 NkT3t6y9ZCFA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,495,1583222400"; d="scan'208";a="306561584" Received: from shwdenpg235.ccr.corp.intel.com ([10.240.182.60]) by fmsmga002.fm.intel.com with ESMTP; 10 Jun 2020 05:09:10 -0700 From: alvinx.zhang@intel.com To: dev@dpdk.org Cc: stable@dpdk.org, beilei.xing@intel.com, jia.guo@intel.com, maox.jiang@intel.com Date: Wed, 10 Jun 2020 20:07:03 +0800 Message-Id: <20200610120703.8268-1-alvinx.zhang@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH] net/i40e: fix modifying the number of queues 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" From: Alvin Zhang For the newly created VF, if the number of qps is greater than 4 at startup, it may fail to start. This patch updates the API `i40evf_dev_configure`. Fixes: c48eb308ed13 ("net/i40e: support VF request more queues") Cc: stable@dpdk.org Signed-off-by: Alvin Zhang --- drivers/net/i40e/i40e_ethdev_vf.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index bb5d28a..7500e0a 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1082,13 +1082,10 @@ static int i40evf_dev_xstats_get(struct rte_eth_dev *dev, args.out_buffer = vf->aq_resp; 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) PMD_DRV_LOG(ERR, "fail to execute command OP_REQUEST_QUEUES"); - rte_eal_alarm_set(I40EVF_ALARM_INTERVAL, - i40evf_dev_alarm_handler, dev); return err; } @@ -1516,7 +1513,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 @@ -1612,16 +1609,35 @@ 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; + hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); PMD_DRV_LOG(INFO, "change queue pairs from %u to %u", vf->vsi_res->num_queue_pairs, num_queue_pairs); + if (hw->adapter_stopped == 0) { + PMD_DRV_LOG(WARNING, "Device must be stopped first!"); + return -EINVAL; + } + + rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev); ret = i40evf_request_queues(dev, num_queue_pairs); - if (ret != 0) + if (ret) return ret; - ret = i40evf_dev_reset(dev); - if (ret != 0) + /* + * The device must be reinitiated after queue resources + * changed + */ + i40e_shutdown_adminq(hw); + i40evf_disable_irq0(hw); + rte_free(vf->vf_res); + vf->vf_res = NULL; + rte_free(vf->aq_resp); + vf->aq_resp = NULL; + + ret = i40evf_dev_init(dev); + if (ret) return ret; } -- 1.8.3.1