d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mem: fix allocation failure on non-NUMA kernel

Browse Source 
Running dpdk-helloworld on Linux with lib numa present, but no kernel
support for NUMA (CONFIG_NUMA=n) causes rte_service_init() to fail with
EAL: error allocating rte services array.

alloc_seg() calls get_mempolicy to verify that the allocation
has happened on the correct socket, but receives ENOSYS from
the kernel and fails the allocation.

The allocated socket should only be verified if check_numa() is true.

Fixes: 2a96c88be8 ("mem: ease init in a docker container")
Cc: stable@dpdk.org

Signed-off-by: Nick Connolly <nick.connolly@mayadata.io>
Reviewed-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
This commit is contained in:
Nick Connolly 2020-10-12 20:28:03 +01:00 committed by David Marchand
parent 7cf3d07c3a
commit 9d42642e86
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/librte_eal/linux/eal_memalloc.c
View File

@ -625,17 +625,25 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
}
#ifdef RTE_EAL_NUMA_AWARE_HUGEPAGES
ret = get_mempolicy(&cur_socket_id, NULL, 0, addr,
MPOL_F_NODE | MPOL_F_ADDR);
if (ret < 0) {
RTE_LOG(DEBUG, EAL, "%s(): get_mempolicy: %s\n",
__func__, strerror(errno));
goto mapped;
} else if (cur_socket_id != socket_id) {
RTE_LOG(DEBUG, EAL,
"%s(): allocation happened on wrong socket (wanted %d, got %d)\n",
__func__, socket_id, cur_socket_id);
goto mapped;
/*
* If the kernel has been built without NUMA support, get_mempolicy()
* will return an error. If check_numa() returns false, memory
* allocation is not NUMA aware and the socket_id should not be
* checked.
*/
if (check_numa()) {
ret = get_mempolicy(&cur_socket_id, NULL, 0, addr,
MPOL_F_NODE | MPOL_F_ADDR);
if (ret < 0) {
RTE_LOG(DEBUG, EAL, "%s(): get_mempolicy: %s\n",
__func__, strerror(errno));
goto mapped;
} else if (cur_socket_id != socket_id) {
RTE_LOG(DEBUG, EAL,
"%s(): allocation happened on wrong socket (wanted %d, got %d)\n",
__func__, socket_id, cur_socket_id);
goto mapped;
}
}
#else
if (rte_socket_count() > 1)