[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 04/14] vdpa: rewind at get_base, not set_base
From: |
Eugenio Pérez |
Subject: |
[PATCH v5 04/14] vdpa: rewind at get_base, not set_base |
Date: |
Fri, 3 Mar 2023 18:24:35 +0100 |
At this moment it is only possible to migrate to a vdpa device running
with x-svq=on. As a protective measure, the rewind of the inflight
descriptors was done at the destination. That way if the source sent a
virtqueue with inuse descriptors they are always discarded.
Since this series allows to migrate also to passthrough devices with no
SVQ, the right thing to do is to rewind at the source so the base of
vrings are correct.
Support for inflight descriptors may be added in the future.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
v4:
* Use virtqueue_unpop at vhost_svq_stop instead of rewinding at
vhost_vdpa_get_vring_base.
---
hw/virtio/vhost-shadow-virtqueue.c | 8 ++++++--
hw/virtio/vhost-vdpa.c | 11 -----------
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/hw/virtio/vhost-shadow-virtqueue.c
b/hw/virtio/vhost-shadow-virtqueue.c
index 515ccf870d..8361e70d1b 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -694,13 +694,17 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq)
g_autofree VirtQueueElement *elem = NULL;
elem = g_steal_pointer(&svq->desc_state[i].elem);
if (elem) {
- virtqueue_detach_element(svq->vq, elem, 0);
+ /*
+ * TODO: This is ok for networking, but other kinds of devices
+ * might have problems with just unpop these.
+ */
+ virtqueue_unpop(svq->vq, elem, 0);
}
}
next_avail_elem = g_steal_pointer(&svq->next_guest_avail_elem);
if (next_avail_elem) {
- virtqueue_detach_element(svq->vq, next_avail_elem, 0);
+ virtqueue_unpop(svq->vq, next_avail_elem, 0);
}
svq->vq = NULL;
g_free(svq->desc_next);
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 5cfa9d5d27..1550b1e26a 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -1170,18 +1170,7 @@ static int vhost_vdpa_set_vring_base(struct vhost_dev
*dev,
struct vhost_vring_state *ring)
{
struct vhost_vdpa *v = dev->opaque;
- VirtQueue *vq = virtio_get_queue(dev->vdev, ring->index);
- /*
- * vhost-vdpa devices does not support in-flight requests. Set all of them
- * as available.
- *
- * TODO: This is ok for networking, but other kinds of devices might
- * have problems with these retransmissions.
- */
- while (virtqueue_rewind(vq, 1)) {
- continue;
- }
if (v->shadow_vqs_enabled) {
/*
* Device vring base was set at device start. SVQ base is handled by
--
2.31.1
- [PATCH v5 00/14] Dynamically switch to vhost shadow virtqueues at vdpa net migration, Eugenio Pérez, 2023/03/03
- [PATCH v5 01/14] vdpa net: move iova tree creation from init to start, Eugenio Pérez, 2023/03/03
- [PATCH v5 02/14] vdpa: Remember last call fd set, Eugenio Pérez, 2023/03/03
- [PATCH v5 05/14] vdpa: add vhost_vdpa->suspended parameter, Eugenio Pérez, 2023/03/03
- [PATCH v5 04/14] vdpa: rewind at get_base, not set_base,
Eugenio Pérez <=
- [PATCH v5 06/14] vdpa: add vhost_vdpa_suspend, Eugenio Pérez, 2023/03/03
- [PATCH v5 07/14] vdpa: move vhost reset after get vring base, Eugenio Pérez, 2023/03/03
- [PATCH v5 03/14] vdpa: Negotiate _F_SUSPEND feature, Eugenio Pérez, 2023/03/03
- [PATCH v5 08/14] vdpa: add vdpa net migration state notifier, Eugenio Pérez, 2023/03/03
- [PATCH v5 09/14] vdpa: disable RAM block discard only for the first device, Eugenio Pérez, 2023/03/03
- [PATCH v5 10/14] vdpa net: block migration if the device has CVQ, Eugenio Pérez, 2023/03/03
- [PATCH v5 11/14] vdpa: block migration if device has unsupported features, Eugenio Pérez, 2023/03/03
- [PATCH v5 13/14] vdpa net: allow VHOST_F_LOG_ALL, Eugenio Pérez, 2023/03/03
- [PATCH v5 12/14] vdpa: block migration if SVQ does not admit a feature, Eugenio Pérez, 2023/03/03
- [PATCH v5 14/14] vdpa: return VHOST_F_LOG_ALL in vhost-vdpa devices, Eugenio Pérez, 2023/03/03