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

memif: contention between memif_disconnect and memif RX/TX threads

Browse Source 
memif_disconect may be called without barrier sync. It removes stuff in mq
without protection which may cause troubles for memif RX/TX worker threads.

The fix is to protect mq removal in memif_disconnect.

Type: fix

Change-Id: I368c466d1f13df98980dfa87e8442fbcd822a428
Signed-off-by: Steven Luong <sluong@cisco.com>
This commit is contained in:
Steven Luong
2023-10-05 15:33:40 -07:00
committed by Damjan Marion
parent bf236630f5
commit 34c721fb47
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/memif/memif.c
+11
View File
@@ -100,6 +100,8 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err)
memif_region_t *mr;
memif_queue_t *mq;
int i;
vlib_main_t *vm = vlib_get_main ();
int with_barrier = 0;
if (mif == 0)
return;
@@ -141,6 +143,12 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err)
clib_mem_free (mif->sock);
}
if (vlib_worker_thread_barrier_held () == 0)
{
with_barrier = 1;
vlib_worker_thread_barrier_sync (vm);
}
/* *INDENT-OFF* */
vec_foreach_index (i, mif->rx_queues)
{
@@ -198,6 +206,9 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err)
vec_free (mif->remote_name);
vec_free (mif->remote_if_name);
clib_fifo_free (mif->msg_queue);
if (with_barrier)
vlib_worker_thread_barrier_release (vm);
}
static clib_error_t *