Commit d8d0c245 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt (VMware)

tracing: Apply soft-disabled and filter to tracepoints printk

Apply soft-disabled and the filter rule of the trace events to
the printk output of tracepoints (a.k.a. tp_printk kernel parameter)
as same as trace buffer output.

Link: http://lkml.kernel.org/r/157867231876.17873.15825819592284704068.stgit@devnote2Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 7b9b816f
...@@ -2610,6 +2610,7 @@ static DEFINE_MUTEX(tracepoint_printk_mutex); ...@@ -2610,6 +2610,7 @@ static DEFINE_MUTEX(tracepoint_printk_mutex);
static void output_printk(struct trace_event_buffer *fbuffer) static void output_printk(struct trace_event_buffer *fbuffer)
{ {
struct trace_event_call *event_call; struct trace_event_call *event_call;
struct trace_event_file *file;
struct trace_event *event; struct trace_event *event;
unsigned long flags; unsigned long flags;
struct trace_iterator *iter = tracepoint_print_iter; struct trace_iterator *iter = tracepoint_print_iter;
...@@ -2623,6 +2624,12 @@ static void output_printk(struct trace_event_buffer *fbuffer) ...@@ -2623,6 +2624,12 @@ static void output_printk(struct trace_event_buffer *fbuffer)
!event_call->event.funcs->trace) !event_call->event.funcs->trace)
return; return;
file = fbuffer->trace_file;
if (test_bit(EVENT_FILE_FL_SOFT_DISABLED_BIT, &file->flags) ||
(unlikely(file->flags & EVENT_FILE_FL_FILTERED) &&
!filter_match_preds(file->filter, fbuffer->entry)))
return;
event = &fbuffer->trace_file->event_call->event; event = &fbuffer->trace_file->event_call->event;
spin_lock_irqsave(&tracepoint_iter_lock, flags); spin_lock_irqsave(&tracepoint_iter_lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment