riscv: Add GENERIC_ENTRY support and related features
Subsystems (4)
v6 cover riscv: Add GENERIC_ENTRY support and related features
From: Guo Ren <[email protected]>
The patches convert riscv to use the generic entry infrastructure from kernel/entry/*. Additionally, add independent irq stacks (IRQ_STACKS) for percpu to prevent kernel stack overflows. Add generic_entry based STACKLEAK support.
You can directly try it with:
[1] https://github.com/guoren83/linux/tree/generic_entry_v6
v6:
- Use THEAD_SIZE_ORDER for thread size adjustment in kconfig (Thx Arnd)
- Move call_on_stack to inline style (Thx Peter Zijlstra)
- Fixup fp chain broken (Thx Chen Zhongjin)
- Remove common entry modification, and fixup page_fault entry (Thx Peter Zijlstra)
- Treat some traps as nmi entry (Thx Peter Zijlstra)
v5:
https://lore.kernel.org/linux-riscv/[email protected]/
- Add riscv own stackleak patch instead of generic entry modification (by Mark Rutland)
- Add EXPERT dependency for THREAD_SIZE (by Arnd)
- Add EXPERT dependency for IRQ_STACK (by Sebastian, David Laight)
- Corrected __trap_section (by Peter Zijlstra)
- Add Tested-by (Yipeng Zou)
- Use CONFIG_SOFTIRQ_ON_OWN_STACK replace "#ifndef CONFIG_PREEMPT_RT"
- Fixup systrace_enter compile error
- Fixup exit_to_user_mode_prepare preempt_disable warning
V4:
https://lore.kernel.org/linux-riscv/[email protected]/
- Fixup entry.S with "la" bug (by Conor.Dooley)
- Fixup missing noinstr bug (by Peter Zijlstra)
V3:
https://lore.kernel.org/linux-riscv/[email protected]/
- Fixup CONFIG_COMPAT=n compile error
- Add THREAD_SIZE_ORDER config
- Optimize elf_kexec.c warning fixup
- Add static to irq_stack_ptr definition
V2:
https://lore.kernel.org/linux-riscv/[email protected]/
- Fixup compile error by include "riscv: ptrace: Remove duplicate operation"
- Fixup compile warning
- Add test repo link in cover letter
V1:
https://lore.kernel.org/linux-riscv/[email protected]/
Dao Lu (1):
riscv: Add support for STACKLEAK gcc plugin
Guo Ren (8):
riscv: elf_kexec: Fixup compile warning
riscv: compat_syscall_table: Fixup compile warning
riscv: ptrace: Remove duplicate operation
riscv: traps: Add noinstr to prevent instrumentation inserted
riscv: convert to generic entry
riscv: Support HAVE_IRQ_EXIT_ON_IRQ_STACK
riscv: Support HAVE_SOFTIRQ_ON_OWN_STACK
riscv: Add config of thread stack size
Jisheng Zhang (1):
riscv: remove extra level wrappers of trace_hardirqs_{on,off}
Lai Jiangshan (1):
compiler_types.h: Add __noinstr_section() for noinstr
arch/riscv/Kconfig | 21 +++ arch/riscv/include/asm/csr.h | 1 - arch/riscv/include/asm/entry-common.h | 8 + arch/riscv/include/asm/ptrace.h | 10 +- arch/riscv/include/asm/stacktrace.h | 5 + arch/riscv/include/asm/syscall.h | 6 + arch/riscv/include/asm/thread_info.h | 27 +-- arch/riscv/include/asm/vmap_stack.h | 28 ++++ arch/riscv/kernel/Makefile | 3 +- arch/riscv/kernel/elf_kexec.c | 2 +- arch/riscv/kernel/entry.S | 230 +++----------------------- arch/riscv/kernel/irq.c | 110 ++++++++++++ arch/riscv/kernel/ptrace.c | 44 ----- arch/riscv/kernel/signal.c | 21 +-- arch/riscv/kernel/sys_riscv.c | 27 +++ arch/riscv/kernel/trace_irq.c | 27 --- arch/riscv/kernel/trace_irq.h | 11 -- arch/riscv/kernel/traps.c | 70 ++++++-- arch/riscv/mm/fault.c | 14 +- drivers/firmware/efi/libstub/Makefile | 2 +- include/linux/compiler_types.h | 8 +- 21 files changed, 321 insertions(+), 354 deletions(-) create mode 100644 arch/riscv/include/asm/entry-common.h create mode 100644 arch/riscv/include/asm/vmap_stack.h delete mode 100644 arch/riscv/kernel/trace_irq.c delete mode 100644 arch/riscv/kernel/trace_irq.h
Signature · 1 line
2.36.1
PATCH v6 1/11 riscv: elf_kexec: Fixup compile warning
From: Guo Ren <[email protected]>
If CRYTPO or CRYPTO_SHA256 or KEXE_FILE is not enabled, then:
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=riscv SHELL=/bin/bash arch/riscv/
../arch/riscv/kernel/elf_kexec.c: In function 'elf_kexec_load':../arch/riscv/kernel/elf_kexec.c:185:23: warning: variable 'kernel_start' set but not used [-Wunused-but-set-variable]
185 | unsigned long kernel_start;
| ^~~~~~~~~~~~--- arch/riscv/kernel/elf_kexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/kernel/elf_kexec.c +1 -1
@@ -198,7 +198,7 @@ static void *elf_kexec_load(struct kimage *image, char *kernel_buf,if (ret) goto out; kernel_start = image->start; -pr_notice ("The entry point of kernel at 0x%lx\n" , image->start); +pr_notice ("The entry point of kernel at 0x%lx\n" , kernel_start);/* Add the kernel binary to the image */ ret = riscv_kexec_elf_load(image, &ehdr, &elf_info,
Signature · 1 line
2.36.1
Re: [PATCH V6 01/11] riscv: elf_kexec: Fixup compile warning
Quoted 27 lines · 在 2022/10/2 9:24, [email protected] 写道:
From: Guo Ren <[email protected]>
If CRYTPO or
CRYPTO_SHA256orKEXE_FILEis not enabled, then:COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=riscv SHELL=/bin/bash
arch/riscv/
../arch/riscv/kernel/elf_kexec.c: In function 'elf_kexec_load':../arch/riscv/kernel/elf_kexec.c:185:23: warning: variable 'kernel_start' set but not used [-Wunused-but-set-variable]185 | unsigned long kernel_start; | ^~~~~~~~~~~~Fixes 838b3e28488f ("RISC-V: Load purgatory in kexec_file")Signed-off-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>Reviewed-by Conor Dooley <[email protected]>Reported-by kernel test robot <[email protected]>--- arch/riscv/kernel/elf_kexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/riscv/kernel/elf_kexec.c +0
-0
arch/riscv/kernel/elf_kexec.c static void *elf_kexec_load(struct kimage *image, char *kernel_buf, · line 204
Quoted 8 lines
arch/riscv/kernel/elf_kexec.c +1
-1@@ -198,7 +198,7 @@ static void *elf_kexec_load(struct kimage *image, char *kernel_buf,if (ret) goto out; kernel_start = image->start; -pr_notice ("The entry point of kernel at 0x%lx\n" , image->start); +pr_notice ("The entry point of kernel at 0x%lx\n" , kernel_start);/* Add the kernel binary to the image */ ret = riscv_kexec_elf_load(image, &ehdr, &elf_info,
LGTM
Signature · 7 lines
BR, Liao, Chang _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH V6 01/11] riscv: elf_kexec: Fixup compile warning
Quoted 37 lines · liaochang (A)
Quoted 33 lines · 在 2022/10/2 9:24, [email protected] 写道:
From: Guo Ren <[email protected]>
If CRYTPO or
CRYPTO_SHA256orKEXE_FILEis not enabled, then:COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=riscv SHELL=/bin/bash
arch/riscv/
../arch/riscv/kernel/elf_kexec.c: In function 'elf_kexec_load':../arch/riscv/kernel/elf_kexec.c:185:23: warning: variable 'kernel_start' set but not used [-Wunused-but-set-variable]185 | unsigned long kernel_start; | ^~~~~~~~~~~~Fixes 838b3e28488f ("RISC-V: Load purgatory in kexec_file")Signed-off-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>Reviewed-by Conor Dooley <[email protected]>Reported-by kernel test robot <[email protected]>--- arch/riscv/kernel/elf_kexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/riscv/kernel/elf_kexec.c +1
-1@@ -198,7 +198,7 @@ static void *elf_kexec_load(struct kimage *image, char *kernel_buf,if (ret) goto out; kernel_start = image->start; -pr_notice ("The entry point of kernel at 0x%lx\n" , image->start); +pr_notice ("The entry point of kernel at 0x%lx\n" , kernel_start);
Quoted 6 lines
arch/riscv/kernel/elf_kexec.c static void *elf_kexec_load(struct kimage *image, char *kernel_buf, · line 204
Quoted 2 lines
arch/riscv/kernel/elf_kexec.c +0
-0/* Add the kernel binary to the image */ ret = riscv_kexec_elf_load(image, &ehdr, &elf_info,LGTM
Reviewed-by Liao Chang <[email protected]>
Thx
Quoted 4 lines
--
BR,
Liao, Chang
Signature · 2 lines
Best Regards Guo Ren
PATCH v6 2/11 riscv: compat_syscall_table: Fixup compile warning
In reply to [email protected]From: Guo Ren <[email protected]>
../arch/riscv/kernel/compat_syscall_table.c:12:41: warning: initialized field overwritten [-Woverride-init]
12 | #define __SYSCALL(nr, call) [nr] = (call),
| ^../include/uapi/asm-generic/unistd.h:567:1: note: in expansion of macro '__SYSCALL'
567 | __SYSCALL(__NR_semget, sys_semget)
--- arch/riscv/kernel/Makefile | 1 + 1 file changed, 1 insertion(+)
arch/riscv/kernel/Makefile +1 -0
@@ -9,6 +9,7 @@ CFLAGS_REMOVE_patch.o = $(CC_FLAGS_FTRACE) CFLAGS_REMOVE_sbi.o = $(CC_FLAGS_FTRACE) endif CFLAGS_syscall_table.o += $(call cc-option,-Wno-override-init,) +CFLAGS_compat_syscall_table.o += $(call cc-option,-Wno-override-init,) ifdef CONFIG_KEXEC AFLAGS_kexec_relocate.o := -mcmodel=medany $(call cc-option,-mno-relax)
Signature · 1 line
2.36.1
PATCH v6 3/11 riscv: ptrace: Remove duplicate operation
In reply to [email protected]From: Guo Ren <[email protected]>
The TIF_SYSCALL_TRACE is controlled by a common code, see kernel/ptrace.c and include/linux/thread.h.
clear_task_syscall_work(child, SYSCALL_TRACE);
--- arch/riscv/kernel/ptrace.c | 1 - 1 file changed, 1 deletion(-)
arch/riscv/kernel/ptrace.c +0 -1
@@ -212,7 +212,6 @@ unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n)void ptrace_disable (struct task_struct *child) { -clear_tsk_thread_flag (child,TIF_SYSCALL_TRACE ); } long arch_ptrace(struct task_struct *child, long request,
Signature · 7 lines
2.36.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v6 4/11 compiler_types.h: Add __noinstr_section() for noinstr
In reply to [email protected]From: Lai Jiangshan <[email protected]>
And it will be extended for C entry code.
--- include/linux/compiler_types.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
include/linux/compiler_types.h +5 -3
@@ -227,9 +227,11 @@ struct ftrace_likely_data {#endif /* Section for code which can't be instrumented at all */ -#define noinstr \ - noinline notrace __attribute((__section__(".noinstr.text"))) \ - __no_kcsan __no_sanitize_address __no_profile __no_sanitize_coverage +#define __noinstr_section (section) \ + noinline notrace __section(section) __no_profile \ + __no_kcsan __no_sanitize_address __no_sanitize_coverage + +#define noinstr __noinstr_section(".noinstr.text")#endif /* __KERNEL__ */
Signature · 7 lines
2.36.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH V6 04/11] compiler_types.h: Add __noinstr_section() for noinstr
Quoted 20 lines · On Sat, Oct 01, 2022 at 09:24:44PM -0400, [email protected] wrote:
From: Lai Jiangshan <[email protected]>
And it will be extended for C entry code.
Cc Borislav Petkov <[email protected]>Reviewed-by Miguel Ojeda <[email protected]>Reviewed-by Kees Cook <[email protected]>Suggested-by Nick Desaulniers <[email protected]>Suggested-by Peter Zijlstra <[email protected]>Signed-off-by Lai Jiangshan <[email protected]>--- include/linux/compiler_types.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)include/linux/compiler_types.h +0
-0@@ -227,9 +227,11 @@ struct ftrace_likely_data {#endif
include/linux/compiler_types.h struct ftrace_likely_data { · line 234
Quoted 10 lines
include/linux/compiler_types.h +5
-3/* Section for code which can't be instrumented at all */ -#define noinstr \ - noinline notrace __attribute((__section__(".noinstr.text"))) \ - __no_kcsan __no_sanitize_address __no_profile __no_sanitize_coverage +#define __noinstr_section (section) \ + noinline notrace __section(section) __no_profile \ + __no_kcsan __no_sanitize_address __no_sanitize_coverage + +#define noinstr __noinstr_section(".noinstr.text")
One thing proably worth noting here is that while KPROBES will avoid instrumenting .noinstr.text, that won't happen automatically for other __noinstr_section() sections, and that will need to be inhibited through other means (e.g. the kprobes blacklist, explicit NOKPROBE_SYMBOL() annotation, or otherwise).
Thanks,
Mark.
Re: [PATCH V6 04/11] compiler_types.h: Add __noinstr_section() for noinstr
Quoted 23 lines · Mark Rutland
Quoted 21 lines · On Sat, Oct 01, 2022 at 09:24:44PM -0400, [email protected] wrote:
From: Lai Jiangshan <[email protected]>
And it will be extended for C entry code.
Cc Borislav Petkov <[email protected]>Reviewed-by Miguel Ojeda <[email protected]>Reviewed-by Kees Cook <[email protected]>Suggested-by Nick Desaulniers <[email protected]>Suggested-by Peter Zijlstra <[email protected]>Signed-off-by Lai Jiangshan <[email protected]>--- include/linux/compiler_types.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)include/linux/compiler_types.h +0
-0@@ -227,9 +227,11 @@ struct ftrace_likely_data {#endif
Quoted 15 lines
include/linux/compiler_types.h struct ftrace_likely_data { · line 234
Quoted 9 lines
include/linux/compiler_types.h +5
-3/* Section for code which can't be instrumented at all */ -#define noinstr \ - noinline notrace __attribute((__section__(".noinstr.text"))) \ - __no_kcsan __no_sanitize_address __no_profile __no_sanitize_coverage +#define __noinstr_section (section) \ + noinline notrace __section(section) __no_profile \ + __no_kcsan __no_sanitize_address __no_sanitize_coverage + +#define noinstr __noinstr_section(".noinstr.text")One thing proably worth noting here is that while KPROBES will avoid instrumenting
.noinstr.text, that won't happen automatically for other__noinstr_section()sections, and that will need to be inhibited through other means (e.g. the kprobes blacklist, explicitNOKPROBE_SYMBOL()annotation, or otherwise).
In riscv, "we select HAVE_KPROBES if !XIP_KERNEL", so don't worry about that. I don't think we could enable kprobe for XIP_KERNEL in the future.
Quoted 3 lines
Thanks,
Mark.
--
Best Regards
Guo Ren
Re: [PATCH V6 04/11] compiler_types.h: Add __noinstr_section() for noinstr
Quoted 40 lines · Guo Ren
Quoted 23 lines · Mark Rutland
Quoted 21 lines · On Sat, Oct 01, 2022 at 09:24:44PM -0400, [email protected] wrote:
From: Lai Jiangshan <[email protected]>
And it will be extended for C entry code.
Cc Borislav Petkov <[email protected]>Reviewed-by Miguel Ojeda <[email protected]>Reviewed-by Kees Cook <[email protected]>Suggested-by Nick Desaulniers <[email protected]>Suggested-by Peter Zijlstra <[email protected]>Signed-off-by Lai Jiangshan <[email protected]>--- include/linux/compiler_types.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)include/linux/compiler_types.h +0
-0@@ -227,9 +227,11 @@ struct ftrace_likely_data {#endif Quoted 15 lines
include/linux/compiler_types.h struct ftrace_likely_data { · line 234
Quoted 9 lines
include/linux/compiler_types.h +5
-3/* Section for code which can't be instrumented at all */ -#define noinstr \ - noinline notrace __attribute((__section__(".noinstr.text"))) \ - __no_kcsan __no_sanitize_address __no_profile __no_sanitize_coverage +#define __noinstr_section (section) \ + noinline notrace __section(section) __no_profile \ + __no_kcsan __no_sanitize_address __no_sanitize_coverage + +#define noinstr __noinstr_section(".noinstr.text")One thing proably worth noting here is that while KPROBES will avoid instrumenting
.noinstr.text, that won't happen automatically for other__noinstr_section()sections, and that will need to be inhibited through other means (e.g. the kprobes blacklist, explicitNOKPROBE_SYMBOL()annotation, or otherwise).
Quoted 3 lines
In riscv, "we select
HAVE_KPROBESif !XIP_KERNEL", so don't worry about that. I don't think we could enable kprobe forXIP_KERNELin the future.
Sure; but someone else might use __noinstr_section() elsewhere where this could matter, and I was suggesting that we could add a comment as above.
Thanks,
Mark.
Re: [PATCH V6 04/11] compiler_types.h: Add __noinstr_section() for noinstr
Hi Mark and Lai,
Quoted 42 lines · Mark Rutland
Quoted 40 lines · Guo Ren
Quoted 38 lines · Mark Rutland
Quoted 20 lines · On Sat, Oct 01, 2022 at 09:24:44PM -0400, [email protected] wrote:
From: Lai Jiangshan <[email protected]>
And it will be extended for C entry code.
Cc Borislav Petkov <[email protected]>Reviewed-by Miguel Ojeda <[email protected]>Reviewed-by Kees Cook <[email protected]>Suggested-by Nick Desaulniers <[email protected]>Suggested-by Peter Zijlstra <[email protected]>Signed-off-by Lai Jiangshan <[email protected]>--- include/linux/compiler_types.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)include/linux/compiler_types.h +0
-0@@ -227,9 +227,11 @@ struct ftrace_likely_data {#endif include/linux/compiler_types.h struct ftrace_likely_data { · line 234
Quoted 10 lines
include/linux/compiler_types.h +5
-3/* Section for code which can't be instrumented at all */ -#define noinstr \ - noinline notrace __attribute((__section__(".noinstr.text"))) \ - __no_kcsan __no_sanitize_address __no_profile __no_sanitize_coverage +#define __noinstr_section (section) \ + noinline notrace __section(section) __no_profile \ + __no_kcsan __no_sanitize_address __no_sanitize_coverage + +#define noinstr __noinstr_section(".noinstr.text")One thing proably worth noting here is that while KPROBES will avoid instrumenting
.noinstr.text, that won't happen automatically for other__noinstr_section()sections, and that will need to be inhibited through other means (e.g. the kprobes blacklist, explicitNOKPROBE_SYMBOL()annotation, or otherwise).
Quoted 6 lines
Quoted 3 lines
In riscv, "we select
HAVE_KPROBESif !XIP_KERNEL", so don't worry about that. I don't think we could enable kprobe forXIP_KERNELin the future.Sure; but someone else might use
__noinstr_section()elsewhere where this could matter, and I was suggesting that we could add a comment as above.
Okay, how about:
/* Be care KPROBES will avoid instrumenting .noinstr.text, not __noinstr_section(). */
#define __noinstr_section(section) \
noinline notrace __section(section) __no_profile \
__no_kcsan __no_sanitize_address __no_sanitize_coverage
/* Section for code which can't be instrumented at all */ #define noinstr __noinstr_section(".noinstr.text")
Quoted 3 lines
Thanks,
Mark.
Signature · 2 lines
Best Regards Guo Ren
Re: [PATCH V6 04/11] compiler_types.h: Add __noinstr_section() for noinstr
Quoted 51 lines · Guo Ren
Hi Mark and Lai,
Quoted 42 lines · Mark Rutland
Quoted 40 lines · Guo Ren
Quoted 38 lines · Mark Rutland
Quoted 20 lines · On Sat, Oct 01, 2022 at 09:24:44PM -0400, [email protected] wrote:
From: Lai Jiangshan <[email protected]>
And it will be extended for C entry code.
Cc Borislav Petkov <[email protected]>Reviewed-by Miguel Ojeda <[email protected]>Reviewed-by Kees Cook <[email protected]>Suggested-by Nick Desaulniers <[email protected]>Suggested-by Peter Zijlstra <[email protected]>Signed-off-by Lai Jiangshan <[email protected]>--- include/linux/compiler_types.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)include/linux/compiler_types.h +0
-0@@ -227,9 +227,11 @@ struct ftrace_likely_data {#endif include/linux/compiler_types.h struct ftrace_likely_data { · line 234
Quoted 10 lines
include/linux/compiler_types.h +5
-3/* Section for code which can't be instrumented at all */ -#define noinstr \ - noinline notrace __attribute((__section__(".noinstr.text"))) \ - __no_kcsan __no_sanitize_address __no_profile __no_sanitize_coverage +#define __noinstr_section (section) \ + noinline notrace __section(section) __no_profile \ + __no_kcsan __no_sanitize_address __no_sanitize_coverage + +#define noinstr __noinstr_section(".noinstr.text")One thing proably worth noting here is that while KPROBES will avoid instrumenting
.noinstr.text, that won't happen automatically for other__noinstr_section()sections, and that will need to be inhibited through other means (e.g. the kprobes blacklist, explicitNOKPROBE_SYMBOL()annotation, or otherwise).Quoted 6 lines
Quoted 3 lines
In riscv, "we select
HAVE_KPROBESif !XIP_KERNEL", so don't worry about that. I don't think we could enable kprobe forXIP_KERNELin the future.Sure; but someone else might use
__noinstr_section()elsewhere where this could matter, and I was suggesting that we could add a comment as above.
Quoted 7 lines
Okay, how about:
/* Be care KPROBES will avoid instrumenting .noinstr.text, not
__noinstr_section(). */
#define__noinstr_section(section)\
noinline notrace__section(section)__no_profile\
__no_kcsan__no_sanitize_address__no_sanitize_coverage
How about we split this like:
| /*
| * Prevent the compiler from instrumenting this code in any way
| * This does not prevent instrumentation via KPROBES, which must be
| * prevented through other means if necessary.
| */
| #define __no_compiler_instrument \
| noinline notrace noinline notrace __no_kcsan \
| __no_sanitize_address __no_sanitize_coverage
|
| /*
| * Section for code which can't be instrumented at all.
| * Any code in this section cannot be instrumented with KPROBES.
| */
| #define noinstr __no_compiler_instrument section(".noinstr.text")... then we don't need __noinstr_section(), and IMO the split is clearer.
Peter?
Thanks,
Mark.
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH V6 04/11] compiler_types.h: Add __noinstr_section() for noinstr
Quoted 6 lines · Mark Rutland
How about we split this like:
| /* | * Prevent the compiler from instrumenting this code in any way | * This does not prevent instrumentation via KPROBES, which must be | * prevented through other means if necessary.
Perhaps point to NOINSTR_TEXT in vmlinux.lds.h
Quoted 11 lines
| */
| #define __no_compiler_instrument \
| noinline notrace noinline notrace __no_kcsan \
| __no_sanitize_address __no_sanitize_coverage
|
| /*
| * Section for code which can't be instrumented at all.
| * Any code in this section cannot be instrumented with KPROBES.
| */
| #define noinstr __no_compiler_instrument section(".noinstr.text")Quoted 2 lines
... then we don't need
__noinstr_section(), and IMO the split is clearer.
Yeah, perhaps, no strong feelings. Note I have this in the sched-idle series as well (which I still need to rebase and repost :/).
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH V6 04/11] compiler_types.h: Add __noinstr_section() for noinstr
Quoted 10 lines · Peter Zijlstra
Quoted 6 lines · Mark Rutland
How about we split this like:
| /* | * Prevent the compiler from instrumenting this code in any way | * This does not prevent instrumentation via KPROBES, which must be | * prevented through other means if necessary.Perhaps point to
NOINSTR_TEXTinvmlinux.lds.h
Makes sense, will do.
Quoted 12 lines
Quoted 12 lines
| */ | #define __no_compiler_instrument \ | noinline notrace noinline notrace __no_kcsan \ | __no_sanitize_address __no_sanitize_coverage | | /* | * Section for code which can't be instrumented at all. | * Any code in this section cannot be instrumented with KPROBES. | */ | #define noinstr __no_compiler_instrument section(".noinstr.text")
Quoted 5 lines
Quoted 2 lines
... then we don't need
__noinstr_section(), and IMO the split is clearer.Yeah, perhaps, no strong feelings. Note I have this in the sched-idle series as well (which I still need to rebase and repost :/).
Ah; I'll sit on this for now then, and once that's all in I can send a cleanup/rework patch. Sorry for the noise!
Thanks,
Mark.
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH V6 04/11] compiler_types.h: Add __noinstr_section() for noinstr
Quoted 6 lines · Mark Rutland
Quoted 4 lines · Peter Zijlstra
Quoted 2 lines · Mark Rutland
How about we split this like:
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
| /* | * Prevent the compiler from instrumenting this code in any way | * This does not prevent instrumentation via KPROBES, which must be | * prevented through other means if necessary.Perhaps point to
NOINSTR_TEXTinvmlinux.lds.hMakes sense, will do.
Do I need to update the comment with NOINSTR_TEXT? eg:
* Prevent the compiler from instrumenting this code in any way
* This does not prevent instrumentation via KPROBES, which must be
* prevented through other means if necessary. See NOINSTR_TEXT
* in vmlinux.lds.h.
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
| */ | #define __no_compiler_instrument \ | noinline notrace noinline notrace __no_kcsan \ | __no_sanitize_address __no_sanitize_coverage | | /* | * Section for code which can't be instrumented at all. | * Any code in this section cannot be instrumented with KPROBES. | */ | #define noinstr __no_compiler_instrument section(".noinstr.text")
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
... then we don't need
__noinstr_section(), and IMO the split is clearer.Yeah, perhaps, no strong feelings. Note I have this in the sched-idle series as well (which I still need to rebase and repost :/).
Ah; I'll sit on this for now then, and once that's all in I can send a cleanup/rework patch. Sorry for the noise!
We still keep __noinstr_section(), right?
Quoted 3 lines
Thanks,
Mark.
--
Best Regards
Guo Ren
Re: [PATCH V6 04/11] compiler_types.h: Add __noinstr_section() for noinstr
Quoted 14 lines · Guo Ren
Quoted 13 lines · Mark Rutland
Quoted 10 lines · Peter Zijlstra
Quoted 6 lines · Mark Rutland
How about we split this like:
| /* | * Prevent the compiler from instrumenting this code in any way | * This does not prevent instrumentation via KPROBES, which must be | * prevented through other means if necessary.Perhaps point to
NOINSTR_TEXTinvmlinux.lds.h
Quoted 7 lines
Quoted 1 line
Makes sense, will do.
Do I need to update the comment with
NOINSTR_TEXT? eg:* Prevent the compiler from instrumenting this code in any way
* This does not prevent instrumentation via KPROBES, which must be
* prevented through other means if necessary. SeeNOINSTR_TEXT
* invmlinux.lds.h.
I think given Peter's reply we can leave the patch as-is for now, and we can leave commentary or other changes to a later follow up. I'm happy to propose patches for that once the existing bits are merged.
Sorry for confusing matters!
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 13 lines
| */ | #define __no_compiler_instrument \ | noinline notrace noinline notrace __no_kcsan \ | __no_sanitize_address __no_sanitize_coverage | | /* | * Section for code which can't be instrumented at all. | * Any code in this section cannot be instrumented with KPROBES. | */ | #define noinstr __no_compiler_instrument section(".noinstr.text")... then we don't need
__noinstr_section(), and IMO the split is clearer.
Quoted 6 lines
Quoted 5 lines
Quoted 2 lines
Yeah, perhaps, no strong feelings. Note I have this in the sched-idle series as well (which I still need to rebase and repost :/).
Ah; I'll sit on this for now then, and once that's all in I can send a cleanup/rework patch. Sorry for the noise!
We still keep
__noinstr_section(), right?
Yes -- for now this patch can stay as-is, and __noinstr_section() will remain.
Thanks,
Mark.
PATCH v6 5/11 riscv: traps: Add noinstr to prevent instrumentation inserted
In reply to [email protected]From: Guo Ren <[email protected]>
Without noinstr the compiler is free to insert instrumentation (think all the k*SAN, KCov, GCov, ftrace etc..) which can call code we're not yet ready to run this early in the entry path, for instance it could rely on RCU which isn't on yet, or expect lockdep state. (by peterz)
--- arch/riscv/kernel/traps.c | 4 ++-- arch/riscv/mm/fault.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/riscv/kernel/traps.c +2 -2
@@ -92,9 +92,9 @@ static void do_trap_error(struct pt_regs *regs, int signo, int code, }#if defined(CONFIG_XIP_KERNEL ) && defined(CONFIG_RISCV_ALTERNATIVE ) -#define __trap_section __section(".xip.traps") +#define __trap_section __noinstr_section(".xip.traps")#else -#define __trap_section +#define __trap_section noinstr#endif #define DO_ERROR_INFO (name, signo, code, str) \ asmlinkage __visible __trap_section void name(struct pt_regs *regs) \
arch/riscv/mm/fault.c +1 -1
@@ -203,7 +203,7 @@ static inline bool access_error(unsigned long cause, struct vm_area_struct *vma)* This routine handles page faults. It determines the address and the * problem, and then passes it off to one of the appropriate routines. */ -asmlinkage void do_page_fault(struct pt_regs *regs) +asmlinkage void noinstr do_page_fault(struct pt_regs *regs) {struct task_struct *tsk;struct vm_area_struct *vma;
Signature · 7 lines
2.36.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH V6 05/11] riscv: traps: Add noinstr to prevent instrumentation inserted
Quoted 21 lines · On Sat, Oct 01, 2022 at 09:24:45PM -0400, [email protected] wrote:
From: Guo Ren <[email protected]>
Without noinstr the compiler is free to insert instrumentation (think all the k*SAN, KCov, GCov, ftrace etc..) which can call code we're not yet ready to run this early in the entry path, for instance it could rely on RCU which isn't on yet, or expect lockdep state. (by peterz)
Suggested-by Peter Zijlstra <[email protected]>Signed-off-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>--- arch/riscv/kernel/traps.c | 4 ++-- arch/riscv/mm/fault.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)arch/riscv/kernel/traps.c +0
-0
arch/riscv/kernel/traps.c static void do_trap_error(struct pt_regs *regs, int signo, int code, · line 95
Quoted 5 lines
arch/riscv/kernel/traps.c +1
-1@@ -92,9 +92,9 @@ static void do_trap_error(struct pt_regs *regs, int signo, int code, }#if defined(CONFIG_XIP_KERNEL ) && defined(CONFIG_RISCV_ALTERNATIVE ) -#define __trap_section __section(".xip.traps") +#define __trap_section __noinstr_section(".xip.traps")
I assume that for CONFIG_XIP_KERNEL, KPROBES is not possible, and so functions marked with __trap_section don't need to be excluded from kprobes.
Is that assumption correct, or does something need to be done to inhibit that?
Thanks,
Mark.
Quoted 22 lines
arch/riscv/kernel/traps.c +1
-1#else -#define __trap_section +#define __trap_section noinstr#endif #define DO_ERROR_INFO (name, signo, code, str) \ asmlinkage __visible __trap_section void name(struct pt_regs *regs) \arch/riscv/mm/fault.c +1
-1@@ -203,7 +203,7 @@ static inline bool access_error(unsigned long cause, struct vm_area_struct *vma)* This routine handles page faults. It determines the address and the * problem, and then passes it off to one of the appropriate routines. */ -asmlinkage void do_page_fault(struct pt_regs *regs) +asmlinkage void noinstr do_page_fault(struct pt_regs *regs) {struct task_struct *tsk;struct vm_area_struct *vma;Signature · 1 line
2.36.1
Re: [PATCH V6 05/11] riscv: traps: Add noinstr to prevent instrumentation inserted
Quoted 25 lines · Mark Rutland
Quoted 23 lines · On Sat, Oct 01, 2022 at 09:24:45PM -0400, [email protected] wrote:
From: Guo Ren <[email protected]>
Without noinstr the compiler is free to insert instrumentation (think all the k*SAN, KCov, GCov, ftrace etc..) which can call code we're not yet ready to run this early in the entry path, for instance it could rely on RCU which isn't on yet, or expect lockdep state. (by peterz)
Suggested-by Peter Zijlstra <[email protected]>Signed-off-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>--- arch/riscv/kernel/traps.c | 4 ++-- arch/riscv/mm/fault.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)arch/riscv/kernel/traps.c +0
-0@@ -92,9 +92,9 @@ static void do_trap_error(struct pt_regs *regs, int signo, int code, }
Quoted 8 lines
arch/riscv/kernel/traps.c static void do_trap_error(struct pt_regs *regs, int signo, int code, · line 95
Quoted 3 lines
arch/riscv/kernel/traps.c +1
-1#if defined(CONFIG_XIP_KERNEL ) && defined(CONFIG_RISCV_ALTERNATIVE ) -#define __trap_section __section(".xip.traps") +#define __trap_section __noinstr_section(".xip.traps")I assume that for
CONFIG_XIP_KERNEL, KPROBES is not possible, and so functions marked with__trap_sectiondon't need to be excluded from kprobes.Is that assumption correct, or does something need to be done to inhibit that?
Correct!
In riscv, "we select HAVE_KPROBES if !XIP_KERNEL", so don't worry about that. I don't think we could enable kprobe for XIP_KERNEL in the future.
Quoted 26 lines
Thanks,
Mark.Quoted 22 lines
arch/riscv/kernel/traps.c +1
-1#else -#define __trap_section +#define __trap_section noinstr#endif #define DO_ERROR_INFO (name, signo, code, str) \ asmlinkage __visible __trap_section void name(struct pt_regs *regs) \arch/riscv/mm/fault.c +1
-2@@ -203,7 +203,7 @@ static inline bool access_error(unsigned long cause, struct vm_area_struct *vma)* This routine handles page faults. It determines the address and the * problem, and then passes it off to one of the appropriate routines. */ -asmlinkage void do_page_fault(struct pt_regs *regs) +asmlinkage void noinstr do_page_fault(struct pt_regs *regs) {struct task_struct *tsk;struct vm_area_struct *vma; --2.36.1
Signature · 2 lines
Best Regards Guo Ren
PATCH v6 6/11 riscv: convert to generic entry
In reply to [email protected]From: Guo Ren <[email protected]>
This patch converts riscv to use the generic entry infrastructure from kernel/entry/*. The generic entry makes maintainers' work easier and codes more elegant. Here are the changes than before:
- More clear entry.S with handle_exception and ret_from_exception
- Get rid of complex custom signal implementation
- More readable syscall procedure
- Little modification on ret_from_fork & ret_from_kernel_thread
- Wrap with irqentry_enter/exit and syscall_enter/exit_from_user_mode
- Use the standard preemption code instead of custom
--- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/csr.h | 1 - arch/riscv/include/asm/entry-common.h | 8 + arch/riscv/include/asm/ptrace.h | 10 +- arch/riscv/include/asm/stacktrace.h | 5 + arch/riscv/include/asm/syscall.h | 6 + arch/riscv/include/asm/thread_info.h | 13 +- arch/riscv/kernel/entry.S | 228 +++----------------------- arch/riscv/kernel/irq.c | 15 ++ arch/riscv/kernel/ptrace.c | 43 ----- arch/riscv/kernel/signal.c | 21 +-- arch/riscv/kernel/sys_riscv.c | 27 +++ arch/riscv/kernel/traps.c | 66 ++++++-- arch/riscv/mm/fault.c | 14 +- 14 files changed, 161 insertions(+), 297 deletions(-) create mode 100644 arch/riscv/include/asm/entry-common.h
arch/riscv/Kconfig +1 -0
@@ -56,6 +56,7 @@ config RISCV select GENERIC_ATOMIC64 if !64BIT select GENERIC_CLOCKEVENTS_BROADCAST if SMP select GENERIC_EARLY_IOREMAP + select GENERIC_ENTRY select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO select GENERIC_IDLE_POLL_SETUP select GENERIC_IOREMAP if MMU
arch/riscv/include/asm/csr.h +0 -1
@@ -40,7 +40,6 @@#define SR_UXL _AC(0x300000000, UL)/* XLEN mask for U-mode */ #define SR_UXL_32 _AC(0x100000000, UL)/* XLEN = 32 for U-mode */ #define SR_UXL_64 _AC(0x200000000, UL)/* XLEN = 64 for U-mode */ -#define SR_UXL_SHIFT 32#endif /* SATP flags */
arch/riscv/include/asm/entry-common.h new file +8 -0
@@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _ASM_RISCV_ENTRY_COMMON_H +#define _ASM_RISCV_ENTRY_COMMON_H + +#include <asm/stacktrace.h> + +#endif /* _ASM_RISCV_ENTRY_COMMON_H */
arch/riscv/include/asm/ptrace.h +8 -2
@@ -53,6 +53,9 @@ struct pt_regs {unsigned long orig_a0; }; +#define PTRACE_SYSEMU 0x1f +#define PTRACE_SYSEMU_SINGLESTEP 0x20 +#ifdef CONFIG_64BIT #define REG_FMT "%016lx"#else
@@ -121,8 +124,6 @@ extern unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs,void prepare_ftrace_return (unsigned long *parent,unsigned long self_addr,unsigned long frame_pointer); -int do_syscall_trace_enter (struct pt_regs *regs); -void do_syscall_trace_exit (struct pt_regs *regs);/** * regs_get_register() - get register value from its offset
@@ -172,6 +173,11 @@ static inline unsigned long regs_get_kernel_argument(struct pt_regs *regs,return 0 ; } +static inline int regs_irqs_disabled (struct pt_regs *regs) +{ +return !(regs->status &SR_IE ); +} +#endif /* __ASSEMBLY__ */ #endif /* _ASM_RISCV_PTRACE_H */
arch/riscv/include/asm/stacktrace.h +5 -0
@@ -16,4 +16,9 @@ extern void notrace walk_stackframe(struct task_struct *task, struct pt_regs *reextern void dump_backtrace (struct pt_regs *regs,struct task_struct *task,const char *loglvl); +static inline bool on_thread_stack (void ) +{ +return !(((unsigned long )(current->stack) ^ current_stack_pointer) & ~(THREAD_SIZE -1 )); +} +#endif /* _ASM_RISCV_STACKTRACE_H */
arch/riscv/include/asm/syscall.h +6 -0
@@ -74,5 +74,11 @@ static inline int syscall_get_arch(struct task_struct *task)#endif } +static inline bool arch_syscall_is_vdso_sigreturn (struct pt_regs *regs) +{ +return false; +} +asmlinkage long sys_riscv_flush_icache (uintptr_t ,uintptr_t ,uintptr_t ); +asmlinkage void do_sys_ecall_u(struct pt_regs *regs);#endif /* _ASM_RISCV_SYSCALL_H */
arch/riscv/include/asm/thread_info.h +1 -12
@@ -66,6 +66,7 @@ struct thread_info {long kernel_sp;/* Kernel stack pointer */ long user_sp;/* User stack pointer */ int cpu; +unsigned long syscall_work;/* SYSCALL_WORK_ flags */ };/*
@@ -88,26 +89,18 @@ struct thread_info {* - pending work-to-be-done flags are in lowest half-word * - other flags in upper half-word(s) */ -#define TIF_SYSCALL_TRACE 0/* syscall trace active */ #define TIF_NOTIFY_RESUME 1/* callback before returning to user */ #define TIF_SIGPENDING 2/* signal pending */ #define TIF_NEED_RESCHED 3/* rescheduling necessary */ #define TIF_RESTORE_SIGMASK 4/* restore signal mask in do_signal() */ #define TIF_MEMDIE 5/* is terminating due to OOM killer */ -#define TIF_SYSCALL_TRACEPOINT 6/* syscall tracepoint instrumentation */ -#define TIF_SYSCALL_AUDIT 7/* syscall auditing */ -#define TIF_SECCOMP 8/* syscall secure computing */ #define TIF_NOTIFY_SIGNAL 9/* signal notifications exist */ #define TIF_UPROBE 10/* uprobe breakpoint or singlestep */ #define TIF_32BIT 11/* compat-mode 32bit process */ -#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)#define _TIF_SIGPENDING (1 << TIF_SIGPENDING)#define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) -#define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT) -#define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) -#define _TIF_SECCOMP (1 << TIF_SECCOMP)#define _TIF_NOTIFY_SIGNAL (1 << TIF_NOTIFY_SIGNAL)#define _TIF_UPROBE (1 << TIF_UPROBE)
@@ -115,8 +108,4 @@ struct thread_info { (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING | _TIF_NEED_RESCHED | \ _TIF_NOTIFY_SIGNAL | _TIF_UPROBE) -#define _TIF_SYSCALL_WORK \ - (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_TRACEPOINT | _TIF_SYSCALL_AUDIT | \ - _TIF_SECCOMP) -#endif /* _ASM_RISCV_THREAD_INFO_H */
arch/riscv/kernel/entry.S +22 -206
312 lines not on this page · raw message
arch/riscv/kernel/irq.c +15 -0
@@ -5,6 +5,7 @@* Copyright (C) 2018 Christoph Hellwig */ +#include <linux/entry-common.h> #include <linux/interrupt.h> #include <linux/irqchip.h> #include <linux/seq_file.h>
@@ -22,3 +23,17 @@ void __init init_IRQ(void)if (!handle_arch_irq)panic ("No interrupt controller found." ); } + +asmlinkage void noinstr do_riscv_irq(struct pt_regs *regs) +{ +struct pt_regs *old_regs; +irqentry_state_t state =irqentry_enter (regs); + +irq_enter_rcu (); + old_regs =set_irq_regs (regs); +handle_arch_irq (regs); +set_irq_regs (old_regs); +irq_exit_rcu (); + +irqentry_exit (regs, state); +}
arch/riscv/kernel/ptrace.c +0 -43
55 lines not on this page · raw message
arch/riscv/kernel/signal.c +2 -19
@@ -12,6 +12,7 @@#include <linux/syscalls.h> #include <linux/resume_user_mode.h> #include <linux/linkage.h> +#include <linux/entry-common.h> #include <asm/ucontext.h> #include <asm/vdso.h>
@@ -272,7 +273,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)signal_setup_done (ret, ksig,0 ); } -static void do_signal (struct pt_regs *regs) +void arch_do_signal_or_restart (struct pt_regs *regs) {struct ksignal ksig;
@@ -309,21 +310,3 @@ static void do_signal(struct pt_regs *regs)*/ restore_saved_sigmask (); } - -/* -* notification of userspace execution resumption -* - triggered by the _TIF_WORK_MASK flags -*/ -asmlinkage __visible void do_notify_resume(struct pt_regs *regs, -unsigned long thread_info_flags) -{ -if (thread_info_flags & _TIF_UPROBE) -uprobe_notify_resume (regs); - -/* Handle pending signal delivery */ -if (thread_info_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL)) -do_signal (regs); - -if (thread_info_flags & _TIF_NOTIFY_RESUME) -resume_user_mode_work (regs); -}
arch/riscv/kernel/sys_riscv.c +27 -0
@@ -5,8 +5,10 @@* Copyright (C) 2017 SiFive */ +#include <linux/entry-common.h> #include <linux/syscalls.h> #include <asm/unistd.h> +#include <asm/syscall.h> #include <asm/cacheflush.h> #include <asm-generic/mman-common.h>
@@ -72,3 +74,28 @@ SYSCALL_DEFINE3(riscv_flush_icache, uintptr_t, start, uintptr_t, end,return 0 ; } + +typedef long (*syscall_t )(ulong ,ulong ,ulong ,ulong ,ulong ,ulong ,ulong ); + +asmlinkage void do_sys_ecall_u(struct pt_regs *regs) +{ +syscall_t syscall; +ulong nr = regs->a7; + + regs->epc +=4 ; + regs->orig_a0 = regs->a0; + regs->a0 = -ENOSYS ; + + nr =syscall_enter_from_user_mode (regs, nr); +#ifdef CONFIG_COMPAT +if ((regs->status &SR_UXL ) ==SR_UXL_32 ) + syscall = compat_sys_call_table[nr]; + else +#endif + syscall = sys_call_table[nr]; + +if (nr < NR_syscalls) + regs->a0 =syscall (regs->orig_a0, regs->a1, regs->a2, + regs->a3, regs->a4, regs->a5, regs->a6); +syscall_exit_to_user_mode (regs); +}
arch/riscv/kernel/traps.c +53 -13
100 lines not on this page · raw message
arch/riscv/mm/fault.c +13 -1
@@ -15,6 +15,7 @@#include <linux/uaccess.h> #include <linux/kprobes.h> #include <linux/kfence.h> +#include <linux/entry-common.h> #include <asm/ptrace.h> #include <asm/tlbflush.h>
@@ -203,7 +204,7 @@ static inline bool access_error(unsigned long cause, struct vm_area_struct *vma)* This routine handles page faults. It determines the address and the * problem, and then passes it off to one of the appropriate routines. */ -asmlinkage void noinstr do_page_fault(struct pt_regs *regs) +static void __do_page_fault (struct pt_regs *regs) {struct task_struct *tsk;struct vm_area_struct *vma;
@@ -350,4 +351,15 @@ asmlinkage void noinstr do_page_fault(struct pt_regs *regs) }return ; } + +asmlinkage void noinstr do_page_fault(struct pt_regs *regs) +{ +irqentry_state_t state =irqentry_enter (regs); + +__do_page_fault (regs); + +local_irq_disable (); + +irqentry_exit (regs, state); +}NOKPROBE_SYMBOL (do_page_fault);
Signature · 7 lines
2.36.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v6 7/11 riscv: Support HAVE_IRQ_EXIT_ON_IRQ_STACK
In reply to [email protected]From: Guo Ren <[email protected]>
Add independent irq stacks for percpu to prevent kernel stack overflows. It is also compatible with VMAP_STACK by implementing arch_alloc_vmap_stack. Many architectures have supported HAVE_IRQ_EXIT_ON_IRQ_STACK, riscv should follow up.
--- arch/riscv/Kconfig | 8 ++++ arch/riscv/include/asm/thread_info.h | 2 + arch/riscv/include/asm/vmap_stack.h | 28 ++++++++++++ arch/riscv/kernel/irq.c | 66 +++++++++++++++++++++++++++- 4 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 arch/riscv/include/asm/vmap_stack.h
arch/riscv/Kconfig +8 -0
@@ -433,6 +433,14 @@ config FPU If you don't know what to do here, say Y. +config IRQ_STACKS + bool "Independent irq stacks" if EXPERT + default y + select HAVE_IRQ_EXIT_ON_IRQ_STACK + help + Add independent irq stacks for percpu to prevent kernel stack overflows. + We may save some memory footprint by disabling IRQ_STACKS. + endmenu # "Platform type" menu "Kernel features"
arch/riscv/include/asm/thread_info.h +2 -0
@@ -40,6 +40,8 @@#define OVERFLOW_STACK_SIZE SZ_4K#define SHADOW_OVERFLOW_STACK_SIZE (1024) +#define IRQ_STACK_SIZE THREAD_SIZE +#ifndef __ASSEMBLY__extern long shadow_stack[SHADOW_OVERFLOW_STACK_SIZE /sizeof (long )];
arch/riscv/include/asm/vmap_stack.h new file +28 -0
@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +// Copied from arch/arm64/include/asm/vmap_stack.h. +#ifndef _ASM_RISCV_VMAP_STACK_H +#define _ASM_RISCV_VMAP_STACK_H + +#include <linux/bug.h> +#include <linux/gfp.h> +#include <linux/kconfig.h> +#include <linux/vmalloc.h> +#include <linux/pgtable.h> +#include <asm/thread_info.h> + +/* +* To ensure that VMAP'd stack overflow detection works correctly, all VMAP'd +* stacks need to have the same alignment. +*/ +static inline unsigned long *arch_alloc_vmap_stack (size_t stack_size,int node) +{ +void *p; + +BUILD_BUG_ON (!IS_ENABLED (CONFIG_VMAP_STACK )); + + p =__vmalloc_node (stack_size,THREAD_ALIGN ,THREADINFO_GFP , node, +__builtin_return_address (0 )); +return kasan_reset_tag (p); +} + +#endif /* _ASM_RISCV_VMAP_STACK_H */
arch/riscv/kernel/irq.c +64 -2
91 lines not on this page · raw message
Signature · 7 lines
2.36.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v6 8/11 riscv: Support HAVE_SOFTIRQ_ON_OWN_STACK
In reply to [email protected]From: Guo Ren <[email protected]>
Add the HAVE_SOFTIRQ_ON_OWN_STACK feature for the IRQ_STACKS config. The irq and softirq use the same independent irq_stack of percpu by time division multiplexing.
--- arch/riscv/Kconfig | 7 ++++--- arch/riscv/kernel/irq.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-)
arch/riscv/Kconfig +4 -3
@@ -434,12 +434,13 @@ config FPU If you don't know what to do here, say Y. config IRQ_STACKS - bool "Independent irq stacks" if EXPERT + bool "Independent irq & softirq stacks" if EXPERT default y select HAVE_IRQ_EXIT_ON_IRQ_STACK + select HAVE_SOFTIRQ_ON_OWN_STACK help - Add independent irq stacks for percpu to prevent kernel stack overflows. - We may save some memory footprint by disabling IRQ_STACKS. + Add independent irq & softirq stacks for percpu to prevent kernel stack + overflows. We may save some memory footprint by disabling IRQ_STACKS. endmenu # "Platform type"
arch/riscv/kernel/irq.c +33 -0
@@ -11,6 +11,7 @@#include <linux/seq_file.h> #include <asm/smp.h> #include <asm/vmap_stack.h> +#include <asm/softirq_stack.h> #ifdef CONFIG_IRQ_STACKS static DEFINE_PER_CPU(ulong *, irq_stack_ptr);
@@ -38,6 +39,38 @@ static void init_irq_stacks(void)per_cpu (irq_stack_ptr, cpu) =per_cpu (irq_stack, cpu); }#endif /* CONFIG_VMAP_STACK */ + +#ifdef CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK +void do_softirq_own_stack (void ) +{ +#ifdef CONFIG_IRQ_STACKS +if (on_thread_stack ()) { +ulong *sp =per_cpu (irq_stack_ptr,smp_processor_id ()) + +IRQ_STACK_SIZE /sizeof (ulong); + __asm__ __volatile( +"addi sp, sp, -" RISCV_SZPTR "\n" +REG_S " ra, (sp) \n" +"addi sp, sp, -" RISCV_SZPTR "\n" +REG_S " s0, (sp) \n" +"addi s0, sp, 2*" RISCV_SZPTR "\n" +"move sp, %[sp] \n" +"call __do_softirq \n" +"addi sp, s0, -2*" RISCV_SZPTR "\n" +REG_L " s0, (sp) \n" +"addi sp, sp, " RISCV_SZPTR "\n" +REG_L " ra, (sp) \n" +"addi sp, sp, " RISCV_SZPTR "\n" + : + : [sp] "r" (sp) + : "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", +"t0" ,"t1" ,"t2" ,"t3" ,"t4" ,"t5" ,"t6" , +"memory" ); + } else +#endif +__do_softirq (); +} +#endif /* CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK */ +#else static void init_irq_stacks (void ) {}#endif /* CONFIG_IRQ_STACKS */
Signature · 7 lines
2.36.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v6 9/11 riscv: Add support for STACKLEAK gcc plugin
In reply to [email protected]From: Dao Lu <[email protected]>
Add support for STACKLEAK gcc plugin to riscv by implementing stackleak_check_alloca, based heavily on the arm64 version, and modifying the entry.S. Additionally, this disables the plugin for EFI stub code for riscv. All modifications base on generic_entry.
--- arch/riscv/Kconfig | 1 + arch/riscv/kernel/entry.S | 8 +++++++- drivers/firmware/efi/libstub/Makefile | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)
arch/riscv/Kconfig +1 -0
@@ -81,6 +81,7 @@ config RISCV select HAVE_ARCH_MMAP_RND_BITS if MMU select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT select HAVE_ARCH_SECCOMP_FILTER + select HAVE_ARCH_STACKLEAK select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE
arch/riscv/kernel/entry.S +7 -1
@@ -130,7 +130,6 @@ END(handle_exception) ENTRY(ret_from_exception) REG_L s0, PT_STATUS(sp) - csrc CSR_STATUS, SR_IE #ifdef CONFIG_RISCV_M_MODE /* the MPP value is too large to be used as an immediate arg for addi */ li t0, SR_MPP
@@ -139,6 +138,9 @@ ENTRY(ret_from_exception) andi s0, s0, SR_SPP #endif bnez s0, 1f +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK + call stackleak_erase +#endif /* Save unwound kernel stack pointer in thread_info */ addi s0, sp, PT_SIZE_ON_STACK
@@ -148,8 +150,12 @@ ENTRY(ret_from_exception) * Save TP into the scratch register , so we can find the kernel data * structures again. */ + csrc CSR_STATUS, SR_IE csrw CSR_SCRATCH, tp + j 2f 1: + csrc CSR_STATUS, SR_IE +2: /* * The current load reservation is effectively part of the processor's * state, in the sense that load reservations cannot be shared between
drivers/firmware/efi/libstub/Makefile +1 -1
@@ -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
Signature · 7 lines
2.36.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH V6 09/11] riscv: Add support for STACKLEAK gcc plugin
Quoted 6 lines · On Sat, Oct 01, 2022 at 09:24:49PM -0400, [email protected] wrote:
From: Dao Lu <[email protected]>
Add support for STACKLEAK gcc plugin to riscv by implementing
stackleak_check_alloca, based heavily on the arm64 version, and modifying theentry.S. Additionally, this disables the plugin for EFI stub code for riscv. All modifications base ongeneric_entry.
I think this commit message is stale; stackleak_check_alloca doesn't exist any more.
Quoted 39 lines
Signed-off-by Dao Lu <[email protected]>Co-developed-by Xianting Tian <[email protected]>Signed-off-by Xianting Tian <[email protected]>Co-developed-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>Cc Conor Dooley <[email protected]>Cc Mark Rutland <[email protected]>--- arch/riscv/Kconfig | 1 + arch/riscv/kernel/entry.S | 8 +++++++- drivers/firmware/efi/libstub/Makefile | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)arch/riscv/Kconfig +1
-0@@ -81,6 +81,7 @@ config RISCV select HAVE_ARCH_MMAP_RND_BITS if MMU select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT select HAVE_ARCH_SECCOMP_FILTER + select HAVE_ARCH_STACKLEAK select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGEarch/riscv/kernel/entry.S +0
-1@@ -130,7 +130,6 @@ END(handle_exception) ENTRY(ret_from_exception) REG_L s0, PT_STATUS(sp) - csrc CSR_STATUS, SR_IE #ifdef CONFIG_RISCV_M_MODE /* the MPP value is too large to be used as an immediate arg for addi */ li t0, SR_MPP
arch/riscv/kernel/entry.S ENTRY(ret_from_exception) · line 143
Quoted 6 lines
arch/riscv/kernel/entry.S +3
-0@@ -139,6 +138,9 @@ ENTRY(ret_from_exception) andi s0, s0, SR_SPP #endif bnez s0, 1f +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK + call stackleak_erase +#endif
I assume this can happen on an arbitrary stack, and so you can't use the stackleak_erase_{on,off}_task_stack variants?
Just to check, have you given this a spin with LKDTM and the STACKLEAK_ERASING test? If not, it'd be good to test that (and ideally, put some sample output from that into the commit message).
For example, as per:
https://lore.kernel.org/all/[email protected]/
... on arm64 this looks something like:
| # uname -a | Linux buildroot 5.18.0-rc1-00013-g26f638ab0d7c #3 SMP PREEMPT Wed Apr 27 16:21:37 BST 2022 aarch64 GNU/Linux | # echo STACKLEAK_ERASING > /sys/kernel/debug/provoke-crash/DIRECT | lkdtm: Performing direct entry STACKLEAK_ERASING | lkdtm: stackleak stack usage: | high offset: 336 bytes | current: 688 bytes | lowest: 1232 bytes | tracked: 1232 bytes | untracked: 672 bytes | poisoned: 14136 bytes | low offset: 8 bytes | lkdtm: OK: the rest of the thread stack is properly erased
Thanks,
Mark.
Quoted 32 lines
arch/riscv/kernel/entry.S +4
-0/* Save unwound kernel stack pointer in thread_info */ addi s0, sp, PT_SIZE_ON_STACK@@ -148,8 +150,12 @@ ENTRY(ret_from_exception) * Save TP into the scratch register , so we can find the kernel data * structures again. */ + csrc CSR_STATUS, SR_IE csrw CSR_SCRATCH, tp + j 2f 1: + csrc CSR_STATUS, SR_IE +2: /* * The current load reservation is effectively part of the processor's * state, in the sense that load reservations cannot be shared betweendrivers/firmware/efi/libstub/Makefile +1
-1@@ -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/libfdtSignature · 1 line
2.36.1
Re: [PATCH V6 09/11] riscv: Add support for STACKLEAK gcc plugin
Quoted 46 lines · Mark Rutland
Quoted 6 lines · On Sat, Oct 01, 2022 at 09:24:49PM -0400, [email protected] wrote:
From: Dao Lu <[email protected]>
Add support for STACKLEAK gcc plugin to riscv by implementing
stackleak_check_alloca, based heavily on the arm64 version, and modifying theentry.S. Additionally, this disables the plugin for EFI stub code for riscv. All modifications base ongeneric_entry.I think this commit message is stale;
stackleak_check_allocadoesn't exist any more.Quoted 34 lines
Signed-off-by Dao Lu <[email protected]>Co-developed-by Xianting Tian <[email protected]>Signed-off-by Xianting Tian <[email protected]>Co-developed-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>Cc Conor Dooley <[email protected]>Cc Mark Rutland <[email protected]>--- arch/riscv/Kconfig | 1 + arch/riscv/kernel/entry.S | 8 +++++++- drivers/firmware/efi/libstub/Makefile | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)arch/riscv/Kconfig +1
-0@@ -81,6 +81,7 @@ config RISCV select HAVE_ARCH_MMAP_RND_BITS if MMU select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT select HAVE_ARCH_SECCOMP_FILTER + select HAVE_ARCH_STACKLEAK select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGEarch/riscv/kernel/entry.S +0
-0@@ -130,7 +130,6 @@ END(handle_exception) ENTRY(ret_from_exception) REG_L s0, PT_STATUS(sp)
Quoted 14 lines
arch/riscv/kernel/entry.S ENTRY(ret_from_exception) · line 143
Quoted 11 lines
arch/riscv/kernel/entry.S +3
-1- csrc CSR_STATUS, SR_IE #ifdef CONFIG_RISCV_M_MODE /* the MPP value is too large to be used as an immediate arg for addi */ li t0, SR_MPP@@ -139,6 +138,9 @@ ENTRY(ret_from_exception) andi s0, s0, SR_SPP #endif bnez s0, 1f +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK + call stackleak_erase +#endifI assume this can happen on an arbitrary stack, and so you can't use the stackleak_erase_{on,off}_task_stack variants?
Dao Lu first patch: call stackleak_erase in resume_userspace Xianting second patch: call stackleak_erase only in resume_syscall
I just thought Dao Lu was right, so I included his patch. Your comment is to let it call stackleak_erase in all ret_from_exception because stack leak may have happened "the day before yesterday"/nested interrupt context, right? So we need to clean up all the stacks.
Here is the new modification:
arch/riscv/kernel/entry.S +3 -0
@@ -130,7 +130,6 @@ END(handle_exception) ENTRY(ret_from_exception) +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK + call stackleak_erase +#endif REG_L s0, PT_STATUS(sp)
csrc CSR_STATUS, SR_IE
#ifdef CONFIG_RISCV_M_MODE
/* the MPP value is too large to be used as an immediate arg for addi */ li t0, SR_MPP
@@ -139,6 +138,9 @@ ENTRY(ret_from_exception)
andi s0, s0, SR_SPP
#endif
bnez s0, 1f
/* Save unwound kernel stack pointer in thread_info */
addi s0, sp, PT_SIZE_ON_STACK@@ -148,8 +150,12 @@ ENTRY(ret_from_exception)
* Save TP into the scratch register , so we can find the kernel data
* structures again.
*/
csrw CSR_SCRATCH, tp
1:
Quoted 4 lines
Just to check, have you given this a spin with LKDTM and the
STACKLEAK_ERASINGtest? If not, it'd be good to test that (and ideally, put some sample output from that into the commit message).
Okay, I would.
Quoted 56 lines
For example, as per:
https://lore.kernel.org/all/[email protected]/
... on arm64 this looks something like:
| # uname -a | Linux buildroot 5.18.0-rc1-00013-g26f638ab0d7c #3 SMP PREEMPT Wed Apr 27 16:21:37 BST 2022 aarch64 GNU/Linux | # echo STACKLEAK_ERASING > /sys/kernel/debug/provoke-crash/DIRECT | lkdtm: Performing direct entry STACKLEAK_ERASING | lkdtm: stackleak stack usage: | high offset: 336 bytes | current: 688 bytes | lowest: 1232 bytes | tracked: 1232 bytes | untracked: 672 bytes | poisoned: 14136 bytes | low offset: 8 bytes | lkdtm: OK: the rest of the thread stack is properly erasedThanks,
Mark.Quoted 32 lines
arch/riscv/kernel/entry.S +4
-0/* Save unwound kernel stack pointer in thread_info */ addi s0, sp, PT_SIZE_ON_STACK@@ -148,8 +150,12 @@ ENTRY(ret_from_exception) * Save TP into the scratch register , so we can find the kernel data * structures again. */ + csrc CSR_STATUS, SR_IE csrw CSR_SCRATCH, tp + j 2f 1: + csrc CSR_STATUS, SR_IE +2: /* * The current load reservation is effectively part of the processor's * state, in the sense that load reservations cannot be shared betweendrivers/firmware/efi/libstub/Makefile +1
-2@@ -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.36.1
Signature · 2 lines
Best Regards Guo Ren
Re: [PATCH V6 09/11] riscv: Add support for STACKLEAK gcc plugin
In reply to Mark RutlandQuoted 46 lines · Mark Rutland
Quoted 6 lines · On Sat, Oct 01, 2022 at 09:24:49PM -0400, [email protected] wrote:
From: Dao Lu <[email protected]>
Add support for STACKLEAK gcc plugin to riscv by implementing
stackleak_check_alloca, based heavily on the arm64 version, and modifying theentry.S. Additionally, this disables the plugin for EFI stub code for riscv. All modifications base ongeneric_entry.I think this commit message is stale;
stackleak_check_allocadoesn't exist any more.Quoted 34 lines
Signed-off-by Dao Lu <[email protected]>Co-developed-by Xianting Tian <[email protected]>Signed-off-by Xianting Tian <[email protected]>Co-developed-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>Cc Conor Dooley <[email protected]>Cc Mark Rutland <[email protected]>--- arch/riscv/Kconfig | 1 + arch/riscv/kernel/entry.S | 8 +++++++- drivers/firmware/efi/libstub/Makefile | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)arch/riscv/Kconfig +1
-0@@ -81,6 +81,7 @@ config RISCV select HAVE_ARCH_MMAP_RND_BITS if MMU select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT select HAVE_ARCH_SECCOMP_FILTER + select HAVE_ARCH_STACKLEAK select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGEarch/riscv/kernel/entry.S +0
-0@@ -130,7 +130,6 @@ END(handle_exception) ENTRY(ret_from_exception) REG_L s0, PT_STATUS(sp)
Quoted 14 lines
arch/riscv/kernel/entry.S ENTRY(ret_from_exception) · line 143
Quoted 11 lines
arch/riscv/kernel/entry.S +3
-1- csrc CSR_STATUS, SR_IE #ifdef CONFIG_RISCV_M_MODE /* the MPP value is too large to be used as an immediate arg for addi */ li t0, SR_MPP@@ -139,6 +138,9 @@ ENTRY(ret_from_exception) andi s0, s0, SR_SPP #endif bnez s0, 1f +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK + call stackleak_erase +#endifI assume this can happen on an arbitrary stack, and so you can't use the stackleak_erase_{on,off}_task_stack variants?
I misunderstood before.
Yes, riscv could use stackleak_erase_on_task_stack. Because the sp has changed to task_stack, even when irq/soft_irq.
Quoted 60 lines
Just to check, have you given this a spin with LKDTM and the
STACKLEAK_ERASINGtest? If not, it'd be good to test that (and ideally, put some sample output from that into the commit message).For example, as per:
https://lore.kernel.org/all/[email protected]/
... on arm64 this looks something like:
| # uname -a | Linux buildroot 5.18.0-rc1-00013-g26f638ab0d7c #3 SMP PREEMPT Wed Apr 27 16:21:37 BST 2022 aarch64 GNU/Linux | # echo STACKLEAK_ERASING > /sys/kernel/debug/provoke-crash/DIRECT | lkdtm: Performing direct entry STACKLEAK_ERASING | lkdtm: stackleak stack usage: | high offset: 336 bytes | current: 688 bytes | lowest: 1232 bytes | tracked: 1232 bytes | untracked: 672 bytes | poisoned: 14136 bytes | low offset: 8 bytes | lkdtm: OK: the rest of the thread stack is properly erasedThanks,
Mark.Quoted 32 lines
arch/riscv/kernel/entry.S +4
-0/* Save unwound kernel stack pointer in thread_info */ addi s0, sp, PT_SIZE_ON_STACK@@ -148,8 +150,12 @@ ENTRY(ret_from_exception) * Save TP into the scratch register , so we can find the kernel data * structures again. */ + csrc CSR_STATUS, SR_IE csrw CSR_SCRATCH, tp + j 2f 1: + csrc CSR_STATUS, SR_IE +2: /* * The current load reservation is effectively part of the processor's * state, in the sense that load reservations cannot be shared betweendrivers/firmware/efi/libstub/Makefile +1
-2@@ -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.36.1
Signature · 2 lines
Best Regards Guo Ren
Re: [PATCH V6 09/11] riscv: Add support for STACKLEAK gcc plugin
Hi Mark,
Here is the test result with stackleak_erase_on_task_stack.
# echo STACKLEAK_ERASING > /sys/kernel/debug/provoke-crash/DIRECT [ 53.110405] lkdtm: Performing direct entry STACKLEAK_ERASING [ 53.111630] lkdtm: stackleak stack usage: [ 53.111630] high offset: 288 bytes [ 53.111630] current: 592 bytes [ 53.111630] lowest: 1136 bytes [ 53.111630] tracked: 1136 bytes [ 53.111630] untracked: 576 bytes [ 53.111630] poisoned: 14376 bytes [ 53.111630] low offset: 8 bytes [ 53.115078] lkdtm: OK: the rest of the thread stack is properly erased
Quoted 133 lines · Guo Ren
Quoted 46 lines · Mark Rutland
Quoted 6 lines · On Sat, Oct 01, 2022 at 09:24:49PM -0400, [email protected] wrote:
From: Dao Lu <[email protected]>
Add support for STACKLEAK gcc plugin to riscv by implementing
stackleak_check_alloca, based heavily on the arm64 version, and modifying theentry.S. Additionally, this disables the plugin for EFI stub code for riscv. All modifications base ongeneric_entry.I think this commit message is stale;
stackleak_check_allocadoesn't exist any more.Quoted 34 lines
Signed-off-by Dao Lu <[email protected]>Co-developed-by Xianting Tian <[email protected]>Signed-off-by Xianting Tian <[email protected]>Co-developed-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>Cc Conor Dooley <[email protected]>Cc Mark Rutland <[email protected]>--- arch/riscv/Kconfig | 1 + arch/riscv/kernel/entry.S | 8 +++++++- drivers/firmware/efi/libstub/Makefile | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)arch/riscv/Kconfig +1
-0@@ -81,6 +81,7 @@ config RISCV select HAVE_ARCH_MMAP_RND_BITS if MMU select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT select HAVE_ARCH_SECCOMP_FILTER + select HAVE_ARCH_STACKLEAK select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGEarch/riscv/kernel/entry.S +0
-0@@ -130,7 +130,6 @@ END(handle_exception) ENTRY(ret_from_exception) REG_L s0, PT_STATUS(sp)Quoted 14 lines
arch/riscv/kernel/entry.S ENTRY(ret_from_exception) · line 143
Quoted 11 lines
arch/riscv/kernel/entry.S +3
-1- csrc CSR_STATUS, SR_IE #ifdef CONFIG_RISCV_M_MODE /* the MPP value is too large to be used as an immediate arg for addi */ li t0, SR_MPP@@ -139,6 +138,9 @@ ENTRY(ret_from_exception) andi s0, s0, SR_SPP #endif bnez s0, 1f +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK + call stackleak_erase +#endifI assume this can happen on an arbitrary stack, and so you can't use the stackleak_erase_{on,off}_task_stack variants?
I misunderstood before.
Yes, riscv could use
stackleak_erase_on_task_stack. Because the sp has changed totask_stack, even when irq/soft_irq.Quoted 55 lines
Just to check, have you given this a spin with LKDTM and the
STACKLEAK_ERASINGtest? If not, it'd be good to test that (and ideally, put some sample output from that into the commit message).For example, as per:
https://lore.kernel.org/all/[email protected]/
... on arm64 this looks something like:
| # uname -a | Linux buildroot 5.18.0-rc1-00013-g26f638ab0d7c #3 SMP PREEMPT Wed Apr 27 16:21:37 BST 2022 aarch64 GNU/Linux | # echo STACKLEAK_ERASING > /sys/kernel/debug/provoke-crash/DIRECT | lkdtm: Performing direct entry STACKLEAK_ERASING | lkdtm: stackleak stack usage: | high offset: 336 bytes | current: 688 bytes | lowest: 1232 bytes | tracked: 1232 bytes | untracked: 672 bytes | poisoned: 14136 bytes | low offset: 8 bytes | lkdtm: OK: the rest of the thread stack is properly erasedThanks,
Mark.Quoted 27 lines
arch/riscv/kernel/entry.S +4
-0/* Save unwound kernel stack pointer in thread_info */ addi s0, sp, PT_SIZE_ON_STACK@@ -148,8 +150,12 @@ ENTRY(ret_from_exception) * Save TP into the scratch register , so we can find the kernel data * structures again. */ + csrc CSR_STATUS, SR_IE csrw CSR_SCRATCH, tp + j 2f 1: + csrc CSR_STATUS, SR_IE +2: /* * The current load reservation is effectively part of the processor's * state, in the sense that load reservations cannot be shared betweendrivers/firmware/efi/libstub/Makefile +1
-1@@ -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)Quoted 5 lines
Quoted 5 lines
drivers/firmware/efi/libstub/Makefile +0
-1cflags-$(CONFIG_EFI_GENERIC_STUB) += -I$(srctree)/scripts/dtc/libfdt --2.36.1
--
Best Regards
Guo Ren
Signature · 2 lines
Best Regards Guo Ren
PATCH v6 10/11 riscv: Add config of thread stack size
In reply to [email protected]From: Guo Ren <[email protected]>
0cac21b02ba5 ("risc v: use 16KB kernel stack on 64-bit") increase the thread size mandatory, but some scenarios, such as D1 with a small memory footprint, would suffer from that. After independent irq stack support, let's give users a choice to determine their custom stack size.
--- arch/riscv/Kconfig | 10 ++++++++++ arch/riscv/include/asm/thread_info.h | 12 +----------- 2 files changed, 11 insertions(+), 11 deletions(-)
arch/riscv/Kconfig +10 -0
@@ -443,6 +443,16 @@ config IRQ_STACKS Add independent irq & softirq stacks for percpu to prevent kernel stack overflows. We may save some memory footprint by disabling IRQ_STACKS. +config THREAD_SIZE_ORDER + int "Kernel stack size (in power-of-two numbers of page size)" if VMAP_STACK && EXPERT + range 0 4 + default 1 if 32BIT && !KASAN + default 3 if 64BIT && KASAN + default 2 + help + Specify the Pages of thread stack size (from 4KB to 64KB), which also + affects irq stack size, which is equal to thread stack size. + endmenu # "Platform type" menu "Kernel features"
arch/riscv/include/asm/thread_info.h +1 -11
@@ -11,18 +11,8 @@#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 + KASAN_STACK_ORDER) -#else -#define THREAD_SIZE_ORDER (1 + KASAN_STACK_ORDER) -#endif +#define THREAD_SIZE_ORDER CONFIG_THREAD_SIZE_ORDER#define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)/*
Signature · 7 lines
2.36.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v6 11/11 riscv: remove extra level wrappers of trace_hardirqs_{on,off}
In reply to [email protected]From: Jisheng Zhang <[email protected]>
Since riscv is converted to generic entry, there's no need for the extra wrappers of trace_hardirqs_{on,off}.
Tested with llvm + irqsoff.
--- arch/riscv/kernel/Makefile | 2 -- arch/riscv/kernel/trace_irq.c | 27 --------------------------- arch/riscv/kernel/trace_irq.h | 11 ----------- 3 files changed, 40 deletions(-) delete mode 100644 arch/riscv/kernel/trace_irq.c delete mode 100644 arch/riscv/kernel/trace_irq.h
arch/riscv/kernel/Makefile +0 -2
@@ -69,8 +69,6 @@ obj-$(CONFIG_CPU_PM) += suspend_entry.o suspend.o obj-$(CONFIG_FUNCTION_TRACER) += mcount.o ftrace.o obj-$(CONFIG_DYNAMIC_FTRACE) += mcount-dyn.o -obj-$(CONFIG_TRACE_IRQFLAGS) += trace_irq.o - obj-$(CONFIG_PERF_EVENTS) += perf_callchain.o obj-$(CONFIG_HAVE_PERF_REGS) += perf_regs.o obj-$(CONFIG_RISCV_SBI) += sbi.o
arch/riscv/kernel/trace_irq.c deleted +0 -27
@@ -1,27 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* Copyright (C) 2022 Changbin Du <[email protected]> -*/ - -#include <linux/irqflags.h> -#include <linux/kprobes.h> -#include "trace_irq.h" - -/* -* trace_hardirqs_on/off require the caller to setup frame pointer properly. -* Otherwise, CALLER_ADDR1 might trigger an pagging exception in kernel. -* Here we add one extra level so they can be safely called by low -* level entry code which $fp is used for other purpose. -*/ - -void __trace_hardirqs_on (void ) -{ -trace_hardirqs_on (); -} -NOKPROBE_SYMBOL (__trace_hardirqs_on); - -void __trace_hardirqs_off (void ) -{ -trace_hardirqs_off (); -} -NOKPROBE_SYMBOL (__trace_hardirqs_off);
arch/riscv/kernel/trace_irq.h deleted +0 -11
@@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Copyright (C) 2022 Changbin Du <[email protected]> -*/ -#ifndef __TRACE_IRQ_H -#define __TRACE_IRQ_H - -void __trace_hardirqs_on (void ); -void __trace_hardirqs_off (void ); - -#endif /* __TRACE_IRQ_H */
Signature · 7 lines
2.36.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv