Author: Frederic Weisbecker <fweisbec@xxxxxxxxx> AuthorDate: Sun, 22 Feb 2009 22:56:08 +0100 Commit: Ingo Molnar <mingo@xxxxxxx> CommitDate: Sun, 22 Feb 2009 23:16:30 +0100 tracing/ftrace: add missing wake-up on some callsites Impact: fix trace_pipe hangs/latencies Now that we use a common wakeup infrastructure, we must append a wakeup on few callsites which lack it or tasks reading trace_pipe will not be awaken when events come on few tracers. Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- kernel/trace/trace.c | 2 ++ kernel/trace/trace_branch.c | 2 ++ kernel/trace/trace_hw_branches.c | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index e1f3b99..7f450b6 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -3055,6 +3055,8 @@ int trace_vprintk(unsigned long ip, int depth, const char *fmt, va_list args) out: preempt_enable_notrace(); + trace_wake_up(); + return len; } EXPORT_SYMBOL_GPL(trace_vprintk); diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c index c2e68d4..8c8f8c0 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c @@ -78,6 +78,8 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) out: atomic_dec(&tr->data[cpu]->disabled); local_irq_restore(flags); + + trace_wake_up(); } static inline diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c index 3561aac..ddd87fd 100644 --- a/kernel/trace/trace_hw_branches.c +++ b/kernel/trace/trace_hw_branches.c @@ -202,6 +202,8 @@ void trace_hw_branch(u64 from, u64 to) out: atomic_dec(&tr->data[cpu]->disabled); local_irq_restore(irq1); + + trace_wake_up(); } static void trace_bts_at(const struct bts_trace *trace, void *at) -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html