[PATCH] iommu/vt-d: Fix a bug in intel_iommu_iova_to_phys() for huge page

[Yonghyun Hwang]

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 <yonghyun@xxxxxxxxxx>
---
 drivers/iommu/intel-iommu.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 0c8d81f56a30..ed6e69adb578 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -5555,13 +5555,20 @@ 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);
-	if (pte)
+	pte = pfn_to_dma_pte(dmar_domain, pfn, &level);
+	if (pte) {
 		phys = dma_pte_addr(pte);
+		if (level > 1)
+			phys += (pfn &
+				((1UL << level_to_offset_bits(level)) - 1))
+				<< VTD_PAGE_SHIFT;
+		phys += iova & (VTD_PAGE_SIZE - 1);
+	}
 
 	return phys;
 }
-- 
2.25.0.265.gbab2e86ba0-goog