From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C208DA0577; Wed, 15 Apr 2020 05:47:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 25C111D415; Wed, 15 Apr 2020 05:47:33 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id D86381D40F; Wed, 15 Apr 2020 05:47:31 +0200 (CEST) IronPort-SDR: BHjaZ3X+Bdeojz9HQvBtvOS6odlSF2/RNuWgxzyEpdfjxRu2Hvmv0SRrnuAewozkJEwceVTFUA wfx+QhDbUn2Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2020 20:47:30 -0700 IronPort-SDR: KcHwETDW1O9mnuMf2M+9d0OeWwYO6nZqujxHQr2LAN7AaBhpaTS8DZ9YT3xRiaS0jL/H6bl6J8 N4/vvPNUyQjg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,385,1580803200"; d="scan'208";a="271608884" Received: from ubuntu.sh.intel.com ([10.240.183.59]) by orsmga002.jf.intel.com with ESMTP; 14 Apr 2020 20:47:28 -0700 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, Zhu Tao , stable@dpdk.org Date: Wed, 15 Apr 2020 08:27:15 -0400 Message-Id: <20200415122715.33368-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 v3] net/ixgbe: fix resource leak after thread exits normally X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Zhu Tao When the thread exits normally, pthread_join() is not called, which can result in a resource leak. Therefore, the thread is set to separation mode using function pthread_detach(), so that no program call pthread_join() is required to recycle, and when the thread exits, the system automatically reclaims resources. Wait for the thread to finish without setting the timeout, wait until the thread finishes before returning. Normally, the thread will finish in a shorter time, and give a warning message if it hasn't finished in a longer time. Fixes: 819d0d1d57f1 ("net/ixgbe: fix blocking system events") Cc: stable@dpdk.org Signed-off-by: Zhu Tao --- drivers/net/ixgbe/ixgbe_ethdev.c | 46 +++++++++++++++------------------------- 1 file changed, 17 insertions(+), 29 deletions(-) v3 changes: 1. Wait for the thread to finish without setting the timeout, and the corresponding function name has also been modified. 2. Commit log. v2 changes: Commit log. diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 2c57976..dac20a3 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -230,7 +230,7 @@ static int ixgbe_dev_rss_reta_query(struct rte_eth_dev *dev, static void ixgbe_dev_interrupt_handler(void *param); static void ixgbe_dev_interrupt_delayed_handler(void *param); static void *ixgbe_dev_setup_link_thread_handler(void *param); -static void ixgbe_dev_cancel_link_thread(struct rte_eth_dev *dev); +static void ixgbe_dev_wait_setup_link_complete(struct rte_eth_dev *dev); static int ixgbe_add_rar(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr, @@ -2601,7 +2601,7 @@ static int eth_ixgbevf_pci_remove(struct rte_pci_device *pci_dev) PMD_INIT_FUNC_TRACE(); /* Stop the link setup handler before resetting the HW. */ - ixgbe_dev_cancel_link_thread(dev); + ixgbe_dev_wait_setup_link_complete(dev); /* disable uio/vfio intr/eventfd mapping */ rte_intr_disable(intr_handle); @@ -2888,7 +2888,7 @@ static int eth_ixgbevf_pci_remove(struct rte_pci_device *pci_dev) PMD_INIT_FUNC_TRACE(); - ixgbe_dev_cancel_link_thread(dev); + ixgbe_dev_wait_setup_link_complete(dev); /* disable interrupts */ ixgbe_disable_intr(hw); @@ -4143,35 +4143,22 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, return ret_val; } -/* return 1: setup complete, return 0: setup not complete, and wait timeout*/ -static int +static void ixgbe_dev_wait_setup_link_complete(struct rte_eth_dev *dev) { -#define DELAY_INTERVAL 100 /* 100ms */ -#define MAX_TIMEOUT 90 /* 9s (90 * 100ms) in total */ +#define DELAY_INTERVAL 10 /* 10ms */ +#define WARNING_TIMEOUT 900 /* 9s (900 * 10ms) in total */ struct ixgbe_adapter *ad = dev->data->dev_private; - int timeout = MAX_TIMEOUT; + int timeout = WARNING_TIMEOUT; - while (rte_atomic32_read(&ad->link_thread_running) && timeout) { + while (rte_atomic32_read(&ad->link_thread_running)) { msec_delay(DELAY_INTERVAL); timeout--; - } - - - return !!timeout; -} -static void -ixgbe_dev_cancel_link_thread(struct rte_eth_dev *dev) -{ - struct ixgbe_adapter *ad = dev->data->dev_private; - void *retval; - - if (!ixgbe_dev_wait_setup_link_complete(dev)) { - pthread_cancel(ad->link_thread_tid); - pthread_join(ad->link_thread_tid, &retval); - rte_atomic32_clear(&ad->link_thread_running); - PMD_DRV_LOG(ERR, "Link thread not complete, cancel it!"); + if (!timeout) { + timeout = WARNING_TIMEOUT; + PMD_DRV_LOG(ERR, "IXGBE link thread not complete too long time!"); + } } } @@ -4186,6 +4173,7 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, u32 speed; bool autoneg = false; + pthread_detach(pthread_self()); speed = hw->phy.autoneg_advertised; if (!speed) ixgbe_get_link_capabilities(hw, &speed, &autoneg); @@ -4282,8 +4270,8 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, if (link_up == 0) { if (ixgbe_get_media_type(hw) == ixgbe_media_type_fiber) { intr->flags |= IXGBE_FLAG_NEED_LINK_CONFIG; - if (ixgbe_dev_wait_setup_link_complete(dev) && - rte_atomic32_test_and_set(&ad->link_thread_running)) { + ixgbe_dev_wait_setup_link_complete(dev); + if (rte_atomic32_test_and_set(&ad->link_thread_running)) { if (rte_ctrl_thread_create(&ad->link_thread_tid, "ixgbe-link-handler", NULL, @@ -5323,7 +5311,7 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, PMD_INIT_FUNC_TRACE(); /* Stop the link setup handler before resetting the HW. */ - ixgbe_dev_cancel_link_thread(dev); + ixgbe_dev_wait_setup_link_complete(dev); err = hw->mac.ops.reset_hw(hw); if (err) { @@ -5421,7 +5409,7 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, PMD_INIT_FUNC_TRACE(); - ixgbe_dev_cancel_link_thread(dev); + ixgbe_dev_wait_setup_link_complete(dev); ixgbevf_intr_disable(dev); -- 1.8.3.1