DPDK patches and discussions
 help / color / mirror / Atom feed
* [dpdk-dev] [PATCH] eal/bsd: fix core detection
@ 2014-10-08  8:43 David Marchand
  2014-10-08  9:20 ` Bruce Richardson
  2014-10-08 10:53 ` Neil Horman
  0 siblings, 2 replies; 7+ messages in thread
From: David Marchand @ 2014-10-08  8:43 UTC (permalink / raw)
  To: dev

Following "options parsing" patchset (commit d7cb626f and 489a9d6c), core
detection is not working correctly on bsd.

./x86_64-native-bsdapp-gcc/app/test -c f -n 4 -- -i
[...]
EAL: lcore 0 unavailable
EAL: invalid coremask

Align bsd to linux:
- commit f563a372 "eal: fix recording of detected/enabled logical cores"
- commit 4f04db8b "eal: check coremask against detected lcores"

Reported-by: Zhan, Zhaochen <zhaochen.zhan@intel.com>
Signed-off-by: David Marchand <david.marchand@6wind.com>
---
 lib/librte_eal/bsdapp/eal/eal.c       |    6 +++---
 lib/librte_eal/bsdapp/eal/eal_lcore.c |   15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index c40a59a..ca99cb9 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -517,6 +517,9 @@ rte_eal_init(int argc, char **argv)
 	if (rte_eal_log_early_init() < 0)
 		rte_panic("Cannot init early logs\n");
 
+	if (rte_eal_cpu_init() < 0)
+		rte_panic("Cannot detect lcores\n");
+
 	fctret = eal_parse_args(argc, argv);
 	if (fctret < 0)
 		exit(1);
@@ -551,9 +554,6 @@ rte_eal_init(int argc, char **argv)
 
 	rte_config_init();
 
-	if (rte_eal_cpu_init() < 0)
-		rte_panic("Cannot detect lcores\n");
-
 	if (rte_eal_memory_init() < 0)
 		rte_panic("Cannot init memory\n");
 
diff --git a/lib/librte_eal/bsdapp/eal/eal_lcore.c b/lib/librte_eal/bsdapp/eal/eal_lcore.c
index 43a5c01..5b52eba 100644
--- a/lib/librte_eal/bsdapp/eal/eal_lcore.c
+++ b/lib/librte_eal/bsdapp/eal/eal_lcore.c
@@ -71,16 +71,18 @@ rte_eal_cpu_init(void)
 	unsigned count = 0;
 
 	const unsigned ncpus = get_ncpus();
-
-	/* disable lcores that were not detected */
-	RTE_LCORE_FOREACH(lcore_id) {
-
+	/*
+	 * Parse the maximum set of logical cores, detect the subset of running
+	 * ones and enable them by default.
+	 */
+	for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
 		lcore_config[lcore_id].detected = (lcore_id < ncpus);
 		if (lcore_config[lcore_id].detected == 0) {
 			config->lcore_role[lcore_id] = ROLE_OFF;
 			continue;
 		}
-		count++;
+		/* By default, each detected core is enabled */
+		config->lcore_role[lcore_id] = ROLE_RTE;
 		lcore_config[lcore_id].core_id = cpu_core_id(lcore_id);
 		lcore_config[lcore_id].socket_id = cpu_socket_id(lcore_id);
 		if (lcore_config[lcore_id].socket_id >= RTE_MAX_NUMA_NODES)
@@ -93,8 +95,9 @@ rte_eal_cpu_init(void)
 #endif
 		RTE_LOG(DEBUG, EAL, "Detected lcore %u\n",
 				lcore_id);
+		count ++;
 	}
-
+	/* Set the count of enabled logical cores of the EAL configuration */
 	config->lcore_count = count;
 	RTE_LOG(DEBUG, EAL, "Support maximum %u logical core(s) by configuration.\n",
 		RTE_MAX_LCORE);
-- 
1.7.10.4

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2014-10-09 18:18 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-08  8:43 [dpdk-dev] [PATCH] eal/bsd: fix core detection David Marchand
2014-10-08  9:20 ` Bruce Richardson
2014-10-08 10:10   ` Zhan, Zhaochen
2014-10-09 18:24     ` Thomas Monjalon
2014-10-08 10:53 ` Neil Horman
2014-10-08 11:23   ` David Marchand
2014-10-08 19:17     ` Neil Horman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).