[dpdk-stable] patch 'bus/pci: ignore missing NUMA node on Windows' has been queued to stable release 20.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.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/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/ac97254b40ded128f07313ced9cd28c89452e06e

Thanks.

Luca Boccassi

---
>From ac97254b40ded128f07313ced9cd28c89452e06e Mon Sep 17 00:00:00 2001
From: Tal Shnaiderman <talshn at nvidia.com>
Date: Sun, 13 Dec 2020 16:16:04 +0200
Subject: [PATCH] bus/pci: ignore missing NUMA node on Windows

[ upstream commit ac7c98d04f2c5c8d57c4f87799a669dca9ca9605 ]

On older processors, NUMA isn't bound to PCIe locality.
those cases return ERROR_NOT_FOUND in response to the
SetupDiGetDevicePropertyW call with DEVPKEY_Device_Numa_Node
attribute.

This error fails the probe process for the PCIe device.
this commit will ignore such failure and will set the
numa_node to 0.

Fixes: b762221ac24f ("bus/pci: support Windows with bifurcated drivers")

Reported-by: Odi Assli <odia at nvidia.com>
Signed-off-by: Tal Shnaiderman <talshn at nvidia.com>
Tested-by: Odi Assli <odia at nvidia.com>
Acked-by: Dmitry Kozlyuk <dmitry.kozliuk at gmail.com>
Acked-by: Ranjit Menon <ranjit.menon at intel.com>
---
 drivers/bus/pci/windows/pci.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c
index fbf0785fdb..f662584528 100644
--- a/drivers/bus/pci/windows/pci.c
+++ b/drivers/bus/pci/windows/pci.c
@@ -235,6 +235,12 @@ get_device_resource_info(HDEVINFO dev_info,
 		&DEVPKEY_Device_Numa_Node, &property_type,
 		(BYTE *)&numa_node, sizeof(numa_node), NULL, 0);
 	if (!res) {
+		DWORD error = GetLastError();
+		if (error == ERROR_NOT_FOUND) {
+			/* On older CPUs, NUMA is not bound to PCIe locality. */
+			dev->device.numa_node = 0;
+			return ERROR_SUCCESS;
+		}
 		RTE_LOG_WIN32_ERR("SetupDiGetDevicePropertyW"
 			"(DEVPKEY_Device_Numa_Node)");
 		return -1;
-- 
2.29.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-05 11:18:29.699636478 +0000
+++ 0008-bus-pci-ignore-missing-NUMA-node-on-Windows.patch	2021-02-05 11:18:28.586686923 +0000
@@ -1 +1 @@
-From ac7c98d04f2c5c8d57c4f87799a669dca9ca9605 Mon Sep 17 00:00:00 2001
+From ac97254b40ded128f07313ced9cd28c89452e06e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ac7c98d04f2c5c8d57c4f87799a669dca9ca9605 ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org