Skip to contentSkip to conversation

aio-posix: fix test-aio /aio/event/wait with fdmon-io_uring

PATCH Applied Stefan Hajnoczi 3 participants 4 messages Apr 2, 2020 – Apr 3, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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))

Fixes 73fd282e7b6dd4e4ea1c3bbb3d302c8db51e4ccf

("aio-posix: add io_uring fd monitoring implementation")

---
 util/fdmon-io_uring.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
util/fdmon-io_uring.c +6 -1
index 7e143ef515..b4d6109f20 100644
@@ -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;
     }
Signature · 1 line
2.25.1
Tested-by on v1 1/1
#1 lore raw
Quoted 10 lines · Stefan Hajnoczi

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:

Quoted 8 lines

ok 11 /aio/event/wait
**
ERROR:tests/test-aio.c:374:test_flush_event_notifier: assertion failed: (aio_poll(ctx, false))

Fixes 73fd282e7b6dd4e4ea1c3bbb3d302c8db51e4ccf

("aio-posix: add io_uring fd monitoring implementation")

Fixes the crash for me, thanks!

- Cole

Reviewed-by on v1 1/1
#2 lore raw
In reply to Stefan Hajnoczi
Quoted 14 lines · Stefan Hajnoczi

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))

Quoted 7 lines
Fixes 73fd282e7b6dd4e4ea1c3bbb3d302c8db51e4ccf

("aio-posix: add io_uring fd monitoring implementation")

---
 util/fdmon-io_uring.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Thanks,
Stefano

Quoted 22 lines
util/fdmon-io_uring.c +6 -1
index 7e143ef515..b4d6109f20 100644
@@ -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;
     }
Signature · 1 line
2.25.1
author Applied
#3 lore raw
In reply to Stefan Hajnoczi
Quoted 14 lines · Stefan Hajnoczi

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))

Quoted 7 lines
Fixes 73fd282e7b6dd4e4ea1c3bbb3d302c8db51e4ccf

("aio-posix: add io_uring fd monitoring implementation")

---
 util/fdmon-io_uring.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan