X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsegment_manager.c;h=6386645a9748127a90db367cbd5934aa1a27a258;hb=2af0e3a74c40e5df946813324574ccc18feb4761;hp=c7d2482d6bff6e2ce7c83a09f5e249ba52284dec;hpb=52207f1b7b60cb0784d5241f0a4d40eef531c67e;p=vpp.git

diff --git a/src/vnet/session/segment_manager.c b/src/vnet/session/segment_manager.c
index c7d2482d6bf..6386645a974 100644
--- a/src/vnet/session/segment_manager.c
+++ b/src/vnet/session/segment_manager.c
@@ -34,7 +34,8 @@ static u32 default_app_evt_queue_size = 128;
 segment_manager_properties_t *
 segment_manager_properties_get (segment_manager_t * sm)
 {
-  return application_get_segment_manager_properties (sm->app_index);
+  app_worker_t *app_wrk = app_worker_get (sm->app_wrk_index);
+  return application_get_segment_manager_properties (app_wrk->app_index);
 }
 
 segment_manager_properties_t *
@@ -50,13 +51,13 @@ segment_manager_properties_init (segment_manager_properties_t * props)
 static u8
 segment_manager_app_detached (segment_manager_t * sm)
 {
-  return (sm->app_index == SEGMENT_MANAGER_INVALID_APP_INDEX);
+  return (sm->app_wrk_index == SEGMENT_MANAGER_INVALID_APP_INDEX);
 }
 
 void
 segment_manager_app_detach (segment_manager_t * sm)
 {
-  sm->app_index = SEGMENT_MANAGER_INVALID_APP_INDEX;
+  sm->app_wrk_index = SEGMENT_MANAGER_INVALID_APP_INDEX;
 }
 
 always_inline u32
@@ -81,14 +82,14 @@ segment_manager_del_segment (segment_manager_t * sm,
   ssvm_delete (&fs->ssvm);
 
   if (CLIB_DEBUG)
-    memset (fs, 0xfb, sizeof (*fs));
+    clib_memset (fs, 0xfb, sizeof (*fs));
   pool_put (sm->segments, fs);
 }
 
 /**
  * Removes segment after acquiring writer lock
  */
-always_inline void
+static inline void
 segment_manager_lock_and_del_segment (segment_manager_t * sm, u32 fs_index)
 {
   svm_fifo_segment_private_t *fs;
@@ -181,7 +182,7 @@ segment_manager_add_segment (segment_manager_t * sm, u32 segment_size)
     {
       pool_get (sm->segments, seg);
     }
-  memset (seg, 0, sizeof (*seg));
+  clib_memset (seg, 0, sizeof (*seg));
 
   /*
    * Initialize ssvm segment and svm fifo private header
@@ -192,7 +193,7 @@ segment_manager_add_segment (segment_manager_t * sm, u32 segment_size)
   if (props->segment_type != SSVM_SEGMENT_PRIVATE)
     {
       seg_name = format (0, "%d-%d%c", getpid (), segment_name_counter++, 0);
-      alloc_size = segment_size + rnd_margin;
+      alloc_size = (uword) segment_size + rnd_margin;
       baseva = clib_valloc_alloc (&smm->va_allocator, alloc_size, 0);
       if (!baseva)
 	{
@@ -237,7 +238,7 @@ segment_manager_new ()
   segment_manager_main_t *smm = &segment_manager_main;
   segment_manager_t *sm;
   pool_get (smm->segment_managers, sm);
-  memset (sm, 0, sizeof (*sm));
+  clib_memset (sm, 0, sizeof (*sm));
   clib_rwlock_init (&sm->segments_rwlock);
   return sm;
 }
@@ -252,8 +253,7 @@ segment_manager_init (segment_manager_t * sm, u32 first_seg_size,
 {
   u32 rx_fifo_size, tx_fifo_size, pair_size;
   u32 rx_rounded_data_size, tx_rounded_data_size;
-  u64 approx_total_size, max_seg_size =
-    ((u64) 1 << 32) - clib_mem_get_page_size ();
+  u64 approx_total_size, max_seg_size = ((u64) 1 << 32) - (128 << 10);
   segment_manager_properties_t *props;
   svm_fifo_segment_private_t *segment;
   u32 approx_segment_count;
@@ -290,8 +290,7 @@ segment_manager_init (segment_manager_t * sm, u32 first_seg_size,
 
 	  segment = segment_manager_get_segment (sm, seg_index);
 	  if (i == 0)
-	    sm->event_queue = segment_manager_alloc_queue (segment,
-							   props->evt_q_size);
+	    sm->event_queue = segment_manager_alloc_queue (segment, props);
 
 	  svm_fifo_segment_preallocate_fifo_pairs (segment,
 						   props->rx_fifo_size,
@@ -311,8 +310,7 @@ segment_manager_init (segment_manager_t * sm, u32 first_seg_size,
 	  return seg_index;
 	}
       segment = segment_manager_get_segment (sm, seg_index);
-      sm->event_queue = segment_manager_alloc_queue (segment,
-						     props->evt_q_size);
+      sm->event_queue = segment_manager_alloc_queue (segment, props);
     }
 
   return 0;
@@ -368,11 +366,11 @@ segment_manager_del_sessions (segment_manager_t * sm)
      */
     while (fifo)
       {
-	if (fifo->master_thread_index == 255)
+	if (fifo->ct_session_index != SVM_FIFO_INVALID_SESSION_INDEX)
 	  {
 	    svm_fifo_t *next = fifo->next;
-	    application_local_session_disconnect_w_index (sm->app_index,
-	                                                  fifo->master_session_index);
+	    application_local_session_disconnect_w_index (sm->app_wrk_index,
+	                                                  fifo->ct_session_index);
 	    fifo = next;
 	    continue;
 	  }
@@ -421,7 +419,7 @@ segment_manager_del (segment_manager_t * sm)
 
   clib_rwlock_free (&sm->segments_rwlock);
   if (CLIB_DEBUG)
-    memset (sm, 0xfe, sizeof (*sm));
+    clib_memset (sm, 0xfe, sizeof (*sm));
   pool_put (smm->segment_managers, sm);
 }
 
@@ -520,8 +518,8 @@ alloc_check:
       *fifo_segment_index = segment_manager_segment_index (sm, fifo_segment);
 
       if (added_a_segment)
-	rv = application_add_segment_notify (sm->app_index,
-					     &fifo_segment->ssvm);
+	rv = app_worker_add_segment_notify (sm->app_wrk_index,
+					    &fifo_segment->ssvm);
       /* Drop the lock after app is notified */
       segment_manager_segment_reader_unlock (sm);
       return rv;
@@ -593,7 +591,9 @@ segment_manager_dealloc_fifos (u32 segment_index, svm_fifo_t * rx_fifo,
       /* Remove segment manager if no sessions and detached from app */
       if (segment_manager_app_detached (sm)
 	  && !segment_manager_has_fifos (sm))
-	segment_manager_del (sm);
+	{
+	  segment_manager_del (sm);
+	}
     }
   else
     segment_manager_segment_reader_unlock (sm);
@@ -623,7 +623,7 @@ segment_manager_evt_q_expected_size (u32 q_len)
  */
 svm_msg_q_t *
 segment_manager_alloc_queue (svm_fifo_segment_private_t * segment,
-			     u32 queue_size)
+			     segment_manager_properties_t * props)
 {
   u32 fifo_evt_size, session_evt_size = 256, notif_q_size;
   svm_msg_q_cfg_t _cfg, *cfg = &_cfg;
@@ -631,21 +631,27 @@ segment_manager_alloc_queue (svm_fifo_segment_private_t * segment,
   void *oldheap;
 
   fifo_evt_size = sizeof (session_event_t);
-  notif_q_size = clib_max (16, queue_size >> 4);
+  notif_q_size = clib_max (16, props->evt_q_size >> 4);
   /* *INDENT-OFF* */
   svm_msg_q_ring_cfg_t rc[SESSION_MQ_N_RINGS] = {
-    {queue_size, fifo_evt_size, 0},
+    {props->evt_q_size, fifo_evt_size, 0},
     {notif_q_size, session_evt_size, 0}
   };
   /* *INDENT-ON* */
   cfg->consumer_pid = 0;
   cfg->n_rings = 2;
-  cfg->q_nitems = queue_size;
+  cfg->q_nitems = props->evt_q_size;
   cfg->ring_cfgs = rc;
 
   oldheap = ssvm_push_heap (segment->ssvm.sh);
   q = svm_msg_q_alloc (cfg);
   ssvm_pop_heap (oldheap);
+
+  if (props->use_mq_eventfd)
+    {
+      if (svm_msg_q_alloc_producer_eventfd (q))
+	clib_warning ("failed to alloc eventfd");
+    }
   return q;
 }
 
@@ -717,8 +723,8 @@ segment_manager_show_fn (vlib_main_t * vm, unformat_input_t * input,
 
       /* *INDENT-OFF* */
       pool_foreach (sm, smm->segment_managers, ({
-	vlib_cli_output (vm, "%-10d%=15d%=12d", segment_manager_index(sm),
-			   sm->app_index, pool_elts (sm->segments));
+	vlib_cli_output (vm, "%-10d%=15d%=12d", segment_manager_index (sm),
+			   sm->app_wrk_index, pool_elts (sm->segments));
       }));
       /* *INDENT-ON* */