| Message ID | 20240607143905.765133-8-eric.auger@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | VIRTIO-IOMMU/VFIO: Fix host iommu geometry handling for hotplugged devices | expand |
>-----Original Message----- >From: Eric Auger <eric.auger@redhat.com> >Subject: [RFC v2 7/7] memory: Remove IOMMU MR iommu_set_iova_range >API > >Since the host IOVA ranges are now passed through the >PCIIOMMUOps set_host_resv_regions and we have removed >the only implementation of iommu_set_iova_range() in >the virtio-iommu and the only call site in vfio/common, >let's retire the IOMMU MR API and its memory wrapper. > >Signed-off-by: Eric Auger <eric.auger@redhat.com> Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com> Thanks Zhenzhong >--- > include/exec/memory.h | 32 -------------------------------- > system/memory.c | 13 ------------- > 2 files changed, 45 deletions(-) > >diff --git a/include/exec/memory.h b/include/exec/memory.h >index 9cdd64e9c6..35d772e52b 100644 >--- a/include/exec/memory.h >+++ b/include/exec/memory.h >@@ -530,26 +530,6 @@ struct IOMMUMemoryRegionClass { > int (*iommu_set_page_size_mask)(IOMMUMemoryRegion *iommu, > uint64_t page_size_mask, > Error **errp); >- /** >- * @iommu_set_iova_ranges: >- * >- * Propagate information about the usable IOVA ranges for a given >IOMMU >- * memory region. Used for example to propagate host physical device >- * reserved memory region constraints to the virtual IOMMU. >- * >- * Optional method: if this method is not provided, then the default IOVA >- * aperture is used. >- * >- * @iommu: the IOMMUMemoryRegion >- * >- * @iova_ranges: list of ordered IOVA ranges (at least one range) >- * >- * Returns 0 on success, or a negative error. In case of failure, the error >- * object must be created. >- */ >- int (*iommu_set_iova_ranges)(IOMMUMemoryRegion *iommu, >- GList *iova_ranges, >- Error **errp); > }; > > typedef struct RamDiscardListener RamDiscardListener; >@@ -1945,18 +1925,6 @@ int >memory_region_iommu_set_page_size_mask(IOMMUMemoryRegion >*iommu_mr, > uint64_t page_size_mask, > Error **errp); > >-/** >- * memory_region_iommu_set_iova_ranges - Set the usable IOVA ranges >- * for a given IOMMU MR region >- * >- * @iommu: IOMMU memory region >- * @iova_ranges: list of ordered IOVA ranges (at least one range) >- * @errp: pointer to Error*, to store an error if it happens. >- */ >-int memory_region_iommu_set_iova_ranges(IOMMUMemoryRegion >*iommu, >- GList *iova_ranges, >- Error **errp); >- > /** > * memory_region_name: get a memory region's name > * >diff --git a/system/memory.c b/system/memory.c >index 9540caa8a1..248d514f83 100644 >--- a/system/memory.c >+++ b/system/memory.c >@@ -1914,19 +1914,6 @@ int >memory_region_iommu_set_page_size_mask(IOMMUMemoryRegion >*iommu_mr, > return ret; > } > >-int memory_region_iommu_set_iova_ranges(IOMMUMemoryRegion >*iommu_mr, >- GList *iova_ranges, >- Error **errp) >-{ >- IOMMUMemoryRegionClass *imrc = >IOMMU_MEMORY_REGION_GET_CLASS(iommu_mr); >- int ret = 0; >- >- if (imrc->iommu_set_iova_ranges) { >- ret = imrc->iommu_set_iova_ranges(iommu_mr, iova_ranges, errp); >- } >- return ret; >-} >- > int memory_region_register_iommu_notifier(MemoryRegion *mr, > IOMMUNotifier *n, Error **errp) > { >-- >2.41.0
diff --git a/include/exec/memory.h b/include/exec/memory.h index 9cdd64e9c6..35d772e52b 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -530,26 +530,6 @@ struct IOMMUMemoryRegionClass { int (*iommu_set_page_size_mask)(IOMMUMemoryRegion *iommu, uint64_t page_size_mask, Error **errp); - /** - * @iommu_set_iova_ranges: - * - * Propagate information about the usable IOVA ranges for a given IOMMU - * memory region. Used for example to propagate host physical device - * reserved memory region constraints to the virtual IOMMU. - * - * Optional method: if this method is not provided, then the default IOVA - * aperture is used. - * - * @iommu: the IOMMUMemoryRegion - * - * @iova_ranges: list of ordered IOVA ranges (at least one range) - * - * Returns 0 on success, or a negative error. In case of failure, the error - * object must be created. - */ - int (*iommu_set_iova_ranges)(IOMMUMemoryRegion *iommu, - GList *iova_ranges, - Error **errp); }; typedef struct RamDiscardListener RamDiscardListener; @@ -1945,18 +1925,6 @@ int memory_region_iommu_set_page_size_mask(IOMMUMemoryRegion *iommu_mr, uint64_t page_size_mask, Error **errp); -/** - * memory_region_iommu_set_iova_ranges - Set the usable IOVA ranges - * for a given IOMMU MR region - * - * @iommu: IOMMU memory region - * @iova_ranges: list of ordered IOVA ranges (at least one range) - * @errp: pointer to Error*, to store an error if it happens. - */ -int memory_region_iommu_set_iova_ranges(IOMMUMemoryRegion *iommu, - GList *iova_ranges, - Error **errp); - /** * memory_region_name: get a memory region's name * diff --git a/system/memory.c b/system/memory.c index 9540caa8a1..248d514f83 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1914,19 +1914,6 @@ int memory_region_iommu_set_page_size_mask(IOMMUMemoryRegion *iommu_mr, return ret; } -int memory_region_iommu_set_iova_ranges(IOMMUMemoryRegion *iommu_mr, - GList *iova_ranges, - Error **errp) -{ - IOMMUMemoryRegionClass *imrc = IOMMU_MEMORY_REGION_GET_CLASS(iommu_mr); - int ret = 0; - - if (imrc->iommu_set_iova_ranges) { - ret = imrc->iommu_set_iova_ranges(iommu_mr, iova_ranges, errp); - } - return ret; -} - int memory_region_register_iommu_notifier(MemoryRegion *mr, IOMMUNotifier *n, Error **errp) {
Since the host IOVA ranges are now passed through the PCIIOMMUOps set_host_resv_regions and we have removed the only implementation of iommu_set_iova_range() in the virtio-iommu and the only call site in vfio/common, let's retire the IOMMU MR API and its memory wrapper. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- include/exec/memory.h | 32 -------------------------------- system/memory.c | 13 ------------- 2 files changed, 45 deletions(-)