Skip to contentSkip to conversation

vfio/migration: Make VFIO migration non-experimental

PATCH In review Avihai Horon 5 participants 10 messages Jun 28, 2023 – Jun 29, 2023

lore
Share & tools
lore
#0 lore raw

v2 cover vfio/migration: Make VFIO migration non-experimental

Hello,

The major parts of VFIO migration are supported today in QEMU. This includes basic VFIO migration, device dirty page tracking and precopy support. Thus, at this point in time, it seems appropriate to make VFIO migration non-experimental.

This short series (which is based on the precopy series [1]) does that and also adds a few improvements:
- Patch #1 resets bytes_transferred counter properly.
- Patch #2 cleans up the VFIO migration realize flow and makes VFIO migration non-experimental.

Note that Zhenzhong's series [2] fixes additional bugs and further cleans the VFIO migration realize flow.

Changes from v1 [3]:
* Dropped patch #1 as it's an optimization. (Cedric)
* Added Fixes tag to patch #2. (Cedric)
* Made VFIO device realization fail if migration is not supported and enable_migration is ON. (Cedric)
* Kept the error message of errno == ENOTTY case as it was in vfio_migration_query_flags(). (Cedric)
* Added a warn when enable_migration is ON and device dirty tracking is not supported. (Alex)
* Renamed trace_vfio_migration_probe() to
* trace_vfio_migration_realize().

Thanks.

[1]
https://lore.kernel.org/qemu-devel/[email protected]/

[2]
https://lore.kernel.org/qemu-devel/[email protected]/

[3]
https://lore.kernel.org/qemu-devel/[email protected]/

Avihai Horon (2):
vfio/migration: Reset bytes_transferred properly vfio/migration: Make VFIO migration non-experimental

 include/hw/vfio/vfio-common.h |  7 +--
 migration/migration.h         |  1 +
 hw/vfio/common.c              | 16 ++++++-
 hw/vfio/migration.c           | 85 ++++++++++++++++++++++++-----------
 hw/vfio/pci.c                 |  4 +-
 migration/migration.c         |  1 +
 migration/savevm.c            |  1 +
 migration/target.c            | 17 ++++++-
 hw/vfio/trace-events          |  2 +-
 9 files changed, 97 insertions(+), 37 deletions(-)
Signature · 1 line
2.26.3
#1 lore raw

PATCH v2 1/2 vfio/migration: Reset bytes_transferred properly

Currently, VFIO bytes_transferred is not reset properly:
1. bytes_transferred is not reset after a VM snapshot (so a migration following a snapshot will report incorrect value).
2. bytes_transferred is a single counter for all VFIO devices, however upon migration failure it is reset multiple times, by each VFIO device.

Fix it by introducing a new function vfio_reset_bytes_transferred() and calling it during migration and snapshot start.

Remove existing bytes_transferred reset in VFIO migration state notifier, which is not needed anymore.

Fixes 3710586caa5d ("qapi: Add VFIO devices migration stats in Migration stats")
---
 include/hw/vfio/vfio-common.h |  1 +
 migration/migration.h         |  1 +
 hw/vfio/migration.c           |  6 +++++-
 migration/migration.c         |  1 +
 migration/savevm.c            |  1 +
 migration/target.c            | 17 +++++++++++++++--
 6 files changed, 24 insertions(+), 3 deletions(-)
include/hw/vfio/vfio-common.h +1 -0
index 3dc5f2104c..b4c28f318f 100644
@@ -228,6 +228,7 @@ int vfio_block_multiple_devices_migration(Error **errp);
 void vfio_unblock_multiple_devices_migration(void);
 int vfio_block_giommu_migration(Error **errp);
 int64_t vfio_mig_bytes_transferred(void);
+void vfio_reset_bytes_transferred(void);
 
 #ifdef CONFIG_LINUX
 int vfio_get_region_info(VFIODevice *vbasedev, int index,
migration/migration.h +1 -0
index c859a0d35e..a80b22b703 100644
@@ -514,6 +514,7 @@ bool migration_rate_limit(void);
 void migration_cancel(const Error *error);
 
 void populate_vfio_info(MigrationInfo *info);
+void reset_vfio_bytes_transferred(void);
 void postcopy_temp_page_reset(PostcopyTmpPage *tmp_page);
 
 #endif
hw/vfio/migration.c +5 -1
index acbf0bb7ab..7cf143926c 100644
@@ -697,7 +697,6 @@ static void vfio_migration_state_notifier(Notifier *notifier, void *data)
     case MIGRATION_STATUS_CANCELLING:
     case MIGRATION_STATUS_CANCELLED:
     case MIGRATION_STATUS_FAILED:
-        bytes_transferred = 0;
         /*
          * If setting the device in RUNNING state fails, the device should
          * be reset. To do so, use ERROR state as a recover state.
@@ -818,6 +817,11 @@ int64_t vfio_mig_bytes_transferred(void)
     return bytes_transferred;
 }
 
+void vfio_reset_bytes_transferred(void)
+{
+    bytes_transferred = 0;
+}
+
 int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)
 {
     int ret = -ENOTSUP;
migration/migration.c +1 -0
index 7653787f74..096e8191d1 100644
@@ -1628,6 +1628,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
      */
     memset(&mig_stats, 0, sizeof(mig_stats));
     memset(&compression_counters, 0, sizeof(compression_counters));
+    reset_vfio_bytes_transferred();
 
     return true;
 }
migration/savevm.c +1 -0
index cdf4793924..95c2abf47c 100644
@@ -1622,6 +1622,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
     migrate_init(ms);
     memset(&mig_stats, 0, sizeof(mig_stats));
     memset(&compression_counters, 0, sizeof(compression_counters));
+    reset_vfio_bytes_transferred();
     ms->to_dst_file = f;
 
     qemu_mutex_unlock_iothread();
migration/target.c +15 -2
index 00ca007f97..f39c9a8d88 100644
@@ -14,12 +14,25 @@
 #include "hw/vfio/vfio-common.h"
 #endif
 
+#ifdef CONFIG_VFIO
 void populate_vfio_info(MigrationInfo *info)
 {
-#ifdef CONFIG_VFIO
     if (vfio_mig_active()) {
         info->vfio = g_malloc0(sizeof(*info->vfio));
         info->vfio->transferred = vfio_mig_bytes_transferred();
     }
-#endif
 }
+
+void reset_vfio_bytes_transferred(void)
+{
+    vfio_reset_bytes_transferred();
+}
+#else
+void populate_vfio_info(MigrationInfo *info)
+{
+}
+
+void reset_vfio_bytes_transferred(void)
+{
+}
+#endif
Signature · 1 line
2.26.3
Reviewed-by on v2 1/2
#2 lore raw

Re: [PATCH v2 1/2] vfio/migration: Reset bytes_transferred properly

Quoted 7 lines · Avihai Horon

Currently, VFIO bytes_transferred is not reset properly:
1. bytes_transferred is not reset after a VM snapshot (so a migration following a snapshot will report incorrect value).
2. bytes_transferred is a single counter for all VFIO devices, however upon migration failure it is reset multiple times, by each VFIO device.

Quoted 8 lines

Fix it by introducing a new function vfio_reset_bytes_transferred() and calling it during migration and snapshot start.

Remove existing bytes_transferred reset in VFIO migration state notifier, which is not needed anymore.

Fixes 3710586caa5d ("qapi: Add VFIO devices migration stats in Migration stats")

Thanks,

C.

Quoted 113 lines
---
  include/hw/vfio/vfio-common.h |  1 +
  migration/migration.h         |  1 +
  hw/vfio/migration.c           |  6 +++++-
  migration/migration.c         |  1 +
  migration/savevm.c            |  1 +
  migration/target.c            | 17 +++++++++++++++--
  6 files changed, 24 insertions(+), 3 deletions(-)
include/hw/vfio/vfio-common.h +1 -0
index 3dc5f2104c..b4c28f318f 100644
@@ -228,6 +228,7 @@ int vfio_block_multiple_devices_migration(Error **errp);
  void vfio_unblock_multiple_devices_migration(void);
  int vfio_block_giommu_migration(Error **errp);
  int64_t vfio_mig_bytes_transferred(void);
+void vfio_reset_bytes_transferred(void);
 
  #ifdef CONFIG_LINUX
  int vfio_get_region_info(VFIODevice *vbasedev, int index,
migration/migration.h +1 -0
index c859a0d35e..a80b22b703 100644
@@ -514,6 +514,7 @@ bool migration_rate_limit(void);
  void migration_cancel(const Error *error);
 
  void populate_vfio_info(MigrationInfo *info);
+void reset_vfio_bytes_transferred(void);
  void postcopy_temp_page_reset(PostcopyTmpPage *tmp_page);
 
  #endif
hw/vfio/migration.c +5 -1
index acbf0bb7ab..7cf143926c 100644
@@ -697,7 +697,6 @@ static void vfio_migration_state_notifier(Notifier *notifier, void *data)
      case MIGRATION_STATUS_CANCELLING:
      case MIGRATION_STATUS_CANCELLED:
      case MIGRATION_STATUS_FAILED:
-        bytes_transferred = 0;
          /*
           * If setting the device in RUNNING state fails, the device should
           * be reset. To do so, use ERROR state as a recover state.
@@ -818,6 +817,11 @@ int64_t vfio_mig_bytes_transferred(void)
      return bytes_transferred;
  }
 
+void vfio_reset_bytes_transferred(void)
+{
+    bytes_transferred = 0;
+}
+
  int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)
  {
      int ret = -ENOTSUP;
migration/migration.c +1 -0
index 7653787f74..096e8191d1 100644
@@ -1628,6 +1628,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
       */
      memset(&mig_stats, 0, sizeof(mig_stats));
      memset(&compression_counters, 0, sizeof(compression_counters));
+    reset_vfio_bytes_transferred();
 
      return true;
  }
migration/savevm.c +1 -0
index cdf4793924..95c2abf47c 100644
@@ -1622,6 +1622,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
      migrate_init(ms);
      memset(&mig_stats, 0, sizeof(mig_stats));
      memset(&compression_counters, 0, sizeof(compression_counters));
+    reset_vfio_bytes_transferred();
      ms->to_dst_file = f;
 
      qemu_mutex_unlock_iothread();
migration/target.c +15 -2
index 00ca007f97..f39c9a8d88 100644
@@ -14,12 +14,25 @@
  #include "hw/vfio/vfio-common.h"
  #endif
 
+#ifdef CONFIG_VFIO
  void populate_vfio_info(MigrationInfo *info)
  {
-#ifdef CONFIG_VFIO
      if (vfio_mig_active()) {
          info->vfio = g_malloc0(sizeof(*info->vfio));
          info->vfio->transferred = vfio_mig_bytes_transferred();
      }
-#endif
  }
+
+void reset_vfio_bytes_transferred(void)
+{
+    vfio_reset_bytes_transferred();
+}
+#else
+void populate_vfio_info(MigrationInfo *info)
+{
+}
+
+void reset_vfio_bytes_transferred(void)
+{
+}
+#endif
#3 lore raw

PATCH v2 2/2 vfio/migration: Make VFIO migration non-experimental

In reply to Avihai Horon

The major parts of VFIO migration are supported today in QEMU. This includes basic VFIO migration, device dirty page tracking and precopy support.

Thus, at this point in time, it seems appropriate to make VFIO migration
non-experimental: remove the x prefix from enable_migration property, change it to ON_OFF_AUTO and let the default value be AUTO.

In addition, make the following adjustments:
1. When enable_migration is ON and migration is not supported, fail VFIO device realization.
2. When enable_migration is AUTO (i.e., not explicitly enabled), require device dirty tracking support. This is because device dirty tracking is currently the only method to do dirty page tracking, which is essential for migrating in a reasonable downtime. Setting enable_migration to ON will not require device dirty tracking.
3. Make migration error and blocker messages more elaborate.
4. Remove error prints in vfio_migration_query_flags().
5. Rename trace_vfio_migration_probe() to trace_vfio_migration_realize().

---
 include/hw/vfio/vfio-common.h |  6 +--
 hw/vfio/common.c              | 16 ++++++-
 hw/vfio/migration.c           | 79 +++++++++++++++++++++++------------
 hw/vfio/pci.c                 |  4 +-
 hw/vfio/trace-events          |  2 +-
 5 files changed, 73 insertions(+), 34 deletions(-)
include/hw/vfio/vfio-common.h +3 -3
index b4c28f318f..0ded0e73e2 100644
@@ -139,7 +139,7 @@ typedef struct VFIODevice {
     bool needs_reset;
     bool no_mmap;
     bool ram_block_discard_allowed;
-    bool enable_migration;
+    OnOffAuto enable_migration;
     VFIODeviceOps *ops;
     unsigned int num_irqs;
     unsigned int num_regions;
@@ -224,9 +224,9 @@ typedef QLIST_HEAD(VFIOGroupList, VFIOGroup) VFIOGroupList;
 extern VFIOGroupList vfio_group_list;
 
 bool vfio_mig_active(void);
-int vfio_block_multiple_devices_migration(Error **errp);
+int vfio_block_multiple_devices_migration(VFIODevice *vbasedev, Error **errp);
 void vfio_unblock_multiple_devices_migration(void);
-int vfio_block_giommu_migration(Error **errp);
+int vfio_block_giommu_migration(VFIODevice *vbasedev, Error **errp);
 int64_t vfio_mig_bytes_transferred(void);
 void vfio_reset_bytes_transferred(void);
 
hw/vfio/common.c +14 -2
index 25801de173..8c73f84581 100644
@@ -381,7 +381,7 @@ static unsigned int vfio_migratable_device_num(void)
     return device_num;
 }
 
-int vfio_block_multiple_devices_migration(Error **errp)
+int vfio_block_multiple_devices_migration(VFIODevice *vbasedev, Error **errp)
 {
     int ret;
 
@@ -390,6 +390,12 @@ int vfio_block_multiple_devices_migration(Error **errp)
         return 0;
     }
 
+    if (vbasedev->enable_migration == ON_OFF_AUTO_ON) {
+        error_setg(errp, "Migration is currently not supported with multiple "
+                         "VFIO devices");
+        return -EINVAL;
+    }
+
     error_setg(&multiple_devices_migration_blocker,
                "Migration is currently not supported with multiple "
                "VFIO devices");
@@ -427,7 +433,7 @@ static bool vfio_viommu_preset(void)
     return false;
 }
 
-int vfio_block_giommu_migration(Error **errp)
+int vfio_block_giommu_migration(VFIODevice *vbasedev, Error **errp)
 {
     int ret;
 
@@ -436,6 +442,12 @@ int vfio_block_giommu_migration(Error **errp)
         return 0;
     }
 
+    if (vbasedev->enable_migration == ON_OFF_AUTO_ON) {
+        error_setg(errp,
+                   "Migration is currently not supported with vIOMMU enabled");
+        return -EINVAL;
+    }
+
     error_setg(&giommu_migration_blocker,
                "Migration is currently not supported with vIOMMU enabled");
     ret = migrate_add_blocker(giommu_migration_blocker, errp);
hw/vfio/migration.c +53 -26

113 lines not on this page · raw message

hw/vfio/pci.c +2 -2
index 73874a94de..48584e3b01 100644
@@ -3347,8 +3347,8 @@ static Property vfio_pci_dev_properties[] = {
                     VFIO_FEATURE_ENABLE_REQ_BIT, true),
     DEFINE_PROP_BIT("x-igd-opregion", VFIOPCIDevice, features,
                     VFIO_FEATURE_ENABLE_IGD_OPREGION_BIT, false),
-    DEFINE_PROP_BOOL("x-enable-migration", VFIOPCIDevice,
-                     vbasedev.enable_migration, false),
+    DEFINE_PROP_ON_OFF_AUTO("enable-migration", VFIOPCIDevice,
+                            vbasedev.enable_migration, ON_OFF_AUTO_AUTO),
     DEFINE_PROP_BOOL("x-no-mmap", VFIOPCIDevice, vbasedev.no_mmap, false),
     DEFINE_PROP_BOOL("x-balloon-allowed", VFIOPCIDevice,
                      vbasedev.ram_block_discard_allowed, false),
hw/vfio/trace-events +1 -1
index e328d644d2..ee7509e68e 100644
@@ -155,7 +155,7 @@ vfio_load_cleanup(const char *name) " (%s)"
 vfio_load_device_config_state(const char *name) " (%s)"
 vfio_load_state(const char *name, uint64_t data) " (%s) data 0x%"PRIx64
 vfio_load_state_device_data(const char *name, uint64_t data_size, int ret) " (%s) size 0x%"PRIx64" ret %d"
-vfio_migration_probe(const char *name) " (%s)"
+vfio_migration_realize(const char *name) " (%s)"
 vfio_migration_set_state(const char *name, const char *state) " (%s) state %s"
 vfio_migration_state_notifier(const char *name, const char *state) " (%s) state %s"
 vfio_save_block(const char *name, int data_size) " (%s) data_size %d"
Signature · 1 line
2.26.3
Reviewed-by on v2 2/2
#4 lore raw
Quoted 21 lines · Avihai Horon

The major parts of VFIO migration are supported today in QEMU. This includes basic VFIO migration, device dirty page tracking and precopy support.

Thus, at this point in time, it seems appropriate to make VFIO migration
non-experimental: remove the x prefix from enable_migration property, change it to ON_OFF_AUTO and let the default value be AUTO.

In addition, make the following adjustments:
1. When enable_migration is ON and migration is not supported, fail VFIO device realization.
2. When enable_migration is AUTO (i.e., not explicitly enabled), require device dirty tracking support. This is because device dirty tracking is currently the only method to do dirty page tracking, which is essential for migrating in a reasonable downtime. Setting enable_migration to ON will not require device dirty tracking.
3. Make migration error and blocker messages more elaborate.
4. Remove error prints in vfio_migration_query_flags().
5. Rename trace_vfio_migration_probe() to trace_vfio_migration_realize().

Quoted 1 line

We should rework the return value of most of the routines called by vfio_migration_realize() and simply use a bool. I think Zhenzhong is working it.

Zhenzhong,

When you resend v4 of the "VFIO migration related refactor and bug fix" series, please rebase on this patch since it should be merged.

Thanks,

C.

Quoted 229 lines
---
  include/hw/vfio/vfio-common.h |  6 +--
  hw/vfio/common.c              | 16 ++++++-
  hw/vfio/migration.c           | 79 +++++++++++++++++++++++------------
  hw/vfio/pci.c                 |  4 +-
  hw/vfio/trace-events          |  2 +-
  5 files changed, 73 insertions(+), 34 deletions(-)
include/hw/vfio/vfio-common.h +3 -3
index b4c28f318f..0ded0e73e2 100644
@@ -139,7 +139,7 @@ typedef struct VFIODevice {
      bool needs_reset;
      bool no_mmap;
      bool ram_block_discard_allowed;
-    bool enable_migration;
+    OnOffAuto enable_migration;
      VFIODeviceOps *ops;
      unsigned int num_irqs;
      unsigned int num_regions;
@@ -224,9 +224,9 @@ typedef QLIST_HEAD(VFIOGroupList, VFIOGroup) VFIOGroupList;
  extern VFIOGroupList vfio_group_list;
 
  bool vfio_mig_active(void);
-int vfio_block_multiple_devices_migration(Error **errp);
+int vfio_block_multiple_devices_migration(VFIODevice *vbasedev, Error **errp);
  void vfio_unblock_multiple_devices_migration(void);
-int vfio_block_giommu_migration(Error **errp);
+int vfio_block_giommu_migration(VFIODevice *vbasedev, Error **errp);
  int64_t vfio_mig_bytes_transferred(void);
  void vfio_reset_bytes_transferred(void);
 
hw/vfio/common.c +14 -2
index 25801de173..8c73f84581 100644
@@ -381,7 +381,7 @@ static unsigned int vfio_migratable_device_num(void)
      return device_num;
  }
 
-int vfio_block_multiple_devices_migration(Error **errp)
+int vfio_block_multiple_devices_migration(VFIODevice *vbasedev, Error **errp)
  {
      int ret;
 
@@ -390,6 +390,12 @@ int vfio_block_multiple_devices_migration(Error **errp)
          return 0;
      }
 
+    if (vbasedev->enable_migration == ON_OFF_AUTO_ON) {
+        error_setg(errp, "Migration is currently not supported with multiple "
+                         "VFIO devices");
+        return -EINVAL;
+    }
+
      error_setg(&multiple_devices_migration_blocker,
                 "Migration is currently not supported with multiple "
                 "VFIO devices");
@@ -427,7 +433,7 @@ static bool vfio_viommu_preset(void)
      return false;
  }
 
-int vfio_block_giommu_migration(Error **errp)
+int vfio_block_giommu_migration(VFIODevice *vbasedev, Error **errp)
  {
      int ret;
 
@@ -436,6 +442,12 @@ int vfio_block_giommu_migration(Error **errp)
          return 0;
      }
 
+    if (vbasedev->enable_migration == ON_OFF_AUTO_ON) {
+        error_setg(errp,
+                   "Migration is currently not supported with vIOMMU enabled");
+        return -EINVAL;
+    }
+
      error_setg(&giommu_migration_blocker,
                 "Migration is currently not supported with vIOMMU enabled");
      ret = migrate_add_blocker(giommu_migration_blocker, errp);
hw/vfio/migration.c +53 -26
index 7cf143926c..1db7d52ab2 100644
@@ -724,14 +724,6 @@ static int vfio_migration_query_flags(VFIODevice *vbasedev, uint64_t *mig_flags)
      feature->argsz = sizeof(buf);
      feature->flags = VFIO_DEVICE_FEATURE_GET | VFIO_DEVICE_FEATURE_MIGRATION;
      if (ioctl(vbasedev->fd, VFIO_DEVICE_FEATURE, feature)) {
-        if (errno == ENOTTY) {
-            error_report("%s: VFIO migration is not supported in kernel",
-                         vbasedev->name);
-        } else {
-            error_report("%s: Failed to query VFIO migration support, err: %s",
-                         vbasedev->name, strerror(errno));
-        }
-
          return -errno;
      }
 
@@ -810,6 +802,27 @@ static int vfio_migration_init(VFIODevice *vbasedev)
      return 0;
  }
 
+static int vfio_block_migration(VFIODevice *vbasedev, Error *err, Error **errp)
+{
+    int ret;
+
+    if (vbasedev->enable_migration == ON_OFF_AUTO_ON) {
+        error_propagate(errp, err);
+        return -EINVAL;
+    }
+
+    vbasedev->migration_blocker = error_copy(err);
+    error_free(err);
+
+    ret = migrate_add_blocker(vbasedev->migration_blocker, errp);
+    if (ret < 0) {
+        error_free(vbasedev->migration_blocker);
+        vbasedev->migration_blocker = NULL;
+    }
+
+    return ret;
+}
+
  /* ---------------------------------------------------------------------- */
 
  int64_t vfio_mig_bytes_transferred(void)
@@ -824,40 +837,54 @@ void vfio_reset_bytes_transferred(void)
 
  int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)
  {
-    int ret = -ENOTSUP;
+    Error *err = NULL;
+    int ret;
 
-    if (!vbasedev->enable_migration) {
-        goto add_blocker;
+    if (vbasedev->enable_migration == ON_OFF_AUTO_OFF) {
+        error_setg(&err, "%s: Migration is disabled for VFIO device",
+                   vbasedev->name);
+        return vfio_block_migration(vbasedev, err, errp);
      }
 
      ret = vfio_migration_init(vbasedev);
      if (ret) {
-        goto add_blocker;
+        if (ret == -ENOTTY) {
+            error_setg(&err, "%s: VFIO migration is not supported in kernel",
+                       vbasedev->name);
+        } else {
+            error_setg(&err,
+                       "%s: Migration couldn't be initialized for VFIO device, "
+                       "err: %d (%s)",
+                       vbasedev->name, ret, strerror(-ret));
+        }
+
+        return vfio_block_migration(vbasedev, err, errp);
+    }
+
+    if (!vbasedev->dirty_pages_supported) {
+        if (vbasedev->enable_migration == ON_OFF_AUTO_AUTO) {
+            error_setg(&err,
+                       "%s: VFIO device doesn't support device dirty tracking",
+                       vbasedev->name);
+            return vfio_block_migration(vbasedev, err, errp);
+        }
+
+        warn_report("%s: VFIO device doesn't support device dirty tracking",
+                    vbasedev->name);
      }
 
-    ret = vfio_block_multiple_devices_migration(errp);
+    ret = vfio_block_multiple_devices_migration(vbasedev, errp);
      if (ret) {
          return ret;
      }
 
-    ret = vfio_block_giommu_migration(errp);
+    ret = vfio_block_giommu_migration(vbasedev, errp);
      if (ret) {
          return ret;
      }
 
-    trace_vfio_migration_probe(vbasedev->name);
+    trace_vfio_migration_realize(vbasedev->name);
      return 0;
-
-add_blocker:
-    error_setg(&vbasedev->migration_blocker,
-               "VFIO device doesn't support migration");
-
-    ret = migrate_add_blocker(vbasedev->migration_blocker, errp);
-    if (ret < 0) {
-        error_free(vbasedev->migration_blocker);
-        vbasedev->migration_blocker = NULL;
-    }
-    return ret;
  }
 
  void vfio_migration_exit(VFIODevice *vbasedev)
hw/vfio/pci.c +2 -2
index 73874a94de..48584e3b01 100644
@@ -3347,8 +3347,8 @@ static Property vfio_pci_dev_properties[] = {
                      VFIO_FEATURE_ENABLE_REQ_BIT, true),
      DEFINE_PROP_BIT("x-igd-opregion", VFIOPCIDevice, features,
                      VFIO_FEATURE_ENABLE_IGD_OPREGION_BIT, false),
-    DEFINE_PROP_BOOL("x-enable-migration", VFIOPCIDevice,
-                     vbasedev.enable_migration, false),
+    DEFINE_PROP_ON_OFF_AUTO("enable-migration", VFIOPCIDevice,
+                            vbasedev.enable_migration, ON_OFF_AUTO_AUTO),
      DEFINE_PROP_BOOL("x-no-mmap", VFIOPCIDevice, vbasedev.no_mmap, false),
      DEFINE_PROP_BOOL("x-balloon-allowed", VFIOPCIDevice,
                       vbasedev.ram_block_discard_allowed, false),
hw/vfio/trace-events +1 -1
index e328d644d2..ee7509e68e 100644
@@ -155,7 +155,7 @@ vfio_load_cleanup(const char *name) " (%s)"
  vfio_load_device_config_state(const char *name) " (%s)"
  vfio_load_state(const char *name, uint64_t data) " (%s) data 0x%"PRIx64
  vfio_load_state_device_data(const char *name, uint64_t data_size, int ret) " (%s) size 0x%"PRIx64" ret %d"
-vfio_migration_probe(const char *name) " (%s)"
+vfio_migration_realize(const char *name) " (%s)"
  vfio_migration_set_state(const char *name, const char *state) " (%s) state %s"
  vfio_migration_state_notifier(const char *name, const char *state) " (%s) state %s"
  vfio_save_block(const char *name, int data_size) " (%s) data_size %d"
#5 lore raw
Quoted 25 lines · Cédric Le Goater
Quoted 21 lines · Avihai Horon

The major parts of VFIO migration are supported today in QEMU. This includes basic VFIO migration, device dirty page tracking and precopy support.

Thus, at this point in time, it seems appropriate to make VFIO migration
non-experimental: remove the x prefix from enable_migration property, change it to ON_OFF_AUTO and let the default value be AUTO.

In addition, make the following adjustments:
1. When enable_migration is ON and migration is not supported, fail VFIO device realization.
2. When enable_migration is AUTO (i.e., not explicitly enabled), require device dirty tracking support. This is because device dirty tracking is currently the only method to do dirty page tracking, which is essential for migrating in a reasonable downtime. Setting enable_migration to ON will not require device dirty tracking.
3. Make migration error and blocker messages more elaborate.
4. Remove error prints in vfio_migration_query_flags().
5. Rename trace_vfio_migration_probe() to trace_vfio_migration_realize().

Quoted 1 line
Quoted 9 lines

We should rework the return value of most of the routines called by vfio_migration_realize() and simply use a bool. I think Zhenzhong is working it.

Zhenzhong,

When you resend v4 of the "VFIO migration related refactor and bug fix" series, please rebase on this patch since it should be merged.

This, and his switchover-ack series from Avihai that preceeds it.

Perhaps it might be easier to point to your tree:branch where you are queueing all the patches?

#6 lore raw
Quoted 32 lines · Joao Martins
Quoted 31 lines · Cédric Le Goater
Quoted 21 lines · Avihai Horon

The major parts of VFIO migration are supported today in QEMU. This includes basic VFIO migration, device dirty page tracking and precopy support.

Thus, at this point in time, it seems appropriate to make VFIO migration
non-experimental: remove the x prefix from enable_migration property, change it to ON_OFF_AUTO and let the default value be AUTO.

In addition, make the following adjustments:
1. When enable_migration is ON and migration is not supported, fail VFIO device realization.
2. When enable_migration is AUTO (i.e., not explicitly enabled), require device dirty tracking support. This is because device dirty tracking is currently the only method to do dirty page tracking, which is essential for migrating in a reasonable downtime. Setting enable_migration to ON will not require device dirty tracking.
3. Make migration error and blocker messages more elaborate.
4. Remove error prints in vfio_migration_query_flags().
5. Rename trace_vfio_migration_probe() to trace_vfio_migration_realize().

Quoted 1 line

We should rework the return value of most of the routines called by vfio_migration_realize() and simply use a bool. I think Zhenzhong is working it.

Zhenzhong,

Quoted 9 lines
Quoted 3 lines

When you resend v4 of the "VFIO migration related refactor and bug fix" series, please rebase on this patch since it should be merged.

This, and his switchover-ack series from Avihai that preceeds it.

Perhaps it might be easier to point to your tree:branch where you are queueing all the patches?

Sure.

I track QEMU patches for various subsystems under :

https://github.com/legoater/qemu

VFIO candidates are under :

https://github.com/legoater/qemu/tree/vfio-8.1

This is a wip tree, patches come and go. It contains the VFIO patches of the day/week, good for testing new ideas and checking CI.

The vfio-next branch contains what I am 90% sure to send upstream :

https://github.com/legoater/qemu/tree/vfio-next

which I rebase on master and update with new proposals and new tags.

Beware, both are git push forced branches. Only master is not.

Cheers,

C.

#7 lore raw
Quoted 74 lines

-----Original Message-----
From: Cédric Le Goater <[email protected]>
Sent: Thursday, June 29, 2023 12:04 AM
To: Martins, Joao <[email protected]>; Avihai Horon <[email protected]>
Cc: Alex Williamson <[email protected]>; Juan Quintela <[email protected]>; Peter Xu <[email protected]>; Leonardo Bras <[email protected]>; Duan, Zhenzhong <[email protected]>; Yishai Hadas <[email protected]>; Jason Gunthorpe <[email protected]>; Maor Gottlieb <[email protected]>; Kirti Wankhede <[email protected]>; Tarun Gupta <[email protected]>; qemu- [email protected]
Subject: Re: [PATCH v2 2/2] vfio/migration: Make VFIO migration non- experimental

Quoted 37 lines · Joao Martins
Quoted 36 lines · Cédric Le Goater
Quoted 26 lines · Avihai Horon

The major parts of VFIO migration are supported today in QEMU. This includes basic VFIO migration, device dirty page tracking and precopy support.

Thus, at this point in time, it seems appropriate to make VFIO migration
non-experimental: remove the x prefix from enable_migration property, change it to ON_OFF_AUTO and let the default value be AUTO.

In addition, make the following adjustments:
1. When enable_migration is ON and migration is not supported, fail VFIO
    device realization.
2. When enable_migration is AUTO (i.e., not explicitly enabled), require
    device dirty tracking support. This is because device dirty
tracking
    is currently the only method to do dirty page tracking, which
is
    essential for migrating in a reasonable downtime. Setting enable_migration to ON will not require device dirty tracking.
3. Make migration error and blocker messages more elaborate.
4. Remove error prints in vfio_migration_query_flags().
5. Rename trace_vfio_migration_probe() to trace_vfio_migration_realize().

Quoted 1 line

We should rework the return value of most of the routines called by vfio_migration_realize() and simply use a bool. I think Zhenzhong is working it.

Zhenzhong,

Quoted 9 lines
Quoted 3 lines

When you resend v4 of the "VFIO migration related refactor and bug fix" series, please rebase on this patch since it should be merged.

This, and his switchover-ack series from Avihai that preceeds it.

Perhaps it might be easier to point to your tree:branch where you are queueing all the patches?

Sure.

I track QEMU patches for various subsystems under :

https://github.com/legoater/qemu

VFIO candidates are under :

https://github.com/legoater/qemu/tree/vfio-8.1

Quoted 7 lines

This is a wip tree, patches come and go. It contains the VFIO patches of the day/week, good for testing new ideas and checking CI.

The vfio-next branch contains what I am 90% sure to send upstream :

https://github.com/legoater/qemu/tree/vfio-next

Great, I'll rebase on this branch, thanks for sharing.

Regards
Zhenzhong

Reviewed-by on v2 2/2
#8 lore raw
In reply to Avihai Horon
Quoted 21 lines · Avihai Horon

The major parts of VFIO migration are supported today in QEMU. This includes basic VFIO migration, device dirty page tracking and precopy support.

Thus, at this point in time, it seems appropriate to make VFIO migration
non-experimental: remove the x prefix from enable_migration property, change it to ON_OFF_AUTO and let the default value be AUTO.

In addition, make the following adjustments:
1. When enable_migration is ON and migration is not supported, fail VFIO device realization.
2. When enable_migration is AUTO (i.e., not explicitly enabled), require device dirty tracking support. This is because device dirty tracking is currently the only method to do dirty page tracking, which is essential for migrating in a reasonable downtime. Setting enable_migration to ON will not require device dirty tracking.
3. Make migration error and blocker messages more elaborate.
4. Remove error prints in vfio_migration_query_flags().
5. Rename trace_vfio_migration_probe() to trace_vfio_migration_realize().

Quoted 1 line
Reviewed-by on the v2 series
#9 lore raw
In reply to Avihai Horon
Quoted 44 lines · On Wed, 28 Jun 2023 10:31:10 +0300 Avihai Horon <[email protected]> wrote:

Hello,

The major parts of VFIO migration are supported today in QEMU. This includes basic VFIO migration, device dirty page tracking and precopy support. Thus, at this point in time, it seems appropriate to make VFIO migration non-experimental.

This short series (which is based on the precopy series [1]) does that and also adds a few improvements:
- Patch #1 resets bytes_transferred counter properly.
- Patch #2 cleans up the VFIO migration realize flow and makes VFIO migration non-experimental.

Note that Zhenzhong's series [2] fixes additional bugs and further cleans the VFIO migration realize flow.

Changes from v1 [3]:
* Dropped patch #1 as it's an optimization. (Cedric)
* Added Fixes tag to patch #2. (Cedric)
* Made VFIO device realization fail if migration is not supported and enable_migration is ON. (Cedric)
* Kept the error message of errno == ENOTTY case as it was in vfio_migration_query_flags(). (Cedric)
* Added a warn when enable_migration is ON and device dirty tracking is not supported. (Alex)
* Renamed trace_vfio_migration_probe() to
* trace_vfio_migration_realize().

Thanks.

[1]
https://lore.kernel.org/qemu-devel/[email protected]/

[2]
https://lore.kernel.org/qemu-devel/[email protected]/

[3]
https://lore.kernel.org/qemu-devel/[email protected]/

Avihai Horon (2):
vfio/migration: Reset bytes_transferred properly vfio/migration: Make VFIO migration non-experimental

Quoted 11 lines
 include/hw/vfio/vfio-common.h |  7 +--
 migration/migration.h         |  1 +
 hw/vfio/common.c              | 16 ++++++-
 hw/vfio/migration.c           | 85 ++++++++++++++++++++++++-----------
 hw/vfio/pci.c                 |  4 +-
 migration/migration.c         |  1 +
 migration/savevm.c            |  1 +
 migration/target.c            | 17 ++++++-
 hw/vfio/trace-events          |  2 +-
 9 files changed, 97 insertions(+), 37 deletions(-)