session: segment manager refactor

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

diff --git a/src/vnet/session/session.h b/src/vnet/session/session.h
index b76e56d..ec00e29 100644 (file)
--- a/src/vnet/session/session.h
+++ b/src/vnet/session/session.h
@@ -18,9 +18,9 @@
 #include <vnet/session/stream_session.h>
 #include <vnet/session/session_lookup.h>
 #include <vnet/session/transport_interface.h>
-#include <vlibmemory/unix_shared_memory_queue.h>
 #include <vnet/session/session_debug.h>
 #include <vnet/session/segment_manager.h>
+#include <svm/queue.h>
 
 #define HALF_OPEN_LOOKUP_INVALID_VALUE ((u64)~0)
 #define INVALID_INDEX ((u32)~0)
@@ -70,7 +70,8 @@ _(FIFO_FULL, "Packets dropped for lack of rx fifo space")               \
 _(EVENT_FIFO_FULL, "Events not sent for lack of event fifo space")      \
 _(API_QUEUE_FULL, "Sessions not created for lack of API queue space")   \
 _(NEW_SEG_NO_SPACE, "Created segment, couldn't allocate a fifo pair")   \
-_(NO_SPACE, "Couldn't allocate a fifo pair")
+_(NO_SPACE, "Couldn't allocate a fifo pair")                           \
+_(SEG_CREATE, "Couldn't create a new segment")
 
 typedef enum
 {
@@ -118,12 +119,8 @@ struct _session_manager_main
   /** Per worker thread session pools */
   stream_session_t **sessions;
 
-  /** Per worker-thread count of threads peeking into the session pool */
-  u32 *session_peekers;
-
-  /** Per worker-thread rw peekers locks */
-  clib_spinlock_t *peekers_readers_locks;
-  clib_spinlock_t *peekers_write_locks;
+  /** Per worker-thread session pool peekers rw locks */
+  clib_rwlock_t *peekers_rw_locks;
 
   /** Pool of listen sessions. Same type as stream sessions to ease lookups */
   stream_session_t **listen_sessions;
@@ -147,7 +144,10 @@ struct _session_manager_main
   session_fifo_event_t **pending_disconnects;
 
   /** vpp fifo event queue */
-  unix_shared_memory_queue_t **vpp_event_queues;
+  svm_queue_t **vpp_event_queues;
+
+  /** Event queues memfd segment initialized only if so configured */
+  ssvm_private_t evt_qs_segment;
 
   /** Unique segment name counter */
   u32 unique_segment_name_counter;
@@ -170,7 +170,13 @@ struct _session_manager_main
    * Config parameters
    */
 
-  /** session table size parameters */
+  /** Session ssvm segment configs*/
+  uword session_baseva;
+  uword session_va_space_size;
+  u32 evt_qs_segment_size;
+  u8 evt_qs_use_memfd_seg;
+
+  /** Session table size parameters */
   u32 configured_v4_session_table_buckets;
   u32 configured_v4_session_table_memory;
   u32 configured_v4_halfopen_table_buckets;
@@ -307,11 +313,7 @@ session_pool_add_peeker (u32 thread_index)
   session_manager_main_t *smm = &session_manager_main;
   if (thread_index == vlib_get_thread_index ())
     return;
-  clib_spinlock_lock_if_init (&smm->peekers_readers_locks[thread_index]);
-  smm->session_peekers[thread_index] += 1;
-  if (smm->session_peekers[thread_index] == 1)
-    clib_spinlock_lock_if_init (&smm->peekers_write_locks[thread_index]);
-  clib_spinlock_unlock_if_init (&smm->peekers_readers_locks[thread_index]);
+  clib_rwlock_reader_lock (&smm->peekers_rw_locks[thread_index]);
 }
 
 always_inline void
@@ -320,12 +322,7 @@ session_pool_remove_peeker (u32 thread_index)
   session_manager_main_t *smm = &session_manager_main;
   if (thread_index == vlib_get_thread_index ())
     return;
-  ASSERT (session_manager_main.session_peekers[thread_index] > 0);
-  clib_spinlock_lock_if_init (&smm->peekers_readers_locks[thread_index]);
-  smm->session_peekers[thread_index] -= 1;
-  if (smm->session_peekers[thread_index] == 0)
-    clib_spinlock_unlock_if_init (&smm->peekers_write_locks[thread_index]);
-  clib_spinlock_unlock_if_init (&smm->peekers_readers_locks[thread_index]);
+  clib_rwlock_reader_unlock (&smm->peekers_rw_locks[thread_index]);
 }
 
 /**
@@ -439,10 +436,12 @@ int session_open (u32 app_index, session_endpoint_t * tep, u32 opaque);
 int stream_session_listen (stream_session_t * s, session_endpoint_t * tep);
 int stream_session_stop_listen (stream_session_t * s);
 void stream_session_disconnect (stream_session_t * s);
+void stream_session_disconnect_transport (stream_session_t * s);
 void stream_session_cleanup (stream_session_t * s);
 void session_send_session_evt_to_thread (u64 session_handle,
                                         fifo_event_type_t evt_type,
                                         u32 thread_index);
+ssvm_private_t *session_manager_get_evt_q_segment (void);
 
 u8 *format_stream_session (u8 * s, va_list * args);
 uword unformat_stream_session (unformat_input_t * input, va_list * args);
@@ -455,7 +454,7 @@ void session_register_transport (transport_proto_t transport_proto,
 
 clib_error_t *vnet_session_enable_disable (vlib_main_t * vm, u8 is_en);
 
-always_inline unix_shared_memory_queue_t *
+always_inline svm_queue_t *
 session_manager_get_vpp_event_queue (u32 thread_index)
 {
   return session_manager_main.vpp_event_queues[thread_index];