X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsegment_manager.h;h=15fd067053f521eaed1de8a3f91e29f9dd7ba3c2;hb=288eaab5964b9211350acad8d742fae4789577fe;hp=9b1d4cd0c06a18170b1f47b2468309b3de48d3c1;hpb=a332c46a51f9b4e13963340dfee1318e7513c124;p=vpp.git diff --git a/src/vnet/session/segment_manager.h b/src/vnet/session/segment_manager.h index 9b1d4cd0c06..15fd067053f 100644 --- a/src/vnet/session/segment_manager.h +++ b/src/vnet/session/segment_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Cisco and/or its affiliates. + * Copyright (c) 2017-2019 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -17,31 +17,24 @@ #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; - - /** Segment type: if set to SSVM_N_TYPES, private segments are used */ - ssvm_segment_type_t segment_type; - - /** 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 @@ -52,8 +45,8 @@ typedef struct _segment_manager /** rwlock that protects the segments pool */ clib_rwlock_t segments_rwlock; - /** Owner app index */ - u32 app_index; + /** Owner app worker index */ + u32 app_wrk_index; /** * First segment should not be deleted unless segment manger is deleted. @@ -65,7 +58,7 @@ typedef struct _segment_manager /** * App event queue allocated in first segment */ - svm_queue_t *event_queue; + svm_msg_q_t *event_queue; } segment_manager_t; #define segment_manager_foreach_segment_w_lock(VAR, SM, BODY) \ @@ -118,22 +111,35 @@ segment_manager_index (segment_manager_t * sm) return sm - segment_manager_main.segment_managers; } -always_inline svm_queue_t * +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 (); int segment_manager_init (segment_manager_t * sm, u32 first_seg_size, - u32 evt_q_size, u32 prealloc_fifo_pairs); + u32 prealloc_fifo_pairs); -svm_fifo_segment_private_t *segment_manager_get_segment (segment_manager_t * - sm, +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); @@ -143,16 +149,20 @@ 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); -svm_queue_t *segment_manager_alloc_queue (segment_manager_t * sm, - u32 queue_size); +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);