From patchwork Wed Jan 19 05:54:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Huang X-Patchwork-Id: 106053 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 36F47A0352; Wed, 19 Jan 2022 06:57:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A4EC40C35; Wed, 19 Jan 2022 06:57:28 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 92AD34013F; Wed, 19 Jan 2022 06:57:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642571846; x=1674107846; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=QfZtFfcQkK07EZZ7M7FrQ0FxZuMH5UyZmpwyrvNe7I8=; b=X7HWlxv5GJCLayy4FFiT0YzTlM/h7KLYI7XW9qxHooAOold/73d558Xl +YGM6U+mNthhP3JkgF0Ge9eaCWgUoHme0j2FN0QLtIDyTNNAzyPDHOEUX pc5BaEFVa6N+fEqYq8bgs4E94eAj2dGqYMMNxaVrGnwXABmgeuPjp2V4N x5vd/wCM96H+bgbn7lhkpee7gGtDVZ5SQhMDxmyEPBlc52G7Hz5a+W+W1 tbxPy+kMxBqH6vU8MS6HwDdvIcoZK4wG43wLVCTuOqYUI5BVnJsVW9DtI pgxJjTK6XGnLFEmCBu+AuLN/InDhX+dmEmDy46De5NuephRHDoU7pA7ei Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="305722517" X-IronPort-AV: E=Sophos;i="5.88,298,1635231600"; d="scan'208";a="305722517" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2022 21:57:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,298,1635231600"; d="scan'208";a="625766086" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.238.175.107]) by orsmga004.jf.intel.com with ESMTP; 18 Jan 2022 21:57:23 -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 v1] raw/ifpga: fix pthread cannot join Date: Wed, 19 Jan 2022 00:54:15 -0500 Message-Id: <20220119055415.4424-1-wei.huang@intel.com> X-Mailer: git-send-email 2.26.2 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 thread handler function. Fixes: 9c006c45 ("raw/ifpga: scan PCIe BDF device tree") Cc: stable@dpdk.org Signed-off-by: Tianfei Zhang --- 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..9663b67 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; }