session svm: per thread fifo segment slices

Type: refactor

Change-Id: I9be652e56cdb48b0aee3253f7ce8d9bed299d824
Signed-off-by: Florin Coras <fcoras@cisco.com>
Signed-off-by: Dave Barach <dave@barachs.net>

4 files changed, 71 insertions, 52 deletions

diff --git a/src/vnet/session/application_local.c b/src/vnet/session/application_local.c
index 7d8fb468f5a..97cda12b7da 100644
--- a/src/vnet/session/application_local.c
+++ b/src/vnet/session/application_local.c
@@ -191,7 +191,8 @@ ct_init_local_session (app_worker_t * client_wrk, app_worker_t * server_wrk,
     }
   seg = segment_manager_get_segment_w_lock (sm, seg_index);
 
-  rv = segment_manager_try_alloc_fifos (seg, props->rx_fifo_size,
+  rv = segment_manager_try_alloc_fifos (seg, ls->thread_index,
+					props->rx_fifo_size,
 					props->tx_fifo_size, &ls->rx_fifo,
 					&ls->tx_fifo);
   if (rv)
diff --git a/src/vnet/session/application_worker.c b/src/vnet/session/application_worker.c
index c45679735b9..bb51cb71f03 100644
--- a/src/vnet/session/application_worker.c
+++ b/src/vnet/session/application_worker.c
@@ -150,7 +150,8 @@ app_worker_alloc_session_fifos (segment_manager_t * sm, session_t * s)
   svm_fifo_t *rx_fifo = 0, *tx_fifo = 0;
   int rv;
 
-  if ((rv = segment_manager_alloc_session_fifos (sm, &rx_fifo, &tx_fifo)))
+  if ((rv = segment_manager_alloc_session_fifos (sm, s->thread_index,
+						 &rx_fifo, &tx_fifo)))
     return rv;
 
   rx_fifo->master_session_index = s->session_index;
diff --git a/src/vnet/session/segment_manager.c b/src/vnet/session/segment_manager.c
index 9c33e35e8f0..5247b0e7461 100644
--- a/src/vnet/session/segment_manager.c
+++ b/src/vnet/session/segment_manager.c
@@ -54,6 +54,7 @@ segment_manager_props_init (segment_manager_props_t * props)
   props->rx_fifo_size = sm_main.default_fifo_size;
   props->tx_fifo_size = sm_main.default_fifo_size;
   props->evt_q_size = sm_main.default_app_mq_size;
+  props->n_slices = vlib_num_workers () + 1;
   return props;
 }
 
@@ -151,6 +152,7 @@ segment_manager_add_segment (segment_manager_t * sm, u32 segment_size)
   /*
    * Initialize fifo segment
    */
+  fs->n_slices = props->n_slices;
   fifo_segment_init (fs);
 
   /*
@@ -470,30 +472,34 @@ segment_manager_has_fifos (segment_manager_t * sm)
 void
 segment_manager_del_sessions (segment_manager_t * sm)
 {
-  fifo_segment_t *fifo_segment;
   session_handle_t *handles = 0, *handle;
+  fifo_segment_t *fs;
   session_t *session;
-  svm_fifo_t *fifo;
+  int slice_index;
+  svm_fifo_t *f;
 
   ASSERT (pool_elts (sm->segments) != 0);
 
   /* Across all fifo segments used by the server */
   /* *INDENT-OFF* */
-  segment_manager_foreach_segment_w_lock (fifo_segment, sm, ({
-    fifo = fifo_segment_get_fifo_list (fifo_segment);
-
-    /*
-     * Remove any residual sessions from the session lookup table
-     * Don't bother deleting the individual fifos, we're going to
-     * throw away the fifo segment in a minute.
-     */
-    while (fifo)
+  segment_manager_foreach_segment_w_lock (fs, sm, ({
+    for (slice_index = 0; slice_index < fs->n_slices; slice_index++)
       {
-	session = session_get_if_valid (fifo->master_session_index,
-	                                fifo->master_thread_index);
-	if (session)
-	  vec_add1 (handles, session_handle (session));
-	fifo = fifo->next;
+        f = fifo_segment_get_slice_fifo_list (fs, slice_index);
+
+        /*
+         * Remove any residual sessions from the session lookup table
+         * Don't bother deleting the individual fifos, we're going to
+         * throw away the fifo segment in a minute.
+         */
+        while (f)
+          {
+            session = session_get_if_valid (f->master_session_index,
+                                            f->master_thread_index);
+            if (session)
+              vec_add1 (handles, session_handle (session));
+            f = f->next;
+          }
       }
 
     /* Instead of removing the segment, test when cleaning up disconnected
@@ -508,16 +514,19 @@ segment_manager_del_sessions (segment_manager_t * sm)
 
 int
 segment_manager_try_alloc_fifos (fifo_segment_t * fifo_segment,
+				 u32 thread_index,
 				 u32 rx_fifo_size, u32 tx_fifo_size,
 				 svm_fifo_t ** rx_fifo, svm_fifo_t ** tx_fifo)
 {
   rx_fifo_size = clib_max (rx_fifo_size, sm_main.default_fifo_size);
-  *rx_fifo = fifo_segment_alloc_fifo (fifo_segment, rx_fifo_size,
-				      FIFO_SEGMENT_RX_FIFO);
+  *rx_fifo = fifo_segment_alloc_fifo_w_slice (fifo_segment, thread_index,
+					      rx_fifo_size,
+					      FIFO_SEGMENT_RX_FIFO);
 
   tx_fifo_size = clib_max (tx_fifo_size, sm_main.default_fifo_size);
-  *tx_fifo = fifo_segment_alloc_fifo (fifo_segment, tx_fifo_size,
-				      FIFO_SEGMENT_TX_FIFO);
+  *tx_fifo = fifo_segment_alloc_fifo_w_slice (fifo_segment, thread_index,
+					      tx_fifo_size,
+					      FIFO_SEGMENT_TX_FIFO);
 
   if (*rx_fifo == 0)
     {
@@ -544,6 +553,7 @@ segment_manager_try_alloc_fifos (fifo_segment_t * fifo_segment,
 
 int
 segment_manager_alloc_session_fifos (segment_manager_t * sm,
+				     u32 thread_index,
 				     svm_fifo_t ** rx_fifo,
 				     svm_fifo_t ** tx_fifo)
 {
@@ -563,6 +573,7 @@ segment_manager_alloc_session_fifos (segment_manager_t * sm,
   /* *INDENT-OFF* */
   segment_manager_foreach_segment_w_lock (fs, sm, ({
     alloc_fail = segment_manager_try_alloc_fifos (fs,
+                                                  thread_index,
                                                   props->rx_fifo_size,
                                                   props->tx_fifo_size,
                                                   rx_fifo, tx_fifo);
@@ -616,7 +627,8 @@ alloc_check:
 	  return SESSION_ERROR_SEG_CREATE;
 	}
       fs = segment_manager_get_segment_w_lock (sm, new_fs_index);
-      alloc_fail = segment_manager_try_alloc_fifos (fs, props->rx_fifo_size,
+      alloc_fail = segment_manager_try_alloc_fifos (fs, thread_index,
+						    props->rx_fifo_size,
 						    props->tx_fifo_size,
 						    rx_fifo, tx_fifo);
       added_a_segment = 1;
@@ -883,11 +895,13 @@ VLIB_CLI_COMMAND (segment_manager_show_command, static) =
 void
 segment_manager_format_sessions (segment_manager_t * sm, int verbose)
 {
-  fifo_segment_t *fifo_segment;
   vlib_main_t *vm = vlib_get_main ();
   app_worker_t *app_wrk;
+  fifo_segment_t *fs;
   const u8 *app_name;
-  u8 *s = 0;
+  int slice_index;
+  u8 *s = 0, *str;
+  svm_fifo_t *f;
 
   if (!sm)
     {
@@ -905,35 +919,35 @@ segment_manager_format_sessions (segment_manager_t * sm, int verbose)
   clib_rwlock_reader_lock (&sm->segments_rwlock);
 
   /* *INDENT-OFF* */
-  pool_foreach (fifo_segment, sm->segments, ({
-    svm_fifo_t *fifo;
-    u8 *str;
-
-    fifo = fifo_segment_get_fifo_list (fifo_segment);
-    while (fifo)
+  pool_foreach (fs, sm->segments, ({
+    for (slice_index = 0; slice_index < fs->n_slices; slice_index++)
       {
-        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;
+        f = fifo_segment_get_slice_fifo_list (fs, slice_index);
+        while (f)
+          {
+            u32 session_index, thread_index;
+            session_t *session;
+
+            session_index = f->master_session_index;
+            thread_index = f->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);
+
+            f = f->next;
+          }
+        vec_free (s);
       }
-    vec_free (s);
   }));
   /* *INDENT-ON* */
 
diff --git a/src/vnet/session/segment_manager.h b/src/vnet/session/segment_manager.h
index 8358c50ba06..f2a90c8f935 100644
--- a/src/vnet/session/segment_manager.h
+++ b/src/vnet/session/segment_manager.h
@@ -31,6 +31,7 @@ typedef struct _segment_manager_props
   u8 add_segment:1;			/**< can add new segments flag */
   u8 use_mq_eventfd:1;			/**< use eventfds for mqs flag */
   u8 reserved:6;			/**< reserved flags */
+  u8 n_slices;				/**< number of fs slices/threads */
   ssvm_segment_type_t segment_type;	/**< seg type: if set to SSVM_N_TYPES,
 					     private segments are used */
 } segment_manager_props_t;
@@ -106,9 +107,11 @@ void segment_manager_segment_reader_unlock (segment_manager_t * sm);
 void segment_manager_segment_writer_unlock (segment_manager_t * sm);
 
 int segment_manager_alloc_session_fifos (segment_manager_t * sm,
+					 u32 thread_index,
 					 svm_fifo_t ** rx_fifo,
 					 svm_fifo_t ** tx_fifo);
 int segment_manager_try_alloc_fifos (fifo_segment_t * fs,
+				     u32 thread_index,
 				     u32 rx_fifo_size, u32 tx_fifo_size,
 				     svm_fifo_t ** rx_fifo,
 				     svm_fifo_t ** tx_fifo);