From patchwork Thu Jan 20 05:58:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Huang X-Patchwork-Id: 106112 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 D19DAA00C4; Thu, 20 Jan 2022 07:01:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96F5041233; Thu, 20 Jan 2022 07:01:33 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id BC5C240042; Thu, 20 Jan 2022 07:01:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642658492; x=1674194492; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RkjwFuQg7uV0HRPF+ONviyYboGfj6KHu/5SihB4xUL8=; b=KQ2UH1l+i4OMEm9V1t7YXTQ70lcOVvGZbAIloJh8kgkTbVQgHPW+Pqie 8V9c+I/oh7k7sfmB+qeZTVJBYC728qA4DijfdDIJMfOAUCJ5VrQ3UbM5v E+Y8AHnU+xN3PjfLNjVaCncsjTrFwb9UdN+ZmyoP4TBdvFDBVSxe92f7i 0g3Vc+Ea6jrzQeSbTONqekylwV9gZEXUO+WYaB+I6uRPA5o9JzXvKN3Y6 HJC0UjlORlMBqK9PZozjjawc9qCqHNM4cRJxq2EwgYTnlOv1zCbVqI6SN Z17ihOf51FHmvIOVMy8fguK3YNAQHBbWMyFHVyg5Yw0yWVZIGtg8euhjk w==; X-IronPort-AV: E=McAfee;i="6200,9189,10232"; a="244099318" X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="244099318" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 22:01:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="530890498" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.238.175.107]) by fmsmga007.fm.intel.com with ESMTP; 19 Jan 2022 22:01:17 -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 v3] raw/ifpga: fix pthread cannot join Date: Thu, 20 Jan 2022 00:58:14 -0500 Message-Id: <20220120055814.7244-1-wei.huang@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220120023535.6747-1-wei.huang@intel.com> References: <20220120023535.6747-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 --- drivers/raw/ifpga/ifpga_rawdev.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index 8d9db58..2bc569b 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]; @@ -542,18 +542,21 @@ static int set_surprise_link_check_aer( static int ifpga_monitor_stop_func(void) { + void *status; 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"); - ret = pthread_join(ifpga_monitor_start_thread, NULL); + ret = pthread_join(ifpga_monitor_start_thread, &status); if (ret) IFPGA_RAWDEV_PMD_ERR("Can't join the thread"); - ifpga_monitor_start = 0; + ifpga_monitor_start_thread = 0; return ret; }