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/vcl/vcl_private.c | 31 +++++++++++++++++++++++++++++++ src/vcl/vcl_private.h | 3 +++ 2 files changed, 34 insertions(+) (limited to 'src/vcl') diff --git a/src/vcl/vcl_private.c b/src/vcl/vcl_private.c index 85fe0a8b06e..3b30d1753c2 100644 --- a/src/vcl/vcl_private.c +++ b/src/vcl/vcl_private.c @@ -404,6 +404,8 @@ vcl_segment_attach_session (uword segment_handle, uword rxf_offset, fs = fifo_segment_get_segment (&vcm->segment_main, fs_index); rxf = fifo_segment_alloc_fifo_w_offset (fs, rxf_offset); txf = fifo_segment_alloc_fifo_w_offset (fs, txf_offset); + rxf->segment_index = fs_index; + txf->segment_index = fs_index; if (!is_ct && mq_offset != (uword) ~0) { @@ -432,6 +434,35 @@ vcl_segment_attach_session (uword segment_handle, uword rxf_offset, return 0; } +void +vcl_session_detach_fifos (vcl_session_t *s) +{ + fifo_segment_t *fs; + + if (!s->rx_fifo) + return; + + clib_rwlock_reader_lock (&vcm->segment_table_lock); + + fs = fifo_segment_get_segment_if_valid (&vcm->segment_main, + s->rx_fifo->segment_index); + if (!fs) + goto done; + + fifo_segment_free_client_fifo (fs, s->rx_fifo); + fifo_segment_free_client_fifo (fs, s->tx_fifo); + if (s->ct_rx_fifo) + { + fs = fifo_segment_get_segment (&vcm->segment_main, + s->ct_rx_fifo->segment_index); + fifo_segment_free_client_fifo (fs, s->ct_rx_fifo); + fifo_segment_free_client_fifo (fs, s->ct_tx_fifo); + } + +done: + clib_rwlock_reader_unlock (&vcm->segment_table_lock); +} + int vcl_segment_attach_mq (uword segment_handle, uword mq_offset, u32 mq_index, svm_msg_q_t **mq) diff --git a/src/vcl/vcl_private.h b/src/vcl/vcl_private.h index 59bb7621e70..df0ca070ccf 100644 --- a/src/vcl/vcl_private.h +++ b/src/vcl/vcl_private.h @@ -364,6 +364,8 @@ extern vppcom_main_t _vppcom_main; #define VCL_INVALID_SEGMENT_INDEX ((u32)~0) #define VCL_INVALID_SEGMENT_HANDLE ((u64)~0) +void vcl_session_detach_fifos (vcl_session_t *s); + static inline vcl_session_t * vcl_session_alloc (vcl_worker_t * wrk) { @@ -380,6 +382,7 @@ vcl_session_free (vcl_worker_t * wrk, vcl_session_t * s) { /* Debug level set to 1 to avoid debug messages while ldp is cleaning up */ VDBG (1, "session %u [0x%llx] removed", s->session_index, s->vpp_handle); + vcl_session_detach_fifos (s); pool_put (wrk->sessions, s); } -- cgit 1.2.3-korg