Commit 86fea8b4 authored by Jing Xia's avatar Jing Xia Committed by Linus Torvalds
Browse files

mm/mm_init.c: report kasan-tag information stored in page->flags 



The pageflags_layout_usage shows incorrect message by means of
mminit_loglevel when Kasan runs in the mode of software tag-based
enabled with CONFIG_KASAN_SW_TAGS.  This patch corrects it and reports
kasan-tag information.

Signed-off-by: default avatarJing Xia <jing.xia@unisoc.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Chunyan Zhang <chunyan.zhang@unisoc.com>
Cc: Orson Zhai <orson.zhai@unisoc.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Link: http://lkml.kernel.org/r/1586929370-10838-1-git-send-email-jing.xia.mail@gmail.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9380ce24

mm/mm_init.c

+10 −6
Original line number Diff line number Diff line
@@ -67,26 +67,30 @@ void __init mminit_verify_pageflags_layout(void) 
	unsigned long or_mask, add_mask;



	shift = 8 * sizeof(unsigned long);

	width = shift - SECTIONS_WIDTH - NODES_WIDTH - ZONES_WIDTH - LAST_CPUPID_SHIFT;

	width = shift - SECTIONS_WIDTH - NODES_WIDTH - ZONES_WIDTH

		- LAST_CPUPID_SHIFT - KASAN_TAG_WIDTH;

	mminit_dprintk(MMINIT_TRACE, "pageflags_layout_widths",

		"Section %d Node %d Zone %d Lastcpupid %d Flags %d\n",

		"Section %d Node %d Zone %d Lastcpupid %d Kasantag %d Flags %d\n",

		SECTIONS_WIDTH,

		NODES_WIDTH,

		ZONES_WIDTH,

		LAST_CPUPID_WIDTH,

		KASAN_TAG_WIDTH,

		NR_PAGEFLAGS);

	mminit_dprintk(MMINIT_TRACE, "pageflags_layout_shifts",

		"Section %d Node %d Zone %d Lastcpupid %d\n",

		"Section %d Node %d Zone %d Lastcpupid %d Kasantag %d\n",

		SECTIONS_SHIFT,

		NODES_SHIFT,

		ZONES_SHIFT,

		LAST_CPUPID_SHIFT);

		LAST_CPUPID_SHIFT,

		KASAN_TAG_WIDTH);

	mminit_dprintk(MMINIT_TRACE, "pageflags_layout_pgshifts",

		"Section %lu Node %lu Zone %lu Lastcpupid %lu\n",

		"Section %lu Node %lu Zone %lu Lastcpupid %lu Kasantag %lu\n",

		(unsigned long)SECTIONS_PGSHIFT,

		(unsigned long)NODES_PGSHIFT,

		(unsigned long)ZONES_PGSHIFT,

		(unsigned long)LAST_CPUPID_PGSHIFT);

		(unsigned long)LAST_CPUPID_PGSHIFT,

		(unsigned long)KASAN_TAG_PGSHIFT);

	mminit_dprintk(MMINIT_TRACE, "pageflags_layout_nodezoneid",

		"Node/Zone ID: %lu -> %lu\n",

		(unsigned long)(ZONEID_PGOFF + ZONEID_SHIFT),

CRA Git | Maintained and supported by SUSTech CRA and CCSE