time/tick-broadcast: Fix tick_broadcast_offline() lockdep complaint
Subsystems (2)
PATCH 1/1 time/tick-broadcast: Fix tick_broadcast_offline() lockdep complaint
The TASKS03 and TREE04 rcutorture scenarios produce the following lockdep complaint:
================================
WARNING: inconsistent lock state
5.2.0-rc1+ #513 Not tainted
--------------------------------
inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage.
migration/1/14 [HC0[0]:SC0[0]:HE1:SE1] takes:
(____ptrval____) (tick_broadcast_lock){?...}, at: tick_broadcast_offline+0xf/0x70 {IN-HARDIRQ-W} state was registered at:
lock_acquire+0xb0/0x1c0 _raw_spin_lock_irqsave+0x3c/0x50 tick_broadcast_switch_to_oneshot+0xd/0x40 tick_switch_to_oneshot+0x4f/0xd0 hrtimer_run_queues+0xf3/0x130 run_local_timers+0x1c/0x50 update_process_times+0x1c/0x50 tick_periodic+0x26/0xc0 tick_handle_periodic+0x1a/0x60 smp_apic_timer_interrupt+0x80/0x2a0 apic_timer_interrupt+0xf/0x20 _raw_spin_unlock_irqrestore+0x4e/0x60 rcu_nocb_gp_kthread+0x15d/0x590 kthread+0xf3/0x130 ret_from_fork+0x3a/0x50 irq event stamp: 171 hardirqs last enabled at (171): [<ffffffff8a201a37>] trace_hardirqs_on_thunk+0x1a/0x1c hardirqs last disabled at (170): [<ffffffff8a201a53>] trace_hardirqs_off_thunk+0x1a/0x1c softirqs last enabled at (0): [<ffffffff8a264ee0>] copy_process.part.56+0x650/0x1cb0 softirqs last disabled at (0): [<0000000000000000>] 0x0
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
----
lock(tick_broadcast_lock);
<Interrupt>
lock(tick_broadcast_lock);*** DEADLOCK ***
1 lock held by migration/1/14:
#0: (____ptrval____) (clockevents_lock){+.+.}, at: tick_offline_cpu+0xf/0x30
stack backtrace: CPU: 1 PID: 14 Comm: migration/1 Not tainted 5.2.0-rc1+ #513 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS Bochs 01/01/2011 Call Trace: dump_stack+0x5e/0x8b print_usage_bug+0x1fc/0x216 ? print_shortest_lock_dependencies+0x1b0/0x1b0 mark_lock+0x1f2/0x280 __lock_acquire+0x1e0/0x18f0 ? __lock_acquire+0x21b/0x18f0 ? _raw_spin_unlock_irqrestore+0x4e/0x60 lock_acquire+0xb0/0x1c0 ? tick_broadcast_offline+0xf/0x70 _raw_spin_lock+0x33/0x40 ? tick_broadcast_offline+0xf/0x70 tick_broadcast_offline+0xf/0x70 tick_offline_cpu+0x16/0x30 take_cpu_down+0x7d/0xa0 multi_cpu_stop+0xa2/0xe0 ? cpu_stop_queue_work+0xc0/0xc0 cpu_stopper_thread+0x6d/0x100 smpboot_thread_fn+0x169/0x240 kthread+0xf3/0x130 ? sort_range+0x20/0x20 ? kthread_cancel_delayed_work_sync+0x10/0x10 ret_from_fork+0x3a/0x50
It turns out that tick_broadcast_offline() can be invoked with interrupts enabled, so this commit fixes this issue by replacing the raw_spin_lock() with raw_spin_lock_irqsave().
kernel/time/tick-broadcast.c +4 -2
@@ -454,12 +454,14 @@ static void tick_shutdown_broadcast(void)*/ void tick_broadcast_offline (unsigned int cpu) { -raw_spin_lock (&tick_broadcast_lock); +unsigned long flags; + +raw_spin_lock_irqsave (&tick_broadcast_lock, flags);cpumask_clear_cpu (cpu, tick_broadcast_mask);cpumask_clear_cpu (cpu, tick_broadcast_on);tick_broadcast_oneshot_offline (cpu);tick_shutdown_broadcast (); -raw_spin_unlock (&tick_broadcast_lock); +raw_spin_unlock_irqrestore (&tick_broadcast_lock, flags); }#endif
Quoted 73 lines · Paul E. McKenney
The TASKS03 and TREE04 rcutorture scenarios produce the following lockdep complaint:
================================
WARNING: inconsistent lock state
5.2.0-rc1+ #513 Not tainted
--------------------------------
inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage.
migration/1/14 [HC0[0]:SC0[0]:HE1:SE1] takes:
(____ptrval____) (tick_broadcast_lock){?...}, at:tick_broadcast_offline+0xf/0x70{IN-HARDIRQ-W} state was registered at:lock_acquire+0xb0/0x1c0 _raw_spin_lock_irqsave+0x3c/0x50 tick_broadcast_switch_to_oneshot+0xd/0x40 tick_switch_to_oneshot+0x4f/0xd0 hrtimer_run_queues+0xf3/0x130 run_local_timers+0x1c/0x50 update_process_times+0x1c/0x50 tick_periodic+0x26/0xc0 tick_handle_periodic+0x1a/0x60 smp_apic_timer_interrupt+0x80/0x2a0 apic_timer_interrupt+0xf/0x20 _raw_spin_unlock_irqrestore+0x4e/0x60 rcu_nocb_gp_kthread+0x15d/0x590 kthread+0xf3/0x130 ret_from_fork+0x3a/0x50 irq event stamp: 171 hardirqs last enabled at (171): [<ffffffff8a201a37>] trace_hardirqs_on_thunk+0x1a/0x1c hardirqs last disabled at (170): [<ffffffff8a201a53>] trace_hardirqs_off_thunk+0x1a/0x1c softirqs last enabled at (0): [<ffffffff8a264ee0>] copy_process.part.56+0x650/0x1cb0 softirqs last disabled at (0): [<0000000000000000>] 0x0other info that might help us debug this:
Possible unsafe locking scenario:CPU0 ---- lock(tick_broadcast_lock); <Interrupt> lock(tick_broadcast_lock);*** DEADLOCK ***
1 lock held by migration/1/14:
#0: (____ptrval____) (clockevents_lock){+.+.}, at:tick_offline_cpu+0xf/0x30stack backtrace: CPU: 1 PID: 14 Comm: migration/1 Not tainted 5.2.0-rc1+ #513 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS Bochs 01/01/2011 Call Trace: dump_stack+0x5e/0x8b print_usage_bug+0x1fc/0x216 ? print_shortest_lock_dependencies+0x1b0/0x1b0 mark_lock+0x1f2/0x280 __lock_acquire+0x1e0/0x18f0 ? __lock_acquire+0x21b/0x18f0 ? _raw_spin_unlock_irqrestore+0x4e/0x60 lock_acquire+0xb0/0x1c0 ? tick_broadcast_offline+0xf/0x70 _raw_spin_lock+0x33/0x40 ? tick_broadcast_offline+0xf/0x70 tick_broadcast_offline+0xf/0x70 tick_offline_cpu+0x16/0x30 take_cpu_down+0x7d/0xa0 multi_cpu_stop+0xa2/0xe0 ? cpu_stop_queue_work+0xc0/0xc0 cpu_stopper_thread+0x6d/0x100 smpboot_thread_fn+0x169/0x240 kthread+0xf3/0x130 ? sort_range+0x20/0x20 ? kthread_cancel_delayed_work_sync+0x10/0x10 ret_from_fork+0x3a/0x50
Quoted 3 lines
It turns out that
tick_broadcast_offline()can be invoked with interrupts enabled, so this commit fixes this issue by replacing theraw_spin_lock()withraw_spin_lock_irqsave().
What?
take_cpu_down() is called from multi_cpu_stop() with interrupts disabled.
So this is just papering over the fact that something called from take_cpu_down() enabled interrupts. That needs to be found and fixed.
Thanks,
tglx
Quoted 79 lines · Thomas Gleixner
Quoted 73 lines · Paul E. McKenney
The TASKS03 and TREE04 rcutorture scenarios produce the following lockdep complaint:
================================
WARNING: inconsistent lock state
5.2.0-rc1+ #513 Not tainted
--------------------------------
inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage.
migration/1/14 [HC0[0]:SC0[0]:HE1:SE1] takes:
(____ptrval____) (tick_broadcast_lock){?...}, at:tick_broadcast_offline+0xf/0x70{IN-HARDIRQ-W} state was registered at:lock_acquire+0xb0/0x1c0 _raw_spin_lock_irqsave+0x3c/0x50 tick_broadcast_switch_to_oneshot+0xd/0x40 tick_switch_to_oneshot+0x4f/0xd0 hrtimer_run_queues+0xf3/0x130 run_local_timers+0x1c/0x50 update_process_times+0x1c/0x50 tick_periodic+0x26/0xc0 tick_handle_periodic+0x1a/0x60 smp_apic_timer_interrupt+0x80/0x2a0 apic_timer_interrupt+0xf/0x20 _raw_spin_unlock_irqrestore+0x4e/0x60 rcu_nocb_gp_kthread+0x15d/0x590 kthread+0xf3/0x130 ret_from_fork+0x3a/0x50 irq event stamp: 171 hardirqs last enabled at (171): [<ffffffff8a201a37>] trace_hardirqs_on_thunk+0x1a/0x1c hardirqs last disabled at (170): [<ffffffff8a201a53>] trace_hardirqs_off_thunk+0x1a/0x1c softirqs last enabled at (0): [<ffffffff8a264ee0>] copy_process.part.56+0x650/0x1cb0 softirqs last disabled at (0): [<0000000000000000>] 0x0other info that might help us debug this:
Possible unsafe locking scenario:CPU0 ---- lock(tick_broadcast_lock); <Interrupt> lock(tick_broadcast_lock);*** DEADLOCK ***
1 lock held by migration/1/14:
#0: (____ptrval____) (clockevents_lock){+.+.}, at:tick_offline_cpu+0xf/0x30stack backtrace: CPU: 1 PID: 14 Comm: migration/1 Not tainted 5.2.0-rc1+ #513 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS Bochs 01/01/2011 Call Trace: dump_stack+0x5e/0x8b print_usage_bug+0x1fc/0x216 ? print_shortest_lock_dependencies+0x1b0/0x1b0 mark_lock+0x1f2/0x280 __lock_acquire+0x1e0/0x18f0 ? __lock_acquire+0x21b/0x18f0 ? _raw_spin_unlock_irqrestore+0x4e/0x60 lock_acquire+0xb0/0x1c0 ? tick_broadcast_offline+0xf/0x70 _raw_spin_lock+0x33/0x40 ? tick_broadcast_offline+0xf/0x70 tick_broadcast_offline+0xf/0x70 tick_offline_cpu+0x16/0x30 take_cpu_down+0x7d/0xa0 multi_cpu_stop+0xa2/0xe0 ? cpu_stop_queue_work+0xc0/0xc0 cpu_stopper_thread+0x6d/0x100 smpboot_thread_fn+0x169/0x240 kthread+0xf3/0x130 ? sort_range+0x20/0x20 ? kthread_cancel_delayed_work_sync+0x10/0x10 ret_from_fork+0x3a/0x50Quoted 3 lines
It turns out that
tick_broadcast_offline()can be invoked with interrupts enabled, so this commit fixes this issue by replacing theraw_spin_lock()withraw_spin_lock_irqsave().
Quoted 6 lines
What?
take_cpu_down()is called frommulti_cpu_stop()with interrupts disabled.So this is just papering over the fact that something called from
take_cpu_down()enabled interrupts. That needs to be found and fixed.
Just posting the information covered via IRC for posterity.
A bisection located commit a0e928ed7c60
("Merge branch 'timers-core-for-linus' ofgit://git.kernel.org/pub/scm/linux/kernel/git/tip/tip").
Yes, this is a merge commit, but both commits feeding into it are fine, but the merge fails. There were no merge conflicts.
It turns out that tick_broadcast_offline() was in innocent bystander. After all, interrupts are supposed to be disabled throughout take_cpu_down(), and therefore should have been disabled upon entry to tick_offline_cpu() and thus to tick_broadcast_offline().
The function returning with irqs enabled was sched_cpu_dying(). It had irqs enabled after return from sched_tick_stop(). And it had irqs enabled after return from cancel_delayed_work_sync(). Which is a wrapper around __cancel_work_timer(). Which can sleep in the case where something else is concurrently trying to cancel the same delayed work, and sleeping is a decidedly bad idea when you are invoked from take_cpu_down().
None of these functions have been changed (at all!) in the past year, so my guess is that some other code was introduced that can race on __cancel_work_timer(). Except that I am not seeing any other call to cancel_delayed_work_sync().
Thoughts?
Thanx, Paul
Quoted 1 line · Paul E. McKenney
On Tue, May 28, 2019 at 01:07:29PM -0700, Thomas Gleixner wrote:
[ . . . ]
Quoted 27 lines
Quoted 6 lines
What?
take_cpu_down()is called frommulti_cpu_stop()with interrupts disabled.So this is just papering over the fact that something called from
take_cpu_down()enabled interrupts. That needs to be found and fixed.Just posting the information covered via IRC for posterity.
A bisection located commit
a0e928ed7c60
("Merge branch 'timers-core-for-linus' ofgit://git.kernel.org/pub/scm/linux/kernel/git/tip/tip").
Yes, this is a merge commit, but both commits feeding into it are fine, but the merge fails. There were no merge conflicts.It turns out that
tick_broadcast_offline()was in innocent bystander. After all, interrupts are supposed to be disabled throughouttake_cpu_down(), and therefore should have been disabled upon entry totick_offline_cpu()and thus totick_broadcast_offline().The function returning with irqs enabled was
sched_cpu_dying(). It had irqs enabled after return fromsched_tick_stop(). And it had irqs enabled after return fromcancel_delayed_work_sync(). Which is a wrapper around__cancel_work_timer(). Which can sleep in the case where something else is concurrently trying to cancel the same delayed work, and sleeping is a decidedly bad idea when you are invoked fromtake_cpu_down().
Quoted 4 lines
None of these functions have been changed (at all!) in the past year, so my guess is that some other code was introduced that can race on
__cancel_work_timer(). Except that I am not seeing any other call tocancel_delayed_work_sync().
And please see below for what might even be a proper patch.
Thoughts?
Thanx, Paul
------------------------------------------------------------------------
commit 82801a716abf999d33846600a5d0faf7638a9b98
Author: Paul E. McKenney <[email protected]> Date: Thu May 30 05:39:25 2019 -0700
time/tick-broadcast: Fix tick_broadcast_offline() lockdep complaint
The TASKS03 and TREE04 rcutorture scenarios produce the following
lockdep complaint:
------------------------------------------------------------------------
================================
WARNING: inconsistent lock state
5.2.0-rc1+ #513 Not tainted
--------------------------------
inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage.
migration/1/14 [HC0[0]:SC0[0]:HE1:SE1] takes:
(____ptrval____) (tick_broadcast_lock){?...}, at: tick_broadcast_offline+0xf/0x70
{IN-HARDIRQ-W} state was registered at:
lock_acquire+0xb0/0x1c0
_raw_spin_lock_irqsave+0x3c/0x50
tick_broadcast_switch_to_oneshot+0xd/0x40
tick_switch_to_oneshot+0x4f/0xd0
hrtimer_run_queues+0xf3/0x130
run_local_timers+0x1c/0x50
update_process_times+0x1c/0x50
tick_periodic+0x26/0xc0
tick_handle_periodic+0x1a/0x60
smp_apic_timer_interrupt+0x80/0x2a0
apic_timer_interrupt+0xf/0x20
_raw_spin_unlock_irqrestore+0x4e/0x60
rcu_nocb_gp_kthread+0x15d/0x590
kthread+0xf3/0x130
ret_from_fork+0x3a/0x50
irq event stamp: 171
hardirqs last enabled at (171): [<ffffffff8a201a37>] trace_hardirqs_on_thunk+0x1a/0x1c
hardirqs last disabled at (170): [<ffffffff8a201a53>] trace_hardirqs_off_thunk+0x1a/0x1c
softirqs last enabled at (0): [<ffffffff8a264ee0>] copy_process.part.56+0x650/0x1cb0
softirqs last disabled at (0): [<0000000000000000>] 0x0
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
----
lock(tick_broadcast_lock);
<Interrupt>
lock(tick_broadcast_lock);
*** DEADLOCK ***
1 lock held by migration/1/14:
#0: (____ptrval____) (clockevents_lock){+.+.}, at: tick_offline_cpu+0xf/0x30
stack backtrace:
CPU: 1 PID: 14 Comm: migration/1 Not tainted 5.2.0-rc1+ #513
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS Bochs 01/01/2011
Call Trace:
dump_stack+0x5e/0x8b
print_usage_bug+0x1fc/0x216
? print_shortest_lock_dependencies+0x1b0/0x1b0
mark_lock+0x1f2/0x280
__lock_acquire+0x1e0/0x18f0
? __lock_acquire+0x21b/0x18f0
? _raw_spin_unlock_irqrestore+0x4e/0x60
lock_acquire+0xb0/0x1c0
? tick_broadcast_offline+0xf/0x70
_raw_spin_lock+0x33/0x40
? tick_broadcast_offline+0xf/0x70
tick_broadcast_offline+0xf/0x70
tick_offline_cpu+0x16/0x30
take_cpu_down+0x7d/0xa0
multi_cpu_stop+0xa2/0xe0
? cpu_stop_queue_work+0xc0/0xc0
cpu_stopper_thread+0x6d/0x100
smpboot_thread_fn+0x169/0x240
kthread+0xf3/0x130
? sort_range+0x20/0x20
? kthread_cancel_delayed_work_sync+0x10/0x10
ret_from_fork+0x3a/0x50
------------------------------------------------------------------------
To reproduce, run the following rcutorture test:
tools/testing/selftests/rcutorture/bin/kvm.sh --duration 5 --kconfig "CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=y" --configs "TASKS03 TREE04"
It turns out that tick_broadcast_offline() was an innocent bystander.
After all, interrupts are supposed to be disabled throughout
take_cpu_down(), and therefore should have been disabled upon entry to
tick_offline_cpu() and thus to tick_broadcast_offline(). This suggests
that one of the CPU-hotplug notifiers was incorrectly enabling interrupts,
and leaving them enabled on return.
Some debugging code showed that the culprit was sched_cpu_dying().
It had irqs enabled after return from sched_tick_stop(). Which in turn
had irqs enabled after return from cancel_delayed_work_sync(). Which is a
wrapper around __cancel_work_timer(). Which can sleep in the case where
something else is concurrently trying to cancel the same delayed work,
and as Thomas Gleixner pointed out on IRC, sleeping is a decidedly bad
idea when you are invoked from take_cpu_down(), regardless of the state
you leave interrupts in upon return.
Code inspection located no reason why the delayed work absolutely
needed to be canceled from sched_tick_stop(): The work is not
bound to the outgoing CPU by design, given that the whole point is
to collect statistics without disturbing the outgoing CPU.
This commit therefore simply drops the cancel_delayed_work_sync() from
sched_tick_stop(). Instead, a new ->state field is added to the tick_work
structure so that the delayed-work handler function sched_tick_remote()
can avoid reposting itself. A cpu_is_offline() check is also added to
sched_tick_remote() to avoid mucking with the state of an offlined CPU
(though it does appear safe to do so). The sched_tick_start() and
sched_tick_stop() functions also update ->state, and sched_tick_start()
also schedules the delayed work if ->state indicates that it is not
already in flight.
Signed-off-by: Paul E. McKenney <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Peter Zijlstra <[email protected]>kernel/sched/core.c +61 -7
@@ -3050,14 +3050,44 @@ void scheduler_tick(void)struct tick_work {int cpu; +int state;struct delayed_work work; }; +// Values for ->state, see diagram below. +#define TICK_SCHED_REMOTE_IDLE 0 +#define TICK_SCHED_REMOTE_RUNNING 1 +#define TICK_SCHED_REMOTE_OFFLINING 2 + +// State diagram for ->state: +// +// +// +----->IDLE-----------------------------+ +// | | +// | | +// | | sched_tick_start() +// | sched_tick_remote() | +// | | +// | V +// | +---------->RUNNING +// | | | +// | | | +// | | | +// | sched_tick_start() | | sched_tick_stop() +// | | | +// | | | +// | | | +// +--------------------OFFLINING<---------+ +// +// +// Other transitions get WARN_ON_ONCE(), except that sched_tick_remote() +// and sched_tick_start() are happy to leave the state in RUNNING. static struct tick_work __percpu *tick_work_cpu;static void sched_tick_remote (struct work_struct *work) {struct delayed_work *dwork =to_delayed_work (work); +int os; struct tick_work *twork = container_of(dwork, struct tick_work, work);int cpu = twork->cpu;struct rq *rq =cpu_rq (cpu);
@@ -3077,7 +3107,7 @@ static void sched_tick_remote(struct work_struct *work)rq_lock_irq (rq, &rf); curr = rq->curr; -if (is_idle_task (curr)) +if (is_idle_task (curr) ||cpu_is_offline (cpu)) goto out_unlock;update_rq_clock (rq);
@@ -3097,13 +3127,22 @@ static void sched_tick_remote(struct work_struct *work)/* * Run the remote tick once per second (1Hz). This arbitrary * frequency is large enough to avoid overload but short enough -* to keep scheduler internal stats reasonably up to date. +* to keep scheduler internal stats reasonably up to date. But +* first update state to reflect hotplug activity if required. */ -queue_delayed_work (system_unbound_wq, dwork,HZ ); +do { + os =READ_ONCE (twork->state); +WARN_ON_ONCE (os ==TICK_SCHED_REMOTE_IDLE ); +if (os ==TICK_SCHED_REMOTE_RUNNING ) +break ; + }while (cmpxchg (&twork->state, os,TICK_SCHED_REMOTE_IDLE ) != os); +if (os ==TICK_SCHED_REMOTE_RUNNING ) +queue_delayed_work (system_unbound_wq, dwork,HZ ); }static void sched_tick_start (int cpu) { +int os;struct tick_work *twork;if (housekeeping_cpu (cpu,HK_FLAG_TICK ))
@@ -3112,14 +3151,23 @@ static void sched_tick_start(int cpu)WARN_ON_ONCE (!tick_work_cpu); twork =per_cpu_ptr (tick_work_cpu, cpu); - twork->cpu = cpu; -INIT_DELAYED_WORK (&twork->work, sched_tick_remote); -queue_delayed_work (system_unbound_wq, &twork->work,HZ ); +do { + os =READ_ONCE (twork->state); +if (os ==TICK_SCHED_REMOTE_RUNNING ) +break ; +// Either idle or offline for a short period + }while (cmpxchg (&twork->state, os,TICK_SCHED_REMOTE_RUNNING ) != os); +if (os ==TICK_SCHED_REMOTE_IDLE ) { + twork->cpu = cpu; +INIT_DELAYED_WORK (&twork->work, sched_tick_remote); +queue_delayed_work (system_unbound_wq, &twork->work,HZ ); + } }#ifdef CONFIG_HOTPLUG_CPU static void sched_tick_stop (int cpu) { +int os;struct tick_work *twork;if (housekeeping_cpu (cpu,HK_FLAG_TICK ))
@@ -3128,7 +3176,13 @@ static void sched_tick_stop(int cpu)WARN_ON_ONCE (!tick_work_cpu); twork =per_cpu_ptr (tick_work_cpu, cpu); - cancel_delayed_work_sync(&twork->work); +// There cannot be competing actions, but don't rely on stop_machine. +do { + os =READ_ONCE (twork->state); +WARN_ON_ONCE (os !=TICK_SCHED_REMOTE_RUNNING ); +// Either idle or offline for a short period + }while (cmpxchg (&twork->state, os,TICK_SCHED_REMOTE_OFFLINING ) != os); + // Don't cancel, as this would mess up the state machine. }#endif /* CONFIG_HOTPLUG_CPU */
Quoted 7 lines · Paul E. McKenney
It turns out that
tick_broadcast_offline()was an innocent bystander. After all, interrupts are supposed to be disabled throughouttake_cpu_down(), and therefore should have been disabled upon entry totick_offline_cpu()and thus totick_broadcast_offline(). This suggests that one of the CPU-hotplug notifiers was incorrectly enabling interrupts, and leaving them enabled on return.
Quoted 8 lines
Some debugging code showed that the culprit was
sched_cpu_dying(). It had irqs enabled after return fromsched_tick_stop(). Which in turn had irqs enabled after return fromcancel_delayed_work_sync(). Which is a wrapper around__cancel_work_timer(). Which can sleep in the case where something else is concurrently trying to cancel the same delayed work, and as Thomas Gleixner pointed out on IRC, sleeping is a decidedly bad idea when you are invoked fromtake_cpu_down(), regardless of the state you leave interrupts in upon return.
Nice catch! Sorry for leaving that puzzle behind.
Quoted 6 lines
Code inspection located no reason why the delayed work absolutely needed to be canceled from
sched_tick_stop(): The work is not bound to the outgoing CPU by design, given that the whole point is to collect statistics without disturbing the outgoing CPU.
Quoted 6 lines
This commit therefore simply drops the
cancel_delayed_work_sync()fromsched_tick_stop(). Instead, a new ->state field is added to thetick_workstructure so that the delayed-work handler functionsched_tick_remote()can avoid reposting itself. Acpu_is_offline()check is also added tosched_tick_remote()to avoid mucking with the state of an offlined CPU (though it does appear safe to do so).
I can't guarantee that it is safe myself to call the tick of an offline CPU. Better have that check indeed.
kernel/sched/core.c void scheduler_tick(void) · line 3057
Quoted 13 lines
kernel/sched/core.c +3
-0@@ -3050,14 +3050,44 @@ void scheduler_tick(void)struct tick_work {int cpu; +int state;struct delayed_work work; }; +// Values for ->state, see diagram below. +#define TICK_SCHED_REMOTE_IDLE 0
So it took me some time to understand that the IDLE state is the tick work that ackowledged OFFLINING and finally completes the offline process. Therefore perhaps we can rename it to TICK_SCHED_REMOTE_OFFLINE so that we instantly get the state machine scenario.
Quoted 37 lines
kernel/sched/core.c +27
-0+#define TICK_SCHED_REMOTE_RUNNING 1 +#define TICK_SCHED_REMOTE_OFFLINING 2 + +// State diagram for ->state: +// +// +// +----->IDLE-----------------------------+ +// | | +// | | +// | | sched_tick_start() +// | sched_tick_remote() | +// | | +// | V +// | +---------->RUNNING +// | | | +// | | | +// | | | +// | sched_tick_start() | | sched_tick_stop() +// | | | +// | | | +// | | | +// +--------------------OFFLINING<---------+ +// +// +// Other transitions get WARN_ON_ONCE(), except that sched_tick_remote() +// and sched_tick_start() are happy to leave the state in RUNNING. static struct tick_work __percpu *tick_work_cpu;static void sched_tick_remote (struct work_struct *work) {struct delayed_work *dwork =to_delayed_work (work); +int os; struct tick_work *twork = container_of(dwork, struct tick_work, work);int cpu = twork->cpu;struct rq *rq =cpu_rq (cpu);
kernel/sched/core.c static void sched_tick_remote(struct work_struct *work) · line 3110
Quoted 5 lines
kernel/sched/core.c +1
-1@@ -3077,7 +3107,7 @@ static void sched_tick_remote(struct work_struct *work)rq_lock_irq (rq, &rf); curr = rq->curr; -if (is_idle_task (curr)) +if (is_idle_task (curr) ||cpu_is_offline (cpu))
Or we could simply check rq->online, while we have rq locked.
Quoted 29 lines
kernel/sched/core.c +11
-2goto out_unlock;update_rq_clock (rq);@@ -3097,13 +3127,22 @@ static void sched_tick_remote(struct work_struct *work)/* * Run the remote tick once per second (1Hz). This arbitrary * frequency is large enough to avoid overload but short enough -* to keep scheduler internal stats reasonably up to date. +* to keep scheduler internal stats reasonably up to date. But +* first update state to reflect hotplug activity if required. */ -queue_delayed_work (system_unbound_wq, dwork,HZ ); +do { + os =READ_ONCE (twork->state); +WARN_ON_ONCE (os ==TICK_SCHED_REMOTE_IDLE ); +if (os ==TICK_SCHED_REMOTE_RUNNING ) +break ; + }while (cmpxchg (&twork->state, os,TICK_SCHED_REMOTE_IDLE ) != os); +if (os ==TICK_SCHED_REMOTE_RUNNING ) +queue_delayed_work (system_unbound_wq, dwork,HZ ); }static void sched_tick_start (int cpu) { +int os;struct tick_work *twork;if (housekeeping_cpu (cpu,HK_FLAG_TICK ))
kernel/sched/core.c static void sched_tick_start(int cpu) · line 3156
Quoted 9 lines
kernel/sched/core.c +3
-3@@ -3112,14 +3151,23 @@ static void sched_tick_start(int cpu)WARN_ON_ONCE (!tick_work_cpu); twork =per_cpu_ptr (tick_work_cpu, cpu); - twork->cpu = cpu; -INIT_DELAYED_WORK (&twork->work, sched_tick_remote); -queue_delayed_work (system_unbound_wq, &twork->work,HZ ); + do { + os = READ_ONCE(twork->state); + if (os == TICK_SCHED_REMOTE_RUNNING)
Is it possible to have RUNNING at this stage? sched_tick_start() shouldn't be called twice without a sched_tick_stop() in the middle.
In which case we should even warn if we meet that value here.
Quoted 21 lines
kernel/sched/core.c +9
-0+break ; +// Either idle or offline for a short period + }while (cmpxchg (&twork->state, os,TICK_SCHED_REMOTE_RUNNING ) != os); +if (os ==TICK_SCHED_REMOTE_IDLE ) { + twork->cpu = cpu; +INIT_DELAYED_WORK (&twork->work, sched_tick_remote); +queue_delayed_work (system_unbound_wq, &twork->work,HZ ); + } }#ifdef CONFIG_HOTPLUG_CPU static void sched_tick_stop (int cpu) { +int os;struct tick_work *twork;if (housekeeping_cpu (cpu,HK_FLAG_TICK ))@@ -3128,7 +3176,13 @@ static void sched_tick_stop(int cpu)WARN_ON_ONCE (!tick_work_cpu); twork =per_cpu_ptr (tick_work_cpu, cpu);
kernel/sched/core.c static void sched_tick_stop(int cpu) · line 3187
Quoted 10 lines
kernel/sched/core.c +7
-1- cancel_delayed_work_sync(&twork->work); +// There cannot be competing actions, but don't rely on stop_machine. +do { + os =READ_ONCE (twork->state); +WARN_ON_ONCE (os !=TICK_SCHED_REMOTE_RUNNING ); +// Either idle or offline for a short period + }while (cmpxchg (&twork->state, os,TICK_SCHED_REMOTE_OFFLINING ) != os); + // Don't cancel, as this would mess up the state machine. }#endif /* CONFIG_HOTPLUG_CPU */
I ran the state machine for a few hours inside my head through FWEISBEC_TORTURE and I see no error message. Which is of course not a guarantee of anything but:
Also, I believe that /* */ is the preferred comment style, FWIW ;-)
Paul E. McKenney
AppliedQuoted 17 lines · Frederic Weisbecker
Quoted 7 lines · Paul E. McKenney
It turns out that
tick_broadcast_offline()was an innocent bystander. After all, interrupts are supposed to be disabled throughouttake_cpu_down(), and therefore should have been disabled upon entry totick_offline_cpu()and thus totick_broadcast_offline(). This suggests that one of the CPU-hotplug notifiers was incorrectly enabling interrupts, and leaving them enabled on return.Quoted 8 lines
Some debugging code showed that the culprit was
sched_cpu_dying(). It had irqs enabled after return fromsched_tick_stop(). Which in turn had irqs enabled after return fromcancel_delayed_work_sync(). Which is a wrapper around__cancel_work_timer(). Which can sleep in the case where something else is concurrently trying to cancel the same delayed work, and as Thomas Gleixner pointed out on IRC, sleeping is a decidedly bad idea when you are invoked fromtake_cpu_down(), regardless of the state you leave interrupts in upon return.
Quoted 1 line
Nice catch! Sorry for leaving that puzzle behind.
Heh! I needed the break from trying to make RCU do unnatural acts. ;-)
Quoted 12 lines
Quoted 11 lines
Code inspection located no reason why the delayed work absolutely needed to be canceled from
sched_tick_stop(): The work is not bound to the outgoing CPU by design, given that the whole point is to collect statistics without disturbing the outgoing CPU.This commit therefore simply drops the
cancel_delayed_work_sync()fromsched_tick_stop(). Instead, a new ->state field is added to thetick_workstructure so that the delayed-work handler functionsched_tick_remote()can avoid reposting itself. Acpu_is_offline()check is also added tosched_tick_remote()to avoid mucking with the state of an offlined CPU (though it does appear safe to do so).
Quoted 2 lines
I can't guarantee that it is safe myself to call the tick of an offline CPU. Better have that check indeed.
No argument, especially given that this preserved the current behavior exactly.
But it looked to me that all of the code was running on some other online CPU and was accessing data that would be left around in good state on the offline CPU. And the current behavior won't account for activity just prior to the CPU going offline until it comes back online (right?), so there might be some incentive to let the last call to sched_tick_remote() do the accounting. Might not be a big deal, though.
Quoted 6 lines
Quoted 6 lines
kernel/sched/core.c +0
-0@@ -3050,14 +3050,44 @@ void scheduler_tick(void)
Quoted 13 lines
kernel/sched/core.c void scheduler_tick(void) · line 3057
Quoted 7 lines
kernel/sched/core.c +3
-0struct tick_work {int cpu; +int state;struct delayed_work work; }; +// Values for ->state, see diagram below. +#define TICK_SCHED_REMOTE_IDLE 0So it took me some time to understand that the IDLE state is the tick work that ackowledged OFFLINING and finally completes the offline process. Therefore perhaps we can rename it to
TICK_SCHED_REMOTE_OFFLINEso that we instantly get the state machine scenario.
Good point, your name is much better. Updated.
Quoted 38 lines
Quoted 38 lines
kernel/sched/core.c +27
-0+#define TICK_SCHED_REMOTE_RUNNING 1 +#define TICK_SCHED_REMOTE_OFFLINING 2 + +// State diagram for ->state: +// +// +// +----->IDLE-----------------------------+ +// | | +// | | +// | | sched_tick_start() +// | sched_tick_remote() | +// | | +// | V +// | +---------->RUNNING +// | | | +// | | | +// | | | +// | sched_tick_start() | | sched_tick_stop() +// | | | +// | | | +// | | | +// +--------------------OFFLINING<---------+ +// +// +// Other transitions get WARN_ON_ONCE(), except that sched_tick_remote() +// and sched_tick_start() are happy to leave the state in RUNNING. static struct tick_work __percpu *tick_work_cpu;static void sched_tick_remote (struct work_struct *work) {struct delayed_work *dwork =to_delayed_work (work); +int os; struct tick_work *twork = container_of(dwork, struct tick_work, work);int cpu = twork->cpu;struct rq *rq =cpu_rq (cpu);@@ -3077,7 +3107,7 @@ static void sched_tick_remote(struct work_struct *work)
Quoted 6 lines
kernel/sched/core.c static void sched_tick_remote(struct work_struct *work) · line 3110
Quoted 4 lines
kernel/sched/core.c +1
-1rq_lock_irq (rq, &rf); curr = rq->curr; -if (is_idle_task (curr)) +if (is_idle_task (curr) ||cpu_is_offline (cpu))Or we could simply check
rq->online, while we have rq locked.
Which would have better cache locality as well.
Let's see... This is cleared from the same sched_cpu_dying() that invokes sched_tick_stop(), so that works. Where is it set? In set_rq_online(), of course, which is invoked from sched_cpu_activate() which is assigned to .startup.single, which sadly not the CPU-online counterpart to sched_cpu_dying(). This would result in the workqueue being started quite some time before its handler would allow itself to sample the state, and would also thus be a deviation from earlier behavior.
In the immortal words of MS-DOS, "Are you sure?"
Quoted 42 lines
Quoted 29 lines
kernel/sched/core.c +11
-2goto out_unlock;update_rq_clock (rq);@@ -3097,13 +3127,22 @@ static void sched_tick_remote(struct work_struct *work)/* * Run the remote tick once per second (1Hz). This arbitrary * frequency is large enough to avoid overload but short enough -* to keep scheduler internal stats reasonably up to date. +* to keep scheduler internal stats reasonably up to date. But +* first update state to reflect hotplug activity if required. */ -queue_delayed_work (system_unbound_wq, dwork,HZ ); +do { + os =READ_ONCE (twork->state); +WARN_ON_ONCE (os ==TICK_SCHED_REMOTE_IDLE ); +if (os ==TICK_SCHED_REMOTE_RUNNING ) +break ; + }while (cmpxchg (&twork->state, os,TICK_SCHED_REMOTE_IDLE ) != os); +if (os ==TICK_SCHED_REMOTE_RUNNING ) +queue_delayed_work (system_unbound_wq, dwork,HZ ); }static void sched_tick_start (int cpu) { +int os;struct tick_work *twork;if (housekeeping_cpu (cpu,HK_FLAG_TICK ))kernel/sched/core.c static void sched_tick_start(int cpu) · line 3156
Quoted 9 lines
kernel/sched/core.c +3
-3@@ -3112,14 +3151,23 @@ static void sched_tick_start(int cpu)WARN_ON_ONCE (!tick_work_cpu); twork =per_cpu_ptr (tick_work_cpu, cpu); - twork->cpu = cpu; -INIT_DELAYED_WORK (&twork->work, sched_tick_remote); -queue_delayed_work (system_unbound_wq, &twork->work,HZ ); + do { + os = READ_ONCE(twork->state); + if (os == TICK_SCHED_REMOTE_RUNNING)Is it possible to have RUNNING at this stage?
sched_tick_start()shouldn't be called twice without asched_tick_stop()in the middle.
Quoted 1 line
In which case we should even warn if we meet that value here.
Good point, it now looks like this:
if (os == WARN_ON_ONCE(TICK_SCHED_REMOTE_RUNNING))
Which, after an embarrassingly long time, turned into this:
if (WARN_ON_ONCE(os == TICK_SCHED_REMOTE_RUNNING))
Quoted 20 lines
Quoted 20 lines
kernel/sched/core.c +9
-0+break ; +// Either idle or offline for a short period + }while (cmpxchg (&twork->state, os,TICK_SCHED_REMOTE_RUNNING ) != os); +if (os ==TICK_SCHED_REMOTE_IDLE ) { + twork->cpu = cpu; +INIT_DELAYED_WORK (&twork->work, sched_tick_remote); +queue_delayed_work (system_unbound_wq, &twork->work,HZ ); + } }#ifdef CONFIG_HOTPLUG_CPU static void sched_tick_stop (int cpu) { +int os;struct tick_work *twork;if (housekeeping_cpu (cpu,HK_FLAG_TICK ))@@ -3128,7 +3176,13 @@ static void sched_tick_stop(int cpu)WARN_ON_ONCE (!tick_work_cpu);
Quoted 14 lines
kernel/sched/core.c static void sched_tick_stop(int cpu) · line 3187
Quoted 11 lines
kernel/sched/core.c +7
-1twork =per_cpu_ptr (tick_work_cpu, cpu); - cancel_delayed_work_sync(&twork->work); +// There cannot be competing actions, but don't rely on stop_machine. +do { + os =READ_ONCE (twork->state); +WARN_ON_ONCE (os !=TICK_SCHED_REMOTE_RUNNING ); +// Either idle or offline for a short period + }while (cmpxchg (&twork->state, os,TICK_SCHED_REMOTE_OFFLINING ) != os); + // Don't cancel, as this would mess up the state machine. }#endif /* CONFIG_HOTPLUG_CPU */ I ran the state machine for a few hours inside my head through
FWEISBEC_TORTUREand I see no error message. Which is of course not a guarantee of anything but:
I know that feeling!
Quoted 1 line
Reviewed-by Frederic Weisbecker <[email protected]>
Thank you, applied!
Quoted 1 line
Also, I believe that /* */ is the preferred comment style, FWIW ;-)
True enough, but "//" is permitted and allows me three more characters of comment before wanting to do a line break. ;-)
But it is your code, so if you want "/* */", just let me know and I will switch to that style.
Thanx, Paul