Skip to contentSkip to conversation

arm64: mm: Walk page tables with interrupts disabled in show_pte()

PATCH In review Karl Mehltretter 2 participants 3 messages Aug 15 – Aug 28 arm64

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: mm: Walk page tables with interrupts disabled in show_pte()

show_pte() walks the page tables locklessly and can run with interrupts enabled, so a concurrent teardown (e.g. munmap() in another thread of the faulting mm) can free a table page from under it. Dereferencing the freed page can fault again or print garbage in the oops report.

arm64 selects MMU_GATHER_RCU_TABLE_FREE, and the documented protection for lockless walkers is disabling interrupts, as gup_fast() does. That holds off the RCU-deferred table frees and, unlike rcu_read_lock(), also blocks the IPI-based synchronisation (tlb_remove_table_sync_one()) that khugepaged collapse uses before reusing a table.

Use guard(irqsave)() around the complete walk. This does not make the diagnostic output a consistent snapshot, but prevents it from dereferencing a released page-table page.

Fixes 1d18c47c735e ("arm64: MMU fault handling and page table management")
Assisted-by Codex:gpt-5.6-sol

---
Testing: QEMU arm64 virt guest, 2 vCPUs, debug_pagealloc=on. A racing page-table unmap triggered a nested fault in the walk without this patch, none with it.

 arch/arm64/mm/fault.c | 3 +++
 1 file changed, 3 insertions(+)
arch/arm64/mm/fault.c +3 -0
index 0b52557652be6..b173eebd3cd19 100644
@@ -16,6 +16,7 @@
 #include <linux/mm.h>
 #include <linux/hardirq.h>
 #include <linux/init.h>
+#include <linux/irqflags.h>
 #include <linux/kasan.h>
 #include <linux/kprobes.h>
 #include <linux/uaccess.h>
@@ -151,6 +152,8 @@ static void show_pte(unsigned long addr)
 		return;
 	}
 
+	guard(irqsave)();
+
 	pr_alert("%s pgtable: %luk pages, %llu-bit VAs, pgdp=%016lx\n",
 		 mm == &init_mm ? "swapper" : "user", PAGE_SIZE / SZ_1K,
 		 vabits_actual, mm_to_pgd_phys(mm));
Signature · 1 line
2.53.0
maintainer
#1 lore raw
Quoted 39 lines · Karl Mehltretter

show_pte() walks the page tables locklessly and can run with interrupts enabled, so a concurrent teardown (e.g. munmap() in another thread of the faulting mm) can free a table page from under it. Dereferencing the freed page can fault again or print garbage in the oops report.

arm64 selects MMU_GATHER_RCU_TABLE_FREE, and the documented protection for lockless walkers is disabling interrupts, as gup_fast() does. That holds off the RCU-deferred table frees and, unlike rcu_read_lock(), also blocks the IPI-based synchronisation (tlb_remove_table_sync_one()) that khugepaged collapse uses before reusing a table.

Use guard(irqsave)() around the complete walk. This does not make the diagnostic output a consistent snapshot, but prevents it from dereferencing a released page-table page.

Fixes 1d18c47c735e ("arm64: MMU fault handling and page table management")
Assisted-by Codex:gpt-5.6-sol

---
Testing: QEMU arm64 virt guest, 2 vCPUs, debug_pagealloc=on. A racing page-table unmap triggered a nested fault in the walk without this patch, none with it.

 arch/arm64/mm/fault.c | 3 +++
 1 file changed, 3 insertions(+)
arch/arm64/mm/fault.c +1 -0
index 0b52557652be6..b173eebd3cd19 100644
@@ -16,6 +16,7 @@
 #include <linux/mm.h>
 #include <linux/hardirq.h>
 #include <linux/init.h>
+#include <linux/irqflags.h>
 #include <linux/kasan.h>
 #include <linux/kprobes.h>
 #include <linux/uaccess.h>

arch/arm64/mm/fault.c static void show_pte(unsigned long addr) · line 159

Quoted 8 lines
arch/arm64/mm/fault.c +2 -0
@@ -151,6 +152,8 @@ static void show_pte(unsigned long addr)
 		return;
 	}
 
+	guard(irqsave)();
+
 	pr_alert("%s pgtable: %luk pages, %llu-bit VAs, pgdp=%016lx\n",
 		 mm == &init_mm ? "swapper" : "user", PAGE_SIZE / SZ_1K,
 		 vabits_actual, mm_to_pgd_phys(mm));

Curious, but why did you add the guard before the print?

Will

#2 lore raw
Quoted 11 lines · Will Deacon

arch/arm64/mm/fault.c static void show_pte(unsigned long addr) · line 159

Quoted 9 lines
arch/arm64/mm/fault.c +2 -0
@@ -151,6 +152,8 @@ static void show_pte(unsigned long addr)
 		return;
 	}
 
+	guard(irqsave)();
+
 	pr_alert("%s pgtable: %luk pages, %llu-bit VAs, pgdp=%016lx\n",
 		 mm == &init_mm ? "swapper" : "user", PAGE_SIZE / SZ_1K,
 		 vabits_actual, mm_to_pgd_phys(mm));

Curious, but why did you add the guard before the print?

Good point. No need to cover the print, I'll move it below in v2.

Thanks,
Karl