qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Yi Liu <yi.l.liu@intel.com>
To: Zhenzhong Duan <zhenzhong.duan@intel.com>, <qemu-devel@nongnu.org>
Cc: <alex.williamson@redhat.com>, <clg@redhat.com>, <mst@redhat.com>,
	<jasowang@redhat.com>, <clement.mathieu--drif@eviden.com>,
	<eric.auger@redhat.com>, <joao.m.martins@oracle.com>,
	<avihaih@nvidia.com>, <xudong.hao@intel.com>,
	<giovanni.cabiddu@intel.com>, <mark.gross@intel.com>,
	 <arjan.van.de.ven@intel.com>
Subject: Re: [PATCH v2 4/8] vfio: Add a backend_flag parameter to vfio_contianer_query_dirty_bitmap()
Date: Mon, 20 Oct 2025 20:44:25 +0800	[thread overview]
Message-ID: <a7a4131d-dfbe-4c52-980f-0d2f8f221023@intel.com> (raw)
In-Reply-To: <20251017082234.517827-5-zhenzhong.duan@intel.com>

On 2025/10/17 16:22, Zhenzhong Duan wrote:
> From: Joao Martins <joao.m.martins@oracle.com>
> 
> This new parameter will be used in following patch, currently 0 is passed.
> 
> Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
> Tested-by: Giovannio Cabiddu <giovanni.cabiddu@intel.com>
> ---
>   include/hw/vfio/vfio-container.h |  8 ++++++--
>   hw/vfio-user/container.c         |  5 +++--
>   hw/vfio/container-legacy.c       |  5 +++--
>   hw/vfio/container.c              | 15 +++++++++------
>   hw/vfio/iommufd.c                |  7 ++++---
>   hw/vfio/listener.c               |  6 +++---
>   hw/vfio/trace-events             |  2 +-
>   7 files changed, 29 insertions(+), 19 deletions(-)

Reviewed-by: Yi Liu <yi.l.liu@intel.com>


> diff --git a/include/hw/vfio/vfio-container.h b/include/hw/vfio/vfio-container.h
> index c4b58d664b..9f6e8cedfc 100644
> --- a/include/hw/vfio/vfio-container.h
> +++ b/include/hw/vfio/vfio-container.h
> @@ -99,7 +99,9 @@ bool vfio_container_devices_dirty_tracking_is_supported(
>       const VFIOContainer *bcontainer);
>   int vfio_container_query_dirty_bitmap(const VFIOContainer *bcontainer,
>                                         uint64_t iova, uint64_t size,
> -                                      hwaddr translated_addr, Error **errp);
> +                                      uint64_t backend_flag,
> +                                      hwaddr translated_addr,
> +                                      Error **errp);
>   
>   GList *vfio_container_get_iova_ranges(const VFIOContainer *bcontainer);
>   
> @@ -253,12 +255,14 @@ struct VFIOIOMMUClass {
>        * @vbmap: #VFIOBitmap internal bitmap structure
>        * @iova: iova base address
>        * @size: size of iova range
> +     * @backend_flag: flags for backend, opaque to upper layer container
>        * @errp: pointer to Error*, to store an error if it happens.
>        *
>        * Returns zero to indicate success and negative for error.
>        */
>       int (*query_dirty_bitmap)(const VFIOContainer *bcontainer,
> -                VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp);
> +                              VFIOBitmap *vbmap, hwaddr iova, hwaddr size,
> +                              uint64_t backend_flag, Error **errp);
>       /* PCI specific */
>       int (*pci_hot_reset)(VFIODevice *vbasedev, bool single);
>   
> diff --git a/hw/vfio-user/container.c b/hw/vfio-user/container.c
> index e45192fef6..3ce6ea12db 100644
> --- a/hw/vfio-user/container.c
> +++ b/hw/vfio-user/container.c
> @@ -162,8 +162,9 @@ vfio_user_set_dirty_page_tracking(const VFIOContainer *bcontainer,
>   }
>   
>   static int vfio_user_query_dirty_bitmap(const VFIOContainer *bcontainer,
> -                                         VFIOBitmap *vbmap, hwaddr iova,
> -                                         hwaddr size, Error **errp)
> +                                        VFIOBitmap *vbmap, hwaddr iova,
> +                                        hwaddr size, uint64_t backend_flag,
> +                                        Error **errp)
>   {
>       error_setg_errno(errp, ENOTSUP, "Not supported");
>       return -ENOTSUP;
> diff --git a/hw/vfio/container-legacy.c b/hw/vfio/container-legacy.c
> index b7e3b892b9..dd9c4a6a5a 100644
> --- a/hw/vfio/container-legacy.c
> +++ b/hw/vfio/container-legacy.c
> @@ -154,7 +154,7 @@ static int vfio_legacy_dma_unmap_one(const VFIOLegacyContainer *container,
>       }
>   
>       if (need_dirty_sync) {
> -        ret = vfio_container_query_dirty_bitmap(bcontainer, iova, size,
> +        ret = vfio_container_query_dirty_bitmap(bcontainer, iova, size, 0,
>                                       iotlb->translated_addr, &local_err);
>           if (ret) {
>               error_report_err(local_err);
> @@ -255,7 +255,8 @@ vfio_legacy_set_dirty_page_tracking(const VFIOContainer *bcontainer,
>   }
>   
>   static int vfio_legacy_query_dirty_bitmap(const VFIOContainer *bcontainer,
> -                      VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp)
> +                                   VFIOBitmap *vbmap, hwaddr iova, hwaddr size,
> +                                   uint64_t backend_flag, Error **errp)
>   {
>       const VFIOLegacyContainer *container = VFIO_IOMMU_LEGACY(bcontainer);
>       struct vfio_iommu_type1_dirty_bitmap *dbitmap;
> diff --git a/hw/vfio/container.c b/hw/vfio/container.c
> index 9ddec300e3..7706603c1c 100644
> --- a/hw/vfio/container.c
> +++ b/hw/vfio/container.c
> @@ -213,13 +213,13 @@ static int vfio_device_dma_logging_report(VFIODevice *vbasedev, hwaddr iova,
>   
>   static int vfio_container_iommu_query_dirty_bitmap(
>       const VFIOContainer *bcontainer, VFIOBitmap *vbmap, hwaddr iova,
> -    hwaddr size, Error **errp)
> +    hwaddr size, uint64_t backend_flag, Error **errp)
>   {
>       VFIOIOMMUClass *vioc = VFIO_IOMMU_GET_CLASS(bcontainer);
>   
>       g_assert(vioc->query_dirty_bitmap);
>       return vioc->query_dirty_bitmap(bcontainer, vbmap, iova, size,
> -                                               errp);
> +                                    backend_flag, errp);
>   }
>   
>   static int vfio_container_devices_query_dirty_bitmap(
> @@ -247,7 +247,9 @@ static int vfio_container_devices_query_dirty_bitmap(
>   
>   int vfio_container_query_dirty_bitmap(const VFIOContainer *bcontainer,
>                                         uint64_t iova, uint64_t size,
> -                                      hwaddr translated_addr, Error **errp)
> +                                      uint64_t backend_flag,
> +                                      hwaddr translated_addr,
> +                                      Error **errp)
>   {
>       bool all_device_dirty_tracking =
>           vfio_container_devices_dirty_tracking_is_supported(bcontainer);
> @@ -274,7 +276,7 @@ int vfio_container_query_dirty_bitmap(const VFIOContainer *bcontainer,
>                                                           errp);
>       } else {
>           ret = vfio_container_iommu_query_dirty_bitmap(bcontainer, &vbmap, iova, size,
> -                                                     errp);
> +                                                      backend_flag, errp);
>       }
>   
>       if (ret) {
> @@ -285,8 +287,9 @@ int vfio_container_query_dirty_bitmap(const VFIOContainer *bcontainer,
>                                                            translated_addr,
>                                                            vbmap.pages);
>   
> -    trace_vfio_container_query_dirty_bitmap(iova, size, vbmap.size,
> -                                            translated_addr, dirty_pages);
> +    trace_vfio_container_query_dirty_bitmap(iova, size, backend_flag,
> +                                            vbmap.size, translated_addr,
> +                                            dirty_pages);
>   out:
>       g_free(vbmap.bitmap);
>   
> diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
> index 404e6249ca..6457cef344 100644
> --- a/hw/vfio/iommufd.c
> +++ b/hw/vfio/iommufd.c
> @@ -74,7 +74,7 @@ static int iommufd_cdev_unmap(const VFIOContainer *bcontainer,
>       if (iotlb && vfio_container_dirty_tracking_is_started(bcontainer)) {
>           if (!vfio_container_devices_dirty_tracking_is_supported(bcontainer) &&
>               bcontainer->dirty_pages_supported) {
> -            ret = vfio_container_query_dirty_bitmap(bcontainer, iova, size,
> +            ret = vfio_container_query_dirty_bitmap(bcontainer, iova, size, 0,
>                                                       iotlb->translated_addr,
>                                                       &local_err);
>               if (ret) {
> @@ -93,7 +93,7 @@ static int iommufd_cdev_unmap(const VFIOContainer *bcontainer,
>       }
>   
>       if (need_dirty_sync) {
> -        ret = vfio_container_query_dirty_bitmap(bcontainer, iova, size,
> +        ret = vfio_container_query_dirty_bitmap(bcontainer, iova, size, 0,
>                                                   iotlb->translated_addr,
>                                                   &local_err);
>           if (ret) {
> @@ -209,7 +209,8 @@ err:
>   
>   static int iommufd_query_dirty_bitmap(const VFIOContainer *bcontainer,
>                                         VFIOBitmap *vbmap, hwaddr iova,
> -                                      hwaddr size, Error **errp)
> +                                      hwaddr size, uint64_t backend_flag,
> +                                      Error **errp)
>   {
>       VFIOIOMMUFDContainer *container = VFIO_IOMMU_IOMMUFD(bcontainer);
>       unsigned long page_size = qemu_real_host_page_size();
> diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c
> index 2d7d3a4645..2109101158 100644
> --- a/hw/vfio/listener.c
> +++ b/hw/vfio/listener.c
> @@ -1083,7 +1083,7 @@ static void vfio_iommu_map_dirty_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
>       translated_addr = memory_region_get_ram_addr(mr) + xlat;
>   
>       ret = vfio_container_query_dirty_bitmap(bcontainer, iova, iotlb->addr_mask + 1,
> -                                translated_addr, &local_err);
> +                                0, translated_addr, &local_err);
>       if (ret) {
>           error_prepend(&local_err,
>                         "vfio_iommu_map_dirty_notify(%p, 0x%"HWADDR_PRIx", "
> @@ -1119,7 +1119,7 @@ static int vfio_ram_discard_query_dirty_bitmap(MemoryRegionSection *section,
>        * Sync the whole mapped region (spanning multiple individual mappings)
>        * in one go.
>        */
> -    ret = vfio_container_query_dirty_bitmap(vrdl->bcontainer, iova, size,
> +    ret = vfio_container_query_dirty_bitmap(vrdl->bcontainer, iova, size, 0,
>                                               translated_addr, &local_err);
>       if (ret) {
>           error_report_err(local_err);
> @@ -1204,7 +1204,7 @@ static int vfio_sync_dirty_bitmap(VFIOContainer *bcontainer,
>   
>       return vfio_container_query_dirty_bitmap(bcontainer,
>                      REAL_HOST_PAGE_ALIGN(section->offset_within_address_space),
> -                   int128_get64(section->size), translated_addr, errp);
> +                   int128_get64(section->size), 0, translated_addr, errp);
>   }
>   
>   static void vfio_listener_log_sync(MemoryListener *listener,
> diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
> index 1e895448cd..3c62bab764 100644
> --- a/hw/vfio/trace-events
> +++ b/hw/vfio/trace-events
> @@ -105,7 +105,7 @@ vfio_device_dirty_tracking_start(int nr_ranges, uint64_t min32, uint64_t max32,
>   vfio_iommu_map_dirty_notify(uint64_t iova_start, uint64_t iova_end) "iommu dirty @ 0x%"PRIx64" - 0x%"PRIx64
>   
>   # container.c
> -vfio_container_query_dirty_bitmap(uint64_t iova, uint64_t size, uint64_t bitmap_size, uint64_t translated_addr, uint64_t dirty_pages) "iova=0x%"PRIx64" size= 0x%"PRIx64" bitmap_size=0x%"PRIx64" gpa=0x%"PRIx64" dirty_pages=%"PRIu64
> +vfio_container_query_dirty_bitmap(uint64_t iova, uint64_t size, uint64_t backend_flag, uint64_t bitmap_size, uint64_t translated_addr, uint64_t dirty_pages) "iova=0x%"PRIx64" size=0x%"PRIx64" backend_flag=0x%"PRIx64" bitmap_size=0x%"PRIx64" gpa=0x%"PRIx64" dirty_pages=%"PRIu64
>   
>   # container-legacy.c
>   vfio_container_disconnect(int fd) "close container->fd=%d"


  parent reply	other threads:[~2025-10-20 12:38 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-17  8:22 [PATCH v2 0/8] vfio: relax the vIOMMU check Zhenzhong Duan
2025-10-17  8:22 ` [PATCH v2 1/8] vfio/iommufd: Add framework code to support getting dirty bitmap before unmap Zhenzhong Duan
2025-10-20  7:00   ` Cédric Le Goater
2025-10-20 12:44   ` Yi Liu
2025-10-17  8:22 ` [PATCH v2 2/8] vfio/iommufd: Query dirty bitmap before DMA unmap Zhenzhong Duan
2025-10-20  7:00   ` Cédric Le Goater
2025-10-20  8:14   ` Avihai Horon
2025-10-20 10:00     ` Duan, Zhenzhong
2025-10-20 12:45       ` Yi Liu
2025-10-20 13:04         ` Avihai Horon
2025-10-21  3:30           ` Yi Liu
2025-10-20 12:44   ` Yi Liu
2025-10-17  8:22 ` [PATCH v2 3/8] vfio/container-legacy: rename vfio_dma_unmap_bitmap() to vfio_legacy_dma_unmap_get_dirty_bitmap() Zhenzhong Duan
2025-10-20  7:00   ` Cédric Le Goater
2025-10-20 12:45   ` Yi Liu
2025-10-17  8:22 ` [PATCH v2 4/8] vfio: Add a backend_flag parameter to vfio_contianer_query_dirty_bitmap() Zhenzhong Duan
2025-10-20  7:01   ` Cédric Le Goater
2025-10-20 12:44   ` Yi Liu [this message]
2025-10-17  8:22 ` [PATCH v2 5/8] vfio/iommufd: Add IOMMU_HWPT_GET_DIRTY_BITMAP_NO_CLEAR flag support Zhenzhong Duan
2025-10-20  7:01   ` Cédric Le Goater
2025-10-20 12:45   ` Yi Liu
2025-10-17  8:22 ` [PATCH v2 6/8] intel_iommu: Fix unmap_bitmap failure with legacy VFIO backend Zhenzhong Duan
2025-10-20  7:06   ` Cédric Le Goater
2025-10-20  7:38   ` Yi Liu
2025-10-20  8:03     ` Duan, Zhenzhong
2025-10-20  8:37       ` Yi Liu
2025-10-20 10:01         ` Duan, Zhenzhong
2025-10-17  8:22 ` [PATCH v2 7/8] vfio/migration: Add migration blocker if VM memory is too large to cause unmap_bitmap failure Zhenzhong Duan
2025-10-20  8:39   ` Cédric Le Goater
2025-10-20 10:07     ` Duan, Zhenzhong
2025-10-20 12:44   ` Yi Liu
2025-10-21  8:25     ` Duan, Zhenzhong
2025-10-17  8:22 ` [PATCH v2 8/8] vfio/migration: Allow live migration with vIOMMU without VFs using device dirty tracking Zhenzhong Duan
2025-10-20 12:46   ` Yi Liu

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=a7a4131d-dfbe-4c52-980f-0d2f8f221023@intel.com \
    --to=yi.l.liu@intel.com \
    --cc=alex.williamson@redhat.com \
    --cc=arjan.van.de.ven@intel.com \
    --cc=avihaih@nvidia.com \
    --cc=clement.mathieu--drif@eviden.com \
    --cc=clg@redhat.com \
    --cc=eric.auger@redhat.com \
    --cc=giovanni.cabiddu@intel.com \
    --cc=jasowang@redhat.com \
    --cc=joao.m.martins@oracle.com \
    --cc=mark.gross@intel.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=xudong.hao@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).