diff options
| author | Yonghyun Hwang <[email protected]> | 2020-02-26 12:30:06 -0800 |
|---|---|---|
| committer | Joerg Roedel <[email protected]> | 2020-03-02 17:07:48 +0100 |
| commit | 77a1bce84bba01f3f143d77127b72e872b573795 (patch) | |
| tree | f9f48197c21613282c8819e3a18dbdd9a5278f5c | |
| parent | 02d715b4a8182f4887d82df82a7b83aced647760 (diff) | |
iommu/vt-d: Fix a bug in intel_iommu_iova_to_phys() for huge page
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.
Cc: <[email protected]>
Acked-by: Lu Baolu <[email protected]>
Reviewed-by: Moritz Fischer <[email protected]>
Signed-off-by: Yonghyun Hwang <[email protected]>
Fixes: 3871794642579 ("VT-d: Changes to support KVM")
Signed-off-by: Joerg Roedel <[email protected]>
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 6fa6de2b6ad5..33593fea0250 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -5700,8 +5700,10 @@ static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain, u64 phys = 0; pte = pfn_to_dma_pte(dmar_domain, iova >> VTD_PAGE_SHIFT, &level); - if (pte) - phys = dma_pte_addr(pte); + if (pte && dma_pte_present(pte)) + phys = dma_pte_addr(pte) + + (iova & (BIT_MASK(level_to_offset_bits(level) + + VTD_PAGE_SHIFT) - 1)); return phys; } |