summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2021-02-20 10:42:22 -0800
committerDave Barach <openvpp@barachs.net>2021-02-22 22:26:45 +0000
commitcbb5e824afc3f6de0663e7b9a201d4c281c36ec0 (patch)
tree52ab9b1277eb7ce1fb261bea426184a7500d078a
parent44fadb0a604b4bbdcb142cec53ddcd356f670900 (diff)
vcl: cleanup fifos detached from segments
Type: fix Signed-off-by: Florin Coras <fcoras@cisco.com> Change-Id: I412024731c1f561680736ad7bfabb99b595e3dff
-rw-r--r--src/svm/fifo_segment.c19
-rw-r--r--src/svm/fifo_segment.h10
-rw-r--r--src/vcl/vcl_private.c31
-rw-r--r--src/vcl/vcl_private.h3
4 files changed, 60 insertions, 3 deletions
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,12 +939,18 @@ 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)
{
fifo_slice_private_t *pfss;
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);
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);
}