mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Thomas Gleixner" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Thomas Gleixner <tglx@kernel.org>,
	stable@vger.kernel.org, x86@kernel.org,
	linux-kernel@vger.kernel.org
Subject: [tip: core/urgent] timer: Keep debugobjects state consistent in migrate_timer_list()
Date: Tue, 18 Aug 2026 08:56:39 -0000	[thread overview]
Message-ID: <178704339949.1542179.13819936766894002577.tip-bot2@tip-bot2> (raw)
In-Reply-To: <87bjb0l7ha.ffs@fw13>

The following commit has been merged into the core/urgent branch of tip:

Commit-ID:     c793bbfc4a0a9f5a66978fc91559e9681748dbeb
Gitweb:        https://git.kernel.org/tip/c793bbfc4a0a9f5a66978fc91559e9681748dbeb
Author:        Thomas Gleixner <tglx@kernel.org>
AuthorDate:    Tue, 18 Aug 2026 00:14:57 +02:00
Committer:     Thomas Gleixner <tglx@kernel.org>
CommitterDate: Tue, 18 Aug 2026 10:51:43 +02:00

timer: Keep debugobjects state consistent in migrate_timer_list()

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
---
 kernel/time/timer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 655a8c6..ae9abf1 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -2492,6 +2492,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);
 	}
 }

  reply	other threads:[~2026-08-18  8:56 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-14  7:28 [syzbot] [kernel?] general protection fault in timers_dead_cpu syzbot
2026-08-17 21:14 ` Thomas Gleixner
2026-08-17 22:12   ` Thomas Gleixner
2026-08-18  0:21     ` Borislav Petkov
2026-08-17 22:14   ` [PATCH] timer: Keep debugobjects state consistent in migrate_timer_list() Thomas Gleixner
2026-08-18  8:56     ` tip-bot2 for Thomas Gleixner [this message]
2026-08-17 23:55   ` [syzbot] [kernel?] general protection fault in timers_dead_cpu Borislav Petkov
2026-08-18  0:18     ` Borislav Petkov
2026-08-18  9:09       ` Thomas Gleixner
2026-10-23  9:18         ` [PATCH] x86/mce: Serialize sysfs controls against CPU hotplug Thomas Gleixner
2026-10-28 19:45           ` [PATCH V2] " Thomas Gleixner
2026-10-29 16:56             ` Yazen Ghannam
2026-10-29 17:46               ` Borislav Petkov
2026-10-29 18:08                 ` Yazen Ghannam
2026-10-29 19:02                   ` Borislav Petkov
2026-10-30 19:18               ` Thomas Gleixner
2026-11-13 14:27                 ` [PATCH V3 RFC] " Thomas Gleixner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178704339949.1542179.13819936766894002577.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=tglx@kernel.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®