From: Greg Kroah-Hartman Date: Tue, 11 Apr 2023 12:12:04 +0000 (+0200) Subject: 6.2-stable patches X-Git-Tag: v5.15.107~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b78073cf5c1fe8ae6fa0d02ec0cb6b31454f96ab;p=thirdparty%2Fkernel%2Fstable-queue.git 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 f4d13c71c29..7b7cd231716 100644 --- 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 Link: https://lkml.kernel.org/r/20230322202449.512091-1-kan.liang@linux.intel.com Signed-off-by: Sasha Levin --- - 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 f119a30ccd5..0419af16b8a 100644 --- 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 index 00000000000..5a585ba75cd --- /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)" +Date: Thu, 6 Apr 2023 11:10:33 -0400 +Subject: tracing/synthetic: Make lastcmd_mutex static + +From: Steven Rostedt (Google) + +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 +Cc: Mark Rutland +Cc: Tze-nan Wu +Fixes: 4ccf11c4e8a8e ("tracing/synthetic: Fix races on freeing last_cmd") +Reviewed-by: Mukesh Ojha +Reported-by: kernel test robot +Signed-off-by: Steven Rostedt (Google) +Signed-off-by: Greg Kroah-Hartman +--- + 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)