From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, vsementsov@virtuozzo.com
Subject: [PATCH] tests: cover aio_co_enter from a worker thread without BQL taken
Date: Mon, 14 Jun 2021 13:02:14 +0200 [thread overview]
Message-ID: <20210614110214.726722-1-pbonzini@redhat.com> (raw)
Add a testcase for the test fixed by commit 'async: the main AioContext
is only "current" if under the BQL.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/unit/test-aio.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/tests/unit/test-aio.c b/tests/unit/test-aio.c
index 8a46078463..6feeb9a4a9 100644
--- a/tests/unit/test-aio.c
+++ b/tests/unit/test-aio.c
@@ -877,6 +877,42 @@ static void test_queue_chaining(void)
g_assert_cmpint(data_b.i, ==, data_b.max);
}
+static void co_check_current_thread(void *opaque)
+{
+ QemuThread *main_thread = opaque;
+ assert(qemu_thread_is_self(main_thread));
+}
+
+static void *test_aio_co_enter(void *co)
+{
+ /*
+ * qemu_get_current_aio_context() should not to be the main thread
+ * AioContext, because this is a worker thread that has not taken
+ * the BQL. So aio_co_enter will schedule the coroutine in the
+ * main thread AioContext.
+ */
+ aio_co_enter(qemu_get_aio_context(), co);
+ return NULL;
+}
+
+static void test_worker_thread_co_enter(void)
+{
+ QemuThread this_thread, worker_thread;
+ Coroutine *co;
+
+ qemu_thread_get_self(&this_thread);
+ co = qemu_coroutine_create(co_check_current_thread, &this_thread);
+
+ qemu_thread_create(&worker_thread, "test_acquire_thread",
+ test_aio_co_enter,
+ co, QEMU_THREAD_JOINABLE);
+
+ /* Test aio_co_enter from a worker thread. */
+ qemu_thread_join(&worker_thread);
+ g_assert(aio_poll(ctx, true));
+ g_assert(!aio_poll(ctx, false));
+}
+
/* End of tests. */
int main(int argc, char **argv)
@@ -903,6 +939,7 @@ int main(int argc, char **argv)
g_test_add_func("/aio/timer/schedule", test_timer_schedule);
g_test_add_func("/aio/coroutine/queue-chaining", test_queue_chaining);
+ g_test_add_func("/aio/coroutine/worker-thread-co-enter", test_worker_thread_co_enter);
g_test_add_func("/aio-gsource/flush", test_source_flush);
g_test_add_func("/aio-gsource/bh/schedule", test_source_bh_schedule);
--
2.31.1
next reply other threads:[~2021-06-14 11:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-14 11:02 Paolo Bonzini [this message]
2021-06-14 14:52 ` [PATCH] tests: cover aio_co_enter from a worker thread without BQL taken Eric Blake
2021-06-15 9:00 ` Vladimir Sementsov-Ogievskiy
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=20210614110214.726722-1-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/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).