[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 6/6] block: Unify order in drain functions
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 6/6] block: Unify order in drain functions |
Date: |
Wed, 6 Dec 2017 11:53:09 +0100 |
Drain requests are propagated to child nodes, parent nodes and directly
to the AioContext. The order in which this happened was different
between all combinations of drain/drain_all and begin/end.
The correct order is to keep children only drained when their parents
are also drained. This means that at the start of a drained section, the
AioContext needs to be drained first, the parents second and only then
the children. The correct order for the end of a drained section is the
opposite.
This patch changes the three other functions to follow the example of
bdrv_drained_begin(), which is the only one that got it right.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/io.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/block/io.c b/block/io.c
index 5fdb92a15e..1e92d2e5b2 100644
--- a/block/io.c
+++ b/block/io.c
@@ -277,6 +277,7 @@ void bdrv_drained_begin(BlockDriverState *bs)
return;
}
+ /* Stop things in parent-to-child order */
if (atomic_fetch_inc(&bs->quiesce_counter) == 0) {
aio_disable_external(bdrv_get_aio_context(bs));
bdrv_parent_drained_begin(bs);
@@ -297,8 +298,9 @@ void bdrv_drained_end(BlockDriverState *bs)
return;
}
- bdrv_parent_drained_end(bs);
+ /* Re-enable things in child-to-parent order */
bdrv_drain_invoke(bs, false);
+ bdrv_parent_drained_end(bs);
aio_enable_external(bdrv_get_aio_context(bs));
}
@@ -351,9 +353,10 @@ void bdrv_drain_all_begin(void)
for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
AioContext *aio_context = bdrv_get_aio_context(bs);
+ /* Stop things in parent-to-child order */
aio_context_acquire(aio_context);
- bdrv_parent_drained_begin(bs);
aio_disable_external(aio_context);
+ bdrv_parent_drained_begin(bs);
bdrv_drain_invoke(bs, true);
aio_context_release(aio_context);
@@ -395,10 +398,11 @@ void bdrv_drain_all_end(void)
for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
AioContext *aio_context = bdrv_get_aio_context(bs);
+ /* Re-enable things in child-to-parent order */
aio_context_acquire(aio_context);
- aio_enable_external(aio_context);
- bdrv_parent_drained_end(bs);
bdrv_drain_invoke(bs, false);
+ bdrv_parent_drained_end(bs);
+ aio_enable_external(aio_context);
aio_context_release(aio_context);
}
--
2.13.6
- [Qemu-devel] [PATCH v2 0/6] block: Fix BlockDriver callbacks in bdrv_drain_all_begin(), Kevin Wolf, 2017/12/06
- [Qemu-devel] [PATCH v2 2/6] block: Call .drain_begin only once in bdrv_drain_all_begin(), Kevin Wolf, 2017/12/06
- [Qemu-devel] [PATCH v2 1/6] block: Make bdrv_drain_invoke() recursive, Kevin Wolf, 2017/12/06
- [Qemu-devel] [PATCH v2 3/6] test-bdrv-drain: Test BlockDriver callbacks for drain, Kevin Wolf, 2017/12/06
- [Qemu-devel] [PATCH v2 4/6] block: bdrv_drain_recurse(): Remove unused begin parameter, Kevin Wolf, 2017/12/06
- [Qemu-devel] [PATCH v2 5/6] block: Don't wait for requests in bdrv_drain*_end(), Kevin Wolf, 2017/12/06
- [Qemu-devel] [PATCH v2 6/6] block: Unify order in drain functions,
Kevin Wolf <=
- Re: [Qemu-devel] [PATCH v2 0/6] block: Fix BlockDriver callbacks in bdrv_drain_all_begin(), Stefan Hajnoczi, 2017/12/08
- Re: [Qemu-devel] [PATCH v2 0/6] block: Fix BlockDriver callbacks in bdrv_drain_all_begin(), Kevin Wolf, 2017/12/08