Skip to content

Commit 7bb83f6

Browse files
mhiramatrostedt
authored andcommitted
tracing/kprobes: Do the notrace functions check without kprobes on ftrace
Enable the notrace function check on the architecture which doesn't support kprobes on ftrace but support dynamic ftrace. This notrace function check is not only for the kprobes on ftrace but also sw-breakpoint based kprobes. Thus there is no reason to limit this check for the arch which supports kprobes on ftrace. This also changes the dependency of Kconfig. Because kprobe event uses the function tracer's address list for identifying notrace function, if the CONFIG_DYNAMIC_FTRACE=n, it can not check whether the target function is notrace or not. Link: https://lkml.kernel.org/r/[email protected] Link: https://lkml.kernel.org/r/161007957862.114704.4512260007555399463.stgit@devnote2 Cc: [email protected] Fixes: 45408c4 ("tracing: kprobes: Prohibit probing on notrace function") Acked-by: Naveen N. Rao <[email protected]> Signed-off-by: Masami Hiramatsu <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
1 parent e71ba94 commit 7bb83f6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

kernel/trace/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ config KPROBE_EVENTS
538538
config KPROBE_EVENTS_ON_NOTRACE
539539
bool "Do NOT protect notrace function from kprobe events"
540540
depends on KPROBE_EVENTS
541-
depends on KPROBES_ON_FTRACE
541+
depends on DYNAMIC_FTRACE
542542
default n
543543
help
544544
This is only for the developers who want to debug ftrace itself

kernel/trace/trace_kprobe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ static int disable_trace_kprobe(struct trace_event_call *call,
434434
return 0;
435435
}
436436

437-
#if defined(CONFIG_KPROBES_ON_FTRACE) && \
437+
#if defined(CONFIG_DYNAMIC_FTRACE) && \
438438
!defined(CONFIG_KPROBE_EVENTS_ON_NOTRACE)
439439
static bool __within_notrace_func(unsigned long addr)
440440
{

0 commit comments

Comments
 (0)