kevin/linux
1
Fork 0
Code

tracing/osnoise: Fix build when timerlat is not enabled

Browse Source 
To fix some critical section races, the interface_lock was added to a few
locations. One of those locations was above where the interface_lock was
declared, so the declaration was moved up before that usage.
Unfortunately, where it was placed was inside a CONFIG_TIMERLAT_TRACER
ifdef block. As the interface_lock is used outside that config, this broke
the build when CONFIG_OSNOISE_TRACER was enabled but
CONFIG_TIMERLAT_TRACER was not.

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: "Helena Anna" <helena.anna.dubel@intel.com>
Cc: "Luis Claudio R. Goncalves" <lgoncalv@redhat.com>
Cc: Tomas Glozar <tglozar@redhat.com>
Link: https://lore.kernel.org/20240909103231.23a289e2@gandalf.local.home
Fixes: e6a53481da ("tracing/timerlat: Only clear timer if a kthread exists")
Reported-by: "Bityutskiy, Artem" <artem.bityutskiy@intel.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt 2024-09-09 10:32:31 -04:00 committed by Steven Rostedt (Google)
parent 5bfbcd1ee5
commit af17814334
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/trace/trace_osnoise.c
View File

@ -228,6 +228,11 @@ static inline struct osnoise_variables *this_cpu_osn_var(void)
return this_cpu_ptr(&per_cpu_osnoise_var); return this_cpu_ptr(&per_cpu_osnoise_var);
} }
/*
* Protect the interface.
*/
static struct mutex interface_lock;
#ifdef CONFIG_TIMERLAT_TRACER #ifdef CONFIG_TIMERLAT_TRACER
/* /*
* Runtime information for the timer mode. * Runtime information for the timer mode.
@ -252,11 +257,6 @@ static inline struct timerlat_variables *this_cpu_tmr_var(void)
return this_cpu_ptr(&per_cpu_timerlat_var); return this_cpu_ptr(&per_cpu_timerlat_var);
} }
/*
* Protect the interface.
*/
static struct mutex interface_lock;
/* /*
* tlat_var_reset - Reset the values of the given timerlat_variables * tlat_var_reset - Reset the values of the given timerlat_variables
*/ */