Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

riscv: trace: fix snapshot deadlock with sbi ecall

If sbi_ecall.c's functions are traceable,

echo "__sbi_ecall:snapshot" > /sys/kernel/tracing/set_ftrace_filter

may get the kernel into a deadlock.

(Functions in sbi_ecall.c are excluded from tracing if
CONFIG_RISCV_ALTERNATIVE_EARLY is set.)

__sbi_ecall triggers a snapshot of the ringbuffer. The snapshot code
raises an IPI interrupt, which results in another call to __sbi_ecall
and another snapshot...

All it takes to get into this endless loop is one initial __sbi_ecall.
On RISC-V systems without SSTC extension, the clock events in
timer-riscv.c issue periodic sbi ecalls, making the problem easy to
trigger.

Always exclude the sbi_ecall.c functions from tracing to fix the
potential deadlock.

sbi ecalls can easiliy be logged via trace events, excluding ecall
functions from function tracing is not a big limitation.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://patch.msgid.link/20251223135043.1336524-1-martin@kaiser.cx
Signed-off-by: Paul Walmsley <pjw@kernel.org>

authored by

Martin Kaiser and committed by
Paul Walmsley
b0d7f5f0 957afeb9

+8 -7
+8 -7
arch/riscv/kernel/Makefile
··· 3 3 # Makefile for the RISC-V Linux kernel 4 4 # 5 5 6 - ifdef CONFIG_FTRACE 7 - CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE) 8 - CFLAGS_REMOVE_patch.o = $(CC_FLAGS_FTRACE) 9 - CFLAGS_REMOVE_sbi.o = $(CC_FLAGS_FTRACE) 10 - CFLAGS_REMOVE_return_address.o = $(CC_FLAGS_FTRACE) 11 - endif 12 6 CFLAGS_syscall_table.o += $(call cc-disable-warning, override-init) 13 7 CFLAGS_compat_syscall_table.o += $(call cc-disable-warning, override-init) 14 8 ··· 18 24 ifdef CONFIG_FTRACE 19 25 CFLAGS_REMOVE_alternative.o = $(CC_FLAGS_FTRACE) 20 26 CFLAGS_REMOVE_cpufeature.o = $(CC_FLAGS_FTRACE) 21 - CFLAGS_REMOVE_sbi_ecall.o = $(CC_FLAGS_FTRACE) 22 27 endif 23 28 ifdef CONFIG_RELOCATABLE 24 29 CFLAGS_alternative.o += -fno-pie ··· 34 41 CFLAGS_cpufeature.o += -D__NO_FORTIFY 35 42 CFLAGS_sbi_ecall.o += -D__NO_FORTIFY 36 43 endif 44 + endif 45 + 46 + ifdef CONFIG_FTRACE 47 + CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE) 48 + CFLAGS_REMOVE_patch.o = $(CC_FLAGS_FTRACE) 49 + CFLAGS_REMOVE_sbi.o = $(CC_FLAGS_FTRACE) 50 + CFLAGS_REMOVE_return_address.o = $(CC_FLAGS_FTRACE) 51 + CFLAGS_REMOVE_sbi_ecall.o = $(CC_FLAGS_FTRACE) 37 52 endif 38 53 39 54 always-$(KBUILD_BUILTIN) += vmlinux.lds