Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/81114/?format=api
{ "id": 81114, "url": "http://patches.dpdk.org/api/patches/81114/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20201016133259.3061153-4-thomas@monjalon.net/", "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": "<20201016133259.3061153-4-thomas@monjalon.net>", "list_archive_url": "https://inbox.dpdk.org/dev/20201016133259.3061153-4-thomas@monjalon.net", "date": "2020-10-16T13:32:59", "name": "[v6,3/3] ethdev: allow close function to return an error", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "1d5314f7ac963e98044ae3ecf859d6fb6d8d690f", "submitter": { "id": 685, "url": "http://patches.dpdk.org/api/people/685/?format=api", "name": "Thomas Monjalon", "email": "thomas@monjalon.net" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20201016133259.3061153-4-thomas@monjalon.net/mbox/", "series": [ { "id": 13064, "url": "http://patches.dpdk.org/api/series/13064/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=13064", "date": "2020-10-16T13:32:56", "name": "cleanup ethdev close operation", "version": 6, "mbox": "http://patches.dpdk.org/series/13064/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/81114/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/81114/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 73E3AA04DB;\n\tFri, 16 Oct 2020 15:34:26 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 3B2691EE3D;\n\tFri, 16 Oct 2020 15:33:30 +0200 (CEST)", "from new3-smtp.messagingengine.com (new3-smtp.messagingengine.com\n [66.111.4.229]) by dpdk.org (Postfix) with ESMTP id 60EDD1EE3C\n for <dev@dpdk.org>; Fri, 16 Oct 2020 15:33:28 +0200 (CEST)", "from compute2.internal (compute2.nyi.internal [10.202.2.42])\n by mailnew.nyi.internal (Postfix) with ESMTP id D022F580324;\n Fri, 16 Oct 2020 09:33:27 -0400 (EDT)", "from mailfrontend2 ([10.202.2.163])\n by compute2.internal (MEProxy); Fri, 16 Oct 2020 09:33:28 -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 1037C3064683;\n Fri, 16 Oct 2020 09:33:24 -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=TgBu2Au2NXwiF\n jM5ajywX4pW+/g3bp//g9KPsoDQrOI=; b=OYkcbTUaMfAeAm6PtF3ScoXjM5KgT\n P8oJ9No0q5DW5A0E7UWamoHZrCEW+ayP8kFLqd7rL32o3QYIGClQIfeo0HOXA0tG\n kA9+3tF+33wo6YLOaSsVdLxZ8aU+LEnomwKEcEDXLz4Nmz6IcAwR+zLWt5OnCyCE\n xDffXPA0UW3Bogms0arG4/af7H/iOYfVn2KMYsrci4fDsJtB/Z6LlHFyBtHr9gm0\n XVqKkt/zJ/yukm5WJywkJP6X/7uQEXSMs0BYYkiuz17e26GIH8PFNyMraY1nXWAD\n aqd57WR2Y2oDb/q3Rx407OHyJ5cGU9nsYrrqXwpsgFD39KKDDDg3Uoi4g==", "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 fm1; bh=TgBu2Au2NXwiFjM5ajywX4pW+/g3bp//g9KPsoDQrOI=; b=nTYrtO8g\n zRcr0e0iaqNgOb0OxErGzR39V8oVVi6gXbgxBVojnmBHBSuU4YbhYsB0uuGRIZrI\n 8LqSPj3UjibNJRlKZiRUWmCn/maSRqt068Efp9BvXmAttvsQFFTz9j7Y54BO1UyP\n mrU3LoBKv3fmj2pjGIhQ4jn2wn8+qIOFg35p5m1umUrvoBwXSdSwRU0kMIETDU1v\n 5ifo9FCBGQQDMMDf4oWQJwGcQdg4UrTkt7A33AIpvZPrV8385PzMF+t+2QDfx4k9\n iqjtdIghlkoTDoGXCXqXx4sD01hOQlyBTgTXmSCph9bUGkC+sNx1RCbd7XVR6pS6\n IifsqfaTBAfLtA==" ], "X-ME-Sender": "<xms:J6GJX4fKCTXnXmWjeCZH0UCedLWsBBFnrPkJZ53ToJNIXIV7VkOdLw>\n <xme:J6GJX6Ohim939PKtdacsjj9FgapSvj_vyGVwtbdIibU1U2GDSJnuYd8H1SbbMOfhr\n hhAxHAKVnOkEzXk1w>", "X-ME-Proxy-Cause": "\n gggruggvucftvghtrhhoucdtuddrgedujedrieehgdeiiecutefuodetggdotefrodftvf\n curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu\n uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc\n fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs\n ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucggtf\n frrghtthgvrhhnpedvhefgiedvjeegtdevheefhfetleefgfeivefgffevfeejgedtgfeu\n tdehtdegveenucfkphepjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuih\n iivgepfeenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhho\n nhdrnhgvth", "X-ME-Proxy": "<xmx:J6GJX5ic414-ZIBesT1Yy2XN_H-uMWpXQEX7JOL1xDpBL2Cysj30Bw>\n <xmx:J6GJX9-onVaDKkXl3zG2HNPKkAvqJn3R0CasnuH8YMOoDp5x_UAttw>\n <xmx:J6GJX0sFsdKf65jXjVjqaeYp9mn1-9CM1wb8IHlMDQEPZ4dtwW4Zlw>\n <xmx:J6GJX_nDqGgocjjz8_o0anNMcKh_dwIvf9I9KkMcMHnfjXq8WmZtLQ>", "From": "Thomas Monjalon <thomas@monjalon.net>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com, andrew.rybchenko@oktetlabs.ru,\n Liron Himi <lironh@marvell.com>,\n Stephen Hemminger <stephen@networkplumber.org>,\n Ray Kinsella <mdr@ashroe.eu>, Neil Horman <nhorman@tuxdriver.com>,\n Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>,\n Gaetan Rivet <grive@u256.net>, Jakub Grajciar <jgrajcia@cisco.com>,\n Matan Azrad <matan@nvidia.com>, Shahaf Shuler <shahafs@nvidia.com>,\n Viacheslav Ovsiienko <viacheslavo@nvidia.com>,\n Zyta Szpak <zr@semihalf.com>, Stephen Hemminger <sthemmin@microsoft.com>,\n \"K. Y. Srinivasan\" <kys@microsoft.com>,\n Haiyang Zhang <haiyangz@microsoft.com>, Long Li <longli@microsoft.com>,\n Maxime Coquelin <maxime.coquelin@redhat.com>,\n Chenbo Xia <chenbo.xia@intel.com>, Zhihong Wang <zhihong.wang@intel.com>", "Date": "Fri, 16 Oct 2020 15:32:59 +0200", "Message-Id": "<20201016133259.3061153-4-thomas@monjalon.net>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20201016133259.3061153-1-thomas@monjalon.net>", "References": "<20200913220711.3768597-1-thomas@monjalon.net>\n <20201016133259.3061153-1-thomas@monjalon.net>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v6 3/3] ethdev: allow close function to return an\n\terror", "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": "The API function rte_eth_dev_close() was returning void.\nThe return type is changed to int for notifying of errors.\n\nIf an error happens during a close operation,\nthe status of the port is undefined,\na maximum of resources having been freed.\n\nSigned-off-by: Thomas Monjalon <thomas@monjalon.net>\nReviewed-by: Liron Himi <lironh@marvell.com>\nAcked-by: Stephen Hemminger <stephen@networkplumber.org>\nAcked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>\nReviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>\n---\n doc/guides/rel_notes/deprecation.rst | 1 -\n doc/guides/rel_notes/release_20_11.rst | 4 +++-\n drivers/net/cxgbe/cxgbe_ethdev.c | 5 +++--\n drivers/net/cxgbe/cxgbevf_ethdev.c | 5 +++--\n drivers/net/failsafe/failsafe_ether.c | 6 +++++-\n drivers/net/failsafe/failsafe_ops.c | 25 +++++++++++++++++--------\n drivers/net/memif/rte_eth_memif.c | 4 +---\n drivers/net/mlx5/mlx5.c | 7 ++++---\n drivers/net/mvneta/mvneta_ethdev.c | 5 +++--\n drivers/net/mvpp2/mrvl_ethdev.c | 5 +++--\n drivers/net/netvsc/hn_ethdev.c | 6 ++++--\n drivers/net/netvsc/hn_var.h | 2 +-\n drivers/net/netvsc/hn_vf.c | 7 +++++--\n drivers/net/virtio/virtio_user_ethdev.c | 4 +---\n lib/librte_ethdev/rte_ethdev.c | 16 +++++++++++-----\n lib/librte_ethdev/rte_ethdev.h | 5 ++++-\n 16 files changed, 68 insertions(+), 39 deletions(-)", "diff": "diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst\nindex 6cbfd11847..6e7bd14a46 100644\n--- a/doc/guides/rel_notes/deprecation.rst\n+++ b/doc/guides/rel_notes/deprecation.rst\n@@ -128,7 +128,6 @@ Deprecation Notices\n invalid port ID, unsupported operation, failed operation):\n \n - ``rte_eth_dev_stop``\n- - ``rte_eth_dev_close``\n \n * ethdev: New offload flags ``DEV_RX_OFFLOAD_FLOW_MARK`` will be added in 19.11.\n This will allow application to enable or disable PMDs from updating\ndiff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst\nindex 48717ee536..b53cff2adc 100644\n--- a/doc/guides/rel_notes/release_20_11.rst\n+++ b/doc/guides/rel_notes/release_20_11.rst\n@@ -369,7 +369,9 @@ API Changes\n \n * ethdev: ``rte_eth_rx_descriptor_done()`` API has been deprecated.\n \n-* Renamed internal ethdev APIs:\n+* ethdev: Added ``int`` return type to ``rte_eth_dev_close()``.\n+\n+* ethdev: Renamed internal functions:\n \n * ``_rte_eth_dev_callback_process()`` -> ``rte_eth_dev_callback_process()``\n * ``_rte_eth_dev_reset`` -> ``rte_eth_dev_internal_reset()``\ndiff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c\nindex 16beb2d435..fe488231a7 100644\n--- a/drivers/net/cxgbe/cxgbe_ethdev.c\n+++ b/drivers/net/cxgbe/cxgbe_ethdev.c\n@@ -1296,12 +1296,13 @@ static int eth_cxgbe_dev_uninit(struct rte_eth_dev *eth_dev)\n {\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n \tuint16_t port_id;\n+\tint err = 0;\n \n \t/* Free up other ports and all resources */\n \tRTE_ETH_FOREACH_DEV_OF(port_id, &pci_dev->device)\n-\t\trte_eth_dev_close(port_id);\n+\t\terr |= rte_eth_dev_close(port_id);\n \n-\treturn 0;\n+\treturn err == 0 ? 0 : -EIO;\n }\n \n static int eth_cxgbe_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\ndiff --git a/drivers/net/cxgbe/cxgbevf_ethdev.c b/drivers/net/cxgbe/cxgbevf_ethdev.c\nindex 947fcdd406..c2918f5356 100644\n--- a/drivers/net/cxgbe/cxgbevf_ethdev.c\n+++ b/drivers/net/cxgbe/cxgbevf_ethdev.c\n@@ -183,12 +183,13 @@ static int eth_cxgbevf_dev_uninit(struct rte_eth_dev *eth_dev)\n {\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n \tuint16_t port_id;\n+\tint err = 0;\n \n \t/* Free up other ports and all resources */\n \tRTE_ETH_FOREACH_DEV_OF(port_id, &pci_dev->device)\n-\t\trte_eth_dev_close(port_id);\n+\t\terr |= rte_eth_dev_close(port_id);\n \n-\treturn 0;\n+\treturn err == 0 ? 0 : -EIO;\n }\n \n static int eth_cxgbevf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\ndiff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c\nindex 7c68bbdec0..950d35dac4 100644\n--- a/drivers/net/failsafe/failsafe_ether.c\n+++ b/drivers/net/failsafe/failsafe_ether.c\n@@ -287,7 +287,11 @@ fs_dev_remove(struct sub_device *sdev)\n \t\t/* fallthrough */\n \tcase DEV_ACTIVE:\n \t\tfailsafe_eth_dev_unregister_callbacks(sdev);\n-\t\trte_eth_dev_close(PORT_ID(sdev));\n+\t\tret = rte_eth_dev_close(PORT_ID(sdev));\n+\t\tif (ret < 0) {\n+\t\t\tERROR(\"Port close failed for sub-device %u\",\n+\t\t\t PORT_ID(sdev));\n+\t\t}\n \t\tsdev->state = DEV_PROBED;\n \t\t/* fallthrough */\n \tcase DEV_PROBED:\ndiff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c\nindex 0ce7dfc8a6..5c606ff077 100644\n--- a/drivers/net/failsafe/failsafe_ops.c\n+++ b/drivers/net/failsafe/failsafe_ops.c\n@@ -638,7 +638,7 @@ failsafe_eth_dev_close(struct rte_eth_dev *dev)\n {\n \tstruct sub_device *sdev;\n \tuint8_t i;\n-\tint ret;\n+\tint err, ret = 0;\n \n \tfs_lock(dev, 0);\n \tfailsafe_hotplug_alarm_cancel(dev);\n@@ -648,29 +648,38 @@ failsafe_eth_dev_close(struct rte_eth_dev *dev)\n \tFOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {\n \t\tDEBUG(\"Closing sub_device %d\", i);\n \t\tfailsafe_eth_dev_unregister_callbacks(sdev);\n-\t\trte_eth_dev_close(PORT_ID(sdev));\n+\t\terr = rte_eth_dev_close(PORT_ID(sdev));\n+\t\tif (err) {\n+\t\t\tret = ret ? ret : err;\n+\t\t\tERROR(\"Error while closing sub-device %u\",\n+\t\t\t\t\tPORT_ID(sdev));\n+\t\t}\n \t\tsdev->state = DEV_ACTIVE - 1;\n \t}\n \trte_eth_dev_callback_unregister(RTE_ETH_ALL, RTE_ETH_EVENT_NEW,\n \t\t\t\t\tfailsafe_eth_new_event_callback, dev);\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY) {\n \t\tfs_unlock(dev, 0);\n-\t\treturn 0;\n+\t\treturn ret;\n \t}\n \tfs_dev_free_queues(dev);\n-\tret = failsafe_eal_uninit(dev);\n-\tif (ret)\n+\terr = failsafe_eal_uninit(dev);\n+\tif (err) {\n+\t\tret = ret ? ret : err;\n \t\tERROR(\"Error while uninitializing sub-EAL\");\n+\t}\n \tfailsafe_args_free(dev);\n \trte_free(PRIV(dev)->subs);\n \trte_free(PRIV(dev)->mcast_addrs);\n \t/* mac_addrs must not be freed alone because part of dev_private */\n \tdev->data->mac_addrs = NULL;\n \tfs_unlock(dev, 0);\n-\tret = pthread_mutex_destroy(&PRIV(dev)->hotplug_mutex);\n-\tif (ret)\n+\terr = pthread_mutex_destroy(&PRIV(dev)->hotplug_mutex);\n+\tif (err) {\n+\t\tret = ret ? ret : err;\n \t\tERROR(\"Error while destroying hotplug mutex\");\n-\treturn 0;\n+\t}\n+\treturn ret;\n }\n \n static int\ndiff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c\nindex ff8a58081f..33bf5c68a3 100644\n--- a/drivers/net/memif/rte_eth_memif.c\n+++ b/drivers/net/memif/rte_eth_memif.c\n@@ -1798,9 +1798,7 @@ rte_pmd_memif_remove(struct rte_vdev_device *vdev)\n \tif (eth_dev == NULL)\n \t\treturn 0;\n \n-\trte_eth_dev_close(eth_dev->data->port_id);\n-\n-\treturn 0;\n+\treturn rte_eth_dev_close(eth_dev->data->port_id);\n }\n \n static struct rte_vdev_driver pmd_memif_drv = {\ndiff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex e5ca392fed..dc55988b10 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -2020,6 +2020,7 @@ static int\n mlx5_pci_remove(struct rte_pci_device *pci_dev)\n {\n \tuint16_t port_id;\n+\tint ret = 0;\n \n \tRTE_ETH_FOREACH_DEV_OF(port_id, &pci_dev->device) {\n \t\t/*\n@@ -2027,11 +2028,11 @@ mlx5_pci_remove(struct rte_pci_device *pci_dev)\n \t\t * call the close function explicitly for secondary process.\n \t\t */\n \t\tif (rte_eal_process_type() == RTE_PROC_SECONDARY)\n-\t\t\tmlx5_dev_close(&rte_eth_devices[port_id]);\n+\t\t\tret |= mlx5_dev_close(&rte_eth_devices[port_id]);\n \t\telse\n-\t\t\trte_eth_dev_close(port_id);\n+\t\t\tret |= rte_eth_dev_close(port_id);\n \t}\n-\treturn 0;\n+\treturn ret == 0 ? 0 : -EIO;\n }\n \n static const struct rte_pci_id mlx5_pci_id_map[] = {\ndiff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c\nindex 3c0332ab4d..1574bf35a8 100644\n--- a/drivers/net/mvneta/mvneta_ethdev.c\n+++ b/drivers/net/mvneta/mvneta_ethdev.c\n@@ -966,14 +966,15 @@ static int\n rte_pmd_mvneta_remove(struct rte_vdev_device *vdev)\n {\n \tuint16_t port_id;\n+\tint ret = 0;\n \n \tRTE_ETH_FOREACH_DEV(port_id) {\n \t\tif (rte_eth_devices[port_id].device != &vdev->device)\n \t\t\tcontinue;\n-\t\trte_eth_dev_close(port_id);\n+\t\tret |= rte_eth_dev_close(port_id);\n \t}\n \n-\treturn 0;\n+\treturn ret == 0 ? 0 : -EIO;\n }\n \n static struct rte_vdev_driver pmd_mvneta_drv = {\ndiff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c\nindex a230a96840..df9f336fab 100644\n--- a/drivers/net/mvpp2/mrvl_ethdev.c\n+++ b/drivers/net/mvpp2/mrvl_ethdev.c\n@@ -3022,14 +3022,15 @@ static int\n rte_pmd_mrvl_remove(struct rte_vdev_device *vdev)\n {\n \tuint16_t port_id;\n+\tint ret = 0;\n \n \tRTE_ETH_FOREACH_DEV(port_id) {\n \t\tif (rte_eth_devices[port_id].device != &vdev->device)\n \t\t\tcontinue;\n-\t\trte_eth_dev_close(port_id);\n+\t\tret |= rte_eth_dev_close(port_id);\n \t}\n \n-\treturn 0;\n+\treturn ret == 0 ? 0 : -EIO;\n }\n \n static struct rte_vdev_driver pmd_mrvl_drv = {\ndiff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c\nindex 8743e6e69a..40e6d25f34 100644\n--- a/drivers/net/netvsc/hn_ethdev.c\n+++ b/drivers/net/netvsc/hn_ethdev.c\n@@ -842,14 +842,16 @@ hn_dev_stop(struct rte_eth_dev *dev)\n static int\n hn_dev_close(struct rte_eth_dev *dev)\n {\n+\tint ret;\n+\n \tPMD_INIT_FUNC_TRACE();\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n \t\treturn 0;\n \n-\thn_vf_close(dev);\n+\tret = hn_vf_close(dev);\n \thn_dev_free_queues(dev);\n \n-\treturn 0;\n+\treturn ret;\n }\n \n static const struct eth_dev_ops hn_eth_dev_ops = {\ndiff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h\nindex 4b63f87607..74f30669ac 100644\n--- a/drivers/net/netvsc/hn_var.h\n+++ b/drivers/net/netvsc/hn_var.h\n@@ -217,7 +217,7 @@ const uint32_t *hn_vf_supported_ptypes(struct rte_eth_dev *dev);\n int\thn_vf_start(struct rte_eth_dev *dev);\n void\thn_vf_reset(struct rte_eth_dev *dev);\n void\thn_vf_stop(struct rte_eth_dev *dev);\n-void\thn_vf_close(struct rte_eth_dev *dev);\n+int\thn_vf_close(struct rte_eth_dev *dev);\n \n int\thn_vf_allmulticast_enable(struct rte_eth_dev *dev);\n int\thn_vf_allmulticast_disable(struct rte_eth_dev *dev);\ndiff --git a/drivers/net/netvsc/hn_vf.c b/drivers/net/netvsc/hn_vf.c\nindex f5f15c0462..d29eee7627 100644\n--- a/drivers/net/netvsc/hn_vf.c\n+++ b/drivers/net/netvsc/hn_vf.c\n@@ -316,18 +316,21 @@ void hn_vf_reset(struct rte_eth_dev *dev)\n \tVF_ETHDEV_FUNC(dev, rte_eth_dev_reset);\n }\n \n-void hn_vf_close(struct rte_eth_dev *dev)\n+int hn_vf_close(struct rte_eth_dev *dev)\n {\n \tstruct hn_data *hv = dev->data->dev_private;\n \tuint16_t vf_port;\n+\tint ret = 0;\n \n \trte_rwlock_read_lock(&hv->vf_lock);\n \tvf_port = hv->vf_port;\n \tif (vf_port != HN_INVALID_PORT)\n-\t\trte_eth_dev_close(vf_port);\n+\t\tret = rte_eth_dev_close(vf_port);\n \n \thv->vf_port = HN_INVALID_PORT;\n \trte_rwlock_read_unlock(&hv->vf_lock);\n+\n+\treturn ret;\n }\n \n int hn_vf_stats_reset(struct rte_eth_dev *dev)\ndiff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c\nindex f56fc238c4..042665bc09 100644\n--- a/drivers/net/virtio/virtio_user_ethdev.c\n+++ b/drivers/net/virtio/virtio_user_ethdev.c\n@@ -881,9 +881,7 @@ virtio_user_pmd_remove(struct rte_vdev_device *vdev)\n \t\treturn rte_eth_dev_release_port(eth_dev);\n \n \t/* make sure the device is stopped, queues freed */\n-\trte_eth_dev_close(eth_dev->data->port_id);\n-\n-\treturn 0;\n+\treturn rte_eth_dev_close(eth_dev->data->port_id);\n }\n \n static int virtio_user_pmd_dma_map(struct rte_vdev_device *vdev, void *addr,\ndiff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c\nindex 3ae2253b9d..11ad32ca61 100644\n--- a/lib/librte_ethdev/rte_ethdev.c\n+++ b/lib/librte_ethdev/rte_ethdev.c\n@@ -1718,19 +1718,25 @@ rte_eth_dev_set_link_down(uint16_t port_id)\n \treturn eth_err(port_id, (*dev->dev_ops->dev_set_link_down)(dev));\n }\n \n-void\n+int\n rte_eth_dev_close(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n+\tint firsterr, binerr;\n+\tint *lasterr = &firsterr;\n \n-\tRTE_ETH_VALID_PORTID_OR_RET(port_id);\n+\tRTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);\n \tdev = &rte_eth_devices[port_id];\n \n-\tRTE_FUNC_PTR_OR_RET(*dev->dev_ops->dev_close);\n-\t(*dev->dev_ops->dev_close)(dev);\n+\tRTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_close, -ENOTSUP);\n+\t*lasterr = (*dev->dev_ops->dev_close)(dev);\n+\tif (*lasterr != 0)\n+\t\tlasterr = &binerr;\n \n \trte_ethdev_trace_close(port_id);\n-\trte_eth_dev_release_port(dev);\n+\t*lasterr = rte_eth_dev_release_port(dev);\n+\n+\treturn eth_err(port_id, firsterr);\n }\n \n int\ndiff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h\nindex 500b2ff766..849bcaf85e 100644\n--- a/lib/librte_ethdev/rte_ethdev.h\n+++ b/lib/librte_ethdev/rte_ethdev.h\n@@ -2306,8 +2306,11 @@ int rte_eth_dev_set_link_down(uint16_t port_id);\n *\n * @param port_id\n * The port identifier of the Ethernet device.\n+ * @return\n+ * - Zero if the port is closed successfully.\n+ * - Negative if something went wrong.\n */\n-void rte_eth_dev_close(uint16_t port_id);\n+int rte_eth_dev_close(uint16_t port_id);\n \n /**\n * Reset a Ethernet device and keep its port id.\n", "prefixes": [ "v6", "3/3" ] }