[PATCH] hw/vfio: Coalesce repeated PCI_COMMAND memory-decode DMA (re)map for passthrough BARs

[PATCH] hw/vfio: Coalesce repeated PCI_COMMAND memory-decode DMA (re)map for passthrough BARs

[Yang Wencheng]

From: YangWencheng <east.moutain.yang@gmail.com>

A passthrough device's own MMIO/BAR range is registered with the IOMMU
(VFIO_IOMMU_MAP_DMA) when its memory region becomes part of the guest
address space, to support peer-to-peer DMA into that BAR from other
devices. Toggling the guest's PCI_COMMAND memory-decode-enable bit off
and back on -- something PCI enumeration/attribute code does routinely,
sometimes several times for the same device (e.g. disable before
reprogramming a BAR then re-enable, or generic driver probing during
guest OS boot) -- currently tears down and rebuilds this mapping every
single time via vfio_listener_region_del()/region_add(), unconditionally.

For devices with very large BARs this is expensive: mapping a 64GB BAR
into IOMMU page tables measured at ~8.5s per call on this hardware, and
was observed being repeated 3-5 times for the same BAR during a single
guest boot, because nothing changed about the underlying mapping between
the disable and the following re-enable.

Defer the actual VFIO_IOMMU_UNMAP_DMA for "ram device" regions (i.e.
passthrough device BARs used for P2P DMA -- explicitly not regular guest
RAM or RamDiscardManager-backed regions, so migration/ballooning/
virtio-mem are unaffected) instead of issuing it immediately in
region_del(). If a matching region_add() for the exact same region
(same MemoryRegion pointer, iova, size, vaddr, readonly) follows, cancel
the deferred unmap and skip the VFIO_IOMMU_MAP_DMA entirely -- the
host-side mapping was never actually removed, so there is nothing to
redo. A region_add() for anything that doesn't match maps normally, as
before.

Nothing is leaked: any mapping still on the pending list is flushed with
a real unmap in two places -- vfio_container_instance_finalize(), before
the container's fd is closed (VM shutdown / last device in a group removed),
and vfio_bars_finalize(), matched by MemoryRegion pointer to just that
device's own BARs, so a device hot-unplugged while the container stays
alive for other devices can't leave a dangling deferred entry either.

This does not weaken the PCI_COMMAND memory-decode security boundary:
every guest write to PCI_COMMAND is still forwarded synchronously and
unconditionally to the real device's config space in
vfio_pci_write_config() (an entirely separate code path, untouched by
this change), which is what actually gates whether the physical device
claims/responds to transactions targeting its BAR, independent of
whatever the IOMMU's routing table still contains. This change only
avoids redundant bookkeeping of that routing table when nothing about
the mapping has changed.

Signed-off-by: Yangwencheng <yangwencheng@gmail.com>
---
 hw/vfio/container.c              | 53 ++++++++++++++++++++++
 hw/vfio/listener.c               | 76 ++++++++++++++++++++++++++++++++
 hw/vfio/pci.c                    | 11 +++++
 include/hw/vfio/vfio-container.h | 28 ++++++++++++
 4 files changed, 168 insertions(+)

diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index d09a663732..00676cadc9 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -298,6 +298,56 @@ GList *vfio_container_get_iova_ranges(const VFIOContainer *bcontainer)
     return g_list_copy_deep(bcontainer->iova_ranges, copy_iova_range, NULL);
 }
 
+/*
+ * Actually unmap (and free the bookkeeping for) any deferred "ram
+ * device" unmaps still pending on this container. Must be called
+ * before the container's fd is closed/reused, and is safe to call at
+ * any time (e.g. also from a specific device's exit path, to avoid
+ * leaking a mapping if that device is hot-unplugged while the
+ * container otherwise stays alive for other devices).
+ */
+void vfio_flush_pending_ram_device_unmaps(VFIOContainer *bcontainer)
+{
+    VFIOPendingRamDeviceUnmap *pending, *tmp;
+
+    QLIST_FOREACH_SAFE(pending, &bcontainer->pending_ram_device_unmap_list,
+                       next, tmp) {
+        int ret = vfio_container_dma_unmap(bcontainer, pending->iova,
+                                            pending->size, NULL, false);
+        if (ret) {
+            error_report("vfio_container_dma_unmap(%p, 0x%"HWADDR_PRIx", "
+                         "0x%"HWADDR_PRIx") = %d (%s)",
+                         bcontainer, pending->iova, pending->size, ret,
+                         strerror(-ret));
+        }
+        QLIST_REMOVE(pending, next);
+        g_free(pending);
+    }
+}
+
+void vfio_flush_pending_ram_device_unmaps_for_mr(VFIOContainer *bcontainer,
+                                                   MemoryRegion *mr)
+{
+    VFIOPendingRamDeviceUnmap *pending, *tmp;
+
+    QLIST_FOREACH_SAFE(pending, &bcontainer->pending_ram_device_unmap_list,
+                       next, tmp) {
+        if (pending->mr != mr) {
+            continue;
+        }
+        int ret = vfio_container_dma_unmap(bcontainer, pending->iova,
+                                            pending->size, NULL, false);
+        if (ret) {
+            error_report("vfio_container_dma_unmap(%p, 0x%"HWADDR_PRIx", "
+                         "0x%"HWADDR_PRIx") = %d (%s)",
+                         bcontainer, pending->iova, pending->size, ret,
+                         strerror(-ret));
+        }
+        QLIST_REMOVE(pending, next);
+        g_free(pending);
+    }
+}
+
 static void vfio_container_instance_finalize(Object *obj)
 {
     VFIOContainer *bcontainer = VFIO_IOMMU(obj);
@@ -312,6 +362,8 @@ static void vfio_container_instance_finalize(Object *obj)
         g_free(giommu);
     }
 
+    vfio_flush_pending_ram_device_unmaps(bcontainer);
+
     g_list_free_full(bcontainer->iova_ranges, g_free);
 }
 
@@ -325,6 +377,7 @@ static void vfio_container_instance_init(Object *obj)
     bcontainer->iova_ranges = NULL;
     QLIST_INIT(&bcontainer->giommu_list);
     QLIST_INIT(&bcontainer->vrdl_list);
+    QLIST_INIT(&bcontainer->pending_ram_device_unmap_list);
 }
 
 static const TypeInfo types[] = {
diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c
index c19600e980..e6bcfd028e 100644
--- a/hw/vfio/listener.c
+++ b/hw/vfio/listener.c
@@ -49,6 +49,55 @@
  * Device state interfaces
  */
 
+/*
+ * Defer the VFIO_IOMMU_UNMAP_DMA for a "ram device" (passthrough device
+ * MMIO/BAR) region instead of doing it immediately. See the comment on
+ * VFIOPendingRamDeviceUnmap in vfio-container.h for why.
+ */
+static void vfio_defer_ram_device_unmap(VFIOContainer *bcontainer,
+                                        MemoryRegion *mr, hwaddr iova,
+                                        hwaddr size, void *vaddr,
+                                        bool readonly)
+{
+    VFIOPendingRamDeviceUnmap *pending = g_malloc0(sizeof(*pending));
+
+    pending->mr = mr;
+    pending->iova = iova;
+    pending->size = size;
+    pending->vaddr = vaddr;
+    pending->readonly = readonly;
+    QLIST_INSERT_HEAD(&bcontainer->pending_ram_device_unmap_list, pending,
+                      next);
+}
+
+/*
+ * If a deferred unmap exactly matching this (mr, iova, size, vaddr,
+ * readonly) is pending, cancel it (drop it without ever issuing the
+ * VFIO_IOMMU_UNMAP_DMA) and report success -- the caller should skip
+ * mapping, since the host-side mapping was never actually removed.
+ * Returns false if there was no matching pending unmap, in which case
+ * the caller must map normally.
+ */
+static bool vfio_cancel_pending_ram_device_unmap(VFIOContainer *bcontainer,
+                                                 MemoryRegion *mr,
+                                                 hwaddr iova, hwaddr size,
+                                                 void *vaddr, bool readonly)
+{
+    VFIOPendingRamDeviceUnmap *pending;
+
+    QLIST_FOREACH(pending, &bcontainer->pending_ram_device_unmap_list, next) {
+        if (pending->mr == mr && pending->iova == iova &&
+            pending->size == size && pending->vaddr == vaddr &&
+            pending->readonly == readonly) {
+            QLIST_REMOVE(pending, next);
+            g_free(pending);
+            return true;
+        }
+    }
+
+    return false;
+}
+
 
 static bool vfio_log_sync_needed(const VFIOContainer *bcontainer)
 {
@@ -608,6 +657,22 @@ void vfio_container_region_add(VFIOContainer *bcontainer,
                 pgmask + 1);
             return;
         }
+
+        /*
+         * If region_del deferred an identical unmap for this exact region
+         * (same MemoryRegion, iova, size, vaddr, readonly), the underlying
+         * VFIO_IOMMU_MAP_DMA mapping is still live host-side -- cancel the
+         * deferred unmap and skip re-mapping. This is what makes toggling
+         * a passthrough device's PCI_COMMAND memory-decode bit off and
+         * back on (which normal PCI enumeration/attribute code does,
+         * sometimes several times per device) cheap instead of repeating
+         * a possibly multi-second VFIO_IOMMU_MAP_DMA for huge BARs.
+         */
+        if (vfio_cancel_pending_ram_device_unmap(bcontainer, section->mr,
+                                                 iova, int128_get64(llsize),
+                                                 vaddr, section->readonly)) {
+            return;
+        }
     }
 
     if (memory_region_skip_iommu_map(section->mr)) {
@@ -714,6 +779,17 @@ static void vfio_listener_region_del(MemoryListener *listener,
 
         pgmask = (1ULL << ctz64(bcontainer->pgsizes)) - 1;
         try_unmap = !((iova & pgmask) || (int128_get64(llsize) & pgmask));
+
+        if (try_unmap) {
+            void *vaddr = memory_region_get_ram_ptr(section->mr) +
+                         section->offset_within_region +
+                         (iova - section->offset_within_address_space);
+
+            vfio_defer_ram_device_unmap(bcontainer, section->mr, iova,
+                                        int128_get64(llsize), vaddr,
+                                        section->readonly);
+            try_unmap = false;
+        }
     } else if (memory_region_has_ram_discard_manager(section->mr)) {
         vfio_ram_discard_unregister_listener(bcontainer, section);
         /* Unregistering will trigger an unmap. */
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index c204706e63..86d61891fe 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -30,6 +30,7 @@
 #include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-properties-system.h"
 #include "hw/vfio/vfio-cpr.h"
+#include "hw/vfio/vfio-container.h"
 #include "migration/vmstate.h"
 #include "migration/cpr.h"
 #include "qobject/qdict.h"
@@ -2042,6 +2043,16 @@ static void vfio_bars_finalize(VFIOPCIDevice *vdev)
         vfio_region_finalize(&bar->region);
         if (bar->mr) {
             assert(bar->size);
+            /*
+             * If a PCI_COMMAND memory-decode toggle deferred this BAR's
+             * unmap (see vfio_defer_ram_device_unmap()), this device is
+             * now really going away -- flush it for real so the mapping
+             * isn't leaked for the remaining lifetime of the container.
+             */
+            if (vdev->vbasedev.bcontainer) {
+                vfio_flush_pending_ram_device_unmaps_for_mr(
+                    vdev->vbasedev.bcontainer, bar->region.mem);
+            }
             g_free(bar->mr);
             bar->mr = NULL;
         }
diff --git a/include/hw/vfio/vfio-container.h b/include/hw/vfio/vfio-container.h
index a15ee2df2b..24525683fb 100644
--- a/include/hw/vfio/vfio-container.h
+++ b/include/hw/vfio/vfio-container.h
@@ -48,6 +48,7 @@ struct VFIOContainer {
     bool dirty_pages_started; /* Protected by BQL */
     QLIST_HEAD(, VFIOGuestIOMMU) giommu_list;
     QLIST_HEAD(, VFIORamDiscardListener) vrdl_list;
+    QLIST_HEAD(, VFIOPendingRamDeviceUnmap) pending_ram_device_unmap_list;
     QLIST_ENTRY(VFIOContainer) next;
     QLIST_HEAD(, VFIODevice) device_list;
     GList *iova_ranges;
@@ -76,6 +77,29 @@ typedef struct VFIORamDiscardListener {
     QLIST_ENTRY(VFIORamDiscardListener) next;
 } VFIORamDiscardListener;
 
+/*
+ * A "ram device" region (a passthrough device's own MMIO/BAR range,
+ * mapped into the IOMMU for peer-to-peer DMA) that region_del wants to
+ * unmap. The actual VFIO_IOMMU_UNMAP_DMA is deferred: if a matching
+ * region_add for the identical region shows up again (e.g. the guest
+ * toggled PCI_COMMAND memory-decode off then back on, which is common
+ * and can happen several times per device during firmware/OS PCI
+ * enumeration), the map is still valid host-side and both the unmap and
+ * the re-map can be skipped entirely. This avoids repeating the
+ * (potentially multi-second, for huge BARs) VFIO_IOMMU_MAP_DMA ioctl for
+ * no functional reason. Any mapping still pending here when the
+ * container is finally torn down gets a real unmap first, so nothing
+ * is ever leaked.
+ */
+typedef struct VFIOPendingRamDeviceUnmap {
+    MemoryRegion *mr;
+    hwaddr iova;
+    hwaddr size;
+    void *vaddr;
+    bool readonly;
+    QLIST_ENTRY(VFIOPendingRamDeviceUnmap) next;
+} VFIOPendingRamDeviceUnmap;
+
 VFIOAddressSpace *vfio_address_space_get(AddressSpace *as);
 void vfio_address_space_put(VFIOAddressSpace *space);
 void vfio_address_space_insert(VFIOAddressSpace *space,
@@ -267,4 +291,8 @@ VFIORamDiscardListener *vfio_find_ram_discard_listener(
 void vfio_container_region_add(VFIOContainer *bcontainer,
                                MemoryRegionSection *section, bool cpr_remap);
 
+void vfio_flush_pending_ram_device_unmaps(VFIOContainer *bcontainer);
+void vfio_flush_pending_ram_device_unmaps_for_mr(VFIOContainer *bcontainer,
+                                                   MemoryRegion *mr);
+
 #endif /* HW_VFIO_VFIO_CONTAINER_H */
-- 
2.43.0

Re: [PATCH] hw/vfio: Coalesce repeated PCI_COMMAND memory-decode DMA (re)map for passthrough BARs

[Alex Williamson]

On Tue, Jul 21, 2026, at 7:06 AM, Yang Wencheng wrote:
> From: YangWencheng <east.moutain.yang@gmail.com>
>
> A passthrough device's own MMIO/BAR range is registered with the IOMMU
> (VFIO_IOMMU_MAP_DMA) when its memory region becomes part of the guest
> address space, to support peer-to-peer DMA into that BAR from other
> devices. Toggling the guest's PCI_COMMAND memory-decode-enable bit off
> and back on -- something PCI enumeration/attribute code does routinely,
> sometimes several times for the same device (e.g. disable before
> reprogramming a BAR then re-enable, or generic driver probing during
> guest OS boot) -- currently tears down and rebuilds this mapping every
> single time via vfio_listener_region_del()/region_add(), unconditionally.
>
> For devices with very large BARs this is expensive: mapping a 64GB BAR
> into IOMMU page tables measured at ~8.5s per call on this hardware, and
> was observed being repeated 3-5 times for the same BAR during a single
> guest boot, because nothing changed about the underlying mapping between
> the disable and the following re-enable.
>
> Defer the actual VFIO_IOMMU_UNMAP_DMA for "ram device" regions (i.e.
> passthrough device BARs used for P2P DMA -- explicitly not regular guest
> RAM or RamDiscardManager-backed regions, so migration/ballooning/
> virtio-mem are unaffected) instead of issuing it immediately in
> region_del(). If a matching region_add() for the exact same region
> (same MemoryRegion pointer, iova, size, vaddr, readonly) follows, cancel
> the deferred unmap and skip the VFIO_IOMMU_MAP_DMA entirely -- the
> host-side mapping was never actually removed, so there is nothing to
> redo. A region_add() for anything that doesn't match maps normally, as
> before.
>
> Nothing is leaked: any mapping still on the pending list is flushed with
> a real unmap in two places -- vfio_container_instance_finalize(), before
> the container's fd is closed (VM shutdown / last device in a group removed),
> and vfio_bars_finalize(), matched by MemoryRegion pointer to just that
> device's own BARs, so a device hot-unplugged while the container stays
> alive for other devices can't leave a dangling deferred entry either.
>
> This does not weaken the PCI_COMMAND memory-decode security boundary:
> every guest write to PCI_COMMAND is still forwarded synchronously and
> unconditionally to the real device's config space in
> vfio_pci_write_config() (an entirely separate code path, untouched by
> this change), which is what actually gates whether the physical device
> claims/responds to transactions targeting its BAR, independent of
> whatever the IOMMU's routing table still contains. This change only
> avoids redundant bookkeeping of that routing table when nothing about
> the mapping has changed.

Seems like you should focus on huge pfnmap support on your platform rather than hack the VMM to not behave like bare metal.  Thanks,

Alex


> Signed-off-by: Yangwencheng <yangwencheng@gmail.com>
> ---
>  hw/vfio/container.c              | 53 ++++++++++++++++++++++
>  hw/vfio/listener.c               | 76 ++++++++++++++++++++++++++++++++
>  hw/vfio/pci.c                    | 11 +++++
>  include/hw/vfio/vfio-container.h | 28 ++++++++++++
>  4 files changed, 168 insertions(+)
>
> diff --git a/hw/vfio/container.c b/hw/vfio/container.c
> index d09a663732..00676cadc9 100644
> --- a/hw/vfio/container.c
> +++ b/hw/vfio/container.c
> @@ -298,6 +298,56 @@ GList *vfio_container_get_iova_ranges(const 
> VFIOContainer *bcontainer)
>      return g_list_copy_deep(bcontainer->iova_ranges, copy_iova_range, 
> NULL);
>  }
> 
> +/*
> + * Actually unmap (and free the bookkeeping for) any deferred "ram
> + * device" unmaps still pending on this container. Must be called
> + * before the container's fd is closed/reused, and is safe to call at
> + * any time (e.g. also from a specific device's exit path, to avoid
> + * leaking a mapping if that device is hot-unplugged while the
> + * container otherwise stays alive for other devices).
> + */
> +void vfio_flush_pending_ram_device_unmaps(VFIOContainer *bcontainer)
> +{
> +    VFIOPendingRamDeviceUnmap *pending, *tmp;
> +
> +    QLIST_FOREACH_SAFE(pending, &bcontainer->pending_ram_device_unmap_list,
> +                       next, tmp) {
> +        int ret = vfio_container_dma_unmap(bcontainer, pending->iova,
> +                                            pending->size, NULL, false);
> +        if (ret) {
> +            error_report("vfio_container_dma_unmap(%p, 0x%"HWADDR_PRIx", "
> +                         "0x%"HWADDR_PRIx") = %d (%s)",
> +                         bcontainer, pending->iova, pending->size, ret,
> +                         strerror(-ret));
> +        }
> +        QLIST_REMOVE(pending, next);
> +        g_free(pending);
> +    }
> +}
> +
> +void vfio_flush_pending_ram_device_unmaps_for_mr(VFIOContainer *bcontainer,
> +                                                   MemoryRegion *mr)
> +{
> +    VFIOPendingRamDeviceUnmap *pending, *tmp;
> +
> +    QLIST_FOREACH_SAFE(pending, &bcontainer->pending_ram_device_unmap_list,
> +                       next, tmp) {
> +        if (pending->mr != mr) {
> +            continue;
> +        }
> +        int ret = vfio_container_dma_unmap(bcontainer, pending->iova,
> +                                            pending->size, NULL, false);
> +        if (ret) {
> +            error_report("vfio_container_dma_unmap(%p, 0x%"HWADDR_PRIx", "
> +                         "0x%"HWADDR_PRIx") = %d (%s)",
> +                         bcontainer, pending->iova, pending->size, ret,
> +                         strerror(-ret));
> +        }
> +        QLIST_REMOVE(pending, next);
> +        g_free(pending);
> +    }
> +}
> +
>  static void vfio_container_instance_finalize(Object *obj)
>  {
>      VFIOContainer *bcontainer = VFIO_IOMMU(obj);
> @@ -312,6 +362,8 @@ static void vfio_container_instance_finalize(Object *obj)
>          g_free(giommu);
>      }
> 
> +    vfio_flush_pending_ram_device_unmaps(bcontainer);
> +
>      g_list_free_full(bcontainer->iova_ranges, g_free);
>  }
> 
> @@ -325,6 +377,7 @@ static void vfio_container_instance_init(Object *obj)
>      bcontainer->iova_ranges = NULL;
>      QLIST_INIT(&bcontainer->giommu_list);
>      QLIST_INIT(&bcontainer->vrdl_list);
> +    QLIST_INIT(&bcontainer->pending_ram_device_unmap_list);
>  }
> 
>  static const TypeInfo types[] = {
> diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c
> index c19600e980..e6bcfd028e 100644
> --- a/hw/vfio/listener.c
> +++ b/hw/vfio/listener.c
> @@ -49,6 +49,55 @@
>   * Device state interfaces
>   */
> 
> +/*
> + * Defer the VFIO_IOMMU_UNMAP_DMA for a "ram device" (passthrough device
> + * MMIO/BAR) region instead of doing it immediately. See the comment on
> + * VFIOPendingRamDeviceUnmap in vfio-container.h for why.
> + */
> +static void vfio_defer_ram_device_unmap(VFIOContainer *bcontainer,
> +                                        MemoryRegion *mr, hwaddr iova,
> +                                        hwaddr size, void *vaddr,
> +                                        bool readonly)
> +{
> +    VFIOPendingRamDeviceUnmap *pending = g_malloc0(sizeof(*pending));
> +
> +    pending->mr = mr;
> +    pending->iova = iova;
> +    pending->size = size;
> +    pending->vaddr = vaddr;
> +    pending->readonly = readonly;
> +    QLIST_INSERT_HEAD(&bcontainer->pending_ram_device_unmap_list, pending,
> +                      next);
> +}
> +
> +/*
> + * If a deferred unmap exactly matching this (mr, iova, size, vaddr,
> + * readonly) is pending, cancel it (drop it without ever issuing the
> + * VFIO_IOMMU_UNMAP_DMA) and report success -- the caller should skip
> + * mapping, since the host-side mapping was never actually removed.
> + * Returns false if there was no matching pending unmap, in which case
> + * the caller must map normally.
> + */
> +static bool vfio_cancel_pending_ram_device_unmap(VFIOContainer *bcontainer,
> +                                                 MemoryRegion *mr,
> +                                                 hwaddr iova, hwaddr size,
> +                                                 void *vaddr, bool readonly)
> +{
> +    VFIOPendingRamDeviceUnmap *pending;
> +
> +    QLIST_FOREACH(pending, &bcontainer->pending_ram_device_unmap_list, next) {
> +        if (pending->mr == mr && pending->iova == iova &&
> +            pending->size == size && pending->vaddr == vaddr &&
> +            pending->readonly == readonly) {
> +            QLIST_REMOVE(pending, next);
> +            g_free(pending);
> +            return true;
> +        }
> +    }
> +
> +    return false;
> +}
> +
> 
>  static bool vfio_log_sync_needed(const VFIOContainer *bcontainer)
>  {
> @@ -608,6 +657,22 @@ void vfio_container_region_add(VFIOContainer *bcontainer,
>                  pgmask + 1);
>              return;
>          }
> +
> +        /*
> +         * If region_del deferred an identical unmap for this exact region
> +         * (same MemoryRegion, iova, size, vaddr, readonly), the underlying
> +         * VFIO_IOMMU_MAP_DMA mapping is still live host-side -- cancel the
> +         * deferred unmap and skip re-mapping. This is what makes toggling
> +         * a passthrough device's PCI_COMMAND memory-decode bit off and
> +         * back on (which normal PCI enumeration/attribute code does,
> +         * sometimes several times per device) cheap instead of repeating
> +         * a possibly multi-second VFIO_IOMMU_MAP_DMA for huge BARs.
> +         */
> +        if (vfio_cancel_pending_ram_device_unmap(bcontainer, section->mr,
> +                                                 iova, int128_get64(llsize),
> +                                                 vaddr, section->readonly)) {
> +            return;
> +        }
>      }
> 
>      if (memory_region_skip_iommu_map(section->mr)) {
> @@ -714,6 +779,17 @@ static void 
> vfio_listener_region_del(MemoryListener *listener,
> 
>          pgmask = (1ULL << ctz64(bcontainer->pgsizes)) - 1;
>          try_unmap = !((iova & pgmask) || (int128_get64(llsize) & pgmask));
> +
> +        if (try_unmap) {
> +            void *vaddr = memory_region_get_ram_ptr(section->mr) +
> +                         section->offset_within_region +
> +                         (iova - section->offset_within_address_space);
> +
> +            vfio_defer_ram_device_unmap(bcontainer, section->mr, iova,
> +                                        int128_get64(llsize), vaddr,
> +                                        section->readonly);
> +            try_unmap = false;
> +        }
>      } else if (memory_region_has_ram_discard_manager(section->mr)) {
>          vfio_ram_discard_unregister_listener(bcontainer, section);
>          /* Unregistering will trigger an unmap. */
> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
> index c204706e63..86d61891fe 100644
> --- a/hw/vfio/pci.c
> +++ b/hw/vfio/pci.c
> @@ -30,6 +30,7 @@
>  #include "hw/core/qdev-properties.h"
>  #include "hw/core/qdev-properties-system.h"
>  #include "hw/vfio/vfio-cpr.h"
> +#include "hw/vfio/vfio-container.h"
>  #include "migration/vmstate.h"
>  #include "migration/cpr.h"
>  #include "qobject/qdict.h"
> @@ -2042,6 +2043,16 @@ static void vfio_bars_finalize(VFIOPCIDevice *vdev)
>          vfio_region_finalize(&bar->region);
>          if (bar->mr) {
>              assert(bar->size);
> +            /*
> +             * If a PCI_COMMAND memory-decode toggle deferred this BAR's
> +             * unmap (see vfio_defer_ram_device_unmap()), this device is
> +             * now really going away -- flush it for real so the mapping
> +             * isn't leaked for the remaining lifetime of the container.
> +             */
> +            if (vdev->vbasedev.bcontainer) {
> +                vfio_flush_pending_ram_device_unmaps_for_mr(
> +                    vdev->vbasedev.bcontainer, bar->region.mem);
> +            }
>              g_free(bar->mr);
>              bar->mr = NULL;
>          }
> diff --git a/include/hw/vfio/vfio-container.h b/include/hw/vfio/vfio-container.h
> index a15ee2df2b..24525683fb 100644
> --- a/include/hw/vfio/vfio-container.h
> +++ b/include/hw/vfio/vfio-container.h
> @@ -48,6 +48,7 @@ struct VFIOContainer {
>      bool dirty_pages_started; /* Protected by BQL */
>      QLIST_HEAD(, VFIOGuestIOMMU) giommu_list;
>      QLIST_HEAD(, VFIORamDiscardListener) vrdl_list;
> +    QLIST_HEAD(, VFIOPendingRamDeviceUnmap) pending_ram_device_unmap_list;
>      QLIST_ENTRY(VFIOContainer) next;
>      QLIST_HEAD(, VFIODevice) device_list;
>      GList *iova_ranges;
> @@ -76,6 +77,29 @@ typedef struct VFIORamDiscardListener {
>      QLIST_ENTRY(VFIORamDiscardListener) next;
>  } VFIORamDiscardListener;
> 
> +/*
> + * A "ram device" region (a passthrough device's own MMIO/BAR range,
> + * mapped into the IOMMU for peer-to-peer DMA) that region_del wants to
> + * unmap. The actual VFIO_IOMMU_UNMAP_DMA is deferred: if a matching
> + * region_add for the identical region shows up again (e.g. the guest
> + * toggled PCI_COMMAND memory-decode off then back on, which is common
> + * and can happen several times per device during firmware/OS PCI
> + * enumeration), the map is still valid host-side and both the unmap and
> + * the re-map can be skipped entirely. This avoids repeating the
> + * (potentially multi-second, for huge BARs) VFIO_IOMMU_MAP_DMA ioctl for
> + * no functional reason. Any mapping still pending here when the
> + * container is finally torn down gets a real unmap first, so nothing
> + * is ever leaked.
> + */
> +typedef struct VFIOPendingRamDeviceUnmap {
> +    MemoryRegion *mr;
> +    hwaddr iova;
> +    hwaddr size;
> +    void *vaddr;
> +    bool readonly;
> +    QLIST_ENTRY(VFIOPendingRamDeviceUnmap) next;
> +} VFIOPendingRamDeviceUnmap;
> +
>  VFIOAddressSpace *vfio_address_space_get(AddressSpace *as);
>  void vfio_address_space_put(VFIOAddressSpace *space);
>  void vfio_address_space_insert(VFIOAddressSpace *space,
> @@ -267,4 +291,8 @@ VFIORamDiscardListener *vfio_find_ram_discard_listener(
>  void vfio_container_region_add(VFIOContainer *bcontainer,
>                                 MemoryRegionSection *section, bool cpr_remap);
> 
> +void vfio_flush_pending_ram_device_unmaps(VFIOContainer *bcontainer);
> +void vfio_flush_pending_ram_device_unmaps_for_mr(VFIOContainer *bcontainer,
> +                                                   MemoryRegion *mr);
> +
>  #endif /* HW_VFIO_VFIO_CONTAINER_H */
> -- 
> 2.43.0

Re: [PATCH] hw/vfio: Coalesce repeated PCI_COMMAND memory-decode DMA (re)map for passthrough BARs

[Michael S. Tsirkin]

On Tue, Jul 21, 2026 at 08:41:04AM -0600, Alex Williamson wrote:
> 
> 
> On Tue, Jul 21, 2026, at 7:06 AM, Yang Wencheng wrote:
> > From: YangWencheng <east.moutain.yang@gmail.com>
> >
> > A passthrough device's own MMIO/BAR range is registered with the IOMMU
> > (VFIO_IOMMU_MAP_DMA) when its memory region becomes part of the guest
> > address space, to support peer-to-peer DMA into that BAR from other
> > devices. Toggling the guest's PCI_COMMAND memory-decode-enable bit off
> > and back on -- something PCI enumeration/attribute code does routinely,
> > sometimes several times for the same device (e.g. disable before
> > reprogramming a BAR then re-enable, or generic driver probing during
> > guest OS boot) -- currently tears down and rebuilds this mapping every
> > single time via vfio_listener_region_del()/region_add(), unconditionally.
> >
> > For devices with very large BARs this is expensive: mapping a 64GB BAR
> > into IOMMU page tables measured at ~8.5s per call on this hardware, and
> > was observed being repeated 3-5 times for the same BAR during a single
> > guest boot, because nothing changed about the underlying mapping between
> > the disable and the following re-enable.
> >
> > Defer the actual VFIO_IOMMU_UNMAP_DMA for "ram device" regions (i.e.
> > passthrough device BARs used for P2P DMA -- explicitly not regular guest
> > RAM or RamDiscardManager-backed regions, so migration/ballooning/
> > virtio-mem are unaffected) instead of issuing it immediately in
> > region_del(). If a matching region_add() for the exact same region
> > (same MemoryRegion pointer, iova, size, vaddr, readonly) follows, cancel
> > the deferred unmap and skip the VFIO_IOMMU_MAP_DMA entirely -- the
> > host-side mapping was never actually removed, so there is nothing to
> > redo. A region_add() for anything that doesn't match maps normally, as
> > before.
> >
> > Nothing is leaked: any mapping still on the pending list is flushed with
> > a real unmap in two places -- vfio_container_instance_finalize(), before
> > the container's fd is closed (VM shutdown / last device in a group removed),
> > and vfio_bars_finalize(), matched by MemoryRegion pointer to just that
> > device's own BARs, so a device hot-unplugged while the container stays
> > alive for other devices can't leave a dangling deferred entry either.
> >
> > This does not weaken the PCI_COMMAND memory-decode security boundary:
> > every guest write to PCI_COMMAND is still forwarded synchronously and
> > unconditionally to the real device's config space in
> > vfio_pci_write_config() (an entirely separate code path, untouched by
> > this change), which is what actually gates whether the physical device
> > claims/responds to transactions targeting its BAR, independent of
> > whatever the IOMMU's routing table still contains. This change only
> > avoids redundant bookkeeping of that routing table when nothing about
> > the mapping has changed.
> 
> Seems like you should focus on huge pfnmap support on your platform rather than hack the VMM to not behave like bare metal.  Thanks,
> 
> Alex

But bare metal does not tweak an iommu during pci enumeration?


> 
> > Signed-off-by: Yangwencheng <yangwencheng@gmail.com>
> > ---
> >  hw/vfio/container.c              | 53 ++++++++++++++++++++++
> >  hw/vfio/listener.c               | 76 ++++++++++++++++++++++++++++++++
> >  hw/vfio/pci.c                    | 11 +++++
> >  include/hw/vfio/vfio-container.h | 28 ++++++++++++
> >  4 files changed, 168 insertions(+)
> >
> > diff --git a/hw/vfio/container.c b/hw/vfio/container.c
> > index d09a663732..00676cadc9 100644
> > --- a/hw/vfio/container.c
> > +++ b/hw/vfio/container.c
> > @@ -298,6 +298,56 @@ GList *vfio_container_get_iova_ranges(const 
> > VFIOContainer *bcontainer)
> >      return g_list_copy_deep(bcontainer->iova_ranges, copy_iova_range, 
> > NULL);
> >  }
> > 
> > +/*
> > + * Actually unmap (and free the bookkeeping for) any deferred "ram
> > + * device" unmaps still pending on this container. Must be called
> > + * before the container's fd is closed/reused, and is safe to call at
> > + * any time (e.g. also from a specific device's exit path, to avoid
> > + * leaking a mapping if that device is hot-unplugged while the
> > + * container otherwise stays alive for other devices).
> > + */
> > +void vfio_flush_pending_ram_device_unmaps(VFIOContainer *bcontainer)
> > +{
> > +    VFIOPendingRamDeviceUnmap *pending, *tmp;
> > +
> > +    QLIST_FOREACH_SAFE(pending, &bcontainer->pending_ram_device_unmap_list,
> > +                       next, tmp) {
> > +        int ret = vfio_container_dma_unmap(bcontainer, pending->iova,
> > +                                            pending->size, NULL, false);
> > +        if (ret) {
> > +            error_report("vfio_container_dma_unmap(%p, 0x%"HWADDR_PRIx", "
> > +                         "0x%"HWADDR_PRIx") = %d (%s)",
> > +                         bcontainer, pending->iova, pending->size, ret,
> > +                         strerror(-ret));
> > +        }
> > +        QLIST_REMOVE(pending, next);
> > +        g_free(pending);
> > +    }
> > +}
> > +
> > +void vfio_flush_pending_ram_device_unmaps_for_mr(VFIOContainer *bcontainer,
> > +                                                   MemoryRegion *mr)
> > +{
> > +    VFIOPendingRamDeviceUnmap *pending, *tmp;
> > +
> > +    QLIST_FOREACH_SAFE(pending, &bcontainer->pending_ram_device_unmap_list,
> > +                       next, tmp) {
> > +        if (pending->mr != mr) {
> > +            continue;
> > +        }
> > +        int ret = vfio_container_dma_unmap(bcontainer, pending->iova,
> > +                                            pending->size, NULL, false);
> > +        if (ret) {
> > +            error_report("vfio_container_dma_unmap(%p, 0x%"HWADDR_PRIx", "
> > +                         "0x%"HWADDR_PRIx") = %d (%s)",
> > +                         bcontainer, pending->iova, pending->size, ret,
> > +                         strerror(-ret));
> > +        }
> > +        QLIST_REMOVE(pending, next);
> > +        g_free(pending);
> > +    }
> > +}
> > +
> >  static void vfio_container_instance_finalize(Object *obj)
> >  {
> >      VFIOContainer *bcontainer = VFIO_IOMMU(obj);
> > @@ -312,6 +362,8 @@ static void vfio_container_instance_finalize(Object *obj)
> >          g_free(giommu);
> >      }
> > 
> > +    vfio_flush_pending_ram_device_unmaps(bcontainer);
> > +
> >      g_list_free_full(bcontainer->iova_ranges, g_free);
> >  }
> > 
> > @@ -325,6 +377,7 @@ static void vfio_container_instance_init(Object *obj)
> >      bcontainer->iova_ranges = NULL;
> >      QLIST_INIT(&bcontainer->giommu_list);
> >      QLIST_INIT(&bcontainer->vrdl_list);
> > +    QLIST_INIT(&bcontainer->pending_ram_device_unmap_list);
> >  }
> > 
> >  static const TypeInfo types[] = {
> > diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c
> > index c19600e980..e6bcfd028e 100644
> > --- a/hw/vfio/listener.c
> > +++ b/hw/vfio/listener.c
> > @@ -49,6 +49,55 @@
> >   * Device state interfaces
> >   */
> > 
> > +/*
> > + * Defer the VFIO_IOMMU_UNMAP_DMA for a "ram device" (passthrough device
> > + * MMIO/BAR) region instead of doing it immediately. See the comment on
> > + * VFIOPendingRamDeviceUnmap in vfio-container.h for why.
> > + */
> > +static void vfio_defer_ram_device_unmap(VFIOContainer *bcontainer,
> > +                                        MemoryRegion *mr, hwaddr iova,
> > +                                        hwaddr size, void *vaddr,
> > +                                        bool readonly)
> > +{
> > +    VFIOPendingRamDeviceUnmap *pending = g_malloc0(sizeof(*pending));
> > +
> > +    pending->mr = mr;
> > +    pending->iova = iova;
> > +    pending->size = size;
> > +    pending->vaddr = vaddr;
> > +    pending->readonly = readonly;
> > +    QLIST_INSERT_HEAD(&bcontainer->pending_ram_device_unmap_list, pending,
> > +                      next);
> > +}
> > +
> > +/*
> > + * If a deferred unmap exactly matching this (mr, iova, size, vaddr,
> > + * readonly) is pending, cancel it (drop it without ever issuing the
> > + * VFIO_IOMMU_UNMAP_DMA) and report success -- the caller should skip
> > + * mapping, since the host-side mapping was never actually removed.
> > + * Returns false if there was no matching pending unmap, in which case
> > + * the caller must map normally.
> > + */
> > +static bool vfio_cancel_pending_ram_device_unmap(VFIOContainer *bcontainer,
> > +                                                 MemoryRegion *mr,
> > +                                                 hwaddr iova, hwaddr size,
> > +                                                 void *vaddr, bool readonly)
> > +{
> > +    VFIOPendingRamDeviceUnmap *pending;
> > +
> > +    QLIST_FOREACH(pending, &bcontainer->pending_ram_device_unmap_list, next) {
> > +        if (pending->mr == mr && pending->iova == iova &&
> > +            pending->size == size && pending->vaddr == vaddr &&
> > +            pending->readonly == readonly) {
> > +            QLIST_REMOVE(pending, next);
> > +            g_free(pending);
> > +            return true;
> > +        }
> > +    }
> > +
> > +    return false;
> > +}
> > +
> > 
> >  static bool vfio_log_sync_needed(const VFIOContainer *bcontainer)
> >  {
> > @@ -608,6 +657,22 @@ void vfio_container_region_add(VFIOContainer *bcontainer,
> >                  pgmask + 1);
> >              return;
> >          }
> > +
> > +        /*
> > +         * If region_del deferred an identical unmap for this exact region
> > +         * (same MemoryRegion, iova, size, vaddr, readonly), the underlying
> > +         * VFIO_IOMMU_MAP_DMA mapping is still live host-side -- cancel the
> > +         * deferred unmap and skip re-mapping. This is what makes toggling
> > +         * a passthrough device's PCI_COMMAND memory-decode bit off and
> > +         * back on (which normal PCI enumeration/attribute code does,
> > +         * sometimes several times per device) cheap instead of repeating
> > +         * a possibly multi-second VFIO_IOMMU_MAP_DMA for huge BARs.
> > +         */
> > +        if (vfio_cancel_pending_ram_device_unmap(bcontainer, section->mr,
> > +                                                 iova, int128_get64(llsize),
> > +                                                 vaddr, section->readonly)) {
> > +            return;
> > +        }
> >      }
> > 
> >      if (memory_region_skip_iommu_map(section->mr)) {
> > @@ -714,6 +779,17 @@ static void 
> > vfio_listener_region_del(MemoryListener *listener,
> > 
> >          pgmask = (1ULL << ctz64(bcontainer->pgsizes)) - 1;
> >          try_unmap = !((iova & pgmask) || (int128_get64(llsize) & pgmask));
> > +
> > +        if (try_unmap) {
> > +            void *vaddr = memory_region_get_ram_ptr(section->mr) +
> > +                         section->offset_within_region +
> > +                         (iova - section->offset_within_address_space);
> > +
> > +            vfio_defer_ram_device_unmap(bcontainer, section->mr, iova,
> > +                                        int128_get64(llsize), vaddr,
> > +                                        section->readonly);
> > +            try_unmap = false;
> > +        }
> >      } else if (memory_region_has_ram_discard_manager(section->mr)) {
> >          vfio_ram_discard_unregister_listener(bcontainer, section);
> >          /* Unregistering will trigger an unmap. */
> > diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
> > index c204706e63..86d61891fe 100644
> > --- a/hw/vfio/pci.c
> > +++ b/hw/vfio/pci.c
> > @@ -30,6 +30,7 @@
> >  #include "hw/core/qdev-properties.h"
> >  #include "hw/core/qdev-properties-system.h"
> >  #include "hw/vfio/vfio-cpr.h"
> > +#include "hw/vfio/vfio-container.h"
> >  #include "migration/vmstate.h"
> >  #include "migration/cpr.h"
> >  #include "qobject/qdict.h"
> > @@ -2042,6 +2043,16 @@ static void vfio_bars_finalize(VFIOPCIDevice *vdev)
> >          vfio_region_finalize(&bar->region);
> >          if (bar->mr) {
> >              assert(bar->size);
> > +            /*
> > +             * If a PCI_COMMAND memory-decode toggle deferred this BAR's
> > +             * unmap (see vfio_defer_ram_device_unmap()), this device is
> > +             * now really going away -- flush it for real so the mapping
> > +             * isn't leaked for the remaining lifetime of the container.
> > +             */
> > +            if (vdev->vbasedev.bcontainer) {
> > +                vfio_flush_pending_ram_device_unmaps_for_mr(
> > +                    vdev->vbasedev.bcontainer, bar->region.mem);
> > +            }
> >              g_free(bar->mr);
> >              bar->mr = NULL;
> >          }
> > diff --git a/include/hw/vfio/vfio-container.h b/include/hw/vfio/vfio-container.h
> > index a15ee2df2b..24525683fb 100644
> > --- a/include/hw/vfio/vfio-container.h
> > +++ b/include/hw/vfio/vfio-container.h
> > @@ -48,6 +48,7 @@ struct VFIOContainer {
> >      bool dirty_pages_started; /* Protected by BQL */
> >      QLIST_HEAD(, VFIOGuestIOMMU) giommu_list;
> >      QLIST_HEAD(, VFIORamDiscardListener) vrdl_list;
> > +    QLIST_HEAD(, VFIOPendingRamDeviceUnmap) pending_ram_device_unmap_list;
> >      QLIST_ENTRY(VFIOContainer) next;
> >      QLIST_HEAD(, VFIODevice) device_list;
> >      GList *iova_ranges;
> > @@ -76,6 +77,29 @@ typedef struct VFIORamDiscardListener {
> >      QLIST_ENTRY(VFIORamDiscardListener) next;
> >  } VFIORamDiscardListener;
> > 
> > +/*
> > + * A "ram device" region (a passthrough device's own MMIO/BAR range,
> > + * mapped into the IOMMU for peer-to-peer DMA) that region_del wants to
> > + * unmap. The actual VFIO_IOMMU_UNMAP_DMA is deferred: if a matching
> > + * region_add for the identical region shows up again (e.g. the guest
> > + * toggled PCI_COMMAND memory-decode off then back on, which is common
> > + * and can happen several times per device during firmware/OS PCI
> > + * enumeration), the map is still valid host-side and both the unmap and
> > + * the re-map can be skipped entirely. This avoids repeating the
> > + * (potentially multi-second, for huge BARs) VFIO_IOMMU_MAP_DMA ioctl for
> > + * no functional reason. Any mapping still pending here when the
> > + * container is finally torn down gets a real unmap first, so nothing
> > + * is ever leaked.
> > + */
> > +typedef struct VFIOPendingRamDeviceUnmap {
> > +    MemoryRegion *mr;
> > +    hwaddr iova;
> > +    hwaddr size;
> > +    void *vaddr;
> > +    bool readonly;
> > +    QLIST_ENTRY(VFIOPendingRamDeviceUnmap) next;
> > +} VFIOPendingRamDeviceUnmap;
> > +
> >  VFIOAddressSpace *vfio_address_space_get(AddressSpace *as);
> >  void vfio_address_space_put(VFIOAddressSpace *space);
> >  void vfio_address_space_insert(VFIOAddressSpace *space,
> > @@ -267,4 +291,8 @@ VFIORamDiscardListener *vfio_find_ram_discard_listener(
> >  void vfio_container_region_add(VFIOContainer *bcontainer,
> >                                 MemoryRegionSection *section, bool cpr_remap);
> > 
> > +void vfio_flush_pending_ram_device_unmaps(VFIOContainer *bcontainer);
> > +void vfio_flush_pending_ram_device_unmaps_for_mr(VFIOContainer *bcontainer,
> > +                                                   MemoryRegion *mr);
> > +
> >  #endif /* HW_VFIO_VFIO_CONTAINER_H */
> > -- 
> > 2.43.0

Re: [PATCH] hw/vfio: Coalesce repeated PCI_COMMAND memory-decode DMA (re)map for passthrough BARs

[Alex Williamson]

On Tue, 21 Jul 2026 11:03:39 -0400
"Michael S. Tsirkin" <mst@redhat.com> wrote:

> On Tue, Jul 21, 2026 at 08:41:04AM -0600, Alex Williamson wrote:
> > 
> > 
> > On Tue, Jul 21, 2026, at 7:06 AM, Yang Wencheng wrote:  
> > > From: YangWencheng <east.moutain.yang@gmail.com>
> > >
> > > A passthrough device's own MMIO/BAR range is registered with the IOMMU
> > > (VFIO_IOMMU_MAP_DMA) when its memory region becomes part of the guest
> > > address space, to support peer-to-peer DMA into that BAR from other
> > > devices. Toggling the guest's PCI_COMMAND memory-decode-enable bit off
> > > and back on -- something PCI enumeration/attribute code does routinely,
> > > sometimes several times for the same device (e.g. disable before
> > > reprogramming a BAR then re-enable, or generic driver probing during
> > > guest OS boot) -- currently tears down and rebuilds this mapping every
> > > single time via vfio_listener_region_del()/region_add(), unconditionally.
> > >
> > > For devices with very large BARs this is expensive: mapping a 64GB BAR
> > > into IOMMU page tables measured at ~8.5s per call on this hardware, and
> > > was observed being repeated 3-5 times for the same BAR during a single
> > > guest boot, because nothing changed about the underlying mapping between
> > > the disable and the following re-enable.
> > >
> > > Defer the actual VFIO_IOMMU_UNMAP_DMA for "ram device" regions (i.e.
> > > passthrough device BARs used for P2P DMA -- explicitly not regular guest
> > > RAM or RamDiscardManager-backed regions, so migration/ballooning/
> > > virtio-mem are unaffected) instead of issuing it immediately in
> > > region_del(). If a matching region_add() for the exact same region
> > > (same MemoryRegion pointer, iova, size, vaddr, readonly) follows, cancel
> > > the deferred unmap and skip the VFIO_IOMMU_MAP_DMA entirely -- the
> > > host-side mapping was never actually removed, so there is nothing to
> > > redo. A region_add() for anything that doesn't match maps normally, as
> > > before.
> > >
> > > Nothing is leaked: any mapping still on the pending list is flushed with
> > > a real unmap in two places -- vfio_container_instance_finalize(), before
> > > the container's fd is closed (VM shutdown / last device in a group removed),
> > > and vfio_bars_finalize(), matched by MemoryRegion pointer to just that
> > > device's own BARs, so a device hot-unplugged while the container stays
> > > alive for other devices can't leave a dangling deferred entry either.
> > >
> > > This does not weaken the PCI_COMMAND memory-decode security boundary:
> > > every guest write to PCI_COMMAND is still forwarded synchronously and
> > > unconditionally to the real device's config space in
> > > vfio_pci_write_config() (an entirely separate code path, untouched by
> > > this change), which is what actually gates whether the physical device
> > > claims/responds to transactions targeting its BAR, independent of
> > > whatever the IOMMU's routing table still contains. This change only
> > > avoids redundant bookkeeping of that routing table when nothing about
> > > the mapping has changed.  
> > 
> > Seems like you should focus on huge pfnmap support on your platform
> > rather than hack the VMM to not behave like bare metal.  Thanks,
> > 
> 
> But bare metal does not tweak an iommu during pci enumeration?

Bare metal is not using the IOMMU to map the device into a guest
physical address space, so no, an equivalent operation does not occur
there.  The proposal here is intentionally leaving stale gpa mappings
to avoid the unmap/remap overhead, where we've essentially eliminated
that overhead on other platforms with huge pfnmap support.  The
specific platform that's being optimized here is also omitted, which
makes it impossible to determine the ongoing need for this code.

The scheme here effectively assumes that a region_del() will either be
followed by a region_add() that cancels the deferred unmap, or the
deferral will be executed on finalize.  It does not actually account
for cases where the guest might remap the BAR to a different address,
ex. pci=realloc, leaving a stale mapping in place.  The finalize also
appears to be using a different MR from the one deferred, such that the
IOMMU is actually only unmapped due to close().

More importantly though, this entire scheme is relying on a gap in the
vfio type1 IOMMU backend, where clearing the memory enable bit of the
command register zaps the CPU mappings and errors faults while cleared,
but does not generate unmaps in the IOMMU.  IOMMUFD resolves that gap,
generating a move-notify/invalidate on the dma-buf, which results in an
IOMMU unmap.  IOW, the premise of this workaround is broken in the
direction that VFIO is headed.

Therefore, I'd once again suggest that effort is better redirected to
implement huge pfnmap support for whatever platform this might be in
order to follow a proven solution to this problem for type1.  Huge
pfnmap is used both in the CPU fault path as well as the DMA mapping
path, by virtue of generating user faults in the pfnmap.  Alternatively,
iommufd may provide better p2p DMA mapping performance than type1
without huge pfnmap, but CPU faults would lag without such support
anyway.  Thanks,

Alex