[dpdk-stable] patch 'bus: clarify log for non-NUMA-aware devices' has been queued to stable release 20.11.3

[luca.boccassi at gmail.com]

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 <dkozlyuk at nvidia.com>
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 <dkozlyuk at nvidia.com>
Reviewed-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
Reviewed-by: Xueming Li <xuemingl at nvidia.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
---
 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 <rte_bus.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
+#include <rte_lcore.h>
 #include <rte_per_lcore.h>
 #include <rte_memory.h>
 #include <rte_eal.h>
@@ -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 <rte_eal.h>
 #include <rte_tailq.h>
 #include <rte_devargs.h>
+#include <rte_lcore.h>
 #include <rte_malloc.h>
 #include <rte_errno.h>
 #include <rte_memory.h>
@@ -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 at 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 <rte_memory.h>
- #include <rte_eal.h>
- #include <rte_eal_paging.h>
-+#include <rte_lcore.h>
- #include <rte_string_fns.h>
- #include <rte_common.h>
- #include <rte_devargs.h>
-@@ -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