[dpdk-stable] patch 'mem: ease init in a docker container' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/26/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/f81c31bcea0b4806284a65a325ca4c268276bdd8

Thanks.

Kevin Traynor

---
>From f81c31bcea0b4806284a65a325ca4c268276bdd8 Mon Sep 17 00:00:00 2001
From: Nicolas Dichtel <nicolas.dichtel at 6wind.com>
Date: Thu, 23 May 2019 11:52:31 +0200
Subject: [PATCH] mem: ease init in a docker container

[ upstream commit 2a96c88be83e3101c3915c2af8c03158aeb605a7 ]

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).

Fixes: 582bed1e1d1d ("mem: support mapping hugepages at runtime")

Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com>
Reviewed-by: Olivier Matz <olivier.matz at 6wind.com>
Reviewed-by: Didier Pallard <didier.pallard at 6wind.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 lib/librte_eal/linuxapp/eal/eal_memalloc.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_memalloc.c b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
index 81b441a96..f85c1f398 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
@@ -733,7 +733,11 @@ 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",
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-06-21 17:22:12.996968243 +0100
+++ 0024-mem-ease-init-in-a-docker-container.patch	2019-06-21 17:22:11.735518853 +0100
@@ -1 +1 @@
-From 2a96c88be83e3101c3915c2af8c03158aeb605a7 Mon Sep 17 00:00:00 2001
+From f81c31bcea0b4806284a65a325ca4c268276bdd8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2a96c88be83e3101c3915c2af8c03158aeb605a7 ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
- lib/librte_eal/linux/eal/eal_memalloc.c | 10 +++++++---
+ lib/librte_eal/linuxapp/eal/eal_memalloc.c | 10 +++++++---
@@ -27,5 +28,5 @@
-diff --git a/lib/librte_eal/linux/eal/eal_memalloc.c b/lib/librte_eal/linux/eal/eal_memalloc.c
-index b1849a28a..2019636fb 100644
---- a/lib/librte_eal/linux/eal/eal_memalloc.c
-+++ b/lib/librte_eal/linux/eal/eal_memalloc.c
-@@ -600,7 +600,11 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
+diff --git a/lib/librte_eal/linuxapp/eal/eal_memalloc.c b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+index 81b441a96..f85c1f398 100644
+--- a/lib/librte_eal/linuxapp/eal/eal_memalloc.c
++++ b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+@@ -733,7 +733,11 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,