From: Masami Hiramatsu (Google) <[email protected]>
Since tracer_init_tracefs_work_func() only updates the tracer options
for the global_trace, the instances created by the kernel cmdline
do not have those options.
Fix to update tracer options for those boot-time created instances
to show those options.
Fixes: 428add559b69 ("tracing: Have tracer option be instance specific")
Signed-off-by: Masami Hiramatsu (Google) <[email protected]>
---
Change in v2:
- Fix update_tracer_options() to update all instances.
- Update tracer_options_updated after update all instances.
---
kernel/trace/trace.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 8ae95800592d..4a6784057855 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -10231,11 +10231,16 @@ static __init int __update_tracer_options(struct
trace_array *tr)
return ret;
}
-static __init void update_tracer_options(struct trace_array *tr)
+static __init void update_tracer_options(void)
{
+ struct trace_array *tr;
+
guard(mutex)(&trace_types_lock);
+
+ list_for_each_entry(tr, &ftrace_trace_arrays, list)
+ __update_tracer_options(tr);
+
tracer_options_updated = true;
- __update_tracer_options(tr);
}
/* Must have trace_types_lock held */
@@ -10937,7 +10942,7 @@ static __init void tracer_init_tracefs_work_func(struct
work_struct *work)
create_trace_instances(NULL);
- update_tracer_options(&global_trace);
+ update_tracer_options();
}
static __init int tracer_init_tracefs(void)
