summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoît Ganne <bganne@cisco.com>2020-09-15 10:45:55 +0200
committerDamjan Marion <dmarion@me.com>2020-09-16 17:38:42 +0000
commit33ce5e568f8b4fb1254bf5ee32865e9443c0185a (patch)
tree16b733584eccfa84db8c143a46d65b8c7e3e663e
parent007abe751f2ee86528d0ccc005a3da1c90850868 (diff)
vpp: fix main heap init
NUMA node parsing with vlib_get_thread_core_numa() can failed on single socket systems. Use clib_get_current_numa_node() instead as we already pinned the main thread to the requested core. Type: fix Change-Id: I22339516d0305689a58584c92ded7c96eb53be39 Signed-off-by: Benoît Ganne <bganne@cisco.com>
-rw-r--r--src/vpp/vnet/main.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c
index 00cb4ad385a..7d87d0cd3b1 100644
--- a/src/vpp/vnet/main.c
+++ b/src/vpp/vnet/main.c
@@ -282,11 +282,8 @@ defaulted:
/* Allocate main heap */
if ((main_heap = clib_mem_init_thread_safe (0, main_heap_size)))
{
- vlib_worker_thread_t tmp;
-
/* Figure out which numa runs the main thread */
- vlib_get_thread_core_numa (&tmp, main_core);
- __os_numa_index = tmp.numa_id;
+ __os_numa_index = clib_get_current_numa_node ();
/* and use the main heap as that numa's numa heap */
clib_mem_set_per_numa_heap (main_heap);