perf, trace: Inline perf_swevent_put_recursion_context()
Subsystems (2)
Commit-ID: ecc55f84b2e9741f29daa787ded93986df6cbe17 Gitweb: http://git.kernel.org/tip/ecc55f84b2e9741f29daa787ded93986df6cbe17 Author: Peter Zijlstra <[email protected]> AuthorDate: Fri, 21 May 2010 15:11:34 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 9 Jun 2010 11:12:33 +0200
perf, trace: Inline perf_swevent_put_recursion_context()
Inline perf_swevent_put_recursion_context into perf_tp_event(), this shrinks the per trace template code footprint and saves a function call.
Signed-off-by Peter Zijlstra <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- include/linux/ftrace_event.h | 3 +-- include/linux/perf_event.h | 2 +- kernel/perf_event.c | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-)
include/linux/ftrace_event.h +1 -2
@@ -257,8 +257,7 @@ static inline void perf_trace_buf_submit(void *raw_data, int size, int rctx, u64 addr, u64 count, struct pt_regs *regs, void *head) { -perf_tp_event (addr, count, raw_data, size, regs, head); -perf_swevent_put_recursion_context (rctx); +perf_tp_event (addr, count, raw_data, size, regs, head, rctx); }#endif
include/linux/perf_event.h +1 -1
@@ -1001,7 +1001,7 @@ static inline bool perf_paranoid_kernel(void)extern void perf_event_init (void );extern void perf_tp_event (u64 addr,u64 count,void *record,int entry_size,struct pt_regs *regs, -struct hlist_head *head); +struct hlist_head *head,int rctx);extern void perf_bp_event (struct perf_event *event,void *data);#ifndef perf_misc_flags
kernel/perf_event.c +4 -4
@@ -4213,14 +4213,12 @@ int perf_swevent_get_recursion_context(void) }EXPORT_SYMBOL_GPL (perf_swevent_get_recursion_context); -void perf_swevent_put_recursion_context (int rctx) +void inline perf_swevent_put_recursion_context (int rctx) {struct perf_cpu_context *cpuctx = &__get_cpu_var (perf_cpu_context);barrier (); cpuctx->recursion[rctx]--; } -EXPORT_SYMBOL_GPL (perf_swevent_put_recursion_context); -void __perf_sw_event (u32 event_id,u64 nr,int nmi,struct pt_regs *regs,u64 addr)
@@ -4601,7 +4599,7 @@ static int perf_tp_event_match(struct perf_event *event, }void perf_tp_event (u64 addr,u64 count,void *record,int entry_size, -struct pt_regs *regs,struct hlist_head *head) +struct pt_regs *regs,struct hlist_head *head,int rctx) {struct perf_sample_data data;struct perf_event *event;
@@ -4621,6 +4619,8 @@ void perf_tp_event(u64 addr, u64 count, void *record, int entry_size,perf_swevent_add (event, count,1 , &data, regs); }rcu_read_unlock (); + +perf_swevent_put_recursion_context (rctx); }EXPORT_SYMBOL_GPL (perf_tp_event);