* Mon Mar 30 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-17.el8
- kvm-block-pass-BlockDriver-reference-to-the-.bdrv_co_cre.patch [bz#1816007] - kvm-block-trickle-down-the-fallback-image-creation-funct.patch [bz#1816007] - kvm-Revert-mirror-Don-t-let-an-operation-wait-for-itself.patch [bz#1794692] - kvm-mirror-Wait-only-for-in-flight-operations.patch [bz#1794692] - Resolves: bz#1794692 (Mirror block job stops making progress) - Resolves: bz#1816007 (qemu-img convert failed to convert with block device as target)
This commit is contained in:
parent
828ffba1b7
commit
739c885ee5
121
kvm-Revert-mirror-Don-t-let-an-operation-wait-for-itself.patch
Normal file
121
kvm-Revert-mirror-Don-t-let-an-operation-wait-for-itself.patch
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
From 71b5267ed33f9e60bc98acbabcbed62f01a96ff4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Date: Mon, 30 Mar 2020 11:19:23 +0100
|
||||||
|
Subject: [PATCH 3/4] Revert "mirror: Don't let an operation wait for itself"
|
||||||
|
|
||||||
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Message-id: <20200330111924.22938-2-kwolf@redhat.com>
|
||||||
|
Patchwork-id: 94464
|
||||||
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 1/2] Revert "mirror: Don't let an operation wait for itself"
|
||||||
|
Bugzilla: 1794692
|
||||||
|
RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
||||||
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
||||||
|
|
||||||
|
This reverts commit 7e6c4ff792734e196c8ca82564c56b5e7c6288ca.
|
||||||
|
|
||||||
|
The fix was incomplete as it only protected against requests waiting for
|
||||||
|
themselves, but not against requests waiting for each other. We need a
|
||||||
|
different solution.
|
||||||
|
|
||||||
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Message-Id: <20200326153628.4869-2-kwolf@redhat.com>
|
||||||
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
||||||
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
(cherry picked from commit 9178f4fe5f083064f5c91f04d98c815ce5a5af1c)
|
||||||
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||||
|
---
|
||||||
|
block/mirror.c | 21 +++++++++------------
|
||||||
|
1 file changed, 9 insertions(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/block/mirror.c b/block/mirror.c
|
||||||
|
index cacbc70..8959e42 100644
|
||||||
|
--- a/block/mirror.c
|
||||||
|
+++ b/block/mirror.c
|
||||||
|
@@ -283,14 +283,11 @@ static int mirror_cow_align(MirrorBlockJob *s, int64_t *offset,
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void coroutine_fn
|
||||||
|
-mirror_wait_for_any_operation(MirrorBlockJob *s, MirrorOp *self, bool active)
|
||||||
|
+mirror_wait_for_any_operation(MirrorBlockJob *s, bool active)
|
||||||
|
{
|
||||||
|
MirrorOp *op;
|
||||||
|
|
||||||
|
QTAILQ_FOREACH(op, &s->ops_in_flight, next) {
|
||||||
|
- if (self == op) {
|
||||||
|
- continue;
|
||||||
|
- }
|
||||||
|
/* Do not wait on pseudo ops, because it may in turn wait on
|
||||||
|
* some other operation to start, which may in fact be the
|
||||||
|
* caller of this function. Since there is only one pseudo op
|
||||||
|
@@ -305,10 +302,10 @@ mirror_wait_for_any_operation(MirrorBlockJob *s, MirrorOp *self, bool active)
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void coroutine_fn
|
||||||
|
-mirror_wait_for_free_in_flight_slot(MirrorBlockJob *s, MirrorOp *self)
|
||||||
|
+mirror_wait_for_free_in_flight_slot(MirrorBlockJob *s)
|
||||||
|
{
|
||||||
|
/* Only non-active operations use up in-flight slots */
|
||||||
|
- mirror_wait_for_any_operation(s, self, false);
|
||||||
|
+ mirror_wait_for_any_operation(s, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Perform a mirror copy operation.
|
||||||
|
@@ -351,7 +348,7 @@ static void coroutine_fn mirror_co_read(void *opaque)
|
||||||
|
|
||||||
|
while (s->buf_free_count < nb_chunks) {
|
||||||
|
trace_mirror_yield_in_flight(s, op->offset, s->in_flight);
|
||||||
|
- mirror_wait_for_free_in_flight_slot(s, op);
|
||||||
|
+ mirror_wait_for_free_in_flight_slot(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Now make a QEMUIOVector taking enough granularity-sized chunks
|
||||||
|
@@ -558,7 +555,7 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)
|
||||||
|
|
||||||
|
while (s->in_flight >= MAX_IN_FLIGHT) {
|
||||||
|
trace_mirror_yield_in_flight(s, offset, s->in_flight);
|
||||||
|
- mirror_wait_for_free_in_flight_slot(s, pseudo_op);
|
||||||
|
+ mirror_wait_for_free_in_flight_slot(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (s->ret < 0) {
|
||||||
|
@@ -612,7 +609,7 @@ static void mirror_free_init(MirrorBlockJob *s)
|
||||||
|
static void coroutine_fn mirror_wait_for_all_io(MirrorBlockJob *s)
|
||||||
|
{
|
||||||
|
while (s->in_flight > 0) {
|
||||||
|
- mirror_wait_for_free_in_flight_slot(s, NULL);
|
||||||
|
+ mirror_wait_for_free_in_flight_slot(s);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -797,7 +794,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
|
||||||
|
if (s->in_flight >= MAX_IN_FLIGHT) {
|
||||||
|
trace_mirror_yield(s, UINT64_MAX, s->buf_free_count,
|
||||||
|
s->in_flight);
|
||||||
|
- mirror_wait_for_free_in_flight_slot(s, NULL);
|
||||||
|
+ mirror_wait_for_free_in_flight_slot(s);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -950,7 +947,7 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
|
||||||
|
/* Do not start passive operations while there are active
|
||||||
|
* writes in progress */
|
||||||
|
while (s->in_active_write_counter) {
|
||||||
|
- mirror_wait_for_any_operation(s, NULL, true);
|
||||||
|
+ mirror_wait_for_any_operation(s, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (s->ret < 0) {
|
||||||
|
@@ -976,7 +973,7 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
|
||||||
|
if (s->in_flight >= MAX_IN_FLIGHT || s->buf_free_count == 0 ||
|
||||||
|
(cnt == 0 && s->in_flight > 0)) {
|
||||||
|
trace_mirror_yield(s, cnt, s->buf_free_count, s->in_flight);
|
||||||
|
- mirror_wait_for_free_in_flight_slot(s, NULL);
|
||||||
|
+ mirror_wait_for_free_in_flight_slot(s);
|
||||||
|
continue;
|
||||||
|
} else if (cnt != 0) {
|
||||||
|
delay_ns = mirror_iteration(s);
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
328
kvm-block-pass-BlockDriver-reference-to-the-.bdrv_co_cre.patch
Normal file
328
kvm-block-pass-BlockDriver-reference-to-the-.bdrv_co_cre.patch
Normal file
@ -0,0 +1,328 @@
|
|||||||
|
From 25c528b30f8774f33e957d14060805398da524d9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
Date: Thu, 26 Mar 2020 20:23:06 +0000
|
||||||
|
Subject: [PATCH 1/4] block: pass BlockDriver reference to the .bdrv_co_create
|
||||||
|
|
||||||
|
RH-Author: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
Message-id: <20200326202307.9264-2-mlevitsk@redhat.com>
|
||||||
|
Patchwork-id: 94447
|
||||||
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 1/2] block: pass BlockDriver reference to the .bdrv_co_create
|
||||||
|
Bugzilla: 1816007
|
||||||
|
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
||||||
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
||||||
|
|
||||||
|
This will allow the reuse of a single generic .bdrv_co_create
|
||||||
|
implementation for several drivers.
|
||||||
|
No functional changes.
|
||||||
|
|
||||||
|
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
Message-Id: <20200326011218.29230-2-mlevitsk@redhat.com>
|
||||||
|
Reviewed-by: Denis V. Lunev <den@openvz.org>
|
||||||
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
||||||
|
(cherry picked from commit b92902dfeaafbceaf744ab7473f2d070284f6172)
|
||||||
|
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||||
|
---
|
||||||
|
block.c | 3 ++-
|
||||||
|
block/crypto.c | 3 ++-
|
||||||
|
block/file-posix.c | 4 +++-
|
||||||
|
block/file-win32.c | 4 +++-
|
||||||
|
block/gluster.c | 3 ++-
|
||||||
|
block/nfs.c | 4 +++-
|
||||||
|
block/parallels.c | 3 ++-
|
||||||
|
block/qcow.c | 3 ++-
|
||||||
|
block/qcow2.c | 4 +++-
|
||||||
|
block/qed.c | 3 ++-
|
||||||
|
block/raw-format.c | 4 +++-
|
||||||
|
block/rbd.c | 3 ++-
|
||||||
|
block/sheepdog.c | 4 +++-
|
||||||
|
block/ssh.c | 4 +++-
|
||||||
|
block/vdi.c | 4 +++-
|
||||||
|
block/vhdx.c | 3 ++-
|
||||||
|
block/vmdk.c | 4 +++-
|
||||||
|
block/vpc.c | 6 ++++--
|
||||||
|
include/block/block_int.h | 3 ++-
|
||||||
|
19 files changed, 49 insertions(+), 20 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/block.c b/block.c
|
||||||
|
index ec29b1e..f9a1c5b 100644
|
||||||
|
--- a/block.c
|
||||||
|
+++ b/block.c
|
||||||
|
@@ -482,7 +482,8 @@ static void coroutine_fn bdrv_create_co_entry(void *opaque)
|
||||||
|
CreateCo *cco = opaque;
|
||||||
|
assert(cco->drv);
|
||||||
|
|
||||||
|
- ret = cco->drv->bdrv_co_create_opts(cco->filename, cco->opts, &local_err);
|
||||||
|
+ ret = cco->drv->bdrv_co_create_opts(cco->drv,
|
||||||
|
+ cco->filename, cco->opts, &local_err);
|
||||||
|
error_propagate(&cco->err, local_err);
|
||||||
|
cco->ret = ret;
|
||||||
|
}
|
||||||
|
diff --git a/block/crypto.c b/block/crypto.c
|
||||||
|
index 2482383..970d463 100644
|
||||||
|
--- a/block/crypto.c
|
||||||
|
+++ b/block/crypto.c
|
||||||
|
@@ -539,7 +539,8 @@ fail:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn block_crypto_co_create_opts_luks(const char *filename,
|
||||||
|
+static int coroutine_fn block_crypto_co_create_opts_luks(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
QemuOpts *opts,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
diff --git a/block/file-posix.c b/block/file-posix.c
|
||||||
|
index fd29372..a2e0a74 100644
|
||||||
|
--- a/block/file-posix.c
|
||||||
|
+++ b/block/file-posix.c
|
||||||
|
@@ -2346,7 +2346,9 @@ out:
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts *opts,
|
||||||
|
+static int coroutine_fn raw_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
+ QemuOpts *opts,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
BlockdevCreateOptions options;
|
||||||
|
diff --git a/block/file-win32.c b/block/file-win32.c
|
||||||
|
index 77e8ff7..1585983 100644
|
||||||
|
--- a/block/file-win32.c
|
||||||
|
+++ b/block/file-win32.c
|
||||||
|
@@ -588,7 +588,9 @@ static int raw_co_create(BlockdevCreateOptions *options, Error **errp)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts *opts,
|
||||||
|
+static int coroutine_fn raw_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
+ QemuOpts *opts,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
BlockdevCreateOptions options;
|
||||||
|
diff --git a/block/gluster.c b/block/gluster.c
|
||||||
|
index 4fa4a77..0aa1f2c 100644
|
||||||
|
--- a/block/gluster.c
|
||||||
|
+++ b/block/gluster.c
|
||||||
|
@@ -1130,7 +1130,8 @@ out:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn qemu_gluster_co_create_opts(const char *filename,
|
||||||
|
+static int coroutine_fn qemu_gluster_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
QemuOpts *opts,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
diff --git a/block/nfs.c b/block/nfs.c
|
||||||
|
index 9a6311e..cc2413d 100644
|
||||||
|
--- a/block/nfs.c
|
||||||
|
+++ b/block/nfs.c
|
||||||
|
@@ -662,7 +662,9 @@ out:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn nfs_file_co_create_opts(const char *url, QemuOpts *opts,
|
||||||
|
+static int coroutine_fn nfs_file_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *url,
|
||||||
|
+ QemuOpts *opts,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
BlockdevCreateOptions *create_options;
|
||||||
|
diff --git a/block/parallels.c b/block/parallels.c
|
||||||
|
index 7a01997..6d4ed77 100644
|
||||||
|
--- a/block/parallels.c
|
||||||
|
+++ b/block/parallels.c
|
||||||
|
@@ -609,7 +609,8 @@ exit:
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn parallels_co_create_opts(const char *filename,
|
||||||
|
+static int coroutine_fn parallels_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
QemuOpts *opts,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
diff --git a/block/qcow.c b/block/qcow.c
|
||||||
|
index fce8989..8973e4e 100644
|
||||||
|
--- a/block/qcow.c
|
||||||
|
+++ b/block/qcow.c
|
||||||
|
@@ -934,7 +934,8 @@ exit:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn qcow_co_create_opts(const char *filename,
|
||||||
|
+static int coroutine_fn qcow_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
QemuOpts *opts, Error **errp)
|
||||||
|
{
|
||||||
|
BlockdevCreateOptions *create_options = NULL;
|
||||||
|
diff --git a/block/qcow2.c b/block/qcow2.c
|
||||||
|
index 83b1fc0..71067c6 100644
|
||||||
|
--- a/block/qcow2.c
|
||||||
|
+++ b/block/qcow2.c
|
||||||
|
@@ -3558,7 +3558,9 @@ out:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn qcow2_co_create_opts(const char *filename, QemuOpts *opts,
|
||||||
|
+static int coroutine_fn qcow2_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
+ QemuOpts *opts,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
BlockdevCreateOptions *create_options = NULL;
|
||||||
|
diff --git a/block/qed.c b/block/qed.c
|
||||||
|
index d8c4e5f..1af9b3c 100644
|
||||||
|
--- a/block/qed.c
|
||||||
|
+++ b/block/qed.c
|
||||||
|
@@ -720,7 +720,8 @@ out:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn bdrv_qed_co_create_opts(const char *filename,
|
||||||
|
+static int coroutine_fn bdrv_qed_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
QemuOpts *opts,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
diff --git a/block/raw-format.c b/block/raw-format.c
|
||||||
|
index 3a76ec7..93b25e1 100644
|
||||||
|
--- a/block/raw-format.c
|
||||||
|
+++ b/block/raw-format.c
|
||||||
|
@@ -419,7 +419,9 @@ static int raw_has_zero_init_truncate(BlockDriverState *bs)
|
||||||
|
return bdrv_has_zero_init_truncate(bs->file->bs);
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts *opts,
|
||||||
|
+static int coroutine_fn raw_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
+ QemuOpts *opts,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
return bdrv_create_file(filename, opts, errp);
|
||||||
|
diff --git a/block/rbd.c b/block/rbd.c
|
||||||
|
index 027cbcc..8847259 100644
|
||||||
|
--- a/block/rbd.c
|
||||||
|
+++ b/block/rbd.c
|
||||||
|
@@ -425,7 +425,8 @@ static int qemu_rbd_co_create(BlockdevCreateOptions *options, Error **errp)
|
||||||
|
return qemu_rbd_do_create(options, NULL, NULL, errp);
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn qemu_rbd_co_create_opts(const char *filename,
|
||||||
|
+static int coroutine_fn qemu_rbd_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
QemuOpts *opts,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
diff --git a/block/sheepdog.c b/block/sheepdog.c
|
||||||
|
index cfa8433..a8a7e32 100644
|
||||||
|
--- a/block/sheepdog.c
|
||||||
|
+++ b/block/sheepdog.c
|
||||||
|
@@ -2157,7 +2157,9 @@ out:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn sd_co_create_opts(const char *filename, QemuOpts *opts,
|
||||||
|
+static int coroutine_fn sd_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
+ QemuOpts *opts,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
BlockdevCreateOptions *create_options = NULL;
|
||||||
|
diff --git a/block/ssh.c b/block/ssh.c
|
||||||
|
index b4375cf..84e9282 100644
|
||||||
|
--- a/block/ssh.c
|
||||||
|
+++ b/block/ssh.c
|
||||||
|
@@ -963,7 +963,9 @@ fail:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn ssh_co_create_opts(const char *filename, QemuOpts *opts,
|
||||||
|
+static int coroutine_fn ssh_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
+ QemuOpts *opts,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
BlockdevCreateOptions *create_options;
|
||||||
|
diff --git a/block/vdi.c b/block/vdi.c
|
||||||
|
index 0142da7..e1a11f2 100644
|
||||||
|
--- a/block/vdi.c
|
||||||
|
+++ b/block/vdi.c
|
||||||
|
@@ -896,7 +896,9 @@ static int coroutine_fn vdi_co_create(BlockdevCreateOptions *create_options,
|
||||||
|
return vdi_co_do_create(create_options, DEFAULT_CLUSTER_SIZE, errp);
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn vdi_co_create_opts(const char *filename, QemuOpts *opts,
|
||||||
|
+static int coroutine_fn vdi_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
+ QemuOpts *opts,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
QDict *qdict = NULL;
|
||||||
|
diff --git a/block/vhdx.c b/block/vhdx.c
|
||||||
|
index f02d261..33e57cd 100644
|
||||||
|
--- a/block/vhdx.c
|
||||||
|
+++ b/block/vhdx.c
|
||||||
|
@@ -2046,7 +2046,8 @@ delete_and_exit:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn vhdx_co_create_opts(const char *filename,
|
||||||
|
+static int coroutine_fn vhdx_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
QemuOpts *opts,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
diff --git a/block/vmdk.c b/block/vmdk.c
|
||||||
|
index 20e909d..eb726f2 100644
|
||||||
|
--- a/block/vmdk.c
|
||||||
|
+++ b/block/vmdk.c
|
||||||
|
@@ -2588,7 +2588,9 @@ exit:
|
||||||
|
return blk;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn vmdk_co_create_opts(const char *filename, QemuOpts *opts,
|
||||||
|
+static int coroutine_fn vmdk_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
+ QemuOpts *opts,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
Error *local_err = NULL;
|
||||||
|
diff --git a/block/vpc.c b/block/vpc.c
|
||||||
|
index a655502..6df75e2 100644
|
||||||
|
--- a/block/vpc.c
|
||||||
|
+++ b/block/vpc.c
|
||||||
|
@@ -1089,8 +1089,10 @@ out:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int coroutine_fn vpc_co_create_opts(const char *filename,
|
||||||
|
- QemuOpts *opts, Error **errp)
|
||||||
|
+static int coroutine_fn vpc_co_create_opts(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
+ QemuOpts *opts,
|
||||||
|
+ Error **errp)
|
||||||
|
{
|
||||||
|
BlockdevCreateOptions *create_options = NULL;
|
||||||
|
QDict *qdict;
|
||||||
|
diff --git a/include/block/block_int.h b/include/block/block_int.h
|
||||||
|
index 96e327b..7ff81be 100644
|
||||||
|
--- a/include/block/block_int.h
|
||||||
|
+++ b/include/block/block_int.h
|
||||||
|
@@ -136,7 +136,8 @@ struct BlockDriver {
|
||||||
|
void (*bdrv_close)(BlockDriverState *bs);
|
||||||
|
int coroutine_fn (*bdrv_co_create)(BlockdevCreateOptions *opts,
|
||||||
|
Error **errp);
|
||||||
|
- int coroutine_fn (*bdrv_co_create_opts)(const char *filename,
|
||||||
|
+ int coroutine_fn (*bdrv_co_create_opts)(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
QemuOpts *opts,
|
||||||
|
Error **errp);
|
||||||
|
int (*bdrv_make_empty)(BlockDriverState *bs);
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
296
kvm-block-trickle-down-the-fallback-image-creation-funct.patch
Normal file
296
kvm-block-trickle-down-the-fallback-image-creation-funct.patch
Normal file
@ -0,0 +1,296 @@
|
|||||||
|
From a1f7b929ae1fe6fa424c520c3a5eb497333b0fd9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
Date: Thu, 26 Mar 2020 20:23:07 +0000
|
||||||
|
Subject: [PATCH 2/4] block: trickle down the fallback image creation function
|
||||||
|
use to the block drivers
|
||||||
|
|
||||||
|
RH-Author: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
Message-id: <20200326202307.9264-3-mlevitsk@redhat.com>
|
||||||
|
Patchwork-id: 94446
|
||||||
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 2/2] block: trickle down the fallback image creation function use to the block drivers
|
||||||
|
Bugzilla: 1816007
|
||||||
|
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
||||||
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
||||||
|
|
||||||
|
Instead of checking the .bdrv_co_create_opts to see if we need the
|
||||||
|
fallback, just implement the .bdrv_co_create_opts in the drivers that
|
||||||
|
need it.
|
||||||
|
|
||||||
|
This way we don't break various places that need to know if the
|
||||||
|
underlying protocol/format really supports image creation, and this way
|
||||||
|
we still allow some drivers to not support image creation.
|
||||||
|
|
||||||
|
Fixes: fd17146cd93d1704cd96d7c2757b325fc7aac6fd
|
||||||
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1816007
|
||||||
|
|
||||||
|
Note that technically this driver reverts the image creation fallback
|
||||||
|
for the vxhs driver since I don't have a means to test it, and IMHO it
|
||||||
|
is better to leave it not supported as it was prior to generic image
|
||||||
|
creation patches.
|
||||||
|
|
||||||
|
Also drop iscsi_create_opts which was left accidentally.
|
||||||
|
|
||||||
|
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
Message-Id: <20200326011218.29230-3-mlevitsk@redhat.com>
|
||||||
|
Reviewed-by: Denis V. Lunev <den@openvz.org>
|
||||||
|
[mreitz: Fixed alignment, and moved bdrv_co_create_opts_simple() and
|
||||||
|
bdrv_create_opts_simple from block.h into block_int.h]
|
||||||
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
||||||
|
(cherry picked from commit 5a5e7f8cd86b7ced0732b1b6e28c82baa65b09c9)
|
||||||
|
|
||||||
|
Contextual conflicts in block.c and include/block/block_int.h
|
||||||
|
|
||||||
|
(conflict in block.c by default shows as functional but
|
||||||
|
with --diff-algorithm=patience it becomes a contextual conflict)
|
||||||
|
|
||||||
|
...
|
||||||
|
001/2:[----] [--] 'block: pass BlockDriver reference to the .bdrv_co_create'
|
||||||
|
002/2:[0014] [FC] 'block: trickle down the fallback image creation function use to the block drivers'
|
||||||
|
...
|
||||||
|
002/2: 'meld <(git show 5a5e7f8^\!) <(git show 6d3bca5^\!)'
|
||||||
|
|
||||||
|
So now running:
|
||||||
|
meld <(git show 5a5e7f8^\! --diff-algorithm=patience) <(git show 6d3bca5^\! --diff-algorithm=patience)
|
||||||
|
|
||||||
|
shows no contextual conflicts
|
||||||
|
It is mostly due to missing commit f6dc1c31d3801dcbdf0c56574f9ff4f05180810c
|
||||||
|
Thanks to Max Reitz for helping me with this.
|
||||||
|
|
||||||
|
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||||
|
---
|
||||||
|
block.c | 35 ++++++++++++++++++++---------------
|
||||||
|
block/file-posix.c | 7 ++++++-
|
||||||
|
block/iscsi.c | 16 ++++------------
|
||||||
|
block/nbd.c | 6 ++++++
|
||||||
|
block/nvme.c | 3 +++
|
||||||
|
include/block/block.h | 1 +
|
||||||
|
include/block/block_int.h | 11 +++++++++++
|
||||||
|
7 files changed, 51 insertions(+), 28 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/block.c b/block.c
|
||||||
|
index f9a1c5b..ba3b40d7 100644
|
||||||
|
--- a/block.c
|
||||||
|
+++ b/block.c
|
||||||
|
@@ -597,8 +597,15 @@ static int create_file_fallback_zero_first_sector(BlockBackend *blk,
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int bdrv_create_file_fallback(const char *filename, BlockDriver *drv,
|
||||||
|
- QemuOpts *opts, Error **errp)
|
||||||
|
+/**
|
||||||
|
+ * Simple implementation of bdrv_co_create_opts for protocol drivers
|
||||||
|
+ * which only support creation via opening a file
|
||||||
|
+ * (usually existing raw storage device)
|
||||||
|
+ */
|
||||||
|
+int coroutine_fn bdrv_co_create_opts_simple(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
+ QemuOpts *opts,
|
||||||
|
+ Error **errp)
|
||||||
|
{
|
||||||
|
BlockBackend *blk;
|
||||||
|
QDict *options;
|
||||||
|
@@ -662,11 +669,7 @@ int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp)
|
||||||
|
return -ENOENT;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (drv->bdrv_co_create_opts) {
|
||||||
|
- return bdrv_create(drv, filename, opts, errp);
|
||||||
|
- } else {
|
||||||
|
- return bdrv_create_file_fallback(filename, drv, opts, errp);
|
||||||
|
- }
|
||||||
|
+ return bdrv_create(drv, filename, opts, errp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
@@ -1543,9 +1546,9 @@ QemuOptsList bdrv_runtime_opts = {
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
-static QemuOptsList fallback_create_opts = {
|
||||||
|
- .name = "fallback-create-opts",
|
||||||
|
- .head = QTAILQ_HEAD_INITIALIZER(fallback_create_opts.head),
|
||||||
|
+QemuOptsList bdrv_create_opts_simple = {
|
||||||
|
+ .name = "simple-create-opts",
|
||||||
|
+ .head = QTAILQ_HEAD_INITIALIZER(bdrv_create_opts_simple.head),
|
||||||
|
.desc = {
|
||||||
|
{
|
||||||
|
.name = BLOCK_OPT_SIZE,
|
||||||
|
@@ -5910,13 +5913,15 @@ void bdrv_img_create(const char *filename, const char *fmt,
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
- create_opts = qemu_opts_append(create_opts, drv->create_opts);
|
||||||
|
- if (proto_drv->create_opts) {
|
||||||
|
- create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
|
||||||
|
- } else {
|
||||||
|
- create_opts = qemu_opts_append(create_opts, &fallback_create_opts);
|
||||||
|
+ if (!proto_drv->create_opts) {
|
||||||
|
+ error_setg(errp, "Protocol driver '%s' does not support image creation",
|
||||||
|
+ proto_drv->format_name);
|
||||||
|
+ return;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ create_opts = qemu_opts_append(create_opts, drv->create_opts);
|
||||||
|
+ create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
|
||||||
|
+
|
||||||
|
/* Create parameter list with default values */
|
||||||
|
opts = qemu_opts_create(create_opts, NULL, 0, &error_abort);
|
||||||
|
qemu_opt_set_number(opts, BLOCK_OPT_SIZE, img_size, &error_abort);
|
||||||
|
diff --git a/block/file-posix.c b/block/file-posix.c
|
||||||
|
index a2e0a74..dd18d40 100644
|
||||||
|
--- a/block/file-posix.c
|
||||||
|
+++ b/block/file-posix.c
|
||||||
|
@@ -3432,6 +3432,8 @@ static BlockDriver bdrv_host_device = {
|
||||||
|
.bdrv_reopen_prepare = raw_reopen_prepare,
|
||||||
|
.bdrv_reopen_commit = raw_reopen_commit,
|
||||||
|
.bdrv_reopen_abort = raw_reopen_abort,
|
||||||
|
+ .bdrv_co_create_opts = bdrv_co_create_opts_simple,
|
||||||
|
+ .create_opts = &bdrv_create_opts_simple,
|
||||||
|
.mutable_opts = mutable_opts,
|
||||||
|
.bdrv_co_invalidate_cache = raw_co_invalidate_cache,
|
||||||
|
.bdrv_co_pwrite_zeroes = hdev_co_pwrite_zeroes,
|
||||||
|
@@ -3558,10 +3560,11 @@ static BlockDriver bdrv_host_cdrom = {
|
||||||
|
.bdrv_reopen_prepare = raw_reopen_prepare,
|
||||||
|
.bdrv_reopen_commit = raw_reopen_commit,
|
||||||
|
.bdrv_reopen_abort = raw_reopen_abort,
|
||||||
|
+ .bdrv_co_create_opts = bdrv_co_create_opts_simple,
|
||||||
|
+ .create_opts = &bdrv_create_opts_simple,
|
||||||
|
.mutable_opts = mutable_opts,
|
||||||
|
.bdrv_co_invalidate_cache = raw_co_invalidate_cache,
|
||||||
|
|
||||||
|
-
|
||||||
|
.bdrv_co_preadv = raw_co_preadv,
|
||||||
|
.bdrv_co_pwritev = raw_co_pwritev,
|
||||||
|
.bdrv_co_flush_to_disk = raw_co_flush_to_disk,
|
||||||
|
@@ -3690,6 +3693,8 @@ static BlockDriver bdrv_host_cdrom = {
|
||||||
|
.bdrv_reopen_prepare = raw_reopen_prepare,
|
||||||
|
.bdrv_reopen_commit = raw_reopen_commit,
|
||||||
|
.bdrv_reopen_abort = raw_reopen_abort,
|
||||||
|
+ .bdrv_co_create_opts = bdrv_co_create_opts_simple,
|
||||||
|
+ .create_opts = &bdrv_create_opts_simple,
|
||||||
|
.mutable_opts = mutable_opts,
|
||||||
|
|
||||||
|
.bdrv_co_preadv = raw_co_preadv,
|
||||||
|
diff --git a/block/iscsi.c b/block/iscsi.c
|
||||||
|
index b45da65..16b0716 100644
|
||||||
|
--- a/block/iscsi.c
|
||||||
|
+++ b/block/iscsi.c
|
||||||
|
@@ -2399,18 +2399,6 @@ out_unlock:
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static QemuOptsList iscsi_create_opts = {
|
||||||
|
- .name = "iscsi-create-opts",
|
||||||
|
- .head = QTAILQ_HEAD_INITIALIZER(iscsi_create_opts.head),
|
||||||
|
- .desc = {
|
||||||
|
- {
|
||||||
|
- .name = BLOCK_OPT_SIZE,
|
||||||
|
- .type = QEMU_OPT_SIZE,
|
||||||
|
- .help = "Virtual disk size"
|
||||||
|
- },
|
||||||
|
- { /* end of list */ }
|
||||||
|
- }
|
||||||
|
-};
|
||||||
|
|
||||||
|
static const char *const iscsi_strong_runtime_opts[] = {
|
||||||
|
"transport",
|
||||||
|
@@ -2434,6 +2422,8 @@ static BlockDriver bdrv_iscsi = {
|
||||||
|
.bdrv_parse_filename = iscsi_parse_filename,
|
||||||
|
.bdrv_file_open = iscsi_open,
|
||||||
|
.bdrv_close = iscsi_close,
|
||||||
|
+ .bdrv_co_create_opts = bdrv_co_create_opts_simple,
|
||||||
|
+ .create_opts = &bdrv_create_opts_simple,
|
||||||
|
.bdrv_reopen_prepare = iscsi_reopen_prepare,
|
||||||
|
.bdrv_reopen_commit = iscsi_reopen_commit,
|
||||||
|
.bdrv_co_invalidate_cache = iscsi_co_invalidate_cache,
|
||||||
|
@@ -2471,6 +2461,8 @@ static BlockDriver bdrv_iser = {
|
||||||
|
.bdrv_parse_filename = iscsi_parse_filename,
|
||||||
|
.bdrv_file_open = iscsi_open,
|
||||||
|
.bdrv_close = iscsi_close,
|
||||||
|
+ .bdrv_co_create_opts = bdrv_co_create_opts_simple,
|
||||||
|
+ .create_opts = &bdrv_create_opts_simple,
|
||||||
|
.bdrv_reopen_prepare = iscsi_reopen_prepare,
|
||||||
|
.bdrv_reopen_commit = iscsi_reopen_commit,
|
||||||
|
.bdrv_co_invalidate_cache = iscsi_co_invalidate_cache,
|
||||||
|
diff --git a/block/nbd.c b/block/nbd.c
|
||||||
|
index a73f0d9..927915d 100644
|
||||||
|
--- a/block/nbd.c
|
||||||
|
+++ b/block/nbd.c
|
||||||
|
@@ -2030,6 +2030,8 @@ static BlockDriver bdrv_nbd = {
|
||||||
|
.protocol_name = "nbd",
|
||||||
|
.instance_size = sizeof(BDRVNBDState),
|
||||||
|
.bdrv_parse_filename = nbd_parse_filename,
|
||||||
|
+ .bdrv_co_create_opts = bdrv_co_create_opts_simple,
|
||||||
|
+ .create_opts = &bdrv_create_opts_simple,
|
||||||
|
.bdrv_file_open = nbd_open,
|
||||||
|
.bdrv_reopen_prepare = nbd_client_reopen_prepare,
|
||||||
|
.bdrv_co_preadv = nbd_client_co_preadv,
|
||||||
|
@@ -2055,6 +2057,8 @@ static BlockDriver bdrv_nbd_tcp = {
|
||||||
|
.protocol_name = "nbd+tcp",
|
||||||
|
.instance_size = sizeof(BDRVNBDState),
|
||||||
|
.bdrv_parse_filename = nbd_parse_filename,
|
||||||
|
+ .bdrv_co_create_opts = bdrv_co_create_opts_simple,
|
||||||
|
+ .create_opts = &bdrv_create_opts_simple,
|
||||||
|
.bdrv_file_open = nbd_open,
|
||||||
|
.bdrv_reopen_prepare = nbd_client_reopen_prepare,
|
||||||
|
.bdrv_co_preadv = nbd_client_co_preadv,
|
||||||
|
@@ -2080,6 +2084,8 @@ static BlockDriver bdrv_nbd_unix = {
|
||||||
|
.protocol_name = "nbd+unix",
|
||||||
|
.instance_size = sizeof(BDRVNBDState),
|
||||||
|
.bdrv_parse_filename = nbd_parse_filename,
|
||||||
|
+ .bdrv_co_create_opts = bdrv_co_create_opts_simple,
|
||||||
|
+ .create_opts = &bdrv_create_opts_simple,
|
||||||
|
.bdrv_file_open = nbd_open,
|
||||||
|
.bdrv_reopen_prepare = nbd_client_reopen_prepare,
|
||||||
|
.bdrv_co_preadv = nbd_client_co_preadv,
|
||||||
|
diff --git a/block/nvme.c b/block/nvme.c
|
||||||
|
index d41c4bd..7b7c0cc 100644
|
||||||
|
--- a/block/nvme.c
|
||||||
|
+++ b/block/nvme.c
|
||||||
|
@@ -1333,6 +1333,9 @@ static BlockDriver bdrv_nvme = {
|
||||||
|
.protocol_name = "nvme",
|
||||||
|
.instance_size = sizeof(BDRVNVMeState),
|
||||||
|
|
||||||
|
+ .bdrv_co_create_opts = bdrv_co_create_opts_simple,
|
||||||
|
+ .create_opts = &bdrv_create_opts_simple,
|
||||||
|
+
|
||||||
|
.bdrv_parse_filename = nvme_parse_filename,
|
||||||
|
.bdrv_file_open = nvme_file_open,
|
||||||
|
.bdrv_close = nvme_close,
|
||||||
|
diff --git a/include/block/block.h b/include/block/block.h
|
||||||
|
index 1df9848..92685d2 100644
|
||||||
|
--- a/include/block/block.h
|
||||||
|
+++ b/include/block/block.h
|
||||||
|
@@ -293,6 +293,7 @@ BlockDriver *bdrv_find_format(const char *format_name);
|
||||||
|
int bdrv_create(BlockDriver *drv, const char* filename,
|
||||||
|
QemuOpts *opts, Error **errp);
|
||||||
|
int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp);
|
||||||
|
+
|
||||||
|
BlockDriverState *bdrv_new(void);
|
||||||
|
void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top,
|
||||||
|
Error **errp);
|
||||||
|
diff --git a/include/block/block_int.h b/include/block/block_int.h
|
||||||
|
index 7ff81be..529f153 100644
|
||||||
|
--- a/include/block/block_int.h
|
||||||
|
+++ b/include/block/block_int.h
|
||||||
|
@@ -1325,4 +1325,15 @@ int coroutine_fn bdrv_co_copy_range_to(BdrvChild *src, uint64_t src_offset,
|
||||||
|
|
||||||
|
int refresh_total_sectors(BlockDriverState *bs, int64_t hint);
|
||||||
|
|
||||||
|
+/**
|
||||||
|
+ * Simple implementation of bdrv_co_create_opts for protocol drivers
|
||||||
|
+ * which only support creation via opening a file
|
||||||
|
+ * (usually existing raw storage device)
|
||||||
|
+ */
|
||||||
|
+int coroutine_fn bdrv_co_create_opts_simple(BlockDriver *drv,
|
||||||
|
+ const char *filename,
|
||||||
|
+ QemuOpts *opts,
|
||||||
|
+ Error **errp);
|
||||||
|
+extern QemuOptsList bdrv_create_opts_simple;
|
||||||
|
+
|
||||||
|
#endif /* BLOCK_INT_H */
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
95
kvm-mirror-Wait-only-for-in-flight-operations.patch
Normal file
95
kvm-mirror-Wait-only-for-in-flight-operations.patch
Normal file
@ -0,0 +1,95 @@
|
|||||||
|
From bddf389330e11fb0ce17413c1bfa2264a281ded2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Date: Mon, 30 Mar 2020 11:19:24 +0100
|
||||||
|
Subject: [PATCH 4/4] mirror: Wait only for in-flight operations
|
||||||
|
|
||||||
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Message-id: <20200330111924.22938-3-kwolf@redhat.com>
|
||||||
|
Patchwork-id: 94463
|
||||||
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 2/2] mirror: Wait only for in-flight operations
|
||||||
|
Bugzilla: 1794692
|
||||||
|
RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
||||||
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
||||||
|
|
||||||
|
mirror_wait_for_free_in_flight_slot() just picks a random operation to
|
||||||
|
wait for. However, a MirrorOp is already in s->ops_in_flight when
|
||||||
|
mirror_co_read() waits for free slots, so if not enough slots are
|
||||||
|
immediately available, an operation can end up waiting for itself, or
|
||||||
|
two or more operations can wait for each other to complete, which
|
||||||
|
results in a hang.
|
||||||
|
|
||||||
|
Fix this by adding a flag to MirrorOp that tells us if the request is
|
||||||
|
already in flight (and therefore occupies slots that it will later
|
||||||
|
free), and picking only such operations for waiting.
|
||||||
|
|
||||||
|
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1794692
|
||||||
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Message-Id: <20200326153628.4869-3-kwolf@redhat.com>
|
||||||
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
||||||
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
(cherry picked from commit ce8cabbd17cf738ddfc68384440c38e5dd2fdf97)
|
||||||
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||||
|
---
|
||||||
|
block/mirror.c | 9 ++++++++-
|
||||||
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/block/mirror.c b/block/mirror.c
|
||||||
|
index 8959e42..5e5a521 100644
|
||||||
|
--- a/block/mirror.c
|
||||||
|
+++ b/block/mirror.c
|
||||||
|
@@ -102,6 +102,7 @@ struct MirrorOp {
|
||||||
|
|
||||||
|
bool is_pseudo_op;
|
||||||
|
bool is_active_write;
|
||||||
|
+ bool is_in_flight;
|
||||||
|
CoQueue waiting_requests;
|
||||||
|
Coroutine *co;
|
||||||
|
|
||||||
|
@@ -293,7 +294,9 @@ mirror_wait_for_any_operation(MirrorBlockJob *s, bool active)
|
||||||
|
* caller of this function. Since there is only one pseudo op
|
||||||
|
* at any given time, we will always find some real operation
|
||||||
|
* to wait on. */
|
||||||
|
- if (!op->is_pseudo_op && op->is_active_write == active) {
|
||||||
|
+ if (!op->is_pseudo_op && op->is_in_flight &&
|
||||||
|
+ op->is_active_write == active)
|
||||||
|
+ {
|
||||||
|
qemu_co_queue_wait(&op->waiting_requests, NULL);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
@@ -367,6 +370,7 @@ static void coroutine_fn mirror_co_read(void *opaque)
|
||||||
|
/* Copy the dirty cluster. */
|
||||||
|
s->in_flight++;
|
||||||
|
s->bytes_in_flight += op->bytes;
|
||||||
|
+ op->is_in_flight = true;
|
||||||
|
trace_mirror_one_iteration(s, op->offset, op->bytes);
|
||||||
|
|
||||||
|
ret = bdrv_co_preadv(s->mirror_top_bs->backing, op->offset, op->bytes,
|
||||||
|
@@ -382,6 +386,7 @@ static void coroutine_fn mirror_co_zero(void *opaque)
|
||||||
|
op->s->in_flight++;
|
||||||
|
op->s->bytes_in_flight += op->bytes;
|
||||||
|
*op->bytes_handled = op->bytes;
|
||||||
|
+ op->is_in_flight = true;
|
||||||
|
|
||||||
|
ret = blk_co_pwrite_zeroes(op->s->target, op->offset, op->bytes,
|
||||||
|
op->s->unmap ? BDRV_REQ_MAY_UNMAP : 0);
|
||||||
|
@@ -396,6 +401,7 @@ static void coroutine_fn mirror_co_discard(void *opaque)
|
||||||
|
op->s->in_flight++;
|
||||||
|
op->s->bytes_in_flight += op->bytes;
|
||||||
|
*op->bytes_handled = op->bytes;
|
||||||
|
+ op->is_in_flight = true;
|
||||||
|
|
||||||
|
ret = blk_co_pdiscard(op->s->target, op->offset, op->bytes);
|
||||||
|
mirror_write_complete(op, ret);
|
||||||
|
@@ -1306,6 +1312,7 @@ static MirrorOp *coroutine_fn active_write_prepare(MirrorBlockJob *s,
|
||||||
|
.offset = offset,
|
||||||
|
.bytes = bytes,
|
||||||
|
.is_active_write = true,
|
||||||
|
+ .is_in_flight = true,
|
||||||
|
};
|
||||||
|
qemu_co_queue_init(&op->waiting_requests);
|
||||||
|
QTAILQ_INSERT_TAIL(&s->ops_in_flight, op, next);
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
@ -67,7 +67,7 @@ Obsoletes: %1-rhev
|
|||||||
Summary: QEMU is a machine emulator and virtualizer
|
Summary: QEMU is a machine emulator and virtualizer
|
||||||
Name: qemu-kvm
|
Name: qemu-kvm
|
||||||
Version: 4.2.0
|
Version: 4.2.0
|
||||||
Release: 16%{?dist}
|
Release: 17%{?dist}
|
||||||
# Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
|
# Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
|
||||||
Epoch: 15
|
Epoch: 15
|
||||||
License: GPLv2 and GPLv2+ and CC-BY
|
License: GPLv2 and GPLv2+ and CC-BY
|
||||||
@ -621,6 +621,14 @@ Patch235: kvm-exec-rom_reset-Free-rom-data-during-inmigrate-skip.patch
|
|||||||
Patch236: kvm-migration-Rate-limit-inside-host-pages.patch
|
Patch236: kvm-migration-Rate-limit-inside-host-pages.patch
|
||||||
# For bz#1811670 - Unneeded qemu-guest-agent dependency on pixman
|
# For bz#1811670 - Unneeded qemu-guest-agent dependency on pixman
|
||||||
Patch237: kvm-build-sys-do-not-make-qemu-ga-link-with-pixman.patch
|
Patch237: kvm-build-sys-do-not-make-qemu-ga-link-with-pixman.patch
|
||||||
|
# For bz#1816007 - qemu-img convert failed to convert with block device as target
|
||||||
|
Patch238: kvm-block-pass-BlockDriver-reference-to-the-.bdrv_co_cre.patch
|
||||||
|
# For bz#1816007 - qemu-img convert failed to convert with block device as target
|
||||||
|
Patch239: kvm-block-trickle-down-the-fallback-image-creation-funct.patch
|
||||||
|
# For bz#1794692 - Mirror block job stops making progress
|
||||||
|
Patch240: kvm-Revert-mirror-Don-t-let-an-operation-wait-for-itself.patch
|
||||||
|
# For bz#1794692 - Mirror block job stops making progress
|
||||||
|
Patch241: kvm-mirror-Wait-only-for-in-flight-operations.patch
|
||||||
|
|
||||||
BuildRequires: wget
|
BuildRequires: wget
|
||||||
BuildRequires: rpm-build
|
BuildRequires: rpm-build
|
||||||
@ -1554,6 +1562,16 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 30 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-17.el8
|
||||||
|
- kvm-block-pass-BlockDriver-reference-to-the-.bdrv_co_cre.patch [bz#1816007]
|
||||||
|
- kvm-block-trickle-down-the-fallback-image-creation-funct.patch [bz#1816007]
|
||||||
|
- kvm-Revert-mirror-Don-t-let-an-operation-wait-for-itself.patch [bz#1794692]
|
||||||
|
- kvm-mirror-Wait-only-for-in-flight-operations.patch [bz#1794692]
|
||||||
|
- Resolves: bz#1794692
|
||||||
|
(Mirror block job stops making progress)
|
||||||
|
- Resolves: bz#1816007
|
||||||
|
(qemu-img convert failed to convert with block device as target)
|
||||||
|
|
||||||
* Tue Mar 24 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-16.el8
|
* Tue Mar 24 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-16.el8
|
||||||
- kvm-migration-Rate-limit-inside-host-pages.patch [bz#1814336]
|
- kvm-migration-Rate-limit-inside-host-pages.patch [bz#1814336]
|
||||||
- kvm-build-sys-do-not-make-qemu-ga-link-with-pixman.patch [bz#1811670]
|
- kvm-build-sys-do-not-make-qemu-ga-link-with-pixman.patch [bz#1811670]
|
||||||
|
Loading…
Reference in New Issue
Block a user