lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ftrace: Fix perf-tracepoint OOPS

Browse Source 
Not all tracepoints are created equal, in specific the ftrace
tracepoints are created with TRACE_EVENT_FORMAT() which does
not generate the needed bits to tie them into perf counters.

For those events, don't create the 'id' file and fail
->profile_enable when their ID is specified through other
means.

Reported-by: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <1249497664.5890.4.camel@laptop>
[ v2: fix build error in the !CONFIG_EVENT_PROFILE case ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra
2009-08-05 20:41:04 +02:00
committed by Ingo Molnar
parent 386c0b702b
commit af6af30c0f
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/ftrace_event.h
View File

@@ -119,11 +119,9 @@ struct ftrace_event_call {
void *filter; void *filter;
void *mod; void *mod;
#ifdef CONFIG_EVENT_PROFILE atomic_t profile_count;
atomic_t profile_count; int (*profile_enable)(struct ftrace_event_call *);
int (*profile_enable)(struct ftrace_event_call *); void (*profile_disable)(struct ftrace_event_call *);
void (*profile_disable)(struct ftrace_event_call *);
#endif
}; };
#define MAX_FILTER_PRED 32 #define MAX_FILTER_PRED 32

2
kernel/trace/trace_event_profile.c
View File

@@ -14,7 +14,7 @@ int ftrace_profile_enable(int event_id)
mutex_lock(&event_mutex); mutex_lock(&event_mutex);
list_for_each_entry(event, &ftrace_events, list) { list_for_each_entry(event, &ftrace_events, list) {
if (event->id == event_id) { if (event->id == event_id && event->profile_enable) {
ret = event->profile_enable(event); ret = event->profile_enable(event);
break; break;
} }

2
kernel/trace/trace_events.c
View File

@@ -940,7 +940,7 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events,
entry = trace_create_file("enable", 0644, call->dir, call, entry = trace_create_file("enable", 0644, call->dir, call,
enable); enable);
if (call->id) if (call->id && call->profile_enable)
entry = trace_create_file("id", 0444, call->dir, call, entry = trace_create_file("id", 0444, call->dir, call,
id); id);