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

x86: pgtable: always use pte_free_kernel()

Page table pages are normally freed using the appropriate helper for the
given page table level. On x86, pud_free_pmd_page() and
pmd_free_pte_page() are an exception to the rule: they call free_page()
directly.

Constructor/destructor calls are about to be introduced for kernel PTEs.
To avoid missing dtor calls in those helpers, free the PTE pages using
pte_free_kernel() instead of free_page().

While at it also use pmd_free() instead of calling pagetable_dtor()
explicitly at the PMD level.

Link: https://lkml.kernel.org/r/20250408095222.860601-3-kevin.brodsky@arm.com
Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Linus Waleij <linus.walleij@linaro.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Qi Zheng <zhengqi.arch@bytedance.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: <x86@kernel.org>
Cc: Yang Shi <yang@os.amperecomputing.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Kevin Brodsky and committed by
Andrew Morton
65ccffce d82d3bf4

+3 -4
+3 -4
arch/x86/mm/pgtable.c
··· 809 809 for (i = 0; i < PTRS_PER_PMD; i++) { 810 810 if (!pmd_none(pmd_sv[i])) { 811 811 pte = (pte_t *)pmd_page_vaddr(pmd_sv[i]); 812 - free_page((unsigned long)pte); 812 + pte_free_kernel(&init_mm, pte); 813 813 } 814 814 } 815 815 816 816 free_page((unsigned long)pmd_sv); 817 817 818 - pagetable_dtor(virt_to_ptdesc(pmd)); 819 - free_page((unsigned long)pmd); 818 + pmd_free(&init_mm, pmd); 820 819 821 820 return 1; 822 821 } ··· 838 839 /* INVLPG to clear all paging-structure caches */ 839 840 flush_tlb_kernel_range(addr, addr + PAGE_SIZE-1); 840 841 841 - free_page((unsigned long)pte); 842 + pte_free_kernel(&init_mm, pte); 842 843 843 844 return 1; 844 845 }