[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v12 04/21] aio-wait.h: introduce AIO_WAIT_WHILE_UNLOCKED
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v12 04/21] aio-wait.h: introduce AIO_WAIT_WHILE_UNLOCKED |
Date: |
Mon, 26 Sep 2022 05:31:57 -0400 |
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>
---
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.31.1
- [PATCH v12 03/21] job.c: API functions not used outside should be static, (continued)
- [PATCH v12 03/21] job.c: API functions not used outside should be static, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 02/21] job.h: categorize fields in struct Job, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 18/21] job.c: enable job lock/unlock and remove Aiocontext locks, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 07/21] blockjob: introduce block_job _locked() APIs, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 16/21] blockjob: protect iostatus field in BlockJob struct, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 09/21] jobs: use job locks also in the unit tests, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 05/21] job.c: add job_lock/unlock while keeping job.h intact, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 12/21] job: detect change of aiocontext within job coroutine, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 19/21] block_job_query: remove atomic read, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 04/21] aio-wait.h: introduce AIO_WAIT_WHILE_UNLOCKED,
Emanuele Giuseppe Esposito <=
- [PATCH v12 15/21] blockjob: rename notifier callbacks as _locked, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 17/21] job.h: categorize JobDriver callbacks that need the AioContext lock, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 14/21] blockjob.h: categorize fields in struct BlockJob, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 06/21] job: move and update comments from blockjob.c, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 11/21] jobs: group together API calls under the same job lock, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 20/21] blockjob: remove unused functions, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 10/21] block/mirror.c: use of job helpers in drivers, Emanuele Giuseppe Esposito, 2022/09/26
- [PATCH v12 21/21] job: remove unused functions, Emanuele Giuseppe Esposito, 2022/09/26