s390/mm,ptdump: avoid Kasan vs Memcpy Real markers swapping

---[ Real Memory Copy Area Start ]---
0x001bfffffffff000-0x001c000000000000         4K PTE I
---[ Kasan Shadow Start ]---
---[ Real Memory Copy Area End ]---
0x001c000000000000-0x001c000200000000         8G PMD RW NX
...
---[ Kasan Shadow End ]---

ptdump does a stable sort of markers. Move kasan markers after
memcpy real to avoid swapping.

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

diff --git a/arch/s390/mm/dump_pagetables.c b/arch/s390/mm/dump_pagetables.c
index 9953819d795968c1d9ab09d362e415d1cf04e474..ba5f8026887814cf1b938cd40383af7537896226 100644 (file)
--- a/arch/s390/mm/dump_pagetables.c
+++ b/arch/s390/mm/dump_pagetables.c
@@ -33,10 +33,6 @@ enum address_markers_idx {
 #endif
        IDENTITY_AFTER_NR,
        IDENTITY_AFTER_END_NR,
-#ifdef CONFIG_KASAN
-       KASAN_SHADOW_START_NR,
-       KASAN_SHADOW_END_NR,
-#endif
        VMEMMAP_NR,
        VMEMMAP_END_NR,
        VMALLOC_NR,
@@ -47,6 +43,10 @@ enum address_markers_idx {
        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[] = {
@@ -62,10 +62,6 @@ static struct addr_marker address_markers[] = {
 #endif
        [IDENTITY_AFTER_NR]     = {(unsigned long)_end, "Identity Mapping Start"},
        [IDENTITY_AFTER_END_NR] = {0, "Identity Mapping End"},
-#ifdef CONFIG_KASAN
-       [KASAN_SHADOW_START_NR] = {KASAN_SHADOW_START, "Kasan Shadow Start"},
-       [KASAN_SHADOW_END_NR]   = {KASAN_SHADOW_END, "Kasan Shadow End"},
-#endif
        [VMEMMAP_NR]            = {0, "vmemmap Area Start"},
        [VMEMMAP_END_NR]        = {0, "vmemmap Area End"},
        [VMALLOC_NR]            = {0, "vmalloc Area Start"},
@@ -76,6 +72,10 @@ static struct addr_marker address_markers[] = {
        [ABS_LOWCORE_END_NR]    = {0, "Lowcore Area End"},
        [MEMCPY_REAL_NR]        = {0, "Real Memory Copy Area Start"},
        [MEMCPY_REAL_END_NR]    = {0, "Real Memory Copy Area End"},
+#ifdef CONFIG_KASAN
+       [KASAN_SHADOW_START_NR] = {KASAN_SHADOW_START, "Kasan Shadow Start"},
+       [KASAN_SHADOW_END_NR]   = {KASAN_SHADOW_END, "Kasan Shadow End"},
+#endif
        { -1, NULL }
 };