session: update fifo slice on session migration

[vpp.git] / src / vnet / session / segment_manager.c

diff --git a/src/vnet/session/segment_manager.c b/src/vnet/session/segment_manager.c
index eb3f63c..b40675a 100644 (file)
--- a/src/vnet/session/segment_manager.c
+++ b/src/vnet/session/segment_manager.c
@@ -171,6 +171,7 @@ segment_manager_add_segment (segment_manager_t * sm, uword segment_size)
    */
   fs->h->high_watermark = sm->high_watermark;
   fs->h->low_watermark = sm->low_watermark;
+  fs->h->pct_first_alloc = props->pct_first_alloc;
   fs->h->flags &= ~FIFO_SEGMENT_F_MEM_LIMIT;
 
 done:
@@ -210,6 +211,15 @@ segment_manager_del_segment (segment_manager_t * sm, fifo_segment_t * fs)
   pool_put (sm->segments, fs);
 }
 
+static fifo_segment_t *
+segment_manager_get_segment_if_valid (segment_manager_t * sm,
+                                     u32 segment_index)
+{
+  if (pool_is_free_index (sm->segments, segment_index))
+    return 0;
+  return pool_elt_at_index (sm->segments, segment_index);
+}
+
 /**
  * Removes segment after acquiring writer lock
  */
@@ -220,15 +230,18 @@ segment_manager_lock_and_del_segment (segment_manager_t * sm, u32 fs_index)
   u8 is_prealloc;
 
   clib_rwlock_writer_lock (&sm->segments_rwlock);
-  fs = segment_manager_get_segment (sm, fs_index);
+
+  fs = segment_manager_get_segment_if_valid (sm, fs_index);
+  if (!fs)
+    goto done;
+
   is_prealloc = fifo_segment_flags (fs) & FIFO_SEGMENT_F_IS_PREALLOCATED;
   if (is_prealloc && !segment_manager_app_detached (sm))
-    {
-      clib_rwlock_writer_unlock (&sm->segments_rwlock);
-      return;
-    }
+    goto done;
 
   segment_manager_del_segment (sm, fs);
+
+done:
   clib_rwlock_writer_unlock (&sm->segments_rwlock);
 }
 
@@ -292,6 +305,12 @@ segment_manager_get_segment_w_lock (segment_manager_t * sm, u32 segment_index)
   return pool_elt_at_index (sm->segments, segment_index);
 }
 
+void
+segment_manager_segment_reader_lock (segment_manager_t * sm)
+{
+  clib_rwlock_reader_lock (&sm->segments_rwlock);
+}
+
 void
 segment_manager_segment_reader_unlock (segment_manager_t * sm)
 {
@@ -458,27 +477,6 @@ segment_manager_get_if_valid (u32 index)
   return pool_elt_at_index (sm_main.segment_managers, index);
 }
 
-static fifo_segment_t *
-find_max_free_segment (segment_manager_t * sm, u32 thread_index)
-{
-  fifo_segment_t *cur, *fs = 0;
-  uword free_bytes, max_free_bytes = 0;
-
-  clib_rwlock_reader_lock (&sm->segments_rwlock);
-  /* *INDENT-OFF* */
-  pool_foreach (cur, sm->segments, ({
-    if ((free_bytes = fifo_segment_free_bytes (cur)) > max_free_bytes)
-      {
-        max_free_bytes = free_bytes;
-        fs = cur;
-      }
-  }));
-  /* *INDENT-ON* */
-  clib_rwlock_reader_unlock (&sm->segments_rwlock);
-
-  return fs;
-}
-
 u32
 segment_manager_index (segment_manager_t * sm)
 {
@@ -603,8 +601,9 @@ segment_manager_alloc_session_fifos (segment_manager_t * sm,
                                     svm_fifo_t ** tx_fifo)
 {
   int alloc_fail = 1, rv = 0, new_fs_index;
+  uword free_bytes, max_free_bytes = 0;
   segment_manager_props_t *props;
-  fifo_segment_t *fs = 0;
+  fifo_segment_t *fs = 0, *cur;
   u32 sm_index, fs_index;
   u8 added_a_segment = 0;
   u64 fs_handle;
@@ -614,11 +613,22 @@ segment_manager_alloc_session_fifos (segment_manager_t * sm,
   /*
    * Find the first free segment to allocate the fifos in
    */
-  fs = find_max_free_segment (sm, thread_index);
+
+  segment_manager_segment_reader_lock (sm);
+
+  /* *INDENT-OFF* */
+  pool_foreach (cur, sm->segments, ({
+    free_bytes = fifo_segment_available_bytes (cur);
+    if (free_bytes > max_free_bytes)
+      {
+        max_free_bytes = free_bytes;
+        fs = cur;
+      }
+  }));
+  /* *INDENT-ON* */
 
   if (fs)
     {
-      clib_rwlock_reader_lock (&sm->segments_rwlock);
       alloc_fail = segment_manager_try_alloc_fifos (fs, thread_index,
                                                    props->rx_fifo_size,
                                                    props->tx_fifo_size,
@@ -626,14 +636,10 @@ segment_manager_alloc_session_fifos (segment_manager_t * sm,
       /* On success, keep lock until fifos are initialized */
       if (!alloc_fail)
        goto alloc_success;
-
-      segment_manager_segment_reader_unlock (sm);
-    }
-  else
-    {
-      alloc_fail = 1;
     }
 
+  segment_manager_segment_reader_unlock (sm);
+
 alloc_check:
 
   if (!alloc_fail)
@@ -670,12 +676,12 @@ alloc_check:
        {
          clib_warning ("Added a segment, still can't allocate a fifo");
          segment_manager_segment_reader_unlock (sm);
-         return SESSION_ERROR_NEW_SEG_NO_SPACE;
+         return SESSION_E_SEG_NO_SPACE2;
        }
       if ((new_fs_index = segment_manager_add_segment (sm, 0)) < 0)
        {
          clib_warning ("Failed to add new segment");
-         return SESSION_ERROR_SEG_CREATE;
+         return SESSION_E_SEG_CREATE;
        }
       fs = segment_manager_get_segment_w_lock (sm, new_fs_index);
       alloc_fail = segment_manager_try_alloc_fifos (fs, thread_index,
@@ -688,7 +694,7 @@ alloc_check:
   else
     {
       clib_warning ("Can't add new seg and no space to allocate fifos!");
-      return SESSION_ERROR_NO_SPACE;
+      return SESSION_E_SEG_NO_SPACE;
     }
 }
 
@@ -737,6 +743,30 @@ segment_manager_dealloc_fifos (svm_fifo_t * rx_fifo, svm_fifo_t * tx_fifo)
     segment_manager_segment_reader_unlock (sm);
 }
 
+void
+segment_manager_detach_fifo (segment_manager_t * sm, svm_fifo_t * f)
+{
+  fifo_segment_t *fs;
+
+  fs = segment_manager_get_segment_w_lock (sm, f->segment_index);
+  fifo_segment_detach_fifo (fs, f);
+  segment_manager_segment_reader_unlock (sm);
+}
+
+void
+segment_manager_attach_fifo (segment_manager_t * sm, svm_fifo_t * f,
+                            session_t * s)
+{
+  fifo_segment_t *fs;
+
+  fs = segment_manager_get_segment_w_lock (sm, f->segment_index);
+  fifo_segment_attach_fifo (fs, f, s->thread_index);
+  segment_manager_segment_reader_unlock (sm);
+
+  f->master_session_index = s->session_index;
+  f->master_thread_index = s->thread_index;
+}
+
 u32
 segment_manager_evt_q_expected_size (u32 q_len)
 {
@@ -849,6 +879,7 @@ segment_manager_show_fn (vlib_main_t * vm, unformat_input_t * input,
 {
   segment_manager_main_t *smm = &sm_main;
   u8 show_segments = 0, verbose = 0;
+  uword max_fifo_size;
   segment_manager_t *sm;
   fifo_segment_t *seg;
   app_worker_t *app_wrk;
@@ -878,11 +909,12 @@ segment_manager_show_fn (vlib_main_t * vm, unformat_input_t * input,
         app_wrk = app_worker_get_if_valid (sm->app_wrk_index);
         app = app_wrk ? application_get (app_wrk->app_index) : 0;
         custom_logic = (app && (app->cb_fns.fifo_tuning_callback)) ? 1 : 0;
+        max_fifo_size = sm->max_fifo_size;
 
        vlib_cli_output (vm, "%-6d%=10d%=10d%=13U%=11d%=11d%=12s",
                          segment_manager_index (sm),
                         sm->app_wrk_index, pool_elts (sm->segments),
-                         format_memory_size, sm->max_fifo_size,
+                         format_memory_size, max_fifo_size,
                          sm->high_watermark, sm->low_watermark,
                          custom_logic ? "custom" : "none");
       }));
@@ -980,8 +1012,7 @@ void
 segment_manager_set_watermarks (segment_manager_t * sm,
                                u8 high_watermark, u8 low_watermark)
 {
-  ASSERT (high_watermark >= 0 && high_watermark <= 100 &&
-         low_watermark >= 0 && low_watermark <= 100 &&
+  ASSERT (high_watermark <= 100 && low_watermark <= 100 &&
          low_watermark <= high_watermark);
 
   sm->high_watermark = high_watermark;