From: Steven Rostedt <rostedt@goodmis.org>
To: LKML <linux-kernel@vger.kernel.org>,
Linux trace kernel <linux-trace-kernel@vger.kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Douglas Raillard <douglas.raillard@arm.com>
Subject: [PATCH] tracing: Do not use PERF enums when perf is not defined
Date: Sun, 23 Mar 2025 15:21:51 -0400 [thread overview]
Message-ID: <20250323152151.528b5ced@batman.local.home> (raw)
From: Steven Rostedt <rostedt@goodmis.org>
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.
Fixes: a1e3ad43115e ("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>
---
kernel/trace/trace_events_synth.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c
index d91205bc9f61..5976545403ea 100644
--- a/kernel/trace/trace_events_synth.c
+++ b/kernel/trace/trace_events_synth.c
@@ -859,8 +859,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;
@@ -871,8 +873,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:
--
2.47.2
reply other threads:[~2025-03-23 19:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250323152151.528b5ced@batman.local.home \
--to=rostedt@goodmis.org \
--cc=douglas.raillard@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox