mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-04-12 16:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

tracing: Do not use PERF enums when perf is not defined

Browse Source 
An update was made to up the module ref count when a synthetic event is
registered for both trace and perf events. But if perf is not configured
in, the perf enums used will cause the kernel to fail to build.

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Douglas Raillard <douglas.raillard@arm.com>
Link: https://lore.kernel.org/20250323152151.528b5ced@batman.local.home
Fixes: 21581dd4e7ff ("tracing: Ensure module defining synth event cannot be unloaded while tracing")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202503232230.TeREVy8R-lkp@intel.com/
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt 2025-03-23 15:21:51 -04:00 committed by Steven Rostedt (Google)
parent 21581dd4e7
commit 8eb1518642
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/trace/trace_events_synth.c
View File

@ -858,8 +858,10 @@ static int synth_event_reg(struct trace_event_call *call,
struct synth_event *event = container_of(call, struct synth_event, call);
switch (type) {
case TRACE_REG_REGISTER:
#ifdef CONFIG_PERF_EVENTS
case TRACE_REG_PERF_REGISTER:
#endif
case TRACE_REG_REGISTER:
if (!try_module_get(event->mod))
return -EBUSY;
break;
@ -870,8 +872,10 @@ static int synth_event_reg(struct trace_event_call *call,
int ret = trace_event_reg(call, type, data);
switch (type) {
case TRACE_REG_UNREGISTER:
#ifdef CONFIG_PERF_EVENTS
case TRACE_REG_PERF_UNREGISTER:
#endif
case TRACE_REG_UNREGISTER:
module_put(event->mod);
break;
default: