39a0a891d8
- vdpa: move memory listener to the realize stage - vdpa: implement vdpa device migration - vhost: implement post resume bh - vhost: implement migration state notifier for vdpa device - vhost: implement savevm_hanlder for vdpa device - vhost: implement vhost_vdpa_device_suspend/resume - vhost: implement vhost-vdpa suspend/resume - vhost: add vhost_dev_suspend/resume_op - vhost: introduce bytemap for vhost backend logging - vhost-vdpa: add migration log ops for VhostOps - vhost-vdpa: add VHOST_BACKEND_F_BYTEMAPLOG - vhost: fix null pointer access - ui/gtk: prevent ui lock up when dpy_gl_update called again before current draw event occurs - hw/usb: dev-mtp: Use g_mkdir() - target/ppc/cpu-models: Remove the "default" CPU alias - hw/intc/arm_gicv3: ICC_PMR_EL1 high bits should be RAZ - Fixed a QEMU hang when guest poweroff in COLO mode - migration/colo: More accurate update checkpoint time - scripts/entitlement.sh: Use backward-compatible cp flags - block/nvme: fix infinite loop in nvme_free_req_queue_cb() - hw/net: npcm7xx_emc fix missing queue_flush - Add dummy Aspeed AST2600 Display Port MCU (DPMCU) - hw/arm: ast2600: Fix address mapping of second SPI controller - vhost-user-blk: reconnect on any error during realize - vhost-user-blk: propagate error return from generic vhost - hw/riscv: boot: Reduce FDT address alignment constraints - Revert "hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus" - Fix STM32F2XX USART data register readout - block: use 'unsigned' for in_flight field on driver state - sphinx: change default language to 'en' - tests/qtest: Fix two format strings - trivial typos: namesapce - hw/ide/atapi.c: Correct typos (CD-CDROM -> CD-ROM) - hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus - hw/display/next-fb: Fix comment typo - xen/pass-through: merge emulated bits correctly mainline inclusion commit be9c61da9fc57eb7d293f380d0805ca6f46c2657 category: bugfix - tests/qtest/migration-test.c: spelling fix: bandwith - target/i386/cpu: Improve error message for property "vendor" - balloon: Fix a misleading error message - target/arm: Don't set syndrome ISS for loads and stores with writeback mainline inclusion commit 53ae2fdef1f5661cbaa2ea571c517f98e6041cb8 category: bugfix - disas/hppa: Show hexcode of instruction along with disassembly - tcg/loongarch64: Fix tcg_out_mov() Aborted - ui/qmp-cmds: Improve two error messages - qga: Improve guest-exec-status error message - hmp: Improve sync-profile error message - spapr/pci: Correct "does not support hotplugging error messages - xen/pass-through: don't create needless register group mainline inclusion commit c0e86b7624cb9d6db03e0d48cf82659e5b89a6a6 category: bugfix Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
86 lines
2.7 KiB
Diff
86 lines
2.7 KiB
Diff
From 98c74a827b742807f979fc36bca99ba0db38d295 Mon Sep 17 00:00:00 2001
|
|
From: fangyi <eric.fangyi@huawei.com>
|
|
Date: Mon, 4 Dec 2023 15:22:20 +0800
|
|
Subject: [PATCH] vhost: implement vhost-vdpa suspend/resume
|
|
|
|
vhost-vdpa implements the vhost_dev_suspend interface,
|
|
which will be called during the shutdown phase of the
|
|
live migration source virtual machine to suspend the
|
|
device but not reset the device information.
|
|
|
|
vhost-vdpa implements the vhost_dev_resume interface.
|
|
If the live migration fails, it will be called during
|
|
the startup phase of the source virtual machine.
|
|
Enable the device but set the status, etc.
|
|
|
|
Signed-off-by: libai <libai12@huawei.com>
|
|
Signed-off-by: jiangdongxu <jiangdongxu1@huawei.com>
|
|
Signed-off-by: fangyi <eric.fangyi@huawei.com>
|
|
---
|
|
hw/virtio/vhost-vdpa.c | 44 ++++++++++++++++++++++++++++++++++++++++--
|
|
1 file changed, 42 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
|
|
index 7663d78b43..7688dc0eba 100644
|
|
--- a/hw/virtio/vhost-vdpa.c
|
|
+++ b/hw/virtio/vhost-vdpa.c
|
|
@@ -1318,6 +1318,43 @@ static unsigned int vhost_vdpa_get_used_memslots(void)
|
|
return vhost_vdpa_used_memslots;
|
|
}
|
|
|
|
+static int vhost_vdpa_suspend_device(struct vhost_dev *dev)
|
|
+{
|
|
+ struct vhost_vdpa *v = dev->opaque;
|
|
+ int ret;
|
|
+
|
|
+ vhost_vdpa_svqs_stop(dev);
|
|
+ vhost_vdpa_host_notifiers_uninit(dev, dev->nvqs);
|
|
+
|
|
+ if (dev->vq_index + dev->nvqs != dev->vq_index_end) {
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ ret = vhost_vdpa_call(dev, VHOST_VDPA_SUSPEND, NULL);
|
|
+ memory_listener_unregister(&v->listener);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int vhost_vdpa_resume_device(struct vhost_dev *dev)
|
|
+{
|
|
+ struct vhost_vdpa *v = dev->opaque;
|
|
+ bool ok;
|
|
+
|
|
+ vhost_vdpa_host_notifiers_init(dev);
|
|
+ ok = vhost_vdpa_svqs_start(dev);
|
|
+ if (unlikely(!ok)) {
|
|
+ return -1;
|
|
+ }
|
|
+ vhost_vdpa_set_vring_ready(dev);
|
|
+
|
|
+ if (dev->vq_index + dev->nvqs != dev->vq_index_end) {
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ memory_listener_register(&v->listener, &address_space_memory);
|
|
+ return vhost_vdpa_call(dev, VHOST_VDPA_RESUME, NULL);
|
|
+}
|
|
+
|
|
static int vhost_vdpa_log_sync(struct vhost_dev *dev)
|
|
{
|
|
struct vhost_vdpa *v = dev->opaque;
|
|
@@ -1364,6 +1401,9 @@ const VhostOps vdpa_ops = {
|
|
.vhost_force_iommu = vhost_vdpa_force_iommu,
|
|
.vhost_log_sync = vhost_vdpa_log_sync,
|
|
.vhost_set_config_call = vhost_vdpa_set_config_call,
|
|
- .vhost_set_used_memslots = vhost_vdpa_set_used_memslots,
|
|
- .vhost_get_used_memslots = vhost_vdpa_get_used_memslots,
|
|
+ .vhost_set_used_memslots = vhost_vdpa_set_used_memslots,
|
|
+ .vhost_get_used_memslots = vhost_vdpa_get_used_memslots,
|
|
+ .vhost_dev_suspend = vhost_vdpa_suspend_device,
|
|
+ .vhost_dev_resume = vhost_vdpa_resume_device,
|
|
+
|
|
};
|
|
--
|
|
2.27.0
|
|
|