svm: refactor memfd and remove ssvm_eth

Change-Id: Icde296e956eb89ea3a17d547f04a833916ec6440
Signed-off-by: Florin Coras <fcoras@cisco.com>

4 files changed, 137 insertions, 336 deletions

diff --git a/src/svm/memfd.c b/src/svm/memfd.c
deleted file mode 100644
index 9fe487db788..00000000000
--- a/src/svm/memfd.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2017 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:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "memfd.h"
-
-int
-memfd_master_init (memfd_private_t * memfd, u32 master_index)
-{
-  int flags;
-  memfd_shared_header_t *sh;
-  u64 ticks = clib_cpu_time_now ();
-  u64 randomize_baseva;
-  void *oldheap;
-
-  if (memfd->memfd_size == 0)
-    return MEMFD_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)
-    {
-      clib_unix_warning ("create segment '%s'", memfd->name);
-      return MEMFD_API_ERROR_CREATE_FAILURE;
-    }
-
-  if ((ftruncate (memfd->fd, memfd->memfd_size)) == -1)
-    {
-      clib_unix_warning ("set memfd size");
-      return MEMFD_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 =
-    (memfd_shared_header_t *) mmap ((void *) memfd->requested_va,
-				    memfd->memfd_size, PROT_READ | PROT_WRITE,
-				    flags, memfd->fd, 0);
-
-  if (memfd->sh == MAP_FAILED)
-    {
-      clib_unix_warning ("mmap");
-      close (memfd->fd);
-      return MEMFD_API_ERROR_MMAP;
-    }
-
-  memfd->my_pid = getpid ();
-  sh->master_pid = memfd->my_pid;
-  sh->memfd_size = memfd->memfd_size;
-  sh->heap = mheap_alloc_with_flags
-    (((u8 *) sh) + MMAP_PAGESIZE, memfd->memfd_size - MMAP_PAGESIZE,
-     MHEAP_FLAG_DISABLE_VM | MHEAP_FLAG_THREAD_SAFE);
-
-  sh->memfd_va = pointer_to_uword (sh);
-  sh->master_index = master_index;
-
-  oldheap = memfd_push_heap (sh);
-  sh->name = format (0, "%s%c", memfd->name, 0);
-  memfd_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
- */
-
-int
-memfd_slave_init (memfd_private_t * memfd)
-{
-  memfd_shared_header_t *sh;
-
-  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)
-    {
-      clib_unix_warning ("slave research mmap");
-      close (memfd->fd);
-      return MEMFD_API_ERROR_MMAP;
-    }
-
-  memfd->requested_va = (u64) sh->memfd_va;
-  memfd->memfd_size = sh->memfd_size;
-  munmap (sh, MMAP_PAGESIZE);
-
-  sh = memfd->sh =
-    (void *) mmap ((void *) memfd->requested_va, memfd->memfd_size,
-		   PROT_READ | PROT_WRITE,
-		   MAP_SHARED | MAP_FIXED, memfd->fd, 0);
-
-  if (sh == MAP_FAILED)
-    {
-      clib_unix_warning ("slave final mmap");
-      close (memfd->fd);
-      return MEMFD_API_ERROR_MMAP;
-    }
-  sh->slave_pid = getpid ();
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/src/svm/memfd.h b/src/svm/memfd.h
deleted file mode 100644
index 3ed4a9ab067..00000000000
--- a/src/svm/memfd.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2017 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:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_memfd_h__
-#define __included_memfd_h__
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-/* DGMS, memfd syscall not in glibc... */
-#include <vppinfra/linux/syscall.h>
-
-#ifndef MMAP_PAGESIZE
-#define MMAP_PAGESIZE (clib_mem_get_page_size())
-#endif
-
-#define MEMFD_N_OPAQUE 7
-
-typedef struct
-{
-  /* Spin-lock */
-  volatile u32 lock;
-  volatile u32 owner_pid;
-  int recursion_count;
-  u32 tag;			/* for debugging */
-
-  /* The allocation arena */
-  void *heap;
-
-  /* Segment must be mapped at this address, or no supper */
-  u64 memfd_va;
-  /* The actual mmap size */
-  u64 memfd_size;
-  u32 master_pid;
-  u32 slave_pid;
-  u8 *name;
-  void *opaque[MEMFD_N_OPAQUE];
-
-  /* Set when the master application thinks it's time to make the donuts */
-  volatile u32 ready;
-
-  /* Needed to make unique MAC addresses, etc. */
-  u32 master_index;
-} memfd_shared_header_t;
-
-typedef struct
-{
-  memfd_shared_header_t *sh;
-  int fd;
-  u64 memfd_size;
-  u32 my_pid;
-  u32 vlib_hw_if_index;
-  uword requested_va;
-  int i_am_master;
-  u32 per_interface_next_index;
-  u32 *rx_queue;
-  u8 *name;
-} memfd_private_t;
-
-always_inline void
-memfd_lock (memfd_shared_header_t * h, u32 my_pid, u32 tag)
-{
-  if (h->owner_pid == my_pid)
-    {
-      h->recursion_count++;
-      return;
-    }
-
-  while (__sync_lock_test_and_set (&h->lock, 1))
-    ;
-
-  h->owner_pid = my_pid;
-  h->recursion_count = 1;
-  h->tag = tag;
-}
-
-always_inline void
-memfd_lock_non_recursive (memfd_shared_header_t * h, u32 tag)
-{
-  while (__sync_lock_test_and_set (&h->lock, 1))
-    ;
-
-  h->tag = tag;
-}
-
-always_inline void
-memfd_unlock (memfd_shared_header_t * h)
-{
-  if (--h->recursion_count == 0)
-    {
-      h->owner_pid = 0;
-      h->tag = 0;
-      CLIB_MEMORY_BARRIER ();
-      h->lock = 0;
-    }
-}
-
-always_inline void
-memfd_unlock_non_recursive (memfd_shared_header_t * h)
-{
-  h->tag = 0;
-  CLIB_MEMORY_BARRIER ();
-  h->lock = 0;
-}
-
-static inline void *
-memfd_push_heap (memfd_shared_header_t * sh)
-{
-  u8 *oldheap;
-  oldheap = clib_mem_set_heap (sh->heap);
-  return ((void *) oldheap);
-}
-
-static inline void
-memfd_pop_heap (void *oldheap)
-{
-  clib_mem_set_heap (oldheap);
-}
-
-#define foreach_memfd_api_error                  \
-_(NO_NAME, "No shared segment name", -100)      \
-_(NO_SIZE, "Size not set (master)", -101)       \
-_(CREATE_FAILURE, "Create failed", -102)        \
-_(SET_SIZE, "Set size failed", -103)		\
-_(MMAP, "mmap failed", -104)			\
-_(SLAVE_TIMEOUT, "Slave map timeout", -105)
-
-typedef enum
-{
-#define _(n,s,c) MEMFD_API_ERROR_##n = c,
-  foreach_memfd_api_error
-#undef _
-} memfd_api_error_enum_t;
-
-#define MEMFD_API_ERROR_NO_NAME	(-10)
-
-int memfd_master_init (memfd_private_t * memfd, u32 master_index);
-int memfd_slave_init (memfd_private_t * memfd);
-void memfd_delete (memfd_private_t * memfd);
-
-/* These do not belong here, but the original keeps running around... */
-/* $$$$ work w/ Damjan to fix properly */
-
-#ifndef F_LINUX_SPECIFIC_BASE
-#define F_LINUX_SPECIFIC_BASE 1024
-#endif
-#define MFD_ALLOW_SEALING       0x0002U
-#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
-#define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10)
-
-#define F_SEAL_SEAL     0x0001	/* prevent further seals from being set */
-#define F_SEAL_SHRINK   0x0002	/* prevent file from shrinking */
-#define F_SEAL_GROW     0x0004	/* prevent file from growing */
-#define F_SEAL_WRITE    0x0008	/* prevent writes */
-
-#endif /* __included_memfd_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/src/svm/ssvm.c b/src/svm/ssvm.c
index c04982de85a..9b935e4a3bd 100644
--- a/src/svm/ssvm.c
+++ b/src/svm/ssvm.c
@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "ssvm.h"
-#include "svm_common.h"
+#include <svm/ssvm.h>
+#include <svm/svm_common.h>
 
 int
 ssvm_master_init (ssvm_private_t * ssvm, u32 master_index)
@@ -202,6 +202,119 @@ ssvm_delete (ssvm_private_t * ssvm)
   munmap ((void *) ssvm->requested_va, ssvm->ssvm_size);
 }
 
+int
+ssvm_master_init_memfd (ssvm_private_t * memfd, u32 master_index)
+{
+  int flags;
+  ssvm_shared_header_t *sh;
+  u64 ticks = clib_cpu_time_now ();
+  u64 randomize_baseva;
+  void *oldheap;
+
+  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)
+    {
+      clib_unix_warning ("create segment '%s'", memfd->name);
+      return SSVM_API_ERROR_CREATE_FAILURE;
+    }
+
+  if ((ftruncate (memfd->fd, memfd->ssvm_size)) == -1)
+    {
+      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;
+    }
+
+  memfd->my_pid = getpid ();
+  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;
+
+  oldheap = ssvm_push_heap (sh);
+  sh->name = format (0, "%s%c", 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
+ */
+
+int
+ssvm_slave_init_memfd (ssvm_private_t * memfd)
+{
+  ssvm_shared_header_t *sh;
+
+  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)
+    {
+      clib_unix_warning ("slave research mmap");
+      close (memfd->fd);
+      return SSVM_API_ERROR_MMAP;
+    }
+
+  memfd->requested_va = (u64) sh->ssvm_va;
+  memfd->ssvm_size = sh->ssvm_size;
+  munmap (sh, MMAP_PAGESIZE);
+
+  sh = (void *) mmap ((void *) memfd->requested_va, memfd->ssvm_size,
+		      PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED,
+		      memfd->fd, 0);
+
+  if (sh == MAP_FAILED)
+    {
+      clib_unix_warning ("slave final mmap");
+      close (memfd->fd);
+      return SSVM_API_ERROR_MMAP;
+    }
+  sh->slave_pid = getpid ();
+  memfd->sh = sh;
+  return 0;
+}
 
 /*
  * fd.io coding-style-patch-verification: ON
diff --git a/src/svm/ssvm.h b/src/svm/ssvm.h
index 8466e15579b..0295e302e72 100644
--- a/src/svm/ssvm.h
+++ b/src/svm/ssvm.h
@@ -37,6 +37,7 @@
 #include <vppinfra/heap.h>
 #include <vppinfra/pool.h>
 #include <vppinfra/format.h>
+#include <vppinfra/linux/syscall.h>
 
 #ifndef MMAP_PAGESIZE
 #define MMAP_PAGESIZE (clib_mem_get_page_size())
@@ -76,12 +77,12 @@ typedef struct
   ssvm_shared_header_t *sh;
   u64 ssvm_size;
   u32 my_pid;
-  u32 vlib_hw_if_index;
   u8 *name;
   uword requested_va;
   int i_am_master;
-  u32 per_interface_next_index;
-  u32 *rx_queue;
+
+  /* Needed by memfd segments */
+  int fd;
 } ssvm_private_t;
 
 always_inline void
@@ -165,6 +166,24 @@ int ssvm_master_init (ssvm_private_t * ssvm, u32 master_index);
 int ssvm_slave_init (ssvm_private_t * ssvm, int timeout_in_seconds);
 void ssvm_delete (ssvm_private_t * ssvm);
 
+int ssvm_master_init_memfd (ssvm_private_t * memfd, u32 master_index);
+int ssvm_slave_init_memfd (ssvm_private_t * memfd);
+void memfd_delete (ssvm_private_t * memfd);
+
+/* These do not belong here, but the original keeps running around... */
+/* $$$$ work w/ Damjan to fix properly */
+#ifndef F_LINUX_SPECIFIC_BASE
+#define F_LINUX_SPECIFIC_BASE 1024
+#endif
+#define MFD_ALLOW_SEALING       0x0002U
+#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
+#define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10)
+
+#define F_SEAL_SEAL     0x0001	/* prevent further seals from being set */
+#define F_SEAL_SHRINK   0x0002	/* prevent file from shrinking */
+#define F_SEAL_GROW     0x0004	/* prevent file from growing */
+#define F_SEAL_WRITE    0x0008	/* prevent writes */
+
 #endif /* __included_ssvm_h__ */
 
 /*