Skip to content

Commit b0d7f5f

Browse files
martin-kaiserPaul Walmsley
authored andcommitted
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>
1 parent 957afeb commit b0d7f5f

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

arch/riscv/kernel/Makefile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
# Makefile for the RISC-V Linux kernel
44
#
55

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
126
CFLAGS_syscall_table.o += $(call cc-disable-warning, override-init)
137
CFLAGS_compat_syscall_table.o += $(call cc-disable-warning, override-init)
148

@@ -24,7 +18,6 @@ CFLAGS_sbi_ecall.o := -mcmodel=medany
2418
ifdef CONFIG_FTRACE
2519
CFLAGS_REMOVE_alternative.o = $(CC_FLAGS_FTRACE)
2620
CFLAGS_REMOVE_cpufeature.o = $(CC_FLAGS_FTRACE)
27-
CFLAGS_REMOVE_sbi_ecall.o = $(CC_FLAGS_FTRACE)
2821
endif
2922
ifdef CONFIG_RELOCATABLE
3023
CFLAGS_alternative.o += -fno-pie
@@ -43,6 +36,14 @@ CFLAGS_sbi_ecall.o += -D__NO_FORTIFY
4336
endif
4437
endif
4538

39+
ifdef CONFIG_FTRACE
40+
CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE)
41+
CFLAGS_REMOVE_patch.o = $(CC_FLAGS_FTRACE)
42+
CFLAGS_REMOVE_sbi.o = $(CC_FLAGS_FTRACE)
43+
CFLAGS_REMOVE_return_address.o = $(CC_FLAGS_FTRACE)
44+
CFLAGS_REMOVE_sbi_ecall.o = $(CC_FLAGS_FTRACE)
45+
endif
46+
4647
always-$(KBUILD_BUILTIN) += vmlinux.lds
4748

4849
obj-y += head.o

0 commit comments

Comments
 (0)