diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-11-02 00:54:21 (GMT) |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-11-02 14:21:52 (GMT) |
| commit | 0d5c6e1c19bab82fad4837108c2902f557d62a04 (patch) | |
| tree | ed075db499735ea4d72b9d9d7f992fe7d9a1a328 /include/trace | |
| parent | 02404baf1b47123f1c88c9f9f1f3b00e1e2b10db (diff) | |
| download | linux-0d5c6e1c19bab82fad4837108c2902f557d62a04.tar.xz | |
tracing: Use irq_work for wake ups and remove *_nowake_*() functions
Have the ring buffer commit function use the irq_work infrastructure to
wake up any waiters waiting on the ring buffer for new data. The irq_work
was created for such a purpose, where doing the actual wake up at the
time of adding data is too dangerous, as an event or function trace may
be in the midst of the work queue locks and cause deadlocks. The irq_work
will either delay the action to the next timer interrupt, or trigger an IPI
to itself forcing an interrupt to do the work (in a safe location).
With irq_work, all ring buffer commits can safely do wakeups, removing
the need for the ring buffer commit "nowake" variants, which were used
by events and function tracing. All commits can now safely use the
normal commit, and the "nowake" variants can be removed.
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/ftrace.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index a763888..698f2a8 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -545,8 +545,7 @@ ftrace_raw_event_##call(void *__data, proto) \ { assign; } \ \ if (!filter_current_check_discard(buffer, event_call, entry, event)) \ - trace_nowake_buffer_unlock_commit(buffer, \ - event, irq_flags, pc); \ + trace_buffer_unlock_commit(buffer, event, irq_flags, pc); \ } /* * The ftrace_test_probe is compiled out, it is only here as a build time check |