Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

intel-iommu: Free old page tables before creating superpage

The dma_pte_free_pagetable() function will only free a page table page
if it is asked to free the *entire* 2MiB range that it covers. So if a
page table page was used for one or more small mappings, it's likely to
end up still present in the page tables... but with no valid PTEs.

This was fine when we'd only be repopulating it with 4KiB PTEs anyway
but the same virtual address range can end up being reused for a
*large-page* mapping. And in that case were were trying to insert the
large page into the second-level page table, and getting a complaint
from the sanity check in __domain_mapping() because there was already a
corresponding entry. This was *relatively* harmless; it led to a memory
leak of the old page table page, but no other ill-effects.

Fix it by calling dma_pte_clear_range (hopefully redundant) and
dma_pte_free_pagetable() before setting up the new large page.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Tested-by: Ravi Murty <Ravi.Murty@intel.com>
Tested-by: Sudeep Dutt <sudeep.dutt@intel.com>
Cc: stable@kernel.org [3.0+]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Woodhouse, David and committed by
Linus Torvalds
6491d4d0 18000985

+9 -2
+9 -2
drivers/iommu/intel-iommu.c
··· 1827 1827 if (!pte) 1828 1828 return -ENOMEM; 1829 1829 /* It is large page*/ 1830 - if (largepage_lvl > 1) 1830 + if (largepage_lvl > 1) { 1831 1831 pteval |= DMA_PTE_LARGE_PAGE; 1832 - else 1832 + /* Ensure that old small page tables are removed to make room 1833 + for superpage, if they exist. */ 1834 + dma_pte_clear_range(domain, iov_pfn, 1835 + iov_pfn + lvl_to_nr_pages(largepage_lvl) - 1); 1836 + dma_pte_free_pagetable(domain, iov_pfn, 1837 + iov_pfn + lvl_to_nr_pages(largepage_lvl) - 1); 1838 + } else { 1833 1839 pteval &= ~(uint64_t)DMA_PTE_LARGE_PAGE; 1840 + } 1834 1841 1835 1842 } 1836 1843 /* We don't need lock here, nobody else