The patch titled
Subject: arm64: fix add kasan bug
has been added to the -mm tree. Its filename is
arm64-fix-add-kasan-bug.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/arm64-fix-add-kasan-bug.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/arm64-fix-add-kasan-bug.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: zhong jiang <zhongjiang@xxxxxxxxxx>
Subject: arm64: fix add kasan bug
In general, each process have 16kb stack space to use, but stack need
extra space to store red_zone when kasan enable. the patch fix above
question.
Signed-off-by: zhong jiang <zhongjiang@xxxxxxxxxx>
Cc: Andrey Ryabinin <ryabinin.a.a@xxxxxxxxx>
Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
Cc: Xishi Qiu <qiuxishi@xxxxxxxxxx>
Cc: Wang Long <long.wanglong@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/arm64/include/asm/thread_info.h | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff -puN arch/arm64/include/asm/thread_info.h~arm64-fix-add-kasan-bug arch/arm64/include/asm/thread_info.h
--- a/arch/arm64/include/asm/thread_info.h~arm64-fix-add-kasan-bug
+++ a/arch/arm64/include/asm/thread_info.h
@@ -23,13 +23,24 @@
#include <linux/compiler.h>
+#ifdef CONFIG_KASAN
+#define KASAN_STACK_ORDER 1
+#else
+#define KASAN_STACK_ORDER 0
+#endif
+
#ifdef CONFIG_ARM64_4K_PAGES
-#define THREAD_SIZE_ORDER 2
+#define THREAD_SIZE_ORDER (2 + KASAN_STACK_ORDER)
#elif defined(CONFIG_ARM64_16K_PAGES)
-#define THREAD_SIZE_ORDER 0
+#define THREAD_SIZE_ORDER (0 + KASAN_STACK_ORDER)
#endif
+#ifdef CONFIG_KASAN
+#define THREAD_SIZE 32768
+#else
#define THREAD_SIZE 16384
+#endif
+
#define THREAD_START_SP (THREAD_SIZE - 16)
#ifndef __ASSEMBLY__
_
Patches currently in -mm which might be from zhongjiang@xxxxxxxxxx are
arm64-fix-add-kasan-bug.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
