On 2024/7/30 23:07, Thomas Gleixner wrote:
> On Tue, Jul 30 2024 at 22:25, David Wang wrote:
>> When I suspend my system, via `systemctl suspend`, kernel BUG shows up in log:
>>
>> kernel: [ 1734.412974] smpboot: CPU 2 is now offline
>> kernel: [ 1734.414952] BUG: using smp_processor_id() in preemptible [00000000] code: systemd-sleep/4619
>> kernel: [ 1734.414957] caller is hotplug_cpu__broadcast_tick_pull+0x1c/0xc0
>
> The below should fix that.
>
> Thanks,
>
> tglx
> ---
> --- a/kernel/time/tick-broadcast.c
> +++ b/kernel/time/tick-broadcast.c
> @@ -1141,7 +1141,6 @@ void tick_broadcast_switch_to_oneshot(vo
> #ifdef CONFIG_HOTPLUG_CPU
> void hotplug_cpu__broadcast_tick_pull(int deadcpu)
> {
> - struct tick_device *td = this_cpu_ptr(&tick_cpu_device);
> struct clock_event_device *bc;
> unsigned long flags;
>
> @@ -1167,6 +1166,8 @@ void hotplug_cpu__broadcast_tick_pull(in
> * device to avoid the starvation.
> */
> if (tick_check_broadcast_expired()) {
> + struct tick_device *td = this_cpu_ptr(&tick_cpu_device);
> +
> cpumask_clear_cpu(smp_processor_id(), tick_broadcast_force_mask);
> tick_program_event(td->evtdev->next_event, 1);
> }
>
Sorry for causing this issue. I have tested the patch on an x86 machine, this
patch can fix the issue.
Tested-by: Yu Liao <liaoyu15@xxxxxxxxxx>
|