3c4f941ac7
The patches were selected from the recent "Patch Round-up for stable 7.2.1" [0]. Those that should be relevant for our supported use-cases (and the upcoming nvme use-case) were picked. Most of the patches added now have not been submitted to qemu-stable before. The follow-up for the virtio-rng-pci migration fix will break migration between versions with the fix and without the fix when a virtio-pci-rng(-non)-transitional device is used. Luckily Proxmox VE only uses the virtio-pci-rng device, and this was fixed by 0006-virtio-rng-pci-fix-migration-compat-for-vectors.patch which was applied before any public version of Proxmox VE's QEMU 7.2 package was released. [0]: https://lists.nongnu.org/archive/html/qemu-stable/2023-03/msg00010.html [1]: https://bugzilla.redhat.com/show_bug.cgi?id=2162569 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
72 lines
2.4 KiB
Diff
72 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
|
|
Date: Thu, 9 Feb 2023 18:00:04 +0100
|
|
Subject: [PATCH] vdpa: stop all svq on device deletion
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Not stopping them leave the device in a bad state when virtio-net
|
|
fronted device is unplugged with device_del monitor command.
|
|
|
|
This is not triggable in regular poweroff or qemu forces shutdown
|
|
because cleanup is called right after vhost_vdpa_dev_start(false). But
|
|
devices hot unplug does not call vdpa device cleanups. This lead to all
|
|
the vhost_vdpa devices without stop the SVQ but the last.
|
|
|
|
Fix it and clean the code, making it symmetric with
|
|
vhost_vdpa_svqs_start.
|
|
|
|
Fixes: dff4426fa656 ("vhost: Add Shadow VirtQueue kick forwarding capabilities")
|
|
Reported-by: Lei Yang <leiyang@redhat.com>
|
|
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
|
Message-Id: <20230209170004.899472-1-eperezma@redhat.com>
|
|
Tested-by: Laurent Vivier <lvivier@redhat.com>
|
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
|
(cherry-picked from commit 2e1a9de96b487cf818a22d681cad8d3f5d18dcca)
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
---
|
|
hw/virtio/vhost-vdpa.c | 17 ++---------------
|
|
1 file changed, 2 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
|
|
index 7468e44b87..03c78d25d8 100644
|
|
--- a/hw/virtio/vhost-vdpa.c
|
|
+++ b/hw/virtio/vhost-vdpa.c
|
|
@@ -707,26 +707,11 @@ static int vhost_vdpa_get_device_id(struct vhost_dev *dev,
|
|
return ret;
|
|
}
|
|
|
|
-static void vhost_vdpa_reset_svq(struct vhost_vdpa *v)
|
|
-{
|
|
- if (!v->shadow_vqs_enabled) {
|
|
- return;
|
|
- }
|
|
-
|
|
- for (unsigned i = 0; i < v->shadow_vqs->len; ++i) {
|
|
- VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, i);
|
|
- vhost_svq_stop(svq);
|
|
- }
|
|
-}
|
|
-
|
|
static int vhost_vdpa_reset_device(struct vhost_dev *dev)
|
|
{
|
|
- struct vhost_vdpa *v = dev->opaque;
|
|
int ret;
|
|
uint8_t status = 0;
|
|
|
|
- vhost_vdpa_reset_svq(v);
|
|
-
|
|
ret = vhost_vdpa_call(dev, VHOST_VDPA_SET_STATUS, &status);
|
|
trace_vhost_vdpa_reset_device(dev, status);
|
|
return ret;
|
|
@@ -1088,6 +1073,8 @@ static void vhost_vdpa_svqs_stop(struct vhost_dev *dev)
|
|
|
|
for (unsigned i = 0; i < v->shadow_vqs->len; ++i) {
|
|
VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, i);
|
|
+
|
|
+ vhost_svq_stop(svq);
|
|
vhost_vdpa_svq_unmap_rings(dev, svq);
|
|
}
|
|
}
|