mirror of
https://github.com/mii443/qemu.git
synced 2025-08-22 23:25:48 +00:00
coroutine: abort if we try to schedule or enter a pending coroutine
The previous patch fixed a race condition, in which there were coroutines being executing doubly, or after coroutine deletion. We can detect common scenarios when this happens, and print an error message and abort before we corrupt memory / data, or segfault. This patch will abort if an attempt to enter a coroutine is made while it is currently pending execution, either in a specific AioContext bh, or pending execution via a timer. It will also abort if a coroutine is scheduled, before a prior scheduled run has occurred. We cannot rely on the existing co->caller check for recursive re-entry to catch this, as the coroutine may run and exit with COROUTINE_TERMINATE before the scheduled coroutine executes. (This is the scenario that was occurring and fixed in the previous patch). This patch also re-orders the Coroutine struct elements in an attempt to optimize caching. Signed-off-by: Jeff Cody <jcody@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
13
util/async.c
13
util/async.c
@ -388,6 +388,9 @@ static void co_schedule_bh_cb(void *opaque)
|
||||
QSLIST_REMOVE_HEAD(&straight, co_scheduled_next);
|
||||
trace_aio_co_schedule_bh_cb(ctx, co);
|
||||
aio_context_acquire(ctx);
|
||||
|
||||
/* Protected by write barrier in qemu_aio_coroutine_enter */
|
||||
atomic_set(&co->scheduled, NULL);
|
||||
qemu_coroutine_enter(co);
|
||||
aio_context_release(ctx);
|
||||
}
|
||||
@ -438,6 +441,16 @@ fail:
|
||||
void aio_co_schedule(AioContext *ctx, Coroutine *co)
|
||||
{
|
||||
trace_aio_co_schedule(ctx, co);
|
||||
const char *scheduled = atomic_cmpxchg(&co->scheduled, NULL,
|
||||
__func__);
|
||||
|
||||
if (scheduled) {
|
||||
fprintf(stderr,
|
||||
"%s: Co-routine was already scheduled in '%s'\n",
|
||||
__func__, scheduled);
|
||||
abort();
|
||||
}
|
||||
|
||||
QSLIST_INSERT_HEAD_ATOMIC(&ctx->scheduled_coroutines,
|
||||
co, co_scheduled_next);
|
||||
qemu_bh_schedule(ctx->co_schedule_bh);
|
||||
|
Reference in New Issue
Block a user