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 44BDCA0032 for ; Fri, 18 Feb 2022 13:42:18 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 403C640141; Fri, 18 Feb 2022 13:42:18 +0100 (CET) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id E395D40141 for ; Fri, 18 Feb 2022 13:42:16 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id x5so9530983wrg.13 for ; Fri, 18 Feb 2022 04:42:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GWN5W2SSToa/C4ALLe4ZDzzEtaH68WA1ZsV192XH50c=; b=NFSzoR/5ZLZQqTCIn4nYnmG5PGWHMztp2qIatkc4p+vlkRoDJnvncvXDzG+KZ8ymkN 1dB+C1P9JIjGFgYXG25XQT+bzxe4OEAmkejQ9I28SWPh+RjzRUMvWRKHCKO294TLAeKo cT1H3VlO/vQkf3GDW5wklC7wixtkbif7Wu2GQ9heogzIeEwe2Haf1o4tG7VSDMsvAtHi vJ0E+gV2CLxzFNW/HCRxuBNKq1dzsHEnvlOCK4tHp2u2T5fgtSyvK3M71YUolUyVrfTO OOzsKhSPIuuyUuDO7VDvbRdLhIpdJdF6PFnjQZI846iU0OFu6hFWDjshf5ap94ovqGce M3UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GWN5W2SSToa/C4ALLe4ZDzzEtaH68WA1ZsV192XH50c=; b=4cIdwHBv6+KhviQfYofjyZ4wL0QA7peyL5CpLKrprRGdKIdyW2t/IVptaLM5JX6wuy RDx1tzCVnX9azM50yn7rOllj4dIQcXYabiqMcJAavWxM1EbTWrtZbjHRpF30+MRLZYzn EQ04Mb5mrHNCD6R3KxziNmrUwPJBNxOfYG70GuHL1xVL+ajJUFNM/7cWH+HyZ18+1kmx Ew4vfkHXycpjlJj6I8t8M91WhBsu0iNrS3uiXOLAJePwr7Nutoc//K/PSL23WnSStFlo crzA/9XCypVNt33HI4fK2Kobowa8Z4AJXM9T4inId5e8YGIrU8LGX2kusnFBRb9YjNHY cvaw== X-Gm-Message-State: AOAM531FeQ/7jBn/mjMDhzTyJCDBxeZMDVlmvp5QaZdYx3rtd4SGLmtO jaRYtry3UO11X/jpMOZg0jD731sKoxa/cgr/ X-Google-Smtp-Source: ABdhPJzf+F0WKWTN87pIuRL3G4t+PFbXWJfxXLfhm8Vjs5EuVUFt+mW4qfSniowmX5Fa8SwaMEg+bw== X-Received: by 2002:adf:ef83:0:b0:1e4:f048:7193 with SMTP id d3-20020adfef83000000b001e4f0487193mr5699332wro.349.1645188136656; Fri, 18 Feb 2022 04:42:16 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id c9sm21280915wrn.51.2022.02.18.04.42.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:42:16 -0800 (PST) From: luca.boccassi@gmail.com To: Tianfei Zhang Cc: Rosen Xu , dpdk stable Subject: patch 'raw/ifpga: fix thread closing' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:38:20 +0000 Message-Id: <20220218123931.1749595-51-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.5 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/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/f05952e7bfe65f8be8f4611da54229ade0e0a310 Thanks. Luca Boccassi --- >From f05952e7bfe65f8be8f4611da54229ade0e0a310 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 0b0b1be00f..d421d14d68 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.c +++ b/drivers/raw/ifpga/ifpga_rawdev.c @@ -497,7 +497,7 @@ ifpga_rawdev_gsd_handle(__rte_unused void *param) 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,7 +525,7 @@ ifpga_monitor_start_func(void) { int ret; - if (ifpga_monitor_start == 0) { + if (!__atomic_load_n(&ifpga_monitor_start, __ATOMIC_RELAXED)) { ret = pthread_create(&ifpga_monitor_start_thread, NULL, ifpga_rawdev_gsd_handle, NULL); @@ -534,7 +534,7 @@ ifpga_monitor_start_func(void) "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 @@ 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) IFPGA_RAWDEV_PMD_ERR("Can't cancel the thread"); @@ -553,8 +555,6 @@ ifpga_monitor_stop_func(void) if (ret) IFPGA_RAWDEV_PMD_ERR("Can't join the thread"); - ifpga_monitor_start = 0; - return ret; } -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:40.010052003 +0000 +++ 0051-raw-ifpga-fix-thread-closing.patch 2022-02-18 12:37:37.674791563 +0000 @@ -1 +1 @@ -From 60e68d170b122d86c1c49cc51078db461542a26b Mon Sep 17 00:00:00 2001 +From f05952e7bfe65f8be8f4611da54229ade0e0a310 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 60e68d170b122d86c1c49cc51078db461542a26b ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 0eae0c9477..fdf3c23d2c 100644 +index 0b0b1be00f..d421d14d68 100644 @@ -37,3 +38,3 @@ - ret = rte_ctrl_thread_create(&ifpga_monitor_start_thread, - "ifpga-monitor", NULL, - ifpga_rawdev_gsd_handle, NULL); + ret = pthread_create(&ifpga_monitor_start_thread, + NULL, + ifpga_rawdev_gsd_handle, NULL);