Skip to content

Commit 3663901

Browse files
committed
arm64: mm: Fix lockless walks with static and dynamic page-table folding
Lina reports random oopsen originating from the fast GUP code when 16K pages are used with 4-level page-tables, the fourth level being folded at runtime due to lack of LPA2. In this configuration, the generic implementation of p4d_offset_lockless() will return a 'p4d_t *' corresponding to the 'pgd_t' allocated on the stack of the caller, gup_fast_pgd_range(). This is normally fine, but when the fourth level of page-table is folded at runtime, pud_offset_lockless() will offset from the address of the 'p4d_t' to calculate the address of the PUD in the same page-table page. This results in a stray stack read when the 'p4d_t' has been allocated on the stack and can send the walker into the weeds. Fix the problem by providing our own definition of p4d_offset_lockless() when CONFIG_PGTABLE_LEVELS <= 4 which returns the real page-table pointer rather than the address of the local stack variable. Cc: Catalin Marinas <[email protected]> Cc: Ard Biesheuvel <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Fixes: 0dd4f60 ("arm64: mm: Add support for folding PUDs at runtime") Reported-by: Asahi Lina <[email protected]> Reviewed-by: Ard Biesheuvel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent f3dfcd2 commit 3663901

File tree

1 file changed

+22
-0
lines changed

1 file changed

+22
-0
lines changed

arch/arm64/include/asm/pgtable.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,6 +1065,28 @@ static inline bool pgtable_l5_enabled(void) { return false; }
10651065

10661066
#define p4d_offset_kimg(dir,addr) ((p4d_t *)dir)
10671067

1068+
static inline
1069+
p4d_t *p4d_offset_lockless_folded(pgd_t *pgdp, pgd_t pgd, unsigned long addr)
1070+
{
1071+
/*
1072+
* With runtime folding of the pud, pud_offset_lockless() passes
1073+
* the 'pgd_t *' we return here to p4d_to_folded_pud(), which
1074+
* will offset the pointer assuming that it points into
1075+
* a page-table page. However, the fast GUP path passes us a
1076+
* pgd_t allocated on the stack and so we must use the original
1077+
* pointer in 'pgdp' to construct the p4d pointer instead of
1078+
* using the generic p4d_offset_lockless() implementation.
1079+
*
1080+
* Note: reusing the original pointer means that we may
1081+
* dereference the same (live) page-table entry multiple times.
1082+
* This is safe because it is still only loaded once in the
1083+
* context of each level and the CPU guarantees same-address
1084+
* read-after-read ordering.
1085+
*/
1086+
return p4d_offset(pgdp, addr);
1087+
}
1088+
#define p4d_offset_lockless p4d_offset_lockless_folded
1089+
10681090
#endif /* CONFIG_PGTABLE_LEVELS > 4 */
10691091

10701092
#define pgd_ERROR(e) \

0 commit comments

Comments
 (0)