85 lines
3.1 KiB
Diff
85 lines
3.1 KiB
Diff
From f17b37b58a57d849d2ff5fa04f149d9415803a39 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Wed, 8 Apr 2020 17:29:17 +0100
|
|
Subject: [PATCH 6/6] block: Fix blk->in_flight during blk_wait_while_drained()
|
|
|
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
Message-id: <20200408172917.18712-7-kwolf@redhat.com>
|
|
Patchwork-id: 94599
|
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 6/6] block: Fix blk->in_flight during blk_wait_while_drained()
|
|
Bugzilla: 1817621
|
|
RH-Acked-by: Eric Blake <eblake@redhat.com>
|
|
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
|
Waiting in blk_wait_while_drained() while blk->in_flight is increased
|
|
for the current request is wrong because it will cause the drain
|
|
operation to deadlock.
|
|
|
|
This patch makes sure that blk_wait_while_drained() is called with
|
|
blk->in_flight increased exactly once for the current request, and that
|
|
it temporarily decreases the counter while it waits.
|
|
|
|
Fixes: cf3129323f900ef5ddbccbe86e4fa801e88c566e
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
Message-Id: <20200407121259.21350-4-kwolf@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit 7f16476fab14fc32388e0ebae793f64673848efa)
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
block/block-backend.c | 17 +++++------------
|
|
1 file changed, 5 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/block/block-backend.c b/block/block-backend.c
|
|
index 610dbfa..38ae413 100644
|
|
--- a/block/block-backend.c
|
|
+++ b/block/block-backend.c
|
|
@@ -1140,10 +1140,15 @@ static int blk_check_byte_request(BlockBackend *blk, int64_t offset,
|
|
return 0;
|
|
}
|
|
|
|
+/* To be called between exactly one pair of blk_inc/dec_in_flight() */
|
|
static void coroutine_fn blk_wait_while_drained(BlockBackend *blk)
|
|
{
|
|
+ assert(blk->in_flight > 0);
|
|
+
|
|
if (blk->quiesce_counter && !blk->disable_request_queuing) {
|
|
+ blk_dec_in_flight(blk);
|
|
qemu_co_queue_wait(&blk->queued_requests, NULL);
|
|
+ blk_inc_in_flight(blk);
|
|
}
|
|
}
|
|
|
|
@@ -1418,12 +1423,6 @@ static void blk_aio_read_entry(void *opaque)
|
|
BlkRwCo *rwco = &acb->rwco;
|
|
QEMUIOVector *qiov = rwco->iobuf;
|
|
|
|
- if (rwco->blk->quiesce_counter) {
|
|
- blk_dec_in_flight(rwco->blk);
|
|
- blk_wait_while_drained(rwco->blk);
|
|
- blk_inc_in_flight(rwco->blk);
|
|
- }
|
|
-
|
|
assert(qiov->size == acb->bytes);
|
|
rwco->ret = blk_do_preadv(rwco->blk, rwco->offset, acb->bytes,
|
|
qiov, rwco->flags);
|
|
@@ -1436,12 +1435,6 @@ static void blk_aio_write_entry(void *opaque)
|
|
BlkRwCo *rwco = &acb->rwco;
|
|
QEMUIOVector *qiov = rwco->iobuf;
|
|
|
|
- if (rwco->blk->quiesce_counter) {
|
|
- blk_dec_in_flight(rwco->blk);
|
|
- blk_wait_while_drained(rwco->blk);
|
|
- blk_inc_in_flight(rwco->blk);
|
|
- }
|
|
-
|
|
assert(!qiov || qiov->size == acb->bytes);
|
|
rwco->ret = blk_do_pwritev_part(rwco->blk, rwco->offset, acb->bytes,
|
|
qiov, 0, rwco->flags);
|
|
--
|
|
1.8.3.1
|
|
|