svm: allow mq attachments at random offsets

[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 65f3f08..eca199f 100644 (file)
--- a/src/vnet/session/segment_manager.c
+++ b/src/vnet/session/segment_manager.c
@@ -211,6 +211,7 @@ segment_manager_del_segment (segment_manager_t * sm, fifo_segment_t * fs)
        }
     }
 
+  fifo_segment_cleanup (fs);
   ssvm_delete (&fs->ssvm);
 
   if (CLIB_DEBUG)
@@ -469,7 +470,8 @@ segment_manager_free (segment_manager_t * sm)
   segment_manager_main_t *smm = &sm_main;
   fifo_segment_t *fifo_segment;
 
-  ASSERT (!segment_manager_has_fifos (sm)
+  ASSERT (vlib_get_thread_index () == 0
+         && !segment_manager_has_fifos (sm)
          && segment_manager_app_detached (sm));
 
   if (sm->flags & SEG_MANAGER_F_DETACHED_LISTENER)
@@ -495,9 +497,38 @@ segment_manager_free (segment_manager_t * sm)
   pool_put (smm->segment_managers, sm);
 }
 
+static void
+sm_free_w_index_helper (void *arg)
+{
+  u32 sm_index = *(u32 *) arg;
+  segment_manager_t *sm;
+
+  ASSERT (vlib_get_thread_index () == 0);
+
+  if ((sm = segment_manager_get_if_valid (sm_index)))
+    segment_manager_free (sm);
+}
+
+static void
+segment_manager_free_safe (segment_manager_t * sm)
+{
+  if (!vlib_thread_is_main_w_barrier ())
+    {
+      u32 sm_index = segment_manager_index (sm);
+      vlib_rpc_call_main_thread (sm_free_w_index_helper, (u8 *) & sm_index,
+                                sizeof (sm_index));
+    }
+  else
+    {
+      segment_manager_free (sm);
+    }
+}
+
 void
 segment_manager_init_free (segment_manager_t * sm)
 {
+  ASSERT (vlib_get_thread_index () == 0);
+
   segment_manager_app_detach (sm);
   if (segment_manager_has_fifos (sm))
     segment_manager_del_sessions (sm);
@@ -582,12 +613,12 @@ segment_manager_del_sessions (segment_manager_t * sm)
          */
         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;
-          }
+           session = session_get_if_valid (f->shr->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
@@ -785,9 +816,7 @@ segment_manager_dealloc_fifos (svm_fifo_t * rx_fifo, svm_fifo_t * tx_fifo)
       /* Remove segment manager if no sessions and detached from app */
       if (segment_manager_app_detached (sm)
          && !segment_manager_has_fifos (sm))
-       {
-         segment_manager_free (sm);
-       }
+       segment_manager_free_safe (sm);
     }
   else
     segment_manager_segment_reader_unlock (sm);
@@ -813,7 +842,7 @@ segment_manager_attach_fifo (segment_manager_t * sm, svm_fifo_t * f,
   fifo_segment_attach_fifo (fs, f, s->thread_index);
   segment_manager_segment_reader_unlock (sm);
 
-  f->master_session_index = s->session_index;
+  f->shr->master_session_index = s->session_index;
   f->master_thread_index = s->thread_index;
 }
 
@@ -846,7 +875,6 @@ segment_manager_alloc_queue (fifo_segment_t * segment,
   u32 fifo_evt_size, session_evt_size = 256, notif_q_size;
   svm_msg_q_cfg_t _cfg, *cfg = &_cfg;
   svm_msg_q_t *q;
-  void *oldheap;
 
   fifo_evt_size = sizeof (session_event_t);
   notif_q_size = clib_max (16, props->evt_q_size >> 4);
@@ -861,10 +889,7 @@ segment_manager_alloc_queue (fifo_segment_t * segment,
   cfg->q_nitems = props->evt_q_size;
   cfg->ring_cfgs = rc;
 
-  oldheap = ssvm_push_heap (segment->ssvm.sh);
-  q = svm_msg_q_alloc (cfg);
-  fifo_segment_update_free_bytes (segment);
-  ssvm_pop_heap (oldheap);
+  q = fifo_segment_msg_q_alloc (segment, 0, cfg);
 
   if (props->use_mq_eventfd)
     {
@@ -1033,25 +1058,26 @@ segment_manager_format_sessions (segment_manager_t * sm, int verbose)
             u32 session_index, thread_index;
             session_t *session;
 
-            session_index = f->master_session_index;
-            thread_index = f->master_thread_index;
+           session_index = f->shr->master_session_index;
+           thread_index = f->master_thread_index;
 
-            session = session_get (session_index, thread_index);
-            str = format (0, "%U", format_session, session, verbose);
+           session = session_get (session_index, thread_index);
+           str = format (0, "%U", format_session, session, verbose);
 
-            if (verbose)
-              s = format (s, "%-40v%-20v%-15u%-10u", str, app_name,
-                          app_wrk->api_client_index, app_wrk->connects_seg_manager);
-            else
-              s = format (s, "%-40v%-20v", str, app_name);
+           if (verbose)
+             s = format (s, "%-40v%-20v%-15u%-10u", str, app_name,
+                         app_wrk->api_client_index,
+                         app_wrk->connects_seg_manager);
+           else
+             s = format (s, "%-40v%-20v", str, app_name);
 
-            vlib_cli_output (vm, "%v", s);
-            vec_reset_length (s);
-            vec_free (str);
+           vlib_cli_output (vm, "%v", s);
+           vec_reset_length (s);
+           vec_free (str);
 
-            f = f->next;
-          }
-        vec_free (s);
+           f = f->next;
+         }
+       vec_free (s);
       }
   }
   /* *INDENT-ON* */