aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorAnthony PERARD <anthony.perard@citrix.com>2023-07-14 16:27:20 +0100
committerAnthony PERARD <anthony.perard@citrix.com>2023-08-01 10:22:33 +0100
commitf4f71363fcdb1092ff64d2bba6f9af39570c2f2b (patch)
tree3faa765d13d91e2a29a2af0b37906fe87e78b86d /util
parentaa36243514a777f76c8b8a19b1f8a71f27ec6c78 (diff)
downloadqemu-f4f71363fcdb1092ff64d2bba6f9af39570c2f2b.zip
qemu-f4f71363fcdb1092ff64d2bba6f9af39570c2f2b.tar.gz
qemu-f4f71363fcdb1092ff64d2bba6f9af39570c2f2b.tar.bz2
thread-pool: signal "request_cond" while locked
thread_pool_free() might have been called on the `pool`, which would be a reason for worker_thread() to quit. In this case, `pool->request_cond` is been destroyed. If worker_thread() didn't managed to signal `request_cond` before it been destroyed by thread_pool_free(), we got: util/qemu-thread-posix.c:198: qemu_cond_signal: Assertion `cond->initialized' failed. One backtrace: __GI___assert_fail (assertion=0x55555614abcb "cond->initialized", file=0x55555614ab88 "util/qemu-thread-posix.c", line=198, function=0x55555614ad80 <__PRETTY_FUNCTION__.17104> "qemu_cond_signal") at assert.c:101 qemu_cond_signal (cond=0x7fffb800db30) at util/qemu-thread-posix.c:198 worker_thread (opaque=0x7fffb800dab0) at util/thread-pool.c:129 qemu_thread_start (args=0x7fffb8000b20) at util/qemu-thread-posix.c:505 start_thread (arg=<optimized out>) at pthread_create.c:486 Reported here: https://lore.kernel.org/all/ZJwoK50FcnTSfFZ8@MacBook-Air-de-Roger.local/T/#u To avoid issue, keep lock while sending a signal to `request_cond`. Fixes: 900fa208f506 ("thread-pool: replace semaphore with condition variable") Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Message-Id: <20230714152720.5077-1-anthony.perard@citrix.com> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Diffstat (limited to 'util')
-rw-r--r--util/thread-pool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/thread-pool.c b/util/thread-pool.c
index 0d97888..e3d8292 100644
--- a/util/thread-pool.c
+++ b/util/thread-pool.c
@@ -120,13 +120,13 @@ static void *worker_thread(void *opaque)
pool->cur_threads--;
qemu_cond_signal(&pool->worker_stopped);
- qemu_mutex_unlock(&pool->lock);
/*
* Wake up another thread, in case we got a wakeup but decided
* to exit due to pool->cur_threads > pool->max_threads.
*/
qemu_cond_signal(&pool->request_cond);
+ qemu_mutex_unlock(&pool->lock);
return NULL;
}