intel_iommu_iova_to_phys() has a bug when it translates an IOVA for a huge page onto its corresponding physical address. This commit fixes the bug by accomodating the level of page entry for the IOVA and adds IOVA's lower address to the physical address.
Signed-off-by: Yonghyun Hwang <[email protected]> --- drivers/iommu/intel-iommu.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 0c8d81f56a30..beff7ede41f4 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -5548,6 +5548,15 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain, return size; } +static inline unsigned long pfn_level_mask(unsigned long pfn, int level) +{ + if (level > 1) + return pfn & (BIT_MASK(level_to_offset_bits(level)) - 1) + << VTD_PAGE_SHIFT; + else + return 0; +} + static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova) { @@ -5555,13 +5564,15 @@ static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain, struct dma_pte *pte; int level = 0; u64 phys = 0; + const unsigned long pfn = iova >> VTD_PAGE_SHIFT; if (dmar_domain->flags & DOMAIN_FLAG_LOSE_CHILDREN) return 0; - pte = pfn_to_dma_pte(dmar_domain, iova >> VTD_PAGE_SHIFT, &level); + pte = pfn_to_dma_pte(dmar_domain, pfn, &level); if (pte) - phys = dma_pte_addr(pte); + phys = dma_pte_addr(pte) + pfn_level_mask(pfn, level) + + (iova & ~VTD_PAGE_MASK); return phys; } -- 2.25.0.265.gbab2e86ba0-goog _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
