Commit ae60ab7e authored Apr 02, 2020 by Stefan Hajnoczi

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 <crobinso@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Tested-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200402145434.99349-1-stefanha@redhat.com
Fixes: 73fd282e
       ("aio-posix: add io_uring fd monitoring implementation")
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

parent 5142ca07

util/fdmon-io_uring.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}