session: increase max ctrl msg size

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

diff --git a/src/vnet/session/session.h b/src/vnet/session/session.h
index a3f2a01..1d3ae0c 100644 (file)
--- a/src/vnet/session/session.h
+++ b/src/vnet/session/session.h
@@ -68,6 +68,11 @@ typedef struct session_evt_elt
   session_event_t evt;
 } session_evt_elt_t;
 
+typedef struct session_ctrl_evt_data_
+{
+  u8 data[SESSION_CTRL_MSG_MAX_SIZE];
+} session_evt_ctrl_data_t;
+
 typedef struct session_worker_
 {
   CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
@@ -96,18 +101,18 @@ typedef struct session_worker_
   /** Pool of session event list elements */
   session_evt_elt_t *event_elts;
 
+  /** Pool of ctrl events data buffers */
+  session_evt_ctrl_data_t *ctrl_evts_data;
+
+  /** Head of control events list */
+  clib_llist_index_t ctrl_head;
+
   /** Head of list of elements */
   clib_llist_index_t new_head;
 
   /** Head of list of pending events */
   clib_llist_index_t old_head;
 
-  /** Head of list of postponed events */
-  clib_llist_index_t postponed_head;
-
-  /** Head of list of disconnect events */
-  clib_llist_index_t disconnects_head;
-
   /** Peekers rw lock */
   clib_rwlock_t peekers_rw_locks;
 
@@ -203,44 +208,63 @@ session_evt_elt_free (session_worker_t * wrk, session_evt_elt_t * elt)
   pool_put (wrk->event_elts, elt);
 }
 
-static inline session_evt_elt_t *
-session_evt_old_head (session_worker_t * wrk)
+static inline void
+session_evt_add_old (session_worker_t * wrk, session_evt_elt_t * elt)
 {
-  return pool_elt_at_index (wrk->event_elts, wrk->old_head);
+  clib_llist_add_tail (wrk->event_elts, evt_list, elt,
+                      pool_elt_at_index (wrk->event_elts, wrk->old_head));
 }
 
-static inline session_evt_elt_t *
-session_evt_postponed_head (session_worker_t * wrk)
+static inline u32
+session_evt_ctrl_data_alloc (session_worker_t * wrk)
 {
-  return pool_elt_at_index (wrk->event_elts, wrk->postponed_head);
+  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_pending_disconnects_head (session_worker_t * wrk)
+session_evt_alloc_ctrl (session_worker_t * wrk)
 {
-  return pool_elt_at_index (wrk->event_elts, wrk->disconnects_head);
+  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;
 }
 
-static inline void
-session_evt_add_old (session_worker_t * wrk, session_evt_elt_t * elt)
+static inline void *
+session_evt_ctrl_data (session_worker_t * wrk, session_evt_elt_t * elt)
 {
-  clib_llist_add_tail (wrk->event_elts, evt_list, elt,
-                      session_evt_old_head (wrk));
+  return (void *) (pool_elt_at_index (wrk->ctrl_evts_data,
+                                     elt->evt.ctrl_data_index));
 }
 
 static inline void
-session_evt_add_postponed (session_worker_t * wrk, session_evt_elt_t * elt)
+session_evt_ctrl_data_free (session_worker_t * wrk, session_evt_elt_t * elt)
+{
+  ASSERT (elt->evt.event_type > SESSION_IO_EVT_BUILTIN_TX);
+  pool_put_index (wrk->ctrl_evts_data, elt->evt.ctrl_data_index);
+}
+
+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,
-                      session_evt_postponed_head (wrk));
+                      pool_elt_at_index (wrk->event_elts, wrk->new_head));
+  return elt;
 }
 
-static inline void
-session_evt_add_pending_disconnects (session_worker_t * wrk,
-                                    session_evt_elt_t * elt)
+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,
-                      session_evt_pending_disconnects_head (wrk));
+                      pool_elt_at_index (wrk->event_elts, wrk->old_head));
+  return elt;
 }
 
 always_inline u8
@@ -382,7 +406,9 @@ 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);
@@ -394,6 +420,8 @@ 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);
 transport_connection_t *session_get_transport (session_t * s);
 void session_get_endpoint (session_t * s, transport_endpoint_t * tep,
                           u8 is_lcl);
@@ -554,6 +582,14 @@ 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 (pool_is_free_index (session_main.wrk, thread_index))
+    return 0;
+  return &session_main.wrk[thread_index];
+}
+
 always_inline svm_msg_q_t *
 session_main_get_vpp_event_queue (u32 thread_index)
 {
@@ -568,8 +604,8 @@ session_main_is_enabled ()
 
 #define session_cli_return_if_not_enabled()                            \
 do {                                                                   \
-    if (!session_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);