提交 6180da0c 编写于 作者: T Thomas Gleixner 提交者: openeuler-sync-bot

timers: Replace BUG_ON()s

mainline inclusion
from mainline-v6.2-rc1
commit 82ed6f7e
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I7R8WG

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=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: NThomas Gleixner <tglx@linutronix.de>
Tested-by: NGuenter Roeck <linux@roeck-us.net>
Reviewed-by: NJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: NAnna-Maria Behnsen <anna-maria@linutronix.de>
Link: https://lore.kernel.org/r/20221123201624.769128888@linutronix.deSigned-off-by: NYu Liao <liaoyu15@huawei.com>
(cherry picked from commit ebf38635)
上级 c83a01e9
...@@ -1140,7 +1140,8 @@ EXPORT_SYMBOL(timer_reduce); ...@@ -1140,7 +1140,8 @@ EXPORT_SYMBOL(timer_reduce);
*/ */
void add_timer(struct timer_list *timer) 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); __mod_timer(timer, timer->expires, MOD_TIMER_NOTPENDING);
} }
EXPORT_SYMBOL(add_timer); EXPORT_SYMBOL(add_timer);
...@@ -1157,7 +1158,8 @@ void add_timer_on(struct timer_list *timer, int cpu) ...@@ -1157,7 +1158,8 @@ void add_timer_on(struct timer_list *timer, int cpu)
struct timer_base *new_base, *base; struct timer_base *new_base, *base;
unsigned long flags; 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); new_base = get_timer_cpu_base(timer->flags, cpu);
...@@ -1958,8 +1960,6 @@ int timers_dead_cpu(unsigned int cpu) ...@@ -1958,8 +1960,6 @@ int timers_dead_cpu(unsigned int cpu)
struct timer_base *new_base; struct timer_base *new_base;
int b, i; int b, i;
BUG_ON(cpu_online(cpu));
for (b = 0; b < NR_BASES; b++) { for (b = 0; b < NR_BASES; b++) {
old_base = per_cpu_ptr(&timer_bases[b], cpu); old_base = per_cpu_ptr(&timer_bases[b], cpu);
new_base = get_cpu_ptr(&timer_bases[b]); new_base = get_cpu_ptr(&timer_bases[b]);
...@@ -1976,7 +1976,8 @@ int timers_dead_cpu(unsigned int cpu) ...@@ -1976,7 +1976,8 @@ int timers_dead_cpu(unsigned int cpu)
*/ */
forward_timer_base(new_base); 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++) for (i = 0; i < WHEEL_SIZE; i++)
migrate_timer_list(new_base, old_base->vectors + i); migrate_timer_list(new_base, old_base->vectors + i);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册