From patchwork Thu Nov 22 16:21:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zhirun" X-Patchwork-Id: 48244 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 462F11B1F2; Thu, 22 Nov 2018 09:43:35 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id E13C41B14D for ; Thu, 22 Nov 2018 09:43:32 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Nov 2018 00:43:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,264,1539673200"; d="scan'208";a="110611401" Received: from dpdk-server.sh.intel.com ([10.67.110.151]) by orsmga002.jf.intel.com with ESMTP; 22 Nov 2018 00:43:30 -0800 From: Zhirun Yan To: dev@dpdk.org Cc: qi.z.zhang@intel.com, haiyue.wang@intel.com, Zhirun Yan Date: Thu, 22 Nov 2018 16:21:13 +0000 Message-Id: <20181122162113.87376-1-zhirun.yan@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH v1 1/4] net/i40e: fix RX/TX setup when restart port X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Before this patch, there are two functions that will clear RX/TX queues number: rte_eth_dev_close() and i40e_dev_free_queues(). But if also i40e_dev_free_queues() clear it, RX/TX queues will not set up correctly when restart port. Fixes: 6b4537128394 ("i40e: free queue memory when closing") Signed-off-by: Zhirun Yan --- drivers/net/i40e/i40e_rxtx.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index e1152ff0e..cc953ad58 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -2753,7 +2753,6 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) i40e_dev_rx_queue_release(dev->data->rx_queues[i]); dev->data->rx_queues[i] = NULL; } - dev->data->nb_rx_queues = 0; for (i = 0; i < dev->data->nb_tx_queues; i++) { if (!dev->data->tx_queues[i]) @@ -2761,7 +2760,6 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) i40e_dev_tx_queue_release(dev->data->tx_queues[i]); dev->data->tx_queues[i] = NULL; } - dev->data->nb_tx_queues = 0; } #define I40E_FDIR_NUM_TX_DESC I40E_MIN_RING_DESC From patchwork Thu Nov 22 16:22:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zhirun" X-Patchwork-Id: 48245 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2809C1B1FC; Thu, 22 Nov 2018 09:44:37 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 2125E1B1F2 for ; Thu, 22 Nov 2018 09:44:34 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Nov 2018 00:44:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,264,1539673200"; d="scan'208";a="110385037" Received: from dpdk-server.sh.intel.com ([10.67.110.151]) by orsmga001.jf.intel.com with ESMTP; 22 Nov 2018 00:44:33 -0800 From: Zhirun Yan To: dev@dpdk.org Cc: qi.z.zhang@intel.com, haiyue.wang@intel.com, Zhirun Yan Date: Thu, 22 Nov 2018 16:22:16 +0000 Message-Id: <20181122162216.87442-1-zhirun.yan@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH v1 2/4] net/i40e: fix VF port reset X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Port reset will call i40evf_uninit_vf() to release resource. It want to call i40evf_dev_close() to do some clean work. Before this patch, port reset will never call i40evf_dev_close() to shutdown adminq. So the i40evf_dev_init() will failed. Fixs: 18599342024("net/i40e: fix VF add/del MAC") Signed-off-by: Zhirun Yan --- drivers/net/i40e/i40e_ethdev_vf.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index ae55b9b18..cecedc91f 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1924,15 +1924,12 @@ static int i40evf_dev_start(struct rte_eth_dev *dev) { struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); - struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; uint32_t intr_vector = 0; PMD_INIT_FUNC_TRACE(); - hw->adapter_stopped = 0; - vf->max_pkt_len = dev->data->dev_conf.rxmode.max_rx_pkt_len; vf->num_queue_pairs = RTE_MAX(dev->data->nb_rx_queues, dev->data->nb_tx_queues); @@ -2004,7 +2001,6 @@ i40evf_dev_stop(struct rte_eth_dev *dev) { struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; - struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); PMD_INIT_FUNC_TRACE(); @@ -2012,8 +2008,6 @@ i40evf_dev_stop(struct rte_eth_dev *dev) if (dev->data->dev_conf.intr_conf.rxq != 0) rte_intr_disable(intr_handle); - if (hw->adapter_stopped == 1) - return; i40evf_stop_queues(dev); i40evf_disable_queues_intr(dev); i40e_dev_clear_queues(dev); @@ -2029,7 +2023,6 @@ i40evf_dev_stop(struct rte_eth_dev *dev) /* remove all multicast addresses */ i40evf_add_del_mc_addr_list(dev, vf->mc_addrs, vf->mc_addrs_num, FALSE); - hw->adapter_stopped = 1; } @@ -2245,21 +2238,32 @@ static void i40evf_dev_close(struct rte_eth_dev *dev) { struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); + + if (dev->data->dev_started != 0) { + dev->data->dev_started = 0; + i40evf_dev_stop(dev); + } - i40evf_dev_stop(dev); i40e_dev_free_queues(dev); /* * disable promiscuous mode before reset vf * it is a workaround solution when work with kernel driver * and it is not the normal way + * + * If VF is reset, AQTX: head overrun at 0xdeadbeef > 32 */ - i40evf_dev_promiscuous_disable(dev); - i40evf_dev_allmulticast_disable(dev); + if (!vf->vf_reset) { + i40evf_dev_promiscuous_disable(dev); + i40evf_dev_allmulticast_disable(dev); + i40evf_reset_vf(hw); + } - i40evf_reset_vf(hw); + rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev); i40e_shutdown_adminq(hw); i40evf_disable_irq0(hw); - rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev); + + hw->adapter_stopped = 1; } /* From patchwork Thu Nov 22 16:23:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zhirun" X-Patchwork-Id: 48246 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C2E8D5F28; Thu, 22 Nov 2018 09:45:38 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 575625B30 for ; Thu, 22 Nov 2018 09:45:37 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Nov 2018 00:45:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,264,1539673200"; d="scan'208";a="110385318" Received: from dpdk-server.sh.intel.com ([10.67.110.151]) by orsmga001.jf.intel.com with ESMTP; 22 Nov 2018 00:45:35 -0800 From: Zhirun Yan To: dev@dpdk.org Cc: qi.z.zhang@intel.com, haiyue.wang@intel.com, jingjing.wu@intel.com, Zhirun Yan Date: Thu, 22 Nov 2018 16:23:19 +0000 Message-Id: <20181122162319.87507-1-zhirun.yan@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH v1 3/4] net/i40e: support VF request more queues X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Before this patch, VF gets a default number of queues from the PF This patch enables VF requests a different number. When VF configures more queues, it will send VIRTCHNL_OP_REQUEST_QUEUES msg to PF to request more queues, if success, PF will reset the VF. User can run "port stop all", "port config port_id rxq/txq queue_num" and "port start all" to reconfigure queue number. Signed-off-by: Zhirun Yan --- drivers/net/i40e/i40e_ethdev_vf.c | 59 ++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 4 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index cecedc91f..691ab99bb 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -343,6 +343,7 @@ i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args) err = 0; break; case VIRTCHNL_OP_VERSION: + case VIRTCHNL_OP_REQUEST_QUEUES: case VIRTCHNL_OP_GET_VF_RESOURCES: /* for init adminq commands, need to poll the response */ err = -1; @@ -350,8 +351,15 @@ i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args) ret = i40evf_read_pfmsg(dev, &info); vf->cmd_retval = info.result; if (ret == I40EVF_MSG_CMD) { - err = 0; + if (info.ops != VIRTCHNL_OP_REQUEST_QUEUES) + err = 0; break; + } else if (ret == I40EVF_MSG_SYS) { + if (args->ops == VIRTCHNL_OP_REQUEST_QUEUES && + vf->vf_reset) { + err = 0; + break; + } } else if (ret == I40EVF_MSG_ERR) break; rte_delay_ms(ASQ_DELAY_MS); @@ -1012,6 +1020,28 @@ i40evf_add_vlan(struct rte_eth_dev *dev, uint16_t vlanid) return err; } +static int +i40evf_request_queues(struct rte_eth_dev *dev, uint16_t num) +{ + struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); + struct virtchnl_vf_res_request vfres; + struct vf_cmd_info args; + int err; + + vfres.num_queue_pairs = num; + + args.ops = VIRTCHNL_OP_REQUEST_QUEUES; + args.in_args = (u8 *)&vfres; + args.in_args_size = sizeof(vfres); + args.out_buffer = vf->aq_resp; + args.out_size = I40E_AQ_BUF_SZ; + err = i40evf_execute_vf_cmd(dev, &args); + if (err) + PMD_DRV_LOG(ERR, "fail to execute command OP_REQUEST_QUEUES"); + + return err; +} + static int i40evf_del_vlan(struct rte_eth_dev *dev, uint16_t vlanid) { @@ -1515,8 +1545,12 @@ RTE_PMD_REGISTER_KMOD_DEP(net_i40e_vf, "* igb_uio | vfio-pci"); static int i40evf_dev_configure(struct rte_eth_dev *dev) { + struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); struct i40e_adapter *ad = I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + uint16_t num_queue_pairs = RTE_MAX(dev->data->nb_rx_queues, + dev->data->nb_tx_queues); + int ret = 0; /* Initialize to TRUE. If any of Rx queues doesn't meet the bulk * allocation or vector Rx preconditions we will reset it. @@ -1526,7 +1560,24 @@ i40evf_dev_configure(struct rte_eth_dev *dev) ad->tx_simple_allowed = true; ad->tx_vec_allowed = true; - return i40evf_init_vlan(dev); + if (num_queue_pairs != vf->vsi_res->num_queue_pairs) { + PMD_DRV_LOG(INFO, "change queue pairs from %u to %u", + vf->vsi_res->num_queue_pairs, num_queue_pairs); + ret = i40evf_request_queues(dev, num_queue_pairs); + if (ret != 0) + return ret; + + ret = i40evf_dev_reset(dev); + vf->vf_reset = false; + vf->pend_msg &= ~PFMSG_RESET_IMPENDING; + + if (ret != 0) + return ret; + } + + i40evf_init_vlan(dev); + + return ret; } static int @@ -2137,8 +2188,8 @@ i40evf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) { struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); - dev_info->max_rx_queues = vf->vsi_res->num_queue_pairs; - dev_info->max_tx_queues = vf->vsi_res->num_queue_pairs; + dev_info->max_rx_queues = I40E_MAX_QP_NUM_PER_VF; + dev_info->max_tx_queues = I40E_MAX_QP_NUM_PER_VF; dev_info->min_rx_bufsize = I40E_BUF_SIZE_MIN; dev_info->max_rx_pktlen = I40E_FRAME_SIZE_MAX; dev_info->hash_key_size = (I40E_VFQF_HKEY_MAX_INDEX + 1) * sizeof(uint32_t);