From patchwork Mon Jan 24 02:39:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Huang X-Patchwork-Id: 106322 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 90422A04A6; Mon, 24 Jan 2022 03:42:24 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0EC1F40143; Mon, 24 Jan 2022 03:42:24 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 0C1A140040; Mon, 24 Jan 2022 03:42:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642992142; x=1674528142; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KSYfrikRgC0laqa1dKSV4u1ZO1uEy4Jllm5LWA/caAY=; b=XXaff+1Irz2b5vYcbSeAGYLKfS0cbWBy+Q5llifgLcAbzeCUz0S7h13y O7wEZX9DL7Tzg9qHZ93ROLpmbZH7KRX0Z0lBKjGOYiatAoczOZX2eUTIR qLOJ+bbm7S9dGMTEk5Bec9ycQjzFlpS+4cf8zmv1JUUEditqDYLUh2Uer RADm6Z7qbIrqUT6PcXqiyvzUmOTqRUkNifqIwfb4+a2pa28v35hYb7/fM dQstfRgbLbF4xp4iMKvYA9/1KFOuKF3XGW0bf3FuhMoL6+n/19LDgNoGx CxTktn7VffVjPflUCIUwtNesCgCiCrfY2DTA35XUakQRqaEhiLt4lu/wW Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10236"; a="225929624" X-IronPort-AV: E=Sophos;i="5.88,311,1635231600"; d="scan'208";a="225929624" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2022 18:42:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,311,1635231600"; d="scan'208";a="695265386" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.238.175.107]) by orsmga005.jf.intel.com with ESMTP; 23 Jan 2022 18:42:18 -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, stephen@networkplumber.org, david.marchand@redhat.com Subject: [PATCH v7] raw/ifpga: fix pthread cannot join Date: Sun, 23 Jan 2022 21:39:12 -0500 Message-Id: <20220124023912.18650-1-wei.huang@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220122043527.13838-1-wei.huang@intel.com> References: <20220122043527.13838-1-wei.huang@intel.com> MIME-Version: 1.0 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 --- v3: set thread id to 0 after pthread_join --- v4: do not evaluate and set pthread_t variable --- v5: use builtin atomic function to access ifpga_monitor_start flag --- v6: use __atomic_xxx_n to replace rte_atomicNN_xxx --- v7: fix patch applying issue --- drivers/raw/ifpga/ifpga_rawdev.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index 8d9db58..719f3b0 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 (__atomic_load_n(&ifpga_monitor_start, __ATOMIC_RELAXED)) { gsd_enable = 0; for (i = 0; i < IFPGA_RAWDEV_NUM; i++) { ifpga_rdev = &ifpga_rawdevices[i]; @@ -525,16 +525,16 @@ static int set_surprise_link_check_aer( { int ret; - if (ifpga_monitor_start == 0) { + if (!__atomic_load_n(&ifpga_monitor_start, __ATOMIC_RELAXED)) { ret = rte_ctrl_thread_create(&ifpga_monitor_start_thread, "ifpga-monitor", NULL, ifpga_rawdev_gsd_handle, NULL); if (ret != 0) { IFPGA_RAWDEV_PMD_ERR( - "Fail to create ifpga nonitor thread"); + "Fail to create ifpga monitor thread"); return -1; } - ifpga_monitor_start = 1; + __atomic_store_n(&ifpga_monitor_start, 1, __ATOMIC_RELAXED); } return 0; @@ -544,7 +544,9 @@ static int set_surprise_link_check_aer( { int ret; - if (ifpga_monitor_start == 1) { + if (__atomic_load_n(&ifpga_monitor_start, __ATOMIC_RELAXED)) { + __atomic_store_n(&ifpga_monitor_start, 0, __ATOMIC_RELAXED); + 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; }