session: cleanup segment manager and fifo segment

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

src/svm/CMakeLists.txt

@@ -16,23 +16,23 @@
 ##############################################################################
 add_vpp_library(svm
   SOURCES
+  fifo_segment.c
+  message_queue.c
+  queue.c
   svm.c
   ssvm.c
   svm_fifo.c
-  svm_fifo_segment.c
-  queue.c
-  message_queue.c
 
   MULTIARCH_SOURCES
   svm_fifo.c
 
   INSTALL_HEADERS
+  fifo_segment.h
+  message_queue.h
+  queue.h
   ssvm.h
   svm_common.h
   svm_fifo.h
-  svm_fifo_segment.h
-  queue.h
-  message_queue.h
   svm.h
   svmdb.h
 

src/svm/fifo_segment.h

@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2016-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:
+ *
+ *     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_fifo_segment_h__
+#define __included_fifo_segment_h__
+
+#include <svm/ssvm.h>
+#include <svm/svm_fifo.h>
+
+typedef enum
+{
+  FIFO_SEGMENT_FTYPE_NONE = -1,
+  FIFO_SEGMENT_RX_FIFO = 0,
+  FIFO_SEGMENT_TX_FIFO,
+  FIFO_SEGMENT_N_FTYPES
+} fifo_segment_ftype_t;
+
+#define FIFO_SEGMENT_MIN_FIFO_SIZE 4096	/* 4kB min fifo size */
+#define FIFO_SEGMENT_MAX_FIFO_SIZE (2 << 30)	/* 2GB max fifo size */
+#define FIFO_SEGMENT_ALLOC_BATCH_SIZE 32	/* Allocation quantum */
+
+typedef enum fifo_segment_flags_
+{
+  FIFO_SEGMENT_F_IS_PREALLOCATED = 1 << 0,
+  FIFO_SEGMENT_F_WILL_DELETE = 1 << 1,
+} fifo_segment_flags_t;
+
+typedef struct
+{
+  svm_fifo_t *fifos;		/**< Linked list of active RX fifos */
+  svm_fifo_t **free_fifos;	/**< Freelists, by fifo size  */
+  u32 n_active_fifos;		/**< Number of active fifos */
+  u8 flags;			/**< Segment flags */
+} fifo_segment_header_t;
+
+typedef struct
+{
+  ssvm_private_t ssvm;		/**< ssvm segment data */
+  fifo_segment_header_t *h;	/**< fifo segment data */
+} fifo_segment_t;
+
+typedef struct
+{
+  fifo_segment_t *segments;	/**< pool of fifo segments */
+  u64 next_baseva;		/**< Where to put the next one */
+  u32 timeout_in_seconds;	/**< Time to wait during attach */
+} fifo_segment_main_t;
+
+typedef struct
+{
+  ssvm_segment_type_t segment_type;	/**< type of segment requested */
+  u32 segment_size;			/**< size of the segment */
+  int memfd_fd;				/**< fd for memfd segments */
+  char *segment_name;			/**< segment name */
+  u32 *new_segment_indices;		/**< return vec of new seg indices */
+} fifo_segment_create_args_t;
+
+#define fifo_segment_flags(_fs) _fs->h->flags
+
+int fifo_segment_init (fifo_segment_t * fs);
+int fifo_segment_create (fifo_segment_main_t * sm,
+			 fifo_segment_create_args_t * a);
+int fifo_segment_attach (fifo_segment_main_t * sm,
+			 fifo_segment_create_args_t * a);
+void fifo_segment_delete (fifo_segment_main_t * sm, fifo_segment_t * fs);
+fifo_segment_t *fifo_segment_get_segment (fifo_segment_main_t * sm,
+					  u32 fs_index);
+u32 fifo_segment_index (fifo_segment_main_t * sm, fifo_segment_t * fs);
+void fifo_segment_info (fifo_segment_t * seg, char **address, size_t * size);
+
+/**
+ * Allocate fifo in fifo segment
+ *
+ * @param fs		fifo segment
+ * @param data_bytes	size of default fifo chunk in bytes
+ * @param ftype		fifo type @ref fifo_segment_ftype_t
+ * @return		new fifo or 0 if alloc failed
+ */
+svm_fifo_t *fifo_segment_alloc_fifo (fifo_segment_t * fs,
+				     u32 data_bytes,
+				     fifo_segment_ftype_t ftype);
+
+/**
+ * Free fifo allocated in fifo segment
+ *
+ * @param fs		fifo segment
+ * @param f		fifo to be freed
+ */
+void fifo_segment_free_fifo (fifo_segment_t * fs, svm_fifo_t * f);
+
+/**
+ * Pre-allocates fifo pairs in fifo segment
+ *
+ * The number of fifos pre-allocated is the minimum of the requested number
+ * of pairs and the maximum number that fit within the segment. If the maximum
+ * is hit, the number of fifo pairs requested is updated by subtracting the
+ * number of fifos that have been successfully allocated.
+ *
+ * @param fs		fifo segment
+ * @param rx_fifo_size	data size of rx fifos
+ * @param tx_fifo_size	data size of tx fifos
+ * @param n_fifo_pairs	number of pairs requested. Prior to returning, this
+ * 			is decremented by the the number of pairs allocated.
+ */
+void fifo_segment_preallocate_fifo_pairs (fifo_segment_t * fs,
+					  u32 rx_fifo_size,
+					  u32 tx_fifo_size,
+					  u32 * n_fifo_pairs);
+u8 fifo_segment_has_fifos (fifo_segment_t * fs);
+svm_fifo_t *fifo_segment_get_fifo_list (fifo_segment_t * fs);
+u32 fifo_segment_num_fifos (fifo_segment_t * fs);
+u32 fifo_segment_num_free_fifos (fifo_segment_t * fs, u32 fifo_size_in_bytes);
+
+void fifo_segment_main_init (fifo_segment_main_t * sm, u64 baseva,
+			     u32 timeout_in_seconds);
+
+format_function_t format_fifo_segment;
+format_function_t format_fifo_segment_type;
+
+#endif /* __included_fifo_segment_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */

src/svm/svm_fifo.c

@@ -882,7 +882,7 @@ svm_fifo_dequeue_drop_all (svm_fifo_t * f)
 }
 
 int
-svm_fifo_segments (svm_fifo_t * f, svm_fifo_segment_t * fs)
+svm_fifo_segments (svm_fifo_t * f, svm_fifo_seg_t * fs)
 {
   u32 cursize, head, tail, head_idx;
 
@@ -914,7 +914,7 @@ svm_fifo_segments (svm_fifo_t * f, svm_fifo_segment_t * fs)
 }
 
 void
-svm_fifo_segments_free (svm_fifo_t * f, svm_fifo_segment_t * fs)
+svm_fifo_segments_free (svm_fifo_t * f, svm_fifo_seg_t * fs)
 {
   u32 head, head_idx;
 

src/svm/svm_fifo.h

@@ -67,6 +67,7 @@ typedef enum svm_fifo_flag_
 {
   SVM_FIFO_F_SIZE_UPDATE = 1 << 0,
   SVM_FIFO_F_MULTI_CHUNK = 1 << 1,
+  SVM_FIFO_F_LL_TRACKED = 1 << 2,
 } svm_fifo_flag_t;
 
 typedef struct _svm_fifo
@@ -124,11 +125,11 @@ typedef enum
   SVM_FIFO_FULL = -2,
 } svm_fifo_err_t;
 
-typedef struct svm_fifo_segment_
+typedef struct svm_fifo_seg_
 {
   u8 *data;
   u32 len;
-} svm_fifo_segment_t;
+} svm_fifo_seg_t;
 
 #if SVM_FIFO_TRACE
 #define svm_fifo_trace_add(_f, _s, _l, _t)		\
@@ -352,8 +353,8 @@ int svm_fifo_dequeue_nowait (svm_fifo_t * f, u32 max_bytes, u8 * copy_here);
 int svm_fifo_peek (svm_fifo_t * f, u32 offset, u32 max_bytes, u8 * copy_here);
 int svm_fifo_dequeue_drop (svm_fifo_t * f, u32 max_bytes);
 void svm_fifo_dequeue_drop_all (svm_fifo_t * f);
-int svm_fifo_segments (svm_fifo_t * f, svm_fifo_segment_t * fs);
-void svm_fifo_segments_free (svm_fifo_t * f, svm_fifo_segment_t * fs);
+int svm_fifo_segments (svm_fifo_t * f, svm_fifo_seg_t * fs);
+void svm_fifo_segments_free (svm_fifo_t * f, svm_fifo_seg_t * fs);
 void svm_fifo_init_pointers (svm_fifo_t * f, u32 head, u32 tail);
 void svm_fifo_clone (svm_fifo_t * df, svm_fifo_t * sf);
 void svm_fifo_overwrite_head (svm_fifo_t * f, u8 * data, u32 len);

src/svm/svm_fifo_segment.h

@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2016-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:
- *
- *     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_ssvm_fifo_segment_h__
-#define __included_ssvm_fifo_segment_h__
-
-#include <svm/ssvm.h>
-#include <svm/svm_fifo.h>
-#include <vppinfra/lock.h>
-
-typedef enum
-{
-  FIFO_SEGMENT_FREELIST_NONE = -1,
-  FIFO_SEGMENT_RX_FREELIST = 0,
-  FIFO_SEGMENT_TX_FREELIST,
-  FIFO_SEGMENT_N_FREELISTS
-} svm_fifo_segment_freelist_t;
-
-#define FIFO_SEGMENT_MIN_FIFO_SIZE 4096
-#define FIFO_SEGMENT_MAX_FIFO_SIZE (2 << 30)	/* 2GB max fifo size */
-#define FIFO_SEGMENT_ALLOC_CHUNK_SIZE 32	/* Allocation quantum */
-
-#define FIFO_SEGMENT_F_IS_PREALLOCATED	(1 << 0)
-#define FIFO_SEGMENT_F_WILL_DELETE	(1 << 1)
-
-typedef struct
-{
-  svm_fifo_t *fifos;		/**< Linked list of active RX fifos */
-  svm_fifo_t **free_fifos;	/**< Freelists, by fifo size  */
-  u32 n_active_fifos;		/**< Number of active fifos */
-  u8 flags;			/**< Segment flags */
-} svm_fifo_segment_header_t;
-
-typedef struct
-{
-  ssvm_private_t ssvm;
-  svm_fifo_segment_header_t *h;
-} svm_fifo_segment_private_t;
-
-typedef struct
-{
-  volatile u32 lock;
-
-  /** pool of segments */
-  svm_fifo_segment_private_t *segments;
-  /* Where to put the next one */
-  u64 next_baseva;
-  u32 timeout_in_seconds;
-} svm_fifo_segment_main_t;
-
-typedef struct
-{
-  ssvm_segment_type_t segment_type;
-  char *segment_name;
-  u32 segment_size;
-  u32 *new_segment_indices;
-  int memfd_fd;
-} svm_fifo_segment_create_args_t;
-
-#define svm_fifo_segment_flags(_seg) _seg->h->flags
-
-static inline svm_fifo_segment_private_t *
-svm_fifo_segment_get_segment (svm_fifo_segment_main_t * sm, u32 segment_index)
-{
-  return pool_elt_at_index (sm->segments, segment_index);
-}
-
-static inline u8
-svm_fifo_segment_has_fifos (svm_fifo_segment_private_t * fifo_segment)
-{
-  return fifo_segment->h->fifos != 0;
-}
-
-static inline svm_fifo_t *
-svm_fifo_segment_get_fifo_list (svm_fifo_segment_private_t * fifo_segment)
-{
-  return fifo_segment->h->fifos;
-}
-
-int svm_fifo_segment_init (svm_fifo_segment_private_t * s);
-int svm_fifo_segment_create (svm_fifo_segment_main_t * sm,
-			     svm_fifo_segment_create_args_t * a);
-int svm_fifo_segment_create_process_private (svm_fifo_segment_main_t * sm,
-					     svm_fifo_segment_create_args_t
-					     *);
-void svm_fifo_segment_preallocate_fifo_pairs (svm_fifo_segment_private_t * s,
-					      u32 rx_fifo_size,
-					      u32 tx_fifo_size,
-					      u32 * n_fifo_pairs);
-int svm_fifo_segment_attach (svm_fifo_segment_main_t * sm,
-			     svm_fifo_segment_create_args_t * a);
-void svm_fifo_segment_delete (svm_fifo_segment_main_t * sm,
-			      svm_fifo_segment_private_t * s);
-
-svm_fifo_t *svm_fifo_segment_alloc_fifo (svm_fifo_segment_private_t * s,
-					 u32 data_size_in_bytes,
-					 svm_fifo_segment_freelist_t index);
-void svm_fifo_segment_free_fifo (svm_fifo_segment_private_t * s,
-				 svm_fifo_t * f,
-				 svm_fifo_segment_freelist_t index);
-void svm_fifo_segment_main_init (svm_fifo_segment_main_t * sm, u64 baseva,
-				 u32 timeout_in_seconds);
-u32 svm_fifo_segment_index (svm_fifo_segment_main_t * sm,
-			    svm_fifo_segment_private_t * s);
-u32 svm_fifo_segment_num_fifos (svm_fifo_segment_private_t * fifo_segment);
-u32 svm_fifo_segment_num_free_fifos (svm_fifo_segment_private_t *
-				     fifo_segment, u32 fifo_size_in_bytes);
-void svm_fifo_segment_info (svm_fifo_segment_private_t * seg, char **address,
-			    size_t * size);
-
-svm_fifo_segment_private_t
-  * svm_fifo_segment_segments_pool (svm_fifo_segment_main_t * sm);
-
-format_function_t format_svm_fifo_segment;
-format_function_t format_svm_fifo_segment_type;
-
-#endif /* __included_ssvm_fifo_segment_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */

src/tests/vnet/session/quic_echo.c

@@ -17,10 +17,10 @@
 #include <signal.h>
 
 #include <vnet/session/application_interface.h>
-#include <svm/svm_fifo_segment.h>
 #include <vlibmemory/api.h>
 
 #include <vpp/api/vpe_msg_enum.h>
+#include <svm/fifo_segment.h>
 
 #define vl_typedefs		/* define message structures */
 #include <vpp/api/vpe_all_api_h.h>
@@ -141,7 +141,7 @@ typedef struct
    * and all other messages are exchanged using shm IPC. */
   u8 use_sock_api;
 
-  svm_fifo_segment_main_t segment_main;
+  fifo_segment_main_t segment_main;
 } echo_main_t;
 
 echo_main_t echo_main;
@@ -290,8 +290,8 @@ application_detach (echo_main_t * em)
 static int
 ssvm_segment_attach (char *name, ssvm_segment_type_t type, int fd)
 {
-  svm_fifo_segment_create_args_t _a, *a = &_a;
-  svm_fifo_segment_main_t *sm = &echo_main.segment_main;
+  fifo_segment_create_args_t _a, *a = &_a;
+  fifo_segment_main_t *sm = &echo_main.segment_main;
   int rv;
 
   clib_memset (a, 0, sizeof (*a));
@@ -301,7 +301,7 @@ ssvm_segment_attach (char *name, ssvm_segment_type_t type, int fd)
   if (type == SSVM_SEGMENT_MEMFD)
     a->memfd_fd = fd;
 
-  if ((rv = svm_fifo_segment_attach (sm, a)))
+  if ((rv = fifo_segment_attach (sm, a)))
     {
       clib_warning ("svm_fifo_segment_attach ('%s') failed", name);
       return rv;
@@ -454,15 +454,15 @@ disconnect_from_vpp (echo_main_t * em)
 static void
 vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp)
 {
-  svm_fifo_segment_main_t *sm = &echo_main.segment_main;
-  svm_fifo_segment_create_args_t _a, *a = &_a;
+  fifo_segment_main_t *sm = &echo_main.segment_main;
+  fifo_segment_create_args_t _a, *a = &_a;
   int rv;
 
   clib_memset (a, 0, sizeof (*a));
   a->segment_name = (char *) mp->segment_name;
   a->segment_size = mp->segment_size;
   /* Attach to the segment vpp created */
-  rv = svm_fifo_segment_attach (sm, a);
+  rv = fifo_segment_attach (sm, a);
   if (rv)
     {
       clib_warning ("svm_fifo_segment_attach ('%s') failed",
@@ -1286,7 +1286,7 @@ main (int argc, char **argv)
 {
   int i_am_server = 1, test_return_packets = 0;
   echo_main_t *em = &echo_main;
-  svm_fifo_segment_main_t *sm = &em->segment_main;
+  fifo_segment_main_t *sm = &em->segment_main;
   unformat_input_t _argv, *a = &_argv;
   u8 *chroot_prefix;
   u8 *uri = 0;
@@ -1309,7 +1309,7 @@ main (int argc, char **argv)
 
   clib_time_init (&em->clib_time);
   init_error_string_table (em);
-  svm_fifo_segment_main_init (sm, HIGH_SEGMENT_BASEVA, 20);
+  fifo_segment_main_init (sm, HIGH_SEGMENT_BASEVA, 20);
   unformat_init_command_line (a, argv);
 
   while (unformat_check_input (a) != UNFORMAT_END_OF_INPUT)

src/tests/vnet/session/tcp_echo.c

@@ -17,10 +17,10 @@
 #include <signal.h>
 
 #include <vnet/session/application_interface.h>
-#include <svm/svm_fifo_segment.h>
 #include <vlibmemory/api.h>
 
 #include <vpp/api/vpe_msg_enum.h>
+#include <svm/fifo_segment.h>
 
 #define vl_typedefs		/* define message structures */
 #include <vpp/api/vpe_all_api_h.h>
@@ -141,7 +141,7 @@ typedef struct
    * and all other messages are exchanged using shm IPC. */
   u8 use_sock_api;
 
-  svm_fifo_segment_main_t segment_main;
+  fifo_segment_main_t segment_main;
 } echo_main_t;
 
 echo_main_t echo_main;
@@ -290,8 +290,8 @@ application_detach (echo_main_t * em)
 static int
 ssvm_segment_attach (char *name, ssvm_segment_type_t type, int fd)
 {
-  svm_fifo_segment_create_args_t _a, *a = &_a;
-  svm_fifo_segment_main_t *sm = &echo_main.segment_main;
+  fifo_segment_create_args_t _a, *a = &_a;
+  fifo_segment_main_t *sm = &echo_main.segment_main;
   int rv;
 
   clib_memset (a, 0, sizeof (*a));
@@ -301,7 +301,7 @@ ssvm_segment_attach (char *name, ssvm_segment_type_t type, int fd)
   if (type == SSVM_SEGMENT_MEMFD)
     a->memfd_fd = fd;
 
-  if ((rv = svm_fifo_segment_attach (sm, a)))
+  if ((rv = fifo_segment_attach (sm, a)))
     {
       clib_warning ("svm_fifo_segment_attach ('%s') failed", name);
       return rv;
@@ -456,15 +456,15 @@ disconnect_from_vpp (echo_main_t * em)
 static void
 vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp)
 {
-  svm_fifo_segment_main_t *sm = &echo_main.segment_main;
-  svm_fifo_segment_create_args_t _a, *a = &_a;
+  fifo_segment_main_t *sm = &echo_main.segment_main;
+  fifo_segment_create_args_t _a, *a = &_a;
   int rv;
 
   clib_memset (a, 0, sizeof (*a));
   a->segment_name = (char *) mp->segment_name;
   a->segment_size = mp->segment_size;
   /* Attach to the segment vpp created */
-  rv = svm_fifo_segment_attach (sm, a);
+  rv = fifo_segment_attach (sm, a);
   if (rv)
     {
       clib_warning ("svm_fifo_segment_attach ('%s') failed",
@@ -1291,7 +1291,7 @@ main (int argc, char **argv)
 {
   int i_am_server = 1, test_return_packets = 0;
   echo_main_t *em = &echo_main;
-  svm_fifo_segment_main_t *sm = &em->segment_main;
+  fifo_segment_main_t *sm = &em->segment_main;
   unformat_input_t _argv, *a = &_argv;
   u8 *chroot_prefix;
   u8 *uri = 0;
@@ -1314,7 +1314,7 @@ main (int argc, char **argv)
 
   clib_time_init (&em->clib_time);
   init_error_string_table (em);
-  svm_fifo_segment_main_init (sm, HIGH_SEGMENT_BASEVA, 20);
+  fifo_segment_main_init (sm, HIGH_SEGMENT_BASEVA, 20);
   unformat_init_command_line (a, argv);
 
   while (unformat_check_input (a) != UNFORMAT_END_OF_INPUT)

src/tests/vnet/session/udp_echo.c

@@ -27,9 +27,9 @@
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
 #include <vpp/api/vpe_msg_enum.h>
-#include <svm/svm_fifo_segment.h>
 #include <pthread.h>
 #include <vnet/session/application_interface.h>
+#include <svm/fifo_segment.h>
 
 #define vl_typedefs		/* define message structures */
 #include <vpp/api/vpe_all_api_h.h>
@@ -79,7 +79,7 @@ typedef struct
   uword *session_index_by_vpp_handles;
 
   /* fifo segment */
-  svm_fifo_segment_private_t *seg;
+  fifo_segment_t *seg;
 
   /* intermediate rx buffer */
   u8 *rx_buf;
@@ -121,7 +121,7 @@ typedef struct
   /* VNET_API_ERROR_FOO -> "Foo" hash table */
   uword *error_string_by_error_number;
 
-  svm_fifo_segment_main_t segment_main;
+  fifo_segment_main_t segment_main;
 
   u8 *connect_test_data;
 
@@ -334,9 +334,9 @@ static void
 vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t *
 					   mp)
 {
-  svm_fifo_segment_create_args_t _a = { 0 }, *a = &_a;
+  fifo_segment_create_args_t _a = { 0 }, *a = &_a;
   udp_echo_main_t *utm = &udp_echo_main;
-  svm_fifo_segment_main_t *sm = &utm->segment_main;
+  fifo_segment_main_t *sm = &utm->segment_main;
   int rv;
 
   if (mp->retval)
@@ -358,7 +358,7 @@ vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t *
   ASSERT (mp->app_event_queue_address);
 
   /* Attach to the segment vpp created */
-  rv = svm_fifo_segment_attach (sm, a);
+  rv = fifo_segment_attach (sm, a);
   if (rv)
     {
       clib_warning ("svm_fifo_segment_attach ('%s') failed",
@@ -841,24 +841,24 @@ client_test (udp_echo_main_t * utm)
 static void
 vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp)
 {
-  svm_fifo_segment_create_args_t _a, *a = &_a;
+  fifo_segment_create_args_t _a, *a = &_a;
   udp_echo_main_t *utm = &udp_echo_main;
-  svm_fifo_segment_main_t *sm = &utm->segment_main;
-  svm_fifo_segment_private_t *seg;
+  fifo_segment_main_t *sm = &utm->segment_main;
+  fifo_segment_t *seg;
   int rv;
 
   clib_memset (a, 0, sizeof (*a));
   a->segment_name = (char *) mp->segment_name;
   a->segment_size = mp->segment_size;
   /* Attach to the segment vpp created */
-  rv = svm_fifo_segment_attach (sm, a);
+  rv = fifo_segment_attach (sm, a);
   if (rv)
     {
       clib_warning ("svm_fifo_segment_attach ('%s') failed",
 		    mp->segment_name);
       return;
     }
-  seg = svm_fifo_segment_get_segment (sm, a->new_segment_indices[0]);
+  seg = fifo_segment_get_segment (sm, a->new_segment_indices[0]);
   clib_warning ("Mapped new segment '%s' size %d", seg->ssvm.name,
 		seg->ssvm.ssvm_size);
   hash_set (utm->segments_table, clib_net_to_host_u64 (mp->segment_handle),
@@ -869,8 +869,8 @@ static void
 vl_api_unmap_segment_t_handler (vl_api_unmap_segment_t * mp)
 {
   udp_echo_main_t *utm = &udp_echo_main;
-  svm_fifo_segment_main_t *sm = &utm->segment_main;
-  svm_fifo_segment_private_t *seg;
+  fifo_segment_main_t *sm = &utm->segment_main;
+  fifo_segment_t *seg;
   uword *seg_indexp;
   u64 segment_handle;
 
@@ -882,8 +882,8 @@ vl_api_unmap_segment_t_handler (vl_api_unmap_segment_t * mp)
       return;
     }
   hash_unset (utm->segments_table, segment_handle);
-  seg = svm_fifo_segment_get_segment (sm, (u32) seg_indexp[0]);
-  svm_fifo_segment_delete (sm, seg);
+  seg = fifo_segment_get_segment (sm, (u32) seg_indexp[0]);
+  fifo_segment_delete (sm, seg);
   clib_warning ("Unmapped segment '%s'", segment_handle);
 }
 
@@ -1127,7 +1127,7 @@ int
 main (int argc, char **argv)
 {
   udp_echo_main_t *utm = &udp_echo_main;
-  svm_fifo_segment_main_t *sm = &utm->segment_main;
+  fifo_segment_main_t *sm = &utm->segment_main;
   u8 *uri = (u8 *) "udp://6.0.1.1/1234";
   unformat_input_t _argv, *a = &_argv;
   int i_am_server = 1;
@@ -1139,7 +1139,7 @@ main (int argc, char **argv)
 
   clib_mem_init_thread_safe (0, 256 << 20);
 
-  svm_fifo_segment_main_init (sm, HIGH_SEGMENT_BASEVA, 20);
+  fifo_segment_main_init (sm, HIGH_SEGMENT_BASEVA, 20);
 
   vec_validate (utm->rx_buf, 128 << 10);
   utm->session_index_by_vpp_handles = hash_create (0, sizeof (uword));

src/vcl/vcl_bapi.c

@@ -65,7 +65,7 @@ static int
 vcl_segment_attach (u64 segment_handle, char *name, ssvm_segment_type_t type,
 		    int fd)
 {
-  svm_fifo_segment_create_args_t _a, *a = &_a;
+  fifo_segment_create_args_t _a, *a = &_a;
   int rv;
 
   memset (a, 0, sizeof (*a));
@@ -75,7 +75,7 @@ vcl_segment_attach (u64 segment_handle, char *name, ssvm_segment_type_t type,
   if (type == SSVM_SEGMENT_MEMFD)
     a->memfd_fd = fd;
 
-  if ((rv = svm_fifo_segment_attach (&vcm->segment_main, a)))
+  if ((rv = fifo_segment_attach (&vcm->segment_main, a)))
     {
       clib_warning ("svm_fifo_segment_attach ('%s') failed", name);
       return rv;
@@ -88,15 +88,15 @@ vcl_segment_attach (u64 segment_handle, char *name, ssvm_segment_type_t type,
 static void
 vcl_segment_detach (u64 segment_handle)
 {
-  svm_fifo_segment_main_t *sm = &vcm->segment_main;
-  svm_fifo_segment_private_t *segment;
+  fifo_segment_main_t *sm = &vcm->segment_main;
+  fifo_segment_t *segment;
   u32 segment_index;
 
   segment_index = vcl_segment_table_lookup (segment_handle);
   if (segment_index == (u32) ~ 0)
     return;
-  segment = svm_fifo_segment_get_segment (sm, segment_index);
-  svm_fifo_segment_delete (sm, segment);
+  segment = fifo_segment_get_segment (sm, segment_index);
+  fifo_segment_delete (sm, segment);
   vcl_segment_table_del (segment_handle);
   VDBG (0, "detached segment %u handle %u", segment_index, segment_handle);
 }

src/vcl/vcl_private.h

@@ -325,7 +325,7 @@ typedef struct vppcom_main_t_
   /** Mapped segments table */
   uword *segment_table;
 
-  svm_fifo_segment_main_t segment_main;
+  fifo_segment_main_t segment_main;
 
 #ifdef VCL_ELOG
   /* VPP Event-logger */

src/vcl/vppcom.c

@@ -15,10 +15,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <svm/svm_fifo_segment.h>
 #include <vcl/vppcom.h>
 #include <vcl/vcl_debug.h>
 #include <vcl/vcl_private.h>
+#include <svm/fifo_segment.h>
 
 __thread uword __vcl_worker_index = ~0;
 
@@ -924,8 +924,8 @@ vppcom_app_create (char *app_name)
   vcm->main_pid = getpid ();
   vcm->app_name = format (0, "%s", app_name);
   vppcom_init_error_string_table ();
-  svm_fifo_segment_main_init (&vcm->segment_main, vcl_cfg->segment_baseva,
-			      20 /* timeout in secs */ );
+  fifo_segment_main_init (&vcm->segment_main, vcl_cfg->segment_baseva,
+			  20 /* timeout in secs */ );
   pool_alloc (vcm->workers, vcl_cfg->max_workers);
   clib_spinlock_init (&vcm->workers_lock);
   clib_rwlock_init (&vcm->segment_table_lock);
@@ -1611,7 +1611,7 @@ vppcom_session_read_segments (uint32_t session_handle,
 	}
     }
 
-  n_read = svm_fifo_segments (rx_fifo, (svm_fifo_segment_t *) ds);
+  n_read = svm_fifo_segments (rx_fifo, (svm_fifo_seg_t *) ds);
   svm_fifo_unset_event (rx_fifo);
 
   return n_read;
@@ -1628,7 +1628,7 @@ vppcom_session_free_segments (uint32_t session_handle,
   if (PREDICT_FALSE (!s || s->is_vep))
     return;
 
-  svm_fifo_segments_free (s->rx_fifo, (svm_fifo_segment_t *) ds);
+  svm_fifo_segments_free (s->rx_fifo, (svm_fifo_seg_t *) ds);
 }
 
 int

src/vnet/session-apps/echo_client.h

@@ -24,7 +24,6 @@
 
 #include <vppinfra/hash.h>
 #include <vppinfra/error.h>
-#include <svm/svm_fifo_segment.h>
 #include <vnet/session/session.h>
 #include <vnet/session/application_interface.h>
 

src/vnet/session-apps/proxy.h

@@ -23,7 +23,6 @@
 
 #include <vppinfra/hash.h>
 #include <vppinfra/error.h>
-#include <svm/svm_fifo_segment.h>
 #include <vnet/session/session.h>
 #include <vnet/session/application_interface.h>
 

src/vnet/session/application.c

@@ -504,7 +504,7 @@ static int
 application_alloc_and_init (app_init_args_t * a)
 {
   ssvm_segment_type_t seg_type = SSVM_SEGMENT_MEMFD;
-  segment_manager_properties_t *props;
+  segment_manager_props_t *props;
   vl_api_registration_t *reg;
   application_t *app;
   u64 *options;
@@ -553,7 +553,7 @@ application_alloc_and_init (app_init_args_t * a)
     app->flags |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE;
 
   props = application_segment_manager_properties (app);
-  segment_manager_properties_init (props);
+  segment_manager_props_init (props);
   props->segment_size = options[APP_OPTIONS_ADD_SEGMENT_SIZE];
   props->prealloc_fifos = options[APP_OPTIONS_PREALLOC_FIFO_PAIRS];
   if (options[APP_OPTIONS_ADD_SEGMENT_SIZE])
@@ -719,7 +719,7 @@ application_alloc_worker_and_init (application_t * app, app_worker_t ** wrk)
   /*
    * Setup first segment manager
    */
-  sm = segment_manager_new ();
+  sm = segment_manager_alloc ();
   sm->app_wrk_index = app_wrk->wrk_index;
 
   if ((rv = segment_manager_init (sm, app->sm_properties.segment_size,
@@ -746,7 +746,7 @@ application_alloc_worker_and_init (application_t * app, app_worker_t ** wrk)
 int
 vnet_app_worker_add_del (vnet_app_worker_add_del_args_t * a)
 {
-  svm_fifo_segment_private_t *fs;
+  fifo_segment_t *fs;
   app_worker_map_t *wrk_map;
   app_worker_t *app_wrk;
   segment_manager_t *sm;
@@ -838,7 +838,7 @@ app_name_from_api_index (u32 api_client_index)
 int
 vnet_application_attach (vnet_app_attach_args_t * a)
 {
-  svm_fifo_segment_private_t *fs;
+  fifo_segment_t *fs;
   application_t *app = 0;
   app_worker_t *app_wrk;
   segment_manager_t *sm;
@@ -1313,13 +1313,13 @@ application_remove_proxy (application_t * app)
   /* *INDENT-ON* */
 }
 
-segment_manager_properties_t *
+segment_manager_props_t *
 application_segment_manager_properties (application_t * app)
 {
   return &app->sm_properties;
 }
 
-segment_manager_properties_t *
+segment_manager_props_t *
 application_get_segment_manager_properties (u32 app_index)
 {
   application_t *app = application_get (app_index);
@@ -1404,7 +1404,7 @@ format_application (u8 * s, va_list * args)
 {
   application_t *app = va_arg (*args, application_t *);
   CLIB_UNUSED (int verbose) = va_arg (*args, int);
-  segment_manager_properties_t *props;
+  segment_manager_props_t *props;
   const u8 *app_ns_name, *app_name;
   app_worker_map_t *wrk_map;
   app_worker_t *app_wrk;

src/vnet/session/application.h

@@ -92,7 +92,7 @@ typedef struct application_
   session_cb_vft_t cb_fns;
 
   /** Segment manager properties. Shared by all segment managers */
-  segment_manager_properties_t sm_properties;
+  segment_manager_props_t sm_properties;
 
   /** Pool of mappings that keep track of workers associated to this app */
   app_worker_map_t *worker_maps;
@@ -197,10 +197,10 @@ u8 application_has_global_scope (application_t * app);
 void application_setup_proxy (application_t * app);
 void application_remove_proxy (application_t * app);
 
-segment_manager_properties_t *application_get_segment_manager_properties (u32
-									  app_index);
+segment_manager_props_t *application_get_segment_manager_properties (u32
+								     app_index);
 
-segment_manager_properties_t
+segment_manager_props_t
   * application_segment_manager_properties (application_t * app);
 
 /*

src/vnet/session/application_interface.h

@@ -17,9 +17,9 @@
 
 #include <vlibmemory/api.h>
 #include <svm/message_queue.h>
-#include <svm/svm_fifo_segment.h>
 #include <vnet/session/session_types.h>
 #include <vnet/tls/tls_test.h>
+#include <svm/fifo_segment.h>
 
 typedef struct _stream_session_cb_vft
 {

src/vnet/session/application_local.c

@@ -91,10 +91,10 @@ ct_session_endpoint (session_t * ll, session_endpoint_t * sep)
 int
 ct_session_connect_notify (session_t * ss)
 {
-  svm_fifo_segment_private_t *seg;
   ct_connection_t *sct, *cct;
   app_worker_t *client_wrk;
   segment_manager_t *sm;
+  fifo_segment_t *seg;
   u64 segment_handle;
   int is_fail = 0;
   session_t *cs;
@@ -167,11 +167,11 @@ ct_init_local_session (app_worker_t * client_wrk, app_worker_t * server_wrk,
 		       ct_connection_t * ct, session_t * ls, session_t * ll)
 {
   u32 round_rx_fifo_sz, round_tx_fifo_sz, sm_index, seg_size;
-  segment_manager_properties_t *props;
-  svm_fifo_segment_private_t *seg;
+  segment_manager_props_t *props;
   application_t *server;
   segment_manager_t *sm;
   u32 margin = 16 << 10;
+  fifo_segment_t *seg;
   u64 segment_handle;
   int seg_index, rv;
 

src/vnet/session/application_worker.c

@@ -95,7 +95,7 @@ app_worker_free (app_worker_t * app_wrk)
       sm = segment_manager_get (app_wrk->connects_seg_manager);
       sm->app_wrk_index = SEGMENT_MANAGER_INVALID_APP_INDEX;
       sm->first_is_protected = 0;
-      segment_manager_init_del (sm);
+      segment_manager_init_free (sm);
     }
 
   /* If first segment manager is used by a listener */
@@ -108,7 +108,7 @@ app_worker_free (app_worker_t * app_wrk)
       /* .. and has no fifos, e.g. it might be used for redirected sessions,
        * remove it */
       if (!segment_manager_has_fifos (sm))
-	segment_manager_del (sm);
+	segment_manager_free (sm);
     }
 
   pool_put (app_workers, app_wrk);
@@ -140,7 +140,7 @@ app_worker_alloc_segment_manager (app_worker_t * app_wrk)
       return sm;
     }
 
-  sm = segment_manager_new ();
+  sm = segment_manager_alloc ();
   sm->app_wrk_index = app_wrk->wrk_index;
 
   return sm;
@@ -238,7 +238,7 @@ app_worker_stop_listen_session (app_worker_t * app_wrk, session_t * ls)
     }
   else
     {
-      segment_manager_init_del (sm);
+      segment_manager_init_free (sm);
     }
   hash_unset (app_wrk->listeners_table, handle);
 }
@@ -698,63 +698,20 @@ format_app_worker (u8 * s, va_list * args)
 void
 app_worker_format_connects (app_worker_t * app_wrk, int verbose)
 {
-  svm_fifo_segment_private_t *fifo_segment;
-  vlib_main_t *vm = vlib_get_main ();
   segment_manager_t *sm;
-  const u8 *app_name;
-  u8 *s = 0;
 
   /* Header */
   if (!app_wrk)
     {
-      if (verbose)
-	vlib_cli_output (vm, "%-40s%-20s%-15s%-10s", "Connection", "App",
-			 "API Client", "SegManager");
-      else
-	vlib_cli_output (vm, "%-40s%-20s", "Connection", "App");
+      segment_manager_format_sessions (0, verbose);
       return;
     }
 
   if (app_wrk->connects_seg_manager == (u32) ~ 0)
     return;
 
-  app_name = application_name_from_index (app_wrk->app_index);
-
-  /* Across all fifo segments */
   sm = segment_manager_get (app_wrk->connects_seg_manager);
-
-  /* *INDENT-OFF* */
-  segment_manager_foreach_segment_w_lock (fifo_segment, sm, ({
-    svm_fifo_t *fifo;
-    u8 *str;
-
-    fifo = svm_fifo_segment_get_fifo_list (fifo_segment);
-    while (fifo)
-      {
-        u32 session_index, thread_index;
-        session_t *session;
-
-        session_index = fifo->master_session_index;
-        thread_index = fifo->master_thread_index;
-
-        session = session_get (session_index, thread_index);
-        str = format (0, "%U", format_session, session, verbose);
-
-        if (verbose)
-          s = format (s, "%-40s%-20s%-15u%-10u", str, app_name,
-                      app_wrk->api_client_index, app_wrk->connects_seg_manager);
-        else
-          s = format (s, "%-40s%-20s", str, app_name);
-
-        vlib_cli_output (vm, "%v", s);
-        vec_reset_length (s);
-        vec_free (str);
-
-        fifo = fifo->next;
-      }
-    vec_free (s);
-  }));
-  /* *INDENT-ON* */
+  segment_manager_format_sessions (sm, verbose);
 }
 
 /*

src/vnet/session/segment_manager.h

@@ -15,14 +15,12 @@
 #ifndef SRC_VNET_SESSION_SEGMENT_MANAGER_H_
 #define SRC_VNET_SESSION_SEGMENT_MANAGER_H_
 
-#include <vnet/vnet.h>
-#include <svm/svm_fifo_segment.h>
 #include <svm/message_queue.h>
-#include <vlibmemory/api.h>
 #include <vppinfra/lock.h>
 #include <vppinfra/valloc.h>
+#include <svm/fifo_segment.h>
 
-typedef struct _segment_manager_properties
+typedef struct _segment_manager_props
 {
   u32 rx_fifo_size;			/**< receive fifo size */
   u32 tx_fifo_size;			/**< transmit fifo size */
@@ -35,12 +33,12 @@ typedef struct _segment_manager_properties
   u8 reserved:6;			/**< reserved flags */
   ssvm_segment_type_t segment_type;	/**< seg type: if set to SSVM_N_TYPES,
 					     private segments are used */
-} segment_manager_properties_t;
+} segment_manager_props_t;
 
 typedef struct _segment_manager
 {
   /** Pool of segments allocated by this manager */
-  svm_fifo_segment_private_t *segments;
+  fifo_segment_t *segments;
 
   /** rwlock that protects the segments pool */
   clib_rwlock_t segments_rwlock;
@@ -61,25 +59,6 @@ typedef struct _segment_manager
   svm_msg_q_t *event_queue;
 } segment_manager_t;
 
-#define segment_manager_foreach_segment_w_lock(VAR, SM, BODY)		\
-do {									\
-    clib_rwlock_reader_lock (&(SM)->segments_rwlock);			\
-    pool_foreach((VAR), ((SM)->segments), (BODY));			\
-    clib_rwlock_reader_unlock (&(SM)->segments_rwlock);			\
-} while (0)
-
-typedef struct segment_manager_main_
-{
-  /** Pool of segment managers */
-  segment_manager_t *segment_managers;
-
-  /** Virtual address allocator */
-  clib_valloc_main_t va_allocator;
-
-} segment_manager_main_t;
-
-extern segment_manager_main_t segment_manager_main;
-
 typedef struct segment_manager_main_init_args_
 {
   u64 baseva;
@@ -88,86 +67,78 @@ typedef struct segment_manager_main_init_args_
 
 #define SEGMENT_MANAGER_INVALID_APP_INDEX ((u32) ~0)
 
-/** Pool of segment managers */
-extern segment_manager_t *segment_managers;
-
-always_inline segment_manager_t *
-segment_manager_get (u32 index)
-{
-  return pool_elt_at_index (segment_manager_main.segment_managers, index);
-}
-
-always_inline segment_manager_t *
-segment_manager_get_if_valid (u32 index)
-{
-  if (pool_is_free_index (segment_manager_main.segment_managers, index))
-    return 0;
-  return pool_elt_at_index (segment_manager_main.segment_managers, index);
-}
-
-always_inline u32
-segment_manager_index (segment_manager_t * sm)
-{
-  return sm - segment_manager_main.segment_managers;
-}
-
-always_inline svm_msg_q_t *
-segment_manager_event_queue (segment_manager_t * sm)
-{
-  return sm->event_queue;
-}
-
-always_inline u64
-segment_manager_make_segment_handle (u32 segment_manager_index,
-				     u32 segment_index)
-{
-  return (((u64) segment_manager_index << 32) | segment_index);
-}
-
-u64 segment_manager_segment_handle (segment_manager_t * sm,
-				    svm_fifo_segment_private_t * segment);
-
-segment_manager_t *segment_manager_new ();
+segment_manager_t *segment_manager_alloc (void);
 int segment_manager_init (segment_manager_t * sm, u32 first_seg_size,
 			  u32 prealloc_fifo_pairs);
 
-svm_fifo_segment_private_t *segment_manager_get_segment (segment_manager_t *,
-							 u32 segment_index);
-svm_fifo_segment_private_t *segment_manager_get_segment_w_handle (u64);
-svm_fifo_segment_private_t
-  * segment_manager_get_segment_w_lock (segment_manager_t * sm,
-					u32 segment_index);
+/**
+ * Cleanup segment manager
+ *
+ * @param sm	segment manager to be freed
+ */
+void segment_manager_free (segment_manager_t * sm);
+
+/**
+ * Initiate segment manager cleanup
+ *
+ * @param sm	segment manager to be freed
+ */
+void segment_manager_init_free (segment_manager_t * sm);
+segment_manager_t *segment_manager_get (u32 index);
+segment_manager_t *segment_manager_get_if_valid (u32 index);
+u32 segment_manager_index (segment_manager_t * sm);
+
 int segment_manager_add_segment (segment_manager_t * sm, u32 segment_size);
 void segment_manager_del_segment (segment_manager_t * sm,
-				  svm_fifo_segment_private_t * fs);
+				  fifo_segment_t * fs);
+fifo_segment_t *segment_manager_get_segment (segment_manager_t * sm,
+					     u32 segment_index);
+fifo_segment_t *segment_manager_get_segment_w_handle (u64 sh);
+fifo_segment_t *segment_manager_get_segment_w_lock (segment_manager_t *,
+						    u32 segment_index);
+int segment_manager_add_first_segment (segment_manager_t * sm,
+				       u32 segment_size);
+u64 segment_manager_make_segment_handle (u32 segment_manager_index,
+					 u32 segment_index);
+u64 segment_manager_segment_handle (segment_manager_t * sm,
+				    fifo_segment_t * segment);
 void segment_manager_segment_reader_unlock (segment_manager_t * sm);
 void segment_manager_segment_writer_unlock (segment_manager_t * sm);
 
-int segment_manager_add_first_segment (segment_manager_t * sm,
-				       u32 segment_size);
-void segment_manager_del_sessions (segment_manager_t * sm);
-void segment_manager_del (segment_manager_t * sm);
-void segment_manager_init_del (segment_manager_t * sm);
-u8 segment_manager_has_fifos (segment_manager_t * sm);
 int segment_manager_alloc_session_fifos (segment_manager_t * sm,
-					 svm_fifo_t ** server_rx_fifo,
-					 svm_fifo_t ** server_tx_fifo);
-int segment_manager_try_alloc_fifos (svm_fifo_segment_private_t * fs,
+					 svm_fifo_t ** rx_fifo,
+					 svm_fifo_t ** tx_fifo);
+int segment_manager_try_alloc_fifos (fifo_segment_t * fs,
 				     u32 rx_fifo_size, u32 tx_fifo_size,
 				     svm_fifo_t ** rx_fifo,
 				     svm_fifo_t ** tx_fifo);
 void segment_manager_dealloc_fifos (svm_fifo_t * rx_fifo,
 				    svm_fifo_t * tx_fifo);
-u32 segment_manager_evt_q_expected_size (u32 q_size);
-svm_msg_q_t *segment_manager_alloc_queue (svm_fifo_segment_private_t * fs,
-					  segment_manager_properties_t *
-					  props);
+u8 segment_manager_has_fifos (segment_manager_t * sm);
+
+svm_msg_q_t *segment_manager_alloc_queue (fifo_segment_t * fs,
+					  segment_manager_props_t * props);
 void segment_manager_dealloc_queue (segment_manager_t * sm, svm_queue_t * q);
+svm_msg_q_t *segment_manager_event_queue (segment_manager_t * sm);
+u32 segment_manager_evt_q_expected_size (u32 q_size);
+
 void segment_manager_app_detach (segment_manager_t * sm);
 
+/**
+ * Cleanup segment manager sessions
+ *
+ * Initiates disconnects for all sessions 'owned' by a segment manager by
+ * leveraging the backpointers that fifos keep.
+ *
+ * @param sm	segment manager whose sessions are to be disconnected
+ */
+void segment_manager_del_sessions (segment_manager_t * sm);
+void segment_manager_format_sessions (segment_manager_t * sm, int verbose);
+
 void segment_manager_main_init (segment_manager_main_init_args_t * a);
-segment_manager_properties_t
-  * segment_manager_properties_init (segment_manager_properties_t * sm);
+
+segment_manager_props_t *segment_manager_props_init (segment_manager_props_t *
+						     sm);
 
 #endif /* SRC_VNET_SESSION_SEGMENT_MANAGER_H_ */
 /*

src/vnet/session/session_api.c

@@ -83,8 +83,8 @@ send_add_segment_callback (u32 api_client_index, u64 segment_handle)
 {
   int fds[SESSION_N_FD_TYPE], n_fds = 0;
   vl_api_map_another_segment_t *mp;
-  svm_fifo_segment_private_t *fs;
   vl_api_registration_t *reg;
+  fifo_segment_t *fs;
   ssvm_private_t *sp;
   u8 fd_flags = 0;