[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 13/14] block: Add bdrv_lock()/unlock()
From: |
Kevin Wolf |
Subject: |
[PATCH v8 13/14] block: Add bdrv_lock()/unlock() |
Date: |
Mon, 5 Oct 2020 17:58:54 +0200 |
Inside of coroutine context, we can't directly use aio_context_acquire()
for the AioContext of a block node because we already own the lock of
the current AioContext and we need to avoid double locking to prevent
deadlocks.
This provides helper functions to lock the AioContext of a node only if
it's not the same as the current AioContext.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/block/block.h | 14 ++++++++++++++
block.c | 27 +++++++++++++++++++++++++++
2 files changed, 41 insertions(+)
diff --git a/include/block/block.h b/include/block/block.h
index b5fa7b2229..65d79270e6 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -643,6 +643,20 @@ AioContext *coroutine_fn bdrv_co_enter(BlockDriverState
*bs);
*/
void coroutine_fn bdrv_co_leave(BlockDriverState *bs, AioContext *old_ctx);
+/**
+ * Locks the AioContext of @bs if it's not the current AioContext. This avoids
+ * double locking which could lead to deadlocks: This is a coroutine_fn, so we
+ * know we already own the lock of the current AioContext.
+ *
+ * May only be called in the main thread.
+ */
+void coroutine_fn bdrv_co_lock(BlockDriverState *bs);
+
+/**
+ * Unlocks the AioContext of @bs if it's not the current AioContext.
+ */
+void coroutine_fn bdrv_co_unlock(BlockDriverState *bs);
+
/**
* Transfer control to @co in the aio context of @bs
*/
diff --git a/block.c b/block.c
index 5eac2683b2..e39d5fa3db 100644
--- a/block.c
+++ b/block.c
@@ -6395,6 +6395,33 @@ void coroutine_fn bdrv_co_leave(BlockDriverState *bs,
AioContext *old_ctx)
bdrv_dec_in_flight(bs);
}
+void coroutine_fn bdrv_co_lock(BlockDriverState *bs)
+{
+ AioContext *ctx = bdrv_get_aio_context(bs);
+
+ /* In the main thread, bs->aio_context won't change concurrently */
+ assert(qemu_get_current_aio_context() == qemu_get_aio_context());
+
+ /*
+ * We're in coroutine context, so we already hold the lock of the main
+ * loop AioContext. Don't lock it twice to avoid deadlocks.
+ */
+ assert(qemu_in_coroutine());
+ if (ctx != qemu_get_aio_context()) {
+ aio_context_acquire(ctx);
+ }
+}
+
+void coroutine_fn bdrv_co_unlock(BlockDriverState *bs)
+{
+ AioContext *ctx = bdrv_get_aio_context(bs);
+
+ assert(qemu_in_coroutine());
+ if (ctx != qemu_get_aio_context()) {
+ aio_context_release(ctx);
+ }
+}
+
void bdrv_coroutine_enter(BlockDriverState *bs, Coroutine *co)
{
aio_co_enter(bdrv_get_aio_context(bs), co);
--
2.25.4
- [PATCH v8 04/14] hmp: Update current monitor only in handle_hmp_command(), (continued)
- [PATCH v8 04/14] hmp: Update current monitor only in handle_hmp_command(), Kevin Wolf, 2020/10/05
- [PATCH v8 03/14] monitor: Use getter/setter functions for cur_mon, Kevin Wolf, 2020/10/05
- [PATCH v8 05/14] qmp: Assert that no other monitor is active, Kevin Wolf, 2020/10/05
- [PATCH v8 06/14] qmp: Call monitor_set_cur() only in qmp_dispatch(), Kevin Wolf, 2020/10/05
- [PATCH v8 07/14] monitor: Make current monitor a per-coroutine property, Kevin Wolf, 2020/10/05
- [PATCH v8 08/14] qapi: Add a 'coroutine' flag for commands, Kevin Wolf, 2020/10/05
- [PATCH v8 09/14] qmp: Move dispatcher to a coroutine, Kevin Wolf, 2020/10/05
- [PATCH v8 12/14] block: Add bdrv_co_enter()/leave(), Kevin Wolf, 2020/10/05
- [PATCH v8 11/14] util/async: Add aio_co_reschedule_self(), Kevin Wolf, 2020/10/05
- [PATCH v8 10/14] hmp: Add support for coroutine command handlers, Kevin Wolf, 2020/10/05
- [PATCH v8 13/14] block: Add bdrv_lock()/unlock(),
Kevin Wolf <=
- [PATCH v8 14/14] block: Convert 'block_resize' to coroutine, Kevin Wolf, 2020/10/05
- Re: [PATCH v8 00/14] monitor: Optionally run handlers in coroutines, Markus Armbruster, 2020/10/06
- Re: [PATCH v8 00/14] monitor: Optionally run handlers in coroutines, Stefan Hajnoczi, 2020/10/08