From: Stefan Hajnoczi Date: Thu, 2 Apr 2020 14:54:34 +0000 (+0100) Subject: aio-posix: fix test-aio /aio/event/wait with fdmon-io_uring X-Git-Tag: v5.0.0-rc2~11^2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ae60ab7eb20715fa63cca1b0bb4493e160da51ce;p=qemu-xen-unstable.git aio-posix: fix test-aio /aio/event/wait with fdmon-io_uring When a file descriptor becomes ready we must re-arm POLL_ADD. This is done by adding an sqe to the io_uring sq ring. The ->need_wait() function wasn't taking pending sqes into account and therefore io_uring_submit_and_wait() was not being called. Polling for cqes failed to detect fd readiness since we hadn't submitted the sqe to io_uring. This patch fixes the following tests/test-aio -p /aio/event/wait failure: ok 11 /aio/event/wait ** ERROR:tests/test-aio.c:374:test_flush_event_notifier: assertion failed: (aio_poll(ctx, false)) Reported-by: Cole Robinson Reviewed-by: Stefano Garzarella Tested-by: Cole Robinson Signed-off-by: Stefan Hajnoczi Message-id: 20200402145434.99349-1-stefanha@redhat.com Fixes: 73fd282e7b6dd4e4ea1c3bbb3d302c8db51e4ccf ("aio-posix: add io_uring fd monitoring implementation") Signed-off-by: Stefan Hajnoczi --- diff --git a/util/fdmon-io_uring.c b/util/fdmon-io_uring.c index 7e143ef515..b4d6109f20 100644 --- a/util/fdmon-io_uring.c +++ b/util/fdmon-io_uring.c @@ -295,7 +295,12 @@ static bool fdmon_io_uring_need_wait(AioContext *ctx) return true; } - /* Do we need to submit new io_uring sqes? */ + /* Are there pending sqes to submit? */ + if (io_uring_sq_ready(&ctx->fdmon_io_uring)) { + return true; + } + + /* Do we need to process AioHandlers for io_uring changes? */ if (!QSLIST_EMPTY_RCU(&ctx->submit_list)) { return true; }