Commit 8eb15186 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt (Google)
Browse files

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

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: 21581dd4 ("tracing: Ensure module defining synth event cannot be unloaded while tracing")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202503232230.TeREVy8R-lkp@intel.com/


Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 21581dd4

kernel/trace/trace_events_synth.c

+6 −2
Original line number Diff line number Diff line
@@ -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: