AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

tracing: Ignore mmiotrace from kernel commandline

Browse Source 
The mmiotrace tracer cannot be enabled with ftrace=mmiotrace in kernel
commandline. With this patch, noboot is added to the tracer struct,
and when system boot with a tracer that has noboot=true, it will print
out a warning message and continue booting.

Link: http://lkml.kernel.org/r/1505111195-31942-1-git-send-email-zsun@redhat.com

Signed-off-by: Ziqian SUN (Zamir) <zsun@redhat.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Ziqian SUN (Zamir) 2017-09-11 14:26:35 +08:00 committed by Steven Rostedt (VMware)
parent 8dd33bcb70
commit c7b3ae0bd2
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/trace/trace.c
View File

@ -5364,6 +5364,13 @@ static int tracing_set_tracer(struct trace_array *tr, const char *buf)
if (t == tr->current_trace) if (t == tr->current_trace)
goto out; goto out;
/* Some tracers won't work on kernel command line */
if (system_state < SYSTEM_RUNNING && t->noboot) {
pr_warn("Tracer '%s' is not allowed on command line, ignored\n",
t->name);
goto out;
}
/* Some tracers are only allowed for the top level buffer */ /* Some tracers are only allowed for the top level buffer */
if (!trace_ok_for_array(t, tr)) { if (!trace_ok_for_array(t, tr)) {
ret = -EINVAL; ret = -EINVAL;

2
kernel/trace/trace.h
View File

@ -444,6 +444,8 @@ struct tracer {
#ifdef CONFIG_TRACER_MAX_TRACE #ifdef CONFIG_TRACER_MAX_TRACE
bool use_max_tr; bool use_max_tr;
#endif #endif
/* True if tracer cannot be enabled in kernel param */
bool noboot;
}; };

1
kernel/trace/trace_mmiotrace.c
View File

@ -282,6 +282,7 @@ static struct tracer mmio_tracer __read_mostly =
.close = mmio_close, .close = mmio_close,
.read = mmio_read, .read = mmio_read,
.print_line = mmio_print_line, .print_line = mmio_print_line,
.noboot = true,
}; };
__init static int init_mmio_trace(void) __init static int init_mmio_trace(void)