[dpdk-stable] patch 'eal: remove dead code on NUMA node detection' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.6

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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/883ce8ee6b55e4452313dc32bbc1fe6bb120e99d

Thanks.

Kevin.

---
>From 883ce8ee6b55e4452313dc32bbc1fe6bb120e99d Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 22 Oct 2019 21:34:17 +0200
Subject: [PATCH] eal: remove dead code on NUMA node detection

[ upstream commit 8e35792c5325f9fd2cb7cfab507aa23fc956ced7 ]

RTE_EAL_ALLOW_INV_SOCKET_ID had been introduced and documented as used
with xen dom0 support (dropped for some time now).

Closely looking at this, the code was changed later and ensures that the
socket id is in the [0..RTE_MAX_NUMA_NODES] range anyway.

Let's drop this dead code and the build option with it.

Fixes: 94ef2964148a ("eal/linux: fix numa node detection")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 config/common_base                       | 1 -
 config/meson.build                       | 1 -
 lib/librte_eal/common/eal_common_lcore.c | 9 ---------
 3 files changed, 11 deletions(-)

diff --git a/config/common_base b/config/common_base
index d12ae98bc..6bce2c97f 100644
--- a/config/common_base
+++ b/config/common_base
@@ -89,5 +89,4 @@ CONFIG_RTE_LOG_HISTORY=256
 CONFIG_RTE_BACKTRACE=y
 CONFIG_RTE_LIBEAL_USE_HPET=n
-CONFIG_RTE_EAL_ALLOW_INV_SOCKET_ID=n
 CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=n
 CONFIG_RTE_EAL_IGB_UIO=n
diff --git a/config/meson.build b/config/meson.build
index e92be6c47..d76776137 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -113,5 +113,4 @@ dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores'))
 dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes'))
 dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
-dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id'))
 # values which have defaults which may be overridden
 dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64)
diff --git a/lib/librte_eal/common/eal_common_lcore.c b/lib/librte_eal/common/eal_common_lcore.c
index 3167e9d79..7f4a4ee8d 100644
--- a/lib/librte_eal/common/eal_common_lcore.c
+++ b/lib/librte_eal/common/eal_common_lcore.c
@@ -58,13 +58,4 @@ rte_eal_cpu_init(void)
 		/* find socket first */
 		socket_id = eal_cpu_socket_id(lcore_id);
-		if (socket_id >= RTE_MAX_NUMA_NODES) {
-#ifdef RTE_EAL_ALLOW_INV_SOCKET_ID
-			socket_id = 0;
-#else
-			RTE_LOG(ERR, EAL, "Socket ID (%u) is greater than RTE_MAX_NUMA_NODES (%d)\n",
-					socket_id, RTE_MAX_NUMA_NODES);
-			return -1;
-#endif
-		}
 		lcore_to_socket_id[lcore_id] = socket_id;
 
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-03 17:29:54.441938652 +0000
+++ 0046-eal-remove-dead-code-on-NUMA-node-detection.patch	2019-12-03 17:29:51.770749537 +0000
@@ -1 +1 @@
-From 8e35792c5325f9fd2cb7cfab507aa23fc956ced7 Mon Sep 17 00:00:00 2001
+From 883ce8ee6b55e4452313dc32bbc1fe6bb120e99d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8e35792c5325f9fd2cb7cfab507aa23fc956ced7 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
-index 232315920..ef4c1c4aa 100644
+index d12ae98bc..6bce2c97f 100644
@@ -30 +31 @@
-@@ -103,5 +103,4 @@ CONFIG_RTE_LOG_HISTORY=256
+@@ -89,5 +89,4 @@ CONFIG_RTE_LOG_HISTORY=256
@@ -37 +38 @@
-index acacba704..6a6ab503e 100644
+index e92be6c47..d76776137 100644
@@ -40,2 +41,2 @@
-@@ -181,5 +181,4 @@ dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes'))
- dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports'))
+@@ -113,5 +113,4 @@ dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores'))
+ dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes'))
@@ -47 +48 @@
-index 38af2605e..59a2fd14d 100644
+index 3167e9d79..7f4a4ee8d 100644
@@ -50 +51 @@
-@@ -90,13 +90,4 @@ rte_eal_cpu_init(void)
+@@ -58,13 +58,4 @@ rte_eal_cpu_init(void)