X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsegment_manager.h;h=e786b3144c2ef080152a79f6b9f481f77aa9409a;hb=e111bbd121b7c2ca4e2a002fd8ed4ffcea5222ff;hp=cad95509b2e8dfc9658bb477fe7f5a858e9a92d9;hpb=234fe894d80a6ebc7e457bc86f2eea80d5ef01ea;p=vpp.git diff --git a/src/vnet/session/segment_manager.h b/src/vnet/session/segment_manager.h index cad95509b2e..e786b3144c2 100644 --- a/src/vnet/session/segment_manager.h +++ b/src/vnet/session/segment_manager.h @@ -19,6 +19,7 @@ #include #include #include +#include typedef struct _segment_manager_props { @@ -26,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 */ @@ -34,10 +36,19 @@ typedef struct _segment_manager_props u8 n_slices; /**< number of fs slices/threads */ ssvm_segment_type_t segment_type; /**< seg type: if set to SSVM_N_TYPES, private segments are used */ + u32 max_fifo_size; /**< max fifo size */ u8 high_watermark; /**< memory usage high watermark % */ u8 low_watermark; /**< memory usage low watermark % */ + u8 pct_first_alloc; /**< pct of fifo size to alloc */ + u8 huge_page; /**< use hugepage */ } 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 */ @@ -61,20 +72,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 @@ -82,6 +91,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 @@ -93,9 +103,29 @@ 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); +/** + * Add segment without lock + * + * @param sm Segment manager + * @param segment_size Size of segment to be added + * @param notify_app Flag set if app notification requested + */ +int segment_manager_add_segment (segment_manager_t *sm, uword segment_size, + u8 notify_app); + +/** + * Add segment with lock + * + * @param sm Segment manager + * @param segment_size Size of segment to be added + * @param flags Flags to be set on segment + */ +int segment_manager_add_segment2 (segment_manager_t *sm, uword segment_size, + u8 flags); 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); @@ -108,7 +138,6 @@ u64 segment_manager_make_segment_handle (u32 segment_manager_index, u64 segment_manager_segment_handle (segment_manager_t * sm, fifo_segment_t * segment); void segment_manager_segment_reader_unlock (segment_manager_t * sm); -void segment_manager_segment_writer_unlock (segment_manager_t * sm); int segment_manager_alloc_session_fifos (segment_manager_t * sm, u32 thread_index, @@ -121,6 +150,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); @@ -133,6 +165,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); /** @@ -144,13 +177,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