diff options
| author | Thomas Gleixner <tglx@kernel.org> | 2026-08-18 00:14:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-09-07 17:23:00 +0200 |
| commit | b7eff3f621ef24624f946e35fe7deb6a36398576 (patch) | |
| tree | 24099f1200dd1219682625d7e17128cbb48dfd6f | |
| parent | fecf1e37775269ad38c172b468ad4ecc3968aa63 (diff) | |
| download | linux-b7eff3f621ef24624f946e35fe7deb6a36398576.tar.gz linux-b7eff3f621ef24624f946e35fe7deb6a36398576.zip | |
timer: Keep debugobjects state consistent in migrate_timer_list()
commit c793bbfc4a0a9f5a66978fc91559e9681748dbeb upstream.
When timers are migrated away from an offline CPU the debugobjects state
gets corrupted. The timer is accounted as inactive on deletion, but the
enqueue on the alive CPU lacks the activation call.
That used to work, but got broken when the trace point and the debug
objects call got separated. That change missed to fixup
migrate_timer_list().
Add the missing debug_timer_activate() invocation to fix it.
Fixes: dc1e7dc5ac62 ("timer: Move trace point to get proper index")
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/87bjb0l7ha.ffs@fw13
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | kernel/time/timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index d5ebb1d927ea..97a7bd5a8e3b 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -2491,6 +2491,7 @@ static void migrate_timer_list(struct timer_base *new_base, struct hlist_head *h timer = hlist_entry(head->first, struct timer_list, entry); detach_timer(timer, false); timer->flags = (timer->flags & ~TIMER_BASEMASK) | cpu; + debug_timer_activate(timer); internal_add_timer(new_base, timer); } } |