Commit 05178996 authored by Vasily Gorbik's avatar Vasily Gorbik Committed by Heiko Carstens
Browse files

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: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 39da9a97

arch/s390/mm/dump_pagetables.c

+8 −8
Original line number Diff line number Diff line
@@ -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 }

};