Commit 77a1bce8 authored by Yonghyun Hwang's avatar Yonghyun Hwang Committed by Joerg Roedel

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: <stable@vger.kernel.org>
Acked-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarMoritz Fischer <mdf@kernel.org>
Signed-off-by: default avatarYonghyun Hwang <yonghyun@google.com>
Fixes: 38717946 ("VT-d: Changes to support KVM")
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 02d715b4
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment