linux-cp: populate mapping vif-sw_if_index only for default-ns

[vpp.git] / src / svm / ssvm.c

diff --git a/src/svm/ssvm.c b/src/svm/ssvm.c
index cfdb796..bf0a136 100644 (file)
--- a/src/svm/ssvm.c
+++ b/src/svm/ssvm.c
@@ -95,7 +95,7 @@ ssvm_server_init_shm (ssvm_private_t * ssvm)
 
   close (ssvm_fd);
 
-  CLIB_MEM_UNPOISON (sh, sizeof (*sh));
+  clib_mem_unpoison (sh, sizeof (*sh));
   sh->server_pid = ssvm->my_pid;
   sh->ssvm_size = ssvm->ssvm_size;
   sh->ssvm_va = pointer_to_uword (sh);
@@ -183,6 +183,7 @@ re_map_it:
       return SSVM_API_ERROR_MMAP;
     }
   sh->client_pid = getpid ();
+  close (ssvm_fd);
   return 0;
 }
 
@@ -226,8 +227,12 @@ ssvm_server_init_memfd (ssvm_private_t * memfd)
 
   ASSERT (vec_c_string_is_terminated (memfd->name));
 
-  memfd->fd = clib_mem_vm_create_fd (CLIB_MEM_PAGE_SZ_DEFAULT,
-                                    (char *) memfd->name);
+  if (memfd->huge_page)
+    memfd->fd = clib_mem_vm_create_fd (CLIB_MEM_PAGE_SZ_DEFAULT_HUGE,
+                                      (char *) memfd->name);
+  else
+    memfd->fd =
+      clib_mem_vm_create_fd (CLIB_MEM_PAGE_SZ_DEFAULT, (char *) memfd->name);
 
   if (memfd->fd == CLIB_MEM_ERROR)
     {
@@ -269,7 +274,7 @@ ssvm_server_init_memfd (ssvm_private_t * memfd)
   sh->ssvm_va = pointer_to_uword (sh);
   sh->type = SSVM_SEGMENT_MEMFD;
 
-  page_size = 1ULL << log2_page_size;
+  page_size = clib_mem_get_page_size ();
   sh->heap = clib_mem_create_heap (((u8 *) sh) + page_size,
                                   memfd->ssvm_size - page_size,
                                   1 /* locked */ , "ssvm server memfd");
@@ -304,9 +309,6 @@ ssvm_client_init_memfd (ssvm_private_t * memfd)
       return SSVM_API_ERROR_MMAP;
     }
 
-  if (memfd->requested_va)
-    mmap_flags |= MAP_FIXED;
-
   /*
    * Map the segment once, to look at the shared header
    */
@@ -324,6 +326,9 @@ ssvm_client_init_memfd (ssvm_private_t * memfd)
   memfd->ssvm_size = sh->ssvm_size;
   munmap (sh, page_size);
 
+  if (memfd->requested_va)
+    mmap_flags |= MAP_FIXED;
+
   /*
    * Remap the segment at the 'right' address
    */
@@ -404,7 +409,7 @@ ssvm_server_init_private (ssvm_private_t * ssvm)
   clib_memset (sh, 0, sizeof (*sh));
   sh->heap = heap;
   sh->ssvm_size = rnd_size;
-  sh->ssvm_va = pointer_to_uword (heap);
+  sh->ssvm_va = pointer_to_uword (sh);
   sh->type = SSVM_SEGMENT_PRIVATE;
 
   oldheap = ssvm_push_heap (sh);