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 C2795A0C40 for ; Thu, 5 Aug 2021 11:53:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BB9F041262; Thu, 5 Aug 2021 11:53:20 +0200 (CEST) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 5086B40040 for ; Thu, 5 Aug 2021 11:53:19 +0200 (CEST) Received: by mail-wm1-f41.google.com with SMTP id k4so2949240wms.3 for ; Thu, 05 Aug 2021 02:53:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JmpRtS9S1VBKrf3tLrMQwBJ+WuwGLt1QY6QGgvVNcH0=; b=YlPB29HuBTPTN6p9OAsUdf2mI1sZhU2E3UPMy3/rDqhaubIlDbht+BLZumk18GZzVu TIGyNccqhNTV8+aW5khYr9NLfqgDNs4cwrwMVmiOvAtQ1P3ZXiwLCCPDRuvBwkHGYkqE 8+zUsy2TgxfhLUDgg6JLirVqbFkGk8SA26guHNIjdvRZ6FaVdpqVbcz+zchduMQ87Hrk 6Pq4WTruUJahueDdBsQMOgeVPHel+b8Ew1HPVVml2B/YoKFxg3Zv8BJIY74Uts5c7SdX UEhMeANq8zxTBbL+XnSjfhLZviLe/1TRL1wGgI/4DST/QcZ8erI+4HnGU1JP0/s2aIxV etoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JmpRtS9S1VBKrf3tLrMQwBJ+WuwGLt1QY6QGgvVNcH0=; b=hKpvQoKmR9W5nVzLfj7YtFzWZIrtDDLKXhohTsBc9fK46lfDtTrjVoyYDib7xfa/Ke XQka94ppiHVNbh2r4nMAsTJyV76igGo5KiGyNWvIsgbY8rDg9s4d+sZHfZ1NHRmVhtny jDKIa9V+GFv5mWdk0TLffDyLhuRNDfSEk2jjIUnp+Rlqhrc8vZsWrKpY0THr5Zocj/sY EPAG7jYGL9JhP+8lSnAbU4oJwG1ohkaZk77yEqdvm+uUD7hU49/Y8f6yG5YUWC7ltko9 vX3IkglnLYBvirRfvRJJq9/9IML4yw+AS1NElaIzBNR6TvFlLip3xDEc+G/S8z8AiOZa dPOA== X-Gm-Message-State: AOAM53094sU5cK34x2KrIvROsMKvdbo5rGXjNTrLJw88yhW/2lZM293E MnVVsiU5kXwcYxB0b/PyucA= X-Google-Smtp-Source: ABdhPJzdfBZRWXyEjuyULSzMeopx2zHkAIDcW+q+lyNYLIYb+PA4MunT69NfJa6Dg6rAQ2ti1zY3BQ== X-Received: by 2002:a1c:188:: with SMTP id 130mr4125617wmb.184.1628157199046; Thu, 05 Aug 2021 02:53:19 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id p8sm5815773wrn.79.2021.08.05.02.53.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Aug 2021 02:53:18 -0700 (PDT) From: luca.boccassi@gmail.com To: Dmitry Kozlyuk Cc: Viacheslav Ovsiienko , Xueming Li , Andrew Rybchenko , dpdk stable Date: Thu, 5 Aug 2021 10:53:13 +0100 Message-Id: <20210805095314.1755018-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210805095314.1755018-1-luca.boccassi@gmail.com> References: <20210803122214.1094992-25-luca.boccassi@gmail.com> <20210805095314.1755018-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus: clarify log for non-NUMA-aware devices' has been queued to stable release 20.11.3 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/07/21. 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/bf76709d20d41e08adef3b342716d8a9d37c28c0 Thanks. Luca Boccassi --- >From bf76709d20d41e08adef3b342716d8a9d37c28c0 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlyuk Date: Wed, 4 Aug 2021 11:03:01 +0300 Subject: [PATCH] bus: clarify log for non-NUMA-aware devices [ upstream commit e9b3d79b0696cd983ace8e6f65532b240f43a1bb ] PCI, vmbus, and auxiliary drivers printed a warning when NUMA node had been reported as (-1) or not reported by OS: EAL: Invalid NUMA socket, default to 0 This message and its level might confuse users because the configuration is valid and nothing happens that requires attention or intervention. It was also printed without the device identification and with an indent (PCI only), which is confusing unless DEBUG logging is on to print the header message with the device name. Reduce level to INFO, reword the message, and suppress it when there is only one NUMA node because NUMA awareness does not matter in this case. Also, remove the indent for PCI. Fixes: f0e0e86aa35d ("pci: move NUMA node check from scan to probe") Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support") Fixes: 1afce3086cf4 ("bus/auxiliary: introduce auxiliary bus") Signed-off-by: Dmitry Kozlyuk Reviewed-by: Viacheslav Ovsiienko Reviewed-by: Xueming Li Acked-by: Andrew Rybchenko --- doc/guides/nics/ena.rst | 2 +- drivers/bus/pci/pci_common.c | 5 ++++- drivers/bus/vmbus/vmbus_common.c | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/guides/nics/ena.rst b/doc/guides/nics/ena.rst index 0f1f63f722..df720201f9 100644 --- a/doc/guides/nics/ena.rst +++ b/doc/guides/nics/ena.rst @@ -234,7 +234,7 @@ Example output: [...] EAL: PCI device 0000:00:06.0 on NUMA socket -1 - EAL: Invalid NUMA socket, default to 0 + EAL: Device 0000:00:06.0 is not NUMA-aware, defaulting socket to 0 EAL: probe driver: 1d0f:ec20 net_ena Interactive-mode selected diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index 9b8d769287..fa887de11b 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -190,7 +191,9 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr, } if (dev->device.numa_node < 0) { - RTE_LOG(WARNING, EAL, " Invalid NUMA socket, default to 0\n"); + if (rte_socket_count() > 1) + RTE_LOG(INFO, EAL, "Device %s is not NUMA-aware, defaulting socket to 0\n", + dev->name); dev->device.numa_node = 0; } diff --git a/drivers/bus/vmbus/vmbus_common.c b/drivers/bus/vmbus/vmbus_common.c index 39b3308577..09b8c3c5c8 100644 --- a/drivers/bus/vmbus/vmbus_common.c +++ b/drivers/bus/vmbus/vmbus_common.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -112,7 +113,9 @@ vmbus_probe_one_driver(struct rte_vmbus_driver *dr, dev->driver = dr; if (dev->device.numa_node < 0) { - VMBUS_LOG(WARNING, " Invalid NUMA socket, default to 0"); + if (rte_socket_count() > 1) + VMBUS_LOG(INFO, "Device %s is not NUMA-aware, defaulting socket to 0", + guid); dev->device.numa_node = 0; } -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-05 09:55:22.682829677 +0100 +++ 0002-bus-clarify-log-for-non-NUMA-aware-devices.patch 2021-08-05 09:55:22.598740183 +0100 @@ -1 +1 @@ -From e9b3d79b0696cd983ace8e6f65532b240f43a1bb Mon Sep 17 00:00:00 2001 +From bf76709d20d41e08adef3b342716d8a9d37c28c0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e9b3d79b0696cd983ace8e6f65532b240f43a1bb ] + @@ -24 +25,0 @@ -Cc: stable@dpdk.org @@ -31,5 +32,4 @@ - doc/guides/nics/ena.rst | 2 +- - drivers/bus/auxiliary/auxiliary_common.c | 5 ++++- - drivers/bus/pci/pci_common.c | 5 ++++- - drivers/bus/vmbus/vmbus_common.c | 5 ++++- - 4 files changed, 13 insertions(+), 4 deletions(-) + doc/guides/nics/ena.rst | 2 +- + drivers/bus/pci/pci_common.c | 5 ++++- + drivers/bus/vmbus/vmbus_common.c | 5 ++++- + 3 files changed, 9 insertions(+), 3 deletions(-) @@ -38 +38 @@ -index 63951098ea..92b1858e7a 100644 +index 0f1f63f722..df720201f9 100644 @@ -41 +41 @@ -@@ -246,7 +246,7 @@ Example output: +@@ -234,7 +234,7 @@ Example output: @@ -50,23 +49,0 @@ -diff --git a/drivers/bus/auxiliary/auxiliary_common.c b/drivers/bus/auxiliary/auxiliary_common.c -index 89e653c54e..603b6fdc02 100644 ---- a/drivers/bus/auxiliary/auxiliary_common.c -+++ b/drivers/bus/auxiliary/auxiliary_common.c -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -106,7 +107,9 @@ rte_auxiliary_probe_one_driver(struct rte_auxiliary_driver *drv, - } - - if (dev->device.numa_node < 0) { -- AUXILIARY_LOG(INFO, "Device is not NUMA-aware, defaulting NUMA node to 0"); -+ if (rte_socket_count() > 1) -+ AUXILIARY_LOG(INFO, "Device %s is not NUMA-aware, defaulting socket to 0", -+ dev->name); - dev->device.numa_node = 0; - } - @@ -74 +51 @@ -index 35d7d092d1..79a6fcffbd 100644 +index 9b8d769287..fa887de11b 100644 @@ -97 +74 @@ -index d25fd14ef5..519ca9c6fe 100644 +index 39b3308577..09b8c3c5c8 100644