[PATCH 08/13] xtensa: split out printing of virtual memory layout to a function

Mike Rapoport
2025-03-06T18:53:30Z

This will help with pulling out memblock_free_all() to the generic
code and reducing code duplication in arch::mem_init().

Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
---
arch/xtensa/mm/init.c | 97 ++++++++++++++++++++++---------------------
1 file changed, 50 insertions(+), 47 deletions(-)

diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index b2587a1a7c46..01577d33e602 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -66,6 +66,55 @@ void __init bootmem_init(void)
memblock_dump_all();
}

+static void __init print_vm_layout(void)
+{
+ pr_info("virtual kernel memory layout:\n"
+#ifdef CONFIG_KASAN
+ " kasan : 0x%08lx - 0x%08lx (%5lu MB)\n"
+#endif
+#ifdef CONFIG_MMU
+ " vmalloc : 0x%08lx - 0x%08lx (%5lu MB)\n"
+#endif
+#ifdef CONFIG_HIGHMEM
+ " pkmap : 0x%08lx - 0x%08lx (%5lu kB)\n"
+ " fixmap : 0x%08lx - 0x%08lx (%5lu kB)\n"
+#endif
+ " lowmem : 0x%08lx - 0x%08lx (%5lu MB)\n"
+ " .text : 0x%08lx - 0x%08lx (%5lu kB)\n"
+ " .rodata : 0x%08lx - 0x%08lx (%5lu kB)\n"
+ " .data : 0x%08lx - 0x%08lx (%5lu kB)\n"
+ " .init : 0x%08lx - 0x%08lx (%5lu kB)\n"
+ " .bss : 0x%08lx - 0x%08lx (%5lu kB)\n",
+#ifdef CONFIG_KASAN
+ KASAN_SHADOW_START, KASAN_SHADOW_START + KASAN_SHADOW_SIZE,
+ KASAN_SHADOW_SIZE >> 20,
+#endif
+#ifdef CONFIG_MMU
+ VMALLOC_START, VMALLOC_END,
+ (VMALLOC_END - VMALLOC_START) >> 20,
+#ifdef CONFIG_HIGHMEM
+ PKMAP_BASE, PKMAP_BASE + LAST_PKMAP * PAGE_SIZE,
+ (LAST_PKMAP*PAGE_SIZE) >> 10,
+ FIXADDR_START, FIXADDR_END,
+ (FIXADDR_END - FIXADDR_START) >> 10,
+#endif
+ PAGE_OFFSET, PAGE_OFFSET +
+ (max_low_pfn - min_low_pfn) * PAGE_SIZE,
+#else
+ min_low_pfn * PAGE_SIZE, max_low_pfn * PAGE_SIZE,
+#endif
+ ((max_low_pfn - min_low_pfn) * PAGE_SIZE) >> 20,
+ (unsigned long)_text, (unsigned long)_etext,
+ (unsigned long)(_etext - _text) >> 10,
+ (unsigned long)__start_rodata, (unsigned long)__end_rodata,
+ (unsigned long)(__end_rodata - __start_rodata) >> 10,
+ (unsigned long)_sdata, (unsigned long)_edata,
+ (unsigned long)(_edata - _sdata) >> 10,
+ (unsigned long)__init_begin, (unsigned long)__init_end,
+ (unsigned long)(__init_end - __init_begin) >> 10,
+ (unsigned long)__bss_start, (unsigned long)__bss_stop,
+ (unsigned long)(__bss_stop - __bss_start) >> 10);
+}

void __init zones_init(void)
{
@@ -77,6 +126,7 @@ void __init zones_init(void)
#endif
};
free_area_init(max_zone_pfn);
+ print_vm_layout();
}

static void __init free_highpages(void)
@@ -118,53 +168,6 @@ void __init mem_init(void)
high_memory = (void *)__va(max_low_pfn << PAGE_SHIFT);

memblock_free_all();
-
- pr_info("virtual kernel memory layout:\n"
-#ifdef CONFIG_KASAN
- " kasan : 0x%08lx - 0x%08lx (%5lu MB)\n"
-#endif
-#ifdef CONFIG_MMU
- " vmalloc : 0x%08lx - 0x%08lx (%5lu MB)\n"
-#endif
-#ifdef CONFIG_HIGHMEM
- " pkmap : 0x%08lx - 0x%08lx (%5lu kB)\n"
- " fixmap : 0x%08lx - 0x%08lx (%5lu kB)\n"
-#endif
- " lowmem : 0x%08lx - 0x%08lx (%5lu MB)\n"
- " .text : 0x%08lx - 0x%08lx (%5lu kB)\n"
- " .rodata : 0x%08lx - 0x%08lx (%5lu kB)\n"
- " .data : 0x%08lx - 0x%08lx (%5lu kB)\n"
- " .init : 0x%08lx - 0x%08lx (%5lu kB)\n"
- " .bss : 0x%08lx - 0x%08lx (%5lu kB)\n",
-#ifdef CONFIG_KASAN
- KASAN_SHADOW_START, KASAN_SHADOW_START + KASAN_SHADOW_SIZE,
- KASAN_SHADOW_SIZE >> 20,
-#endif
-#ifdef CONFIG_MMU
- VMALLOC_START, VMALLOC_END,
- (VMALLOC_END - VMALLOC_START) >> 20,
-#ifdef CONFIG_HIGHMEM
- PKMAP_BASE, PKMAP_BASE + LAST_PKMAP * PAGE_SIZE,
- (LAST_PKMAP*PAGE_SIZE) >> 10,
- FIXADDR_START, FIXADDR_END,
- (FIXADDR_END - FIXADDR_START) >> 10,
-#endif
- PAGE_OFFSET, PAGE_OFFSET +
- (max_low_pfn - min_low_pfn) * PAGE_SIZE,
-#else
- min_low_pfn * PAGE_SIZE, max_low_pfn * PAGE_SIZE,
-#endif
- ((max_low_pfn - min_low_pfn) * PAGE_SIZE) >> 20,
- (unsigned long)_text, (unsigned long)_etext,
- (unsigned long)(_etext - _text) >> 10,
- (unsigned long)__start_rodata, (unsigned long)__end_rodata,
- (unsigned long)(__end_rodata - __start_rodata) >> 10,
- (unsigned long)_sdata, (unsigned long)_edata,
- (unsigned long)(_edata - _sdata) >> 10,
- (unsigned long)__init_begin, (unsigned long)__init_end,
- (unsigned long)(__init_end - __init_begin) >> 10,
- (unsigned long)__bss_start, (unsigned long)__bss_stop,
- (unsigned long)(__bss_stop - __bss_start) >> 10);
}

static void __init parse_memmap_one(char *p)
--
2.47.2