From cbb5e824afc3f6de0663e7b9a201d4c281c36ec0 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Sat, 20 Feb 2021 10:42:22 -0800 Subject: vcl: cleanup fifos detached from segments Type: fix Signed-off-by: Florin Coras Change-Id: I412024731c1f561680736ad7bfabb99b595e3dff --- src/svm/fifo_segment.c | 19 ++++++++++++++++--- src/svm/fifo_segment.h | 10 ++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) (limited to 'src/svm') diff --git a/src/svm/fifo_segment.c b/src/svm/fifo_segment.c index ea0352f4835..9f1e46c9df6 100644 --- a/src/svm/fifo_segment.c +++ b/src/svm/fifo_segment.c @@ -418,6 +418,14 @@ fifo_segment_get_segment (fifo_segment_main_t * sm, u32 segment_index) return pool_elt_at_index (sm->segments, segment_index); } +fifo_segment_t * +fifo_segment_get_segment_if_valid (fifo_segment_main_t *sm, u32 segment_index) +{ + if (pool_is_free_index (sm->segments, segment_index)) + return 0; + return pool_elt_at_index (sm->segments, segment_index); +} + void fifo_segment_info (fifo_segment_t * seg, char **address, size_t * size) { @@ -783,9 +791,8 @@ fs_fifo_alloc (fifo_segment_t *fs, u32 slice_index) } void -fs_fifo_free (fifo_segment_t *fs, svm_fifo_t *f) +fs_fifo_free (fifo_segment_t *fs, svm_fifo_t *f, u32 slice_index) { - u32 slice_index = f->shr->slice_index; fifo_slice_private_t *pfss; if (CLIB_DEBUG) @@ -932,11 +939,17 @@ fifo_segment_free_fifo (fifo_segment_t * fs, svm_fifo_t * f) f->ooo_enq = f->ooo_deq = 0; f->prev = 0; - fs_fifo_free (fs, f); + fs_fifo_free (fs, f, f->shr->slice_index); fsh_active_fifos_update (fsh, -1); } +void +fifo_segment_free_client_fifo (fifo_segment_t *fs, svm_fifo_t *f) +{ + fs_fifo_free (fs, f, 0 /* clients attach fifos in slice 0 */); +} + void fifo_segment_detach_fifo (fifo_segment_t *fs, svm_fifo_t **f) { diff --git a/src/svm/fifo_segment.h b/src/svm/fifo_segment.h index 9d2ab281034..64dfce87b6d 100644 --- a/src/svm/fifo_segment.h +++ b/src/svm/fifo_segment.h @@ -101,6 +101,8 @@ void fifo_segment_delete (fifo_segment_main_t * sm, fifo_segment_t * fs); void fifo_segment_cleanup (fifo_segment_t *fs); fifo_segment_t *fifo_segment_get_segment (fifo_segment_main_t * sm, u32 fs_index); +fifo_segment_t *fifo_segment_get_segment_if_valid (fifo_segment_main_t *sm, + u32 segment_index); u32 fifo_segment_index (fifo_segment_main_t * sm, fifo_segment_t * fs); void fifo_segment_info (fifo_segment_t * seg, char **address, size_t * size); @@ -139,6 +141,14 @@ svm_fifo_t *fifo_segment_alloc_fifo_w_offset (fifo_segment_t *fs, */ void fifo_segment_free_fifo (fifo_segment_t * fs, svm_fifo_t * f); +/** + * Free fifo allocated by external applications + * + * @params fs fifo segment for fifo + * @param f fifo to be freed + */ +void fifo_segment_free_client_fifo (fifo_segment_t *fs, svm_fifo_t *f); + void fifo_segment_detach_fifo (fifo_segment_t *fs, svm_fifo_t **f); void fifo_segment_attach_fifo (fifo_segment_t *fs, svm_fifo_t **f, u32 slice_index); -- cgit 1.2.3-korg