X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsegment_manager.h;h=657a1fcc231953116ef4a24c2d880a3eba382376;hb=fa76a76bf3388f09d55d0c83e7aea507c44f9619;hp=9d2d141e7b415be50fca5843bee26bb15380239a;hpb=ff6e7699a5e9921d73818970ecf3571080922ecc;p=vpp.git diff --git a/src/vnet/session/segment_manager.h b/src/vnet/session/segment_manager.h index 9d2d141e7b4..657a1fcc231 100644 --- a/src/vnet/session/segment_manager.h +++ b/src/vnet/session/segment_manager.h @@ -17,48 +17,36 @@ #include #include - -#include +#include #include #include +#include typedef struct _segment_manager_properties { - /** Session fifo sizes. */ - u32 rx_fifo_size; - u32 tx_fifo_size; - - /** Preallocated pool sizes */ - u32 preallocated_fifo_pairs; - - /** Configured additional segment size */ - u32 add_segment_size; - - /** Flag that indicates if additional segments should be created */ - u8 add_segment; - - /** Use private memory segment instead of shared memory */ - u8 use_private_segment; - - /** Use one or more private mheaps, instead of the global heap */ - u32 private_segment_count; + 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 */ + u8 add_segment:1; /**< can add new segments flag */ + u8 use_mq_eventfd:1; /**< use eventfds for mqs flag */ + 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; typedef struct _segment_manager { - clib_spinlock_t lockp; - - /** segments mapped by this manager */ - u32 *segment_indices; + /** Pool of segments allocated by this manager */ + svm_fifo_segment_private_t *segments; - /** Owner app index */ - u32 app_index; + /** rwlock that protects the segments pool */ + clib_rwlock_t segments_rwlock; - /** - * Pointer to manager properties. Could be shared among all of - * an app's segment managers s - */ - u32 properties_index; + /** Owner app worker index */ + u32 app_wrk_index; /** * First segment should not be deleted unless segment manger is deleted. @@ -66,8 +54,38 @@ typedef struct _segment_manager * allocated for the app. */ u8 first_is_protected; + + /** + * App event queue allocated in first segment + */ + 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; + u64 size; +} segment_manager_main_init_args_t; + #define SEGMENT_MANAGER_INVALID_APP_INDEX ((u32) ~0) /** Pool of segment managers */ @@ -76,53 +94,81 @@ extern segment_manager_t *segment_managers; always_inline segment_manager_t * segment_manager_get (u32 index) { - return pool_elt_at_index (segment_managers, 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_managers, index)) + if (pool_is_free_index (segment_manager_main.segment_managers, index)) return 0; - return pool_elt_at_index (segment_managers, index); + return pool_elt_at_index (segment_manager_main.segment_managers, index); } always_inline u32 segment_manager_index (segment_manager_t * sm) { - return sm - segment_managers; + return sm - segment_manager_main.segment_managers; } -segment_manager_t *segment_manager_new (); -int -segment_manager_init (segment_manager_t * sm, u32 props_index, u32 seg_size); +always_inline svm_msg_q_t * +segment_manager_event_queue (segment_manager_t * sm) +{ + return sm->event_queue; +} -void segment_manager_get_segment_info (u32 index, u8 ** name, u32 * size); -int -session_manager_add_first_segment (segment_manager_t * sm, u32 segment_size); -int session_manager_add_segment (segment_manager_t * sm); +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 (); +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); +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); +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, - u32 * fifo_segment_index); -void -segment_manager_dealloc_fifos (u32 svm_segment_index, svm_fifo_t * rx_fifo, - svm_fifo_t * tx_fifo); -unix_shared_memory_queue_t *segment_manager_alloc_queue (segment_manager_t * - sm, u32 queue_size); -void segment_manager_dealloc_queue (segment_manager_t * sm, - unix_shared_memory_queue_t * q); +int segment_manager_alloc_session_fifos (segment_manager_t * sm, + svm_fifo_t ** server_rx_fifo, + svm_fifo_t ** server_tx_fifo, + u32 * fifo_segment_index); +int segment_manager_try_alloc_fifos (svm_fifo_segment_private_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 (u32 segment_index, 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); +void segment_manager_dealloc_queue (segment_manager_t * sm, svm_queue_t * q); void segment_manager_app_detach (segment_manager_t * sm); -segment_manager_properties_t *segment_manager_properties_alloc (void); -void segment_manager_properties_free (segment_manager_properties_t * p); -segment_manager_properties_t *segment_manager_properties_get (u32 smp_index); -u32 segment_manager_properties_index (segment_manager_properties_t * p); +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); #endif /* SRC_VNET_SESSION_SEGMENT_MANAGER_H_ */ /*