You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
85 lines
2.8 KiB
85 lines
2.8 KiB
1 year ago
|
From 757767330abb2c0a650c387a9a5965fee224beee 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
|
||
|
|
|
||
|
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
RH-MergeRequest: 286: vdpa: stop all svq on device deletion
|
||
|
|
RH-Bugzilla: 2213864
|
||
|
|
RH-Acked-by: Cindy Lu <lulu@redhat.com>
|
||
|
|
RH-Acked-by: Eugenio Pérez <eperezma@redhat.com>
|
||
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
||
|
|
RH-Commit: [1/1] b9ff402e4c6e386be3ea867df9358cdaa283cda7
|
||
|
|
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2213864
|
||
|
|
Upstream-Status: merged
|
||
|
|
|
||
|
|
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)
|
||
|
|
---
|
||
|
|
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 72ff06673c..46896b7592 100644
|
||
|
|
--- a/hw/virtio/vhost-vdpa.c
|
||
|
|
+++ b/hw/virtio/vhost-vdpa.c
|
||
|
|
@@ -669,26 +669,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;
|
||
|
|
@@ -1080,6 +1065,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);
|
||
|
|
|
||
|
|
event_notifier_cleanup(&svq->hdev_kick);
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|