qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Alex Williamson <alex.williamson@redhat.com>
To: qemu-devel@nongnu.org
Cc: alex.williamson@redhat.com, avihaih@nvidia.com, clg@redhat.com,
	joao.m.martins@oracle.com
Subject: [PULL 13/17] vfio/migration: Block migration with vIOMMU
Date: Tue, 07 Mar 2023 11:53:33 -0700	[thread overview]
Message-ID: <167821521373.619792.5140950265708875301.stgit@omen> (raw)
In-Reply-To: <167821508699.619792.1719671327865445814.stgit@omen>

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

Migrating with vIOMMU will require either tracking maximum
IOMMU supported address space (e.g. 39/48 address width on Intel)
or range-track current mappings and dirty track the new ones
post starting dirty tracking. This will be done as a separate
series, so add a live migration blocker until that is fixed.

Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Link: https://lore.kernel.org/r/20230307125450.62409-14-joao.m.martins@oracle.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
 hw/vfio/common.c              |   46 +++++++++++++++++++++++++++++++++++++++++
 hw/vfio/migration.c           |    5 ++++
 hw/vfio/pci.c                 |    1 +
 include/hw/vfio/vfio-common.h |    2 ++
 4 files changed, 54 insertions(+)

diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 334c62585829..539246e332b0 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -362,6 +362,7 @@ bool vfio_mig_active(void)
 }
 
 static Error *multiple_devices_migration_blocker;
+static Error *giommu_migration_blocker;
 
 static unsigned int vfio_migratable_device_num(void)
 {
@@ -413,6 +414,51 @@ void vfio_unblock_multiple_devices_migration(void)
     multiple_devices_migration_blocker = NULL;
 }
 
+static bool vfio_viommu_preset(void)
+{
+    VFIOAddressSpace *space;
+
+    QLIST_FOREACH(space, &vfio_address_spaces, list) {
+        if (space->as != &address_space_memory) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+int vfio_block_giommu_migration(Error **errp)
+{
+    int ret;
+
+    if (giommu_migration_blocker ||
+        !vfio_viommu_preset()) {
+        return 0;
+    }
+
+    error_setg(&giommu_migration_blocker,
+               "Migration is currently not supported with vIOMMU enabled");
+    ret = migrate_add_blocker(giommu_migration_blocker, errp);
+    if (ret < 0) {
+        error_free(giommu_migration_blocker);
+        giommu_migration_blocker = NULL;
+    }
+
+    return ret;
+}
+
+void vfio_unblock_giommu_migration(void)
+{
+    if (!giommu_migration_blocker ||
+        vfio_viommu_preset()) {
+        return;
+    }
+
+    migrate_del_blocker(giommu_migration_blocker);
+    error_free(giommu_migration_blocker);
+    giommu_migration_blocker = NULL;
+}
+
 static void vfio_set_migration_error(int err)
 {
     MigrationState *ms = migrate_get_current();
diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index a2c3d9bade7f..776fd2d7cdf3 100644
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -634,6 +634,11 @@ int vfio_migration_probe(VFIODevice *vbasedev, Error **errp)
         return ret;
     }
 
+    ret = vfio_block_giommu_migration(errp);
+    if (ret) {
+        return ret;
+    }
+
     trace_vfio_migration_probe(vbasedev->name);
     return 0;
 
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 939dcc3d4a9e..30a271eab38c 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3185,6 +3185,7 @@ static void vfio_instance_finalize(Object *obj)
      */
     vfio_put_device(vdev);
     vfio_put_group(group);
+    vfio_unblock_giommu_migration();
 }
 
 static void vfio_exitfn(PCIDevice *pdev)
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 9551d2d43025..009bec34c4bc 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -222,6 +222,8 @@ extern VFIOGroupList vfio_group_list;
 bool vfio_mig_active(void);
 int vfio_block_multiple_devices_migration(Error **errp);
 void vfio_unblock_multiple_devices_migration(void);
+int vfio_block_giommu_migration(Error **errp);
+void vfio_unblock_giommu_migration(void);
 int64_t vfio_mig_bytes_transferred(void);
 
 #ifdef CONFIG_LINUX




  parent reply	other threads:[~2023-03-07 18:54 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-07 18:52 [PULL 00/17] VFIO updates for 8.0 Alex Williamson
2023-03-07 18:52 ` [PULL 01/17] vfio/common: Fix error reporting in vfio_get_dirty_bitmap() Alex Williamson
2023-03-07 18:52 ` [PULL 02/17] vfio/common: Fix wrong %m usages Alex Williamson
2023-03-07 18:52 ` [PULL 03/17] vfio/common: Abort migration if dirty log start/stop/sync fails Alex Williamson
2023-03-07 18:52 ` [PULL 04/17] vfio/common: Add VFIOBitmap and alloc function Alex Williamson
2023-03-07 18:52 ` [PULL 05/17] vfio/common: Add helper to validate iova/end against hostwin Alex Williamson
2023-03-07 18:52 ` [PULL 06/17] vfio/common: Use a single tracepoint for skipped sections Alex Williamson
2023-03-07 18:52 ` [PULL 07/17] vfio/common: Consolidate skip/invalid section into helper Alex Williamson
2023-03-07 18:53 ` [PULL 08/17] vfio/common: Add helper to consolidate iova/end calculation Alex Williamson
2023-03-07 18:53 ` [PULL 09/17] vfio/common: Record DMA mapped IOVA ranges Alex Williamson
2023-03-07 18:53 ` [PULL 10/17] vfio/common: Add device dirty page tracking start/stop Alex Williamson
2023-03-07 18:53 ` [PULL 11/17] vfio/common: Extract code from vfio_get_dirty_bitmap() to new function Alex Williamson
2023-03-07 18:53 ` [PULL 12/17] vfio/common: Add device dirty page bitmap sync Alex Williamson
2023-03-07 18:53 ` Alex Williamson [this message]
2023-03-07 18:53 ` [PULL 14/17] vfio/migration: Query device dirty page tracking support Alex Williamson
2023-03-07 18:53 ` [PULL 15/17] docs/devel: Document VFIO device dirty page tracking Alex Williamson
2023-03-07 18:53 ` [PULL 16/17] vfio/migration: Rename entry points Alex Williamson
2023-03-07 18:53 ` [PULL 17/17] vfio: Fix vfio_get_dev_region() trace event Alex Williamson
2023-03-09 16:51 ` [PULL 00/17] VFIO updates for 8.0 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=167821521373.619792.5140950265708875301.stgit@omen \
    --to=alex.williamson@redhat.com \
    --cc=avihaih@nvidia.com \
    --cc=clg@redhat.com \
    --cc=joao.m.martins@oracle.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).