6.1-stable patches

added patches:
	tracing-do-not-use-perf-enums-when-perf-is-not-defined.patch

diff --git a/queue-6.1/series b/queue-6.1/series
index e860754565244a8b2e0488f2bd8cc1d76bb1b4a1..54e1640d1e33736fb7aabe6158d922fc4a5e5fc6 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -202,3 +202,4 @@ jfs-add-index-corruption-check-to-dt_getpage.patch
 media-streamzap-fix-race-between-device-disconnection-and-urb-callback.patch
 nfsd-put-dl_stid-if-fail-to-queue-dl_recall.patch
 nfsd-skip-sending-cb_recall_any-when-the-backchannel-isn-t-up.patch
+tracing-do-not-use-perf-enums-when-perf-is-not-defined.patch

diff --git a/queue-6.1/tracing-do-not-use-perf-enums-when-perf-is-not-defined.patch b/queue-6.1/tracing-do-not-use-perf-enums-when-perf-is-not-defined.patch
new file mode 100644 (file)
index 0000000..13a694f
--- /dev/null
+++ b/queue-6.1/tracing-do-not-use-perf-enums-when-perf-is-not-defined.patch
@@ -0,0 +1,52 @@
+From 8eb1518642738c6892bd629b46043513a3bf1a6a Mon Sep 17 00:00:00 2001
+From: Steven Rostedt <rostedt@goodmis.org>
+Date: Sun, 23 Mar 2025 15:21:51 -0400
+Subject: tracing: Do not use PERF enums when perf is not defined
+
+From: Steven Rostedt <rostedt@goodmis.org>
+
+commit 8eb1518642738c6892bd629b46043513a3bf1a6a upstream.
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/trace/trace_events_synth.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/kernel/trace/trace_events_synth.c
++++ b/kernel/trace/trace_events_synth.c
+@@ -881,8 +881,10 @@ static int synth_event_reg(struct trace_
+       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;
+@@ -893,8 +895,10 @@ static int synth_event_reg(struct trace_
+       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: