perf: Fix function pointer case
Subsystems (2)
PATCH 1/1 perf: Fix function pointer case
From: Peter Zijlstra <[email protected]>
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
--- kernel/events/core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
kernel/events/core.c +6 -2
@@ -1224,6 +1224,11 @@ static int perf_mux_hrtimer_restart(struct perf_cpu_context *cpuctx)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);
@@ -11137,8 +11142,7 @@ perf_event_mux_interval_ms_store(struct device *dev, 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);
Signature · 1 line
2.34.1
Greg KH
maintainerQuoted 8 lines · Cixi Geng
From: Peter Zijlstra <[email protected]>
commit
1af6239d1d3e61d33fd2f0ba53d3d1a67cc50574upstream. With the advent of CFI it is no longer acceptible to cast function pointers.The robot complains thusly:
Quoted 8 lines
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 <[email protected]>Signed-off-by Peter Zijlstra (Intel) <[email protected]>Signed-off-by Cixi Geng <[email protected]>--- kernel/events/core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
What stable tree(s) is this for?
2023年8月2日 19:47, "Greg KH" <[email protected]> 写到:
Quoted 22 lines · Cixi Geng
Quoted 10 lines
From: Peter Zijlstra <[email protected]>
commit
1af6239d1d3e61d33fd2f0ba53d3d1a67cc50574upstream. With the advent of CFI it is no longer acceptible to cast function pointers.The robot complains thusly:
Quoted 9 lines
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 <[email protected]>Signed-off-by Peter Zijlstra (Intel) <[email protected]>Signed-off-by Cixi Geng <[email protected]>---
kernel/events/core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
Quoted 2 lines
What stable tree(s) is this for?
Hi Greg
I want to apply this patch for linux-5.15-y and linux-6.1-y, the other stable trees not requred for me, thanks!
Greg KH
maintainerQuoted 25 lines · On Thu, Aug 03, 2023 at 01:28:32AM +0000, [email protected] wrote:
2023年8月2日 19:47, "Greg KH" <[email protected]> 写到:
Quoted 22 lines · Cixi Geng
Quoted 19 lines
From: Peter Zijlstra <[email protected]>
commit
1af6239d1d3e61d33fd2f0ba53d3d1a67cc50574upstream. 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 <[email protected]>Signed-off-by Peter Zijlstra (Intel) <[email protected]>Signed-off-by Cixi Geng <[email protected]>---
kernel/events/core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
Quoted 5 lines
Quoted 2 lines
What stable tree(s) is this for?
Hi Greg
I want to apply this patch for linux-5.15-y and linux-6.1-y, the other stable trees not requred for me, thanks!
Now queued up, thanks.
greg k-h