Skip to content

Commit cb26a69

Browse files
davidhildenbrandakpm00
authored andcommitted
mm/hugetlb: fix hugetlb vs. core-mm PT locking
We recently made GUP's common page table walking code to also walk hugetlb VMAs without most hugetlb special-casing, preparing for the future of having less hugetlb-specific page table walking code in the codebase. Turns out that we missed one page table locking detail: page table locking for hugetlb folios that are not mapped using a single PMD/PUD. Assume we have hugetlb folio that spans multiple PTEs (e.g., 64 KiB hugetlb folios on arm64 with 4 KiB base page size). GUP, as it walks the page tables, will perform a pte_offset_map_lock() to grab the PTE table lock. However, hugetlb that concurrently modifies these page tables would actually grab the mm->page_table_lock: with USE_SPLIT_PTE_PTLOCKS, the locks would differ. Something similar can happen right now with hugetlb folios that span multiple PMDs when USE_SPLIT_PMD_PTLOCKS. This issue can be reproduced [1], for example triggering: [ 3105.936100] ------------[ cut here ]------------ [ 3105.939323] WARNING: CPU: 31 PID: 2732 at mm/gup.c:142 try_grab_folio+0x11c/0x188 [ 3105.944634] Modules linked in: [...] [ 3105.974841] CPU: 31 PID: 2732 Comm: reproducer Not tainted 6.10.0-64.eln141.aarch64 #1 [ 3105.980406] Hardware name: QEMU KVM Virtual Machine, BIOS edk2-20240524-4.fc40 05/24/2024 [ 3105.986185] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 3105.991108] pc : try_grab_folio+0x11c/0x188 [ 3105.994013] lr : follow_page_pte+0xd8/0x430 [ 3105.996986] sp : ffff80008eafb8f0 [ 3105.999346] x29: ffff80008eafb900 x28: ffffffe8d481f380 x27: 00f80001207cff43 [ 3106.004414] x26: 0000000000000001 x25: 0000000000000000 x24: ffff80008eafba48 [ 3106.009520] x23: 0000ffff9372f000 x22: ffff7a54459e2000 x21: ffff7a546c1aa978 [ 3106.014529] x20: ffffffe8d481f3c0 x19: 0000000000610041 x18: 0000000000000001 [ 3106.019506] x17: 0000000000000001 x16: ffffffffffffffff x15: 0000000000000000 [ 3106.024494] x14: ffffb85477fdfe08 x13: 0000ffff9372ffff x12: 0000000000000000 [ 3106.029469] x11: 1fffef4a88a96be1 x10: ffff7a54454b5f0c x9 : ffffb854771b12f0 [ 3106.034324] x8 : 0008000000000000 x7 : ffff7a546c1aa980 x6 : 0008000000000080 [ 3106.038902] x5 : 00000000001207cf x4 : 0000ffff9372f000 x3 : ffffffe8d481f000 [ 3106.043420] x2 : 0000000000610041 x1 : 0000000000000001 x0 : 0000000000000000 [ 3106.047957] Call trace: [ 3106.049522] try_grab_folio+0x11c/0x188 [ 3106.051996] follow_pmd_mask.constprop.0.isra.0+0x150/0x2e0 [ 3106.055527] follow_page_mask+0x1a0/0x2b8 [ 3106.058118] __get_user_pages+0xf0/0x348 [ 3106.060647] faultin_page_range+0xb0/0x360 [ 3106.063651] do_madvise+0x340/0x598 Let's make huge_pte_lockptr() effectively use the same PT locks as any core-mm page table walker would. Add ptep_lockptr() to obtain the PTE page table lock using a pte pointer -- unfortunately we cannot convert pte_lockptr() because virt_to_page() doesn't work with kmap'ed page tables we can have with CONFIG_HIGHPTE. Handle CONFIG_PGTABLE_LEVELS correctly by checking in reverse order, such that when e.g., CONFIG_PGTABLE_LEVELS==2 with PGDIR_SIZE==P4D_SIZE==PUD_SIZE==PMD_SIZE will work as expected. Document why that works. There is one ugly case: powerpc 8xx, whereby we have an 8 MiB hugetlb folio being mapped using two PTE page tables. While hugetlb wants to take the PMD table lock, core-mm would grab the PTE table lock of one of both PTE page tables. In such corner cases, we have to make sure that both locks match, which is (fortunately!) currently guaranteed for 8xx as it does not support SMP and consequently doesn't use split PT locks. [1] https://lore.kernel.org/all/[email protected]/ Link: https://lkml.kernel.org/r/[email protected] Fixes: 9cb28da ("mm/gup: handle hugetlb in the generic follow_page_mask code") Signed-off-by: David Hildenbrand <[email protected]> Acked-by: Peter Xu <[email protected]> Reviewed-by: Baolin Wang <[email protected]> Tested-by: Baolin Wang <[email protected]> Cc: Peter Xu <[email protected]> Cc: Oscar Salvador <[email protected]> Cc: Muchun Song <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 691bedd commit cb26a69

File tree

2 files changed

+41
-3
lines changed

2 files changed

+41
-3
lines changed

include/linux/hugetlb.h

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -944,10 +944,37 @@ static inline bool htlb_allow_alloc_fallback(int reason)
944944
static inline spinlock_t *huge_pte_lockptr(struct hstate *h,
945945
struct mm_struct *mm, pte_t *pte)
946946
{
947-
if (huge_page_size(h) == PMD_SIZE)
947+
const unsigned long size = huge_page_size(h);
948+
949+
VM_WARN_ON(size == PAGE_SIZE);
950+
951+
/*
952+
* hugetlb must use the exact same PT locks as core-mm page table
953+
* walkers would. When modifying a PTE table, hugetlb must take the
954+
* PTE PT lock, when modifying a PMD table, hugetlb must take the PMD
955+
* PT lock etc.
956+
*
957+
* The expectation is that any hugetlb folio smaller than a PMD is
958+
* always mapped into a single PTE table and that any hugetlb folio
959+
* smaller than a PUD (but at least as big as a PMD) is always mapped
960+
* into a single PMD table.
961+
*
962+
* If that does not hold for an architecture, then that architecture
963+
* must disable split PT locks such that all *_lockptr() functions
964+
* will give us the same result: the per-MM PT lock.
965+
*
966+
* Note that with e.g., CONFIG_PGTABLE_LEVELS=2 where
967+
* PGDIR_SIZE==P4D_SIZE==PUD_SIZE==PMD_SIZE, we'd use pud_lockptr()
968+
* and core-mm would use pmd_lockptr(). However, in such configurations
969+
* split PMD locks are disabled -- they don't make sense on a single
970+
* PGDIR page table -- and the end result is the same.
971+
*/
972+
if (size >= PUD_SIZE)
973+
return pud_lockptr(mm, (pud_t *) pte);
974+
else if (size >= PMD_SIZE || IS_ENABLED(CONFIG_HIGHPTE))
948975
return pmd_lockptr(mm, (pmd_t *) pte);
949-
VM_BUG_ON(huge_page_size(h) == PAGE_SIZE);
950-
return &mm->page_table_lock;
976+
/* pte_alloc_huge() only applies with !CONFIG_HIGHPTE */
977+
return ptep_lockptr(mm, pte);
951978
}
952979

953980
#ifndef hugepages_supported

include/linux/mm.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2920,6 +2920,13 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd)
29202920
return ptlock_ptr(page_ptdesc(pmd_page(*pmd)));
29212921
}
29222922

2923+
static inline spinlock_t *ptep_lockptr(struct mm_struct *mm, pte_t *pte)
2924+
{
2925+
BUILD_BUG_ON(IS_ENABLED(CONFIG_HIGHPTE));
2926+
BUILD_BUG_ON(MAX_PTRS_PER_PTE * sizeof(pte_t) > PAGE_SIZE);
2927+
return ptlock_ptr(virt_to_ptdesc(pte));
2928+
}
2929+
29232930
static inline bool ptlock_init(struct ptdesc *ptdesc)
29242931
{
29252932
/*
@@ -2944,6 +2951,10 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd)
29442951
{
29452952
return &mm->page_table_lock;
29462953
}
2954+
static inline spinlock_t *ptep_lockptr(struct mm_struct *mm, pte_t *pte)
2955+
{
2956+
return &mm->page_table_lock;
2957+
}
29472958
static inline void ptlock_cache_init(void) {}
29482959
static inline bool ptlock_init(struct ptdesc *ptdesc) { return true; }
29492960
static inline void ptlock_free(struct ptdesc *ptdesc) {}

0 commit comments

Comments
 (0)