X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fsvm%2Fssvm.c;h=0305278a6b6e439a65142e779601ee1a1b6687d8;hb=2c8e0023f91882e53f06eb99c901b97fe013f981;hp=9b935e4a3bd5d137f169c29879cecdad6222454b;hpb=4d9b9d8e74f12a26404ccdd8baf46c61b44584db;p=vpp.git

diff --git a/src/svm/ssvm.c b/src/svm/ssvm.c
index 9b935e4a3bd..0305278a6b6 100644
--- a/src/svm/ssvm.c
+++ b/src/svm/ssvm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Copyright (c) 2015-2019 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -15,17 +15,24 @@
 #include <svm/ssvm.h>
 #include <svm/svm_common.h>
 
+typedef int (*init_fn) (ssvm_private_t *);
+typedef void (*delete_fn) (ssvm_private_t *);
+
+static init_fn master_init_fns[SSVM_N_SEGMENT_TYPES] =
+  { ssvm_master_init_shm, ssvm_master_init_memfd, ssvm_master_init_private };
+static init_fn slave_init_fns[SSVM_N_SEGMENT_TYPES] =
+  { ssvm_slave_init_shm, ssvm_slave_init_memfd, ssvm_slave_init_private };
+static delete_fn delete_fns[SSVM_N_SEGMENT_TYPES] =
+  { ssvm_delete_shm, ssvm_delete_memfd, ssvm_delete_private };
+
 int
-ssvm_master_init (ssvm_private_t * ssvm, u32 master_index)
+ssvm_master_init_shm (ssvm_private_t * ssvm)
 {
-  svm_main_region_t *smr = svm_get_root_rp ()->data_base;
   int ssvm_fd;
-  u8 *ssvm_filename;
-  u8 junk = 0;
-  int flags;
+  clib_mem_vm_map_t mapa = { 0 };
+  u8 junk = 0, *ssvm_filename;
   ssvm_shared_header_t *sh;
-  u64 ticks = clib_cpu_time_now ();
-  u64 randomize_baseva;
+  uword page_size, requested_va = 0;
   void *oldheap;
 
   if (ssvm->ssvm_size == 0)
@@ -36,13 +43,10 @@ ssvm_master_init (ssvm_private_t * ssvm, u32 master_index)
 
   ASSERT (vec_c_string_is_terminated (ssvm->name));
   ssvm_filename = format (0, "/dev/shm/%s%c", ssvm->name, 0);
-
   unlink ((char *) ssvm_filename);
-
   vec_free (ssvm_filename);
 
   ssvm_fd = shm_open ((char *) ssvm->name, O_RDWR | O_CREAT | O_EXCL, 0777);
-
   if (ssvm_fd < 0)
     {
       clib_unix_warning ("create segment '%s'", ssvm->name);
@@ -51,8 +55,13 @@ ssvm_master_init (ssvm_private_t * ssvm, u32 master_index)
 
   if (fchmod (ssvm_fd, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP) < 0)
     clib_unix_warning ("ssvm segment chmod");
-  if (fchown (ssvm_fd, smr->uid, smr->gid) < 0)
-    clib_unix_warning ("ssvm segment chown");
+  if (svm_get_root_rp ())
+    {
+      /* TODO: is this really needed? */
+      svm_main_region_t *smr = svm_get_root_rp ()->data_base;
+      if (fchown (ssvm_fd, smr->uid, smr->gid) < 0)
+	clib_unix_warning ("ssvm segment chown");
+    }
 
   if (lseek (ssvm_fd, ssvm->ssvm_size, SEEK_SET) < 0)
     {
@@ -68,43 +77,41 @@ ssvm_master_init (ssvm_private_t * ssvm, u32 master_index)
       return SSVM_API_ERROR_SET_SIZE;
     }
 
-  flags = MAP_SHARED;
+  page_size = clib_mem_get_fd_page_size (ssvm_fd);
   if (ssvm->requested_va)
-    flags |= MAP_FIXED;
-
-  randomize_baseva = (ticks & 15) * MMAP_PAGESIZE;
-
-  if (ssvm->requested_va)
-    ssvm->requested_va += randomize_baseva;
-
-  sh = ssvm->sh =
-    (ssvm_shared_header_t *) mmap ((void *) ssvm->requested_va,
-				   ssvm->ssvm_size, PROT_READ | PROT_WRITE,
-				   flags, ssvm_fd, 0);
+    {
+      requested_va = ssvm->requested_va;
+      clib_mem_vm_randomize_va (&requested_va, min_log2 (page_size));
+    }
 
-  if (ssvm->sh == MAP_FAILED)
+  mapa.requested_va = requested_va;
+  mapa.size = ssvm->ssvm_size;
+  mapa.fd = ssvm_fd;
+  mapa.numa_node = ssvm->numa;
+  if (clib_mem_vm_ext_map (&mapa))
     {
       clib_unix_warning ("mmap");
       close (ssvm_fd);
       return SSVM_API_ERROR_MMAP;
     }
-
   close (ssvm_fd);
 
-  ssvm->my_pid = getpid ();
+  sh = mapa.addr;
   sh->master_pid = ssvm->my_pid;
   sh->ssvm_size = ssvm->ssvm_size;
-  sh->heap = mheap_alloc_with_flags
-    (((u8 *) sh) + MMAP_PAGESIZE, ssvm->ssvm_size - MMAP_PAGESIZE,
-     MHEAP_FLAG_DISABLE_VM | MHEAP_FLAG_THREAD_SAFE);
-
   sh->ssvm_va = pointer_to_uword (sh);
-  sh->master_index = master_index;
+  sh->type = SSVM_SEGMENT_SHM;
+  sh->heap = create_mspace_with_base (((u8 *) sh) + page_size,
+				      ssvm->ssvm_size - page_size,
+				      1 /* locked */ );
+  mspace_disable_expand (sh->heap);
 
   oldheap = ssvm_push_heap (sh);
-  sh->name = format (0, "%s%c", ssvm->name, 0);
+  sh->name = format (0, "%s", ssvm->name, 0);
   ssvm_pop_heap (oldheap);
 
+  ssvm->sh = sh;
+  ssvm->my_pid = getpid ();
   ssvm->i_am_master = 1;
 
   /* The application has to set set sh->ready... */
@@ -112,7 +119,7 @@ ssvm_master_init (ssvm_private_t * ssvm, u32 master_index)
 }
 
 int
-ssvm_slave_init (ssvm_private_t * ssvm, int timeout_in_seconds)
+ssvm_slave_init_shm (ssvm_private_t * ssvm)
 {
   struct stat stat;
   int ssvm_fd = -1;
@@ -121,7 +128,7 @@ ssvm_slave_init (ssvm_private_t * ssvm, int timeout_in_seconds)
   ASSERT (vec_c_string_is_terminated (ssvm->name));
   ssvm->i_am_master = 0;
 
-  while (timeout_in_seconds-- > 0)
+  while (ssvm->attach_timeout-- > 0)
     {
       if (ssvm_fd < 0)
 	ssvm_fd = shm_open ((char *) ssvm->name, O_RDWR, 0777);
@@ -152,7 +159,7 @@ map_it:
       return SSVM_API_ERROR_MMAP;
     }
 
-  while (timeout_in_seconds-- > 0)
+  while (ssvm->attach_timeout-- > 0)
     {
       if (sh->ready)
 	goto re_map_it;
@@ -163,7 +170,7 @@ map_it:
   return SSVM_API_ERROR_SLAVE_TIMEOUT;
 
 re_map_it:
-  ssvm->requested_va = (u64) sh->ssvm_va;
+  ssvm->requested_va = sh->ssvm_va;
   ssvm->ssvm_size = sh->ssvm_size;
   munmap (sh, MMAP_PAGESIZE);
 
@@ -182,7 +189,7 @@ re_map_it:
 }
 
 void
-ssvm_delete (ssvm_private_t * ssvm)
+ssvm_delete_shm (ssvm_private_t * ssvm)
 {
   u8 *fn;
 
@@ -199,123 +206,240 @@ ssvm_delete (ssvm_private_t * ssvm)
   vec_free (fn);
   vec_free (ssvm->name);
 
-  munmap ((void *) ssvm->requested_va, ssvm->ssvm_size);
+  munmap ((void *) ssvm->sh, ssvm->ssvm_size);
 }
 
+/**
+ * Initialize memfd segment master
+ */
 int
-ssvm_master_init_memfd (ssvm_private_t * memfd, u32 master_index)
+ssvm_master_init_memfd (ssvm_private_t * memfd)
 {
-  int flags;
+  uword page_size;
   ssvm_shared_header_t *sh;
-  u64 ticks = clib_cpu_time_now ();
-  u64 randomize_baseva;
   void *oldheap;
+  clib_mem_vm_alloc_t alloc = { 0 };
+  clib_error_t *err;
 
   if (memfd->ssvm_size == 0)
     return SSVM_API_ERROR_NO_SIZE;
 
   ASSERT (vec_c_string_is_terminated (memfd->name));
-  memfd->name = format (0, "memfd svm region %d", master_index);
 
-  memfd->fd = memfd_create ((char *) memfd->name, MFD_ALLOW_SEALING);
-  if (memfd->fd < 0)
+  alloc.name = (char *) memfd->name;
+  alloc.size = memfd->ssvm_size;
+  alloc.flags = CLIB_MEM_VM_F_SHARED;
+  alloc.requested_va = memfd->requested_va;
+  if (memfd->numa)
     {
-      clib_unix_warning ("create segment '%s'", memfd->name);
-      return SSVM_API_ERROR_CREATE_FAILURE;
+      alloc.numa_node = memfd->numa;
+      alloc.flags |= CLIB_MEM_VM_F_NUMA_PREFER;
     }
-
-  if ((ftruncate (memfd->fd, memfd->ssvm_size)) == -1)
+  if ((err = clib_mem_vm_ext_alloc (&alloc)))
     {
-      clib_unix_warning ("set memfd size");
-      return SSVM_API_ERROR_SET_SIZE;
-    }
-
-  if ((fcntl (memfd->fd, F_ADD_SEALS, F_SEAL_SHRINK)) == -1)
-    clib_unix_warning ("fcntl (F_ADD_SEALS, F_SEAL_SHRINK)");
-
-  flags = MAP_SHARED;
-  if (memfd->requested_va)
-    flags |= MAP_FIXED;
-
-  randomize_baseva = (ticks & 15) * MMAP_PAGESIZE;
-
-  if (memfd->requested_va)
-    memfd->requested_va += randomize_baseva;
-
-  sh = memfd->sh =
-    (ssvm_shared_header_t *) mmap ((void *) memfd->requested_va,
-				   memfd->ssvm_size, PROT_READ | PROT_WRITE,
-				   flags, memfd->fd, 0);
-
-  if (memfd->sh == MAP_FAILED)
-    {
-      clib_unix_warning ("mmap");
-      close (memfd->fd);
-      return SSVM_API_ERROR_MMAP;
+      clib_error_report (err);
+      return SSVM_API_ERROR_CREATE_FAILURE;
     }
 
+  memfd->fd = alloc.fd;
+  memfd->sh = (ssvm_shared_header_t *) alloc.addr;
   memfd->my_pid = getpid ();
+  memfd->i_am_master = 1;
+
+  page_size = 1ull << alloc.log2_page_size;
+  sh = memfd->sh;
   sh->master_pid = memfd->my_pid;
   sh->ssvm_size = memfd->ssvm_size;
-  sh->heap = mheap_alloc_with_flags
-    (((u8 *) sh) + MMAP_PAGESIZE, memfd->ssvm_size - MMAP_PAGESIZE,
-     MHEAP_FLAG_DISABLE_VM | MHEAP_FLAG_THREAD_SAFE);
-
   sh->ssvm_va = pointer_to_uword (sh);
-  sh->master_index = master_index;
+  sh->type = SSVM_SEGMENT_MEMFD;
 
+  sh->heap = create_mspace_with_base (((u8 *) sh) + page_size,
+				      memfd->ssvm_size - page_size,
+				      1 /* locked */ );
+  mspace_disable_expand (sh->heap);
   oldheap = ssvm_push_heap (sh);
-  sh->name = format (0, "%s%c", memfd->name, 0);
+  sh->name = format (0, "%s", memfd->name, 0);
   ssvm_pop_heap (oldheap);
 
-  memfd->i_am_master = 1;
-
   /* The application has to set set sh->ready... */
   return 0;
 }
 
-/*
- * Subtly different than svm_slave_init. The caller
- * needs to acquire a usable file descriptor for the memfd segment
- * e.g. via vppinfra/socket.c:default_socket_recvmsg
+/**
+ * Initialize memfd segment slave
+ *
+ * Subtly different than svm_slave_init. The caller needs to acquire
+ * a usable file descriptor for the memfd segment e.g. via
+ * vppinfra/socket.c:default_socket_recvmsg
  */
-
 int
 ssvm_slave_init_memfd (ssvm_private_t * memfd)
 {
+  clib_mem_vm_map_t mapa = { 0 };
   ssvm_shared_header_t *sh;
+  uword page_size;
 
   memfd->i_am_master = 0;
 
-  /* Map the segment once, to look at the shared header */
-  sh = (void *) mmap (0, MMAP_PAGESIZE, PROT_READ | PROT_WRITE, MAP_SHARED,
-		      memfd->fd, 0);
-  if (sh == MAP_FAILED)
+  page_size = clib_mem_get_fd_page_size (memfd->fd);
+  if (!page_size)
     {
-      clib_unix_warning ("slave research mmap");
-      close (memfd->fd);
+      clib_unix_warning ("page size unknown");
       return SSVM_API_ERROR_MMAP;
     }
 
-  memfd->requested_va = (u64) sh->ssvm_va;
-  memfd->ssvm_size = sh->ssvm_size;
-  munmap (sh, MMAP_PAGESIZE);
+  /*
+   * Map the segment once, to look at the shared header
+   */
+  mapa.fd = memfd->fd;
+  mapa.size = page_size;
 
-  sh = (void *) mmap ((void *) memfd->requested_va, memfd->ssvm_size,
-		      PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED,
-		      memfd->fd, 0);
+  if (clib_mem_vm_ext_map (&mapa))
+    {
+      clib_unix_warning ("slave research mmap (fd %d)", mapa.fd);
+      close (memfd->fd);
+      return SSVM_API_ERROR_MMAP;
+    }
 
-  if (sh == MAP_FAILED)
+  sh = mapa.addr;
+  memfd->requested_va = sh->ssvm_va;
+  memfd->ssvm_size = sh->ssvm_size;
+  clib_mem_vm_free (sh, page_size);
+
+  /*
+   * Remap the segment at the 'right' address
+   */
+  mapa.requested_va = memfd->requested_va;
+  mapa.size = memfd->ssvm_size;
+  if (clib_mem_vm_ext_map (&mapa))
     {
       clib_unix_warning ("slave final mmap");
       close (memfd->fd);
       return SSVM_API_ERROR_MMAP;
     }
+
+  sh = mapa.addr;
   sh->slave_pid = getpid ();
   memfd->sh = sh;
   return 0;
 }
 
+void
+ssvm_delete_memfd (ssvm_private_t * memfd)
+{
+  vec_free (memfd->name);
+  clib_mem_vm_free (memfd->sh, memfd->ssvm_size);
+  close (memfd->fd);
+}
+
+/**
+ * Initialize segment in a private heap
+ */
+int
+ssvm_master_init_private (ssvm_private_t * ssvm)
+{
+  uword pagesize = clib_mem_get_page_size (), rnd_size = 0;
+  clib_mem_vm_alloc_t alloc = { 0 };
+  struct dlmallinfo dlminfo;
+  ssvm_shared_header_t *sh;
+  clib_error_t *err;
+  u8 *heap;
+
+  rnd_size = clib_max (ssvm->ssvm_size + (pagesize - 1), ssvm->ssvm_size);
+  rnd_size &= ~(pagesize - 1);
+
+  alloc.name = (char *) ssvm->name;
+  alloc.size = rnd_size + pagesize;
+  if (ssvm->numa)
+    {
+      alloc.numa_node = ssvm->numa;
+      alloc.flags |= CLIB_MEM_VM_F_NUMA_PREFER;
+    }
+
+  if ((err = clib_mem_vm_ext_alloc (&alloc)))
+    {
+      clib_error_report (err);
+      return SSVM_API_ERROR_CREATE_FAILURE;
+    }
+
+  heap = create_mspace_with_base ((u8 *) alloc.addr + pagesize, rnd_size,
+				  1 /* locked */ );
+  if (heap == 0)
+    {
+      clib_unix_warning ("mheap alloc");
+      return -1;
+    }
+
+  mspace_disable_expand (heap);
+
+  /* Find actual size because mspace size is rounded up by dlmalloc */
+  dlminfo = mspace_mallinfo (heap);
+  rnd_size = dlminfo.fordblks;
+
+  ssvm->ssvm_size = rnd_size;
+  ssvm->i_am_master = 1;
+  ssvm->my_pid = getpid ();
+  ssvm->requested_va = ~0;
+
+  /* First page in allocated memory is set aside for the shared header */
+  sh = alloc.addr;
+  ssvm->sh = sh;
+
+  clib_memset (sh, 0, sizeof (*sh));
+  sh->heap = heap;
+  sh->ssvm_size = rnd_size;
+  sh->ssvm_va = pointer_to_uword (heap);
+  sh->type = SSVM_SEGMENT_PRIVATE;
+  sh->name = ssvm->name;
+
+  return 0;
+}
+
+int
+ssvm_slave_init_private (ssvm_private_t * ssvm)
+{
+  clib_warning ("BUG: this should not be called!");
+  return -1;
+}
+
+void
+ssvm_delete_private (ssvm_private_t * ssvm)
+{
+  vec_free (ssvm->name);
+  destroy_mspace (ssvm->sh->heap);
+  clib_mem_vm_free (ssvm->sh, ssvm->ssvm_size + clib_mem_get_page_size ());
+}
+
+int
+ssvm_master_init (ssvm_private_t * ssvm, ssvm_segment_type_t type)
+{
+  return (master_init_fns[type]) (ssvm);
+}
+
+int
+ssvm_slave_init (ssvm_private_t * ssvm, ssvm_segment_type_t type)
+{
+  return (slave_init_fns[type]) (ssvm);
+}
+
+void
+ssvm_delete (ssvm_private_t * ssvm)
+{
+  delete_fns[ssvm->sh->type] (ssvm);
+}
+
+ssvm_segment_type_t
+ssvm_type (const ssvm_private_t * ssvm)
+{
+  return ssvm->sh->type;
+}
+
+u8 *
+ssvm_name (const ssvm_private_t * ssvm)
+{
+  return ssvm->sh->name;
+}
+
 /*
  * fd.io coding-style-patch-verification: ON
  *