iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tracing/osnoise: Properly unhook events if start_per_cpu_kthreads() fails

Browse Source 
If start_per_cpu_kthreads() called from osnoise_workload_start() returns
error, event hooks are left in broken state: unhook_irq_events() called
but unhook_thread_events() and unhook_softirq_events() not called, and
trace_osnoise_callback_enabled flag not cleared.

On the next tracer enable, hooks get not installed due to
trace_osnoise_callback_enabled flag.

And on the further tracer disable an attempt to remove non-installed
hooks happened, hitting a WARN_ON_ONCE() in tracepoint_remove_func().

Fix the error path by adding the missing part of cleanup.
While at this, introduce osnoise_unhook_events() to avoid code
duplication between this error path and normal tracer disable.

Link: https://lkml.kernel.org/r/20220109153459.3701773-1-nikita.yushchenko@virtuozzo.com

Cc: stable@vger.kernel.org
Fixes: bce29ac9ce0b ("trace: Add osnoise tracer")
Acked-by: Daniel Bristot de Oliveira <bristot@kernel.org>
Signed-off-by: Nikita Yushchenko <nikita.yushchenko@virtuozzo.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Nikita Yushchenko 2022-01-09 18:34:59 +03:00 committed by Steven Rostedt
parent 6e1b4bd191
commit 0878355b51
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/trace/trace_osnoise.c
View File

@ -2122,6 +2122,13 @@ out_unhook_irq:
return -EINVAL; return -EINVAL;
} }
static void osnoise_unhook_events(void)
{
unhook_thread_events();
unhook_softirq_events();
unhook_irq_events();
}
/* /*
* osnoise_workload_start - start the workload and hook to events * osnoise_workload_start - start the workload and hook to events
*/ */
@ -2154,7 +2161,14 @@ static int osnoise_workload_start(void)
retval = start_per_cpu_kthreads(); retval = start_per_cpu_kthreads();
if (retval) { if (retval) {
unhook_irq_events(); trace_osnoise_callback_enabled = false;
/*
* Make sure that ftrace_nmi_enter/exit() see
* trace_osnoise_callback_enabled as false before continuing.
*/
barrier();
osnoise_unhook_events();
return retval; return retval;
} }
@ -2185,9 +2199,7 @@ static void osnoise_workload_stop(void)
stop_per_cpu_kthreads(); stop_per_cpu_kthreads();
unhook_irq_events(); osnoise_unhook_events();
unhook_softirq_events();
unhook_thread_events();
} }
static void osnoise_tracer_start(struct trace_array *tr) static void osnoise_tracer_start(struct trace_array *tr)