From: Stephen Hurd <shurd@broadcom.com>
Date: Wed, 13 Jan 2016 22:23:36 +0000 (-0800)
Subject: app/testpmd: fix numa socket detection
X-Git-Tag: spdx-start~7552
X-Git-Url: http://git.droids-corp.org/?p=dpdk.git;a=commitdiff_plain;h=f54fe5ee31ac68b5f1a5d0edfadf544f89f709fe

app/testpmd: fix numa socket detection

Previously, max_socket was set to the highest numbered socket with
an enabled lcore.  The intent is to set it to the highest socket
regardless of it being enabled.

Fixes: 7acf894d07d1 ("app/testpmd: detect numa socket count")

Signed-off-by: Stephen Hurd <shurd@broadcom.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 1319917d68..269ef819be 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -354,17 +354,17 @@ set_default_fwd_lcores_config(void)
 
 	nb_lc = 0;
 	for (i = 0; i < RTE_MAX_LCORE; i++) {
-		if (! rte_lcore_is_enabled(i))
-			continue;
-		if (i == rte_get_master_lcore())
-			continue;
-		fwd_lcores_cpuids[nb_lc++] = i;
 		sock_num = rte_lcore_to_socket_id(i) + 1;
 		if (sock_num > max_socket) {
 			if (sock_num > RTE_MAX_NUMA_NODES)
 				rte_exit(EXIT_FAILURE, "Total sockets greater than %u\n", RTE_MAX_NUMA_NODES);
 			max_socket = sock_num;
 		}
+		if (!rte_lcore_is_enabled(i))
+			continue;
+		if (i == rte_get_master_lcore())
+			continue;
+		fwd_lcores_cpuids[nb_lc++] = i;
 	}
 	nb_lcores = (lcoreid_t) nb_lc;
 	nb_cfg_lcores = nb_lcores;