|
 |
586cba |
From 896f7749c72afe988ab28ac6af77b9c53b685c03 Mon Sep 17 00:00:00 2001
|
|
|
586cba |
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
|
|
|
586cba |
Date: Tue, 23 Aug 2022 20:30:37 +0200
|
|
|
586cba |
Subject: [PATCH 22/23] vdpa: Delete CVQ migration blocker
|
|
|
586cba |
MIME-Version: 1.0
|
|
|
586cba |
Content-Type: text/plain; charset=UTF-8
|
|
|
586cba |
Content-Transfer-Encoding: 8bit
|
|
|
586cba |
|
|
|
586cba |
RH-Author: Eugenio Pérez <eperezma@redhat.com>
|
|
|
586cba |
RH-MergeRequest: 116: vdpa: Restore device state on destination
|
|
|
586cba |
RH-Bugzilla: 2114060
|
|
|
586cba |
RH-Acked-by: Cindy Lu <lulu@redhat.com>
|
|
|
586cba |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
586cba |
RH-Commit: [21/21] 286f55177a132a8845c2912fb28cb4add472005a (eperezmartin/qemu-kvm)
|
|
|
586cba |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2114060
|
|
|
586cba |
Upstream status: git@github.com:jasowang/qemu.git net-next
|
|
|
586cba |
|
|
|
586cba |
We can restore the device state in the destination via CVQ now. Remove
|
|
|
586cba |
the migration blocker.
|
|
|
586cba |
|
|
|
586cba |
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
|
|
586cba |
Acked-by: Jason Wang <jasowang@redhat.com>
|
|
|
586cba |
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
|
586cba |
(cherry picked from commit fe2b0cd71cddbec4eaf6e325eaf357a4e72a469d)
|
|
|
586cba |
---
|
|
|
586cba |
hw/virtio/vhost-vdpa.c | 15 ---------------
|
|
|
586cba |
include/hw/virtio/vhost-vdpa.h | 1 -
|
|
|
586cba |
net/vhost-vdpa.c | 2 --
|
|
|
586cba |
3 files changed, 18 deletions(-)
|
|
|
586cba |
|
|
|
586cba |
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
|
|
|
586cba |
index 0bea1e1eb9..b61e313953 100644
|
|
|
586cba |
--- a/hw/virtio/vhost-vdpa.c
|
|
|
586cba |
+++ b/hw/virtio/vhost-vdpa.c
|
|
|
586cba |
@@ -1031,13 +1031,6 @@ static bool vhost_vdpa_svqs_start(struct vhost_dev *dev)
|
|
|
586cba |
return true;
|
|
|
586cba |
}
|
|
|
586cba |
|
|
|
586cba |
- if (v->migration_blocker) {
|
|
|
586cba |
- int r = migrate_add_blocker(v->migration_blocker, &err;;
|
|
|
586cba |
- if (unlikely(r < 0)) {
|
|
|
586cba |
- return false;
|
|
|
586cba |
- }
|
|
|
586cba |
- }
|
|
|
586cba |
-
|
|
|
586cba |
for (i = 0; i < v->shadow_vqs->len; ++i) {
|
|
|
586cba |
VirtQueue *vq = virtio_get_queue(dev->vdev, dev->vq_index + i);
|
|
|
586cba |
VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, i);
|
|
|
586cba |
@@ -1080,10 +1073,6 @@ err:
|
|
|
586cba |
vhost_svq_stop(svq);
|
|
|
586cba |
}
|
|
|
586cba |
|
|
|
586cba |
- if (v->migration_blocker) {
|
|
|
586cba |
- migrate_del_blocker(v->migration_blocker);
|
|
|
586cba |
- }
|
|
|
586cba |
-
|
|
|
586cba |
return false;
|
|
|
586cba |
}
|
|
|
586cba |
|
|
|
586cba |
@@ -1099,10 +1088,6 @@ static void vhost_vdpa_svqs_stop(struct vhost_dev *dev)
|
|
|
586cba |
VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, i);
|
|
|
586cba |
vhost_vdpa_svq_unmap_rings(dev, svq);
|
|
|
586cba |
}
|
|
|
586cba |
-
|
|
|
586cba |
- if (v->migration_blocker) {
|
|
|
586cba |
- migrate_del_blocker(v->migration_blocker);
|
|
|
586cba |
- }
|
|
|
586cba |
}
|
|
|
586cba |
|
|
|
586cba |
static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)
|
|
|
586cba |
diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h
|
|
|
586cba |
index d10a89303e..1111d85643 100644
|
|
|
586cba |
--- a/include/hw/virtio/vhost-vdpa.h
|
|
|
586cba |
+++ b/include/hw/virtio/vhost-vdpa.h
|
|
|
586cba |
@@ -35,7 +35,6 @@ typedef struct vhost_vdpa {
|
|
|
586cba |
bool shadow_vqs_enabled;
|
|
|
586cba |
/* IOVA mapping used by the Shadow Virtqueue */
|
|
|
586cba |
VhostIOVATree *iova_tree;
|
|
|
586cba |
- Error *migration_blocker;
|
|
|
586cba |
GPtrArray *shadow_vqs;
|
|
|
586cba |
const VhostShadowVirtqueueOps *shadow_vq_ops;
|
|
|
586cba |
void *shadow_vq_ops_opaque;
|
|
|
586cba |
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
|
|
|
586cba |
index 79ebda7de1..f4f16583e4 100644
|
|
|
586cba |
--- a/net/vhost-vdpa.c
|
|
|
586cba |
+++ b/net/vhost-vdpa.c
|
|
|
586cba |
@@ -555,8 +555,6 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer,
|
|
|
586cba |
|
|
|
586cba |
s->vhost_vdpa.shadow_vq_ops = &vhost_vdpa_net_svq_ops;
|
|
|
586cba |
s->vhost_vdpa.shadow_vq_ops_opaque = s;
|
|
|
586cba |
- error_setg(&s->vhost_vdpa.migration_blocker,
|
|
|
586cba |
- "Migration disabled: vhost-vdpa uses CVQ.");
|
|
|
586cba |
}
|
|
|
586cba |
ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa, queue_pair_index, nvqs);
|
|
|
586cba |
if (ret) {
|
|
|
586cba |
--
|
|
|
586cba |
2.31.1
|
|
|
586cba |
|