session: api to add new transport types
[vpp.git] / src / vnet / session / session.h
index d60cca2..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/transport.h>
-#include <vlibmemory/unix_shared_memory_queue.h>
+#include <vppinfra/llist.h>
+#include <vnet/session/session_types.h>
+#include <vnet/session/session_lookup.h>
 #include <vnet/session/session_debug.h>
-#include <vnet/session/segment_manager.h>
-
-#define HALF_OPEN_LOOKUP_INVALID_VALUE ((u64)~0)
-#define INVALID_INDEX ((u32)~0)
-
-/* 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;
+#include <svm/message_queue.h>
+#include <svm/ssvm.h>
 
 #define foreach_session_input_error                                            \
 _(NO_SESSION, "No session drops")                                       \
@@ -45,7 +31,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
 {
@@ -55,417 +42,620 @@ typedef enum
     SESSION_N_ERROR,
 } session_error_t;
 
-/* Event queue input node static next indices */
-typedef enum
+typedef struct session_tx_context_
 {
-  SESSION_QUEUE_NEXT_DROP,
-  SESSION_QUEUE_NEXT_TCP_IP4_OUTPUT,
-  SESSION_QUEUE_NEXT_IP4_LOOKUP,
-  SESSION_QUEUE_NEXT_TCP_IP6_OUTPUT,
-  SESSION_QUEUE_NEXT_IP6_LOOKUP,
-  SESSION_QUEUE_N_NEXT,
-} session_queue_next_t;
-
-#define foreach_session_type                    \
-  _(IP4_TCP, ip4_tcp)                           \
-  _(IP4_UDP, ip4_udp)                           \
-  _(IP6_TCP, ip6_tcp)                           \
-  _(IP6_UDP, ip6_udp)
-
-typedef enum
+  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 struct session_evt_elt
 {
-#define _(A, a) SESSION_TYPE_##A,
-  foreach_session_type
-#undef _
-    SESSION_N_TYPES,
-} session_type_t;
+  clib_llist_anchor_t evt_list;
+  session_event_t evt;
+} session_evt_elt_t;
 
-/*
- * Application session state
- */
-typedef enum
+typedef struct session_ctrl_evt_data_
 {
-  SESSION_STATE_LISTENING,
-  SESSION_STATE_CONNECTING,
-  SESSION_STATE_READY,
-  SESSION_STATE_CLOSED,
-  SESSION_STATE_N_STATES,
-} stream_session_state_t;
+  u8 data[SESSION_CTRL_MSG_MAX_SIZE];
+} session_evt_ctrl_data_t;
 
-typedef struct
+typedef struct session_worker_
 {
-  void *fp;
-  void *arg;
-} rpc_args_t;
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
 
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  union
-    {
-      svm_fifo_t * fifo;
-      u64 session_handle;
-      rpc_args_t rpc_args;
-    };
-  u8 event_type;
-  u16 event_id;
-}) session_fifo_event_t;
-/* *INDENT-ON* */
+  /** Worker session pool */
+  session_t *sessions;
 
-typedef struct _stream_session_t
-{
-  /** fifo pointers. Once allocated, these do not move */
-  svm_fifo_t *server_rx_fifo;
-  svm_fifo_t *server_tx_fifo;
+  /** 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;
 
-  /** Type */
-  u8 session_type;
+  /** vlib_time_now rounded to us precision and as u64 */
+  clib_us_time_t last_vlib_us_time;
 
-  /** State */
-  u8 session_state;
+  /** Convenience pointer to this worker's vlib_main */
+  vlib_main_t *vm;
 
-  u8 thread_index;
+  /** Per-proto vector of sessions to enqueue */
+  u32 **session_to_enqueue;
 
-  /** used during unbind processing */
-  u8 is_deleted;
+  /** Context for session tx */
+  session_tx_context_t ctx;
 
-  /** To avoid n**2 "one event per frame" check */
-  u8 enqueue_epoch;
+  /** Vector of tx buffer free lists */
+  u32 *tx_buffers;
 
-  /** Pad to a multiple of 8 octets */
-  u8 align_pad[2];
+  /** Pool of session event list elements */
+  session_evt_elt_t *event_elts;
 
-  /** svm segment index where fifos were allocated */
-  u32 svm_segment_index;
+  /** Pool of ctrl events data buffers */
+  session_evt_ctrl_data_t *ctrl_evts_data;
 
-  /** Session index in per_thread pool */
-  u32 session_index;
+  /** Head of control events list */
+  clib_llist_index_t ctrl_head;
 
-  /** Transport specific */
-  u32 connection_index;
+  /** Head of list of elements */
+  clib_llist_index_t new_head;
 
-  /** Application specific */
-  u32 pid;
+  /** Head of list of pending events */
+  clib_llist_index_t old_head;
 
-  /** stream server pool index */
-  u32 app_index;
+  /** Peekers rw lock */
+  clib_rwlock_t peekers_rw_locks;
 
-  /** Parent listener session if the result of an accept */
-  u32 listener_index;
+  /** Vector of buffers to be sent */
+  u32 *pending_tx_buffers;
 
-  /** Opaque, pad to a 64-octet boundary */
-  u64 opaque[2];
-} stream_session_t;
+  /** Vector of nexts for the pending tx buffers */
+  u16 *pending_tx_nexts;
 
-/* Forward definition */
-typedef struct _session_manager_main session_manager_main_t;
+#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) (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 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);
 
-struct _session_manager_main
+typedef struct session_main_
 {
-  /** Lookup tables for established sessions and listeners */
-  clib_bihash_16_8_t v4_session_hash;
-  clib_bihash_48_8_t v6_session_hash;
+  /** Worker contexts */
+  session_worker_t *wrk;
 
-  /** Lookup tables for half-open sessions */
-  clib_bihash_16_8_t v4_half_open_hash;
-  clib_bihash_48_8_t v6_half_open_hash;
+  /** Event queues memfd segment initialized only if so configured */
+  ssvm_private_t evt_qs_segment;
 
-  /** Per worker thread session pools */
-  stream_session_t **sessions;
+  /** Unique segment name counter */
+  u32 unique_segment_name_counter;
 
-  /** Pool of listen sessions. Same type as stream sessions to ease lookups */
-  stream_session_t *listen_sessions[SESSION_N_TYPES];
+  /** Per transport rx function that can either dequeue or peek */
+  session_fifo_rx_fn **session_tx_fns;
 
-  /** Sparse vector to map dst port to stream server  */
-  u16 *stream_server_by_dst_port[SESSION_N_TYPES];
+  /** Per session type output nodes. Could optimize to group nodes by
+   * fib but lookup would then require session type parsing in session node.
+   * Trade memory for speed, for now */
+  u32 *session_type_to_next;
 
-  /** per-worker enqueue epoch counters */
-  u8 *current_enqueue_epoch;
+  transport_proto_t last_transport_proto_type;
 
-  /** Per-worker thread vector of sessions to enqueue */
-  u32 **session_indices_to_enqueue_by_thread;
+  /*
+   * Config parameters
+   */
 
-  /** per-worker tx buffer free lists */
-  u32 **tx_buffers;
+  /** 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;
+
+  /** Session ssvm segment configs*/
+  uword session_baseva;
+  uword session_va_space_size;
+  uword 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;
+  u32 configured_v4_halfopen_table_memory;
+  u32 configured_v6_session_table_buckets;
+  u32 configured_v6_session_table_memory;
+  u32 configured_v6_halfopen_table_buckets;
+  u32 configured_v6_halfopen_table_memory;
+
+  /** Transport table (preallocation) size parameters */
+  u32 local_endpoints_table_memory;
+  u32 local_endpoints_table_buckets;
+
+  /** Preallocate session config parameter */
+  u32 preallocated_sessions;
+
+} session_main_t;
+
+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;
 
-  /** Per worker-thread vector of partially read events */
-  session_fifo_event_t **free_event_vector;
+#define SESSION_Q_PROCESS_FLUSH_FRAMES 1
+#define SESSION_Q_PROCESS_STOP         2
 
-  /** per-worker active event vectors */
-  session_fifo_event_t **pending_event_vector;
+#define TRANSPORT_PROTO_INVALID (session_main.last_transport_proto_type + 1)
+#define TRANSPORT_N_PROTOS (session_main.last_transport_proto_type + 1)
 
-  /** vpp fifo event queue */
-  unix_shared_memory_queue_t **vpp_event_queues;
+static inline session_evt_elt_t *
+session_evt_elt_alloc (session_worker_t * wrk)
+{
+  session_evt_elt_t *elt;
+  pool_get (wrk->event_elts, elt);
+  return elt;
+}
 
-  /** Unique segment name counter */
-  u32 unique_segment_name_counter;
+static inline void
+session_evt_elt_free (session_worker_t * wrk, session_evt_elt_t * elt)
+{
+  pool_put (wrk->event_elts, elt);
+}
 
-  /** Per transport rx function that can either dequeue or peek */
-  session_fifo_rx_fn *session_tx_fns[SESSION_N_TYPES];
+static inline void
+session_evt_add_old (session_worker_t * wrk, session_evt_elt_t * elt)
+{
+  clib_llist_add_tail (wrk->event_elts, evt_list, elt,
+                      pool_elt_at_index (wrk->event_elts, wrk->old_head));
+}
 
-  u8 is_enabled;
+static inline void
+session_evt_add_head_old (session_worker_t * wrk, session_evt_elt_t * elt)
+{
+  clib_llist_add (wrk->event_elts, evt_list, elt,
+                 pool_elt_at_index (wrk->event_elts, wrk->old_head));
+}
 
-  /* Convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
 
-#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
+static inline u32
+session_evt_ctrl_data_alloc (session_worker_t * wrk)
+{
+  session_evt_ctrl_data_t *data;
+  pool_get (wrk->ctrl_evts_data, data);
+  return (data - wrk->ctrl_evts_data);
+}
 
-};
+static inline session_evt_elt_t *
+session_evt_alloc_ctrl (session_worker_t * wrk)
+{
+  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;
+}
 
-extern session_manager_main_t session_manager_main;
-extern vlib_node_registration_t session_queue_node;
+static inline void *
+session_evt_ctrl_data (session_worker_t * wrk, session_evt_elt_t * elt)
+{
+  return (void *) (pool_elt_at_index (wrk->ctrl_evts_data,
+                                     elt->evt.ctrl_data_index));
+}
 
-/*
- * Session manager function
- */
-always_inline session_manager_main_t *
-vnet_get_session_manager_main ()
+static inline void
+session_evt_ctrl_data_free (session_worker_t * wrk, session_evt_elt_t * elt)
 {
-  return &session_manager_main;
+  ASSERT (elt->evt.event_type > SESSION_IO_EVT_BUILTIN_TX);
+  pool_put_index (wrk->ctrl_evts_data, elt->evt.ctrl_data_index);
 }
 
-/*
- * Stream session functions
- */
+static inline session_evt_elt_t *
+session_evt_alloc_new (session_worker_t * wrk)
+{
+  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;
+}
 
-stream_session_t *stream_session_lookup_listener4 (ip4_address_t * lcl,
-                                                  u16 lcl_port, u8 proto);
-stream_session_t *stream_session_lookup4 (ip4_address_t * lcl,
-                                         ip4_address_t * rmt, u16 lcl_port,
-                                         u16 rmt_port, u8 proto,
-                                         u32 thread_index);
-stream_session_t *stream_session_lookup_listener6 (ip6_address_t * lcl,
-                                                  u16 lcl_port, u8 proto);
-stream_session_t *stream_session_lookup6 (ip6_address_t * lcl,
-                                         ip6_address_t * rmt, u16 lcl_port,
-                                         u16 rmt_port, u8, u32 thread_index);
-transport_connection_t
-  * stream_session_lookup_transport4 (ip4_address_t * lcl,
-                                     ip4_address_t * rmt, u16 lcl_port,
-                                     u16 rmt_port, u8 proto,
-                                     u32 thread_index);
-transport_connection_t
-  * stream_session_lookup_transport6 (ip6_address_t * lcl,
-                                     ip6_address_t * rmt, u16 lcl_port,
-                                     u16 rmt_port, u8 proto,
-                                     u32 thread_index);
-stream_session_t *stream_session_lookup_listener (ip46_address_t * lcl,
-                                                 u16 lcl_port, u8 proto);
-void stream_session_table_add_for_tc (transport_connection_t * tc, u64 value);
-int stream_session_table_del_for_tc (transport_connection_t * tc);
-
-always_inline stream_session_t *
-stream_session_get_tsi (u64 ti_and_si, u32 thread_index)
-{
-  ASSERT ((u32) (ti_and_si >> 32) == thread_index);
-  return pool_elt_at_index (session_manager_main.sessions[thread_index],
-                           ti_and_si & 0xFFFFFFFFULL);
-}
-
-always_inline stream_session_t *
-stream_session_get (u32 si, u32 thread_index)
-{
-  return pool_elt_at_index (session_manager_main.sessions[thread_index], si);
-}
-
-always_inline stream_session_t *
-stream_session_get_if_valid (u64 si, u32 thread_index)
-{
-  if (thread_index >= vec_len (session_manager_main.sessions))
+static inline session_evt_elt_t *
+session_evt_alloc_old (session_worker_t * wrk)
+{
+  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;
+}
+
+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)
+{
+  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_main.wrk))
     return 0;
 
-  if (pool_is_free_index (session_manager_main.sessions[thread_index], si))
+  if (pool_is_free_index (session_main.wrk[thread_index].sessions, si))
     return 0;
 
-  return pool_elt_at_index (session_manager_main.sessions[thread_index], si);
+  ASSERT (session_is_valid (si, thread_index));
+  return pool_elt_at_index (session_main.wrk[thread_index].sessions, si);
 }
 
-always_inline u64
-stream_session_handle (stream_session_t * s)
+always_inline session_t *
+session_get_from_handle (session_handle_t handle)
 {
-  return ((u64) s->thread_index << 32) | (u64) s->session_index;
+  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 u32
-stream_session_index_from_handle (u64 handle)
+always_inline session_t *
+session_get_from_handle_if_valid (session_handle_t handle)
 {
-  return handle & 0xFFFFFFFF;
+  u32 session_index, thread_index;
+  session_parse_handle (handle, &session_index, &thread_index);
+  return session_get_if_valid (session_index, thread_index);
 }
 
-always_inline u32
-stream_session_thread_from_handle (u64 handle)
+u64 session_segment_handle (session_t * s);
+
+/**
+ * Acquires a lock that blocks a session pool from expanding.
+ *
+ * This is typically used for safely peeking into other threads'
+ * pools in order to clone elements. Lock should be dropped as soon
+ * as possible by calling @ref session_pool_remove_peeker.
+ *
+ * NOTE: Avoid using pool_elt_at_index while the lock is held because
+ * it may lead to free elt bitmap expansion/contraction!
+ */
+always_inline void
+session_pool_add_peeker (u32 thread_index)
 {
-  return handle >> 32;
+  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);
 }
 
 always_inline void
-stream_session_parse_handle (u64 handle, u32 * index, u32 * thread_index)
+session_pool_remove_peeker (u32 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);
+}
+
+/**
+ * Get session from handle and 'lock' pool resize if not in same thread
+ *
+ * Caller should drop the peek 'lock' as soon as possible.
+ */
+always_inline session_t *
+session_get_from_handle_safe (u64 handle)
 {
-  *index = stream_session_index_from_handle (handle);
-  *thread_index = stream_session_thread_from_handle (handle);
+  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 (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 wrk->sessions + session_index_from_handle (handle);
+    }
 }
 
-always_inline stream_session_t *
-stream_session_get_from_handle (u64 handle)
+always_inline u32
+session_get_index (session_t * s)
 {
-  session_manager_main_t *smm = &session_manager_main;
-  return pool_elt_at_index (smm->sessions[stream_session_thread_from_handle
-                                         (handle)],
-                           stream_session_index_from_handle (handle));
+  return (s - session_main.wrk[s->thread_index].sessions);
 }
 
-always_inline stream_session_t *
-stream_session_listener_get (u8 sst, u64 si)
+always_inline session_t *
+session_clone_safe (u32 session_index, u32 thread_index)
 {
-  return pool_elt_at_index (session_manager_main.listen_sessions[sst], si);
+  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
+   * decides to give the old chunk of memory to somebody in a hurry to
+   * scribble something on it, we have a problem. So add this thread as
+   * a session pool peeker.
+   */
+  session_pool_add_peeker (thread_index);
+  new_s = session_alloc (current_thread_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;
+  new_s->session_index = session_get_index (new_s);
+  return new_s;
 }
 
+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);
+
+/*
+ * 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,
+                                 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);
+
 always_inline u32
-stream_session_get_index (stream_session_t * s)
+transport_max_rx_enqueue (transport_connection_t * tc)
 {
-  if (s->session_state == SESSION_STATE_LISTENING)
-    return s - session_manager_main.listen_sessions[s->session_type];
+  session_t *s = session_get (tc->s_index, tc->thread_index);
+  return svm_fifo_max_enqueue_prod (s->rx_fifo);
+}
 
-  return s - session_manager_main.sessions[s->thread_index];
+always_inline u32
+transport_max_tx_dequeue (transport_connection_t * tc)
+{
+  session_t *s = session_get (tc->s_index, tc->thread_index);
+  return svm_fifo_max_dequeue_cons (s->tx_fifo);
 }
 
 always_inline u32
-stream_session_max_rx_enqueue (transport_connection_t * tc)
+transport_max_rx_dequeue (transport_connection_t * tc)
 {
-  stream_session_t *s = stream_session_get (tc->s_index, tc->thread_index);
-  return svm_fifo_max_enqueue (s->server_rx_fifo);
+  session_t *s = session_get (tc->s_index, tc->thread_index);
+  return svm_fifo_max_dequeue (s->rx_fifo);
 }
 
 always_inline u32
-stream_session_fifo_size (transport_connection_t * tc)
-{
-  stream_session_t *s = stream_session_get (tc->s_index, tc->thread_index);
-  return s->server_rx_fifo->nitems;
-}
-
-int
-stream_session_enqueue_data (transport_connection_t * tc, vlib_buffer_t * b,
-                            u32 offset, u8 queue_event, u8 is_in_order);
-u32
-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);
-
-void stream_session_connect_notify (transport_connection_t * tc, u8 sst,
-                                   u8 is_fail);
-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 sst, u8 notify);
-int
-stream_session_open (u32 app_index, session_type_t st,
-                    transport_endpoint_t * tep,
-                    transport_connection_t ** tc);
-int stream_session_listen (stream_session_t * s, transport_endpoint_t * tep);
-int stream_session_stop_listen (stream_session_t * s);
-void stream_session_disconnect (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);
-u8 *format_stream_session (u8 * s, va_list * args);
-int
-send_session_connected_callback (u32 app_index, u32 api_context,
-                                stream_session_t * s, u8 is_fail);
-
-
-void session_register_transport (u8 type, const transport_proto_vft_t * vft);
-transport_proto_vft_t *session_get_transport_vft (u8 type);
+transport_rx_fifo_size (transport_connection_t * tc)
+{
+  session_t *s = session_get (tc->s_index, tc->thread_index);
+  return svm_fifo_size (s->rx_fifo);
+}
 
-clib_error_t *vnet_session_enable_disable (vlib_main_t * vm, u8 is_en);
+always_inline u32
+transport_tx_fifo_size (transport_connection_t * tc)
+{
+  session_t *s = session_get (tc->s_index, tc->thread_index);
+  return svm_fifo_size (s->tx_fifo);
+}
 
-always_inline unix_shared_memory_queue_t *
-session_manager_get_vpp_event_queue (u32 thread_index)
+always_inline u8
+transport_rx_fifo_has_ooo_data (transport_connection_t * tc)
 {
-  return session_manager_main.vpp_event_queues[thread_index];
+  session_t *s = session_get (tc->c_index, tc->thread_index);
+  return svm_fifo_has_ooo_data (s->rx_fifo);
 }
 
-int session_manager_flush_enqueue_events (u32 thread_index);
+always_inline clib_time_type_t
+transport_time_now (u32 thread_index)
+{
+  return session_main.wrk[thread_index].last_vlib_time;
+}
 
-always_inline u64
-listen_session_get_handle (stream_session_t * s)
+always_inline clib_us_time_t
+transport_us_time_now (u32 thread_index)
 {
-  ASSERT (s->session_state == SESSION_STATE_LISTENING);
-  return ((u64) s->session_type << 32) | s->session_index;
+  return session_main.wrk[thread_index].last_vlib_us_time;
 }
 
-always_inline stream_session_t *
-listen_session_get_from_handle (u64 handle)
+always_inline void
+transport_add_tx_event (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);
+  if (svm_fifo_has_event (s->tx_fifo))
+    return;
+  session_send_io_evt_to_thread (s->tx_fifo, SESSION_IO_EVT_TX);
+}
 
-  if (pool_is_free_index (smm->listen_sessions[type], index))
-    return 0;
+/*
+ * Listen sessions
+ */
 
-  s = pool_elt_at_index (smm->listen_sessions[type], index);
-  ASSERT (s->session_state == SESSION_STATE_LISTENING);
-  return s;
+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 stream_session_t *
-listen_session_new (session_type_t type)
+always_inline session_t *
+listen_session_get_from_handle (session_handle_t handle)
 {
-  stream_session_t *s;
-  pool_get_aligned (session_manager_main.listen_sessions[type], s,
-                   CLIB_CACHE_LINE_BYTES);
-  memset (s, 0, sizeof (*s));
+  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 (session_t * s);
+
+/*
+ * Session layer functions
+ */
+
+always_inline session_main_t *
+vnet_get_session_main ()
+{
+  return &session_main;
+}
+
+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)
+{
+  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_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__ */
 
 /*