session: api to add new transport types

[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 25fbd6f..02ac1c0 100644 (file)
--- a/src/vnet/session/segment_manager.c
+++ b/src/vnet/session/segment_manager.c
@@ -26,11 +26,12 @@ typedef struct segment_manager_main_
   /*
    * Configuration
    */
-  u32 default_fifo_size;               /**< default rx/tx fifo size */
-  u32 default_segment_size;            /**< default fifo segment size */
-  u32 default_app_mq_size;             /**< default app msg q size */
-  u8 default_high_watermark;           /**< default high watermark % */
-  u8 default_low_watermark;            /**< default low watermark % */
+  u32 default_fifo_size;       /**< default rx/tx fifo size */
+  u32 default_segment_size;    /**< default fifo segment size */
+  u32 default_app_mq_size;     /**< default app msg q size */
+  u32 default_max_fifo_size;   /**< default max fifo size */
+  u8 default_high_watermark;   /**< default high watermark % */
+  u8 default_low_watermark;    /**< default low watermark % */
 } segment_manager_main_t;
 
 static segment_manager_main_t sm_main;
@@ -56,6 +57,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->max_fifo_size = sm_main.default_max_fifo_size;
   props->high_watermark = sm_main.default_high_watermark;
   props->low_watermark = sm_main.default_low_watermark;
   props->n_slices = vlib_num_workers () + 1;
@@ -169,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:
@@ -290,6 +293,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)
 {
@@ -335,6 +344,10 @@ segment_manager_init (segment_manager_t * sm)
                             sm_main.default_segment_size);
   prealloc_fifo_pairs = props->prealloc_fifos;
 
+  sm->max_fifo_size = props->max_fifo_size ?
+    props->max_fifo_size : sm_main.default_max_fifo_size;
+  sm->max_fifo_size = clib_max (sm->max_fifo_size, 4096);
+
   segment_manager_set_watermarks (sm,
                                  props->high_watermark,
                                  props->low_watermark);
@@ -452,27 +465,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)
 {
@@ -597,8 +589,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;
@@ -608,11 +601,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,
@@ -620,14 +624,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)
@@ -832,6 +832,7 @@ segment_manager_main_init (segment_manager_main_init_args_t * a)
   sm->default_fifo_size = 1 << 12;
   sm->default_segment_size = 1 << 20;
   sm->default_app_mq_size = 128;
+  sm->default_max_fifo_size = 4 << 20;
   sm->default_high_watermark = 80;
   sm->default_low_watermark = 50;
 }
@@ -844,6 +845,9 @@ segment_manager_show_fn (vlib_main_t * vm, unformat_input_t * input,
   u8 show_segments = 0, verbose = 0;
   segment_manager_t *sm;
   fifo_segment_t *seg;
+  app_worker_t *app_wrk;
+  application_t *app;
+  u8 custom_logic;
 
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
@@ -859,13 +863,22 @@ segment_manager_show_fn (vlib_main_t * vm, unformat_input_t * input,
                   pool_elts (smm->segment_managers));
   if (verbose && pool_elts (smm->segment_managers))
     {
-      vlib_cli_output (vm, "%-10s%=15s%=12s", "Index", "App Index",
-                      "Segments");
+      vlib_cli_output (vm, "%-6s%=10s%=10s%=13s%=11s%=11s%=12s",
+                      "Index", "AppIndex", "Segments", "MaxFifoSize",
+                      "HighWater", "LowWater", "FifoTuning");
 
       /* *INDENT-OFF* */
       pool_foreach (sm, smm->segment_managers, ({
-       vlib_cli_output (vm, "%-10d%=15d%=12d", segment_manager_index (sm),
-                          sm->app_wrk_index, pool_elts (sm->segments));
+        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;
+
+       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,
+                         sm->high_watermark, sm->low_watermark,
+                         custom_logic ? "custom" : "none");
       }));
       /* *INDENT-ON* */
 
@@ -961,8 +974,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;