diff options
| author |   Alexander Kabaev <kan@freebsd.org> | 2019-11-01 18:26:20 -0400 |
|---|---|---|
| committer |   Andrew Yourtchenko <ayourtch@gmail.com> | 2019-11-18 13:15:39 +0000 |
| commit | ccdd73e636e634c21ff83b7e757c21c4dfb9b59d (patch) | |
| tree | 59aca33042f3e0afbfe4229e62d6905e8dc2ff3b | |
| parent | f821dd79900a891fb6489712d02992330defc2f5 (diff) | |
vlib: Handle race in thread barrier processing
When CLIB_DEBUG is enabled, vlib_foreach_main macro asserts that
vlib_main it currently looks at is safely parked in barrier, by
checkling that vlib_main->parked_at_barrier is not 0.
Unfortunately, the check is racy - workers first increment the
atomic counter to indicate that they have reached the barrier
and _then_ set this_main->parked_at_barrier to 1. For the last
worker to suspend this opens the race - main thread is free
to execute and assert immediately after atomic counter has been
incremented, before worker gets to write to own parked_at_barrier.
Fix this by simply swapping the order of two operations.
Type: fix
Signed-off-by: Alexnader Kabaev <kan@FreeBSD.org>
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
Change-Id: Iae47abd6ca0be1c5413f5ecaefabc64cd7eac2ed
(cherry picked from commit feda545105106d673fdca61028331c86eeb1f408)
| -rw-r--r-- | src/vlib/threads.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vlib/threads.h b/src/vlib/threads.h index 79f44c8f502..312323c096d 100644 --- a/src/vlib/threads.h +++ b/src/vlib/threads.h @@ -416,12 +416,12 @@ vlib_worker_thread_barrier_check (void) ed->thread_index = thread_index; } - clib_atomic_fetch_add (vlib_worker_threads->workers_at_barrier, 1); if (CLIB_DEBUG > 0) { vm = vlib_get_main (); vm->parked_at_barrier = 1; } + clib_atomic_fetch_add (vlib_worker_threads->workers_at_barrier, 1); while (*vlib_worker_threads->wait_at_barrier) ; |