Commit a0d54b4f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-v5.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace 

Pull tracing fix from Steven Rostedt:
 "Blacklist properly on all archs.

  The code to blacklist notrace functions for kprobes was not using the
  right kconfig option, which caused some archs (powerpc) to possibly
  not blacklist them"

* tag 'trace-v5.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/kprobes: Do the notrace functions check without kprobes on ftrace
parents 6e68b996 7bb83f6f

kernel/trace/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ config KPROBE_EVENTS 
config KPROBE_EVENTS_ON_NOTRACE

	bool "Do NOT protect notrace function from kprobe events"

	depends on KPROBE_EVENTS

	depends on KPROBES_ON_FTRACE

	depends on DYNAMIC_FTRACE

	default n

	help

	  This is only for the developers who want to debug ftrace itself

kernel/trace/trace_kprobe.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static int disable_trace_kprobe(struct trace_event_call *call, 
	return 0;

}



#if defined(CONFIG_KPROBES_ON_FTRACE) && \

#if defined(CONFIG_DYNAMIC_FTRACE) && \

	!defined(CONFIG_KPROBE_EVENTS_ON_NOTRACE)

static bool __within_notrace_func(unsigned long addr)

{