[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 08/13] vfio: Register SaveVMHandlers for VFIO dev
From: |
Kirti Wankhede |
Subject: |
[Qemu-devel] [PATCH v6 08/13] vfio: Register SaveVMHandlers for VFIO device |
Date: |
Tue, 9 Jul 2019 07:29:09 +0530 |
Define flags to be used as delimeter in migration file stream.
Added .save_setup and .save_cleanup functions. Mapped & unmapped migration
region from these functions at source during saving or pre-copy phase.
Set VFIO device state depending on VM's state. During live migration, VM is
running when .save_setup is called, _SAVING | _RUNNING state is set for VFIO
device. During save-restore, VM is paused, _SAVING state is set for VFIO device.
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1;
t=1562645558; bh=8vUPg3KmhoNDzrGG08rPjtEGsYW1X/3yWpzwzoAlpYU=;
h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer:
In-Reply-To:References:X-NVConfidentiality:MIME-Version:
Content-Type;
b=EmYoZd4tSWL7HAR6lpWP5Ev573hRbr5BzxGhBCR/+E/EG5p/8mIeBf5ok5QLV3nFp
dKmaZd1HgZF199j9dLgEC5pJpRIA+jYh0hftr46zgI/LM68ipWZZXntTW1e5NyGdso
Gajrdkggu3WlC2d4oniUCgQmSWA9QPPojqDSt5bx23/NV64YJtHjDyV81PT1TX+Rez
yskR4PtGVBJmbfZ17G+SK0S+vGMpIxoBSDuZnqyqb41CDY9ExPWzrV3pLQgZvD/5r8
o93QNSARfaWNeLt5InRFa/G6Oop8gLEi5lCTo3HFOYs0FBjXCGk6yZHHMrN4q/ssog
gLjyJR6pxp6wQ==
Signed-off-by: Kirti Wankhede <address@hidden>
Reviewed-by: Neo Jia <address@hidden>
---
hw/vfio/migration.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++-
hw/vfio/trace-events | 2 ++
2 files changed, 83 insertions(+), 1 deletion(-)
diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index e4a89a6f9bc7..0597a45fda2d 100644
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -23,6 +23,17 @@
#include "pci.h"
#include "trace.h"
+/*
+ * Flags used as delimiter:
+ * 0xffffffff => MSB 32-bit all 1s
+ * 0xef10 => emulated (virtual) function IO
+ * 0x0000 => 16-bits reserved for flags
+ */
+#define VFIO_MIG_FLAG_END_OF_STATE (0xffffffffef100001ULL)
+#define VFIO_MIG_FLAG_DEV_CONFIG_STATE (0xffffffffef100002ULL)
+#define VFIO_MIG_FLAG_DEV_SETUP_STATE (0xffffffffef100003ULL)
+#define VFIO_MIG_FLAG_DEV_DATA_STATE (0xffffffffef100004ULL)
+
static void vfio_migration_region_exit(VFIODevice *vbasedev)
{
VFIOMigration *migration = vbasedev->migration;
@@ -106,6 +117,74 @@ static int vfio_migration_set_state(VFIODevice *vbasedev,
uint32_t state)
return 0;
}
+/* ---------------------------------------------------------------------- */
+
+static int vfio_save_setup(QEMUFile *f, void *opaque)
+{
+ VFIODevice *vbasedev = opaque;
+ VFIOMigration *migration = vbasedev->migration;
+ int ret;
+
+ qemu_put_be64(f, VFIO_MIG_FLAG_DEV_SETUP_STATE);
+
+ if (migration->region.buffer.mmaps) {
+ qemu_mutex_lock_iothread();
+ ret = vfio_region_mmap(&migration->region.buffer);
+ qemu_mutex_unlock_iothread();
+ if (ret) {
+ error_report("%s: Failed to mmap VFIO migration region %d: %s",
+ vbasedev->name, migration->region.index,
+ strerror(-ret));
+ return ret;
+ }
+ }
+
+ if (vbasedev->vm_running) {
+ ret = vfio_migration_set_state(vbasedev,
+ VFIO_DEVICE_STATE_RUNNING | VFIO_DEVICE_STATE_SAVING);
+ if (ret) {
+ error_report("%s: Failed to set state RUNNING and SAVING",
+ vbasedev->name);
+ return ret;
+ }
+ } else {
+ ret = vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_SAVING);
+ if (ret) {
+ error_report("%s: Failed to set state STOP and SAVING",
+ vbasedev->name);
+ return ret;
+ }
+ }
+
+ qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE);
+
+ ret = qemu_file_get_error(f);
+ if (ret) {
+ return ret;
+ }
+
+ trace_vfio_save_setup(vbasedev->name);
+ return 0;
+}
+
+static void vfio_save_cleanup(void *opaque)
+{
+ VFIODevice *vbasedev = opaque;
+ VFIOMigration *migration = vbasedev->migration;
+
+ if (migration->region.buffer.mmaps) {
+ vfio_region_unmap(&migration->region.buffer);
+ }
+ trace_vfio_save_cleanup(vbasedev->name);
+}
+
+static SaveVMHandlers savevm_vfio_handlers = {
+ .save_setup = vfio_save_setup,
+ .save_cleanup = vfio_save_cleanup,
+};
+
+/* ---------------------------------------------------------------------- */
+
static void vfio_vmstate_change(void *opaque, int running, RunState state)
{
VFIODevice *vbasedev = opaque;
@@ -195,7 +274,8 @@ static int vfio_migration_init(VFIODevice *vbasedev,
}
qemu_mutex_init(&vbasedev->migration->lock);
-
+ register_savevm_live(vbasedev->dev, "vfio", -1, 1, &savevm_vfio_handlers,
+ vbasedev);
vbasedev->vm_state = qemu_add_vm_change_state_handler(vfio_vmstate_change,
vbasedev);
diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
index 69503228f20e..4bb43f18f315 100644
--- a/hw/vfio/trace-events
+++ b/hw/vfio/trace-events
@@ -149,3 +149,5 @@ vfio_migration_probe(char *name, uint32_t index) " (%s)
Region %d"
vfio_migration_set_state(char *name, uint32_t state) " (%s) state %d"
vfio_vmstate_change(char *name, int running, const char *reason, uint32_t
dev_state) " (%s) running %d reason %s device state %d"
vfio_migration_state_notifier(char *name, int state) " (%s) state %d"
+vfio_save_setup(char *name) " (%s)"
+vfio_save_cleanup(char *name) " (%s)"
--
2.7.0
- [Qemu-devel] [PATCH v6 01/13] vfio: KABI for migration interface, (continued)
- [Qemu-devel] [PATCH v6 01/13] vfio: KABI for migration interface, Kirti Wankhede, 2019/07/09
- [Qemu-devel] [PATCH v6 03/13] vfio: Add vfio_get_object callback to VFIODeviceOps, Kirti Wankhede, 2019/07/09
- [Qemu-devel] [PATCH v6 09/13] vfio: Add save state functions to SaveVMHandlers, Kirti Wankhede, 2019/07/09
- [Qemu-devel] [PATCH v6 12/13] vfio: Add vfio_listerner_log_sync to mark dirty pages, Kirti Wankhede, 2019/07/09
- [Qemu-devel] [PATCH v6 04/13] vfio: Add save and load functions for VFIO PCI devices, Kirti Wankhede, 2019/07/09
- [Qemu-devel] [PATCH v6 13/13] vfio: Make vfio-pci device migration capable., Kirti Wankhede, 2019/07/09
- [Qemu-devel] [PATCH v6 10/13] vfio: Add load state functions to SaveVMHandlers, Kirti Wankhede, 2019/07/09
- [Qemu-devel] [PATCH v6 05/13] vfio: Add migration region initialization and finalize function, Kirti Wankhede, 2019/07/09
- [Qemu-devel] [PATCH v6 07/13] vfio: Add migration state change notifier, Kirti Wankhede, 2019/07/09
- [Qemu-devel] [PATCH v6 06/13] vfio: Add VM state change handler to know state of VM, Kirti Wankhede, 2019/07/09
- [Qemu-devel] [PATCH v6 08/13] vfio: Register SaveVMHandlers for VFIO device,
Kirti Wankhede <=
- [Qemu-devel] [PATCH v6 02/13] vfio: Add function to unmap VFIO region, Kirti Wankhede, 2019/07/09
- Re: [Qemu-devel] [PATCH v6 00/13] Add migration support for VFIO device, no-reply, 2019/07/09
- Re: [Qemu-devel] [PATCH v6 00/13] Add migration support for VFIO device, no-reply, 2019/07/09