[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 32/50] aio-wait.h: introduce AIO_WAIT_WHILE_UNLOCKED
From: |
Kevin Wolf |
Subject: |
[PULL 32/50] aio-wait.h: introduce AIO_WAIT_WHILE_UNLOCKED |
Date: |
Fri, 7 Oct 2022 12:47:34 +0200 |
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Same as AIO_WAIT_WHILE macro, but if we are in the Main loop
do not release and then acquire ctx_ 's aiocontext.
Once all Aiocontext locks go away, this macro will replace
AIO_WAIT_WHILE.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-Id: <20220926093214.506243-5-eesposit@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/block/aio-wait.h | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/include/block/aio-wait.h b/include/block/aio-wait.h
index 54840f8622..dd9a7f6461 100644
--- a/include/block/aio-wait.h
+++ b/include/block/aio-wait.h
@@ -59,10 +59,13 @@ typedef struct {
extern AioWait global_aio_wait;
/**
- * AIO_WAIT_WHILE:
+ * AIO_WAIT_WHILE_INTERNAL:
* @ctx: the aio context, or NULL if multiple aio contexts (for which the
* caller does not hold a lock) are involved in the polling condition.
* @cond: wait while this conditional expression is true
+ * @unlock: whether to unlock and then lock again @ctx. This apples
+ * only when waiting for another AioContext from the main loop.
+ * Otherwise it's ignored.
*
* Wait while a condition is true. Use this to implement synchronous
* operations that require event loop activity.
@@ -75,7 +78,7 @@ extern AioWait global_aio_wait;
* wait on conditions between two IOThreads since that could lead to deadlock,
* go via the main loop instead.
*/
-#define AIO_WAIT_WHILE(ctx, cond) ({ \
+#define AIO_WAIT_WHILE_INTERNAL(ctx, cond, unlock) ({ \
bool waited_ = false; \
AioWait *wait_ = &global_aio_wait; \
AioContext *ctx_ = (ctx); \
@@ -92,11 +95,11 @@ extern AioWait global_aio_wait;
assert(qemu_get_current_aio_context() == \
qemu_get_aio_context()); \
while ((cond)) { \
- if (ctx_) { \
+ if (unlock && ctx_) { \
aio_context_release(ctx_); \
} \
aio_poll(qemu_get_aio_context(), true); \
- if (ctx_) { \
+ if (unlock && ctx_) { \
aio_context_acquire(ctx_); \
} \
waited_ = true; \
@@ -105,6 +108,12 @@ extern AioWait global_aio_wait;
qatomic_dec(&wait_->num_waiters); \
waited_; })
+#define AIO_WAIT_WHILE(ctx, cond) \
+ AIO_WAIT_WHILE_INTERNAL(ctx, cond, true)
+
+#define AIO_WAIT_WHILE_UNLOCKED(ctx, cond) \
+ AIO_WAIT_WHILE_INTERNAL(ctx, cond, false)
+
/**
* aio_wait_kick:
* Wake up the main thread if it is waiting on AIO_WAIT_WHILE(). During
--
2.37.3
- [PULL 04/50] block: add missing coroutine_fn annotations, (continued)
- [PULL 04/50] block: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 08/50] blkverify: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 21/50] vmdk: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 06/50] nbd: remove incorrect coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 07/50] coroutine: remove incorrect coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 03/50] block/nvme: separate nvme_get_free_req cases for coroutine/non-coroutine context, Kevin Wolf, 2022/10/07
- [PULL 25/50] 9p: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 28/50] quorum: Remove unnecessary forward declaration, Kevin Wolf, 2022/10/07
- [PULL 23/50] coroutine-lock: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 31/50] job.c: API functions not used outside should be static, Kevin Wolf, 2022/10/07
- [PULL 32/50] aio-wait.h: introduce AIO_WAIT_WHILE_UNLOCKED,
Kevin Wolf <=
- [PULL 17/50] curl: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 11/50] nbd: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 15/50] qcow2: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 37/50] jobs: use job locks also in the unit tests, Kevin Wolf, 2022/10/07
- [PULL 33/50] job.c: add job_lock/unlock while keeping job.h intact, Kevin Wolf, 2022/10/07
- [PULL 48/50] blockjob: remove unused functions, Kevin Wolf, 2022/10/07
- [PULL 27/50] test-coroutine: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 13/50] nvme: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 22/50] job: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 19/50] quorum: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07