Impact: enhance boot trace output with scheduling events Use the sched_switch tracer from the boot tracer. We also can trace schedule events inside the initcalls. Sched tracing is disabled after the initcall has finished and then reenabled before the next one is started.
Unified · Split
| @@ -3251,6 +3251,8 @@ __init static int tracer_alloc_buffers(void) · 3250 unmodified lines | ||
| 3251 | 3251 | |
| 3252 | 3252 | register_tracer(&nop_trace); |
| 3253 | 3253 | #ifdef CONFIG_BOOT_TRACER |
| 3254 | + /* We don't want to launch sched_switch tracer yet */ | |
| 3255 | + global_trace.ctrl = 0; | |
| 3254 | 3256 | register_tracer(&boot_tracer); |
| 3255 | 3257 | current_trace = &boot_tracer; |
| 3256 | 3258 | current_trace->init(&global_trace); |
| @@ -49,6 +49,7 @@ struct ftrace_entry { · 48 unmodified lines | ||
| 49 | 49 | unsigned long parent_ip; |
| 50 | 50 | }; |
| 51 | 51 | extern struct tracer boot_tracer; |
| 52 | +extern struct tracer sched_switch_trace; /* Used by the boot tracer */ | |
| 52 | 53 | |
| 53 | 54 | /* |
| 54 | 55 | * Context switch trace entry - which task (and prio) we switched from/to: |
| @@ -27,10 +27,14 @@ void start_boot_trace(void) · 26 unmodified lines | ||
| 27 | 27 | |
| 28 | 28 | void enable_boot_trace(void) |
| 29 | 29 | { |
| 30 | + if (pre_initcalls_finished) | |
| 31 | + tracing_start_cmdline_record(); | |
| 30 | 32 | } |
| 31 | 33 | |
| 32 | 34 | void disable_boot_trace(void) |
| 33 | 35 | { |
| 36 | + if (pre_initcalls_finished) | |
| 37 | + tracing_stop_cmdline_record(); | |
| 34 | 38 | } |
| 35 | 39 | |
| 36 | 40 | void reset_boot_trace(struct trace_array *tr) |
| @@ -45,6 +49,8 @@ static void boot_trace_init(struct trace_array *tr) · 8 unmodified lines | ||
| 45 | 49 | |
| 46 | 50 | for_each_cpu_mask(cpu, cpu_possible_map) |
| 47 | 51 | tracing_reset(tr, cpu); |
| 52 | + | |
| 53 | + sched_switch_trace.init(tr); | |
| 48 | 54 | } |
| 49 | 55 | |
| 50 | 56 | static void boot_trace_ctrl_update(struct trace_array *tr) |
| @@ -127,6 +127,7 @@ static void tracing_start_sched_switch(void) · 126 unmodified lines | ||
| 127 | 127 | long ref; |
| 128 | 128 | |
| 129 | 129 | mutex_lock(&tracepoint_mutex); |
| 130 | + tracer_enabled = 1; | |
| 130 | 131 | ref = atomic_inc_return(&sched_ref); |
| 131 | 132 | if (ref == 1) |
| 132 | 133 | tracing_sched_register(); |
| @@ -138,6 +139,7 @@ static void tracing_stop_sched_switch(void) · 5 unmodified lines | ||
| 138 | 139 | long ref; |
| 139 | 140 | |
| 140 | 141 | mutex_lock(&tracepoint_mutex); |
| 142 | + tracer_enabled = 0; | |
| 141 | 143 | ref = atomic_dec_and_test(&sched_ref); |
| 142 | 144 | if (ref) |
| 143 | 145 | tracing_sched_unregister(); |
| @@ -158,12 +160,10 @@ static void start_sched_trace(struct trace_array *tr) · 14 unmodified lines | ||
| 158 | 160 | { |
| 159 | 161 | sched_switch_reset(tr); |
| 160 | 162 | tracing_start_cmdline_record(); |
| 161 | − tracer_enabled = 1; | |
| 162 | 163 | } |
| 163 | 164 | |
| 164 | 165 | static void stop_sched_trace(struct trace_array *tr) |
| 165 | 166 | { |
| 166 | − tracer_enabled = 0; | |
| 167 | 167 | tracing_stop_cmdline_record(); |
| 168 | 168 | } |
| 169 | 169 | |
| @@ -190,7 +190,7 @@ static void sched_switch_trace_ctrl_update(struct trace_array *tr) · 20 unmodified lines | ||
| 190 | 190 | stop_sched_trace(tr); |
| 191 | 191 | } |
| 192 | 192 | |
| 193 | −static struct tracer sched_switch_trace __read_mostly = | |
| 193 | +struct tracer sched_switch_trace __read_mostly = | |
| 194 | 194 | { |
| 195 | 195 | .name = "sched_switch", |
| 196 | 196 | .init = sched_switch_trace_init, |