commit 7b185360843c2b1cbcbeede64340add8a56fe440
author Damjan Marion <damarion@cisco.com> Sun Mar 04 16:41:35 2018 +0100
committer Florin Coras <florin.coras@gmail.com> Sun Mar 04 17:58:02 2018 +0000
tree 1d1920fe15491747e00d9cc6536f1ca79a411645
parent 30787378f49714319e75437b347b7027a949700d

vppinfra: fix clib_mem_vm_ext_alloc non-shared allocations

Change-Id: I6d049c0875b91f67f008dc04ae7efe2f8ddc276e
Signed-off-by: Damjan Marion <damarion@cisco.com>

src/vppinfra/linux/mem.c

diff --git a/src/vppinfra/linux/mem.c b/src/vppinfra/linux/mem.c
index c4973a6..75d2a7e 100644
--- a/src/vppinfra/linux/mem.c
+++ b/src/vppinfra/linux/mem.c
@@ -83,7 +83,7 @@
   clib_error_t *err = 0;
   void *addr = 0;
   u8 *filename = 0;
-  int mmap_flags = MAP_SHARED;
+  int mmap_flags = 0;
   int log2_page_size;
   int n_pages;
   int old_mpol = -1;
@@ -108,9 +108,13 @@
 	}
     }
 
+  if (a->flags & CLIB_MEM_VM_F_LOCKED)
+    mmap_flags |= MAP_LOCKED;
+
   /* if we are creating shared segment, we need file descriptor */
   if (a->flags & CLIB_MEM_VM_F_SHARED)
     {
+      mmap_flags |= MAP_SHARED;
       /* if hugepages are needed we need to create mount point */
       if (a->flags & CLIB_MEM_VM_F_HUGETLB)
 	{
@@ -169,14 +173,14 @@
     }
   else				/* not CLIB_MEM_VM_F_SHARED */
     {
+      mmap_flags |= MAP_PRIVATE | MAP_ANONYMOUS;
       if (a->flags & CLIB_MEM_VM_F_HUGETLB)
 	{
-	  mmap_flags |= MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS;
+	  mmap_flags |= MAP_HUGETLB;
 	  log2_page_size = 21;
 	}
       else
 	{
-	  mmap_flags |= MAP_PRIVATE | MAP_ANONYMOUS;
 	  log2_page_size = min_log2 (sysconf (_SC_PAGESIZE));
 	}
     }