Commit 571a2a50 authored by Ze Gao's avatar Ze Gao Committed by Masami Hiramatsu (Google)
Browse files

rethook, fprobe: do not trace rethook related functions 

These functions are already marked as NOKPROBE to prevent recursion and
we have the same reason to blacklist them if rethook is used with fprobe,
since they are beyond the recursion-free region ftrace can guard.

Link: https://lore.kernel.org/all/20230517034510.15639-5-zegao@tencent.com/



Fixes: f3a112c0 ("x86,rethook,kprobes: Replace kretprobe with rethook on x86")
Signed-off-by: default avatarZe Gao <zegao@tencent.com>
Reviewed-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Acked-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
parent 27527410

arch/riscv/kernel/probes/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -4,3 +4,5 @@ obj-$(CONFIG_RETHOOK) += rethook.o rethook_trampoline.o 
obj-$(CONFIG_KPROBES_ON_FTRACE)	+= ftrace.o

obj-$(CONFIG_UPROBES)		+= uprobes.o decode-insn.o simulate-insn.o

CFLAGS_REMOVE_simulate-insn.o = $(CC_FLAGS_FTRACE)

CFLAGS_REMOVE_rethook.o = $(CC_FLAGS_FTRACE)

CFLAGS_REMOVE_rethook_trampoline.o = $(CC_FLAGS_FTRACE)

arch/s390/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE) 


# Do not trace early setup code

CFLAGS_REMOVE_early.o		= $(CC_FLAGS_FTRACE)

CFLAGS_REMOVE_rethook.o		= $(CC_FLAGS_FTRACE)



endif

arch/x86/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ CFLAGS_REMOVE_ftrace.o = -pg 
CFLAGS_REMOVE_early_printk.o = -pg

CFLAGS_REMOVE_head64.o = -pg

CFLAGS_REMOVE_sev.o = -pg

CFLAGS_REMOVE_rethook.o = -pg

endif



KASAN_SANITIZE_head$(BITS).o				:= n