[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 20/21] vdpa: Add device migration blocker
From: |
Eugenio Pérez |
Subject: |
[PATCH v6 20/21] vdpa: Add device migration blocker |
Date: |
Wed, 20 Jul 2022 08:59:45 +0200 |
Since the vhost-vdpa device is exposing _F_LOG, adding a migration blocker if
it uses CVQ.
However, qemu is able to migrate simple devices with no CVQ as long as
they use SVQ. To allow it, add a placeholder error to vhost_vdpa, and
only add to vhost_dev when used. vhost_dev machinery place the migration
blocker if needed.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
include/hw/virtio/vhost-vdpa.h | 1 +
hw/virtio/vhost-vdpa.c | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h
index 1111d85643..d10a89303e 100644
--- a/include/hw/virtio/vhost-vdpa.h
+++ b/include/hw/virtio/vhost-vdpa.h
@@ -35,6 +35,7 @@ typedef struct vhost_vdpa {
bool shadow_vqs_enabled;
/* IOVA mapping used by the Shadow Virtqueue */
VhostIOVATree *iova_tree;
+ Error *migration_blocker;
GPtrArray *shadow_vqs;
const VhostShadowVirtqueueOps *shadow_vq_ops;
void *shadow_vq_ops_opaque;
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index beaaa7049a..291cd19054 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -20,6 +20,7 @@
#include "hw/virtio/vhost-shadow-virtqueue.h"
#include "hw/virtio/vhost-vdpa.h"
#include "exec/address-spaces.h"
+#include "migration/blocker.h"
#include "qemu/cutils.h"
#include "qemu/main-loop.h"
#include "cpu.h"
@@ -1022,6 +1023,13 @@ static bool vhost_vdpa_svqs_start(struct vhost_dev *dev)
return true;
}
+ if (v->migration_blocker) {
+ int r = migrate_add_blocker(v->migration_blocker, &err);
+ if (unlikely(r < 0)) {
+ return false;
+ }
+ }
+
for (i = 0; i < v->shadow_vqs->len; ++i) {
VirtQueue *vq = virtio_get_queue(dev->vdev, dev->vq_index + i);
VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, i);
@@ -1064,6 +1072,10 @@ err:
vhost_svq_stop(svq);
}
+ if (v->migration_blocker) {
+ migrate_del_blocker(v->migration_blocker);
+ }
+
return false;
}
@@ -1083,6 +1095,9 @@ static bool vhost_vdpa_svqs_stop(struct vhost_dev *dev)
}
}
+ if (v->migration_blocker) {
+ migrate_del_blocker(v->migration_blocker);
+ }
return true;
}
--
2.31.1
- [PATCH v6 10/21] vhost: Track number of descs in SVQDescState, (continued)
- [PATCH v6 10/21] vhost: Track number of descs in SVQDescState, Eugenio Pérez, 2022/07/20
- [PATCH v6 12/21] vhost: Expose vhost_svq_add, Eugenio Pérez, 2022/07/20
- [PATCH v6 15/21] vdpa: Export vhost_vdpa_dma_map and unmap calls, Eugenio Pérez, 2022/07/20
- [PATCH v6 13/21] vhost: add vhost_svq_poll, Eugenio Pérez, 2022/07/20
- [PATCH v6 11/21] vhost: add vhost_svq_push_elem, Eugenio Pérez, 2022/07/20
- [PATCH v6 14/21] vhost: Add svq avail_handler callback, Eugenio Pérez, 2022/07/20
- [PATCH v6 16/21] vhost-net-vdpa: add stubs for when no virtio-net device is present, Eugenio Pérez, 2022/07/20
- [PATCH v6 18/21] vdpa: Buffer CVQ support on shadow virtqueue, Eugenio Pérez, 2022/07/20
- [PATCH v6 17/21] vdpa: manual forward CVQ buffers, Eugenio Pérez, 2022/07/20
- [PATCH v6 19/21] vdpa: Extract get features part from vhost_vdpa_get_max_queue_pairs, Eugenio Pérez, 2022/07/20
- [PATCH v6 20/21] vdpa: Add device migration blocker,
Eugenio Pérez <=
- [PATCH v6 21/21] vdpa: Add x-svq to NetdevVhostVDPAOptions, Eugenio Pérez, 2022/07/20