76 lines
3.0 KiB
Diff
76 lines
3.0 KiB
Diff
|
From b1f5aa5a342a25dc558ee9d435fed0643fe5155f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hanna Reitz <hreitz@redhat.com>
|
||
|
|
Date: Wed, 9 Nov 2022 17:54:50 +0100
|
||
|
|
Subject: [PATCH 03/11] block/mirror: Fix NULL s->job in active writes
|
||
|
|
|
||
|
|
RH-Author: Hanna Czenczek <hreitz@redhat.com>
|
||
|
|
RH-MergeRequest: 246: block/mirror: Make active mirror progress even under full load
|
||
|
|
RH-Bugzilla: 2125119
|
||
|
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
||
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
RH-Commit: [3/3] 49d7ebd15667151a6e14228a8260cfdd0aa27a78
|
||
|
|
|
||
|
|
There is a small gap in mirror_start_job() before putting the mirror
|
||
|
|
filter node into the block graph (bdrv_append() call) and the actual job
|
||
|
|
being created. Before the job is created, MirrorBDSOpaque.job is NULL.
|
||
|
|
|
||
|
|
It is possible that requests come in when bdrv_drained_end() is called,
|
||
|
|
and those requests would see MirrorBDSOpaque.job == NULL. Have our
|
||
|
|
filter node handle that case gracefully.
|
||
|
|
|
||
|
|
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
|
||
|
|
Message-Id: <20221109165452.67927-4-hreitz@redhat.com>
|
||
|
|
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
(cherry picked from commit da93d5c84e56e6b4e84aa8e98b6b984c9b6bb528)
|
||
|
|
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
|
||
|
|
---
|
||
|
|
block/mirror.c | 20 ++++++++++++--------
|
||
|
|
1 file changed, 12 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/block/mirror.c b/block/mirror.c
|
||
|
|
index 6b02555ad7..50289fca49 100644
|
||
|
|
--- a/block/mirror.c
|
||
|
|
+++ b/block/mirror.c
|
||
|
|
@@ -1438,11 +1438,13 @@ static int coroutine_fn bdrv_mirror_top_do_write(BlockDriverState *bs,
|
||
|
|
MirrorOp *op = NULL;
|
||
|
|
MirrorBDSOpaque *s = bs->opaque;
|
||
|
|
int ret = 0;
|
||
|
|
- bool copy_to_target;
|
||
|
|
+ bool copy_to_target = false;
|
||
|
|
|
||
|
|
- copy_to_target = s->job->ret >= 0 &&
|
||
|
|
- !job_is_cancelled(&s->job->common.job) &&
|
||
|
|
- s->job->copy_mode == MIRROR_COPY_MODE_WRITE_BLOCKING;
|
||
|
|
+ if (s->job) {
|
||
|
|
+ copy_to_target = s->job->ret >= 0 &&
|
||
|
|
+ !job_is_cancelled(&s->job->common.job) &&
|
||
|
|
+ s->job->copy_mode == MIRROR_COPY_MODE_WRITE_BLOCKING;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
if (copy_to_target) {
|
||
|
|
op = active_write_prepare(s->job, offset, bytes);
|
||
|
|
@@ -1487,11 +1489,13 @@ static int coroutine_fn bdrv_mirror_top_pwritev(BlockDriverState *bs,
|
||
|
|
QEMUIOVector bounce_qiov;
|
||
|
|
void *bounce_buf;
|
||
|
|
int ret = 0;
|
||
|
|
- bool copy_to_target;
|
||
|
|
+ bool copy_to_target = false;
|
||
|
|
|
||
|
|
- copy_to_target = s->job->ret >= 0 &&
|
||
|
|
- !job_is_cancelled(&s->job->common.job) &&
|
||
|
|
- s->job->copy_mode == MIRROR_COPY_MODE_WRITE_BLOCKING;
|
||
|
|
+ if (s->job) {
|
||
|
|
+ copy_to_target = s->job->ret >= 0 &&
|
||
|
|
+ !job_is_cancelled(&s->job->common.job) &&
|
||
|
|
+ s->job->copy_mode == MIRROR_COPY_MODE_WRITE_BLOCKING;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
if (copy_to_target) {
|
||
|
|
/* The guest might concurrently modify the data to write; but
|
||
|
|
--
|
||
|
|
2.37.3
|
||
|
|
|