1 files changed, 46 insertions, 73 deletions

diff --git a/src/vnet/session/session.h b/src/vnet/session/session.h
index 92fd5fafe7a..a7c91949eb3 100644
--- a/src/vnet/session/session.h
+++ b/src/vnet/session/session.h
@@ -18,8 +18,8 @@
 #include <vnet/session/session_types.h>
 #include <vnet/session/session_lookup.h>
 #include <vnet/session/session_debug.h>
-#include <vnet/session/segment_manager.h>
 #include <svm/message_queue.h>
+#include <svm/ssvm.h>
 
 #define SESSION_PROXY_LISTENER_INDEX ((u8)~0 - 1)
 
@@ -64,7 +64,7 @@ typedef struct session_tx_context_
   session_dgram_hdr_t hdr;
 } session_tx_context_t;
 
-typedef struct session_manager_worker_
+typedef struct session_worker_
 {
   CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
 
@@ -109,11 +109,11 @@ typedef struct session_manager_worker_
 
   u32 last_tx_packets;
 
-} session_manager_worker_t;
+} session_worker_t;
 
 typedef int (session_fifo_rx_fn) (vlib_main_t * vm,
 				  vlib_node_runtime_t * node,
-				  session_manager_worker_t * wrk,
+				  session_worker_t * wrk,
 				  session_event_t * e, int *n_tx_pkts);
 
 extern session_fifo_rx_fn session_tx_fifo_peek_and_snd;
@@ -122,10 +122,10 @@ extern session_fifo_rx_fn session_tx_fifo_dequeue_internal;
 
 u8 session_node_lookup_fifo_event (svm_fifo_t * f, session_event_t * e);
 
-typedef struct session_manager_main_
+typedef struct session_main_
 {
   /** Worker contexts */
-  session_manager_worker_t *wrk;
+  session_worker_t *wrk;
 
   /** Event queues memfd segment initialized only if so configured */
   ssvm_private_t evt_qs_segment;
@@ -182,9 +182,9 @@ typedef struct session_manager_main_
   f64 *last_event_poll_by_thread;
 #endif
 
-} session_manager_main_t;
+} session_main_t;
 
-extern session_manager_main_t session_manager_main;
+extern session_main_t session_main;
 extern vlib_node_registration_t session_queue_node;
 extern vlib_node_registration_t session_queue_process_node;
 
@@ -192,15 +192,11 @@ extern vlib_node_registration_t session_queue_process_node;
 #define SESSION_Q_PROCESS_STOP		2
 
 always_inline u8
-stream_session_is_valid (u32 si, u8 thread_index)
+session_is_valid (u32 si, u8 thread_index)
 {
   session_t *s;
-  s = pool_elt_at_index (session_manager_main.wrk[thread_index].sessions, si);
-  if (s->thread_index != thread_index || s->session_index != si
-      /* || s->server_rx_fifo->master_session_index != si
-         || s->server_tx_fifo->master_session_index != si
-         || s->server_rx_fifo->master_thread_index != thread_index
-         || s->server_tx_fifo->master_thread_index != thread_index */ )
+  s = pool_elt_at_index (session_main.wrk[thread_index].sessions, si);
+  if (s->thread_index != thread_index || s->session_index != si)
     return 0;
   return 1;
 }
@@ -212,30 +208,27 @@ void session_free_w_fifos (session_t * s);
 always_inline session_t *
 session_get (u32 si, u32 thread_index)
 {
-  ASSERT (stream_session_is_valid (si, thread_index));
-  return pool_elt_at_index (session_manager_main.wrk[thread_index].sessions,
-			    si);
+  ASSERT (session_is_valid (si, thread_index));
+  return pool_elt_at_index (session_main.wrk[thread_index].sessions, si);
 }
 
 always_inline session_t *
 session_get_if_valid (u64 si, u32 thread_index)
 {
-  if (thread_index >= vec_len (session_manager_main.wrk))
+  if (thread_index >= vec_len (session_main.wrk))
     return 0;
 
-  if (pool_is_free_index (session_manager_main.wrk[thread_index].sessions,
-			  si))
+  if (pool_is_free_index (session_main.wrk[thread_index].sessions, si))
     return 0;
 
-  ASSERT (stream_session_is_valid (si, thread_index));
-  return pool_elt_at_index (session_manager_main.wrk[thread_index].sessions,
-			    si);
+  ASSERT (session_is_valid (si, thread_index));
+  return pool_elt_at_index (session_main.wrk[thread_index].sessions, si);
 }
 
 always_inline session_t *
 session_get_from_handle (session_handle_t handle)
 {
-  session_manager_main_t *smm = &session_manager_main;
+  session_main_t *smm = &session_main;
   u32 session_index, thread_index;
   session_parse_handle (handle, &session_index, &thread_index);
   return pool_elt_at_index (smm->wrk[thread_index].sessions, session_index);
@@ -249,18 +242,7 @@ session_get_from_handle_if_valid (session_handle_t handle)
   return session_get_if_valid (session_index, thread_index);
 }
 
-always_inline u64
-session_segment_handle (session_t * s)
-{
-  svm_fifo_t *f;
-
-  if (s->session_state == SESSION_STATE_LISTENING)
-    return SESSION_INVALID_HANDLE;
-
-  f = s->rx_fifo;
-  return segment_manager_make_segment_handle (f->segment_manager,
-					      f->segment_index);
-}
+u64 session_segment_handle (session_t * s);
 
 /**
  * Acquires a lock that blocks a session pool from expanding.
@@ -275,7 +257,7 @@ session_segment_handle (session_t * s)
 always_inline void
 session_pool_add_peeker (u32 thread_index)
 {
-  session_manager_worker_t *wrk = &session_manager_main.wrk[thread_index];
+  session_worker_t *wrk = &session_main.wrk[thread_index];
   if (thread_index == vlib_get_thread_index ())
     return;
   clib_rwlock_reader_lock (&wrk->peekers_rw_locks);
@@ -284,7 +266,7 @@ session_pool_add_peeker (u32 thread_index)
 always_inline void
 session_pool_remove_peeker (u32 thread_index)
 {
-  session_manager_worker_t *wrk = &session_manager_main.wrk[thread_index];
+  session_worker_t *wrk = &session_main.wrk[thread_index];
   if (thread_index == vlib_get_thread_index ())
     return;
   clib_rwlock_reader_unlock (&wrk->peekers_rw_locks);
@@ -299,7 +281,7 @@ always_inline session_t *
 session_get_from_handle_safe (u64 handle)
 {
   u32 thread_index = session_thread_from_handle (handle);
-  session_manager_worker_t *wrk = &session_manager_main.wrk[thread_index];
+  session_worker_t *wrk = &session_main.wrk[thread_index];
 
   if (thread_index == vlib_get_thread_index ())
     {
@@ -317,7 +299,7 @@ session_get_from_handle_safe (u64 handle)
 always_inline u32
 session_get_index (session_t * s)
 {
-  return (s - session_manager_main.wrk[s->thread_index].sessions);
+  return (s - session_main.wrk[s->thread_index].sessions);
 }
 
 always_inline session_t *
@@ -333,7 +315,7 @@ session_clone_safe (u32 session_index, u32 thread_index)
    */
   session_pool_add_peeker (thread_index);
   new_s = session_alloc (current_thread_index);
-  old_s = session_manager_main.wrk[thread_index].sessions + session_index;
+  old_s = session_main.wrk[thread_index].sessions + session_index;
   clib_memcpy_fast (new_s, old_s, sizeof (*new_s));
   session_pool_remove_peeker (thread_index);
   new_s->thread_index = current_thread_index;
@@ -357,8 +339,8 @@ void session_send_rpc_evt_to_thread (u32 thread_index, void *fp,
 transport_connection_t *session_get_transport (session_t * s);
 
 
-u8 *format_stream_session (u8 * s, va_list * args);
-uword unformat_stream_session (unformat_input_t * input, va_list * args);
+u8 *format_session (u8 * s, va_list * args);
+uword unformat_session (unformat_input_t * input, va_list * args);
 uword unformat_transport_connection (unformat_input_t * input,
 				     va_list * args);
 
@@ -373,17 +355,10 @@ int session_enqueue_dgram_connection (session_t * s,
 				      session_dgram_hdr_t * hdr,
 				      vlib_buffer_t * b, u8 proto,
 				      u8 queue_event);
-int stream_session_peek_bytes (transport_connection_t * tc, u8 * buffer,
-			       u32 offset, u32 max_bytes);
-u32 session_dequeue_drop (transport_connection_t * tc, u32 max_bytes);
-
 int session_stream_connect_notify (transport_connection_t * tc, u8 is_fail);
 int session_dgram_connect_notify (transport_connection_t * tc,
 				  u32 old_thread_index,
 				  session_t ** new_session);
-void stream_session_init_fifos_pointers (transport_connection_t * tc,
-					 u32 rx_pointer, u32 tx_pointer);
-
 int session_stream_accept_notify (transport_connection_t * tc);
 void session_transport_closing_notify (transport_connection_t * tc);
 void session_transport_delete_notify (transport_connection_t * tc);
@@ -391,10 +366,12 @@ void session_transport_closed_notify (transport_connection_t * tc);
 void session_transport_reset_notify (transport_connection_t * tc);
 int session_stream_accept (transport_connection_t * tc, u32 listener_index,
 			   u8 notify);
-u32 session_tx_fifo_max_dequeue (transport_connection_t * tc);
 void session_register_transport (transport_proto_t transport_proto,
 				 const transport_proto_vft_t * vft, u8 is_ip4,
 				 u32 output_node);
+int session_tx_fifo_peek_bytes (transport_connection_t * tc, u8 * buffer,
+				u32 offset, u32 max_bytes);
+u32 session_tx_fifo_dequeue_drop (transport_connection_t * tc, u32 max_bytes);
 
 always_inline u32
 transport_max_rx_enqueue (transport_connection_t * tc)
@@ -434,13 +411,13 @@ transport_rx_fifo_has_ooo_data (transport_connection_t * tc)
 always_inline f64
 transport_dispatch_period (u32 thread_index)
 {
-  return session_manager_main.wrk[thread_index].dispatch_period;
+  return session_main.wrk[thread_index].dispatch_period;
 }
 
 always_inline f64
 transport_time_now (u32 thread_index)
 {
-  return session_manager_main.wrk[thread_index].last_vlib_time;
+  return session_main.wrk[thread_index].last_vlib_time;
 }
 
 always_inline void
@@ -500,48 +477,44 @@ listen_session_free (session_t * s)
 
 transport_connection_t *listen_session_get_transport (session_t * s);
 
-int
-listen_session_get_local_session_endpoint (session_t * listener,
-					   session_endpoint_t * sep);
-
 /*
- * Session manager functions
+ * Session layer functions
  */
 
-always_inline session_manager_main_t *
-vnet_get_session_manager_main ()
+always_inline session_main_t *
+vnet_get_session_main ()
 {
-  return &session_manager_main;
+  return &session_main;
 }
 
-always_inline session_manager_worker_t *
-session_manager_get_worker (u32 thread_index)
+always_inline session_worker_t *
+session_main_get_worker (u32 thread_index)
 {
-  return &session_manager_main.wrk[thread_index];
+  return &session_main.wrk[thread_index];
 }
 
 always_inline svm_msg_q_t *
-session_manager_get_vpp_event_queue (u32 thread_index)
+session_main_get_vpp_event_queue (u32 thread_index)
 {
-  return session_manager_main.wrk[thread_index].vpp_event_queue;
+  return session_main.wrk[thread_index].vpp_event_queue;
 }
 
 always_inline u8
-session_manager_is_enabled ()
+session_main_is_enabled ()
 {
-  return session_manager_main.is_enabled == 1;
+  return session_main.is_enabled == 1;
 }
 
 #define session_cli_return_if_not_enabled()				\
 do {									\
-    if (!session_manager_main.is_enabled)				\
+    if (!session_main.is_enabled)				\
       return clib_error_return(0, "session layer is not enabled");	\
 } while (0)
 
-int session_manager_flush_enqueue_events (u8 proto, u32 thread_index);
-int session_manager_flush_all_enqueue_events (u8 transport_proto);
+int session_main_flush_enqueue_events (u8 proto, u32 thread_index);
+int session_main_flush_all_enqueue_events (u8 transport_proto);
 void session_flush_frames_main_thread (vlib_main_t * vm);
-ssvm_private_t *session_manager_get_evt_q_segment (void);
+ssvm_private_t *session_main_get_evt_q_segment (void);
 void session_node_enable_disable (u8 is_en);
 clib_error_t *vnet_session_enable_disable (vlib_main_t * vm, u8 is_en);