session: api to add new transport types
[vpp.git] / src / vnet / session / session.h
index 364c646..0a72f97 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
 #ifndef __included_session_h__
 #define __included_session_h__
 
-#include <vnet/session/stream_session.h>
+#include <vppinfra/llist.h>
+#include <vnet/session/session_types.h>
 #include <vnet/session/session_lookup.h>
-#include <vnet/session/transport_interface.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)
-#define SESSION_PROXY_LISTENER_INDEX ((u32)~0 - 1)
-#define SESSION_LOCAL_HANDLE_PREFIX 0x7FFFFFFF
-
-/* TODO decide how much since we have pre-data as well */
-#define MAX_HDRS_LEN    100    /* Max number of bytes for headers */
-
-typedef enum
-{
-  FIFO_EVENT_APP_RX,
-  FIFO_EVENT_APP_TX,
-  FIFO_EVENT_TIMEOUT,
-  FIFO_EVENT_DISCONNECT,
-  FIFO_EVENT_BUILTIN_RX,
-  FIFO_EVENT_RPC,
-} fifo_event_type_t;
-
-static inline const char *
-fifo_event_type_str (fifo_event_type_t et)
-{
-  switch (et)
-    {
-    case FIFO_EVENT_APP_RX:
-      return "FIFO_EVENT_APP_RX";
-    case FIFO_EVENT_APP_TX:
-      return "FIFO_EVENT_APP_TX";
-    case FIFO_EVENT_TIMEOUT:
-      return "FIFO_EVENT_TIMEOUT";
-    case FIFO_EVENT_DISCONNECT:
-      return "FIFO_EVENT_DISCONNECT";
-    case FIFO_EVENT_BUILTIN_RX:
-      return "FIFO_EVENT_BUILTIN_RX";
-    case FIFO_EVENT_RPC:
-      return "FIFO_EVENT_RPC";
-    default:
-      return "UNKNOWN FIFO EVENT";
-    }
-}
+#include <svm/message_queue.h>
+#include <svm/ssvm.h>
 
 #define foreach_session_input_error                                            \
 _(NO_SESSION, "No session drops")                                       \
@@ -82,72 +42,107 @@ typedef enum
     SESSION_N_ERROR,
 } session_error_t;
 
-typedef struct
+typedef struct session_tx_context_
 {
-  void *fp;
-  void *arg;
-} rpc_args_t;
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  session_t *s;
+  transport_proto_vft_t *transport_vft;
+  transport_connection_t *tc;
+  transport_send_params_t sp;
+  u32 max_dequeue;
+  u32 left_to_snd;
+  u32 max_len_to_snd;
+  u16 deq_per_first_buf;
+  u16 deq_per_buf;
+  u16 n_segs_per_evt;
+  u8 n_bufs_per_seg;
+    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
+  session_dgram_hdr_t hdr;
+} session_tx_context_t;
 
-typedef u64 session_handle_t;
+typedef struct session_evt_elt
+{
+  clib_llist_anchor_t evt_list;
+  session_event_t evt;
+} session_evt_elt_t;
 
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  union
-    {
-      svm_fifo_t * fifo;
-      session_handle_t session_handle;
-      rpc_args_t rpc_args;
-    };
-  u8 event_type;
-  u8 postponed;
-}) session_fifo_event_t;
-/* *INDENT-ON* */
-
-/* Forward definition */
-typedef struct _session_manager_main session_manager_main_t;
-
-typedef int
-  (session_fifo_rx_fn) (vlib_main_t * vm, vlib_node_runtime_t * node,
-                       session_manager_main_t * smm,
-                       session_fifo_event_t * e0, stream_session_t * s0,
-                       u32 thread_index, int *n_tx_pkts);
+typedef struct session_ctrl_evt_data_
+{
+  u8 data[SESSION_CTRL_MSG_MAX_SIZE];
+} session_evt_ctrl_data_t;
 
-extern session_fifo_rx_fn session_tx_fifo_peek_and_snd;
-extern session_fifo_rx_fn session_tx_fifo_dequeue_and_snd;
+typedef struct session_worker_
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
 
-u8 session_node_lookup_fifo_event (svm_fifo_t * f, session_fifo_event_t * e);
+  /** Worker session pool */
+  session_t *sessions;
 
-struct _session_manager_main
-{
-  /** Per worker thread session pools */
-  stream_session_t **sessions;
+  /** vpp event message queue for worker */
+  svm_msg_q_t *vpp_event_queue;
+
+  /** vlib_time_now last time around the track */
+  clib_time_type_t last_vlib_time;
 
-  /** Per worker-thread session pool peekers rw locks */
-  clib_rwlock_t *peekers_rw_locks;
+  /** vlib_time_now rounded to us precision and as u64 */
+  clib_us_time_t last_vlib_us_time;
 
-  /** Pool of listen sessions. Same type as stream sessions to ease lookups */
-  stream_session_t **listen_sessions;
+  /** Convenience pointer to this worker's vlib_main */
+  vlib_main_t *vm;
 
-  /** Per-proto, per-worker enqueue epoch counters */
-  u32 *current_enqueue_epoch[TRANSPORT_N_PROTO];
+  /** Per-proto vector of sessions to enqueue */
+  u32 **session_to_enqueue;
 
-  /** Per-proto, per-worker thread vector of sessions to enqueue */
-  u32 **session_to_enqueue[TRANSPORT_N_PROTO];
+  /** Context for session tx */
+  session_tx_context_t ctx;
 
-  /** per-worker tx buffer free lists */
-  u32 **tx_buffers;
+  /** Vector of tx buffer free lists */
+  u32 *tx_buffers;
 
-  /** Per worker-thread vector of partially read events */
-  session_fifo_event_t **free_event_vector;
+  /** Pool of session event list elements */
+  session_evt_elt_t *event_elts;
 
-  /** per-worker active event vectors */
-  session_fifo_event_t **pending_event_vector;
+  /** Pool of ctrl events data buffers */
+  session_evt_ctrl_data_t *ctrl_evts_data;
 
-  /** per-worker postponed disconnects */
-  session_fifo_event_t **pending_disconnects;
+  /** Head of control events list */
+  clib_llist_index_t ctrl_head;
 
-  /** vpp fifo event queue */
-  svm_queue_t **vpp_event_queues;
+  /** Head of list of elements */
+  clib_llist_index_t new_head;
+
+  /** Head of list of pending events */
+  clib_llist_index_t old_head;
+
+  /** Peekers rw lock */
+  clib_rwlock_t peekers_rw_locks;
+
+  /** Vector of buffers to be sent */
+  u32 *pending_tx_buffers;
+
+  /** Vector of nexts for the pending tx buffers */
+  u16 *pending_tx_nexts;
+
+#if SESSION_DEBUG
+  /** last event poll time by thread */
+  clib_time_type_t last_event_poll;
+#endif
+} session_worker_t;
+
+typedef int (session_fifo_rx_fn) (session_worker_t * wrk,
+                                 vlib_node_runtime_t * node,
+                                 session_evt_elt_t * e, int *n_tx_packets);
+
+extern session_fifo_rx_fn session_tx_fifo_peek_and_snd;
+extern session_fifo_rx_fn session_tx_fifo_dequeue_and_snd;
+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_main_
+{
+  /** Worker contexts */
+  session_worker_t *wrk;
 
   /** Event queues memfd segment initialized only if so configured */
   ssvm_private_t evt_qs_segment;
@@ -163,20 +158,24 @@ struct _session_manager_main
    * Trade memory for speed, for now */
   u32 *session_type_to_next;
 
+  transport_proto_t last_transport_proto_type;
+
+  /*
+   * Config parameters
+   */
+
   /** Session manager is enabled */
   u8 is_enabled;
+  /** Enable session manager at startup */
+  u8 session_enable_asap;
 
   /** vpp fifo event queue configured length */
   u32 configured_event_queue_length;
 
-  /*
-   * Config parameters
-   */
-
   /** Session ssvm segment configs*/
   uword session_baseva;
   uword session_va_space_size;
-  u32 evt_qs_segment_size;
+  uword evt_qs_segment_size;
   u8 evt_qs_use_memfd_seg;
 
   /** Session table size parameters */
@@ -196,152 +195,144 @@ struct _session_manager_main
   /** Preallocate session config parameter */
   u32 preallocated_sessions;
 
-#if SESSION_DBG
-  /**
-   * last event poll time by thread
-   * Debug only. Will cause false cache-line sharing as-is
-   */
-  f64 *last_event_poll_by_thread;
-#endif
-
-};
+} 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;
+extern vlib_node_registration_t session_queue_pre_input_node;
 
-/*
- * Session manager function
- */
-always_inline session_manager_main_t *
-vnet_get_session_manager_main ()
-{
-  return &session_manager_main;
-}
-
-always_inline u8
-stream_session_is_valid (u32 si, u8 thread_index)
-{
-  stream_session_t *s;
-  s = pool_elt_at_index (session_manager_main.sessions[thread_index], 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 */ )
-    return 0;
-  return 1;
-}
+#define SESSION_Q_PROCESS_FLUSH_FRAMES 1
+#define SESSION_Q_PROCESS_STOP         2
 
-stream_session_t *session_alloc (u32 thread_index);
+#define TRANSPORT_PROTO_INVALID (session_main.last_transport_proto_type + 1)
+#define TRANSPORT_N_PROTOS (session_main.last_transport_proto_type + 1)
 
-always_inline stream_session_t *
-session_get (u32 si, u32 thread_index)
+static inline session_evt_elt_t *
+session_evt_elt_alloc (session_worker_t * wrk)
 {
-  ASSERT (stream_session_is_valid (si, thread_index));
-  return pool_elt_at_index (session_manager_main.sessions[thread_index], si);
+  session_evt_elt_t *elt;
+  pool_get (wrk->event_elts, elt);
+  return elt;
 }
 
-always_inline stream_session_t *
-session_get_if_valid (u64 si, u32 thread_index)
+static inline void
+session_evt_elt_free (session_worker_t * wrk, session_evt_elt_t * elt)
 {
-  if (thread_index >= vec_len (session_manager_main.sessions))
-    return 0;
-
-  if (pool_is_free_index (session_manager_main.sessions[thread_index], si))
-    return 0;
-
-  ASSERT (stream_session_is_valid (si, thread_index));
-  return pool_elt_at_index (session_manager_main.sessions[thread_index], si);
+  pool_put (wrk->event_elts, elt);
 }
 
-always_inline session_handle_t
-session_handle (stream_session_t * s)
+static inline void
+session_evt_add_old (session_worker_t * wrk, session_evt_elt_t * elt)
 {
-  return ((u64) s->thread_index << 32) | (u64) s->session_index;
+  clib_llist_add_tail (wrk->event_elts, evt_list, elt,
+                      pool_elt_at_index (wrk->event_elts, wrk->old_head));
 }
 
-always_inline u32
-session_index_from_handle (session_handle_t handle)
+static inline void
+session_evt_add_head_old (session_worker_t * wrk, session_evt_elt_t * elt)
 {
-  return handle & 0xFFFFFFFF;
+  clib_llist_add (wrk->event_elts, evt_list, elt,
+                 pool_elt_at_index (wrk->event_elts, wrk->old_head));
 }
 
-always_inline u32
-session_thread_from_handle (session_handle_t handle)
-{
-  return handle >> 32;
-}
 
-always_inline void
-session_parse_handle (session_handle_t handle, u32 * index,
-                     u32 * thread_index)
+static inline u32
+session_evt_ctrl_data_alloc (session_worker_t * wrk)
 {
-  *index = session_index_from_handle (handle);
-  *thread_index = session_thread_from_handle (handle);
+  session_evt_ctrl_data_t *data;
+  pool_get (wrk->ctrl_evts_data, data);
+  return (data - wrk->ctrl_evts_data);
 }
 
-always_inline stream_session_t *
-session_get_from_handle (session_handle_t handle)
+static inline session_evt_elt_t *
+session_evt_alloc_ctrl (session_worker_t * wrk)
 {
-  session_manager_main_t *smm = &session_manager_main;
-  u32 session_index, thread_index;
-  session_parse_handle (handle, &session_index, &thread_index);
-  return pool_elt_at_index (smm->sessions[thread_index], session_index);
+  session_evt_elt_t *elt;
+  elt = session_evt_elt_alloc (wrk);
+  clib_llist_add_tail (wrk->event_elts, evt_list, elt,
+                      pool_elt_at_index (wrk->event_elts, wrk->ctrl_head));
+  return elt;
 }
 
-always_inline stream_session_t *
-session_get_from_handle_if_valid (session_handle_t handle)
+static inline void *
+session_evt_ctrl_data (session_worker_t * wrk, session_evt_elt_t * elt)
 {
-  u32 session_index, thread_index;
-  session_parse_handle (handle, &session_index, &thread_index);
-  return session_get_if_valid (session_index, thread_index);
+  return (void *) (pool_elt_at_index (wrk->ctrl_evts_data,
+                                     elt->evt.ctrl_data_index));
 }
 
-always_inline u8
-session_handle_is_local (session_handle_t handle)
+static inline void
+session_evt_ctrl_data_free (session_worker_t * wrk, session_evt_elt_t * elt)
 {
-  if ((handle >> 32) == SESSION_LOCAL_HANDLE_PREFIX)
-    return 1;
-  return 0;
+  ASSERT (elt->evt.event_type > SESSION_IO_EVT_BUILTIN_TX);
+  pool_put_index (wrk->ctrl_evts_data, elt->evt.ctrl_data_index);
 }
 
-always_inline transport_proto_t
-session_type_transport_proto (session_type_t st)
+static inline session_evt_elt_t *
+session_evt_alloc_new (session_worker_t * wrk)
 {
-  return (st >> 1);
+  session_evt_elt_t *elt;
+  elt = session_evt_elt_alloc (wrk);
+  clib_llist_add_tail (wrk->event_elts, evt_list, elt,
+                      pool_elt_at_index (wrk->event_elts, wrk->new_head));
+  return elt;
 }
 
-always_inline u8
-session_type_is_ip4 (session_type_t st)
+static inline session_evt_elt_t *
+session_evt_alloc_old (session_worker_t * wrk)
 {
-  return (st & 1);
+  session_evt_elt_t *elt;
+  elt = session_evt_elt_alloc (wrk);
+  clib_llist_add_tail (wrk->event_elts, evt_list, elt,
+                      pool_elt_at_index (wrk->event_elts, wrk->old_head));
+  return elt;
 }
 
-always_inline transport_proto_t
-session_get_transport_proto (stream_session_t * s)
+session_t *session_alloc (u32 thread_index);
+void session_free (session_t * s);
+void session_free_w_fifos (session_t * s);
+u8 session_is_valid (u32 si, u8 thread_index);
+
+always_inline session_t *
+session_get (u32 si, u32 thread_index)
 {
-  return (s->session_type >> 1);
+  ASSERT (session_is_valid (si, thread_index));
+  return pool_elt_at_index (session_main.wrk[thread_index].sessions, si);
 }
 
-always_inline fib_protocol_t
-session_get_fib_proto (stream_session_t * s)
+always_inline session_t *
+session_get_if_valid (u64 si, u32 thread_index)
 {
-  u8 is_ip4 = s->session_type & 1;
-  return (is_ip4 ? FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6);
+  if (thread_index >= vec_len (session_main.wrk))
+    return 0;
+
+  if (pool_is_free_index (session_main.wrk[thread_index].sessions, si))
+    return 0;
+
+  ASSERT (session_is_valid (si, thread_index));
+  return pool_elt_at_index (session_main.wrk[thread_index].sessions, si);
 }
 
-always_inline session_type_t
-session_type_from_proto_and_ip (transport_proto_t proto, u8 is_ip4)
+always_inline session_t *
+session_get_from_handle (session_handle_t handle)
 {
-  return (proto << 1 | is_ip4);
+  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);
 }
 
-always_inline u8
-session_has_transport (stream_session_t * s)
+always_inline session_t *
+session_get_from_handle_if_valid (session_handle_t handle)
 {
-  return (session_get_transport_proto (s) != TRANSPORT_PROTO_NONE);
+  u32 session_index, thread_index;
+  session_parse_handle (handle, &session_index, &thread_index);
+  return session_get_if_valid (session_index, thread_index);
 }
 
+u64 session_segment_handle (session_t * s);
+
 /**
  * Acquires a lock that blocks a session pool from expanding.
  *
@@ -355,19 +346,19 @@ session_has_transport (stream_session_t * s)
 always_inline void
 session_pool_add_peeker (u32 thread_index)
 {
-  session_manager_main_t *smm = &session_manager_main;
+  session_worker_t *wrk = &session_main.wrk[thread_index];
   if (thread_index == vlib_get_thread_index ())
     return;
-  clib_rwlock_reader_lock (&smm->peekers_rw_locks[thread_index]);
+  clib_rwlock_reader_lock (&wrk->peekers_rw_locks);
 }
 
 always_inline void
 session_pool_remove_peeker (u32 thread_index)
 {
-  session_manager_main_t *smm = &session_manager_main;
+  session_worker_t *wrk = &session_main.wrk[thread_index];
   if (thread_index == vlib_get_thread_index ())
     return;
-  clib_rwlock_reader_unlock (&smm->peekers_rw_locks[thread_index]);
+  clib_rwlock_reader_unlock (&wrk->peekers_rw_locks);
 }
 
 /**
@@ -375,63 +366,35 @@ session_pool_remove_peeker (u32 thread_index)
  *
  * Caller should drop the peek 'lock' as soon as possible.
  */
-always_inline stream_session_t *
+always_inline session_t *
 session_get_from_handle_safe (u64 handle)
 {
-  session_manager_main_t *smm = &session_manager_main;
   u32 thread_index = session_thread_from_handle (handle);
+  session_worker_t *wrk = &session_main.wrk[thread_index];
+
   if (thread_index == vlib_get_thread_index ())
     {
-      return pool_elt_at_index (smm->sessions[thread_index],
+      return pool_elt_at_index (wrk->sessions,
                                session_index_from_handle (handle));
     }
   else
     {
       session_pool_add_peeker (thread_index);
       /* Don't use pool_elt_at index. See @ref session_pool_add_peeker */
-      return smm->sessions[thread_index] + session_index_from_handle (handle);
+      return wrk->sessions + session_index_from_handle (handle);
     }
 }
 
-always_inline stream_session_t *
-stream_session_listener_get (u8 sst, u64 si)
-{
-  return pool_elt_at_index (session_manager_main.listen_sessions[sst], si);
-}
-
-always_inline u32
-stream_session_get_index (stream_session_t * s)
-{
-  if (s->session_state == SESSION_STATE_LISTENING)
-    return s - session_manager_main.listen_sessions[s->session_type];
-
-  return s - session_manager_main.sessions[s->thread_index];
-}
-
 always_inline u32
-stream_session_max_rx_enqueue (transport_connection_t * tc)
+session_get_index (session_t * s)
 {
-  stream_session_t *s = session_get (tc->s_index, tc->thread_index);
-  return svm_fifo_max_enqueue (s->server_rx_fifo);
+  return (s - session_main.wrk[s->thread_index].sessions);
 }
 
-always_inline u32
-stream_session_rx_fifo_size (transport_connection_t * tc)
-{
-  stream_session_t *s = session_get (tc->s_index, tc->thread_index);
-  return s->server_rx_fifo->nitems;
-}
-
-always_inline u32
-session_get_index (stream_session_t * s)
-{
-  return (s - session_manager_main.sessions[s->thread_index]);
-}
-
-always_inline stream_session_t *
+always_inline session_t *
 session_clone_safe (u32 session_index, u32 thread_index)
 {
-  stream_session_t *old_s, *new_s;
+  session_t *old_s, *new_s;
   u32 current_thread_index = vlib_get_thread_index ();
 
   /* If during the memcpy pool is reallocated AND the memory allocator
@@ -441,163 +404,257 @@ 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.sessions[thread_index] + session_index;
-  clib_memcpy (new_s, old_s, sizeof (*new_s));
+  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;
   new_s->session_index = session_get_index (new_s);
   return new_s;
 }
 
-transport_connection_t *session_get_transport (stream_session_t * s);
-
-u32 stream_session_tx_fifo_max_dequeue (transport_connection_t * tc);
+int session_open (u32 app_index, session_endpoint_t * tep, u32 opaque);
+int session_listen (session_t * s, session_endpoint_cfg_t * sep);
+int session_stop_listen (session_t * s);
+void session_close (session_t * s);
+void session_reset (session_t * s);
+void session_transport_close (session_t * s);
+void session_transport_reset (session_t * s);
+void session_transport_cleanup (session_t * s);
+int session_send_io_evt_to_thread (svm_fifo_t * f,
+                                  session_evt_type_t evt_type);
+int session_enqueue_notify (session_t * s);
+int session_dequeue_notify (session_t * s);
+int session_send_io_evt_to_thread_custom (void *data, u32 thread_index,
+                                         session_evt_type_t evt_type);
+void session_send_rpc_evt_to_thread (u32 thread_index, void *fp,
+                                    void *rpc_args);
+void session_send_rpc_evt_to_thread_force (u32 thread_index, void *fp,
+                                          void *rpc_args);
+void session_add_self_custom_tx_evt (transport_connection_t * tc,
+                                    u8 has_prio);
+void sesssion_reschedule_tx (transport_connection_t * tc);
+transport_connection_t *session_get_transport (session_t * s);
+void session_get_endpoint (session_t * s, transport_endpoint_t * tep,
+                          u8 is_lcl);
+
+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);
 
-stream_session_t *session_alloc (u32 thread_index);
-int
-session_enqueue_stream_connection (transport_connection_t * tc,
-                                  vlib_buffer_t * b, u32 offset,
-                                  u8 queue_event, u8 is_in_order);
-int session_enqueue_dgram_connection (stream_session_t * s, 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 stream_session_dequeue_drop (transport_connection_t * tc, u32 max_bytes);
+/*
+ * Interface to transport protos
+ */
 
+int session_enqueue_stream_connection (transport_connection_t * tc,
+                                      vlib_buffer_t * b, u32 offset,
+                                      u8 queue_event, u8 is_in_order);
+int session_enqueue_dgram_connection (session_t * s,
+                                     session_dgram_hdr_t * hdr,
+                                     vlib_buffer_t * b, u8 proto,
+                                     u8 queue_event);
 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,
-                                 stream_session_t ** new_session);
-void stream_session_init_fifos_pointers (transport_connection_t * tc,
-                                        u32 rx_pointer, u32 tx_pointer);
-
-void stream_session_accept_notify (transport_connection_t * tc);
-void stream_session_disconnect_notify (transport_connection_t * tc);
-void stream_session_delete_notify (transport_connection_t * tc);
-void stream_session_reset_notify (transport_connection_t * tc);
-int stream_session_accept (transport_connection_t * tc, u32 listener_index,
-                          u8 notify);
-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);
-uword unformat_transport_connection (unformat_input_t * input,
-                                    va_list * args);
-
+                                 session_t ** new_session);
+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);
+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,
+                          u32 thread_index, u8 notify);
+/**
+ * Initialize session layer for given transport proto and ip version
+ *
+ * Allocates per session type (transport proto + ip version) data structures
+ * and adds arc from session queue node to session type output node.
+ *
+ * @param transport_proto      transport proto to be registered
+ * @param vft                  virtual function table for transport
+ * @param is_ip4               flag that indicates if transports uses ipv4
+ *                             as underlying network layer
+ * @param output_node          output node for transport
+ */
 void session_register_transport (transport_proto_t transport_proto,
                                 const transport_proto_vft_t * vft, u8 is_ip4,
                                 u32 output_node);
+transport_proto_t session_add_transport_proto (void);
+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);
 
-clib_error_t *vnet_session_enable_disable (vlib_main_t * vm, u8 is_en);
+always_inline u32
+transport_max_rx_enqueue (transport_connection_t * tc)
+{
+  session_t *s = session_get (tc->s_index, tc->thread_index);
+  return svm_fifo_max_enqueue_prod (s->rx_fifo);
+}
 
-always_inline svm_queue_t *
-session_manager_get_vpp_event_queue (u32 thread_index)
+always_inline u32
+transport_max_tx_dequeue (transport_connection_t * tc)
 {
-  return session_manager_main.vpp_event_queues[thread_index];
+  session_t *s = session_get (tc->s_index, tc->thread_index);
+  return svm_fifo_max_dequeue_cons (s->tx_fifo);
 }
 
-int session_manager_flush_enqueue_events (u8 proto, u32 thread_index);
+always_inline u32
+transport_max_rx_dequeue (transport_connection_t * tc)
+{
+  session_t *s = session_get (tc->s_index, tc->thread_index);
+  return svm_fifo_max_dequeue (s->rx_fifo);
+}
 
-always_inline u64
-listen_session_get_handle (stream_session_t * s)
+always_inline u32
+transport_rx_fifo_size (transport_connection_t * tc)
 {
-  ASSERT (s->session_state == SESSION_STATE_LISTENING);
-  return ((u64) s->session_type << 32) | s->session_index;
+  session_t *s = session_get (tc->s_index, tc->thread_index);
+  return svm_fifo_size (s->rx_fifo);
 }
 
-always_inline stream_session_t *
-listen_session_get_from_handle (session_handle_t handle)
+always_inline u32
+transport_tx_fifo_size (transport_connection_t * tc)
 {
-  session_manager_main_t *smm = &session_manager_main;
-  stream_session_t *s;
-  u32 type, index;
-  type = handle >> 32;
-  index = handle & 0xFFFFFFFF;
+  session_t *s = session_get (tc->s_index, tc->thread_index);
+  return svm_fifo_size (s->tx_fifo);
+}
 
-  if (pool_is_free_index (smm->listen_sessions[type], index))
-    return 0;
+always_inline u8
+transport_rx_fifo_has_ooo_data (transport_connection_t * tc)
+{
+  session_t *s = session_get (tc->c_index, tc->thread_index);
+  return svm_fifo_has_ooo_data (s->rx_fifo);
+}
 
-  s = pool_elt_at_index (smm->listen_sessions[type], index);
-  ASSERT (s->session_state == SESSION_STATE_LISTENING);
-  return s;
+always_inline clib_time_type_t
+transport_time_now (u32 thread_index)
+{
+  return session_main.wrk[thread_index].last_vlib_time;
+}
+
+always_inline clib_us_time_t
+transport_us_time_now (u32 thread_index)
+{
+  return session_main.wrk[thread_index].last_vlib_us_time;
 }
 
-always_inline stream_session_t *
-listen_session_new (session_type_t type)
+always_inline void
+transport_add_tx_event (transport_connection_t * tc)
 {
-  stream_session_t *s;
-  pool_get_aligned (session_manager_main.listen_sessions[type], s,
-                   CLIB_CACHE_LINE_BYTES);
-  memset (s, 0, sizeof (*s));
+  session_t *s = session_get (tc->s_index, tc->thread_index);
+  if (svm_fifo_has_event (s->tx_fifo))
+    return;
+  session_send_io_evt_to_thread (s->tx_fifo, SESSION_IO_EVT_TX);
+}
+
+/*
+ * Listen sessions
+ */
+
+always_inline u64
+listen_session_get_handle (session_t * s)
+{
+  ASSERT (s->session_state == SESSION_STATE_LISTENING ||
+         session_get_transport_proto (s) == TRANSPORT_PROTO_QUIC);
+  return session_handle (s);
+}
+
+always_inline session_t *
+listen_session_get_from_handle (session_handle_t handle)
+{
+  return session_get_from_handle (handle);
+}
+
+always_inline void
+listen_session_parse_handle (session_handle_t handle, u32 * index,
+                            u32 * thread_index)
+{
+  session_parse_handle (handle, index, thread_index);
+}
 
+always_inline session_t *
+listen_session_alloc (u8 thread_index, session_type_t type)
+{
+  session_t *s;
+  s = session_alloc (thread_index);
   s->session_type = type;
   s->session_state = SESSION_STATE_LISTENING;
-  s->session_index = s - session_manager_main.listen_sessions[type];
-
   return s;
 }
 
-always_inline stream_session_t *
-listen_session_get (session_type_t type, u32 index)
+always_inline session_t *
+listen_session_get (u32 ls_index)
 {
-  return pool_elt_at_index (session_manager_main.listen_sessions[type],
-                           index);
+  return session_get (ls_index, 0);
 }
 
 always_inline void
-listen_session_del (stream_session_t * s)
+listen_session_free (session_t * s)
 {
-  pool_put (session_manager_main.listen_sessions[s->session_type], s);
+  session_free (s);
 }
 
-transport_connection_t *listen_session_get_transport (stream_session_t * s);
+transport_connection_t *listen_session_get_transport (session_t * s);
 
-int
-listen_session_get_local_session_endpoint (stream_session_t * listener,
-                                          session_endpoint_t * sep);
+/*
+ * Session layer functions
+ */
 
-always_inline stream_session_t *
-session_manager_get_listener (u8 session_type, u32 index)
+always_inline session_main_t *
+vnet_get_session_main ()
 {
-  return
-    pool_elt_at_index (session_manager_main.listen_sessions[session_type],
-                      index);
+  return &session_main;
 }
 
-/**
- * Set peek or dequeue function for given session type
- *
- * Reliable transport protocols will probably want to use a peek function
- */
-always_inline void
-session_manager_set_transport_rx_fn (session_type_t type, u8 is_peek)
+always_inline session_worker_t *
+session_main_get_worker (u32 thread_index)
+{
+  return &session_main.wrk[thread_index];
+}
+
+static inline session_worker_t *
+session_main_get_worker_if_valid (u32 thread_index)
 {
-  session_manager_main.session_tx_fns[type] = (is_peek) ?
-    session_tx_fifo_peek_and_snd : session_tx_fifo_dequeue_and_snd;
+  if (thread_index > vec_len (session_main.wrk))
+    return 0;
+  return &session_main.wrk[thread_index];
+}
+
+always_inline svm_msg_q_t *
+session_main_get_vpp_event_queue (u32 thread_index)
+{
+  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)                              \
-      return clib_error_return(0, "session layer is not enabled");     \
+    if (!session_main.is_enabled)                                      \
+      return clib_error_return (0, "session layer is not enabled");    \
 } while (0)
 
+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);
+
+always_inline void
+session_add_pending_tx_buffer (session_type_t st, u32 thread_index, u32 bi)
+{
+  session_worker_t *wrk = session_main_get_worker (thread_index);
+  vec_add1 (wrk->pending_tx_buffers, bi);
+  vec_add1 (wrk->pending_tx_nexts, session_main.session_type_to_next[st]);
+}
+
+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);
+
+session_t *session_alloc_for_connection (transport_connection_t * tc);
 
 #endif /* __included_session_h__ */