iommu/vt-d: fix range computation when making room for large pages
PATCH 1/1 iommu/vt-d: fix range computation when making room for large pages
In preparation for the installation of a large page, any small page tables that may still exist in the target IOV address range are removed. However, if a scatter/gather list entry is large enough to fit more than one large page, the address space for those secondary large pages is not cleared of conflicting small page tables.
This can cause legitimate mapping requests to fail with errors of the form below, potentially followed by a series of IOMMU faults:
ERROR: DMA PTE for vPFN 0xfde00 already set (to 7f83a4003 not 7e9e00083)
In this example, a 4MB scatter/gather list entry resulted in the successful installation of a large page @ vPFN 0xfdc00, followed by a failed attempt to install another large page @ vPFN 0xfde00, due to the presence of a pointer to a small page table @ 0x7f83a4000.
To address this problem, compute the number of large pages that fit into a given scatter/gather list entry, and use it to derive the last vPFN covered by the large page(s).
--- drivers/iommu/intel-iommu.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/iommu/intel-iommu.c +8 -4
@@ -1986,6 +1986,7 @@ static int __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn,unsigned long sg_res =0 ;unsigned int largepage_lvl =0 ;unsigned long lvl_pages =0 ; +unsigned long nr_superpages, end_pfn;BUG_ON (!domain_pfn_supported (domain, iov_pfn + nr_pages -1 ));
@@ -2020,13 +2021,16 @@ static int __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn,if (largepage_lvl >1 ) { pteval |=DMA_PTE_LARGE_PAGE ; lvl_pages =lvl_to_nr_pages (largepage_lvl); + + nr_superpages = sg_res / lvl_pages; + end_pfn = iov_pfn + nr_superpages * lvl_pages -1 ; +/* * Ensure that old small page tables are -* removed to make room for superpage, -* if they exist. +* removed, if any exist, to make room for the +* superpage(s). */ -dma_pte_free_pagetable (domain, iov_pfn, - iov_pfn + lvl_pages -1 ); +dma_pte_free_pagetable (domain, iov_pfn, end_pfn); }else { pteval &= ~(uint64_t )DMA_PTE_LARGE_PAGE ; }
A message that is not in the archive (sent off-list or not yet received): 20150610164145.GA7583-S8cdEeysnC83VuCnIjKjaZqQE7yCjDx5@public.gmane.org
Quoted 16 lines · Christian Zander
In preparation for the installation of a large page, any small page tables that may still exist in the target IOV address range are removed. However, if a scatter/gather list entry is large enough to fit more than one large page, the address space for those secondary large pages is not cleared of conflicting small page tables.
This can cause legitimate mapping requests to fail with errors of the form below, potentially followed by a series of IOMMU faults:
ERROR: DMA PTE for vPFN
0xfde00already set (to7f83a4003not7e9e00083)In this example, a 4MB scatter/gather list entry resulted in the successful installation of a large page @ vPFN
0xfdc00, followed by a failed attempt to install another large page @ vPFN0xfde00, due to the presence of a pointer to a small page table @0x7f83a4000.
Quoted 6 lines
To address this problem, compute the number of large pages that fit into a given scatter/gather list entry, and use it to derive the last vPFN covered by the large page(s).
Thanks; the fix looks correct. I've pushed it with minor cosmetic fixes to my tree, and will send it on to Linus in a few days assuming nothing explodes (which of course it shouldn't).
Signature · 2 lines
David Woodhouse Open Source Technology Centre [email protected] Intel Corporation
A message that is not in the archive (sent off-list or not yet received): 1444765078.125804.36.camel-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org
Quoted 21 lines · David Woodhouse
Quoted 20 lines · Christian Zander
In preparation for the installation of a large page, any small page tables that may still exist in the target IOV address range are removed. However, if a scatter/gather list entry is large enough to fit more than one large page, the address space for those secondary large pages is not cleared of conflicting small page tables.
This can cause legitimate mapping requests to fail with errors of the form below, potentially followed by a series of IOMMU faults:
ERROR: DMA PTE for vPFN
0xfde00already set (to7f83a4003not7e9e00083)In this example, a 4MB scatter/gather list entry resulted in the successful installation of a large page @ vPFN
0xfdc00, followed by a failed attempt to install another large page @ vPFN0xfde00, due to the presence of a pointer to a small page table @0x7f83a4000.To address this problem, compute the number of large pages that fit into a given scatter/gather list entry, and use it to derive the last vPFN covered by the large page(s).
Quoted 7 lines
Quoted 2 lines
Thanks; the fix looks correct. I've pushed it with minor cosmetic fixes to my tree, and will send it on to Linus in a few days assuming nothing explodes (which of course it shouldn't).
Thanks David.
--
Quoted 4 lines
David Woodhouse Open Source Technology Centre
[email protected] Intel Corporation