Implement iova_to_phys_length for virtio IOMMU driver, returning the actual PTE mapping size.
Signed-off-by: Guanghui Feng <[email protected]> --- drivers/iommu/virtio-iommu.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c index 587fc13197f1..b92316257e42 100644 --- a/drivers/iommu/virtio-iommu.c +++ b/drivers/iommu/virtio-iommu.c @@ -912,10 +912,11 @@ static size_t viommu_unmap_pages(struct iommu_domain *domain, unsigned long iova return ret ? 0 : unmapped; } -static phys_addr_t viommu_iova_to_phys(struct iommu_domain *domain, - dma_addr_t iova) +static phys_addr_t viommu_iova_to_phys_length(struct iommu_domain *domain, + dma_addr_t iova, + size_t *mapped_length) { - u64 paddr = 0; + u64 paddr = PHYS_ADDR_MAX; unsigned long flags; struct viommu_mapping *mapping; struct interval_tree_node *node; @@ -926,6 +927,9 @@ static phys_addr_t viommu_iova_to_phys(struct iommu_domain *domain, if (node) { mapping = container_of(node, struct viommu_mapping, iova); paddr = mapping->paddr + (iova - mapping->iova.start); + if (mapped_length) + *mapped_length = mapping->iova.last - + mapping->iova.start + 1; } spin_unlock_irqrestore(&vdomain->mappings_lock, flags); @@ -1102,7 +1106,7 @@ static const struct iommu_ops viommu_ops = { .attach_dev = viommu_attach_dev, .map_pages = viommu_map_pages, .unmap_pages = viommu_unmap_pages, - .iova_to_phys = viommu_iova_to_phys, + .iova_to_phys_length = viommu_iova_to_phys_length, .flush_iotlb_all = viommu_flush_iotlb_all, .iotlb_sync = viommu_iotlb_sync, .iotlb_sync_map = viommu_iotlb_sync_map, -- 2.43.7
