s390/mm/ptdump: Generate address marker array dynamically

Generate the address marker array dynamically instead of modifying a large
static array at kernel startup. Each marker is added twice to the array:
with and without a "start" indicator. This way the code and logic stays
similar to other architectures.

Acked-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/mm/dump_pagetables.c b/arch/s390/mm/dump_pagetables.c
index 0a67fcee44141e966ff514784752c10a6973167d..9e2dc42143b3cd539e4353118b2a2d775cd63840 100644 (file)
--- a/arch/s390/mm/dump_pagetables.c
+++ b/arch/s390/mm/dump_pagetables.c
@@ -18,89 +18,12 @@ static unsigned long max_addr;
 struct addr_marker {
        int is_start;
        unsigned long start_address;
+       unsigned long size;
        const char *name;
 };
 
-enum address_markers_idx {
-       KVA_NR = 0,
-       LOWCORE_START_NR,
-       LOWCORE_END_NR,
-       AMODE31_START_NR,
-       AMODE31_END_NR,
-       KERNEL_START_NR,
-       KERNEL_END_NR,
-#ifdef CONFIG_KFENCE
-       KFENCE_START_NR,
-       KFENCE_END_NR,
-#endif
-       IDENTITY_START_NR,
-       IDENTITY_END_NR,
-       VMEMMAP_NR,
-       VMEMMAP_END_NR,
-       VMALLOC_NR,
-       VMALLOC_END_NR,
-#ifdef CONFIG_KMSAN
-       KMSAN_VMALLOC_SHADOW_START_NR,
-       KMSAN_VMALLOC_SHADOW_END_NR,
-       KMSAN_VMALLOC_ORIGIN_START_NR,
-       KMSAN_VMALLOC_ORIGIN_END_NR,
-       KMSAN_MODULES_SHADOW_START_NR,
-       KMSAN_MODULES_SHADOW_END_NR,
-       KMSAN_MODULES_ORIGIN_START_NR,
-       KMSAN_MODULES_ORIGIN_END_NR,
-#endif
-       MODULES_NR,
-       MODULES_END_NR,
-       ABS_LOWCORE_NR,
-       ABS_LOWCORE_END_NR,
-       MEMCPY_REAL_NR,
-       MEMCPY_REAL_END_NR,
-#ifdef CONFIG_KASAN
-       KASAN_SHADOW_START_NR,
-       KASAN_SHADOW_END_NR,
-#endif
-};
-
-static struct addr_marker address_markers[] = {
-       [KVA_NR]                = {0, 0, "Kernel Virtual Address Space"},
-       [LOWCORE_START_NR]      = {1, 0, "Lowcore Start"},
-       [LOWCORE_END_NR]        = {0, 0, "Lowcore End"},
-       [IDENTITY_START_NR]     = {1, 0, "Identity Mapping Start"},
-       [IDENTITY_END_NR]       = {0, 0, "Identity Mapping End"},
-       [AMODE31_START_NR]      = {1, 0, "Amode31 Area Start"},
-       [AMODE31_END_NR]        = {0, 0, "Amode31 Area End"},
-       [KERNEL_START_NR]       = {1, (unsigned long)_stext, "Kernel Image Start"},
-       [KERNEL_END_NR]         = {0, (unsigned long)_end, "Kernel Image End"},
-#ifdef CONFIG_KFENCE
-       [KFENCE_START_NR]       = {1, 0, "KFence Pool Start"},
-       [KFENCE_END_NR]         = {0, 0, "KFence Pool End"},
-#endif
-       [VMEMMAP_NR]            = {1, 0, "vmemmap Area Start"},
-       [VMEMMAP_END_NR]        = {0, 0, "vmemmap Area End"},
-       [VMALLOC_NR]            = {1, 0, "vmalloc Area Start"},
-       [VMALLOC_END_NR]        = {0, 0, "vmalloc Area End"},
-#ifdef CONFIG_KMSAN
-       [KMSAN_VMALLOC_SHADOW_START_NR] = {1, 0, "Kmsan vmalloc Shadow Start"},
-       [KMSAN_VMALLOC_SHADOW_END_NR]   = {0, 0, "Kmsan vmalloc Shadow End"},
-       [KMSAN_VMALLOC_ORIGIN_START_NR] = {1, 0, "Kmsan vmalloc Origins Start"},
-       [KMSAN_VMALLOC_ORIGIN_END_NR]   = {0, 0, "Kmsan vmalloc Origins End"},
-       [KMSAN_MODULES_SHADOW_START_NR] = {1, 0, "Kmsan Modules Shadow Start"},
-       [KMSAN_MODULES_SHADOW_END_NR]   = {0, 0, "Kmsan Modules Shadow End"},
-       [KMSAN_MODULES_ORIGIN_START_NR] = {1, 0, "Kmsan Modules Origins Start"},
-       [KMSAN_MODULES_ORIGIN_END_NR]   = {0, 0, "Kmsan Modules Origins End"},
-#endif
-       [MODULES_NR]            = {1, 0, "Modules Area Start"},
-       [MODULES_END_NR]        = {0, 0, "Modules Area End"},
-       [ABS_LOWCORE_NR]        = {1, 0, "Lowcore Area Start"},
-       [ABS_LOWCORE_END_NR]    = {0, 0, "Lowcore Area End"},
-       [MEMCPY_REAL_NR]        = {1, 0, "Real Memory Copy Area Start"},
-       [MEMCPY_REAL_END_NR]    = {0, 0, "Real Memory Copy Area End"},
-#ifdef CONFIG_KASAN
-       [KASAN_SHADOW_START_NR] = {1, KASAN_SHADOW_START, "Kasan Shadow Start"},
-       [KASAN_SHADOW_END_NR]   = {0, KASAN_SHADOW_END, "Kasan Shadow End"},
-#endif
-       {1, -1UL, NULL}
-};
+static struct addr_marker *markers;
+static unsigned int markers_cnt;
 
 struct pg_state {
        struct ptdump_state ptdump;
@@ -173,7 +96,8 @@ static void note_page_update_state(struct pg_state *st, unsigned long addr, unsi
 
        while (addr >= st->marker[1].start_address) {
                st->marker++;
-               pt_dump_seq_printf(m, "---[ %s ]---\n", st->marker->name);
+               pt_dump_seq_printf(m, "---[ %s %s ]---\n", st->marker->name,
+                                  st->marker->is_start ? "Start" : "End");
        }
        st->start_address = addr;
        st->current_prot = prot;
@@ -202,7 +126,7 @@ static void note_page(struct ptdump_state *pt_st, unsigned long addr, int level,
        if (level == -1)
                addr = max_addr;
        if (st->level == -1) {
-               pt_dump_seq_printf(m, "---[ %s ]---\n", st->marker->name);
+               pt_dump_seq_puts(m, "---[ Kernel Virtual Address Space ]---\n");
                note_page_update_state(st, addr, prot, level);
        } else if (prot != st->current_prot || level != st->level ||
                   addr >= st->marker[1].start_address) {
@@ -276,7 +200,7 @@ static int ptdump_show(struct seq_file *m, void *v)
                .check_wx = false,
                .wx_pages = 0,
                .start_address = 0,
-               .marker = address_markers,
+               .marker = markers,
        };
 
        get_online_mems();
@@ -299,10 +223,23 @@ static int ptdump_cmp(const void *a, const void *b)
        if (ama->start_address < amb->start_address)
                return -1;
        /*
-        * If the start addresses of two markers are identical consider the
-        * marker which defines the start of an area higher than the one which
-        * defines the end of an area. This keeps pairs of markers sorted.
+        * If the start addresses of two markers are identical sort markers in an
+        * order that considers areas contained within other areas correctly.
         */
+       if (ama->is_start && amb->is_start) {
+               if (ama->size > amb->size)
+                       return -1;
+               if (ama->size < amb->size)
+                       return 1;
+               return 0;
+       }
+       if (!ama->is_start && !amb->is_start) {
+               if (ama->size > amb->size)
+                       return 1;
+               if (ama->size < amb->size)
+                       return -1;
+               return 0;
+       }
        if (ama->is_start)
                return 1;
        if (amb->is_start)
@@ -310,12 +247,41 @@ static int ptdump_cmp(const void *a, const void *b)
        return 0;
 }
 
+static int add_marker(unsigned long start, unsigned long end, const char *name)
+{
+       size_t oldsize, newsize;
+
+       oldsize = markers_cnt * sizeof(*markers);
+       newsize = oldsize + 2 * sizeof(*markers);
+       if (!oldsize)
+               markers = kvmalloc(newsize, GFP_KERNEL);
+       else
+               markers = kvrealloc(markers, oldsize, newsize, GFP_KERNEL);
+       if (!markers)
+               goto error;
+       markers[markers_cnt].is_start = 1;
+       markers[markers_cnt].start_address = start;
+       markers[markers_cnt].size = end - start;
+       markers[markers_cnt].name = name;
+       markers_cnt++;
+       markers[markers_cnt].is_start = 0;
+       markers[markers_cnt].start_address = end;
+       markers[markers_cnt].size = end - start;
+       markers[markers_cnt].name = name;
+       markers_cnt++;
+       return 0;
+error:
+       markers_cnt = 0;
+       return -ENOMEM;
+}
+
 static int pt_dump_init(void)
 {
 #ifdef CONFIG_KFENCE
        unsigned long kfence_start = (unsigned long)__kfence_pool;
 #endif
        unsigned long lowcore = (unsigned long)get_lowcore();
+       int rc;
 
        /*
         * Figure out the maximum virtual address being accessible with the
@@ -324,41 +290,38 @@ static int pt_dump_init(void)
         */
        max_addr = (get_lowcore()->kernel_asce.val & _REGION_ENTRY_TYPE_MASK) >> 2;
        max_addr = 1UL << (max_addr * 11 + 31);
-       address_markers[LOWCORE_START_NR].start_address = lowcore;
-       address_markers[LOWCORE_END_NR].start_address = lowcore + sizeof(struct lowcore);
-       address_markers[IDENTITY_START_NR].start_address = __identity_base;
-       address_markers[IDENTITY_END_NR].start_address = __identity_base + ident_map_size;
-       address_markers[AMODE31_START_NR].start_address = (unsigned long)__samode31;
-       address_markers[AMODE31_END_NR].start_address = (unsigned long)__eamode31;
-       address_markers[MODULES_NR].start_address = MODULES_VADDR;
-       address_markers[MODULES_END_NR].start_address = MODULES_END;
-       address_markers[ABS_LOWCORE_NR].start_address = __abs_lowcore;
-       address_markers[ABS_LOWCORE_END_NR].start_address = __abs_lowcore + ABS_LOWCORE_MAP_SIZE;
-       address_markers[MEMCPY_REAL_NR].start_address = __memcpy_real_area;
-       address_markers[MEMCPY_REAL_END_NR].start_address = __memcpy_real_area + MEMCPY_REAL_SIZE;
-       address_markers[VMEMMAP_NR].start_address = (unsigned long) vmemmap;
-       address_markers[VMEMMAP_END_NR].start_address = (unsigned long)vmemmap + vmemmap_size;
-       address_markers[VMALLOC_NR].start_address = VMALLOC_START;
-       address_markers[VMALLOC_END_NR].start_address = VMALLOC_END;
+       /* start + end markers - must be added first */
+       rc = add_marker(0, -1UL, NULL);
+       rc |= add_marker((unsigned long)_stext, (unsigned long)_end, "Kernel Image");
+       rc |= add_marker(lowcore, lowcore + sizeof(struct lowcore), "Lowcore");
+       rc |= add_marker(__identity_base, __identity_base + ident_map_size, "Identity Mapping");
+       rc |= add_marker((unsigned long)__samode31, (unsigned long)__eamode31, "Amode31 Area");
+       rc |= add_marker(MODULES_VADDR, MODULES_END, "Modules Area");
+       rc |= add_marker(__abs_lowcore, __abs_lowcore + ABS_LOWCORE_MAP_SIZE, "Lowcore Area");
+       rc |= add_marker(__memcpy_real_area, __memcpy_real_area + MEMCPY_REAL_SIZE, "Real Memory Copy Area");
+       rc |= add_marker((unsigned long)vmemmap, (unsigned long)vmemmap + vmemmap_size, "vmemmap Area");
+       rc |= add_marker(VMALLOC_START, VMALLOC_END, "vmalloc Area");
 #ifdef CONFIG_KFENCE
-       address_markers[KFENCE_START_NR].start_address = kfence_start;
-       address_markers[KFENCE_END_NR].start_address = kfence_start + KFENCE_POOL_SIZE;
+       rc |= add_marker(kfence_start, kfence_start + KFENCE_POOL_SIZE, "KFence Pool");
 #endif
 #ifdef CONFIG_KMSAN
-       address_markers[KMSAN_VMALLOC_SHADOW_START_NR].start_address = KMSAN_VMALLOC_SHADOW_START;
-       address_markers[KMSAN_VMALLOC_SHADOW_END_NR].start_address = KMSAN_VMALLOC_SHADOW_END;
-       address_markers[KMSAN_VMALLOC_ORIGIN_START_NR].start_address = KMSAN_VMALLOC_ORIGIN_START;
-       address_markers[KMSAN_VMALLOC_ORIGIN_END_NR].start_address = KMSAN_VMALLOC_ORIGIN_END;
-       address_markers[KMSAN_MODULES_SHADOW_START_NR].start_address = KMSAN_MODULES_SHADOW_START;
-       address_markers[KMSAN_MODULES_SHADOW_END_NR].start_address = KMSAN_MODULES_SHADOW_END;
-       address_markers[KMSAN_MODULES_ORIGIN_START_NR].start_address = KMSAN_MODULES_ORIGIN_START;
-       address_markers[KMSAN_MODULES_ORIGIN_END_NR].start_address = KMSAN_MODULES_ORIGIN_END;
+       rc |= add_marker(KMSAN_VMALLOC_SHADOW_START, KMSAN_VMALLOC_SHADOW_END, "Kmsan vmalloc Shadow");
+       rc |= add_marker(KMSAN_VMALLOC_ORIGIN_START, KMSAN_VMALLOC_ORIGIN_END, "Kmsan vmalloc Origins");
+       rc |= add_marker(KMSAN_MODULES_SHADOW_START, KMSAN_MODULES_SHADOW_END, "Kmsan Modules Shadow");
+       rc |= add_marker(KMSAN_MODULES_ORIGIN_START, KMSAN_MODULES_ORIGIN_END, "Kmsan Modules Origins");
+#endif
+#ifdef CONFIG_KASAN
+       rc |= add_marker(KASAN_SHADOW_START, KASAN_SHADOW_END, "Kasan Shadow");
 #endif
-       sort(address_markers, ARRAY_SIZE(address_markers) - 1,
-            sizeof(address_markers[0]), ptdump_cmp, NULL);
+       if (rc)
+               goto error;
+       sort(&markers[1], markers_cnt - 1, sizeof(*markers), ptdump_cmp, NULL);
 #ifdef CONFIG_PTDUMP_DEBUGFS
        debugfs_create_file("kernel_page_tables", 0400, NULL, NULL, &ptdump_fops);
 #endif /* CONFIG_PTDUMP_DEBUGFS */
        return 0;
+error:
+       kvfree(markers);
+       return -ENOMEM;
 }
 device_initcall(pt_dump_init);