Skip to content

Commit 5a646c3

Browse files
spandruvadagregkh
authored andcommitted
thermal: intel_powerclamp: Use get_cpu() instead of smp_processor_id() to avoid crash
[ Upstream commit 68b99e9 ] 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 <[email protected]> Signed-off-by: Srinivas Pandruvada <[email protected]> [ rjw: Subject edits ] Signed-off-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 49a6ffd commit 5a646c3

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/thermal/intel/intel_powerclamp.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,10 @@ static int start_power_clamp(void)
535535

536536
/* prefer BSP */
537537
control_cpu = 0;
538-
if (!cpu_online(control_cpu))
539-
control_cpu = smp_processor_id();
538+
if (!cpu_online(control_cpu)) {
539+
control_cpu = get_cpu();
540+
put_cpu();
541+
}
540542

541543
clamping = true;
542544
schedule_delayed_work(&poll_pkg_cstate_work, 0);

0 commit comments

Comments
 (0)