Commit 5224c3a31549f1c056039545b289e1b01ed02f12
Committed by
Steven Rostedt
Steven Rostedt
1 parent
50a011f640
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
tracing: Add an option for disabling markers
In our application, we have trace markers spread through user-space. We have markers in GL, X, etc. These are super handy for Chrome's about:tracing feature (Chrome + system + kernel trace view), but can be very distracting when you're trying to debug a kernel issue. I normally, use "grep -v tracing_mark_write" but it would be nice if I could just temporarily disable markers all together. Link: http://lkml.kernel.org/r/1347066739-26285-1-git-send-email-msb@chromium.org CC: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Mandeep Singh Baines <msb@chromium.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Showing 2 changed files with 6 additions and 1 deletions Side-by-side Diff
kernel/trace/trace.c
| ... | ... | @@ -328,7 +328,7 @@ |
| 328 | 328 | unsigned long trace_flags = TRACE_ITER_PRINT_PARENT | TRACE_ITER_PRINTK | |
| 329 | 329 | TRACE_ITER_ANNOTATE | TRACE_ITER_CONTEXT_INFO | TRACE_ITER_SLEEP_TIME | |
| 330 | 330 | TRACE_ITER_GRAPH_TIME | TRACE_ITER_RECORD_CMD | TRACE_ITER_OVERWRITE | |
| 331 | - TRACE_ITER_IRQ_INFO; | |
| 331 | + TRACE_ITER_IRQ_INFO | TRACE_ITER_MARKERS; | |
| 332 | 332 | |
| 333 | 333 | static int trace_stop_count; |
| 334 | 334 | static DEFINE_RAW_SPINLOCK(tracing_start_lock); |
| ... | ... | @@ -470,6 +470,7 @@ |
| 470 | 470 | "overwrite", |
| 471 | 471 | "disable_on_free", |
| 472 | 472 | "irq-info", |
| 473 | + "markers", | |
| 473 | 474 | NULL |
| 474 | 475 | }; |
| 475 | 476 | |
| ... | ... | @@ -3884,6 +3885,9 @@ |
| 3884 | 3885 | int i; |
| 3885 | 3886 | |
| 3886 | 3887 | if (tracing_disabled) |
| 3888 | + return -EINVAL; | |
| 3889 | + | |
| 3890 | + if (!(trace_flags & TRACE_ITER_MARKERS)) | |
| 3887 | 3891 | return -EINVAL; |
| 3888 | 3892 | |
| 3889 | 3893 | if (cnt > TRACE_BUF_SIZE) |