aio-posix: fix io_uring with external events
PATCH 1/1 aio-posix: fix io_uring with external events
When external event sources are disabled fdmon-io_uring falls back to fdmon-poll. The ->need_wait() callback needs to watch for this so it can return true when external event sources are disabled.
It is also necessary to call ->wait() when AioHandlers have changed because io_uring is asynchronous and we must submit new sqes.
Both of these changes to ->need_wait() together fix tests/test-aio -p /aio/external-client, which failed with:
test-aio: tests/test-aio.c:404: test_aio_external_client: Assertion `aio_poll(ctx, false)' failed.
--- util/fdmon-io_uring.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
util/fdmon-io_uring.c +12 -1
@@ -290,7 +290,18 @@ static int fdmon_io_uring_wait(AioContext *ctx, AioHandlerList *ready_list,static bool fdmon_io_uring_need_wait (AioContext *ctx) { -return io_uring_cq_ready (&ctx->fdmon_io_uring); +/* Have io_uring events completed? */ +if (io_uring_cq_ready (&ctx->fdmon_io_uring)) { +return true; + } + +/* Do we need to submit new io_uring sqes? */ +if (!QSLIST_EMPTY_RCU (&ctx->submit_list)) { +return true; + } + +/* Are we falling back to fdmon-poll? */ +return atomic_read (&ctx->external_disable_cnt); }static const FDMonOps fdmon_io_uring_ops = {
Signature · 1 line
2.24.1
Quoted 45 lines · Stefan Hajnoczi
When external event sources are disabled fdmon-io_uring falls back to fdmon-poll. The ->need_wait() callback needs to watch for this so it can return true when external event sources are disabled.
It is also necessary to call ->wait() when AioHandlers have changed because
io_uringis asynchronous and we must submit new sqes.Both of these changes to ->need_wait() together fix tests/test-aio -p /aio/external-client, which failed with:
test-aio:
tests/test-aio.c:404:test_aio_external_client: Assertion `aio_poll(ctx, false)' failed.Reported-by Julia Suvorova <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>--- util/fdmon-io_uring.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)util/fdmon-io_uring.c +12
-1@@ -290,7 +290,18 @@ static int fdmon_io_uring_wait(AioContext *ctx, AioHandlerList *ready_list,static bool fdmon_io_uring_need_wait (AioContext *ctx) { -return io_uring_cq_ready (&ctx->fdmon_io_uring); +/* Have io_uring events completed? */ +if (io_uring_cq_ready (&ctx->fdmon_io_uring)) { +return true; + } + +/* Do we need to submit new io_uring sqes? */ +if (!QSLIST_EMPTY_RCU (&ctx->submit_list)) { +return true; + } + +/* Are we falling back to fdmon-poll? */ +return atomic_read (&ctx->external_disable_cnt); }static const FDMonOps fdmon_io_uring_ops = {Signature · 1 line
2.24.1
Stefan Hajnoczi
AppliedQuoted 10 lines · Stefan Hajnoczi
When external event sources are disabled fdmon-io_uring falls back to fdmon-poll. The ->need_wait() callback needs to watch for this so it can return true when external event sources are disabled.
It is also necessary to call ->wait() when AioHandlers have changed because
io_uringis asynchronous and we must submit new sqes.Both of these changes to ->need_wait() together fix tests/test-aio -p /aio/external-client, which failed with:
Quoted 7 lines
test-aio:
tests/test-aio.c:404:test_aio_external_client: Assertion `aio_poll(ctx, false)' failed.Reported-by Julia Suvorova <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>--- util/fdmon-io_uring.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block
Stefan