[PATCH -fixes v2] drivers: perf: Fix smp_processor_id() use in preemptible code

From: Alexandre Ghiti
Date: Thu Aug 29 2024 - 05:00:46 EST


As reported in [1], the use of smp_processor_id() in
pmu_sbi_device_probe() must be protected by disabling the preemption, so
simply use get_cpu()/put_cpu() instead.

Reported-by: Andrea Parri <parri.andrea@xxxxxxxxx>
Reported-by: Nam Cao <namcao@xxxxxxxxxxxxx>
Closes: https://lore.kernel.org/linux-riscv/20240820074925.ReMKUPP3@xxxxxxxxxxxxx/ [1]
Signed-off-by: Alexandre Ghiti <alexghiti@xxxxxxxxxxxx>
---

Changes in v2:
- Do not disable the preemption in static_key_enable() (Will)

drivers/perf/riscv_pmu_sbi.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
index 31a17a56eb3b..febd8e74a72f 100644
--- a/drivers/perf/riscv_pmu_sbi.c
+++ b/drivers/perf/riscv_pmu_sbi.c
@@ -1373,11 +1373,16 @@ static int pmu_sbi_device_probe(struct platform_device *pdev)

/* SBI PMU Snapsphot is only available in SBI v2.0 */
if (sbi_v2_available) {
+ int cpu;
+
ret = pmu_sbi_snapshot_alloc(pmu);
if (ret)
goto out_unregister;

- ret = pmu_sbi_snapshot_setup(pmu, smp_processor_id());
+ cpu = get_cpu();
+ ret = pmu_sbi_snapshot_setup(pmu, cpu);
+ put_cpu();
+
if (ret) {
/* Snapshot is an optional feature. Continue if not available */
pmu_sbi_snapshot_free(pmu);
--
2.39.2