From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 46E33A00C3; Thu, 20 Jan 2022 03:38:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 37E8F411F3; Thu, 20 Jan 2022 03:38:44 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 49B91410E5; Thu, 20 Jan 2022 03:38:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642646322; x=1674182322; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=N5IkT05pRQ4Pmr0N/VKzwPlNkN0mNHUlagCPItizM/Y=; b=OrSw6HmaSK1MIz5QlKhMA2gerJ2dOe0gLCu2o4Hx5cm01nwOpSTRMXYU XyINaHSbMCUizYiB0AxN58fS9jJ6fS/JsNf3S8WsT2jfCK7uScQBAOkMG hLoj0SqQs3gdMR0bHHXiPcbCMIdo8lpXfO0WHJRSGQxrBOii5tzlCCDmU VcLPpbEuuoWgLGSCAUYhyyzGpqUvmTJe52pEvyk5RfrPqNCs4zb7G+H6M 9zFM5P+qp6x9yL6gHhkgesEyW0M08SU2Z/bUDkLv3bx8WVtS3eBZLFr1T ipaZh5BpyJCdndHX1u4abcLoqZdsK5teLCtK/cL6JI+9LLRcAinGqUv8j g==; X-IronPort-AV: E=McAfee;i="6200,9189,10232"; a="232618296" X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="232618296" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 18:38:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="615936075" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.238.175.107]) by FMSMGA003.fm.intel.com with ESMTP; 19 Jan 2022 18:38:39 -0800 From: Wei Huang To: dev@dpdk.org, rosen.xu@intel.com, qi.z.zhang@intel.com Cc: stable@dpdk.org, tianfei.zhang@intel.com, ferruh.yigit@intel.com Subject: [PATCH v2] raw/ifpga: fix pthread cannot join Date: Wed, 19 Jan 2022 21:35:35 -0500 Message-Id: <20220120023535.6747-1-wei.huang@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220119055415.4424-1-wei.huang@intel.com> References: <20220119055415.4424-1-wei.huang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Tianfei Zhang When we want to close a thread, we should set a flag to notify thread handler function. Fixes: 9c006c45 ("raw/ifpga: scan PCIe BDF device tree") Cc: stable@dpdk.org Signed-off-by: Tianfei Zhang --- v2: update commit log --- drivers/raw/ifpga/ifpga_rawdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index 8d9db58..26752c4 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.c +++ b/drivers/raw/ifpga/ifpga_rawdev.c @@ -497,7 +497,7 @@ static int set_surprise_link_check_aer( int gsd_enable, ret; #define MS 1000 - while (1) { + while (ifpga_monitor_start) { gsd_enable = 0; for (i = 0; i < IFPGA_RAWDEV_NUM; i++) { ifpga_rdev = &ifpga_rawdevices[i]; @@ -544,7 +544,9 @@ static int set_surprise_link_check_aer( { int ret; - if (ifpga_monitor_start == 1) { + if ((ifpga_monitor_start == 1) && ifpga_monitor_start_thread) { + ifpga_monitor_start = 0; + ret = pthread_cancel(ifpga_monitor_start_thread); if (ret) IFPGA_RAWDEV_PMD_ERR("Can't cancel the thread"); @@ -553,8 +555,6 @@ static int set_surprise_link_check_aer( if (ret) IFPGA_RAWDEV_PMD_ERR("Can't join the thread"); - ifpga_monitor_start = 0; - return ret; } -- 1.8.3.1