From: Xianting Tian <xianting.tian@linux.alibaba.com> To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, ardb@kernel.org, guoren@kernel.org, heiko@sntech.de Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Xianting Tian <xianting.tian@linux.alibaba.com> Subject: [PATCH] RISC-V: Add STACKLEAK erasing the kernel stack at the end of syscalls Date: Sun, 28 Aug 2022 21:54:07 +0800 [thread overview] Message-ID: <20220828135407.3897717-1-xianting.tian@linux.alibaba.com> (raw) This adds support for the STACKLEAK gcc plugin to RISC-V and disables the plugin in EFI stub code, which is out of scope for the protection. For the benefits of STACKLEAK feature, please check the commit afaef01c0015 ("x86/entry: Add STACKLEAK erasing the kernel stack at the end of syscalls") Performance impact (tested on qemu env with 1 riscv64 hart, 1GB mem) hackbench -s 512 -l 200 -g 15 -f 25 -P 2.0% slowdown Signed-off-by: Xianting Tian <xianting.tian@linux.alibaba.com> --- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/processor.h | 4 ++++ arch/riscv/kernel/entry.S | 3 +++ drivers/firmware/efi/libstub/Makefile | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index ed66c31e4655..61fd0dad4463 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -85,6 +85,7 @@ config RISCV select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE select HAVE_ARCH_THREAD_STRUCT_WHITELIST select HAVE_ARCH_VMAP_STACK if MMU && 64BIT + select HAVE_ARCH_STACKLEAK select HAVE_ASM_MODVERSIONS select HAVE_CONTEXT_TRACKING_USER select HAVE_DEBUG_KMEMLEAK diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index 19eedd4af4cd..75620c467d25 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -85,6 +85,10 @@ int riscv_of_parent_hartid(struct device_node *node, unsigned long *hartid); extern void riscv_fill_hwcap(void); extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src); +#define current_top_of_stack() ((unsigned long)current->stack + THREAD_SIZE) +#define on_thread_stack() ((unsigned long)((current_top_of_stack() \ + - current_stack_pointer) < THREAD_SIZE)) + #endif /* __ASSEMBLY__ */ #endif /* _ASM_RISCV_PROCESSOR_H */ diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index b9eda3fcbd6d..5f98660b46d4 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -233,6 +233,9 @@ check_syscall_nr: ret_from_syscall: /* Set user a0 to kernel a0 */ REG_S a0, PT_A0(sp) +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK + call stackleak_erase_on_task_stack +#endif /* * We didn't execute the actual syscall. * Seccomp already set return value for the current task pt_regs. diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile index d0537573501e..5e1fc4f82883 100644 --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile @@ -25,7 +25,7 @@ cflags-$(CONFIG_ARM) := $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \ -fno-builtin -fpic \ $(call cc-option,-mno-single-pic-base) cflags-$(CONFIG_RISCV) := $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \ - -fpic + -fpic $(DISABLE_STACKLEAK_PLUGIN) cflags-$(CONFIG_EFI_GENERIC_STUB) += -I$(srctree)/scripts/dtc/libfdt -- 2.17.1 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
WARNING: multiple messages have this Message-ID (diff)
From: guoren@kernel.org To: oleg@redhat.com, vgupta@kernel.org, linux@armlinux.org.uk, monstr@monstr.eu, dinguyen@kernel.org, palmer@dabbelt.com, davem@davemloft.net, arnd@arndb.de, shorne@gmail.com, guoren@kernel.org, paul.walmsley@sifive.com, aou@eecs.berkeley.edu, ardb@kernel.org, heiko@sntech.de Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-snps-arc@lists.infradead.org, sparclinux@vger.kernel.org, openrisc@lists.librecores.org, Xianting Tian <xianting.tian@linux.alibaba.com>, linux-efi@vger.kernel.org Subject: [PATCH] RISC-V: Add STACKLEAK erasing the kernel stack at the end of syscalls Date: Sat, 3 Sep 2022 12:23:28 -0400 [thread overview] Message-ID: <20220828135407.3897717-1-xianting.tian@linux.alibaba.com> (raw) Message-ID: <20220903162328.dNfP7ctbFyga2X_UNN4VBjU_-OkOouF4hkHlGTrs38A@z> (raw) In-Reply-To: <20220903162328.1952477-1-guoren@kernel.org> From: Xianting Tian <xianting.tian@linux.alibaba.com> This adds support for the STACKLEAK gcc plugin to RISC-V and disables the plugin in EFI stub code, which is out of scope for the protection. For the benefits of STACKLEAK feature, please check the commit afaef01c0015 ("x86/entry: Add STACKLEAK erasing the kernel stack at the end of syscalls") Performance impact (tested on qemu env with 1 riscv64 hart, 1GB mem) hackbench -s 512 -l 200 -g 15 -f 25 -P 2.0% slowdown Signed-off-by: Xianting Tian <xianting.tian@linux.alibaba.com> --- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/processor.h | 4 ++++ arch/riscv/kernel/entry.S | 3 +++ drivers/firmware/efi/libstub/Makefile | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index ed66c31e4655..61fd0dad4463 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -85,6 +85,7 @@ config RISCV select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE select HAVE_ARCH_THREAD_STRUCT_WHITELIST select HAVE_ARCH_VMAP_STACK if MMU && 64BIT + select HAVE_ARCH_STACKLEAK select HAVE_ASM_MODVERSIONS select HAVE_CONTEXT_TRACKING_USER select HAVE_DEBUG_KMEMLEAK diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile index d0537573501e..5e1fc4f82883 100644 --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile @@ -25,7 +25,7 @@ cflags-$(CONFIG_ARM) := $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \ -fno-builtin -fpic \ $(call cc-option,-mno-single-pic-base) cflags-$(CONFIG_RISCV) := $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \ - -fpic + -fpic $(DISABLE_STACKLEAK_PLUGIN) cflags-$(CONFIG_EFI_GENERIC_STUB) += -I$(srctree)/scripts/dtc/libfdt -- 2.17.1 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev reply other threads:[~2022-08-28 13:54 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-09-03 16:23 [PATCH V2 0/3] arch: Cleanup ptrace_disable guoren 2022-08-28 13:54 ` Xianting Tian [this message] 2022-09-03 16:23 ` [PATCH] RISC-V: Add STACKLEAK erasing the kernel stack at the end of syscalls guoren 2022-09-06 17:35 ` Conor.Dooley 2022-09-07 1:51 ` Guo Ren 2022-10-07 2:31 ` Palmer Dabbelt 2022-10-07 11:29 ` Mark Rutland 2022-10-08 0:00 ` Guo Ren 2022-09-03 16:23 ` [PATCH V2 1/3] riscv: ptrace: Remove duplicate operation guoren 2022-09-03 16:23 ` [PATCH V2 2/3] openrisc: " guoren 2022-09-03 16:23 ` [PATCH V2 3/3] arch: ptrace: Cleanup ptrace_disable guoren
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220828135407.3897717-1-xianting.tian@linux.alibaba.com \ --to=xianting.tian@linux.alibaba.com \ --cc=aou@eecs.berkeley.edu \ --cc=ardb@kernel.org \ --cc=guoren@kernel.org \ --cc=heiko@sntech.de \ --cc=linux-efi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-riscv@lists.infradead.org \ --cc=palmer@dabbelt.com \ --cc=paul.walmsley@sifive.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).