riscv: Increase stack size under KASAN
PATCH 1/1 riscv: Increase stack size under KASAN
KASAN requires more stack space because of compiler instrumentation. Increase stack size as other arches do.
--- arch/riscv/include/asm/thread_info.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
arch/riscv/include/asm/thread_info.h +8 -2
@@ -11,11 +11,17 @@#include <asm/page.h> #include <linux/const.h> +#ifdef CONFIG_KASAN +#define KASAN_STACK_ORDER 1 +#else +#define KASAN_STACK_ORDER 0 +#endif +/* thread information allocation */ #ifdef CONFIG_64BIT -#define THREAD_SIZE_ORDER (2) +#define THREAD_SIZE_ORDER (2 + KASAN_STACK_ORDER)#else -#define THREAD_SIZE_ORDER (1) +#define THREAD_SIZE_ORDER (1 + KASAN_STACK_ORDER)#endif #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
base-commit: 0966d385830de3470b7131db8e86c0c5bc9c52dc
Signature · 7 lines
2.35.1.723.g4982287a31-goog _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Quoted 8 lines · Dmitry Vyukov
KASAN requires more stack space because of compiler instrumentation. Increase stack size as other arches do.
Signed-off-by Dmitry Vyukov <[email protected]>Reported-by [email protected]
ping
Quoted 29 lines
--- arch/riscv/include/asm/thread_info.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)arch/riscv/include/asm/thread_info.h +8
-2@@ -11,11 +11,17 @@#include <asm/page.h> #include <linux/const.h> +#ifdef CONFIG_KASAN +#define KASAN_STACK_ORDER 1 +#else +#define KASAN_STACK_ORDER 0 +#endif +/* thread information allocation */ #ifdef CONFIG_64BIT -#define THREAD_SIZE_ORDER (2) +#define THREAD_SIZE_ORDER (2 + KASAN_STACK_ORDER)#else -#define THREAD_SIZE_ORDER (1) +#define THREAD_SIZE_ORDER (1 + KASAN_STACK_ORDER)#endif #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
Quoted 4 lines
base-commit:
0966d385830de3470b7131db8e86c0c5bc9c52dc--
2.35.1.723.g4982287a31-goog
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Palmer Dabbelt
maintainerQuoted 36 lines · On Mon, 14 Mar 2022 02:06:52 PDT (-0700), [email protected] wrote:
KASAN requires more stack space because of compiler instrumentation. Increase stack size as other arches do.
Signed-off-by Dmitry Vyukov <[email protected]>Reported-by [email protected]--- arch/riscv/include/asm/thread_info.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)arch/riscv/include/asm/thread_info.h +8
-2@@ -11,11 +11,17 @@#include <asm/page.h> #include <linux/const.h> +#ifdef CONFIG_KASAN +#define KASAN_STACK_ORDER 1 +#else +#define KASAN_STACK_ORDER 0 +#endif +/* thread information allocation */ #ifdef CONFIG_64BIT -#define THREAD_SIZE_ORDER (2) +#define THREAD_SIZE_ORDER (2 + KASAN_STACK_ORDER)#else -#define THREAD_SIZE_ORDER (1) +#define THREAD_SIZE_ORDER (1 + KASAN_STACK_ORDER)#endif #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
Quoted 1 line
base-commit:
0966d385830de3470b7131db8e86c0c5bc9c52dc
Thanks, this is on for-next (there's no fixes right now, I'm still collecting stuff for this merge window).
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv