Re: [PATCH for-8.2 4/6] vfio/migration: Refactor PRE_COPY and RUNNING state checks

[Cédric Le Goater]

On 7/16/23 10:15, Avihai Horon wrote:

From: Joao Martins <joao.m.mart...@oracle.com>

Move the PRE_COPY and RUNNING state checks to helper functions.

This is in preparation for adding P2P VFIO migration support, where
these helpers will also test for PRE_COPY_P2P and RUNNING_P2P states.

Signed-off-by: Joao Martins <joao.m.mart...@oracle.com>
Signed-off-by: Avihai Horon <avih...@nvidia.com>

Reviewed-by: Cédric Le Goater <c...@redhat.com>

Thanks,

C.

---
  include/hw/vfio/vfio-common.h |  2 ++
  hw/vfio/common.c              | 22 ++++++++++++++++++----
  hw/vfio/migration.c           | 10 ++++------
  3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index da43d27352..e9b8954595 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -230,6 +230,8 @@ void vfio_unblock_multiple_devices_migration(void);
  bool vfio_viommu_preset(VFIODevice *vbasedev);
  int64_t vfio_mig_bytes_transferred(void);
  void vfio_reset_bytes_transferred(void);
+bool vfio_device_state_is_running(VFIODevice *vbasedev);
+bool vfio_device_state_is_precopy(VFIODevice *vbasedev);

#ifdef CONFIG_LINUX

  int vfio_get_region_info(VFIODevice *vbasedev, int index,
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 9aac21abb7..16cf79a76c 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -437,6 +437,20 @@ static void vfio_set_migration_error(int err)
      }
  }

+bool vfio_device_state_is_running(VFIODevice *vbasedev)

+{
+    VFIOMigration *migration = vbasedev->migration;
+
+    return migration->device_state == VFIO_DEVICE_STATE_RUNNING;
+}
+
+bool vfio_device_state_is_precopy(VFIODevice *vbasedev)
+{
+    VFIOMigration *migration = vbasedev->migration;
+
+    return migration->device_state == VFIO_DEVICE_STATE_PRE_COPY;
+}
+
  static bool vfio_devices_all_dirty_tracking(VFIOContainer *container)
  {
      VFIOGroup *group;
@@ -457,8 +471,8 @@ static bool vfio_devices_all_dirty_tracking(VFIOContainer 
*container)
              }

if (vbasedev->pre_copy_dirty_page_tracking == ON_OFF_AUTO_OFF &&

-                (migration->device_state == VFIO_DEVICE_STATE_RUNNING ||
-                 migration->device_state == VFIO_DEVICE_STATE_PRE_COPY)) {
+                (vfio_device_state_is_running(vbasedev) ||
+                 vfio_device_state_is_precopy(vbasedev))) {
                  return false;
              }
          }
@@ -503,8 +517,8 @@ static bool 
vfio_devices_all_running_and_mig_active(VFIOContainer *container)
                  return false;
              }

- if (migration->device_state == VFIO_DEVICE_STATE_RUNNING ||

-                migration->device_state == VFIO_DEVICE_STATE_PRE_COPY) {
+            if (vfio_device_state_is_running(vbasedev) ||
+                vfio_device_state_is_precopy(vbasedev)) {
                  continue;
              } else {
                  return false;
diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index 8acd182a8b..48f9c23cbe 100644
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -411,7 +411,7 @@ static void vfio_state_pending_estimate(void *opaque, 
uint64_t *must_precopy,
      VFIODevice *vbasedev = opaque;
      VFIOMigration *migration = vbasedev->migration;

- if (migration->device_state != VFIO_DEVICE_STATE_PRE_COPY) {

+    if (!vfio_device_state_is_precopy(vbasedev)) {
          return;
      }

@@ -444,7 +444,7 @@ static void vfio_state_pending_exact(void *opaque, uint64_t *must_precopy,

      vfio_query_stop_copy_size(vbasedev, &stop_copy_size);
      *must_precopy += stop_copy_size;

- if (migration->device_state == VFIO_DEVICE_STATE_PRE_COPY) {

+    if (vfio_device_state_is_precopy(vbasedev)) {
          vfio_query_precopy_size(migration);

*must_precopy +=

@@ -459,9 +459,8 @@ static void vfio_state_pending_exact(void *opaque, uint64_t 
*must_precopy,
  static bool vfio_is_active_iterate(void *opaque)
  {
      VFIODevice *vbasedev = opaque;
-    VFIOMigration *migration = vbasedev->migration;

- return migration->device_state == VFIO_DEVICE_STATE_PRE_COPY;

+    return vfio_device_state_is_precopy(vbasedev);
  }

static int vfio_save_iterate(QEMUFile *f, void *opaque)

@@ -656,7 +655,6 @@ static const SaveVMHandlers savevm_vfio_handlers = {
  static void vfio_vmstate_change(void *opaque, bool running, RunState state)
  {
      VFIODevice *vbasedev = opaque;
-    VFIOMigration *migration = vbasedev->migration;
      enum vfio_device_mig_state new_state;
      int ret;

@@ -664,7 +662,7 @@ static void vfio_vmstate_change(void *opaque, bool running, RunState state)

          new_state = VFIO_DEVICE_STATE_RUNNING;
      } else {
          new_state =
-            (migration->device_state == VFIO_DEVICE_STATE_PRE_COPY &&
+            (vfio_device_state_is_precopy(vbasedev) &&
               (state == RUN_STATE_FINISH_MIGRATE || state == 
RUN_STATE_PAUSED)) ?
                  VFIO_DEVICE_STATE_STOP_COPY :
                  VFIO_DEVICE_STATE_STOP;