vlib: Fix sh int addr

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

diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c
index 5065f78..9429ddb 100644 (file)
--- a/src/vnet/session/session.c
+++ b/src/vnet/session/session.c
@@ -1469,11 +1469,8 @@ session_transport_cleanup (session_t * s)
 /**
  * Allocate event queues in the shared-memory segment
  *
- * That can either be a newly created memfd segment, that will need to be
- * mapped by all stack users, or the binary api's svm region. The latter is
- * assumed to be already mapped. NOTE that this assumption DOES NOT hold if
- * api clients bootstrap shm api over sockets (i.e. use memfd segments) and
- * vpp uses api svm region for event queues.
+ * That can only be a newly created memfd segment, that must be
+ * mapped by all apps/stack users.
  */
 void
 session_vpp_event_queues_allocate (session_main_t * smm)
@@ -1488,29 +1485,22 @@ session_vpp_event_queues_allocate (session_main_t * smm)
   if (smm->configured_event_queue_length)
     evt_q_length = smm->configured_event_queue_length;
 
-  if (smm->evt_qs_use_memfd_seg)
-    {
-      if (smm->evt_qs_segment_size)
-       eqs_size = smm->evt_qs_segment_size;
+  if (smm->evt_qs_segment_size)
+    eqs_size = smm->evt_qs_segment_size;
 
-      eqs->ssvm_size = eqs_size;
-      eqs->i_am_master = 1;
-      eqs->my_pid = vpp_pid;
-      eqs->name = format (0, "%s%c", "session: evt-qs-segment", 0);
-      /* clib_mem_vm_map_shared consumes first page before requested_va */
-      eqs->requested_va = smm->session_baseva + clib_mem_get_page_size ();
+  eqs->ssvm_size = eqs_size;
+  eqs->my_pid = vpp_pid;
+  eqs->name = format (0, "%s%c", "session: evt-qs-segment", 0);
+  /* clib_mem_vm_map_shared consumes first page before requested_va */
+  eqs->requested_va = smm->session_baseva + clib_mem_get_page_size ();
 
-      if (ssvm_master_init (eqs, SSVM_SEGMENT_MEMFD))
-       {
-         clib_warning ("failed to initialize queue segment");
-         return;
-       }
+  if (ssvm_server_init (eqs, SSVM_SEGMENT_MEMFD))
+    {
+      clib_warning ("failed to initialize queue segment");
+      return;
     }
 
-  if (smm->evt_qs_use_memfd_seg)
-    oldheap = ssvm_push_heap (eqs->sh);
-  else
-    oldheap = vl_msg_push_heap ();
+  oldheap = ssvm_push_heap (eqs->sh);
 
   for (i = 0; i < vec_len (smm->wrk); i++)
     {
@@ -1525,26 +1515,17 @@ session_vpp_event_queues_allocate (session_main_t * smm)
       cfg->q_nitems = evt_q_length;
       cfg->ring_cfgs = rc;
       smm->wrk[i].vpp_event_queue = svm_msg_q_alloc (cfg);
-      if (smm->evt_qs_use_memfd_seg)
-       {
-         if (svm_msg_q_alloc_consumer_eventfd (smm->wrk[i].vpp_event_queue))
-           clib_warning ("eventfd returned");
-       }
+      if (svm_msg_q_alloc_consumer_eventfd (smm->wrk[i].vpp_event_queue))
+       clib_warning ("eventfd returned");
     }
 
-  if (smm->evt_qs_use_memfd_seg)
-    ssvm_pop_heap (oldheap);
-  else
-    vl_msg_pop_heap (oldheap);
+  ssvm_pop_heap (oldheap);
 }
 
 ssvm_private_t *
 session_main_get_evt_q_segment (void)
 {
-  session_main_t *smm = &session_main;
-  if (smm->evt_qs_use_memfd_seg)
-    return &smm->evt_qs_segment;
-  return 0;
+  return &session_main.evt_qs_segment;
 }
 
 u64
@@ -1666,6 +1647,10 @@ session_manager_main_enable (vlib_main_t * vm)
   session_worker_t *wrk;
   int i;
 
+  /* We only initialize once and do not de-initialized on disable */
+  if (smm->is_initialized)
+    goto done;
+
   num_threads = 1 /* main thread */  + vtm->n_threads;
 
   if (num_threads < 1)
@@ -1722,6 +1707,9 @@ session_manager_main_enable (vlib_main_t * vm)
   session_lookup_init ();
   app_namespaces_init ();
   transport_init ();
+  smm->is_initialized = 1;
+
+done:
 
   smm->is_enabled = 1;
 
@@ -1732,6 +1720,12 @@ session_manager_main_enable (vlib_main_t * vm)
   return 0;
 }
 
+static void
+session_manager_main_disable (vlib_main_t * vm)
+{
+  transport_enable_disable (vm, 0 /* is_en */ );
+}
+
 void
 session_node_enable_disable (u8 is_en)
 {
@@ -1743,10 +1737,10 @@ session_node_enable_disable (u8 is_en)
   foreach_vlib_main (({
     if (have_workers && ii == 0)
       {
-       vlib_node_set_state (this_vlib_main, session_queue_process_node.index,
-                            state);
        if (is_en)
          {
+           vlib_node_set_state (this_vlib_main,
+                                session_queue_process_node.index, state);
            vlib_node_t *n = vlib_get_node (this_vlib_main,
                                            session_queue_process_node.index);
            vlib_start_process (this_vlib_main, n->runtime_index);
@@ -1781,6 +1775,7 @@ vnet_session_enable_disable (vlib_main_t * vm, u8 is_en)
   else
     {
       session_main.is_enabled = 0;
+      session_manager_main_disable (vm);
       session_node_enable_disable (is_en);
     }
 
@@ -1899,13 +1894,16 @@ session_config_fn (vlib_main_t * vm, unformat_input_t * input)
       else if (unformat (input, "local-endpoints-table-buckets %d",
                         &smm->local_endpoints_table_buckets))
        ;
+      /* Deprecated but maintained for compatibility */
       else if (unformat (input, "evt_qs_memfd_seg"))
-       smm->evt_qs_use_memfd_seg = 1;
+       ;
       else if (unformat (input, "evt_qs_seg_size %U", unformat_memory_size,
                         &smm->evt_qs_segment_size))
        ;
       else if (unformat (input, "enable"))
        smm->session_enable_asap = 1;
+      else if (unformat (input, "segment-baseva 0x%lx", &smm->session_baseva))
+       ;
       else if (unformat (input, "use-app-socket-api"))
        appns_sapi_enable ();
       else