[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 12/14] block: Add bdrv_co_enter()/leave()
From: |
Kevin Wolf |
Subject: |
[PATCH v8 12/14] block: Add bdrv_co_enter()/leave() |
Date: |
Mon, 5 Oct 2020 17:58:53 +0200 |
Add a pair of functions to temporarily move the current coroutine to the
AioContext of a given BlockDriverState.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/block/block.h | 17 +++++++++++++++++
block.c | 23 +++++++++++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/include/block/block.h b/include/block/block.h
index 981ab5b314..b5fa7b2229 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -626,6 +626,23 @@ bool bdrv_debug_is_suspended(BlockDriverState *bs, const
char *tag);
*/
AioContext *bdrv_get_aio_context(BlockDriverState *bs);
+/**
+ * Move the current coroutine to the AioContext of @bs and return the old
+ * AioContext of the coroutine. Increase bs->in_flight so that draining @bs
+ * will wait for the operation to proceed until the corresponding
+ * bdrv_co_leave().
+ *
+ * Consequently, you can't call drain inside a bdrv_co_enter/leave() section as
+ * this will deadlock.
+ */
+AioContext *coroutine_fn bdrv_co_enter(BlockDriverState *bs);
+
+/**
+ * Ends a section started by bdrv_co_enter(). Move the current coroutine back
+ * to old_ctx and decrease bs->in_flight again.
+ */
+void coroutine_fn bdrv_co_leave(BlockDriverState *bs, AioContext *old_ctx);
+
/**
* Transfer control to @co in the aio context of @bs
*/
diff --git a/block.c b/block.c
index f4b6dd5d3d..5eac2683b2 100644
--- a/block.c
+++ b/block.c
@@ -6372,6 +6372,29 @@ AioContext *bdrv_get_aio_context(BlockDriverState *bs)
return bs ? bs->aio_context : qemu_get_aio_context();
}
+AioContext *coroutine_fn bdrv_co_enter(BlockDriverState *bs)
+{
+ Coroutine *self = qemu_coroutine_self();
+ AioContext *old_ctx = qemu_coroutine_get_aio_context(self);
+ AioContext *new_ctx;
+
+ /*
+ * Increase bs->in_flight to ensure that this operation is completed before
+ * moving the node to a different AioContext. Read new_ctx only afterwards.
+ */
+ bdrv_inc_in_flight(bs);
+
+ new_ctx = bdrv_get_aio_context(bs);
+ aio_co_reschedule_self(new_ctx);
+ return old_ctx;
+}
+
+void coroutine_fn bdrv_co_leave(BlockDriverState *bs, AioContext *old_ctx)
+{
+ aio_co_reschedule_self(old_ctx);
+ bdrv_dec_in_flight(bs);
+}
+
void bdrv_coroutine_enter(BlockDriverState *bs, Coroutine *co)
{
aio_co_enter(bdrv_get_aio_context(bs), co);
--
2.25.4
- [PATCH v8 01/14] monitor: Add Monitor parameter to monitor_set_cpu(), (continued)
- [PATCH v8 01/14] monitor: Add Monitor parameter to monitor_set_cpu(), Kevin Wolf, 2020/10/05
- [PATCH v8 02/14] monitor: Add Monitor parameter to monitor_get_cpu_index(), Kevin Wolf, 2020/10/05
- [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 <=
- [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, 2020/10/05
- [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