From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 4 Aug 2023 10:43:21 +0000 (+0200)
Subject: 6.1-stable patches
X-Git-Tag: v4.14.321~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3a9d1d258a737a5f94c68686fa1af59dfe1cabb;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	perf-fix-function-pointer-case.patch
---

diff --git a/queue-6.1/perf-fix-function-pointer-case.patch b/queue-6.1/perf-fix-function-pointer-case.patch
new file mode 100644
index 00000000000..c02065c7f85
--- /dev/null
+++ b/queue-6.1/perf-fix-function-pointer-case.patch
@@ -0,0 +1,48 @@
+From 1af6239d1d3e61d33fd2f0ba53d3d1a67cc50574 Mon Sep 17 00:00:00 2001
+From: Peter Zijlstra <peterz@infradead.org>
+Date: Wed, 16 Nov 2022 22:40:17 +0100
+Subject: perf: Fix function pointer case
+
+From: Peter Zijlstra <peterz@infradead.org>
+
+commit 1af6239d1d3e61d33fd2f0ba53d3d1a67cc50574 upstream.
+
+With the advent of CFI it is no longer acceptible to cast function
+pointers.
+
+The robot complains thusly:
+
+  kernel-events-core.c:warning:cast-from-int-(-)(struct-perf_cpu_pmu_context-)-to-remote_function_f-(aka-int-(-)(void-)-)-converts-to-incompatible-function-type
+
+Reported-by: kernel test robot <lkp@intel.com>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Signed-off-by: Cixi Geng <cixi.geng1@unisoc.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/events/core.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/kernel/events/core.c
++++ b/kernel/events/core.c
+@@ -1133,6 +1133,11 @@ static int perf_mux_hrtimer_restart(stru
+ 	return 0;
+ }
+ 
++static int perf_mux_hrtimer_restart_ipi(void *arg)
++{
++	return perf_mux_hrtimer_restart(arg);
++}
++
+ void perf_pmu_disable(struct pmu *pmu)
+ {
+ 	int *count = this_cpu_ptr(pmu->pmu_disable_count);
+@@ -11155,8 +11160,7 @@ perf_event_mux_interval_ms_store(struct
+ 		cpuctx = per_cpu_ptr(pmu->pmu_cpu_context, cpu);
+ 		cpuctx->hrtimer_interval = ns_to_ktime(NSEC_PER_MSEC * timer);
+ 
+-		cpu_function_call(cpu,
+-			(remote_function_f)perf_mux_hrtimer_restart, cpuctx);
++		cpu_function_call(cpu, perf_mux_hrtimer_restart_ipi, cpuctx);
+ 	}
+ 	cpus_read_unlock();
+ 	mutex_unlock(&mux_interval_mutex);
diff --git a/queue-6.1/series b/queue-6.1/series
index 933a41e543c..c2a68a87b87 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -1 +1,2 @@
 io_uring-gate-iowait-schedule-on-having-pending-requests.patch
+perf-fix-function-pointer-case.patch