]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
thermal: intel_powerclamp: Use get_cpu() instead of smp_processor_id() to avoid crash
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Tue, 20 Sep 2022 11:06:57 +0000 (04:06 -0700)
committerStefan Bader <stefan.bader@canonical.com>
Thu, 24 Nov 2022 13:24:52 +0000 (14:24 +0100)
BugLink: https://bugs.launchpad.net/bugs/1996825
[ Upstream commit 68b99e94a4a2db6ba9b31fe0485e057b9354a640 ]

When CPU 0 is offline and intel_powerclamp is used to inject
idle, it generates kernel BUG:

BUG: using smp_processor_id() in preemptible [00000000] code: bash/15687
caller is debug_smp_processor_id+0x17/0x20
CPU: 4 PID: 15687 Comm: bash Not tainted 5.19.0-rc7+ #57
Call Trace:
<TASK>
dump_stack_lvl+0x49/0x63
dump_stack+0x10/0x16
check_preemption_disabled+0xdd/0xe0
debug_smp_processor_id+0x17/0x20
powerclamp_set_cur_state+0x7f/0xf9 [intel_powerclamp]
...
...

Here CPU 0 is the control CPU by default and changed to the current CPU,
if CPU 0 offlined. This check has to be performed under cpus_read_lock(),
hence the above warning.

Use get_cpu() instead of smp_processor_id() to avoid this BUG.

Suggested-by: Chen Yu <yu.c.chen@intel.com>
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
[ rjw: Subject edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/thermal/intel/intel_powerclamp.c

index a5b58ea89cc6d7e1bb759f74605088068ce2ca65..9121ae4f5068254a7fdb5fe25a787a3d9782f69b 100644 (file)
@@ -532,8 +532,10 @@ static int start_power_clamp(void)
 
        /* prefer BSP */
        control_cpu = 0;
-       if (!cpu_online(control_cpu))
-               control_cpu = smp_processor_id();
+       if (!cpu_online(control_cpu)) {
+               control_cpu = get_cpu();
+               put_cpu();
+       }
 
        clamping = true;
        schedule_delayed_work(&poll_pkg_cstate_work, 0);