On Thu, May 23, 2019 at 11:53 AM Nicolas Dichtel <nicolas.dich...@6wind.com> wrote:
> move_pages() is only used to get the numa node id, but this function > is not allowed by default in docker (it needs CAP_SYS_NICE and an update of > the seccomp profile). > get_mempolicy() also requires CAP_SYS_NICE but doesn't need any change in > the default seccomp profile. > > Note that the returned value of move_pages() was not checked, thus some > errors could be hidden (if the requested id was 0). > > Cc: sta...@dpdk.org > Fixes: 582bed1e1d1d ("mem: support mapping hugepages at runtime") > Signed-off-by: Nicolas Dichtel <nicolas.dich...@6wind.com> > Reviewed-by: Olivier Matz <olivier.m...@6wind.com> > Reviewed-by: Didier Pallard <didier.pall...@6wind.com> > Acked-by: Anatoly Burakov <anatoly.bura...@intel.com> > --- > > v2: add fixes tag + cc stable > fix title prefix > > lib/librte_eal/linux/eal/eal_memalloc.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/lib/librte_eal/linux/eal/eal_memalloc.c > b/lib/librte_eal/linux/eal/eal_memalloc.c > index 1e9ebb86dd1b..438faa0ab168 100644 > --- a/lib/librte_eal/linux/eal/eal_memalloc.c > +++ b/lib/librte_eal/linux/eal/eal_memalloc.c > @@ -600,9 +600,13 @@ alloc_seg(struct rte_memseg *ms, void *addr, int > socket_id, > } > > #ifdef RTE_EAL_NUMA_AWARE_HUGEPAGES > - move_pages(getpid(), 1, &addr, NULL, &cur_socket_id, 0); > - > - if (cur_socket_id != socket_id) { > + 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); > -- > 2.21.0 > > Reviewed-by: David Marchand <david.march...@redhat.com> -- David Marchand