9d4efc5cc6
The method to fetch, sort and read the last entry of a list to figure
out the total number of NUMA nodes in the system fails with 10 or more
nodes. The reason being the usage of string compare while sorting, hence
node 'node10' will be sorted before 'node2'.
Solve this by sorting the list based on integer comparison of the
numerical part of the node name.
Before this change on a system with 16 NUMA nodes,
EAL: Detected CPU lcores: 128
EAL: Detected NUMA nodes: 10
EAL: Static memory layout is selected, amount of reserved memory can
be adjusted with -m or --socket-mem
EAL: Detected static linkage of DPDK
EAL: Multi-process socket /var/run/dpdk/rte/mp_socket
EAL: Selected IOVA mode 'VA'
EAL: VFIO support initialized
With this change on the same system,
EAL: Detected CPU lcores: 128
EAL: Detected NUMA nodes: 16
EAL: Static memory layout is selected, amount of reserved memory can
be adjusted with -m or --socket-mem
EAL: Detected static linkage of DPDK
EAL: Multi-process socket /var/run/dpdk/rte/mp_socket
EAL: Selected IOVA mode 'VA'
EAL: VFIO support initialized
Fixes: 8ef09fdc506b ("build: add optional NUMA and CPU counts detection")
Cc: stable@dpdk.org
Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
26 lines
718 B
Python
26 lines
718 B
Python
#!/usr/bin/env python3
|
|
# SPDX-License-Identifier: BSD-3-Clause
|
|
# Copyright (c) 2021 PANTHEON.tech s.r.o.
|
|
|
|
import ctypes
|
|
import glob
|
|
import os
|
|
import subprocess
|
|
import re
|
|
|
|
if os.name == 'posix':
|
|
if os.path.isdir('/sys/devices/system/node'):
|
|
numa_nodes = glob.glob('/sys/devices/system/node/node*')
|
|
numa_nodes.sort(key=lambda l: int(re.findall('\d+', l)[0]))
|
|
print(int(os.path.basename(numa_nodes[-1])[4:]) + 1)
|
|
else:
|
|
subprocess.run(['sysctl', '-n', 'vm.ndomains'], check=False)
|
|
|
|
elif os.name == 'nt':
|
|
libkernel32 = ctypes.windll.kernel32
|
|
|
|
numa_count = ctypes.c_ulong()
|
|
|
|
libkernel32.GetNumaHighestNodeNumber(ctypes.pointer(numa_count))
|
|
print(numa_count.value + 1)
|