- 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>
266 lines
7.8 KiB
Diff
266 lines
7.8 KiB
Diff
From 9cd596fd081bdb88b03b5e969631d8d08797c14d Mon Sep 17 00:00:00 2001
|
|
From: fangyi <eric.fangyi@huawei.com>
|
|
Date: Mon, 4 Dec 2023 15:53:28 +0800
|
|
Subject: [PATCH] vhost: implement savevm_hanlder for vdpa device
|
|
|
|
Signed-off-by: libai <libai12@huawei.com>
|
|
Signed-off-by: jiangdongxu <jiangdongxu1@huawei.com>
|
|
Signed-off-by: fangyi <eric.fangyi@huawei.com>
|
|
---
|
|
hw/virtio/vdpa-dev-mig.c | 174 +++++++++++++++++++++++++++++++
|
|
include/hw/virtio/vdpa-dev-mig.h | 13 +++
|
|
linux-headers/linux/vhost.h | 8 ++
|
|
3 files changed, 195 insertions(+)
|
|
|
|
diff --git a/hw/virtio/vdpa-dev-mig.c b/hw/virtio/vdpa-dev-mig.c
|
|
index 64c9e245d1..c0bcbda7d4 100644
|
|
--- a/hw/virtio/vdpa-dev-mig.c
|
|
+++ b/hw/virtio/vdpa-dev-mig.c
|
|
@@ -32,6 +32,17 @@
|
|
#include "sysemu/runstate.h"
|
|
#include "qemu/error-report.h"
|
|
#include "hw/virtio/vdpa-dev-mig.h"
|
|
+#include "migration/qemu-file-types.h"
|
|
+
|
|
+/*
|
|
+ * Flags used as delimiter:
|
|
+ * 0xffffffff => MSB 32-bit all 1s
|
|
+ * 0xef10 => emulated (virtual) function IO
|
|
+ * 0x0000 => 16-bits reserved for flags
|
|
+ */
|
|
+#define VDPA_MIG_FLAG_END_OF_STATE (0xffffffffef100001ULL)
|
|
+#define VDPA_MIG_FLAG_DEV_CONFIG_STATE (0xffffffffef100002ULL)
|
|
+#define VDPA_MIG_FLAG_DEV_SETUP_STATE (0xffffffffef100003ULL)
|
|
|
|
static int vhost_vdpa_call(struct vhost_dev *dev, unsigned long int request,
|
|
void *arg)
|
|
@@ -47,6 +58,80 @@ static int vhost_vdpa_call(struct vhost_dev *dev, unsigned long int request,
|
|
return ioctl(fd, request, arg);
|
|
}
|
|
|
|
+static int vhost_vdpa_set_mig_state(struct vhost_dev *dev, uint8_t state)
|
|
+{
|
|
+ return vhost_vdpa_call(dev, VHOST_VDPA_SET_MIG_STATE, &state);
|
|
+}
|
|
+
|
|
+static int vhost_vdpa_dev_buffer_size(struct vhost_dev *dev, uint32_t *size)
|
|
+{
|
|
+ return vhost_vdpa_call(dev, VHOST_GET_DEV_BUFFER_SIZE, size);
|
|
+}
|
|
+
|
|
+static int vhost_vdpa_dev_buffer_save(struct vhost_dev *dev, QEMUFile *f)
|
|
+{
|
|
+ struct vhost_vdpa_config *config;
|
|
+ unsigned long config_size = offsetof(struct vhost_vdpa_config, buf);
|
|
+ uint32_t buffer_size = 0;
|
|
+ int ret;
|
|
+
|
|
+ ret = vhost_vdpa_dev_buffer_size(dev, &buffer_size);
|
|
+ if (ret) {
|
|
+ error_report("get dev buffer size failed: %d\n", ret);
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
+ qemu_put_be32(f, buffer_size);
|
|
+
|
|
+ config = g_malloc(buffer_size + config_size);
|
|
+ config->off = 0;
|
|
+ config->len = buffer_size;
|
|
+
|
|
+ ret = vhost_vdpa_call(dev, VHOST_GET_DEV_BUFFER, config);
|
|
+ if (ret) {
|
|
+ error_report("get dev buffer failed: %d\n", ret);
|
|
+ goto free;
|
|
+ }
|
|
+
|
|
+ qemu_put_buffer(f, config->buf, buffer_size);
|
|
+free:
|
|
+ g_free(config);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int vhost_vdpa_dev_buffer_load(struct vhost_dev *dev, QEMUFile *f)
|
|
+{
|
|
+ struct vhost_vdpa_config *config;
|
|
+ unsigned long config_size = offsetof(struct vhost_vdpa_config, buf);
|
|
+ uint32_t buffer_size, recv_size;
|
|
+ int ret;
|
|
+
|
|
+ buffer_size = qemu_get_be32(f);
|
|
+
|
|
+ config = g_malloc(buffer_size + config_size);
|
|
+ config->off = 0;
|
|
+ config->len = buffer_size;
|
|
+
|
|
+ recv_size = qemu_get_buffer(f, config->buf, buffer_size);
|
|
+ if (recv_size != buffer_size) {
|
|
+ error_report("read dev mig buffer failed, buffer_size: %u, "
|
|
+ "recv_size: %u\n", buffer_size, recv_size);
|
|
+ ret = -EINVAL;
|
|
+ goto free;
|
|
+ }
|
|
+
|
|
+ ret = vhost_vdpa_call(dev, VHOST_SET_DEV_BUFFER, config);
|
|
+ if (ret) {
|
|
+ error_report("set dev buffer failed: %d\n", ret);
|
|
+ }
|
|
+
|
|
+free:
|
|
+ g_free(config);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
static int vhost_vdpa_device_suspend(VhostVdpaDevice *vdpa)
|
|
{
|
|
VirtIODevice *vdev = VIRTIO_DEVICE(vdpa);
|
|
@@ -173,14 +258,103 @@ static void vdpa_dev_vmstate_change(void *opaque, bool running, RunState state)
|
|
}
|
|
}
|
|
|
|
+static int vdpa_save_setup(QEMUFile *f, void *opaque)
|
|
+{
|
|
+ qemu_put_be64(f, VDPA_MIG_FLAG_DEV_SETUP_STATE);
|
|
+ qemu_put_be64(f, VDPA_MIG_FLAG_END_OF_STATE);
|
|
+
|
|
+ return qemu_file_get_error(f);
|
|
+}
|
|
+
|
|
+static int vdpa_save_complete_precopy(QEMUFile *f, void *opaque)
|
|
+{
|
|
+ VhostVdpaDevice *vdev = VHOST_VDPA_DEVICE(opaque);
|
|
+ struct vhost_dev *hdev = &vdev->dev;
|
|
+ int ret;
|
|
+
|
|
+ qemu_put_be64(f, VDPA_MIG_FLAG_DEV_CONFIG_STATE);
|
|
+ ret = vhost_vdpa_dev_buffer_save(hdev, f);
|
|
+ if (ret) {
|
|
+ error_report("Save vdpa device buffer failed: %d\n", ret);
|
|
+ return ret;
|
|
+ }
|
|
+ qemu_put_be64(f, VDPA_MIG_FLAG_END_OF_STATE);
|
|
+
|
|
+ return qemu_file_get_error(f);
|
|
+}
|
|
+
|
|
+static int vdpa_load_state(QEMUFile *f, void *opaque, int version_id)
|
|
+{
|
|
+ VhostVdpaDevice *vdev = VHOST_VDPA_DEVICE(opaque);
|
|
+ struct vhost_dev *hdev = &vdev->dev;
|
|
+
|
|
+ int ret;
|
|
+ uint64_t data;
|
|
+
|
|
+ data = qemu_get_be64(f);
|
|
+ while (data != VDPA_MIG_FLAG_END_OF_STATE) {
|
|
+ if (data == VDPA_MIG_FLAG_DEV_SETUP_STATE) {
|
|
+ data = qemu_get_be64(f);
|
|
+ if (data == VDPA_MIG_FLAG_END_OF_STATE) {
|
|
+ return 0;
|
|
+ } else {
|
|
+ error_report("SETUP STATE: EOS not found 0x%lx\n", data);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+ } else if (data == VDPA_MIG_FLAG_DEV_CONFIG_STATE) {
|
|
+ ret = vhost_vdpa_dev_buffer_load(hdev, f);
|
|
+ if (ret) {
|
|
+ error_report("fail to restore device buffer.\n");
|
|
+ return ret;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ ret = qemu_file_get_error(f);
|
|
+ if (ret) {
|
|
+ error_report("qemu file error: %d\n", ret);
|
|
+ return ret;
|
|
+ }
|
|
+ data = qemu_get_be64(f);
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int vdpa_load_setup(QEMUFile *f, void *opaque)
|
|
+{
|
|
+ VhostVdpaDevice *v = VHOST_VDPA_DEVICE(opaque);
|
|
+ struct vhost_dev *hdev = &v->dev;
|
|
+ int ret = 0;
|
|
+
|
|
+ ret = vhost_vdpa_set_mig_state(hdev, VDPA_DEVICE_PRE_START);
|
|
+ if (ret) {
|
|
+ error_report("pre start device failed: %d\n", ret);
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ return qemu_file_get_error(f);
|
|
+out:
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static SaveVMHandlers savevm_vdpa_handlers = {
|
|
+ .save_setup = vdpa_save_setup,
|
|
+ .save_live_complete_precopy = vdpa_save_complete_precopy,
|
|
+ .load_state = vdpa_load_state,
|
|
+ .load_setup = vdpa_load_setup,
|
|
+};
|
|
+
|
|
void vdpa_migration_register(VhostVdpaDevice *vdev)
|
|
{
|
|
vdev->vmstate = qdev_add_vm_change_state_handler(DEVICE(vdev),
|
|
vdpa_dev_vmstate_change,
|
|
DEVICE(vdev));
|
|
+ register_savevm_live("vdpa", -1, 1,
|
|
+ &savevm_vdpa_handlers, DEVICE(vdev));
|
|
}
|
|
|
|
void vdpa_migration_unregister(VhostVdpaDevice *vdev)
|
|
{
|
|
+ unregister_savevm(VMSTATE_IF(&vdev->parent_obj.parent_obj), "vdpa", DEVICE(vdev));
|
|
qemu_del_vm_change_state_handler(vdev->vmstate);
|
|
}
|
|
diff --git a/include/hw/virtio/vdpa-dev-mig.h b/include/hw/virtio/vdpa-dev-mig.h
|
|
index 89665ca747..adc1d657f7 100644
|
|
--- a/include/hw/virtio/vdpa-dev-mig.h
|
|
+++ b/include/hw/virtio/vdpa-dev-mig.h
|
|
@@ -9,6 +9,19 @@
|
|
|
|
#include "hw/virtio/vdpa-dev.h"
|
|
|
|
+enum {
|
|
+ VDPA_DEVICE_START,
|
|
+ VDPA_DEVICE_STOP,
|
|
+ VDPA_DEVICE_PRE_START,
|
|
+ VDPA_DEVICE_PRE_STOP,
|
|
+ VDPA_DEVICE_CANCEL,
|
|
+ VDPA_DEVICE_POST_START,
|
|
+ VDPA_DEVICE_START_ASYNC,
|
|
+ VDPA_DEVICE_STOP_ASYNC,
|
|
+ VDPA_DEVICE_PRE_START_ASYNC,
|
|
+ VDPA_DEVICE_QUERY_OP_STATE,
|
|
+};
|
|
+
|
|
void vdpa_migration_register(VhostVdpaDevice *vdev);
|
|
|
|
void vdpa_migration_unregister(VhostVdpaDevice *vdev);
|
|
diff --git a/linux-headers/linux/vhost.h b/linux-headers/linux/vhost.h
|
|
index 9b3f71b20f..457923974c 100644
|
|
--- a/linux-headers/linux/vhost.h
|
|
+++ b/linux-headers/linux/vhost.h
|
|
@@ -192,4 +192,12 @@
|
|
*/
|
|
#define VHOST_VDPA_RESUME _IO(VHOST_VIRTIO, 0x7E)
|
|
|
|
+/* set and get device buffer */
|
|
+#define VHOST_GET_DEV_BUFFER _IOR(VHOST_VIRTIO, 0xb0, struct vhost_vdpa_config)
|
|
+#define VHOST_SET_DEV_BUFFER _IOW(VHOST_VIRTIO, 0xb1, struct vhost_vdpa_config)
|
|
+#define VHOST_GET_DEV_BUFFER_SIZE _IOR(VHOST_VIRTIO, 0xb3, __u32)
|
|
+
|
|
+/* set device migtration state */
|
|
+#define VHOST_VDPA_SET_MIG_STATE _IOW(VHOST_VIRTIO, 0xb2, __u8)
|
|
+
|
|
#endif
|
|
--
|
|
2.27.0
|
|
|