Skip to content

Commit 26b840a

Browse files
torvaldstorvalds
committed
Merge tag 'trace-fixes-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing/kprobes update from Steven Rostedt: "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." * tag 'trace-fixes-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing/kprobes: Support soft-mode disabling tracing/kprobes: Support ftrace_event_file base multibuffer tracing/kprobes: Pass trace_probe directly from dispatcher tracing/kprobes: Increment probe hit-count even if it is used by perf tracing/kprobes: Use bool for retprobe checker ftrace: Fix function probe when more than one probe is added ftrace: Fix the output of enabled_functions debug file ftrace: Fix locking in register_ftrace_function_probe() tracing: Add helper function trace_create_new_event() to remove duplicate code tracing: Modify soft-mode only if there's no other referrer tracing: Indicate enabled soft-mode in enable file tracing/kprobes: Fix to increment return event probe hit-count ftrace: Cleanup regex_lock and ftrace_lock around hash updating ftrace, kprobes: Fix a deadlock on ftrace_regex_lock ftrace: Have ftrace_regex_write() return either read or error tracing: Return error if register_ftrace_function_probe() fails for event_enable_func() tracing: Don't succeed if event_enable_func did not register anything ring-buffer: Select IRQ_WORK
2 parents 607eeb0 + b882008 commit 26b840a

File tree

6 files changed

+368
-108
lines changed

6 files changed

+368
-108
lines changed

‎include/linux/ftrace.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip,
9090
* not set this, then the ftrace infrastructure will add recursion
9191
* protection for the caller.
9292
* STUB - The ftrace_ops is just a place holder.
93+
* INITIALIZED - The ftrace_ops has already been initialized (first use time
94+
* register_ftrace_function() is called, it will initialized the ops)
9395
*/
9496
enum {
9597
FTRACE_OPS_FL_ENABLED = 1 << 0,
@@ -100,6 +102,7 @@ enum {
100102
FTRACE_OPS_FL_SAVE_REGS_IF_SUPPORTED = 1 << 5,
101103
FTRACE_OPS_FL_RECURSION_SAFE = 1 << 6,
102104
FTRACE_OPS_FL_STUB = 1 << 7,
105+
FTRACE_OPS_FL_INITIALIZED = 1 << 8,
103106
};
104107

105108
struct ftrace_ops {
@@ -110,6 +113,7 @@ struct ftrace_ops {
110113
#ifdef CONFIG_DYNAMIC_FTRACE
111114
struct ftrace_hash *notrace_hash;
112115
struct ftrace_hash *filter_hash;
116+
struct mutex regex_lock;
113117
#endif
114118
};
115119

‎include/linux/ftrace_event.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ struct ftrace_event_file {
293293
* caching and such. Which is mostly OK ;-)
294294
*/
295295
unsigned long flags;
296+
atomic_t sm_ref; /* soft-mode reference counter */
296297
};
297298

298299
#define __TRACE_EVENT_FLAGS(name, value) \

‎kernel/trace/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ config TRACE_CLOCK
7171
config RING_BUFFER
7272
bool
7373
select TRACE_CLOCK
74+
select IRQ_WORK
7475

7576
config FTRACE_NMI_ENTER
7677
bool
@@ -107,7 +108,6 @@ config TRACING
107108
select BINARY_PRINTF
108109
select EVENT_TRACING
109110
select TRACE_CLOCK
110-
select IRQ_WORK
111111

112112
config GENERIC_TRACER
113113
bool

0 commit comments

Comments
 (0)