From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Kevin Wolf <kwolf@redhat.com>,
hibriansong@gmail.com, qemu-block@nongnu.org,
Hanna Czenczek <hreitz@redhat.com>,
eblake@redhat.com
Subject: [PATCH v5 03/12] tests/unit: skip test-nested-aio-poll with io_uring
Date: Wed, 29 Oct 2025 16:34:02 -0400 [thread overview]
Message-ID: <20251029203411.445852-4-stefanha@redhat.com> (raw)
In-Reply-To: <20251029203411.445852-1-stefanha@redhat.com>
test-nested-aio-poll relies on internal details of how fdmon-poll.c
handles AioContext polling. Skip it when other fdmon implementations are
in use.
The reason why fdmon-io_uring.c behaves differently from fdmon-poll.c is
that its fdmon_ops->need_wait() function returns true when
io_uring_enter(2) must be called (e.g. to submit pending SQEs).
AioContext polling is skipped when ->need_wait() returns true, so the
test case will never enter AioContext polling mode with
fdmon-io_uring.c.
Restrict this test to fdmon-poll.c and drop the
aio_context_use_g_source() call since it's no longer necessary.
Note that this test is only built on POSIX systems so it is safe to
include "util/aio-posix.h".
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
v5:
- Explain how fdmon-io_uring.c differs from other fdmon implementations
in commit message [Kevin]
- Move test-nested-aio-poll aio_get_g_source() removal into commit that touches test case [Kevin]
---
tests/unit/test-nested-aio-poll.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/tests/unit/test-nested-aio-poll.c b/tests/unit/test-nested-aio-poll.c
index d8fd92c43b..d13ecccd8c 100644
--- a/tests/unit/test-nested-aio-poll.c
+++ b/tests/unit/test-nested-aio-poll.c
@@ -15,6 +15,7 @@
#include "qemu/osdep.h"
#include "block/aio.h"
#include "qapi/error.h"
+#include "util/aio-posix.h"
typedef struct {
AioContext *ctx;
@@ -71,17 +72,17 @@ static void test(void)
.ctx = aio_context_new(&error_abort),
};
+ if (td.ctx->fdmon_ops != &fdmon_poll_ops) {
+ /* This test is tied to fdmon-poll.c */
+ g_test_skip("fdmon_poll_ops not in use");
+ return;
+ }
+
qemu_set_current_aio_context(td.ctx);
/* Enable polling */
aio_context_set_poll_params(td.ctx, 1000000, 2, 2, &error_abort);
- /*
- * The GSource is unused but this has the side-effect of changing the fdmon
- * that AioContext uses.
- */
- aio_get_g_source(td.ctx);
-
/* Make the event notifier active (set) right away */
event_notifier_init(&td.poll_notifier, 1);
aio_set_event_notifier(td.ctx, &td.poll_notifier,
--
2.51.0
next prev parent reply other threads:[~2025-10-29 20:36 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-29 20:33 [PATCH v5 00/12] aio: add the aio_add_sqe() io_uring API Stefan Hajnoczi
2025-10-29 20:34 ` [PATCH v5 01/12] aio-posix: fix race between io_uring CQE and AioHandler deletion Stefan Hajnoczi
2025-10-29 20:34 ` [PATCH v5 02/12] aio-posix: keep polling enabled with fdmon-io_uring.c Stefan Hajnoczi
2025-10-29 20:34 ` Stefan Hajnoczi [this message]
2025-10-29 20:34 ` [PATCH v5 04/12] aio-posix: integrate fdmon into glib event loop Stefan Hajnoczi
2025-10-29 20:34 ` [PATCH v5 05/12] aio: remove aio_context_use_g_source() Stefan Hajnoczi
2025-10-29 20:34 ` [PATCH v5 06/12] aio: free AioContext when aio_context_new() fails Stefan Hajnoczi
2025-10-29 20:34 ` [PATCH v5 07/12] aio: add errp argument to aio_context_setup() Stefan Hajnoczi
2025-10-29 20:34 ` [PATCH v5 08/12] aio-posix: gracefully handle io_uring_queue_init() failure Stefan Hajnoczi
2025-10-29 20:34 ` [PATCH v5 09/12] aio-posix: unindent fdmon_io_uring_destroy() Stefan Hajnoczi
2025-10-29 20:34 ` [PATCH v5 10/12] aio-posix: add fdmon_ops->dispatch() Stefan Hajnoczi
2025-10-29 20:34 ` [PATCH v5 11/12] aio-posix: add aio_add_sqe() API for user-defined io_uring requests Stefan Hajnoczi
2025-10-29 20:34 ` [PATCH v5 12/12] block/io_uring: use aio_add_sqe() Stefan Hajnoczi
2025-10-30 14:43 ` [PATCH v5 00/12] aio: add the aio_add_sqe() io_uring API Kevin Wolf
2025-10-30 15:15 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251029203411.445852-4-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=eblake@redhat.com \
--cc=hibriansong@gmail.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).