Merge: Fix call trace from create_trace_option_files in kernel/trace/trace.c

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1896

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2155737

Backport a missing patch from an earlier backport series to fix a call trace (BZ 2129758
backported commit 6621a70 but was missing the preceeding patch ef9188b).

Signed-off-by: Thomas Huth <thuth@redhat.com>

Approved-by: Cédric Le Goater <clg@redhat.com>
Approved-by: Joe Lawrence <joe.lawrence@redhat.com>

Signed-off-by: Herton R. Krzesinski <herton@redhat.com>

Author: Herton R. Krzesinski

kernel/trace/trace.c

@@ -6315,12 +6315,18 @@ static void tracing_set_nop(struct trace_array *tr)
 	tr->current_trace = &nop_trace;
 }
 
+static bool tracer_options_updated;
+
 static void add_tracer_options(struct trace_array *tr, struct tracer *t)
 {
 	/* Only enable if the directory has been created already. */
 	if (!tr->dir)
 		return;
 
+	/* Only create trace option files after update_tracer_options finish */
+	if (!tracer_options_updated)
+		return;
+
 	create_trace_option_files(tr, t);
 }
 
@@ -9144,6 +9150,7 @@ static void __update_tracer_options(struct trace_array *tr)
 static void update_tracer_options(struct trace_array *tr)
 {
 	mutex_lock(&trace_types_lock);
+	tracer_options_updated = true;
 	__update_tracer_options(tr);
 	mutex_unlock(&trace_types_lock);
 }