michael/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tracing: Ensure module defining synth event cannot be unloaded while tracing

Browse Source 
commit 21581dd4e7 upstream.

Currently, using synth_event_delete() will fail if the event is being
used (tracing in progress), but that is normally done in the module exit
function. At that stage, failing is problematic as returning a non-zero
status means the module will become locked (impossible to unload or
reload again).

Instead, ensure the module exit function does not get called in the
first place by increasing the module refcnt when the event is enabled.

Cc: stable@vger.kernel.org
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Fixes: 35ca5207c2 ("tracing: Add synthetic event command generation functions")
Link: https://lore.kernel.org/20250318180906.226841-1-douglas.raillard@arm.com
Signed-off-by: Douglas Raillard <douglas.raillard@arm.com>
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Douglas Raillard
2025-03-18 18:09:05 +00:00
committed by Greg Kroah-Hartman
parent 099ef33858
commit fc128e85cf
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
kernel/trace/trace_events_synth.c
View File

@@ -859,6 +859,34 @@ static struct trace_event_fields synth_event_fields_array[] = {
{}
};
static int synth_event_reg(struct trace_event_call *call,
enum trace_reg type, void *data)
{
struct synth_event *event = container_of(call, struct synth_event, call);
switch (type) {
case TRACE_REG_REGISTER:
case TRACE_REG_PERF_REGISTER:
if (!try_module_get(event->mod))
return -EBUSY;
break;
default:
break;
}
int ret = trace_event_reg(call, type, data);
switch (type) {
case TRACE_REG_UNREGISTER:
case TRACE_REG_PERF_UNREGISTER:
module_put(event->mod);
break;
default:
break;
}
return ret;
}
static int register_synth_event(struct synth_event *event)
{
struct trace_event_call *call = &event->call;
@@ -888,7 +916,7 @@ static int register_synth_event(struct synth_event *event)
goto out;
}
call->flags = TRACE_EVENT_FL_TRACEPOINT;
call->class->reg = trace_event_reg;
call->class->reg = synth_event_reg;
call->class->probe = trace_event_raw_event_synth;
call->data = event;
call->tp = event->tp;