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

api: fix dead client scan heap issue

Browse Source 
Type: fix

On multiworker setup when an app client dies, the
vec_reset_length call fails the assert in
clib_mem_is_heap_object. Same thing might happen for
the clib_warnings

Change-Id: I369f9d2dbe60407c84994a4e8d25f6df7848ca93
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
(cherry picked from commit 5ed3fe3dd4320a7b4080f18de32ef491b5a1c7f0)
This commit is contained in:
Nathan Skrzypczak
2019-11-07 16:00:57 +01:00
committed by Andrew Yourtchenko
parent 814e898eba
commit 2eb13c2954
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vlibmemory/memory_api.c
View File

@ -666,14 +666,18 @@ vl_mem_api_dead_client_scan (api_main_t * am, vl_shmem_hdr_t * shm, f64 now)
vec_delete (am->vlib_private_rps, 1, i); vec_delete (am->vlib_private_rps, 1, i);
goto found; goto found;
} }
svm_pop_heap (oldheap);
clib_warning ("private rp %llx AWOL", dead_rp); clib_warning ("private rp %llx AWOL", dead_rp);
oldheap = svm_push_data_heap (svm);
found: found:
/* Kill it, accounting for the memfd header page */ /* Kill it, accounting for the memfd header page */
svm_pop_heap (oldheap);
if (munmap ((void *) virtual_base, virtual_size) < 0) if (munmap ((void *) virtual_base, virtual_size) < 0)
clib_unix_warning ("munmap"); clib_unix_warning ("munmap");
/* Reset the queue-length-address cache */ /* Reset the queue-length-address cache */
vec_reset_length (vl_api_queue_cursizes); vec_reset_length (vl_api_queue_cursizes);
oldheap = svm_push_data_heap (svm);
} }
else else
{ {