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 9D4D5A00C2 for ; Tue, 8 Mar 2022 15:16:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9845B4068B; Tue, 8 Mar 2022 15:16:43 +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 CF6E84068B for ; Tue, 8 Mar 2022 15:16:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646749001; 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=oUTsxWjfiSNOstmPB3q9MIGa/aEH1kG9KMnqE72tgk4=; b=QCfYuKxu9yUTMXYoI2uuKw/4YBDGhMYZGmK+SVkDNG51YUVW6R53RBL4GX9yy1xa1acWjK hC0Pz/cjW9VAUl01mbqYViUNYEgMoXGRD+/4AXEUN2QFVn8ZKmA1kg/B5XgnZVO/HTyDWo n3STgOabRxhYFp7PkWN2iqnwqQFcWDQ= 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-308-G4lX6uE2MPmVc0A1djsZUA-1; Tue, 08 Mar 2022 09:16:23 -0500 X-MC-Unique: G4lX6uE2MPmVc0A1djsZUA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B254D801DDB; Tue, 8 Mar 2022 14:16:22 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id A7039865A4; Tue, 8 Mar 2022 14:16:21 +0000 (UTC) From: Kevin Traynor To: Wei Huang Cc: Tianfei Zhang , dpdk stable Subject: patch 'raw/ifpga: fix monitor thread' has been queued to stable release 21.11.1 Date: Tue, 8 Mar 2022 14:14:54 +0000 Message-Id: <20220308141500.286915-39-ktraynor@redhat.com> In-Reply-To: <20220308141500.286915-1-ktraynor@redhat.com> References: <20220308141500.286915-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 03/14/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/415ad41107c755841c92221bde4fecf696c92b5e Thanks. Kevin --- >From 415ad41107c755841c92221bde4fecf696c92b5e Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Tue, 1 Mar 2022 03:47:03 -0500 Subject: [PATCH] raw/ifpga: fix monitor thread [ upstream commit 2479a1e9a8886c93ba4c8a7aa2a35a04302f1aae ] Monitor thread handles graceful shutdown according to the value of specific sensors in device, two issues are found below. 1. Thread is not created when card is probed. 2. Thread is canceled without checking presence of other cards. To fix them, thread is created in pci device probe function, a reference count is checked before canceling the thread. Fixes: 9c006c45 ("raw/ifpga: scan PCIe BDF device tree") Signed-off-by: Wei Huang Acked-by: Tianfei Zhang --- drivers/raw/ifpga/ifpga_rawdev.c | 62 +++++++++++++++++++++----------- drivers/raw/ifpga/ifpga_rawdev.h | 2 ++ 2 files changed, 43 insertions(+), 21 deletions(-) diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index c2e74518aa..2d3c4fd229 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.c +++ b/drivers/raw/ifpga/ifpga_rawdev.c @@ -69,5 +69,5 @@ static const struct rte_pci_id pci_ifpga_map[] = { static struct ifpga_rawdev ifpga_rawdevices[IFPGA_RAWDEV_NUM]; -static int ifpga_monitor_start; +static int ifpga_monitor_refcnt; static pthread_t ifpga_monitor_start_thread; @@ -134,4 +134,5 @@ ifpga_rawdev_allocate(struct rte_rawdev *rawdev) for (i = 0; i < IFPGA_MAX_IRQ; i++) dev->intr_handle[i] = NULL; + dev->poll_enabled = 0; return dev; @@ -208,8 +209,9 @@ static int ifpga_get_dev_vendor_id(const char *bdf, return 0; } -static int ifpga_rawdev_fill_info(struct ifpga_rawdev *ifpga_dev, - const char *bdf) + +static int ifpga_rawdev_fill_info(struct ifpga_rawdev *ifpga_dev) { - char path[1024] = "/sys/bus/pci/devices/0000:"; + struct opae_adapter *adapter = NULL; + char path[1024] = "/sys/bus/pci/devices/"; char link[1024], link1[1024]; char dir[1024] = "/sys/devices/"; @@ -226,5 +228,9 @@ static int ifpga_rawdev_fill_info(struct ifpga_rawdev *ifpga_dev, uint32_t dev_id, vendor_id; - strlcat(path, bdf, sizeof(path)); + adapter = ifpga_dev ? ifpga_rawdev_get_priv(ifpga_dev->rawdev) : NULL; + if (!adapter) + return -ENODEV; + + strlcat(path, adapter->name, sizeof(path)); memset(link, 0, sizeof(link)); memset(link1, 0, sizeof(link1)); @@ -376,5 +382,5 @@ ifpga_monitor_sensor(struct rte_rawdev *raw_dev, if (!strcmp(sensor->name, "Board Temperature") || !strcmp(sensor->name, "FPGA Die Temperature")) { - IFPGA_RAWDEV_PMD_INFO("read sensor %s %d %d %d\n", + IFPGA_RAWDEV_PMD_DEBUG("read sensor %s %d %d %d\n", sensor->name, value, sensor->high_warn, sensor->high_fatal); @@ -418,5 +424,5 @@ static int set_surprise_link_check_aer( uint32_t aer_new0, aer_new1; - if (!ifpga_rdev) { + if (!ifpga_rdev || !ifpga_rdev->rawdev) { printf("\n device does not exist\n"); return -EFAULT; @@ -497,9 +503,9 @@ ifpga_rawdev_gsd_handle(__rte_unused void *param) #define MS 1000 - while (__atomic_load_n(&ifpga_monitor_start, __ATOMIC_RELAXED)) { + while (__atomic_load_n(&ifpga_monitor_refcnt, __ATOMIC_RELAXED)) { gsd_enable = 0; for (i = 0; i < IFPGA_RAWDEV_NUM; i++) { ifpga_rdev = &ifpga_rawdevices[i]; - if (ifpga_rdev->rawdev) { + if (ifpga_rdev->poll_enabled) { ret = set_surprise_link_check_aer(ifpga_rdev, gsd_enable); @@ -521,30 +527,44 @@ ifpga_rawdev_gsd_handle(__rte_unused void *param) static int -ifpga_monitor_start_func(void) +ifpga_monitor_start_func(struct ifpga_rawdev *dev) { int ret; - if (!__atomic_load_n(&ifpga_monitor_start, __ATOMIC_RELAXED)) { + if (!dev) + return -ENODEV; + + ret = ifpga_rawdev_fill_info(dev); + if (ret) + return ret; + + dev->poll_enabled = 1; + + if (!__atomic_fetch_add(&ifpga_monitor_refcnt, 1, __ATOMIC_RELAXED)) { ret = rte_ctrl_thread_create(&ifpga_monitor_start_thread, "ifpga-monitor", NULL, ifpga_rawdev_gsd_handle, NULL); if (ret != 0) { + ifpga_monitor_start_thread = 0; IFPGA_RAWDEV_PMD_ERR( "Fail to create ifpga monitor thread"); return -1; } - __atomic_store_n(&ifpga_monitor_start, 1, __ATOMIC_RELAXED); } return 0; } + static int -ifpga_monitor_stop_func(void) +ifpga_monitor_stop_func(struct ifpga_rawdev *dev) { int ret; - if (__atomic_load_n(&ifpga_monitor_start, __ATOMIC_RELAXED)) { - __atomic_store_n(&ifpga_monitor_start, 0, __ATOMIC_RELAXED); + if (!dev || !dev->poll_enabled) + return 0; + dev->poll_enabled = 0; + + if (!__atomic_sub_fetch(&ifpga_monitor_refcnt, 1, __ATOMIC_RELAXED) && + ifpga_monitor_start_thread) { ret = pthread_cancel(ifpga_monitor_start_thread); if (ret) @@ -719,4 +739,5 @@ ifpga_rawdev_close(struct rte_rawdev *dev) if (dev) { + ifpga_monitor_stop_func(ifpga_rawdev_get(dev)); adapter = ifpga_rawdev_get_priv(dev); if (adapter) { @@ -1573,4 +1594,8 @@ ifpga_rawdev_create(struct rte_pci_device *pci_dev, goto free_adapter_data; + ret = ifpga_monitor_start_func(dev); + if (ret) + goto free_adapter_data; + return ret; @@ -1648,5 +1673,5 @@ static int ifpga_rawdev_pci_remove(struct rte_pci_device *pci_dev) { - ifpga_monitor_stop_func(); + IFPGA_RAWDEV_PMD_INFO("remove pci_dev %s", pci_dev->device.name); return ifpga_rawdev_destroy(pci_dev); } @@ -1699,5 +1724,4 @@ ifpga_cfg_probe(struct rte_vdev_device *dev) int port; char *name = NULL; - const char *bdf; char dev_name[RTE_RAWDEV_NAME_MAX_LEN]; int ret = -1; @@ -1748,8 +1772,4 @@ ifpga_cfg_probe(struct rte_vdev_device *dev) if (!ifpga_dev) goto end; - bdf = name; - ifpga_rawdev_fill_info(ifpga_dev, bdf); - - ifpga_monitor_start_func(); memset(dev_name, 0, sizeof(dev_name)); diff --git a/drivers/raw/ifpga/ifpga_rawdev.h b/drivers/raw/ifpga/ifpga_rawdev.h index 6e09afead3..857b73463d 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.h +++ b/drivers/raw/ifpga/ifpga_rawdev.h @@ -63,4 +63,6 @@ struct ifpga_rawdev { /* 0 for FME interrupt, others are reserved for AFU irq */ void *intr_handle[IFPGA_MAX_IRQ]; + /* enable monitor thread poll device's sensors or not */ + int poll_enabled; }; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:29.348136534 +0000 +++ 0039-raw-ifpga-fix-monitor-thread.patch 2022-03-08 13:55:28.510315202 +0000 @@ -1 +1 @@ -From 2479a1e9a8886c93ba4c8a7aa2a35a04302f1aae Mon Sep 17 00:00:00 2001 +From 415ad41107c755841c92221bde4fecf696c92b5e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2479a1e9a8886c93ba4c8a7aa2a35a04302f1aae ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index cc569c5e71..26c1366a64 100644 +index c2e74518aa..2d3c4fd229 100644 @@ -147 +148 @@ -@@ -1572,4 +1593,8 @@ ifpga_rawdev_create(struct rte_pci_device *pci_dev, +@@ -1573,4 +1594,8 @@ ifpga_rawdev_create(struct rte_pci_device *pci_dev, @@ -156 +157 @@ -@@ -1647,5 +1672,5 @@ static int +@@ -1648,5 +1673,5 @@ static int @@ -163 +164 @@ -@@ -1698,5 +1723,4 @@ ifpga_cfg_probe(struct rte_vdev_device *dev) +@@ -1699,5 +1724,4 @@ ifpga_cfg_probe(struct rte_vdev_device *dev) @@ -169 +170 @@ -@@ -1747,8 +1771,4 @@ ifpga_cfg_probe(struct rte_vdev_device *dev) +@@ -1748,8 +1772,4 @@ ifpga_cfg_probe(struct rte_vdev_device *dev)