Unverified Commit 57f7c7dc authored by Alexandre Ghiti's avatar Alexandre Ghiti Committed by Palmer Dabbelt
Browse files

drivers: perf: Fix wrong put_cpu() placement 



Unfortunately, the wrong patch version was merged which places the
put_cpu() after enabling a static key, which is not safe as pointed by
Will [1], so move put_cpu() before to avoid this.

Fixes: 2840dadf ("drivers: perf: Fix smp_processor_id() use in preemptible code")
Reported-by: default avatarAtish Patra <atishp@rivosinc.com>
Link: https://lore.kernel.org/all/20240827125335.GD4772@willie-the-truck/

 [1]
Signed-off-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20241112113422.617954-1-alexghiti@rivosinc.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 59b723cd

drivers/perf/riscv_pmu_sbi.c

+2 −2
Original line number Diff line number Diff line
@@ -1393,8 +1393,9 @@ static int pmu_sbi_device_probe(struct platform_device *pdev) 
			goto out_unregister;



		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);
@@ -1408,7 +1409,6 @@ static int pmu_sbi_device_probe(struct platform_device *pdev) 
			 */

			static_branch_enable(&sbi_pmu_snapshot_available);

		}

		put_cpu();

	}



	register_sysctl("kernel", sbi_pmu_sysctl_table);