Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/69075/?format=api
{ "id": 69075, "url": "https://patches.dpdk.org/api/patches/69075/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200422123736.18234-1-taox.zhu@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": "<20200422123736.18234-1-taox.zhu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200422123736.18234-1-taox.zhu@intel.com", "date": "2020-04-22T12:37:36", "name": "[v6] net/ixgbe: fix resource leak after thread exits normally", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "e405af32bca3956f7207bc38ecf1f3c06628847e", "submitter": { "id": 1368, "url": "https://patches.dpdk.org/api/people/1368/?format=api", "name": "Zhu, TaoX", "email": "taox.zhu@intel.com" }, "delegate": { "id": 31221, "url": "https://patches.dpdk.org/api/users/31221/?format=api", "username": "yexl", "first_name": "xiaolong", "last_name": "ye", "email": "xiaolong.ye@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20200422123736.18234-1-taox.zhu@intel.com/mbox/", "series": [ { "id": 9559, "url": "https://patches.dpdk.org/api/series/9559/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=9559", "date": "2020-04-22T12:37:36", "name": "[v6] net/ixgbe: fix resource leak after thread exits normally", "version": 6, "mbox": "https://patches.dpdk.org/series/9559/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/69075/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/69075/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 9A6FAA05A1;\n\tWed, 22 Apr 2020 05:54:16 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 049DD1D167;\n\tWed, 22 Apr 2020 05:54:16 +0200 (CEST)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n by dpdk.org (Postfix) with ESMTP id 41CDA1D166;\n Wed, 22 Apr 2020 05:54:14 +0200 (CEST)", "from orsmga002.jf.intel.com ([10.7.209.21])\n by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 21 Apr 2020 20:54:13 -0700", "from unknown (HELO localhost.localdomain) ([10.240.183.95])\n by orsmga002.jf.intel.com with ESMTP; 21 Apr 2020 20:54:10 -0700" ], "IronPort-SDR": [ "\n dgZXQ1eIpDuyMsw7hk8o/7u/s+wwD8Ax1thoeYFqdPvuKore34xUGp0s5M/pebsPNkl4fTrbFq\n z4BRLfJueShg==", "\n YOQHci5ULLIwpvCl1Fn++Z3pQOrK8xctAZAaL7ORC4P8WKhCZM9adWKNu8qy75WV0kejyYdv9f\n B0ZXBbPNNBKw==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.72,412,1580803200\"; d=\"scan'208\";a=\"273749253\"", "From": "taox.zhu@intel.com", "To": "konstantin.ananyev@intel.com, wenzhuo.lu@intel.com, xiaolong.ye@intel.com", "Cc": "dev@dpdk.org, martin.weiser@allegro-packets.com,\n Zhu Tao <taox.zhu@intel.com>, stable@dpdk.org", "Date": "Wed, 22 Apr 2020 12:37:36 +0000", "Message-Id": "<20200422123736.18234-1-taox.zhu@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<1586495895-9610-1-git-send-email-taox.zhu@intel.com>", "References": "<1586495895-9610-1-git-send-email-taox.zhu@intel.com>", "Subject": "[dpdk-dev] [PATCH v6] net/ixgbe: fix resource leak after thread\n\texits normally", "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: Zhu Tao <taox.zhu@intel.com>\n\nWhen the thread exits normally, pthread_join() is not called, which can\nresult in a resource leak. Therefore, the thread is set to separation\nmode using function pthread_detach(), so that no program call\npthread_join() is required to recycle, and when the thread exits,\nthe system automatically reclaims resources.\n\nWait for the thread to finish with timeout argument(0 means that it will\nnot return until link complete), wait until the thread finishes before\nreturning. Normally, the thread will finish in a shorter time, and give\na warning message if it hasn't finished in a longer time.\n\nFixes: 819d0d1d57f1 (\"net/ixgbe: fix blocking system events\")\nCc: stable@dpdk.org\n\nSigned-off-by: Zhu Tao <taox.zhu@intel.com>\nAcked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>\n---\n drivers/net/ixgbe/ixgbe_ethdev.c | 57 +++++++++++++++++++---------------------\n 1 file changed, 27 insertions(+), 30 deletions(-)\n\nV6 changes:\n Change code segment\n 'int timeout = timeout_ms ? WARNING_TIMEOUT : timeout_ms;'\n to\n 'uint32_t timeout = timeout_ms ? timeout_ms : WARNING_TIMEOUT;'.\n\nV5 changes:\n Modify the definition of function ixgbe_dev_wait_setup_link_complete(),\n so that the caller can choose whether to block, etc.\n\nv4 changes:\n Format codes.\n\nv3 changes:\n 1. Wait for the thread to finish without setting the timeout, and the\n corresponding function name has also been modified.\n 2. Commit log.\n\nv2 changes:\n Commit log.", "diff": "diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c\nindex 2c57976..a3ae4d7 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.c\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.c\n@@ -230,7 +230,7 @@ static int ixgbe_dev_rss_reta_query(struct rte_eth_dev *dev,\n static void ixgbe_dev_interrupt_handler(void *param);\n static void ixgbe_dev_interrupt_delayed_handler(void *param);\n static void *ixgbe_dev_setup_link_thread_handler(void *param);\n-static void ixgbe_dev_cancel_link_thread(struct rte_eth_dev *dev);\n+static int ixgbe_dev_wait_setup_link_complete(struct rte_eth_dev *dev, uint32_t timeout_ms);\n \n static int ixgbe_add_rar(struct rte_eth_dev *dev,\n \t\t\tstruct rte_ether_addr *mac_addr,\n@@ -2601,7 +2601,7 @@ static int eth_ixgbevf_pci_remove(struct rte_pci_device *pci_dev)\n \tPMD_INIT_FUNC_TRACE();\n \n \t/* Stop the link setup handler before resetting the HW. */\n-\tixgbe_dev_cancel_link_thread(dev);\n+\tixgbe_dev_wait_setup_link_complete(dev, 0);\n \n \t/* disable uio/vfio intr/eventfd mapping */\n \trte_intr_disable(intr_handle);\n@@ -2888,7 +2888,7 @@ static int eth_ixgbevf_pci_remove(struct rte_pci_device *pci_dev)\n \n \tPMD_INIT_FUNC_TRACE();\n \n-\tixgbe_dev_cancel_link_thread(dev);\n+\tixgbe_dev_wait_setup_link_complete(dev, 0);\n \n \t/* disable interrupts */\n \tixgbe_disable_intr(hw);\n@@ -4143,36 +4143,32 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,\n \treturn ret_val;\n }\n \n-/* return 1: setup complete, return 0: setup not complete, and wait timeout*/\n+/*\n+ * If @timeout_ms was 0, it means that it will not return until link complete.\n+ * It returns 1 on complete, return 0 on timeout.\n+ */\n static int\n-ixgbe_dev_wait_setup_link_complete(struct rte_eth_dev *dev)\n+ixgbe_dev_wait_setup_link_complete(struct rte_eth_dev *dev, uint32_t timeout_ms)\n {\n-#define DELAY_INTERVAL 100 /* 100ms */\n-#define MAX_TIMEOUT 90 /* 9s (90 * 100ms) in total */\n+#define WARNING_TIMEOUT 9000 /* 9s in total */\n \tstruct ixgbe_adapter *ad = dev->data->dev_private;\n-\tint timeout = MAX_TIMEOUT;\n+\tuint32_t timeout = timeout_ms ? timeout_ms : WARNING_TIMEOUT;\n \n-\twhile (rte_atomic32_read(&ad->link_thread_running) && timeout) {\n-\t\tmsec_delay(DELAY_INTERVAL);\n+\twhile (rte_atomic32_read(&ad->link_thread_running)) {\n+\t\tmsec_delay(1);\n \t\ttimeout--;\n-\t}\n-\n-\n-\treturn !!timeout;\n-}\n \n-static void\n-ixgbe_dev_cancel_link_thread(struct rte_eth_dev *dev)\n-{\n-\tstruct ixgbe_adapter *ad = dev->data->dev_private;\n-\tvoid *retval;\n-\n-\tif (!ixgbe_dev_wait_setup_link_complete(dev)) {\n-\t\tpthread_cancel(ad->link_thread_tid);\n-\t\tpthread_join(ad->link_thread_tid, &retval);\n-\t\trte_atomic32_clear(&ad->link_thread_running);\n-\t\tPMD_DRV_LOG(ERR, \"Link thread not complete, cancel it!\");\n+\t\tif (timeout_ms) {\n+\t\t\tif (!timeout)\n+\t\t\t\treturn 0;\n+\t\t} else if (!timeout) {\n+\t\t\t/* It will not return until link complete */\n+\t\t\ttimeout = WARNING_TIMEOUT;\n+\t\t\tPMD_DRV_LOG(ERR, \"IXGBE link thread not complete too long time!\");\n+\t\t}\n \t}\n+\n+\treturn 1;\n }\n \n static void *\n@@ -4186,6 +4182,7 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,\n \tu32 speed;\n \tbool autoneg = false;\n \n+\tpthread_detach(pthread_self());\n \tspeed = hw->phy.autoneg_advertised;\n \tif (!speed)\n \t\tixgbe_get_link_capabilities(hw, &speed, &autoneg);\n@@ -4282,8 +4279,8 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,\n \tif (link_up == 0) {\n \t\tif (ixgbe_get_media_type(hw) == ixgbe_media_type_fiber) {\n \t\t\tintr->flags |= IXGBE_FLAG_NEED_LINK_CONFIG;\n-\t\t\tif (ixgbe_dev_wait_setup_link_complete(dev) &&\n-\t\t\t rte_atomic32_test_and_set(&ad->link_thread_running)) {\n+\t\t\tixgbe_dev_wait_setup_link_complete(dev, 0);\n+\t\t\tif (rte_atomic32_test_and_set(&ad->link_thread_running)) {\n \t\t\t\tif (rte_ctrl_thread_create(&ad->link_thread_tid,\n \t\t\t\t\t\"ixgbe-link-handler\",\n \t\t\t\t\tNULL,\n@@ -5323,7 +5320,7 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,\n \tPMD_INIT_FUNC_TRACE();\n \n \t/* Stop the link setup handler before resetting the HW. */\n-\tixgbe_dev_cancel_link_thread(dev);\n+\tixgbe_dev_wait_setup_link_complete(dev, 0);\n \n \terr = hw->mac.ops.reset_hw(hw);\n \tif (err) {\n@@ -5421,7 +5418,7 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,\n \n \tPMD_INIT_FUNC_TRACE();\n \n-\tixgbe_dev_cancel_link_thread(dev);\n+\tixgbe_dev_wait_setup_link_complete(dev, 0);\n \n \tixgbevf_intr_disable(dev);\n \n", "prefixes": [ "v6" ] }