Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/48528/?format=api
{ "id": 48528, "url": "http://patches.dpdk.org/api/patches/48528/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20181205124625.24398-1-zhirun.yan@intel.com/", "project": { "id": 1, "url": "http://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": "<20181205124625.24398-1-zhirun.yan@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20181205124625.24398-1-zhirun.yan@intel.com", "date": "2018-12-05T12:46:25", "name": "[v2] net/i40e: fix VF/PF port reset", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "4222aaaa35c2dfc8dd2ceb8571284c19c9888c9c", "submitter": { "id": 1154, "url": "http://patches.dpdk.org/api/people/1154/?format=api", "name": "Yan, Zhirun", "email": "zhirun.yan@intel.com" }, "delegate": { "id": 1540, "url": "http://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20181205124625.24398-1-zhirun.yan@intel.com/mbox/", "series": [ { "id": 2665, "url": "http://patches.dpdk.org/api/series/2665/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=2665", "date": "2018-12-05T12:46:25", "name": "[v2] net/i40e: fix VF/PF port reset", "version": 2, "mbox": "http://patches.dpdk.org/series/2665/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/48528/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/48528/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id E4A891B1D6;\n\tWed, 5 Dec 2018 06:09:38 +0100 (CET)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby dpdk.org (Postfix) with ESMTP id 30A0E1B192\n\tfor <dev@dpdk.org>; Wed, 5 Dec 2018 06:09:37 +0100 (CET)", "from orsmga004.jf.intel.com ([10.7.209.38])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t04 Dec 2018 21:09:35 -0800", "from dpdk-server.sh.intel.com ([10.67.110.170])\n\tby orsmga004.jf.intel.com with ESMTP; 04 Dec 2018 21:09:34 -0800" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.56,316,1539673200\"; d=\"scan'208\";a=\"256902872\"", "From": "Zhirun Yan <zhirun.yan@intel.com>", "To": "dev@dpdk.org,\n\tqi.z.zhang@intel.com,\n\thaiyue.wang@intel.com", "Cc": "Zhirun Yan <zhirun.yan@intel.com>", "Date": "Wed, 5 Dec 2018 12:46:25 +0000", "Message-Id": "<20181205124625.24398-1-zhirun.yan@intel.com>", "X-Mailer": "git-send-email 2.17.1", "Subject": "[dpdk-dev] [PATCH v2] net/i40e: fix VF/PF port reset", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "Reply-To": "20181128165212.78742-1-zhirun.yan@intel.com", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Port reset will call i40evf_uninit_vf() to release resource. It wants\nto call i40evf_dev_close() to do some clean work. Before this patch,\nport reset will never call i40evf_dev_close() to shutdown adminq. So\nthe i40evf_dev_init() will failed.\n\nThe status of stop/start should be flaged by dev->data->dev_started.\nClose should be flaged by hw->adapter_stopped. This patch modify\nthese flags both in VF and PF.\n\nSigned-off-by: Zhirun Yan <zhirun.yan@intel.com>\nSigned-off-by: Haiyue Wang <haiyue.wang@intel.com>\n---\n drivers/net/i40e/i40e_ethdev.c | 13 ++++++-------\n drivers/net/i40e/i40e_ethdev_vf.c | 17 ++++++++---------\n 2 files changed, 14 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c\nindex 7030eb1fa..8eaf6eba6 100644\n--- a/drivers/net/i40e/i40e_ethdev.c\n+++ b/drivers/net/i40e/i40e_ethdev.c\n@@ -2391,15 +2391,11 @@ static void\n i40e_dev_stop(struct rte_eth_dev *dev)\n {\n \tstruct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n-\tstruct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tstruct i40e_vsi *main_vsi = pf->main_vsi;\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n \tstruct rte_intr_handle *intr_handle = &pci_dev->intr_handle;\n \tint i;\n \n-\tif (hw->adapter_stopped == 1)\n-\t\treturn;\n-\n \tif (dev->data->dev_conf.intr_conf.rxq == 0) {\n \t\trte_eal_alarm_cancel(i40e_dev_alarm_handler, dev);\n \t\trte_intr_enable(intr_handle);\n@@ -2442,8 +2438,6 @@ i40e_dev_stop(struct rte_eth_dev *dev)\n \n \t/* reset hierarchy commit */\n \tpf->tm_conf.committed = false;\n-\n-\thw->adapter_stopped = 1;\n }\n \n static void\n@@ -2460,7 +2454,10 @@ i40e_dev_close(struct rte_eth_dev *dev)\n \n \tPMD_INIT_FUNC_TRACE();\n \n-\ti40e_dev_stop(dev);\n+\tif (dev->data->dev_started != 0) {\n+\t\tdev->data->dev_started = 0;\n+\t\ti40e_dev_stop(dev);\n+\t}\n \n \t/* Remove all mirror rules */\n \twhile ((p_mirror = TAILQ_FIRST(&pf->mirror_list))) {\n@@ -2523,6 +2520,8 @@ i40e_dev_close(struct rte_eth_dev *dev)\n \tI40E_WRITE_REG(hw, I40E_PFGEN_CTRL,\n \t\t\t(reg | I40E_PFGEN_CTRL_PFSWR_MASK));\n \tI40E_WRITE_FLUSH(hw);\n+\n+\thw->adapter_stopped = 1;\n }\n \n /*\ndiff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c\nindex ae55b9b18..cbe9bec3c 100644\n--- a/drivers/net/i40e/i40e_ethdev_vf.c\n+++ b/drivers/net/i40e/i40e_ethdev_vf.c\n@@ -1924,15 +1924,12 @@ static int\n i40evf_dev_start(struct rte_eth_dev *dev)\n {\n \tstruct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);\n-\tstruct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n \tstruct rte_intr_handle *intr_handle = &pci_dev->intr_handle;\n \tuint32_t intr_vector = 0;\n \n \tPMD_INIT_FUNC_TRACE();\n \n-\thw->adapter_stopped = 0;\n-\n \tvf->max_pkt_len = dev->data->dev_conf.rxmode.max_rx_pkt_len;\n \tvf->num_queue_pairs = RTE_MAX(dev->data->nb_rx_queues,\n \t\t\t\t\tdev->data->nb_tx_queues);\n@@ -2004,7 +2001,6 @@ i40evf_dev_stop(struct rte_eth_dev *dev)\n {\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n \tstruct rte_intr_handle *intr_handle = &pci_dev->intr_handle;\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 \tPMD_INIT_FUNC_TRACE();\n@@ -2012,8 +2008,6 @@ i40evf_dev_stop(struct rte_eth_dev *dev)\n \tif (dev->data->dev_conf.intr_conf.rxq != 0)\n \t\trte_intr_disable(intr_handle);\n \n-\tif (hw->adapter_stopped == 1)\n-\t\treturn;\n \ti40evf_stop_queues(dev);\n \ti40evf_disable_queues_intr(dev);\n \ti40e_dev_clear_queues(dev);\n@@ -2029,7 +2023,6 @@ i40evf_dev_stop(struct rte_eth_dev *dev)\n \t/* remove all multicast addresses */\n \ti40evf_add_del_mc_addr_list(dev, vf->mc_addrs, vf->mc_addrs_num,\n \t\t\t\tFALSE);\n-\thw->adapter_stopped = 1;\n \n }\n \n@@ -2246,7 +2239,11 @@ i40evf_dev_close(struct rte_eth_dev *dev)\n {\n \tstruct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n-\ti40evf_dev_stop(dev);\n+\tif (dev->data->dev_started != 0) {\n+\t\tdev->data->dev_started = 0;\n+\t\ti40evf_dev_stop(dev);\n+\t}\n+\n \ti40e_dev_free_queues(dev);\n \t/*\n \t * disable promiscuous mode before reset vf\n@@ -2255,11 +2252,13 @@ i40evf_dev_close(struct rte_eth_dev *dev)\n \t */\n \ti40evf_dev_promiscuous_disable(dev);\n \ti40evf_dev_allmulticast_disable(dev);\n-\n \ti40evf_reset_vf(hw);\n+\n \ti40e_shutdown_adminq(hw);\n \ti40evf_disable_irq0(hw);\n \trte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);\n+\n+\thw->adapter_stopped = 1;\n }\n \n /*\n", "prefixes": [ "v2" ] }