[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/11] vfio: unplug failover primary device before migration
From: |
Jens Freimann |
Subject: |
[PATCH 11/11] vfio: unplug failover primary device before migration |
Date: |
Fri, 18 Oct 2019 22:20:40 +0200 |
As usual block all vfio-pci devices from being migrated, but make an
exception for failover primary devices. This is achieved by setting
unmigratable to 0 but also add a migration blocker for all vfio-pci
devices except failover primary devices. These will be unplugged before
migration happens by the migration handler of the corresponding
virtio-net standby device.
Signed-off-by: Jens Freimann <address@hidden>
---
hw/vfio/pci.c | 31 +++++++++++++++++++++++++------
hw/vfio/pci.h | 1 +
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 12fac39804..a15b83c6b6 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -40,6 +40,9 @@
#include "pci.h"
#include "trace.h"
#include "qapi/error.h"
+#include "migration/blocker.h"
+#include "qemu/option.h"
+#include "qemu/option_int.h"
#define TYPE_VFIO_PCI "vfio-pci"
#define PCI_VFIO(obj) OBJECT_CHECK(VFIOPCIDevice, obj, TYPE_VFIO_PCI)
@@ -2712,12 +2715,26 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
int i, ret;
bool is_mdev;
+ if (!pdev->net_failover_pair_id) {
+ error_setg(&vdev->migration_blocker,
+ "VFIO device doesn't support migration");
+ ret = migrate_add_blocker(vdev->migration_blocker, &err);
+ if (err) {
+ error_propagate(errp, err);
+ goto error;
+ }
+ } else {
+ pdev->qdev.allow_unplug_during_migration = true;
+ }
+
if (!vdev->vbasedev.sysfsdev) {
if (!(~vdev->host.domain || ~vdev->host.bus ||
~vdev->host.slot || ~vdev->host.function)) {
error_setg(errp, "No provided host device");
error_append_hint(errp, "Use -device vfio-pci,host=DDDD:BB:DD.F "
"or -device vfio-pci,sysfsdev=PATH_TO_DEVICE\n");
+ migrate_del_blocker(vdev->migration_blocker);
+ error_free(vdev->migration_blocker);
return;
}
vdev->vbasedev.sysfsdev =
@@ -2729,6 +2746,8 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
if (stat(vdev->vbasedev.sysfsdev, &st) < 0) {
error_setg_errno(errp, errno, "no such host device");
error_prepend(errp, VFIO_MSG_PREFIX, vdev->vbasedev.sysfsdev);
+ migrate_del_blocker(vdev->migration_blocker);
+ error_free(vdev->migration_blocker);
return;
}
@@ -3008,6 +3027,8 @@ out_teardown:
vfio_bars_exit(vdev);
error:
error_prepend(errp, VFIO_MSG_PREFIX, vdev->vbasedev.name);
+ migrate_del_blocker(vdev->migration_blocker);
+ error_free(vdev->migration_blocker);
}
static void vfio_instance_finalize(Object *obj)
@@ -3019,6 +3040,10 @@ static void vfio_instance_finalize(Object *obj)
vfio_bars_finalize(vdev);
g_free(vdev->emulated_config_bits);
g_free(vdev->rom);
+ if (vdev->migration_blocker) {
+ migrate_del_blocker(vdev->migration_blocker);
+ error_free(vdev->migration_blocker);
+ }
/*
* XXX Leaking igd_opregion is not an oversight, we can't remove the
* fw_cfg entry therefore leaking this allocation seems like the safest
@@ -3151,11 +3176,6 @@ static Property vfio_pci_dev_properties[] = {
DEFINE_PROP_END_OF_LIST(),
};
-static const VMStateDescription vfio_pci_vmstate = {
- .name = "vfio-pci",
- .unmigratable = 1,
-};
-
static void vfio_pci_dev_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
@@ -3163,7 +3183,6 @@ static void vfio_pci_dev_class_init(ObjectClass *klass,
void *data)
dc->reset = vfio_pci_reset;
dc->props = vfio_pci_dev_properties;
- dc->vmsd = &vfio_pci_vmstate;
dc->desc = "VFIO-based PCI device assignment";
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
pdc->realize = vfio_realize;
diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
index 834a90d646..b329d50338 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -168,6 +168,7 @@ typedef struct VFIOPCIDevice {
bool no_vfio_ioeventfd;
bool enable_ramfb;
VFIODisplay *dpy;
+ Error *migration_blocker;
} VFIOPCIDevice;
uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len);
--
2.21.0
- [PATCH 03/11] pci: mark devices partially unplugged, (continued)
- [PATCH 03/11] pci: mark devices partially unplugged, Jens Freimann, 2019/10/18
- [PATCH 04/11] pci: mark device having guest unplug request pending, Jens Freimann, 2019/10/18
- [PATCH 05/11] qapi: add unplug primary event, Jens Freimann, 2019/10/18
- [PATCH 06/11] qapi: add failover negotiated event, Jens Freimann, 2019/10/18
- [PATCH 07/11] migration: allow unplug during migration for failover devices, Jens Freimann, 2019/10/18
- [PATCH 08/11] migration: add new migration state wait-unplug, Jens Freimann, 2019/10/18
- [PATCH 09/11] libqos: tolerate wait-unplug migration state, Jens Freimann, 2019/10/18
- [PATCH 10/11] net/virtio: add failover support, Jens Freimann, 2019/10/18
- [PATCH 11/11] vfio: unplug failover primary device before migration,
Jens Freimann <=
- Re: [PATCH v4 0/11] add failover feature for assigned network devices, no-reply, 2019/10/19
- Re: [PATCH v4 0/11] add failover feature for assigned network devices, no-reply, 2019/10/19
- Re: [PATCH v4 0/11] add failover feature for assigned network devices, Cornelia Huck, 2019/10/21