X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsegment_manager.h;h=ef8b9703e8383f38fd56c8fc1f02ce489070951d;hp=cbf8e3535224d26b884cad21392f6ed4ca2887ae;hb=da78c5abc;hpb=b095a3cd221a142f7d2b4897b812b2781de05d29 diff --git a/src/vnet/session/segment_manager.h b/src/vnet/session/segment_manager.h index cbf8e353522..ef8b9703e83 100644 --- a/src/vnet/session/segment_manager.h +++ b/src/vnet/session/segment_manager.h @@ -19,22 +19,35 @@ #include #include #include +#include typedef struct _segment_manager_props { u32 rx_fifo_size; /**< receive fifo size */ u32 tx_fifo_size; /**< transmit fifo size */ u32 evt_q_size; /**< event queue length */ - u32 segment_size; /**< first segment size */ u32 prealloc_fifos; /**< preallocated fifo pairs */ - u32 add_segment_size; /**< additional segment size */ + 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 */ u8 use_mq_eventfd:1; /**< use eventfds for mqs flag */ u8 reserved:6; /**< reserved flags */ + 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 */ } 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 */ @@ -57,19 +70,19 @@ typedef struct _segment_manager * App event queue allocated in first segment */ svm_msg_q_t *event_queue; -} segment_manager_t; -typedef struct segment_manager_main_init_args_ -{ - u64 baseva; - u64 size; -} segment_manager_main_init_args_t; + u8 flags; + + u32 max_fifo_size; + u8 high_watermark; + u8 low_watermark; +} segment_manager_t; #define SEGMENT_MANAGER_INVALID_APP_INDEX ((u32) ~0) segment_manager_t *segment_manager_alloc (void); -int segment_manager_init (segment_manager_t * sm, u32 first_seg_size, - u32 prealloc_fifo_pairs); +int segment_manager_init (segment_manager_t * sm); +int segment_manager_init_first (segment_manager_t * sm); /** * Cleanup segment manager @@ -77,6 +90,7 @@ int segment_manager_init (segment_manager_t * sm, u32 first_seg_size, * @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 @@ -88,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, u32 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); @@ -106,25 +123,23 @@ 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, svm_fifo_t ** rx_fifo, svm_fifo_t ** tx_fifo); int segment_manager_try_alloc_fifos (fifo_segment_t * fs, + u32 thread_index, u32 rx_fifo_size, u32 tx_fifo_size, svm_fifo_t ** rx_fifo, 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); -/** - * Grows fifo owned by segment manager - * - * @param sm segment manager that owns the fifo - * @param f fifo to be grown - * @param size amount of bytes to add to fifo - * @return 0 on success, negative number otherwise - */ -int segment_manager_grow_fifo (segment_manager_t * sm, svm_fifo_t * f, - u32 size); u8 segment_manager_has_fifos (segment_manager_t * sm); svm_msg_q_t *segment_manager_alloc_queue (fifo_segment_t * fs, @@ -133,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); /** @@ -144,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