ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2021-01-11 14:37:13 -08:00
parent 6e68b9961f 7bb83f6fc4
commit a0d54b4f5b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/trace/Kconfig
View File

@@ -538,7 +538,7 @@ config KPROBE_EVENTS
config KPROBE_EVENTS_ON_NOTRACE config KPROBE_EVENTS_ON_NOTRACE
bool "Do NOT protect notrace function from kprobe events" bool "Do NOT protect notrace function from kprobe events"
depends on KPROBE_EVENTS depends on KPROBE_EVENTS
depends on KPROBES_ON_FTRACE depends on DYNAMIC_FTRACE
default n default n
help help
This is only for the developers who want to debug ftrace itself This is only for the developers who want to debug ftrace itself

2
kernel/trace/trace_kprobe.c
View File

@@ -434,7 +434,7 @@ static int disable_trace_kprobe(struct trace_event_call *call,
return 0; return 0;
} }
#if defined(CONFIG_KPROBES_ON_FTRACE) && \ #if defined(CONFIG_DYNAMIC_FTRACE) && \
!defined(CONFIG_KPROBE_EVENTS_ON_NOTRACE) !defined(CONFIG_KPROBE_EVENTS_ON_NOTRACE)
static bool __within_notrace_func(unsigned long addr) static bool __within_notrace_func(unsigned long addr)
{ {