Message ID | 1574056694-28927-1-git-send-email-yash.shah@sifive.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v2] RISC-V: Add address map dumper | expand |
On Mon, Nov 18, 2019 at 11:28 AM Yash Shah <yash.shah@sifive.com> wrote: > > Add support for dumping the kernel address space layout to the console. > User can enable CONFIG_DEBUG_VM to dump the virtual memory region into > dmesg buffer during boot-up. > > Signed-off-by: Yash Shah <yash.shah@sifive.com> > --- > This patch is based on Linux 5.4-rc6 and tested on SiFive HiFive > Unleashed board. > > Changes in v2: > - Avoid #ifdefs inside functions > - Helper functions instead of macros > - Drop newly added CONFIG_DEBUG_VM_LAYOUT, instead use CONFIG_DEBUG_VM > --- > arch/riscv/mm/init.c | 36 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 36 insertions(+) > > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c > index 573463d..7828136 100644 > --- a/arch/riscv/mm/init.c > +++ b/arch/riscv/mm/init.c > @@ -45,6 +45,41 @@ void setup_zero_page(void) > memset((void *)empty_zero_page, 0, PAGE_SIZE); > } > > +#ifdef CONFIG_DEBUG_VM > +static inline void print_mlk(char *name, unsigned long b, unsigned long t) > +{ > + pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld kB)\n", name, b, t, > + (((t) - (b)) >> 10)); > +} > + > +static inline void print_mlm(char *name, unsigned long b, unsigned long t) > +{ > + pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld MB)\n", name, b, t, > + (((t) - (b)) >> 20)); > +} > + > +static void print_vm_layout(void) > +{ > + pr_notice("Virtual kernel memory layout:\n"); > + print_mlk("fixmap", (unsigned long)FIXADDR_START, > + (unsigned long)FIXADDR_TOP); > + print_mlm("vmemmap", (unsigned long)VMEMMAP_START, > + (unsigned long)VMEMMAP_END); > + print_mlm("vmalloc", (unsigned long)VMALLOC_START, > + (unsigned long)VMALLOC_END); > + print_mlm("lowmem", (unsigned long)PAGE_OFFSET, > + (unsigned long)high_memory); > + print_mlk(".init", (unsigned long)__init_begin, > + (unsigned long)__init_end); > + print_mlk(".text", (unsigned long)_text, (unsigned long)_etext); > + print_mlk(".data", (unsigned long)_sdata, (unsigned long)_edata); > + print_mlk(".bss", (unsigned long)__bss_start, > + (unsigned long)__bss_stop); > +} > +#else > +static void print_vm_layout(void) { } > +#endif /* CONFIG_DEBUG_VM */ > + > void __init mem_init(void) > { > #ifdef CONFIG_FLATMEM > @@ -55,6 +90,7 @@ void __init mem_init(void) > memblock_free_all(); > > mem_init_print_info(NULL); > + print_vm_layout(); > } > > #ifdef CONFIG_BLK_DEV_INITRD > -- > 2.7.4 > LGTM. Reviewed-by: Anup Patel <anup@brainfault.org> Regards, Anup
On 2019-11-17 10:58 p.m., Yash Shah wrote: > Add support for dumping the kernel address space layout to the console. > User can enable CONFIG_DEBUG_VM to dump the virtual memory region into > dmesg buffer during boot-up. > > Signed-off-by: Yash Shah <yash.shah@sifive.com> Looks good to me, thanks. Reviewed-by: Logan Gunthorpe <logang@deltatee.com> > --- > This patch is based on Linux 5.4-rc6 and tested on SiFive HiFive > Unleashed board. > > Changes in v2: > - Avoid #ifdefs inside functions > - Helper functions instead of macros > - Drop newly added CONFIG_DEBUG_VM_LAYOUT, instead use CONFIG_DEBUG_VM > --- > arch/riscv/mm/init.c | 36 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 36 insertions(+) > > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c > index 573463d..7828136 100644 > --- a/arch/riscv/mm/init.c > +++ b/arch/riscv/mm/init.c > @@ -45,6 +45,41 @@ void setup_zero_page(void) > memset((void *)empty_zero_page, 0, PAGE_SIZE); > } > > +#ifdef CONFIG_DEBUG_VM > +static inline void print_mlk(char *name, unsigned long b, unsigned long t) > +{ > + pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld kB)\n", name, b, t, > + (((t) - (b)) >> 10)); > +} > + > +static inline void print_mlm(char *name, unsigned long b, unsigned long t) > +{ > + pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld MB)\n", name, b, t, > + (((t) - (b)) >> 20)); > +} > + > +static void print_vm_layout(void) > +{ > + pr_notice("Virtual kernel memory layout:\n"); > + print_mlk("fixmap", (unsigned long)FIXADDR_START, > + (unsigned long)FIXADDR_TOP); > + print_mlm("vmemmap", (unsigned long)VMEMMAP_START, > + (unsigned long)VMEMMAP_END); > + print_mlm("vmalloc", (unsigned long)VMALLOC_START, > + (unsigned long)VMALLOC_END); > + print_mlm("lowmem", (unsigned long)PAGE_OFFSET, > + (unsigned long)high_memory); > + print_mlk(".init", (unsigned long)__init_begin, > + (unsigned long)__init_end); > + print_mlk(".text", (unsigned long)_text, (unsigned long)_etext); > + print_mlk(".data", (unsigned long)_sdata, (unsigned long)_edata); > + print_mlk(".bss", (unsigned long)__bss_start, > + (unsigned long)__bss_stop); > +} > +#else > +static void print_vm_layout(void) { } > +#endif /* CONFIG_DEBUG_VM */ > + > void __init mem_init(void) > { > #ifdef CONFIG_FLATMEM > @@ -55,6 +90,7 @@ void __init mem_init(void) > memblock_free_all(); > > mem_init_print_info(NULL); > + print_vm_layout(); > } > > #ifdef CONFIG_BLK_DEV_INITRD >
Hi Yash, On Mon, 18 Nov 2019, Yash Shah wrote: > Add support for dumping the kernel address space layout to the console. > User can enable CONFIG_DEBUG_VM to dump the virtual memory region into > dmesg buffer during boot-up. > > Signed-off-by: Yash Shah <yash.shah@sifive.com> Thanks, I've queued up the following patch. I added the PCI I/O region, and also dropped some of the .init/.text/etc. prints since they duplicate the output from mem_init_print_info(). - Paul From: Yash Shah <yash.shah@sifive.com> Date: Mon, 18 Nov 2019 05:58:34 +0000 Subject: [PATCH] RISC-V: Add address map dumper Add support for dumping the kernel address space layout to the console. User can enable CONFIG_DEBUG_VM to dump the virtual memory region into dmesg buffer during boot-up. Signed-off-by: Yash Shah <yash.shah@sifive.com> Reviewed-by: Logan Gunthorpe <logang@deltatee.com> Reviewed-by: Anup Patel <anup@brainfault.org> [paul.walmsley@sifive.com: dropped .init/.text/.data/.bss prints; added PCI legacy I/O region display] Signed-off-by: Paul Walmsley <paul.walmsley@sifive.com> --- arch/riscv/mm/init.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 573463d1c799..c2c0e244555f 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -45,6 +45,37 @@ void setup_zero_page(void) memset((void *)empty_zero_page, 0, PAGE_SIZE); } +#ifdef CONFIG_DEBUG_VM +static inline void print_mlk(char *name, unsigned long b, unsigned long t) +{ + pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld kB)\n", name, b, t, + (((t) - (b)) >> 10)); +} + +static inline void print_mlm(char *name, unsigned long b, unsigned long t) +{ + pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld MB)\n", name, b, t, + (((t) - (b)) >> 20)); +} + +static void print_vm_layout(void) +{ + pr_notice("Virtual kernel memory layout:\n"); + print_mlk("fixmap", (unsigned long)FIXADDR_START, + (unsigned long)FIXADDR_TOP); + print_mlm("pci io", (unsigned long)PCI_IO_START, + (unsigned long)PCI_IO_END); + print_mlm("vmemmap", (unsigned long)VMEMMAP_START, + (unsigned long)VMEMMAP_END); + print_mlm("vmalloc", (unsigned long)VMALLOC_START, + (unsigned long)VMALLOC_END); + print_mlm("lowmem", (unsigned long)PAGE_OFFSET, + (unsigned long)high_memory); +} +#else +static void print_vm_layout(void) { } +#endif /* CONFIG_DEBUG_VM */ + void __init mem_init(void) { #ifdef CONFIG_FLATMEM @@ -55,6 +86,7 @@ void __init mem_init(void) memblock_free_all(); mem_init_print_info(NULL); + print_vm_layout(); } #ifdef CONFIG_BLK_DEV_INITRD
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 573463d..7828136 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -45,6 +45,41 @@ void setup_zero_page(void) memset((void *)empty_zero_page, 0, PAGE_SIZE); } +#ifdef CONFIG_DEBUG_VM +static inline void print_mlk(char *name, unsigned long b, unsigned long t) +{ + pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld kB)\n", name, b, t, + (((t) - (b)) >> 10)); +} + +static inline void print_mlm(char *name, unsigned long b, unsigned long t) +{ + pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld MB)\n", name, b, t, + (((t) - (b)) >> 20)); +} + +static void print_vm_layout(void) +{ + pr_notice("Virtual kernel memory layout:\n"); + print_mlk("fixmap", (unsigned long)FIXADDR_START, + (unsigned long)FIXADDR_TOP); + print_mlm("vmemmap", (unsigned long)VMEMMAP_START, + (unsigned long)VMEMMAP_END); + print_mlm("vmalloc", (unsigned long)VMALLOC_START, + (unsigned long)VMALLOC_END); + print_mlm("lowmem", (unsigned long)PAGE_OFFSET, + (unsigned long)high_memory); + print_mlk(".init", (unsigned long)__init_begin, + (unsigned long)__init_end); + print_mlk(".text", (unsigned long)_text, (unsigned long)_etext); + print_mlk(".data", (unsigned long)_sdata, (unsigned long)_edata); + print_mlk(".bss", (unsigned long)__bss_start, + (unsigned long)__bss_stop); +} +#else +static void print_vm_layout(void) { } +#endif /* CONFIG_DEBUG_VM */ + void __init mem_init(void) { #ifdef CONFIG_FLATMEM @@ -55,6 +90,7 @@ void __init mem_init(void) memblock_free_all(); mem_init_print_info(NULL); + print_vm_layout(); } #ifdef CONFIG_BLK_DEV_INITRD
Add support for dumping the kernel address space layout to the console. User can enable CONFIG_DEBUG_VM to dump the virtual memory region into dmesg buffer during boot-up. Signed-off-by: Yash Shah <yash.shah@sifive.com> --- This patch is based on Linux 5.4-rc6 and tested on SiFive HiFive Unleashed board. Changes in v2: - Avoid #ifdefs inside functions - Helper functions instead of macros - Drop newly added CONFIG_DEBUG_VM_LAYOUT, instead use CONFIG_DEBUG_VM --- arch/riscv/mm/init.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)