powerpc/ptdump: Reduce level numbers by 1 in note_page() and add p4d level

Do the same as commit f8f0d0b6fa20 ("mm: ptdump: reduce level numbers
by 1 in note_page()") and add missing p4d level.

This will align powerpc to the users of generic ptdump.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/d76495c574132b197b445a1f133755cca4b912a4.1625762906.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/mm/ptdump/8xx.c b/arch/powerpc/mm/ptdump/8xx.c
index 86da2a6..fac932e 100644 (file)
--- a/arch/powerpc/mm/ptdump/8xx.c
+++ b/arch/powerpc/mm/ptdump/8xx.c
@@ -75,8 +75,10 @@ static const struct flag_info flag_array[] = {
 };
 
 struct pgtable_level pg_level[5] = {
-       {
-       }, { /* pgd */
+       { /* pgd */
+               .flag   = flag_array,
+               .num    = ARRAY_SIZE(flag_array),
+       }, { /* p4d */
                .flag   = flag_array,
                .num    = ARRAY_SIZE(flag_array),
        }, { /* pud */

diff --git a/arch/powerpc/mm/ptdump/book3s64.c b/arch/powerpc/mm/ptdump/book3s64.c
index 14f7386..5ad92d9 100644 (file)
--- a/arch/powerpc/mm/ptdump/book3s64.c
+++ b/arch/powerpc/mm/ptdump/book3s64.c
@@ -103,8 +103,10 @@ static const struct flag_info flag_array[] = {
 };
 
 struct pgtable_level pg_level[5] = {
-       {
-       }, { /* pgd */
+       { /* pgd */
+               .flag   = flag_array,
+               .num    = ARRAY_SIZE(flag_array),
+       }, { /* p4d */
                .flag   = flag_array,
                .num    = ARRAY_SIZE(flag_array),
        }, { /* pud */

diff --git a/arch/powerpc/mm/ptdump/ptdump.c b/arch/powerpc/mm/ptdump/ptdump.c
index 3eb8732..fb531bc 100644 (file)
--- a/arch/powerpc/mm/ptdump/ptdump.c
+++ b/arch/powerpc/mm/ptdump/ptdump.c
@@ -58,7 +58,7 @@ struct pg_state {
        const struct addr_marker *marker;
        unsigned long start_address;
        unsigned long start_pa;
-       unsigned int level;
+       int level;
        u64 current_flags;
        bool check_wx;
        unsigned long wx_pages;
@@ -188,10 +188,9 @@ 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_update_state(struct pg_state *st, unsigned long addr,
-                                  unsigned int level, u64 val)
+static void note_page_update_state(struct pg_state *st, unsigned long addr, int level, u64 val)
 {
-       u64 flag = val & pg_level[level].mask;
+       u64 flag = level >= 0 ? val & pg_level[level].mask : 0;
        u64 pa = val & PTE_RPN_MASK;
 
        st->level = level;
@@ -206,12 +205,12 @@ static void note_page_update_state(struct pg_state *st, unsigned long addr,
 }
 
 static void note_page(struct pg_state *st, unsigned long addr,
-              unsigned int level, u64 val, unsigned long page_size)
+                     int level, u64 val, unsigned long page_size)
 {
-       u64 flag = val & pg_level[level].mask;
+       u64 flag = level >= 0 ? val & pg_level[level].mask : 0;
 
        /* At first no level is set */
-       if (!st->level) {
+       if (st->level == -1) {
                pt_dump_seq_printf(st->seq, "---[ %s ]---\n", st->marker->name);
                note_page_update_state(st, addr, level, val);
        /*
@@ -383,6 +382,7 @@ static int ptdump_show(struct seq_file *m, void *v)
        struct pg_state st = {
                .seq = m,
                .marker = address_markers,
+               .level = -1,
                .start_address = IS_ENABLED(CONFIG_PPC64) ? PAGE_OFFSET : TASK_SIZE,
        };
 
@@ -393,7 +393,7 @@ static int ptdump_show(struct seq_file *m, void *v)
 
        /* Traverse kernel page tables */
        walk_pagetables(&st);
-       note_page(&st, 0, 0, 0, 0);
+       note_page(&st, 0, -1, 0, 0);
        return 0;
 }
 
@@ -415,6 +415,7 @@ void ptdump_check_wx(void)
        struct pg_state st = {
                .seq = NULL,
                .marker = address_markers,
+               .level = -1,
                .check_wx = true,
                .start_address = IS_ENABLED(CONFIG_PPC64) ? PAGE_OFFSET : TASK_SIZE,
        };

diff --git a/arch/powerpc/mm/ptdump/shared.c b/arch/powerpc/mm/ptdump/shared.c
index c005fe0..03607ab 100644 (file)
--- a/arch/powerpc/mm/ptdump/shared.c
+++ b/arch/powerpc/mm/ptdump/shared.c
@@ -68,8 +68,10 @@ static const struct flag_info flag_array[] = {
 };
 
 struct pgtable_level pg_level[5] = {
-       {
-       }, { /* pgd */
+       { /* pgd */
+               .flag   = flag_array,
+               .num    = ARRAY_SIZE(flag_array),
+       }, { /* p4d */
                .flag   = flag_array,
                .num    = ARRAY_SIZE(flag_array),
        }, { /* pud */