diff options
author | Oleg Nesterov <oleg@redhat.com> | 2013-06-17 13:02:04 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2013-07-18 21:31:27 -0400 |
commit | b8ebfd3f7113b63dda93d76bfec638c00e6bd514 (patch) | |
tree | 5a72a20c5fa86fe1c284308111132345f249c671 | |
parent | d611851b421731e2afd9cb956daae001af57a423 (diff) |
tracing/function: Avoid perf_trace_buf_*() if event_function.perf_events is empty
perf_trace_buf_prepare() + perf_trace_buf_submit(head, task => NULL)
make no sense if hlist_empty(head). Change perf_ftrace_function_call()
to check event_function.perf_events beforehand.
Link: http://lkml.kernel.org/r/20130617170204.GA19803@redhat.com
Acked-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r-- | kernel/trace/trace_event_perf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index 84b1e045faba..12df5573086e 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c | |||
@@ -266,6 +266,10 @@ perf_ftrace_function_call(unsigned long ip, unsigned long parent_ip, | |||
266 | struct pt_regs regs; | 266 | struct pt_regs regs; |
267 | int rctx; | 267 | int rctx; |
268 | 268 | ||
269 | head = this_cpu_ptr(event_function.perf_events); | ||
270 | if (hlist_empty(head)) | ||
271 | return; | ||
272 | |||
269 | #define ENTRY_SIZE (ALIGN(sizeof(struct ftrace_entry) + sizeof(u32), \ | 273 | #define ENTRY_SIZE (ALIGN(sizeof(struct ftrace_entry) + sizeof(u32), \ |
270 | sizeof(u64)) - sizeof(u32)) | 274 | sizeof(u64)) - sizeof(u32)) |
271 | 275 | ||
@@ -279,8 +283,6 @@ perf_ftrace_function_call(unsigned long ip, unsigned long parent_ip, | |||
279 | 283 | ||
280 | entry->ip = ip; | 284 | entry->ip = ip; |
281 | entry->parent_ip = parent_ip; | 285 | entry->parent_ip = parent_ip; |
282 | |||
283 | head = this_cpu_ptr(event_function.perf_events); | ||
284 | perf_trace_buf_submit(entry, ENTRY_SIZE, rctx, 0, | 286 | perf_trace_buf_submit(entry, ENTRY_SIZE, rctx, 0, |
285 | 1, ®s, head, NULL); | 287 | 1, ®s, head, NULL); |
286 | 288 | ||