From: Jeongjun Park <aha310510@gmail.com>
To: stable@vger.kernel.org
Cc: gregkh@linuxfoundation.org, tglx@linutronix.de,
Julia.Lawall@inria.fr, akpm@linux-foundation.org,
anna-maria@linutronix.de, arnd@arndb.de,
linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org,
linux@roeck-us.net, luiz.dentz@gmail.com, marcel@holtmann.org,
maz@kernel.org, peterz@infradead.org, rostedt@goodmis.org,
sboyd@kernel.org, viresh.kumar@linaro.org, zouyipeng@huawei.com,
aha310510@gmail.com, linux-staging@lists.linux.dev,
Jacob Keller <jacob.e.keller@intel.com>
Subject: [PATCH 5.10.y 06/15] timers: Replace BUG_ON()s
Date: Fri, 20 Feb 2026 02:13:01 +0900 [thread overview]
Message-ID: <20260219171310.118170-7-aha310510@gmail.com> (raw)
In-Reply-To: <20260219171310.118170-1-aha310510@gmail.com>
From: Thomas Gleixner <tglx@linutronix.de>
[ Upstream commit 82ed6f7ef58f9634fe4462dd721902c580f01569 ]
The timer code still has a few BUG_ON()s left which are crashing the kernel
in situations where it still can recover or simply refuse to take an
action.
Remove the one in the hotplug callback which checks for the CPU being
offline. If that happens then the whole hotplug machinery will explode in
colourful ways.
Replace the rest with WARN_ON_ONCE() and conditional returns where
appropriate.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Link: https://lore.kernel.org/r/20221123201624.769128888@linutronix.de
Signed-off-by: Jeongjun Park <aha310510@gmail.com>
---
kernel/time/timer.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index e09852be4e63..7094b916c854 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1208,7 +1208,8 @@ EXPORT_SYMBOL(timer_reduce);
*/
void add_timer(struct timer_list *timer)
{
- BUG_ON(timer_pending(timer));
+ if (WARN_ON_ONCE(timer_pending(timer)))
+ return;
__mod_timer(timer, timer->expires, MOD_TIMER_NOTPENDING);
}
EXPORT_SYMBOL(add_timer);
@@ -1227,7 +1228,8 @@ void add_timer_on(struct timer_list *timer, int cpu)
struct timer_base *new_base, *base;
unsigned long flags;
- BUG_ON(timer_pending(timer) || !timer->function);
+ if (WARN_ON_ONCE(timer_pending(timer) || !timer->function))
+ return;
new_base = get_timer_cpu_base(timer->flags, cpu);
@@ -2047,8 +2049,6 @@ int timers_dead_cpu(unsigned int cpu)
struct timer_base *new_base;
int b, i;
- BUG_ON(cpu_online(cpu));
-
for (b = 0; b < NR_BASES; b++) {
old_base = per_cpu_ptr(&timer_bases[b], cpu);
new_base = get_cpu_ptr(&timer_bases[b]);
@@ -2065,7 +2065,8 @@ int timers_dead_cpu(unsigned int cpu)
*/
forward_timer_base(new_base);
- BUG_ON(old_base->running_timer);
+ WARN_ON_ONCE(old_base->running_timer);
+ old_base->running_timer = NULL;
for (i = 0; i < WHEEL_SIZE; i++)
migrate_timer_list(new_base, old_base->vectors + i);
--
next prev parent reply other threads:[~2026-02-19 17:13 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-19 17:12 [PATCH 5.10.y 00/15] timers: Provide timer_shutdown[_sync]() Jeongjun Park
2026-02-19 17:12 ` [PATCH 5.10.y 01/15] Documentation: Remove bogus claim about del_timer_sync() Jeongjun Park
2026-02-19 17:12 ` [PATCH 5.10.y 02/15] ARM: spear: Do not use timer namespace for timer_shutdown() function Jeongjun Park
2026-02-19 17:12 ` [PATCH 5.10.y 03/15] clocksource/drivers/arm_arch_timer: " Jeongjun Park
2026-02-19 17:12 ` [PATCH 5.10.y 04/15] clocksource/drivers/sp804: " Jeongjun Park
2026-02-19 17:13 ` [PATCH 5.10.y 05/15] timers: Get rid of del_singleshot_timer_sync() Jeongjun Park
2026-02-19 17:13 ` Jeongjun Park [this message]
2026-02-19 17:13 ` [PATCH 5.10.y 07/15] timers: Rename del_timer() to timer_delete() Jeongjun Park
2026-02-19 17:13 ` [PATCH 5.10.y 08/15] Documentation: Replace del_timer/del_timer_sync() Jeongjun Park
2026-02-19 17:13 ` [PATCH 5.10.y 09/15] timers: Silently ignore timers with a NULL function Jeongjun Park
2026-02-19 17:13 ` [PATCH 5.10.y 10/15] timers: Split [try_to_]del_timer[_sync]() to prepare for shutdown mode Jeongjun Park
2026-02-19 17:13 ` [PATCH 5.10.y 11/15] timers: Add shutdown mechanism to the internal functions Jeongjun Park
2026-02-19 17:13 ` [PATCH 5.10.y 12/15] timers: Provide timer_shutdown[_sync]() Jeongjun Park
2026-02-19 17:13 ` [PATCH 5.10.y 13/15] timers: Update the documentation to reflect on the new timer_shutdown() API Jeongjun Park
2026-02-19 17:13 ` [PATCH 5.10.y 14/15] Bluetooth: hci_qca: Fix the teardown problem for real Jeongjun Park
2026-02-19 17:13 ` [PATCH 5.10.y 15/15] timers: Fix NULL function pointer race in timer_shutdown_sync() Jeongjun Park
2026-02-19 17:17 ` Jeongjun Park
2026-04-23 12:49 ` [PATCH 5.10.y 00/15] timers: Provide timer_shutdown[_sync]() Greg KH
2026-04-23 13:36 ` Jeongjun Park
2026-04-23 13:43 ` Greg KH
2026-04-23 14:07 ` Jeongjun Park
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=20260219171310.118170-7-aha310510@gmail.com \
--to=aha310510@gmail.com \
--cc=Julia.Lawall@inria.fr \
--cc=akpm@linux-foundation.org \
--cc=anna-maria@linutronix.de \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=jacob.e.keller@intel.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux@roeck-us.net \
--cc=luiz.dentz@gmail.com \
--cc=marcel@holtmann.org \
--cc=maz@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=sboyd@kernel.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=viresh.kumar@linaro.org \
--cc=zouyipeng@huawei.com \
/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