Move the pagetable walking state and level definitions to a new arch/riscv/include/asm/ptdump.h header. This allows other parts of the kernel (like KVM) to reuse the ptdump attribute parsing logic. To support different pagetable types (like G-stage), the attribute parsing logic in dump_prot() is updated to use attribute bits defined within the pg_level structure rather than a global array. Assisted-by: YuanSheng: deepseek-v4-pro Co-developed-by: Quan Zhou Signed-off-by: Quan Zhou Signed-off-by: Dylan.Wu --- arch/riscv/include/asm/ptdump.h | 42 +++++++++++++ arch/riscv/mm/ptdump.c | 102 +++++++++++--------------------- 2 files changed, 77 insertions(+), 67 deletions(-) create mode 100644 arch/riscv/include/asm/ptdump.h diff --git a/arch/riscv/include/asm/ptdump.h b/arch/riscv/include/asm/ptdump.h new file mode 100644 index 000000000..9173910fa --- /dev/null +++ b/arch/riscv/include/asm/ptdump.h @@ -0,0 +1,42 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_RISCV_PTDUMP_H +#define _ASM_RISCV_PTDUMP_H + +#include +#include + +struct addr_marker { + unsigned long start_address; + const char *name; +}; + +struct ptdump_prot_bits { + u64 mask; + const char *set; + const char *clear; +}; + +struct ptdump_pg_level { + const struct ptdump_prot_bits *bits; + const char *name; + u64 mask; + int num; +}; + +struct ptdump_pg_state { + struct ptdump_state ptdump; + struct seq_file *seq; + const struct addr_marker *marker; + const struct ptdump_pg_level *pg_level; + unsigned long start_address; + unsigned long start_pa; + unsigned long last_pa; + int level; + u64 current_prot; + bool check_wx; + unsigned long wx_pages; +}; + +void note_page(struct ptdump_state *pt_st, unsigned long addr, int level, u64 val); + +#endif /* _ASM_RISCV_PTDUMP_H */ diff --git a/arch/riscv/mm/ptdump.c b/arch/riscv/mm/ptdump.c index f4b4a9fcb..7e55656cb 100644 --- a/arch/riscv/mm/ptdump.c +++ b/arch/riscv/mm/ptdump.c @@ -11,6 +11,7 @@ #include #include +#include #include #define pt_dump_seq_printf(m, fmt, args...) \ @@ -25,31 +26,6 @@ seq_puts(m, fmt); \ }) -/* - * The page dumper groups page table entries of the same type into a single - * description. It uses pg_state to track the range information while - * iterating over the pte entries. When the continuity is broken it then - * dumps out a description of the range. - */ -struct pg_state { - struct ptdump_state ptdump; - struct seq_file *seq; - const struct addr_marker *marker; - unsigned long start_address; - unsigned long start_pa; - unsigned long last_pa; - int level; - u64 current_prot; - bool check_wx; - unsigned long wx_pages; -}; - -/* Address marker */ -struct addr_marker { - unsigned long start_address; - const char *name; -}; - /* Private information for debugfs */ struct ptd_mm_info { struct mm_struct *mm; @@ -126,14 +102,7 @@ static struct ptd_mm_info efi_ptd_info = { }; #endif -/* Page Table Entry */ -struct prot_bits { - u64 mask; - const char *set; - const char *clear; -}; - -static const struct prot_bits pte_bits[] = { +static const struct ptdump_prot_bits pte_bits[] = { { #ifdef CONFIG_64BIT .mask = _PAGE_NAPOT, @@ -183,52 +152,48 @@ static const struct prot_bits pte_bits[] = { } }; -/* Page Level */ -struct pg_level { - const char *name; - u64 mask; -}; - -static struct pg_level pg_level[] = { +static struct ptdump_pg_level kernel_pg_levels[] = { { /* pgd */ .name = "PGD", }, { /* p4d */ - .name = (CONFIG_PGTABLE_LEVELS > 4) ? "P4D" : "PGD", + .name = "P4D", }, { /* pud */ - .name = (CONFIG_PGTABLE_LEVELS > 3) ? "PUD" : "PGD", + .name = "PUD", }, { /* pmd */ - .name = (CONFIG_PGTABLE_LEVELS > 2) ? "PMD" : "PGD", + .name = "PMD", }, { /* pte */ .name = "PTE", }, }; -static void dump_prot(struct pg_state *st) +static void dump_prot(struct ptdump_pg_state *st) { unsigned int i; + const struct ptdump_pg_level *lvl = &st->pg_level[st->level]; + const struct ptdump_prot_bits *bits = lvl->bits; - for (i = 0; i < ARRAY_SIZE(pte_bits); i++) { + for (i = 0; i < lvl->num; i++) { char s[7]; unsigned long val; - val = st->current_prot & pte_bits[i].mask; + val = st->current_prot & bits[i].mask; if (val) { - if (pte_bits[i].mask == _PAGE_SOFT) - snprintf(s, sizeof(s), pte_bits[i].set, val >> 8); + if (bits[i].mask == _PAGE_SOFT) + snprintf(s, sizeof(s), bits[i].set, val >> 8); #ifdef CONFIG_64BIT - else if (pte_bits[i].mask == _PAGE_MTMASK_SVPBMT) { + else if (bits[i].mask == _PAGE_MTMASK_SVPBMT) { if (val == _PAGE_NOCACHE_SVPBMT) - snprintf(s, sizeof(s), pte_bits[i].set, "NC"); + snprintf(s, sizeof(s), bits[i].set, "NC"); else if (val == _PAGE_IO_SVPBMT) - snprintf(s, sizeof(s), pte_bits[i].set, "IO"); + snprintf(s, sizeof(s), bits[i].set, "IO"); else - snprintf(s, sizeof(s), pte_bits[i].set, "??"); + snprintf(s, sizeof(s), bits[i].set, "??"); } #endif else - strscpy(s, pte_bits[i].set); + strscpy(s, bits[i].set); } else { - strscpy(s, pte_bits[i].clear); + strscpy(s, bits[i].clear); } pt_dump_seq_printf(st->seq, " %s", s); @@ -240,7 +205,7 @@ static void dump_prot(struct pg_state *st) #else #define ADDR_FORMAT "0x%08lx" #endif -static void dump_addr(struct pg_state *st, unsigned long addr) +static void dump_addr(struct ptdump_pg_state *st, unsigned long addr) { static const char units[] = "KMGTPE"; const char *unit = units; @@ -258,10 +223,10 @@ static void dump_addr(struct pg_state *st, unsigned long addr) } pt_dump_seq_printf(st->seq, "%9lu%c %s", delta, *unit, - pg_level[st->level].name); + st->pg_level[st->level].name); } -static void note_prot_wx(struct pg_state *st, unsigned long addr) +static void note_prot_wx(struct ptdump_pg_state *st, unsigned long addr) { if (!st->check_wx) return; @@ -276,15 +241,15 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr) st->wx_pages += (addr - st->start_address) / PAGE_SIZE; } -static void note_page(struct ptdump_state *pt_st, unsigned long addr, - int level, u64 val) +void note_page(struct ptdump_state *pt_st, unsigned long addr, + int level, u64 val) { - struct pg_state *st = container_of(pt_st, struct pg_state, ptdump); + struct ptdump_pg_state *st = container_of(pt_st, struct ptdump_pg_state, ptdump); u64 pa = PFN_PHYS(pte_pfn(__pte(val))); u64 prot = 0; if (level >= 0) - prot = val & pg_level[level].mask; + prot = val & st->pg_level[level].mask; if (st->level == -1) { st->level = level; @@ -317,6 +282,7 @@ static void note_page(struct ptdump_state *pt_st, unsigned long addr, st->last_pa = pa; } } +EXPORT_SYMBOL_GPL(note_page); static void note_page_pte(struct ptdump_state *pt_st, unsigned long addr, pte_t pte) { @@ -352,9 +318,10 @@ static void note_page_flush(struct ptdump_state *pt_st) static void ptdump_walk(struct seq_file *s, struct ptd_mm_info *pinfo) { - struct pg_state st = { + struct ptdump_pg_state st = { .seq = s, .marker = pinfo->markers, + .pg_level = kernel_pg_levels, .level = -1, .ptdump = { .note_page_pte = note_page_pte, @@ -375,12 +342,13 @@ static void ptdump_walk(struct seq_file *s, struct ptd_mm_info *pinfo) bool ptdump_check_wx(void) { - struct pg_state st = { + struct ptdump_pg_state st = { .seq = NULL, .marker = (struct addr_marker[]) { {0, NULL}, {-1, NULL}, }, + .pg_level = kernel_pg_levels, .level = -1, .check_wx = true, .ptdump = { @@ -446,12 +414,12 @@ static int __init ptdump_init(void) kernel_ptd_info.base_addr = KERN_VIRT_START; - pg_level[1].name = pgtable_l5_enabled ? "P4D" : "PGD"; - pg_level[2].name = pgtable_l4_enabled ? "PUD" : "PGD"; + kernel_pg_levels[1].name = pgtable_l5_enabled ? "P4D" : "PGD"; + kernel_pg_levels[2].name = pgtable_l4_enabled ? "PUD" : "PGD"; - for (i = 0; i < ARRAY_SIZE(pg_level); i++) + for (i = 0; i < ARRAY_SIZE(kernel_pg_levels); i++) for (j = 0; j < ARRAY_SIZE(pte_bits); j++) - pg_level[i].mask |= pte_bits[j].mask; + kernel_pg_levels[i].mask |= pte_bits[j].mask; debugfs_create_file("kernel_page_tables", 0400, NULL, &kernel_ptd_info, &ptdump_fops); -- 2.34.1