Commit 9182301a authored by Sebastian Ene's avatar Sebastian Ene Committed by Marc Zyngier

arm64: ptdump: Use the ptdump description from a local context

Rename the attributes description array to allow the parsing method
to use the description from a local context. To be able to do this,
store a pointer to the description array in the state structure. This
will allow for the later introduced callers (stage_2 ptdump) to specify
their own page table description format to the ptdump parser.
Signed-off-by: default avatarSebastian Ene <sebastianene@google.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20240909124721.1672199-4-sebastianene@google.comSigned-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent acc3d3a8
...@@ -45,6 +45,7 @@ struct ptdump_pg_level { ...@@ -45,6 +45,7 @@ struct ptdump_pg_level {
*/ */
struct ptdump_pg_state { struct ptdump_pg_state {
struct ptdump_state ptdump; struct ptdump_state ptdump;
struct ptdump_pg_level *pg_level;
struct seq_file *seq; struct seq_file *seq;
const struct addr_marker *marker; const struct addr_marker *marker;
const struct mm_struct *mm; const struct mm_struct *mm;
......
...@@ -117,7 +117,7 @@ static const struct ptdump_prot_bits pte_bits[] = { ...@@ -117,7 +117,7 @@ static const struct ptdump_prot_bits pte_bits[] = {
} }
}; };
static struct ptdump_pg_level pg_level[] __ro_after_init = { static struct ptdump_pg_level kernel_pg_levels[] __ro_after_init = {
{ /* pgd */ { /* pgd */
.name = "PGD", .name = "PGD",
.bits = pte_bits, .bits = pte_bits,
...@@ -192,6 +192,7 @@ void note_page(struct ptdump_state *pt_st, unsigned long addr, int level, ...@@ -192,6 +192,7 @@ void note_page(struct ptdump_state *pt_st, unsigned long addr, int level,
u64 val) u64 val)
{ {
struct ptdump_pg_state *st = container_of(pt_st, struct ptdump_pg_state, ptdump); struct ptdump_pg_state *st = container_of(pt_st, struct ptdump_pg_state, ptdump);
struct ptdump_pg_level *pg_level = st->pg_level;
static const char units[] = "KMGTPE"; static const char units[] = "KMGTPE";
u64 prot = 0; u64 prot = 0;
...@@ -262,6 +263,7 @@ void ptdump_walk(struct seq_file *s, struct ptdump_info *info) ...@@ -262,6 +263,7 @@ void ptdump_walk(struct seq_file *s, struct ptdump_info *info)
.seq = s, .seq = s,
.marker = info->markers, .marker = info->markers,
.mm = info->mm, .mm = info->mm,
.pg_level = &kernel_pg_levels[0],
.level = -1, .level = -1,
.ptdump = { .ptdump = {
.note_page = note_page, .note_page = note_page,
...@@ -279,10 +281,10 @@ static void __init ptdump_initialize(void) ...@@ -279,10 +281,10 @@ static void __init ptdump_initialize(void)
{ {
unsigned i, j; unsigned i, j;
for (i = 0; i < ARRAY_SIZE(pg_level); i++) for (i = 0; i < ARRAY_SIZE(kernel_pg_levels); i++)
if (pg_level[i].bits) if (kernel_pg_levels[i].bits)
for (j = 0; j < pg_level[i].num; j++) for (j = 0; j < kernel_pg_levels[i].num; j++)
pg_level[i].mask |= pg_level[i].bits[j].mask; kernel_pg_levels[i].mask |= kernel_pg_levels[i].bits[j].mask;
} }
static struct ptdump_info kernel_ptdump_info __ro_after_init = { static struct ptdump_info kernel_ptdump_info __ro_after_init = {
...@@ -297,6 +299,7 @@ bool ptdump_check_wx(void) ...@@ -297,6 +299,7 @@ bool ptdump_check_wx(void)
{ 0, NULL}, { 0, NULL},
{ -1, NULL}, { -1, NULL},
}, },
.pg_level = &kernel_pg_levels[0],
.level = -1, .level = -1,
.check_wx = true, .check_wx = true,
.ptdump = { .ptdump = {
......
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