[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 13/13] aio-posix: Assert that aio_poll() is alway
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 13/13] aio-posix: Assert that aio_poll() is always called in home thread |
Date: |
Wed, 20 Feb 2019 18:48:43 +0100 |
aio_poll() has an existing assertion that the function is only called
from the AioContext's home thread if blocking is allowed.
This is not enough, some handlers make assumptions about the thread they
run in. Extend the assertion to non-blocking calls, too.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
util/aio-posix.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/util/aio-posix.c b/util/aio-posix.c
index 8640dfde9f..6fbfa7924f 100644
--- a/util/aio-posix.c
+++ b/util/aio-posix.c
@@ -613,6 +613,8 @@ bool aio_poll(AioContext *ctx, bool blocking)
int64_t timeout;
int64_t start = 0;
+ assert(in_aio_context_home_thread(ctx));
+
/* aio_notify can avoid the expensive event_notifier_set if
* everything (file descriptors, bottom halves, timers) will
* be re-evaluated before the next blocking poll(). This is
@@ -621,7 +623,6 @@ bool aio_poll(AioContext *ctx, bool blocking)
* so disable the optimization now.
*/
if (blocking) {
- assert(in_aio_context_home_thread(ctx));
atomic_add(&ctx->notify_me, 2);
}
--
2.20.1
- Re: [Qemu-devel] [PATCH v2 05/13] io: Remove redundant read/write_coroutine assignments, (continued)
[Qemu-devel] [PATCH v2 04/13] io: Make qio_channel_yield() interruptible, Kevin Wolf, 2019/02/20
[Qemu-devel] [PATCH v2 06/13] nbd: Move nbd_read_eof() to nbd/client.c, Kevin Wolf, 2019/02/20
[Qemu-devel] [PATCH v2 09/13] block: Don't poll in bdrv_set_aio_context(), Kevin Wolf, 2019/02/20
[Qemu-devel] [PATCH v2 07/13] nbd: Use low-level QIOChannel API in nbd_read_eof(), Kevin Wolf, 2019/02/20
[Qemu-devel] [PATCH v2 08/13] nbd: Increase bs->in_flight during AioContext switch, Kevin Wolf, 2019/02/20
[Qemu-devel] [PATCH v2 10/13] block: Fix AioContext switch for drained node, Kevin Wolf, 2019/02/20
[Qemu-devel] [PATCH v2 11/13] test-bdrv-drain: AioContext switch in drained section, Kevin Wolf, 2019/02/20
[Qemu-devel] [PATCH v2 12/13] block: Use normal drain for bdrv_set_aio_context(), Kevin Wolf, 2019/02/20
[Qemu-devel] [PATCH v2 13/13] aio-posix: Assert that aio_poll() is always called in home thread,
Kevin Wolf <=
Re: [Qemu-devel] [PATCH v2 00/13] block: bdrv_set_aio_context() related fixes, Kevin Wolf, 2019/02/25