6.2-stable patches

added patches:
	tracing-synthetic-make-lastcmd_mutex-static.patch

diff --git a/queue-6.2/perf-core-fix-the-same-task-check-in-perf_event_set_.patch b/queue-6.2/perf-core-fix-the-same-task-check-in-perf_event_set_.patch
index f4d13c71c29141899ee395e8dd20a91c1f2efe75..7b7cd2317165e29bc7d87e2bea9d6a37b97a4510 100644 (file)
--- a/queue-6.2/perf-core-fix-the-same-task-check-in-perf_event_set_.patch
+++ b/queue-6.2/perf-core-fix-the-same-task-check-in-perf_event_set_.patch
@@ -52,14 +52,12 @@ Reviewed-by: Zhengjun Xing <zhengjun.xing@linux.intel.com>
 Link: https://lkml.kernel.org/r/20230322202449.512091-1-kan.liang@linux.intel.com
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- kernel/events/core.c | 2 +-
+ kernel/events/core.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/kernel/events/core.c b/kernel/events/core.c
-index 4b3205f6bed5e..daecb8c9126b0 100644
 --- a/kernel/events/core.c
 +++ b/kernel/events/core.c
-@@ -12155,7 +12155,7 @@ perf_event_set_output(struct perf_event *event, struct perf_event *output_event)
+@@ -12155,7 +12155,7 @@ perf_event_set_output(struct perf_event
        /*
         * If its not a per-cpu rb, it must be the same task.
         */
@@ -68,6 +66,3 @@ index 4b3205f6bed5e..daecb8c9126b0 100644
                goto out;
  
        /*
--- 
-2.39.2
-

diff --git a/queue-6.2/series b/queue-6.2/series
index f119a30ccd529797c34089e83b014ed330dc4d34..0419af16b8acaab3943964a54ea0a38efcbe85a6 100644 (file)
--- a/queue-6.2/series
+++ b/queue-6.2/series
@@ -138,3 +138,4 @@ block-ublk-make-sure-that-block-size-is-set-correctl.patch
 block-don-t-set-gd_need_part_scan-if-scan-partition-.patch
 perf-optimize-perf_pmu_migrate_context.patch
 perf-core-fix-the-same-task-check-in-perf_event_set_.patch
+tracing-synthetic-make-lastcmd_mutex-static.patch

diff --git a/queue-6.2/tracing-synthetic-make-lastcmd_mutex-static.patch b/queue-6.2/tracing-synthetic-make-lastcmd_mutex-static.patch
new file mode 100644 (file)
index 0000000..5a585ba
--- /dev/null
+++ b/queue-6.2/tracing-synthetic-make-lastcmd_mutex-static.patch
@@ -0,0 +1,38 @@
+From 31c683967174b487939efaf65e41f5ff1404e141 Mon Sep 17 00:00:00 2001
+From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
+Date: Thu, 6 Apr 2023 11:10:33 -0400
+Subject: tracing/synthetic: Make lastcmd_mutex static
+
+From: Steven Rostedt (Google) <rostedt@goodmis.org>
+
+commit 31c683967174b487939efaf65e41f5ff1404e141 upstream.
+
+The lastcmd_mutex is only used in trace_events_synth.c and should be
+static.
+
+Link: https://lore.kernel.org/linux-trace-kernel/202304062033.cRStgOuP-lkp@intel.com/
+Link: https://lore.kernel.org/linux-trace-kernel/20230406111033.6e26de93@gandalf.local.home
+
+Cc: Masami Hiramatsu <mhiramat@kernel.org>
+Cc: Mark Rutland <mark.rutland@arm.com>
+Cc: Tze-nan Wu <Tze-nan.Wu@mediatek.com>
+Fixes: 4ccf11c4e8a8e ("tracing/synthetic: Fix races on freeing last_cmd")
+Reviewed-by: Mukesh Ojha <quic_mojha@quicinc.com>
+Reported-by: kernel test robot <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 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/trace/trace_events_synth.c
++++ b/kernel/trace/trace_events_synth.c
+@@ -44,7 +44,7 @@ enum { ERRORS };
+ 
+ static const char *err_text[] = { ERRORS };
+ 
+-DEFINE_MUTEX(lastcmd_mutex);
++static DEFINE_MUTEX(lastcmd_mutex);
+ static char *last_cmd;
+ 
+ static int errpos(const char *str)