Skip to content

L
linux
Commit 97026b5a authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files
Options

powerpc/mm: Split dump_pagelinuxtables flag_array table 

To reduce the complexity of flag_array, and allow the removal of
default 0 value of non existing flags, lets have one flag_array
table for each platform family with only the really existing flags.
Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 26973fa5
Hide whitespace changes
Inline Side-by-side
Showing with 307 additions and 153 deletions
arch/powerpc/mm/Makefile
View file @ 97026b5a
...@@ -43,5 +43,12 @@ obj-$(CONFIG_HIGHMEM) += highmem.o ...@@ -43,5 +43,12 @@ obj-$(CONFIG_HIGHMEM) += highmem.o
obj-$(CONFIG_PPC_COPRO_BASE) += copro_fault.o obj-$(CONFIG_PPC_COPRO_BASE) += copro_fault.o
obj-$(CONFIG_SPAPR_TCE_IOMMU) += mmu_context_iommu.o obj-$(CONFIG_SPAPR_TCE_IOMMU) += mmu_context_iommu.o
obj-$(CONFIG_PPC_PTDUMP) += dump_linuxpagetables.o obj-$(CONFIG_PPC_PTDUMP) += dump_linuxpagetables.o
ifdef CONFIG_PPC_PTDUMP
obj-$(CONFIG_4xx) += dump_linuxpagetables-generic.o
obj-$(CONFIG_PPC_8xx) += dump_linuxpagetables-8xx.o
obj-$(CONFIG_PPC_BOOK3E_MMU) += dump_linuxpagetables-generic.o
obj-$(CONFIG_PPC_BOOK3S_32) += dump_linuxpagetables-generic.o
obj-$(CONFIG_PPC_BOOK3S_64) += dump_linuxpagetables-book3s64.o
endif
obj-$(CONFIG_PPC_HTDUMP) += dump_hashpagetable.o obj-$(CONFIG_PPC_HTDUMP) += dump_hashpagetable.o
obj-$(CONFIG_PPC_MEM_KEYS) += pkeys.o obj-$(CONFIG_PPC_MEM_KEYS) += pkeys.o
arch/powerpc/mm/dump_linuxpagetables-8xx.c 0 → 100644
View file @ 97026b5a
// SPDX-License-Identifier: GPL-2.0
/*
* From split of dump_linuxpagetables.c
* Copyright 2016, Rashmica Gupta, IBM Corp.
*
*/
#include <linux/kernel.h>
#include <asm/pgtable.h>
#include "dump_linuxpagetables.h"
static const struct flag_info flag_array[] = {
{
.mask = _PAGE_PRIVILEGED,
.val = 0,
.set = "user",
.clear = " ",
}, {
.mask = _PAGE_RO | _PAGE_NA,
.val = 0,
.set = "rw",
}, {
.mask = _PAGE_RO | _PAGE_NA,
.val = _PAGE_RO,
.set = "r ",
}, {
.mask = _PAGE_RO | _PAGE_NA,
.val = _PAGE_NA,
.set = " ",
}, {
.mask = _PAGE_EXEC,
.val = _PAGE_EXEC,
.set = " X ",
.clear = " ",
}, {
.mask = _PAGE_PRESENT,
.val = _PAGE_PRESENT,
.set = "present",
.clear = " ",
}, {
.mask = _PAGE_GUARDED,
.val = _PAGE_GUARDED,
.set = "guarded",
.clear = " ",
}, {
.mask = _PAGE_DIRTY,
.val = _PAGE_DIRTY,
.set = "dirty",
.clear = " ",
}, {
.mask = _PAGE_ACCESSED,
.val = _PAGE_ACCESSED,
.set = "accessed",
.clear = " ",
}, {
.mask = _PAGE_NO_CACHE,
.val = _PAGE_NO_CACHE,
.set = "no cache",
.clear = " ",
}, {
.mask = _PAGE_SPECIAL,
.val = _PAGE_SPECIAL,
.set = "special",
}
};
struct pgtable_level pg_level[5] = {
{
}, { /* pgd */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
}, { /* pud */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
}, { /* pmd */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
}, { /* pte */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
},
};
arch/powerpc/mm/dump_linuxpagetables-book3s64.c 0 → 100644
View file @ 97026b5a
// SPDX-License-Identifier: GPL-2.0
/*
* From split of dump_linuxpagetables.c
* Copyright 2016, Rashmica Gupta, IBM Corp.
*
*/
#include <linux/kernel.h>
#include <asm/pgtable.h>
#include "dump_linuxpagetables.h"
static const struct flag_info flag_array[] = {
{
.mask = _PAGE_PRIVILEGED,
.val = 0,
.set = "user",
.clear = " ",
}, {
.mask = _PAGE_READ,
.val = _PAGE_READ,
.set = "r",
.clear = " ",
}, {
.mask = _PAGE_WRITE,
.val = _PAGE_WRITE,
.set = "w",
.clear = " ",
}, {
.mask = _PAGE_EXEC,
.val = _PAGE_EXEC,
.set = " X ",
.clear = " ",
}, {
.mask = _PAGE_PTE,
.val = _PAGE_PTE,
.set = "pte",
.clear = " ",
}, {
.mask = _PAGE_PRESENT,
.val = _PAGE_PRESENT,
.set = "present",
.clear = " ",
}, {
.mask = H_PAGE_HASHPTE,
.val = H_PAGE_HASHPTE,
.set = "hpte",
.clear = " ",
}, {
.mask = _PAGE_DIRTY,
.val = _PAGE_DIRTY,
.set = "dirty",
.clear = " ",
}, {
.mask = _PAGE_ACCESSED,
.val = _PAGE_ACCESSED,
.set = "accessed",
.clear = " ",
}, {
.mask = _PAGE_NON_IDEMPOTENT,
.val = _PAGE_NON_IDEMPOTENT,
.set = "non-idempotent",
.clear = " ",
}, {
.mask = _PAGE_TOLERANT,
.val = _PAGE_TOLERANT,
.set = "tolerant",
.clear = " ",
}, {
.mask = H_PAGE_BUSY,
.val = H_PAGE_BUSY,
.set = "busy",
}, {
#ifdef CONFIG_PPC_64K_PAGES
.mask = H_PAGE_COMBO,
.val = H_PAGE_COMBO,
.set = "combo",
}, {
.mask = H_PAGE_4K_PFN,
.val = H_PAGE_4K_PFN,
.set = "4K_pfn",
}, {
#else /* CONFIG_PPC_64K_PAGES */
.mask = H_PAGE_F_GIX,
.val = H_PAGE_F_GIX,
.set = "f_gix",
.is_val = true,
.shift = H_PAGE_F_GIX_SHIFT,
}, {
.mask = H_PAGE_F_SECOND,
.val = H_PAGE_F_SECOND,
.set = "f_second",
}, {
#endif /* CONFIG_PPC_64K_PAGES */
.mask = _PAGE_SPECIAL,
.val = _PAGE_SPECIAL,
.set = "special",
}
};
struct pgtable_level pg_level[5] = {
{
}, { /* pgd */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
}, { /* pud */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
}, { /* pmd */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
}, { /* pte */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
},
};
arch/powerpc/mm/dump_linuxpagetables-generic.c 0 → 100644
View file @ 97026b5a
// SPDX-License-Identifier: GPL-2.0
/*
* From split of dump_linuxpagetables.c
* Copyright 2016, Rashmica Gupta, IBM Corp.
*
*/
#include <linux/kernel.h>
#include <asm/pgtable.h>
#include "dump_linuxpagetables.h"
static const struct flag_info flag_array[] = {
{
.mask = _PAGE_USER,
.val = _PAGE_USER,
.set = "user",
.clear = " ",
}, {
.mask = _PAGE_RW,
.val = _PAGE_RW,
.set = "rw",
.clear = "r ",
}, {
#ifndef CONFIG_PPC_BOOK3S_32
.mask = _PAGE_EXEC,
.val = _PAGE_EXEC,
.set = " X ",
.clear = " ",
}, {
#endif
.mask = _PAGE_PRESENT,
.val = _PAGE_PRESENT,
.set = "present",
.clear = " ",
}, {
.mask = _PAGE_GUARDED,
.val = _PAGE_GUARDED,
.set = "guarded",
.clear = " ",
}, {
.mask = _PAGE_DIRTY,
.val = _PAGE_DIRTY,
.set = "dirty",
.clear = " ",
}, {
.mask = _PAGE_ACCESSED,
.val = _PAGE_ACCESSED,
.set = "accessed",
.clear = " ",
}, {
.mask = _PAGE_WRITETHRU,
.val = _PAGE_WRITETHRU,
.set = "write through",
.clear = " ",
}, {
.mask = _PAGE_NO_CACHE,
.val = _PAGE_NO_CACHE,
.set = "no cache",
.clear = " ",
}, {
.mask = _PAGE_SPECIAL,
.val = _PAGE_SPECIAL,
.set = "special",
}
};
struct pgtable_level pg_level[5] = {
{
}, { /* pgd */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
}, { /* pud */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
}, { /* pmd */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
}, { /* pte */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
},
};
arch/powerpc/mm/dump_linuxpagetables.c
View file @ 97026b5a
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include "dump_linuxpagetables.h"
#ifdef CONFIG_PPC32 #ifdef CONFIG_PPC32
#define KERN_VIRT_START 0 #define KERN_VIRT_START 0
#endif #endif
...@@ -101,159 +103,6 @@ static struct addr_marker address_markers[] = { ...@@ -101,159 +103,6 @@ static struct addr_marker address_markers[] = {
{ -1, NULL }, { -1, NULL },
}; };
struct flag_info {
u64 mask;
u64 val;
const char *set;
const char *clear;
bool is_val;
int shift;
};
static const struct flag_info flag_array[] = {
{
.mask = _PAGE_USER | _PAGE_PRIVILEGED,
.val = _PAGE_USER,
.set = "user",
.clear = " ",
}, {
.mask = _PAGE_RW | _PAGE_RO | _PAGE_NA,
.val = _PAGE_RW,
.set = "rw",
}, {
.mask = _PAGE_RW | _PAGE_RO | _PAGE_NA,
.val = _PAGE_RO,
.set = "ro",
}, {
#if _PAGE_NA != 0
.mask = _PAGE_RW | _PAGE_RO | _PAGE_NA,
.val = _PAGE_RO,
.set = "na",
}, {
#endif
.mask = _PAGE_EXEC,
.val = _PAGE_EXEC,
.set = " X ",
.clear = " ",
}, {
.mask = _PAGE_PTE,
.val = _PAGE_PTE,
.set = "pte",
.clear = " ",
}, {
.mask = _PAGE_PRESENT,
.val = _PAGE_PRESENT,
.set = "present",
.clear = " ",
}, {
#ifdef CONFIG_PPC_BOOK3S_64
.mask = H_PAGE_HASHPTE,
.val = H_PAGE_HASHPTE,
#else
.mask = _PAGE_HASHPTE,
.val = _PAGE_HASHPTE,
#endif
.set = "hpte",
.clear = " ",
}, {
#ifndef CONFIG_PPC_BOOK3S_64
.mask = _PAGE_GUARDED,
.val = _PAGE_GUARDED,
.set = "guarded",
.clear = " ",
}, {
#endif
.mask = _PAGE_DIRTY,
.val = _PAGE_DIRTY,
.set = "dirty",
.clear = " ",
}, {
.mask = _PAGE_ACCESSED,
.val = _PAGE_ACCESSED,
.set = "accessed",
.clear = " ",
}, {
#ifndef CONFIG_PPC_BOOK3S_64
.mask = _PAGE_WRITETHRU,
.val = _PAGE_WRITETHRU,
.set = "write through",
.clear = " ",
}, {
#endif
#ifndef CONFIG_PPC_BOOK3S_64
.mask = _PAGE_NO_CACHE,
.val = _PAGE_NO_CACHE,
.set = "no cache",
.clear = " ",
}, {
#else
.mask = _PAGE_NON_IDEMPOTENT,
.val = _PAGE_NON_IDEMPOTENT,
.set = "non-idempotent",
.clear = " ",
}, {
.mask = _PAGE_TOLERANT,
.val = _PAGE_TOLERANT,
.set = "tolerant",
.clear = " ",
}, {
#endif
#ifdef CONFIG_PPC_BOOK3S_64
.mask = H_PAGE_BUSY,
.val = H_PAGE_BUSY,
.set = "busy",
}, {
#ifdef CONFIG_PPC_64K_PAGES
.mask = H_PAGE_COMBO,
.val = H_PAGE_COMBO,
.set = "combo",
}, {
.mask = H_PAGE_4K_PFN,
.val = H_PAGE_4K_PFN,
.set = "4K_pfn",
}, {
#else /* CONFIG_PPC_64K_PAGES */
.mask = H_PAGE_F_GIX,
.val = H_PAGE_F_GIX,
.set = "f_gix",
.is_val = true,
.shift = H_PAGE_F_GIX_SHIFT,
}, {
.mask = H_PAGE_F_SECOND,
.val = H_PAGE_F_SECOND,
.set = "f_second",
}, {
#endif /* CONFIG_PPC_64K_PAGES */
#endif
.mask = _PAGE_SPECIAL,
.val = _PAGE_SPECIAL,
.set = "special",
}
};
struct pgtable_level {
const struct flag_info *flag;
size_t num;
u64 mask;
};
static struct pgtable_level pg_level[] = {
{
}, { /* pgd */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
}, { /* pud */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
}, { /* pmd */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
}, { /* pte */
.flag = flag_array,
.num = ARRAY_SIZE(flag_array),
},
};
static void dump_flag_info(struct pg_state *st, const struct flag_info static void dump_flag_info(struct pg_state *st, const struct flag_info
*flag, u64 pte, int num) *flag, u64 pte, int num)
{ {
......
arch/powerpc/mm/dump_linuxpagetables.h 0 → 100644
View file @ 97026b5a
/* SPDX-License-Identifier: GPL-2.0 */
#include <linux/types.h>
struct flag_info {
u64 mask;
u64 val;
const char *set;
const char *clear;
bool is_val;
int shift;
};
struct pgtable_level {
const struct flag_info *flag;
size_t num;
u64 mask;
};
extern struct pgtable_level pg_level[5];
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7