88586bd480
- kvm-s390x-css-Introduce-an-ESW-struct.patch [bz#1957194] - kvm-s390x-css-Split-out-the-IRB-sense-data.patch [bz#1957194] - kvm-s390x-css-Refactor-IRB-construction.patch [bz#1957194] - kvm-s390x-css-Add-passthrough-IRB.patch [bz#1957194] - kvm-vhost-user-blk-Fail-gracefully-on-too-large-queue-si.patch [bz#1957194] - kvm-vhost-user-blk-Make-sure-to-set-Error-on-realize-fai.patch [bz#1957194] - kvm-vhost-user-blk-Don-t-reconnect-during-initialisation.patch [bz#1957194] - kvm-vhost-user-blk-Improve-error-reporting-in-realize.patch [bz#1957194] - kvm-vhost-user-blk-Get-more-feature-flags-from-vhost-dev.patch [bz#1957194] - kvm-virtio-Fail-if-iommu_platform-is-requested-but-unsup.patch [bz#1957194] - kvm-vhost-user-blk-Check-that-num-queues-is-supported-by.patch [bz#1957194] - kvm-vhost-user-Fix-backends-without-multiqueue-support.patch [bz#1957194] - kvm-file-posix-fix-max_iov-for-dev-sg-devices.patch [bz#1957194] - kvm-scsi-generic-pass-max_segments-via-max_iov-field-in-.patch [bz#1957194] - kvm-osdep-provide-ROUND_DOWN-macro.patch [bz#1957194] - kvm-block-backend-align-max_transfer-to-request-alignmen.patch [bz#1957194] - kvm-block-add-max_hw_transfer-to-BlockLimits.patch [bz#1957194] - kvm-file-posix-try-BLKSECTGET-on-block-devices-too-do-no.patch [bz#1957194] - kvm-block-Add-option-to-use-driver-whitelist-even-in-too.patch [bz#1957782] - kvm-spec-Restrict-block-drivers-in-tools.patch [bz#1957782] - kvm-Move-tools-to-separate-package.patch [bz#1972285] - kvm-Split-qemu-pr-helper-to-separate-package.patch [bz#1972300] - kvm-spec-RPM_BUILD_ROOT-buildroot.patch [bz#1973029] - kvm-spec-More-use-of-name-instead-of-qemu-kvm.patch [bz#1973029] - kvm-spec-Use-qemu-pr-helper.service-from-qemu.git.patch [bz#1973029] - kvm-spec-Use-_sourcedir-for-referencing-sources.patch [bz#1973029] - kvm-spec-Add-tools_only.patch [bz#1973029] - kvm-spec-build-Add-run_configure-helper.patch [bz#1973029] - kvm-spec-build-Disable-more-bits-with-disable_everything.patch [bz#1973029] - kvm-spec-build-Add-macros-for-some-configure-parameters.patch [bz#1973029] - kvm-spec-files-Move-qemu-guest-agent-and-qemu-img-earlie.patch [bz#1973029] - kvm-spec-install-Remove-redundant-bits.patch [bz#1973029] - kvm-spec-install-Add-modprobe_kvm_conf-macro.patch [bz#1973029] - kvm-spec-install-Remove-qemu-guest-agent-etc-qemu-kvm-us.patch [bz#1973029] - kvm-spec-install-clean-up-qemu-ga-section.patch [bz#1973029] - kvm-spec-install-Use-a-single-tools_only-section.patch [bz#1973029] - kvm-spec-Make-tools_only-not-cross-spec-sections.patch [bz#1973029] - kvm-spec-install-Limit-time-spent-in-qemu_kvm_build.patch [bz#1973029] - kvm-spec-misc-syntactic-merges-with-Fedora.patch [bz#1973029] - kvm-spec-Use-Fedora-s-pattern-for-specifying-rc-version.patch [bz#1973029] - kvm-spec-files-don-t-use-fine-grained-docs-file-list.patch [bz#1973029] - kvm-spec-files-Add-licenses-to-qemu-common-too.patch [bz#1973029] - kvm-spec-install-Drop-python3-shebang-fixup.patch [bz#1973029] - Resolves: bz#1957194 (Synchronize RHEL-AV 8.5.0 changes to RHEL 9.0.0 Beta) - Resolves: bz#1957782 (VMDK support should be read-only) - Resolves: bz#1972285 (Split out a qemu-kvm-tools subpackage) - Resolves: bz#1972300 (Split out a qemu-pr-helper subpackage) - Resolves: bz#1973029 (Spec file cleanups)
180 lines
7.7 KiB
Diff
180 lines
7.7 KiB
Diff
From 5d39cb265db6ea2159662a2d071d340712940d33 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Mon, 12 Jul 2021 10:22:27 -0400
|
|
Subject: [PATCH 07/43] vhost-user-blk: Don't reconnect during initialisation
|
|
|
|
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Bugzilla: 1957194
|
|
|
|
This is a partial revert of commits 77542d43149 and bc79c87bcde.
|
|
|
|
Usually, an error during initialisation means that the configuration was
|
|
wrong. Reconnecting won't make the error go away, but just turn the
|
|
error condition into an endless loop. Avoid this and return errors
|
|
again.
|
|
|
|
Additionally, calling vhost_user_blk_disconnect() from the chardev event
|
|
handler could result in use-after-free because none of the
|
|
initialisation code expects that the device could just go away in the
|
|
middle. So removing the call fixes crashes in several places.
|
|
|
|
For example, using a num-queues setting that is incompatible with the
|
|
backend would result in a crash like this (dereferencing dev->opaque,
|
|
which is already NULL):
|
|
|
|
#0 0x0000555555d0a4bd in vhost_user_read_cb (source=0x5555568f4690, condition=(G_IO_IN | G_IO_HUP), opaque=0x7fffffffcbf0) at ../hw/virtio/vhost-user.c:313
|
|
#1 0x0000555555d950d3 in qio_channel_fd_source_dispatch (source=0x555557c3f750, callback=0x555555d0a478 <vhost_user_read_cb>, user_data=0x7fffffffcbf0) at ../io/channel-watch.c:84
|
|
#2 0x00007ffff7b32a9f in g_main_context_dispatch () at /lib64/libglib-2.0.so.0
|
|
#3 0x00007ffff7b84a98 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0
|
|
#4 0x00007ffff7b32163 in g_main_loop_run () at /lib64/libglib-2.0.so.0
|
|
#5 0x0000555555d0a724 in vhost_user_read (dev=0x555557bc62f8, msg=0x7fffffffcc50) at ../hw/virtio/vhost-user.c:402
|
|
#6 0x0000555555d0ee6b in vhost_user_get_config (dev=0x555557bc62f8, config=0x555557bc62ac "", config_len=60) at ../hw/virtio/vhost-user.c:2133
|
|
#7 0x0000555555d56d46 in vhost_dev_get_config (hdev=0x555557bc62f8, config=0x555557bc62ac "", config_len=60) at ../hw/virtio/vhost.c:1566
|
|
#8 0x0000555555cdd150 in vhost_user_blk_device_realize (dev=0x555557bc60b0, errp=0x7fffffffcf90) at ../hw/block/vhost-user-blk.c:510
|
|
#9 0x0000555555d08f6d in virtio_device_realize (dev=0x555557bc60b0, errp=0x7fffffffcff0) at ../hw/virtio/virtio.c:3660
|
|
|
|
Note that this removes the ability to reconnect during initialisation
|
|
(but not during operation) when there is no permanent error, but the
|
|
backend restarts, as the implementation was buggy. This feature can be
|
|
added back in a follow-up series after changing error paths to
|
|
distinguish cases where retrying could help from cases with permanent
|
|
errors.
|
|
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Message-Id: <20210429171316.162022-3-kwolf@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit dabefdd6abcbc7d858e9413e4734aab2e0b5c8d9)
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
hw/block/vhost-user-blk.c | 59 +++++++++++----------------------------
|
|
1 file changed, 17 insertions(+), 42 deletions(-)
|
|
|
|
diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
|
|
index 7c85248a7b..c0b9958da1 100644
|
|
--- a/hw/block/vhost-user-blk.c
|
|
+++ b/hw/block/vhost-user-blk.c
|
|
@@ -50,6 +50,8 @@ static const int user_feature_bits[] = {
|
|
VHOST_INVALID_FEATURE_BIT
|
|
};
|
|
|
|
+static void vhost_user_blk_event(void *opaque, QEMUChrEvent event);
|
|
+
|
|
static void vhost_user_blk_update_config(VirtIODevice *vdev, uint8_t *config)
|
|
{
|
|
VHostUserBlk *s = VHOST_USER_BLK(vdev);
|
|
@@ -362,19 +364,6 @@ static void vhost_user_blk_disconnect(DeviceState *dev)
|
|
vhost_dev_cleanup(&s->dev);
|
|
}
|
|
|
|
-static void vhost_user_blk_event(void *opaque, QEMUChrEvent event,
|
|
- bool realized);
|
|
-
|
|
-static void vhost_user_blk_event_realize(void *opaque, QEMUChrEvent event)
|
|
-{
|
|
- vhost_user_blk_event(opaque, event, false);
|
|
-}
|
|
-
|
|
-static void vhost_user_blk_event_oper(void *opaque, QEMUChrEvent event)
|
|
-{
|
|
- vhost_user_blk_event(opaque, event, true);
|
|
-}
|
|
-
|
|
static void vhost_user_blk_chr_closed_bh(void *opaque)
|
|
{
|
|
DeviceState *dev = opaque;
|
|
@@ -382,12 +371,11 @@ static void vhost_user_blk_chr_closed_bh(void *opaque)
|
|
VHostUserBlk *s = VHOST_USER_BLK(vdev);
|
|
|
|
vhost_user_blk_disconnect(dev);
|
|
- qemu_chr_fe_set_handlers(&s->chardev, NULL, NULL,
|
|
- vhost_user_blk_event_oper, NULL, opaque, NULL, true);
|
|
+ qemu_chr_fe_set_handlers(&s->chardev, NULL, NULL, vhost_user_blk_event,
|
|
+ NULL, opaque, NULL, true);
|
|
}
|
|
|
|
-static void vhost_user_blk_event(void *opaque, QEMUChrEvent event,
|
|
- bool realized)
|
|
+static void vhost_user_blk_event(void *opaque, QEMUChrEvent event)
|
|
{
|
|
DeviceState *dev = opaque;
|
|
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
|
|
@@ -401,17 +389,7 @@ static void vhost_user_blk_event(void *opaque, QEMUChrEvent event,
|
|
}
|
|
break;
|
|
case CHR_EVENT_CLOSED:
|
|
- /*
|
|
- * Closing the connection should happen differently on device
|
|
- * initialization and operation stages.
|
|
- * On initalization, we want to re-start vhost_dev initialization
|
|
- * from the very beginning right away when the connection is closed,
|
|
- * so we clean up vhost_dev on each connection closing.
|
|
- * On operation, we want to postpone vhost_dev cleanup to let the
|
|
- * other code perform its own cleanup sequence using vhost_dev data
|
|
- * (e.g. vhost_dev_set_log).
|
|
- */
|
|
- if (realized && !runstate_check(RUN_STATE_SHUTDOWN)) {
|
|
+ if (!runstate_check(RUN_STATE_SHUTDOWN)) {
|
|
/*
|
|
* A close event may happen during a read/write, but vhost
|
|
* code assumes the vhost_dev remains setup, so delay the
|
|
@@ -431,8 +409,6 @@ static void vhost_user_blk_event(void *opaque, QEMUChrEvent event,
|
|
* knowing its type (in this case vhost-user).
|
|
*/
|
|
s->dev.started = false;
|
|
- } else {
|
|
- vhost_user_blk_disconnect(dev);
|
|
}
|
|
break;
|
|
case CHR_EVENT_BREAK:
|
|
@@ -489,33 +465,32 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp)
|
|
s->vhost_vqs = g_new0(struct vhost_virtqueue, s->num_queues);
|
|
s->connected = false;
|
|
|
|
- qemu_chr_fe_set_handlers(&s->chardev, NULL, NULL,
|
|
- vhost_user_blk_event_realize, NULL, (void *)dev,
|
|
- NULL, true);
|
|
-
|
|
-reconnect:
|
|
if (qemu_chr_fe_wait_connected(&s->chardev, errp) < 0) {
|
|
goto virtio_err;
|
|
}
|
|
|
|
- /* check whether vhost_user_blk_connect() failed or not */
|
|
- if (!s->connected) {
|
|
- goto reconnect;
|
|
+ if (vhost_user_blk_connect(dev) < 0) {
|
|
+ error_setg(errp, "vhost-user-blk: could not connect");
|
|
+ qemu_chr_fe_disconnect(&s->chardev);
|
|
+ goto virtio_err;
|
|
}
|
|
+ assert(s->connected);
|
|
|
|
ret = vhost_dev_get_config(&s->dev, (uint8_t *)&s->blkcfg,
|
|
sizeof(struct virtio_blk_config));
|
|
if (ret < 0) {
|
|
- error_report("vhost-user-blk: get block config failed");
|
|
- goto reconnect;
|
|
+ error_setg(errp, "vhost-user-blk: get block config failed");
|
|
+ goto vhost_err;
|
|
}
|
|
|
|
- /* we're fully initialized, now we can operate, so change the handler */
|
|
+ /* we're fully initialized, now we can operate, so add the handler */
|
|
qemu_chr_fe_set_handlers(&s->chardev, NULL, NULL,
|
|
- vhost_user_blk_event_oper, NULL, (void *)dev,
|
|
+ vhost_user_blk_event, NULL, (void *)dev,
|
|
NULL, true);
|
|
return;
|
|
|
|
+vhost_err:
|
|
+ vhost_dev_cleanup(&s->dev);
|
|
virtio_err:
|
|
g_free(s->vhost_vqs);
|
|
s->vhost_vqs = NULL;
|
|
--
|
|
2.27.0
|
|
|