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 3C795A0350 for ; Mon, 21 Feb 2022 16:39:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 379384013F; Mon, 21 Feb 2022 16:39:39 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 5D192410F0 for ; Mon, 21 Feb 2022 16:39:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yV3yYTm2bo7JMsYAwS32A47gAAxbWrQKyvC9dnyxmzU=; b=IensO13yIbWgG/8JtRgQiVOSlccAELjSvcBiu/lmHFvWSexRdLlNoebHBZRE+BSLniWWgO jnp3XgW7hvwNK4XsjdeBMdhAAbY234/fnnPksIbnGwcEgYMlxpYDMU8fO5x+RV+uqDtxdi 373n8EQtuZzQLYpv9RFlH2q5YVzu9Fc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-150-iaFj0GRxNkuGW54oG93n5w-1; Mon, 21 Feb 2022 10:39:33 -0500 X-MC-Unique: iaFj0GRxNkuGW54oG93n5w-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 283DF100C667; Mon, 21 Feb 2022 15:39:32 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id F29337E133; Mon, 21 Feb 2022 15:39:30 +0000 (UTC) From: Kevin Traynor To: Tianfei Zhang Cc: Rosen Xu , dpdk stable Subject: patch 'raw/ifpga: fix thread closing' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:43 +0000 Message-Id: <20220221153625.152324-94-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/72db0cca691dcfd260f0fb3d901c141764f3ece7 Thanks. Kevin --- >From 72db0cca691dcfd260f0fb3d901c141764f3ece7 Mon Sep 17 00:00:00 2001 From: Tianfei Zhang Date: Sun, 23 Jan 2022 22:50:05 -0500 Subject: [PATCH] raw/ifpga: fix thread closing [ upstream commit 60e68d170b122d86c1c49cc51078db461542a26b ] When we want to close a thread, we should set a flag to notify thread handler function. Fixes: 9c006c45d0c5 ("raw/ifpga: scan PCIe BDF device tree") Signed-off-by: Tianfei Zhang Acked-by: Rosen Xu --- drivers/raw/ifpga/ifpga_rawdev.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index 0eae0c9477..fdf3c23d2c 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.c +++ b/drivers/raw/ifpga/ifpga_rawdev.c @@ -498,5 +498,5 @@ ifpga_rawdev_gsd_handle(__rte_unused void *param) #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++) { @@ -526,5 +526,5 @@ ifpga_monitor_start_func(void) 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, @@ -535,5 +535,5 @@ ifpga_monitor_start_func(void) return -1; } - ifpga_monitor_start = 1; + __atomic_store_n(&ifpga_monitor_start, 1, __ATOMIC_RELAXED); } @@ -545,5 +545,7 @@ ifpga_monitor_stop_func(void) 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) @@ -554,6 +556,4 @@ ifpga_monitor_stop_func(void) IFPGA_RAWDEV_PMD_ERR("Can't join the thread"); - ifpga_monitor_start = 0; - return ret; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.659929510 +0000 +++ 0094-raw-ifpga-fix-thread-closing.patch 2022-02-21 15:22:44.192704353 +0000 @@ -1 +1 @@ -From 60e68d170b122d86c1c49cc51078db461542a26b Mon Sep 17 00:00:00 2001 +From 72db0cca691dcfd260f0fb3d901c141764f3ece7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 60e68d170b122d86c1c49cc51078db461542a26b ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org