[dpdk-stable] patch 'bus/pci: fix unknown NUMA node value on Windows' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/12/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/196cda0e31b1ac4a41a525f186aa5506b3654237

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 196cda0e31b1ac4a41a525f186aa5506b3654237 Mon Sep 17 00:00:00 2001
From: Pallavi Kadam <pallavi.kadam at intel.com>
Date: Mon, 27 Sep 2021 11:43:22 -0700
Subject: [PATCH] bus/pci: fix unknown NUMA node value on Windows
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 3c6e581025109926c166bbd2f7ea678f07c3bbce ]

Based on the rte_eth_dev_socket_id() documentation,
set the default numa_node to -1. When the API is unsuccessful,
set numa_node to 0.
This change more correctly resembles the Linux code.

Fixes: bf7cf1f947bd ("bus/pci: fix unknown NUMA node value on Windows")

Reported-by: Vipin Varghese <vipin.varghese at intel.com>
Signed-off-by: Pallavi Kadam <pallavi.kadam at intel.com>
Acked-by: Ranjit Menon <ranjit.menon at intel.com>
---
 drivers/bus/pci/windows/pci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c
index 12a46ae370..4944c21f67 100644
--- a/drivers/bus/pci/windows/pci.c
+++ b/drivers/bus/pci/windows/pci.c
@@ -234,6 +234,7 @@ get_device_resource_info(HDEVINFO dev_info,
 	}
 
 	/* Get NUMA node using DEVPKEY_Device_Numa_Node */
+	dev->device.numa_node = SOCKET_ID_ANY;
 	res = SetupDiGetDevicePropertyW(dev_info, dev_info_data,
 		&DEVPKEY_Device_Numa_Node, &property_type,
 		(BYTE *)&numa_node, sizeof(numa_node), NULL, 0);
@@ -241,7 +242,7 @@ get_device_resource_info(HDEVINFO dev_info,
 		DWORD error = GetLastError();
 		if (error == ERROR_NOT_FOUND) {
 			/* On older CPUs, NUMA is not bound to PCIe locality. */
-			dev->device.numa_node = SOCKET_ID_ANY;
+			dev->device.numa_node = 0;
 			return ERROR_SUCCESS;
 		}
 		RTE_LOG_WIN32_ERR("SetupDiGetDevicePropertyW"
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:05.579301066 +0800
+++ 0079-bus-pci-fix-unknown-NUMA-node-value-on-Windows.patch	2021-11-10 14:17:01.844079642 +0800
@@ -1 +1 @@
-From 3c6e581025109926c166bbd2f7ea678f07c3bbce Mon Sep 17 00:00:00 2001
+From 196cda0e31b1ac4a41a525f186aa5506b3654237 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 3c6e581025109926c166bbd2f7ea678f07c3bbce ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +24 @@
-index 343ef6f33b..644c452c76 100644
+index 12a46ae370..4944c21f67 100644
@@ -25 +27 @@
-@@ -237,6 +237,7 @@ get_device_resource_info(HDEVINFO dev_info,
+@@ -234,6 +234,7 @@ get_device_resource_info(HDEVINFO dev_info,
@@ -33 +35 @@
-@@ -244,7 +245,7 @@ get_device_resource_info(HDEVINFO dev_info,
+@@ -241,7 +242,7 @@ get_device_resource_info(HDEVINFO dev_info,