|
 |
1bdc94 |
From 13f0c32e5c77278207f63ade463035d8aaa4898d Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Date: Fri, 14 Sep 2018 10:55:15 +0200
|
|
|
1bdc94 |
Subject: [PATCH 24/49] block: Move bdrv_drain_all_begin() out of coroutine
|
|
|
1bdc94 |
context
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180914105540.18077-18-kwolf@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 82169
|
|
|
1bdc94 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 17/42] block: Move bdrv_drain_all_begin() out of coroutine context
|
|
|
1bdc94 |
Bugzilla: 1601212
|
|
|
1bdc94 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Before we can introduce a single polling loop for all nodes in
|
|
|
1bdc94 |
bdrv_drain_all_begin(), we must make sure to run it outside of coroutine
|
|
|
1bdc94 |
context like we already do for bdrv_do_drained_begin().
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit c8ca33d06def97d909a8511377b82994ae4e5981)
|
|
|
1bdc94 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
block/io.c | 22 +++++++++++++++++-----
|
|
|
1bdc94 |
1 file changed, 17 insertions(+), 5 deletions(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/block/io.c b/block/io.c
|
|
|
1bdc94 |
index 23fe069..b58c91b 100644
|
|
|
1bdc94 |
--- a/block/io.c
|
|
|
1bdc94 |
+++ b/block/io.c
|
|
|
1bdc94 |
@@ -263,11 +263,16 @@ static void bdrv_co_drain_bh_cb(void *opaque)
|
|
|
1bdc94 |
Coroutine *co = data->co;
|
|
|
1bdc94 |
BlockDriverState *bs = data->bs;
|
|
|
1bdc94 |
|
|
|
1bdc94 |
- bdrv_dec_in_flight(bs);
|
|
|
1bdc94 |
- if (data->begin) {
|
|
|
1bdc94 |
- bdrv_do_drained_begin(bs, data->recursive, data->parent, data->poll);
|
|
|
1bdc94 |
+ if (bs) {
|
|
|
1bdc94 |
+ bdrv_dec_in_flight(bs);
|
|
|
1bdc94 |
+ if (data->begin) {
|
|
|
1bdc94 |
+ bdrv_do_drained_begin(bs, data->recursive, data->parent, data->poll);
|
|
|
1bdc94 |
+ } else {
|
|
|
1bdc94 |
+ bdrv_do_drained_end(bs, data->recursive, data->parent);
|
|
|
1bdc94 |
+ }
|
|
|
1bdc94 |
} else {
|
|
|
1bdc94 |
- bdrv_do_drained_end(bs, data->recursive, data->parent);
|
|
|
1bdc94 |
+ assert(data->begin);
|
|
|
1bdc94 |
+ bdrv_drain_all_begin();
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
data->done = true;
|
|
|
1bdc94 |
@@ -293,7 +298,9 @@ static void coroutine_fn bdrv_co_yield_to_drain(BlockDriverState *bs,
|
|
|
1bdc94 |
.parent = parent,
|
|
|
1bdc94 |
.poll = poll,
|
|
|
1bdc94 |
};
|
|
|
1bdc94 |
- bdrv_inc_in_flight(bs);
|
|
|
1bdc94 |
+ if (bs) {
|
|
|
1bdc94 |
+ bdrv_inc_in_flight(bs);
|
|
|
1bdc94 |
+ }
|
|
|
1bdc94 |
aio_bh_schedule_oneshot(bdrv_get_aio_context(bs),
|
|
|
1bdc94 |
bdrv_co_drain_bh_cb, &data);
|
|
|
1bdc94 |
|
|
|
1bdc94 |
@@ -463,6 +470,11 @@ void bdrv_drain_all_begin(void)
|
|
|
1bdc94 |
BlockDriverState *bs;
|
|
|
1bdc94 |
BdrvNextIterator it;
|
|
|
1bdc94 |
|
|
|
1bdc94 |
+ if (qemu_in_coroutine()) {
|
|
|
1bdc94 |
+ bdrv_co_yield_to_drain(NULL, true, false, NULL, true);
|
|
|
1bdc94 |
+ return;
|
|
|
1bdc94 |
+ }
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
/* BDRV_POLL_WHILE() for a node can only be called from its own I/O thread
|
|
|
1bdc94 |
* or the main loop AioContext. We potentially use BDRV_POLL_WHILE() on
|
|
|
1bdc94 |
* nodes in several different AioContexts, so make sure we're in the main
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|