Skip to content

tracing/kprobes: Update kprobes with new ftrace changes

Steven Rostedt lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest18 patches 5 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/18ring-buffer: Select IRQ_WORKkernel/trace/Kconfig+1 -10 replies
2/18tracing: Dont succeed if event_enable_func did not register anythingkernel/trace/trace_events.c+4 -10 replies
3/18tracing: Return error if register_ftrace_function_probe() fails for event_enable_func()kernel/trace/trace_events.c+9 -20 replies
4/18ftrace: Have ftrace_regex_write() return either read or errorkernel/trace/ftrace.c+1 -10 replies
5/18ftrace, kprobes: Fix a deadlock on ftrace_regex_lockinclude/linux/ftrace.h kernel/trace/ftrace.c+56 -210 replies
6/18ftrace: Cleanup regex_lock and ftrace_lock around hash updatingkernel/trace/ftrace.c+32 -270 replies
7/18tracing/kprobes: Fix to increment return event probe hit-countkernel/trace/trace_kprobe.c+2 -00 replies
8/18tracing: Indicate enabled soft-mode in enable filekernel/trace/trace_events.c+2 -00 replies
9/18tracing: Modify soft-mode only if theres no other referrerinclude/linux/ftrace_event.h kernel/trace/trace_events.c+11 -20 replies
10/18tracing: Add helper function trace_create_new_event() to remove duplicate codekernel/trace/trace_events.c+20 -120 replies
11/18ftrace: Fix locking in register_ftrace_function_probe()kernel/trace/ftrace.c+6 -40 replies
12/18ftrace: Fix the output of enabled_functions debug filekernel/trace/ftrace.c+1 -10 replies
13/18ftrace: Fix function probe when more than one probe is addedkernel/trace/ftrace.c+5 -10 replies
14/18tracing/kprobes: Use bool for retprobe checkerkernel/trace/trace_kprobe.c+1 -10 replies
15/18tracing/kprobes: Increment probe hit-count even if it is used by perfkernel/trace/trace_kprobe.c+4 -40 replies
16/18tracing/kprobes: Pass trace_probe directly from dispatcherkernel/trace/trace_kprobe.c+16 -170 replies
17/18tracing/kprobes: Support ftrace_event_file base multibufferkernel/trace/trace_kprobe.c+214 -360 replies
18/18tracing/kprobes: Support soft-mode disablingkernel/trace/trace_kprobe.c+6 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 00/18] tracing/kprobes: Update kprobes with new ftrace changes

Linus,

The majority of these changes are from Masami Hiramatsu bringing kprobes up to par with the latest changes to ftrace (multi buffering and the new function probes).

He also discovered and fixed some bugs in doing so. When pulling in his patches, I also found a few minor bugs as well and fixed them.

This also includes a compile fix for some archs that select the ring buffer but not tracing.

I based this off of the last patch you took from me that fixed the merge conflict error, as that was the commit that had all the changes I needed for this set of changes.

Please pull the latest trace-fixes-v3.10 tree, which can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-fixes-v3.10

Tag SHA1: b3955bf07072c5eb343b45faec09fee2d09cf695 Head SHA1: b8820084f2130b3dcfb09c78ac16cdd2194a345b

Masami Hiramatsu (11):
tracing: Don't succeed if event_enable_func did not register anything ftrace, kprobes: Fix a deadlock on ftrace_regex_lock
ftrace: Cleanup regex_lock and ftrace_lock around hash updating tracing/kprobes: Fix to increment return event probe hit-count
tracing: Indicate enabled soft-mode in enable file
tracing: Modify soft-mode only if there's no other referrer tracing/kprobes: Use bool for retprobe checker tracing/kprobes: Increment probe hit-count even if it is used by perf tracing/kprobes: Pass trace_probe directly from dispatcher tracing/kprobes: Support ftrace_event_file base multibuffer tracing/kprobes: Support soft-mode disabling

Steven Rostedt (Red Hat) (7):
ring-buffer: Select IRQ_WORK
tracing: Return error if register_ftrace_function_probe() fails for event_enable_func()
ftrace: Have ftrace_regex_write() return either read or error
tracing: Add helper function trace_create_new_event() to remove duplicate code
ftrace: Fix locking in register_ftrace_function_probe()
ftrace: Fix the output of enabled_functions debug file
ftrace: Fix function probe when more than one probe is added

----

 include/linux/ftrace.h       |    4 +
 include/linux/ftrace_event.h |    1 +
 kernel/trace/Kconfig         |    2 +-
 kernel/trace/ftrace.c        |  126 ++++++++++++------
 kernel/trace/trace_events.c  |   54 ++++++--
 kernel/trace/trace_kprobe.c  |  289 ++++++++++++++++++++++++++++++++++--------
 6 files changed, 368 insertions(+), 108 deletions(-)