diff options
| author |   Nathan Skrzypczak <nathan.skrzypczak@gmail.com> | 2019-11-07 16:00:57 +0100 |
|---|---|---|
| committer |   Andrew Yourtchenko <ayourtch@gmail.com> | 2019-12-20 09:15:20 +0000 |
| commit | 2eb13c295427405208ad9d13d562d2a084a46da7 (patch) | |
| tree | 24892c0406c9b377555977d7d88fc7c4a115a9e3 | |
| parent | 814e898eba5b3c52515b878f673fc6aa60063ad9 (diff) | |
api: fix dead client scan heap issue
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)
| -rw-r--r-- | src/vlibmemory/memory_api.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/vlibmemory/memory_api.c b/src/vlibmemory/memory_api.c index 34fd9563b73..c9eebabfc50 100644 --- a/src/vlibmemory/memory_api.c +++ b/src/vlibmemory/memory_api.c @@ -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); goto found; } + svm_pop_heap (oldheap); clib_warning ("private rp %llx AWOL", dead_rp); + oldheap = svm_push_data_heap (svm); found: /* Kill it, accounting for the memfd header page */ + svm_pop_heap (oldheap); if (munmap ((void *) virtual_base, virtual_size) < 0) clib_unix_warning ("munmap"); /* Reset the queue-length-address cache */ vec_reset_length (vl_api_queue_cursizes); + oldheap = svm_push_data_heap (svm); } else { |