[PATCH 1/3] arm64/ptdump: Re-organize ptdump_init()
From: Anshuman Khandual <hidden>
Date: 2025-09-10 09:46:41
Also in:
linux-efi, lkml
Subsystem:
arm64 port (aarch64 architecture), extensible firmware interface (efi), the rest · Maintainers:
Catalin Marinas, Will Deacon, Ard Biesheuvel, Linus Torvalds
Split ptdump_debugfs_register() from ptdump_init() which there after can be called early on during the boot and also enable dump kernel page table when required. While here rename ptdump_init() as ptdump_debugfs_init() to avoid name space collision. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: Ard Biesheuvel <ardb@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: linux-efi@vger.kernel.org Suggested-by: Ryan Roberts <ryan.roberts@arm.com> Signed-off-by: Anshuman Khandual <redacted> --- arch/arm64/include/asm/ptdump.h | 2 ++ arch/arm64/kernel/setup.c | 2 ++ arch/arm64/mm/ptdump.c | 8 ++++++-- drivers/firmware/efi/arm-runtime.c | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/include/asm/ptdump.h b/arch/arm64/include/asm/ptdump.h
index fded5358641f..27e774134e7f 100644
--- a/arch/arm64/include/asm/ptdump.h
+++ b/arch/arm64/include/asm/ptdump.h@@ -57,6 +57,7 @@ struct ptdump_pg_state { unsigned long uxn_pages; }; +void __init ptdump_init(void); void ptdump_walk(struct seq_file *s, struct ptdump_info *info); void note_page(struct ptdump_state *pt_st, unsigned long addr, int level, pteval_t val);
@@ -74,6 +75,7 @@ static inline void ptdump_debugfs_register(struct ptdump_info *info, const char *name) { } #endif /* CONFIG_PTDUMP_DEBUGFS */ #else +static inline void __init ptdump_init(void) { } static inline void note_page(struct ptdump_state *pt_st, unsigned long addr, int level, pteval_t val) { } static inline void note_page_pte(struct ptdump_state *st, unsigned long addr, pte_t pte) { }
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 77c7926a4df6..0a3812c8e177 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c@@ -43,6 +43,7 @@ #include <asm/cpu_ops.h> #include <asm/kasan.h> #include <asm/numa.h> +#include <asm/ptdump.h> #include <asm/rsi.h> #include <asm/scs.h> #include <asm/sections.h>
@@ -332,6 +333,7 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p) arm64_memblock_init(); paging_init(); + ptdump_init(); acpi_table_upgrade();
diff --git a/arch/arm64/mm/ptdump.c b/arch/arm64/mm/ptdump.c
index 421a5de806c6..7c42be62898b 100644
--- a/arch/arm64/mm/ptdump.c
+++ b/arch/arm64/mm/ptdump.c@@ -367,7 +367,7 @@ bool ptdump_check_wx(void) } } -static int __init ptdump_init(void) +void __init ptdump_init(void) { u64 page_offset = _PAGE_OFFSET(vabits_actual); u64 vmemmap_start = (u64)virt_to_page((void *)page_offset);
@@ -396,7 +396,11 @@ static int __init ptdump_init(void) kernel_ptdump_info.base_addr = page_offset; ptdump_initialize(); +} + +static int __init ptdump_debugfs_init(void) +{ ptdump_debugfs_register(&kernel_ptdump_info, "kernel_page_tables"); return 0; } -device_initcall(ptdump_init); +device_initcall(ptdump_debugfs_init);
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
index 83092d93f36a..3c84e84dc6ea 100644
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c@@ -38,14 +38,14 @@ static struct ptdump_info efi_ptdump_info = { .base_addr = 0, }; -static int __init ptdump_init(void) +static int __init ptdump_debugfs_init(void) { if (efi_enabled(EFI_RUNTIME_SERVICES)) ptdump_debugfs_register(&efi_ptdump_info, "efi_page_tables"); return 0; } -device_initcall(ptdump_init); +device_initcall(ptdump_debugfs_init); #endif
--
2.25.1