1
0
Fork 0

arm64: dump: De-constify VA_START and KASAN_SHADOW_START

The kernel page table dumper assumes that the placement of VA regions is
constant and determined at compile time. As we are about to introduce
variable VA logic, we need to be able to determine certain regions at
boot time.

Specifically the VA_START and KASAN_SHADOW_START will depend on whether
or not the system is booted with 52-bit kernel VAs.

This patch adds logic to the kernel page table dumper s.t. these regions
can be computed at boot time.

Signed-off-by: Steve Capper <steve.capper@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
alistair/sunxi64-5.4-dsi
Steve Capper 2019-08-07 16:55:16 +01:00 committed by Will Deacon
parent 6bd1d0be0e
commit 99426e5e8c
1 changed files with 17 additions and 4 deletions

View File

@ -25,11 +25,20 @@
#include <asm/pgtable-hwdef.h>
#include <asm/ptdump.h>
static const struct addr_marker address_markers[] = {
{ PAGE_OFFSET, "Linear Mapping start" },
{ VA_START, "Linear Mapping end" },
enum address_markers_idx {
PAGE_OFFSET_NR = 0,
VA_START_NR,
#ifdef CONFIG_KASAN
{ KASAN_SHADOW_START, "Kasan shadow start" },
KASAN_START_NR,
#endif
};
static struct addr_marker address_markers[] = {
{ PAGE_OFFSET, "Linear Mapping start" },
{ 0 /* VA_START */, "Linear Mapping end" },
#ifdef CONFIG_KASAN
{ 0 /* KASAN_SHADOW_START */, "Kasan shadow start" },
{ KASAN_SHADOW_END, "Kasan shadow end" },
#endif
{ MODULES_VADDR, "Modules start" },
@ -402,6 +411,10 @@ void ptdump_check_wx(void)
static int ptdump_init(void)
{
address_markers[VA_START_NR].start_address = VA_START;
#ifdef CONFIG_KASAN
address_markers[KASAN_START_NR].start_address = KASAN_SHADOW_START;
#endif
ptdump_initialize();
ptdump_debugfs_register(&kernel_ptdump_info, "kernel_page_tables");
return 0;