[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 04/18] aio-wait.h: introduce AIO_WAIT_WHILE_UNLOCKED
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v7 04/18] aio-wait.h: introduce AIO_WAIT_WHILE_UNLOCKED |
Date: |
Thu, 16 Jun 2022 09:18:21 -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.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@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..a61f82c617 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:
* @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(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(ctx, cond, true)
+
+#define AIO_WAIT_WHILE_UNLOCKED(ctx, cond) \
+ _AIO_WAIT_WHILE(ctx, cond, false)
+
/**
* aio_wait_kick:
* Wake up the main thread if it is waiting on AIO_WAIT_WHILE(). During
--
2.31.1
- [PATCH v7 09/18] block/mirror.c: use of job helpers in drivers to avoid TOC/TOU, (continued)
- [PATCH v7 09/18] block/mirror.c: use of job helpers in drivers to avoid TOC/TOU, Emanuele Giuseppe Esposito, 2022/06/16
- [PATCH v7 01/18] job.c: make job_mutex and job_lock/unlock() public, Emanuele Giuseppe Esposito, 2022/06/16
- [PATCH v7 03/18] job.c: API functions not used outside should be static, Emanuele Giuseppe Esposito, 2022/06/16
- [PATCH v7 07/18] jobs: add job lock in find_* functions, Emanuele Giuseppe Esposito, 2022/06/16
- [PATCH v7 16/18] jobs: protect job.aio_context with BQL and job_mutex, Emanuele Giuseppe Esposito, 2022/06/16
- [PATCH v7 10/18] jobs: rename static functions called with job_mutex held, Emanuele Giuseppe Esposito, 2022/06/16
- [PATCH v7 18/18] block_job_query: remove atomic read, Emanuele Giuseppe Esposito, 2022/06/16
- [PATCH v7 13/18] job.h: define unlocked functions, Emanuele Giuseppe Esposito, 2022/06/16
- [PATCH v7 04/18] aio-wait.h: introduce AIO_WAIT_WHILE_UNLOCKED,
Emanuele Giuseppe Esposito <=
- [PATCH v7 17/18] job.c: enable job lock/unlock and remove Aiocontext locks, Emanuele Giuseppe Esposito, 2022/06/16
- [PATCH v7 14/18] commit and mirror: create new nodes using bdrv_get_aio_context, and not the job aiocontext, Emanuele Giuseppe Esposito, 2022/06/16
- [PATCH v7 06/18] jobs: protect jobs with job_lock/unlock, Emanuele Giuseppe Esposito, 2022/06/16
- [PATCH v7 08/18] jobs: use job locks also in the unit tests, Emanuele Giuseppe Esposito, 2022/06/16
- [PATCH v7 12/18] block_job: rename block_job functions called with job_mutex held, Emanuele Giuseppe Esposito, 2022/06/16
- [PATCH v7 11/18] job.h: rename job API functions called with job_mutex held, Emanuele Giuseppe Esposito, 2022/06/16
- [PATCH v7 15/18] job: detect change of aiocontext within job coroutine, Emanuele Giuseppe Esposito, 2022/06/16