Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/77569/?format=api
{ "id": 77569, "url": "http://patchwork.dpdk.org/api/patches/77569/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20200913220711.3768597-21-thomas@monjalon.net/", "project": { "id": 1, "url": "http://patchwork.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": "<20200913220711.3768597-21-thomas@monjalon.net>", "list_archive_url": "https://inbox.dpdk.org/dev/20200913220711.3768597-21-thomas@monjalon.net", "date": "2020-09-13T22:07:11", "name": "[20/20] app/testpmd: align behaviour of multi-port detach", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "cdf63d30be87bec9a35bb1387e3d36a7d0749b0a", "submitter": { "id": 685, "url": "http://patchwork.dpdk.org/api/people/685/?format=api", "name": "Thomas Monjalon", "email": "thomas@monjalon.net" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20200913220711.3768597-21-thomas@monjalon.net/mbox/", "series": [ { "id": 12173, "url": "http://patchwork.dpdk.org/api/series/12173/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=12173", "date": "2020-09-13T22:06:51", "name": "cleanup ethdev close operation", "version": 1, "mbox": "http://patchwork.dpdk.org/series/12173/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/77569/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/77569/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 4458EA04C9;\n\tMon, 14 Sep 2020 00:10:02 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 240B31C192;\n\tMon, 14 Sep 2020 00:09:11 +0200 (CEST)", "from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com\n [64.147.123.25]) by dpdk.org (Postfix) with ESMTP id 83CE11C192\n for <dev@dpdk.org>; Mon, 14 Sep 2020 00:09:09 +0200 (CEST)", "from compute7.internal (compute7.nyi.internal [10.202.2.47])\n by mailout.west.internal (Postfix) with ESMTP id 5CFF94A2;\n Sun, 13 Sep 2020 18:09:08 -0400 (EDT)", "from mailfrontend2 ([10.202.2.163])\n by compute7.internal (MEProxy); Sun, 13 Sep 2020 18:09:08 -0400", "from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])\n by mail.messagingengine.com (Postfix) with ESMTPA id 0FED33064674;\n Sun, 13 Sep 2020 18:09:06 -0400 (EDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=\n from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding; s=fm2; bh=1y6/fs8bu+lqK\n rLjaStWy2xeNQLaxhSBsY5e29Mqd/Y=; b=AAo47BcqjXltgfBLHp3S1dSW/rD/x\n 3XXBWEWgh5v/vFruFmYG7EfBb91NsYzZWF0EII89JqZiqS5FTznOwtxX/30UlZ1H\n iaMcLQiOmncwJhGGALX48+24xRh++jZBEVXRDGV8O9HnK4CkV47sHKc4vTFR43ia\n u9hxf8Bcci5id8Gj9+Oq9bYrC/RA1Wkq6B4e3CpJeC/1aGjOF8JMRgcRC7LZk9a7\n I3l5iwjSh879IqwaHzSUWToYu/8wWwVrg43D5Om1R6RUE5sAv1CwLkQQc8bK3vgi\n 3sJ0k2L7LEawkzijgxCCGJZUKC29wF/OSXMjE3wS+UpAdxe4EaL2IfqVA==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=\n messagingengine.com; h=cc:content-transfer-encoding:date:from\n :in-reply-to:message-id:mime-version:references:subject:to\n :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=\n fm3; bh=1y6/fs8bu+lqKrLjaStWy2xeNQLaxhSBsY5e29Mqd/Y=; b=RkPNZUGg\n auJ3xBoCro6EL2Pkgr1EVh4XU8ndgWs07K4Ul6wsUwMR7p2FFKzRwbxH9ImIJ584\n B3i2j4uFOR+D6NhIElqJCX3mH7AhWF4PSM9NZnV9vopIalMq4hcrpuVtQJCqvROb\n qB1lPMTAK6fJ7QSikctL9relbW4XgIkSlEICsnfaaUx9vxuhHe3Ku7FRp7zSj/Rw\n rKFR7qjFivUWEGb1ZYYnS9FkWlpoRzv6BkFDmahYeRxDJTPJn2dd9KJL62Tq+5tz\n Dluwa3W74byoesKKtbgg3TZMmQQG4GTSFODwd3aC30sVK44JdUSWRYyBNvivL0gy\n 3wFNeEBKrXybhA==" ], "X-ME-Sender": "<xms:g5heXwQ94bNygRDYMKFjyEsUzoEjcIl0hTM05ldkpe1pECMpNtRLkA>\n <xme:g5heX9yuXvPD2f0IYjlXVf_8r__Qw23REQ_ZLBxYh3M_k1vkdUybbESCPjXVKTHCp\n r5Clhqn_YX1ke9hnA>", "X-ME-Proxy-Cause": "\n gggruggvucftvghtrhhoucdtuddrgeduiedrudeihedgtdehucetufdoteggodetrfdotf\n fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen\n uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne\n cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr\n shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg\n ftrfgrthhtvghrnhepvdehgfeivdejgedtveehfefhteelfefgieevgfffveefjeegtdfg\n uedthedtgeevnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghruf\n hiiigvpeduleenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgr\n lhhonhdrnhgvth", "X-ME-Proxy": "<xmx:g5heX91zmqLVIOUzvYIx4HNPeN-C7KkAEHzsjvcoOSqehHkGRxcKJg>\n <xmx:g5heX0BPe7ruZ80xXscjJ24dDfldchVA9F8LB4EN0W9tF77iETJSlg>\n <xmx:g5heX5gC-PodT4Fn-IvA7V_7Oe61HJakhrrdNfiYgL19AFFOuPCUkw>\n <xmx:hJheX-vDttn2qv8TdOHdXO6H7sZzQltWoJgrEbp_LruQRmM4hDnH3w>", "From": "Thomas Monjalon <thomas@monjalon.net>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com, arybchenko@solarflare.com,\n Wenzhuo Lu <wenzhuo.lu@intel.com>, Beilei Xing <beilei.xing@intel.com>,\n Bernard Iremonger <bernard.iremonger@intel.com>", "Date": "Mon, 14 Sep 2020 00:07:11 +0200", "Message-Id": "<20200913220711.3768597-21-thomas@monjalon.net>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20200913220711.3768597-1-thomas@monjalon.net>", "References": "<20200913220711.3768597-1-thomas@monjalon.net>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 20/20] app/testpmd: align behaviour of multi-port\n\tdetach", "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": "A port can be closed in multiple situations:\n\t- close command calling close_port() -> rte_eth_dev_close()\n\t- exit calling close_port() -> rte_eth_dev_close()\n\t- hotplug calling close_port() -> rte_eth_dev_close()\n\t- hotplug calling detach_device() -> rte_dev_remove()\n\t- port detach command, detach_device() -> rte_dev_remove()\n\t- device detach command, detach_devargs() -> rte_eal_hotplug_remove()\n\nThe flow rules are flushed before each close.\nIt was already done in close_port(), detach_devargs() and\ndetach_port_device() which calls detach_device(),\nbut not in detach_device(). As a consequence, it was missing for siblings\nof port detach command and unplugged device.\nThe check before calling port_flow_flush() is moved inside the function.\n\nThe state of the port to close is checked to be stopped.\nAs above, this check was missing in detach_device(),\nimpacting the cases of a multi-port device unplugged or detached\nwith the port detach command.\n\nSigned-off-by: Thomas Monjalon <thomas@monjalon.net>\n---\n app/test-pmd/config.c | 7 +++++--\n app/test-pmd/testpmd.c | 22 +++++++++++-----------\n 2 files changed, 16 insertions(+), 13 deletions(-)", "diff": "diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c\nindex 30bee33248..21513a2978 100644\n--- a/app/test-pmd/config.c\n+++ b/app/test-pmd/config.c\n@@ -1588,9 +1588,12 @@ int\n port_flow_flush(portid_t port_id)\n {\n \tstruct rte_flow_error error;\n-\tstruct rte_port *port;\n+\tstruct rte_port *port = &ports[port_id];\n \tint ret = 0;\n \n+\tif (port->flow_list == NULL)\n+\t\treturn ret;\n+\n \t/* Poisoning to make sure PMDs update it in case of error. */\n \tmemset(&error, 0x44, sizeof(error));\n \tif (rte_flow_flush(port_id, &error)) {\n@@ -1599,7 +1602,7 @@ port_flow_flush(portid_t port_id)\n \t\t port_id == (portid_t)RTE_PORT_ALL)\n \t\t\treturn ret;\n \t}\n-\tport = &ports[port_id];\n+\n \twhile (port->flow_list) {\n \t\tstruct port_flow *pf = port->flow_list->next;\n \ndiff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c\nindex 31dc97239b..a76e9877f6 100644\n--- a/app/test-pmd/testpmd.c\n+++ b/app/test-pmd/testpmd.c\n@@ -2694,8 +2694,7 @@ close_port(portid_t pid)\n \t\t\tcontinue;\n \t\t}\n \n-\t\tif (port->flow_list)\n-\t\t\tport_flow_flush(pi);\n+\t\tport_flow_flush(pi);\n \t\trte_eth_dev_close(pi);\n \t}\n \n@@ -2825,15 +2824,20 @@ detach_device(struct rte_device *dev)\n \n \tprintf(\"Removing a device...\\n\");\n \n-\tif (rte_dev_remove(dev) < 0) {\n-\t\tTESTPMD_LOG(ERR, \"Failed to detach device %s\\n\", dev->name);\n-\t\treturn;\n-\t}\n \tRTE_ETH_FOREACH_DEV_OF(sibling, dev) {\n \t\tif (ports[sibling].port_status != RTE_PORT_CLOSED) {\n+\t\t\tif (ports[sibling].port_status != RTE_PORT_STOPPED) {\n+\t\t\t\tprintf(\"Port %u not stopped\\n\", sibling);\n+\t\t\t\treturn;\n+\t\t\t}\n+\t\t\tport_flow_flush(sibling);\n \t\t}\n \t}\n \n+\tif (rte_dev_remove(dev) < 0) {\n+\t\tTESTPMD_LOG(ERR, \"Failed to detach device %s\\n\", dev->name);\n+\t\treturn;\n+\t}\n \tremove_invalid_ports();\n \n \tprintf(\"Device is detached\\n\");\n@@ -2854,8 +2858,6 @@ detach_port_device(portid_t port_id)\n \t\t\treturn;\n \t\t}\n \t\tprintf(\"Port was not closed\\n\");\n-\t\tif (ports[port_id].flow_list)\n-\t\t\tport_flow_flush(port_id);\n \t}\n \n \tdetach_device(rte_eth_devices[port_id].device);\n@@ -2885,9 +2887,7 @@ detach_devargs(char *identifier)\n \t\t\t\trte_eth_iterator_cleanup(&iterator);\n \t\t\t\treturn;\n \t\t\t}\n-\n-\t\t\tif (ports[port_id].flow_list)\n-\t\t\t\tport_flow_flush(port_id);\n+\t\t\tport_flow_flush(port_id);\n \t\t}\n \t}\n \n", "prefixes": [ "20/20" ] }