session: optimize ct fifo segment allocations

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

diff --git a/src/vnet/session/segment_manager.h b/src/vnet/session/segment_manager.h
index cd02d54..ef8b970 100644 (file)
--- a/src/vnet/session/segment_manager.h
+++ b/src/vnet/session/segment_manager.h
@@ -27,6 +27,7 @@ typedef struct _segment_manager_props
   u32 tx_fifo_size;                    /**< transmit fifo size */
   u32 evt_q_size;                      /**< event queue length */
   u32 prealloc_fifos;                  /**< preallocated fifo pairs */
+  u32 prealloc_fifo_hdrs;              /**< preallocated fifo hdrs */
   uword segment_size;                  /**< first segment size */
   uword add_segment_size;              /**< additional segment size */
   u8 add_segment:1;                    /**< can add new segments flag */
@@ -41,6 +42,12 @@ typedef struct _segment_manager_props
   u8 pct_first_alloc;                  /**< pct of fifo size to alloc */
 } segment_manager_props_t;
 
+typedef enum seg_manager_flag_
+{
+  SEG_MANAGER_F_DETACHED = 1 << 0,
+  SEG_MANAGER_F_DETACHED_LISTENER = 1 << 1,
+} seg_manager_flag_t;
+
 typedef struct _segment_manager
 {
   /** Pool of segments allocated by this manager */
@@ -64,21 +71,18 @@ typedef struct _segment_manager
    */
   svm_msg_q_t *event_queue;
 
+  u8 flags;
+
   u32 max_fifo_size;
   u8 high_watermark;
   u8 low_watermark;
 } segment_manager_t;
 
-typedef struct segment_manager_main_init_args_
-{
-  u64 baseva;
-  u64 size;
-} segment_manager_main_init_args_t;
-
 #define SEGMENT_MANAGER_INVALID_APP_INDEX ((u32) ~0)
 
 segment_manager_t *segment_manager_alloc (void);
 int segment_manager_init (segment_manager_t * sm);
+int segment_manager_init_first (segment_manager_t * sm);
 
 /**
  * Cleanup segment manager
@@ -86,6 +90,7 @@ int segment_manager_init (segment_manager_t * sm);
  * @param sm   segment manager to be freed
  */
 void segment_manager_free (segment_manager_t * sm);
+void segment_manager_free_safe (segment_manager_t *sm);
 
 /**
  * Initiate segment manager cleanup
@@ -97,9 +102,12 @@ segment_manager_t *segment_manager_get (u32 index);
 segment_manager_t *segment_manager_get_if_valid (u32 index);
 u32 segment_manager_index (segment_manager_t * sm);
 
-int segment_manager_add_segment (segment_manager_t * sm, uword segment_size);
+int segment_manager_add_segment (segment_manager_t *sm, uword segment_size,
+                                u8 notify_app);
 void segment_manager_del_segment (segment_manager_t * sm,
                                  fifo_segment_t * fs);
+void segment_manager_lock_and_del_segment (segment_manager_t * sm,
+                                          u32 fs_index);
 fifo_segment_t *segment_manager_get_segment (segment_manager_t * sm,
                                             u32 segment_index);
 fifo_segment_t *segment_manager_get_segment_w_handle (u64 sh);
@@ -125,6 +133,9 @@ int segment_manager_try_alloc_fifos (fifo_segment_t * fs,
                                     svm_fifo_t ** tx_fifo);
 void segment_manager_dealloc_fifos (svm_fifo_t * rx_fifo,
                                    svm_fifo_t * tx_fifo);
+void segment_manager_detach_fifo (segment_manager_t *sm, svm_fifo_t **f);
+void segment_manager_attach_fifo (segment_manager_t *sm, svm_fifo_t **f,
+                                 session_t *s);
 
 void segment_manager_set_watermarks (segment_manager_t * sm,
                                     u8 high_watermark, u8 low_watermark);
@@ -137,6 +148,7 @@ void segment_manager_dealloc_queue (segment_manager_t * sm, svm_queue_t * q);
 svm_msg_q_t *segment_manager_event_queue (segment_manager_t * sm);
 u32 segment_manager_evt_q_expected_size (u32 q_size);
 
+u8 segment_manager_app_detached (segment_manager_t * sm);
 void segment_manager_app_detach (segment_manager_t * sm);
 
 /**
@@ -148,13 +160,23 @@ void segment_manager_app_detach (segment_manager_t * sm);
  * @param sm   segment manager whose sessions are to be disconnected
  */
 void segment_manager_del_sessions (segment_manager_t * sm);
+void segment_manager_del_sessions_filter (segment_manager_t *sm,
+                                         session_state_t *states);
 void segment_manager_format_sessions (segment_manager_t * sm, int verbose);
 
-void segment_manager_main_init (segment_manager_main_init_args_t * a);
+void segment_manager_main_init (void);
 
 segment_manager_props_t *segment_manager_props_init (segment_manager_props_t *
                                                     sm);
 
+static inline void
+segment_manager_parse_segment_handle (u64 segment_handle, u32 * sm_index,
+                                     u32 * segment_index)
+{
+  *sm_index = segment_handle >> 32;
+  *segment_index = segment_handle & 0xFFFFFFFF;
+}
+
 #endif /* SRC_VNET_SESSION_SEGMENT_MANAGER_H_ */
 /*
  * fd.io coding-style-patch-verification: ON