From 88001c64e9e5d0dc08e303857ca34687454ebf10 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Wed, 24 Apr 2019 14:44:46 -0700 Subject: session: cleanup segment manager and fifo segment Change-Id: I984f347fb465c0c405cef668d8690457e81788e2 Signed-off-by: Florin Coras --- src/vnet/session/segment_manager.h | 145 +++++++++++++++---------------------- 1 file changed, 58 insertions(+), 87 deletions(-) (limited to 'src/vnet/session/segment_manager.h') diff --git a/src/vnet/session/segment_manager.h b/src/vnet/session/segment_manager.h index 2b6f43feba7..4f30b7a8d2c 100644 --- a/src/vnet/session/segment_manager.h +++ b/src/vnet/session/segment_manager.h @@ -15,14 +15,12 @@ #ifndef SRC_VNET_SESSION_SEGMENT_MANAGER_H_ #define SRC_VNET_SESSION_SEGMENT_MANAGER_H_ -#include -#include #include -#include #include #include +#include -typedef struct _segment_manager_properties +typedef struct _segment_manager_props { u32 rx_fifo_size; /**< receive fifo size */ u32 tx_fifo_size; /**< transmit fifo size */ @@ -35,12 +33,12 @@ typedef struct _segment_manager_properties u8 reserved:6; /**< reserved flags */ ssvm_segment_type_t segment_type; /**< seg type: if set to SSVM_N_TYPES, private segments are used */ -} segment_manager_properties_t; +} segment_manager_props_t; typedef struct _segment_manager { /** Pool of segments allocated by this manager */ - svm_fifo_segment_private_t *segments; + fifo_segment_t *segments; /** rwlock that protects the segments pool */ clib_rwlock_t segments_rwlock; @@ -61,25 +59,6 @@ typedef struct _segment_manager svm_msg_q_t *event_queue; } segment_manager_t; -#define segment_manager_foreach_segment_w_lock(VAR, SM, BODY) \ -do { \ - clib_rwlock_reader_lock (&(SM)->segments_rwlock); \ - pool_foreach((VAR), ((SM)->segments), (BODY)); \ - clib_rwlock_reader_unlock (&(SM)->segments_rwlock); \ -} while (0) - -typedef struct segment_manager_main_ -{ - /** Pool of segment managers */ - segment_manager_t *segment_managers; - - /** Virtual address allocator */ - clib_valloc_main_t va_allocator; - -} segment_manager_main_t; - -extern segment_manager_main_t segment_manager_main; - typedef struct segment_manager_main_init_args_ { u64 baseva; @@ -88,86 +67,78 @@ typedef struct segment_manager_main_init_args_ #define SEGMENT_MANAGER_INVALID_APP_INDEX ((u32) ~0) -/** Pool of segment managers */ -extern segment_manager_t *segment_managers; - -always_inline segment_manager_t * -segment_manager_get (u32 index) -{ - return pool_elt_at_index (segment_manager_main.segment_managers, index); -} - -always_inline segment_manager_t * -segment_manager_get_if_valid (u32 index) -{ - if (pool_is_free_index (segment_manager_main.segment_managers, index)) - return 0; - return pool_elt_at_index (segment_manager_main.segment_managers, index); -} - -always_inline u32 -segment_manager_index (segment_manager_t * sm) -{ - return sm - segment_manager_main.segment_managers; -} - -always_inline svm_msg_q_t * -segment_manager_event_queue (segment_manager_t * sm) -{ - return sm->event_queue; -} - -always_inline u64 -segment_manager_make_segment_handle (u32 segment_manager_index, - u32 segment_index) -{ - return (((u64) segment_manager_index << 32) | segment_index); -} - -u64 segment_manager_segment_handle (segment_manager_t * sm, - svm_fifo_segment_private_t * segment); - -segment_manager_t *segment_manager_new (); +segment_manager_t *segment_manager_alloc (void); int segment_manager_init (segment_manager_t * sm, u32 first_seg_size, u32 prealloc_fifo_pairs); -svm_fifo_segment_private_t *segment_manager_get_segment (segment_manager_t *, - u32 segment_index); -svm_fifo_segment_private_t *segment_manager_get_segment_w_handle (u64); -svm_fifo_segment_private_t - * segment_manager_get_segment_w_lock (segment_manager_t * sm, - u32 segment_index); +/** + * Cleanup segment manager + * + * @param sm segment manager to be freed + */ +void segment_manager_free (segment_manager_t * sm); + +/** + * Initiate segment manager cleanup + * + * @param sm segment manager to be freed + */ +void segment_manager_init_free (segment_manager_t * sm); +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); void segment_manager_del_segment (segment_manager_t * sm, - svm_fifo_segment_private_t * fs); + fifo_segment_t * fs); +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); +fifo_segment_t *segment_manager_get_segment_w_lock (segment_manager_t *, + u32 segment_index); +int segment_manager_add_first_segment (segment_manager_t * sm, + u32 segment_size); +u64 segment_manager_make_segment_handle (u32 segment_manager_index, + u32 segment_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_add_first_segment (segment_manager_t * sm, - u32 segment_size); -void segment_manager_del_sessions (segment_manager_t * sm); -void segment_manager_del (segment_manager_t * sm); -void segment_manager_init_del (segment_manager_t * sm); -u8 segment_manager_has_fifos (segment_manager_t * sm); int segment_manager_alloc_session_fifos (segment_manager_t * sm, - svm_fifo_t ** server_rx_fifo, - svm_fifo_t ** server_tx_fifo); -int segment_manager_try_alloc_fifos (svm_fifo_segment_private_t * fs, + svm_fifo_t ** rx_fifo, + svm_fifo_t ** tx_fifo); +int segment_manager_try_alloc_fifos (fifo_segment_t * fs, 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); -u32 segment_manager_evt_q_expected_size (u32 q_size); -svm_msg_q_t *segment_manager_alloc_queue (svm_fifo_segment_private_t * fs, - segment_manager_properties_t * - props); +u8 segment_manager_has_fifos (segment_manager_t * sm); + +svm_msg_q_t *segment_manager_alloc_queue (fifo_segment_t * fs, + segment_manager_props_t * props); 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); + void segment_manager_app_detach (segment_manager_t * sm); +/** + * Cleanup segment manager sessions + * + * Initiates disconnects for all sessions 'owned' by a segment manager by + * leveraging the backpointers that fifos keep. + * + * @param sm segment manager whose sessions are to be disconnected + */ +void segment_manager_del_sessions (segment_manager_t * sm); +void segment_manager_format_sessions (segment_manager_t * sm, int verbose); + void segment_manager_main_init (segment_manager_main_init_args_t * a); -segment_manager_properties_t - * segment_manager_properties_init (segment_manager_properties_t * sm); + +segment_manager_props_t *segment_manager_props_init (segment_manager_props_t * + sm); #endif /* SRC_VNET_SESSION_SEGMENT_MANAGER_H_ */ /* -- cgit 1.2.3-korg