qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Steve Sistare <steven.sistare@oracle.com>
To: qemu-devel@nongnu.org
Cc: Alex Williamson <alex.williamson@redhat.com>,
	Cedric Le Goater <clg@redhat.com>, Yi Liu <yi.l.liu@intel.com>,
	Eric Auger <eric.auger@redhat.com>,
	Zhenzhong Duan <zhenzhong.duan@intel.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
	Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>,
	Steve Sistare <steven.sistare@oracle.com>
Subject: [PATCH V6 08/21] vfio/iommufd: use IOMMU_IOAS_MAP_FILE
Date: Wed,  2 Jul 2025 14:58:45 -0700	[thread overview]
Message-ID: <1751493538-202042-9-git-send-email-steven.sistare@oracle.com> (raw)
In-Reply-To: <1751493538-202042-1-git-send-email-steven.sistare@oracle.com>

Use IOMMU_IOAS_MAP_FILE when the mapped region is backed by a file.
Such a mapping can be preserved without modification during CPR,
because it depends on the file's address space, which does not change,
rather than on the process's address space, which does change.

Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
---
 include/hw/vfio/vfio-container-base.h | 15 +++++++++++++++
 hw/vfio/container-base.c              |  9 +++++++++
 hw/vfio/iommufd.c                     | 13 +++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/include/hw/vfio/vfio-container-base.h b/include/hw/vfio/vfio-container-base.h
index 3cd86ec..bded6e9 100644
--- a/include/hw/vfio/vfio-container-base.h
+++ b/include/hw/vfio/vfio-container-base.h
@@ -168,6 +168,21 @@ struct VFIOIOMMUClass {
                    hwaddr iova, ram_addr_t size,
                    void *vaddr, bool readonly, MemoryRegion *mr);
     /**
+     * @dma_map_file
+     *
+     * Map a file range for the container.
+     *
+     * @bcontainer: #VFIOContainerBase to use for map
+     * @iova: start address to map
+     * @size: size of the range to map
+     * @fd: descriptor of the file to map
+     * @start: starting file offset of the range to map
+     * @readonly: map read only if true
+     */
+    int (*dma_map_file)(const VFIOContainerBase *bcontainer,
+                        hwaddr iova, ram_addr_t size,
+                        int fd, unsigned long start, bool readonly);
+    /**
      * @dma_unmap
      *
      * Unmap an address range from the container.
diff --git a/hw/vfio/container-base.c b/hw/vfio/container-base.c
index d834bd4..5630497 100644
--- a/hw/vfio/container-base.c
+++ b/hw/vfio/container-base.c
@@ -78,7 +78,16 @@ int vfio_container_dma_map(VFIOContainerBase *bcontainer,
                            void *vaddr, bool readonly, MemoryRegion *mr)
 {
     VFIOIOMMUClass *vioc = VFIO_IOMMU_GET_CLASS(bcontainer);
+    RAMBlock *rb = mr->ram_block;
+    int mfd = rb ? qemu_ram_get_fd(rb) : -1;
 
+    if (mfd >= 0 && vioc->dma_map_file) {
+        unsigned long start = vaddr - qemu_ram_get_host_addr(rb);
+        unsigned long offset = qemu_ram_get_fd_offset(rb);
+
+        return vioc->dma_map_file(bcontainer, iova, size, mfd, start + offset,
+                                  readonly);
+    }
     g_assert(vioc->dma_map);
     return vioc->dma_map(bcontainer, iova, size, vaddr, readonly, mr);
 }
diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
index d3efef7..962a1e2 100644
--- a/hw/vfio/iommufd.c
+++ b/hw/vfio/iommufd.c
@@ -45,6 +45,18 @@ static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr iova,
                                    iova, size, vaddr, readonly);
 }
 
+static int iommufd_cdev_map_file(const VFIOContainerBase *bcontainer,
+                                 hwaddr iova, ram_addr_t size,
+                                 int fd, unsigned long start, bool readonly)
+{
+    const VFIOIOMMUFDContainer *container =
+        container_of(bcontainer, VFIOIOMMUFDContainer, bcontainer);
+
+    return iommufd_backend_map_file_dma(container->be,
+                                        container->ioas_id,
+                                        iova, size, fd, start, readonly);
+}
+
 static int iommufd_cdev_unmap(const VFIOContainerBase *bcontainer,
                               hwaddr iova, ram_addr_t size,
                               IOMMUTLBEntry *iotlb, bool unmap_all)
@@ -807,6 +819,7 @@ static void vfio_iommu_iommufd_class_init(ObjectClass *klass, const void *data)
     VFIOIOMMUClass *vioc = VFIO_IOMMU_CLASS(klass);
 
     vioc->dma_map = iommufd_cdev_map;
+    vioc->dma_map_file = iommufd_cdev_map_file;
     vioc->dma_unmap = iommufd_cdev_unmap;
     vioc->attach_device = iommufd_cdev_attach;
     vioc->detach_device = iommufd_cdev_detach;
-- 
1.8.3.1



  parent reply	other threads:[~2025-07-02 22:03 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-02 21:58 [PATCH V6 00/21] Live update: vfio and iommufd Steve Sistare
2025-07-02 21:58 ` [PATCH V6 01/21] vfio-pci: preserve MSI Steve Sistare
2025-07-03  6:13   ` Cédric Le Goater
2025-07-02 21:58 ` [PATCH V6 02/21] vfio-pci: preserve INTx Steve Sistare
2025-07-03  6:13   ` Cédric Le Goater
2025-07-02 21:58 ` [PATCH V6 03/21] migration: close kvm after cpr Steve Sistare
2025-07-02 22:05   ` Steven Sistare
2025-07-04  9:50     ` Duan, Zhenzhong
2025-07-07 13:07       ` Steven Sistare
2025-07-08  3:04         ` Duan, Zhenzhong
2025-07-02 21:58 ` [PATCH V6 04/21] migration: cpr_get_fd_param helper Steve Sistare
2025-07-02 21:58 ` [PATCH V6 05/21] backends/iommufd: iommufd_backend_map_file_dma Steve Sistare
2025-07-02 21:58 ` [PATCH V6 06/21] backends/iommufd: change process ioctl Steve Sistare
2025-07-02 21:58 ` [PATCH V6 07/21] physmem: qemu_ram_get_fd_offset Steve Sistare
2025-07-02 21:58 ` Steve Sistare [this message]
2025-07-02 21:58 ` [PATCH V6 09/21] vfio/iommufd: invariant device name Steve Sistare
2025-07-02 21:58 ` [PATCH V6 10/21] vfio/iommufd: add vfio_device_free_name Steve Sistare
2025-07-02 21:58 ` [PATCH V6 11/21] vfio/iommufd: device name blocker Steve Sistare
2025-07-02 21:58 ` [PATCH V6 12/21] vfio/iommufd: register container for cpr Steve Sistare
2025-07-03  2:42   ` Duan, Zhenzhong
2025-07-02 21:58 ` [PATCH V6 13/21] migration: vfio cpr state hook Steve Sistare
2025-07-03  2:44   ` Duan, Zhenzhong
2025-07-02 21:58 ` [PATCH V6 14/21] vfio/iommufd: cpr state Steve Sistare
2025-07-02 21:58 ` [PATCH V6 15/21] vfio/iommufd: preserve descriptors Steve Sistare
2025-07-02 21:58 ` [PATCH V6 16/21] vfio/iommufd: reconstruct device Steve Sistare
2025-07-02 21:58 ` [PATCH V6 17/21] vfio/iommufd: reconstruct hwpt Steve Sistare
2025-07-02 21:58 ` [PATCH V6 18/21] vfio/iommufd: change process Steve Sistare
2025-07-02 21:58 ` [PATCH V6 19/21] iommufd: preserve DMA mappings Steve Sistare
2025-07-02 21:58 ` [PATCH V6 20/21] vfio/container: delete old cpr register Steve Sistare
2025-07-02 21:58 ` [PATCH V6 21/21] vfio: doc changes for cpr Steve Sistare
2025-07-03  6:22 ` [PATCH V6 00/21] Live update: vfio and iommufd Cédric Le Goater

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=1751493538-202042-9-git-send-email-steven.sistare@oracle.com \
    --to=steven.sistare@oracle.com \
    --cc=alex.williamson@redhat.com \
    --cc=clg@redhat.com \
    --cc=eric.auger@redhat.com \
    --cc=farosas@suse.de \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mst@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=yi.l.liu@intel.com \
    --cc=zhenzhong.duan@intel.com \
    /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).