projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d611851
)
tracing/function: Avoid perf_trace_buf_*() if event_function.perf_events is empty
author
Oleg Nesterov
<
[email protected]
>
Mon, 17 Jun 2013 17:02:04 +0000
(19:02 +0200)
committer
Steven Rostedt
<
[email protected]
>
Fri, 19 Jul 2013 01:31:27 +0000
(21:31 -0400)
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/
[email protected]
Acked-by: Peter Zijlstra <
[email protected]
>
Signed-off-by: Oleg Nesterov <
[email protected]
>
Signed-off-by: Steven Rostedt <
[email protected]
>
kernel/trace/trace_event_perf.c
patch
|
blob
|
history
diff --git
a/kernel/trace/trace_event_perf.c
b/kernel/trace/trace_event_perf.c
index 84b1e045faba836583fb371d285f49e79bfa6bd0..12df5573086e147283b9375c87e0ffaeb3a3bd45 100644
(file)
--- 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,
struct pt_regs regs;
int rctx;
+ head = this_cpu_ptr(event_function.perf_events);
+ if (hlist_empty(head))
+ return;
+
#define ENTRY_SIZE (ALIGN(sizeof(struct ftrace_entry) + sizeof(u32), \
sizeof(u64)) - sizeof(u32))
@@
-279,8
+283,6
@@
perf_ftrace_function_call(unsigned long ip, unsigned long parent_ip,
entry->ip = ip;
entry->parent_ip = parent_ip;
-
- head = this_cpu_ptr(event_function.perf_events);
perf_trace_buf_submit(entry, ENTRY_SIZE, rctx, 0,
1, ®s, head, NULL);