From 0deaf2ac6bd02c2b595e19778b6d9fcdd19db172 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 4 Aug 2023 12:42:53 +0200 Subject: [PATCH] 5.4-stable patches added patches: perf-fix-function-pointer-case.patch --- .../perf-fix-function-pointer-case.patch | 48 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 49 insertions(+) create mode 100644 queue-5.4/perf-fix-function-pointer-case.patch diff --git a/queue-5.4/perf-fix-function-pointer-case.patch b/queue-5.4/perf-fix-function-pointer-case.patch new file mode 100644 index 00000000000..5c870e7dca0 --- /dev/null +++ b/queue-5.4/perf-fix-function-pointer-case.patch @@ -0,0 +1,48 @@ +From 1af6239d1d3e61d33fd2f0ba53d3d1a67cc50574 Mon Sep 17 00:00:00 2001 +From: Peter Zijlstra +Date: Wed, 16 Nov 2022 22:40:17 +0100 +Subject: perf: Fix function pointer case + +From: Peter Zijlstra + +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 +Signed-off-by: Peter Zijlstra (Intel) +Signed-off-by: Cixi Geng +Signed-off-by: Greg Kroah-Hartman +--- + kernel/events/core.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/kernel/events/core.c ++++ b/kernel/events/core.c +@@ -1134,6 +1134,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); +@@ -9997,8 +10002,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-5.4/series b/queue-5.4/series index 461fb807747..979ecc06783 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -88,3 +88,4 @@ net-sched-sch_qfq-account-for-stab-overhead-in-qfq_enqueue.patch asoc-cs42l51-fix-driver-to-properly-autoload-with-automatic-module-loading.patch arm64-add-ampere1-to-the-spectre-bhb-affected-list.patch arm64-fix-bit-shifting-ub-in-the-midr_cpu_model-macro.patch +perf-fix-function-pointer-case.patch -- 2.47.3