summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-04-18 09:21:24 +0200
committerNeale Ranns <nranns@cisco.com>2018-04-18 10:56:26 +0000
commit915e3f189a06580e2a0cc529138232d7ce9b378f (patch)
treeb491fdcd36b53ad8f5e3a14af1e6098b79ffccd3
parent63777e599af8df1e6bf8c564c638d52007af47d0 (diff)
vppinfra: make set_mempolicy failure non-critical unless NUMA_FORCE is set
Change-Id: I6c1c855cf5fc2ee06f1c7ddd6576ca16cd556fdd Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--src/vppinfra/linux/mem.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vppinfra/linux/mem.c b/src/vppinfra/linux/mem.c
index d479da3f0cb..e4740ad1d3b 100644
--- a/src/vppinfra/linux/mem.c
+++ b/src/vppinfra/linux/mem.c
@@ -213,7 +213,8 @@ clib_mem_vm_ext_alloc (clib_mem_vm_alloc_t * a)
u64 mask[16] = { 0 };
mask[0] = 1 << a->numa_node;
rv = set_mempolicy (MPOL_BIND, mask, sizeof (mask) * 8 + 1);
- if (rv)
+ if (rv == -1 && a->numa_node != 0 &&
+ (a->flags & CLIB_MEM_VM_F_NUMA_FORCE) != 0)
{
err = clib_error_return_unix (0, "set_mempolicy");
goto error;