Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/72699/?format=api
{ "id": 72699, "url": "https://patches.dpdk.org/api/patches/72699/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200702032610.11076-1-alvinx.zhang@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200702032610.11076-1-alvinx.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200702032610.11076-1-alvinx.zhang@intel.com", "date": "2020-07-02T03:26:10", "name": "[v2] net/i40e: fix modify the number of qps in VF", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "68c95a98d774e970bf2422f02e3201dd8ebf3d6e", "submitter": { "id": 1398, "url": "https://patches.dpdk.org/api/people/1398/?format=api", "name": "Alvin Zhang", "email": "alvinx.zhang@intel.com" }, "delegate": { "id": 1540, "url": "https://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20200702032610.11076-1-alvinx.zhang@intel.com/mbox/", "series": [ { "id": 10722, "url": "https://patches.dpdk.org/api/series/10722/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=10722", "date": "2020-07-02T03:26:10", "name": "[v2] net/i40e: fix modify the number of qps in VF", "version": 2, "mbox": "https://patches.dpdk.org/series/10722/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/72699/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/72699/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 89636A0523;\n\tThu, 2 Jul 2020 05:28:22 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 6D14F1D54F;\n\tThu, 2 Jul 2020 05:28:22 +0200 (CEST)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n by dpdk.org (Postfix) with ESMTP id 5B4A01D15F;\n Thu, 2 Jul 2020 05:28:20 +0200 (CEST)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 01 Jul 2020 20:28:19 -0700", "from shwdenpg235.ccr.corp.intel.com ([10.240.182.60])\n by fmsmga002.fm.intel.com with ESMTP; 01 Jul 2020 20:28:17 -0700" ], "IronPort-SDR": [ "\n g/telyWCUG4ElcalnZnuJDrMk9JExq2XInLTW3aTtWwScoH6T3duZB181k8XTHVm4PsmzSEwic\n 9sqmfyHIoQSQ==", "\n ZvVIC0iNzO3jyqGdrbysfPpP5n+BfounZRs93/NA0OJCVx0Oq8PD+D0WNElGlUM0TxVjVAcAwr\n 4AnJvUAX7OQw==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9669\"; a=\"211824939\"", "E=Sophos;i=\"5.75,302,1589266800\"; d=\"scan'208\";a=\"211824939\"", "E=Sophos;i=\"5.75,302,1589266800\"; d=\"scan'208\";a=\"313986556\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "alvinx.zhang@intel.com", "To": "dev@dpdk.org", "Cc": "stable@dpdk.org, beilei.xing@intel.com, jia.guo@intel.com,\n maox.jiang@intel.com", "Date": "Thu, 2 Jul 2020 11:26:10 +0800", "Message-Id": "<20200702032610.11076-1-alvinx.zhang@intel.com>", "X-Mailer": "git-send-email 2.21.0.windows.1", "In-Reply-To": "<20200610120703.8268-1-alvinx.zhang@intel.com>", "References": "<20200610120703.8268-1-alvinx.zhang@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v2] net/i40e: fix modify the number of qps in VF", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Alvin Zhang <alvinx.zhang@intel.com>\n\nFor a VF, if the number of request queue pairs is greater than that\nhas been allocated by the kernel driver, the app may fail to start.\nThis patch modify the request queue process.\n\nFixes: c48eb308ed13 (\"net/i40e: support VF request more queues\")\nFixes: dbda2092deb5 (\"net/i40e: fix request queue in VF\")\nCc: stable@dpdk.org\n\nSigned-off-by: Alvin Zhang <alvinx.zhang@intel.com>\n---\n\nV2: Update git log and modify codes according to comments.\n---\n drivers/net/i40e/i40e_ethdev_vf.c | 57 +++++++++++++++++++++++++++++----------\n 1 file changed, 43 insertions(+), 14 deletions(-)", "diff": "diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c\nindex eca716a..55dd237 100644\n--- a/drivers/net/i40e/i40e_ethdev_vf.c\n+++ b/drivers/net/i40e/i40e_ethdev_vf.c\n@@ -90,6 +90,7 @@ static int i40evf_dev_xstats_get_names(struct rte_eth_dev *dev,\n static int i40evf_vlan_filter_set(struct rte_eth_dev *dev,\n \t\t\t\t uint16_t vlan_id, int on);\n static int i40evf_vlan_offload_set(struct rte_eth_dev *dev, int mask);\n+static void i40evf_dev_release(struct rte_eth_dev *dev);\n static void i40evf_dev_close(struct rte_eth_dev *dev);\n static int i40evf_dev_reset(struct rte_eth_dev *dev);\n static int i40evf_dev_promiscuous_enable(struct rte_eth_dev *dev);\n@@ -1080,13 +1081,10 @@ static int i40evf_dev_xstats_get(struct rte_eth_dev *dev,\n \targs.out_buffer = vf->aq_resp;\n \targs.out_size = I40E_AQ_BUF_SZ;\n \n-\trte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);\n \terr = i40evf_execute_vf_cmd(dev, &args);\n \tif (err)\n \t\tPMD_DRV_LOG(ERR, \"fail to execute command OP_REQUEST_QUEUES\");\n \n-\trte_eal_alarm_set(I40EVF_ALARM_INTERVAL,\n-\t\t\t i40evf_dev_alarm_handler, dev);\n \treturn err;\n }\n \n@@ -1514,7 +1512,7 @@ static int i40evf_dev_xstats_get(struct rte_eth_dev *dev,\n \thw->bus.device = pci_dev->addr.devid;\n \thw->bus.func = pci_dev->addr.function;\n \thw->hw_addr = (void *)pci_dev->mem_resource[0].addr;\n-\thw->adapter_stopped = 0;\n+\thw->adapter_stopped = 1;\n \thw->adapter_closed = 0;\n \n \t/* Pass the information to the rte_eth_dev_close() that it should also\n@@ -1610,16 +1608,39 @@ static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev)\n \tad->tx_vec_allowed = true;\n \n \tif (num_queue_pairs > vf->vsi_res->num_queue_pairs) {\n-\t\tint ret = 0;\n+\t\tstruct i40e_hw *hw;\n+\t\tint ret;\n+\n+\t\t/*\n+\t\t * All VF resources will be reallocated, so change queue pairs\n+\t\t * in secondary processes is forbidden.\n+\t\t */\n+\t\tif (rte_eal_process_type() != RTE_PROC_PRIMARY) {\n+\t\t\tPMD_DRV_LOG(ERR,\n+\t\t\t\t\"For secondary processes, change queue pairs is forbidden!\");\n+\t\t\treturn -ENOTSUP;\n+\t\t}\n \n+\t\thw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \t\tPMD_DRV_LOG(INFO, \"change queue pairs from %u to %u\",\n \t\t\t vf->vsi_res->num_queue_pairs, num_queue_pairs);\n+\t\tif (hw->adapter_stopped == 0) {\n+\t\t\tPMD_DRV_LOG(WARNING, \"Device must be stopped first!\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\trte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);\n \t\tret = i40evf_request_queues(dev, num_queue_pairs);\n-\t\tif (ret != 0)\n+\t\tif (ret)\n \t\t\treturn ret;\n \n-\t\tret = i40evf_dev_reset(dev);\n-\t\tif (ret != 0)\n+\t\t/*\n+\t\t * The device has been reseted after queue resources changed\n+\t\t * and must be reinitiated.\n+\t\t */\n+\t\ti40evf_dev_release(dev);\n+\t\tret = i40evf_dev_init(dev);\n+\t\tif (ret)\n \t\t\treturn ret;\n \t}\n \n@@ -2356,10 +2377,7 @@ static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev)\n i40evf_dev_close(struct rte_eth_dev *dev)\n {\n \tstruct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tstruct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);\n-\n \ti40evf_dev_stop(dev);\n-\ti40e_dev_free_queues(dev);\n \t/*\n \t * disable promiscuous mode before reset vf\n \t * it is a workaround solution when work with kernel driver\n@@ -2370,19 +2388,30 @@ static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev)\n \trte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);\n \n \ti40evf_reset_vf(dev);\n-\ti40e_shutdown_adminq(hw);\n-\ti40evf_disable_irq0(hw);\n+\ti40evf_dev_release(dev);\n \n \tdev->dev_ops = NULL;\n \tdev->rx_pkt_burst = NULL;\n \tdev->tx_pkt_burst = NULL;\n \n+\thw->adapter_closed = 1;\n+}\n+\n+static void\n+i40evf_dev_release(struct rte_eth_dev *dev)\n+{\n+\tstruct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tstruct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);\n+\n+\ti40e_shutdown_adminq(hw);\n+\ti40evf_disable_irq0(hw);\n+\n \trte_free(vf->vf_res);\n \tvf->vf_res = NULL;\n \trte_free(vf->aq_resp);\n \tvf->aq_resp = NULL;\n \n-\thw->adapter_closed = 1;\n+\ti40e_dev_free_queues(dev);\n }\n \n /*\n", "prefixes": [ "v2" ] }