ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcl: cleanup fifos detached from segments

Browse Source 
Type: fix

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I412024731c1f561680736ad7bfabb99b595e3dff
This commit is contained in:
Florin Coras
2021-02-20 10:42:22 -08:00
committed by Dave Barach
parent 44fadb0a60
commit cbb5e824af
4 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/svm/fifo_segment.c
View File

@ -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)
{

10
src/svm/fifo_segment.h
View File

@ -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);