[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 01/15] qed: Don't yield in bdrv_qed_co_drain_begin()
From: |
Kevin Wolf |
Subject: |
[PATCH v2 01/15] qed: Don't yield in bdrv_qed_co_drain_begin() |
Date: |
Fri, 18 Nov 2022 18:40:56 +0100 |
We want to change .bdrv_co_drained_begin() back to be a non-coroutine
callback, so in preparation, avoid yielding in its implementation.
Because we increase bs->in_flight and bdrv_drained_begin() polls, the
behaviour is unchanged.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
block/qed.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 2f36ad342c..013f826c44 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -282,9 +282,8 @@ static void coroutine_fn
qed_unplug_allocating_write_reqs(BDRVQEDState *s)
qemu_co_mutex_unlock(&s->table_lock);
}
-static void coroutine_fn qed_need_check_timer_entry(void *opaque)
+static void coroutine_fn qed_need_check_timer(BDRVQEDState *s)
{
- BDRVQEDState *s = opaque;
int ret;
trace_qed_need_check_timer_cb(s);
@@ -310,9 +309,20 @@ static void coroutine_fn qed_need_check_timer_entry(void
*opaque)
(void) ret;
}
+static void coroutine_fn qed_need_check_timer_entry(void *opaque)
+{
+ BDRVQEDState *s = opaque;
+
+ qed_need_check_timer(opaque);
+ bdrv_dec_in_flight(s->bs);
+}
+
static void qed_need_check_timer_cb(void *opaque)
{
+ BDRVQEDState *s = opaque;
Coroutine *co = qemu_coroutine_create(qed_need_check_timer_entry, opaque);
+
+ bdrv_inc_in_flight(s->bs);
qemu_coroutine_enter(co);
}
@@ -363,8 +373,12 @@ static void coroutine_fn
bdrv_qed_co_drain_begin(BlockDriverState *bs)
* header is flushed.
*/
if (s->need_check_timer && timer_pending(s->need_check_timer)) {
+ Coroutine *co;
+
qed_cancel_need_check_timer(s);
- qed_need_check_timer_entry(s);
+ co = qemu_coroutine_create(qed_need_check_timer_entry, s);
+ bdrv_inc_in_flight(bs);
+ aio_co_enter(bdrv_get_aio_context(bs), co);
}
}
--
2.38.1
- [PATCH v2 00/15] block: Simplify drain, Kevin Wolf, 2022/11/18
- [PATCH v2 01/15] qed: Don't yield in bdrv_qed_co_drain_begin(),
Kevin Wolf <=
- [PATCH v2 02/15] test-bdrv-drain: Don't yield in .bdrv_co_drained_begin/end(), Kevin Wolf, 2022/11/18
- [PATCH v2 05/15] block: Inline bdrv_drain_invoke(), Kevin Wolf, 2022/11/18
- [PATCH v2 03/15] block: Revert .bdrv_drained_begin/end to non-coroutine_fn, Kevin Wolf, 2022/11/18
- [PATCH v2 04/15] block: Remove drained_end_counter, Kevin Wolf, 2022/11/18
- [PATCH v2 06/15] block: Fix locking for bdrv_reopen_queue_child(), Kevin Wolf, 2022/11/18
- [PATCH v2 07/15] block: Drain invidual nodes during reopen, Kevin Wolf, 2022/11/18
- [PATCH v2 08/15] block: Don't use subtree drains in bdrv_drop_intermediate(), Kevin Wolf, 2022/11/18
- [PATCH v2 11/15] block: Call drain callbacks only once, Kevin Wolf, 2022/11/18