Merge tag 'timers_urgent_for_v6.8_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Borislav Petkov: - Make sure a warning is issued when a hrtimer gets queued after the timers have been migrated on the CPU down path and thus said timer will get ignored * tag 'timers_urgent_for_v6.8_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: hrtimer: Report offline hrtimer enqueue
This commit is contained in:
@@ -157,6 +157,7 @@ enum hrtimer_base_type {
|
||||
* @max_hang_time: Maximum time spent in hrtimer_interrupt
|
||||
* @softirq_expiry_lock: Lock which is taken while softirq based hrtimer are
|
||||
* expired
|
||||
* @online: CPU is online from an hrtimers point of view
|
||||
* @timer_waiters: A hrtimer_cancel() invocation waits for the timer
|
||||
* callback to finish.
|
||||
* @expires_next: absolute time of the next event, is required for remote
|
||||
@@ -179,7 +180,8 @@ struct hrtimer_cpu_base {
|
||||
unsigned int hres_active : 1,
|
||||
in_hrtirq : 1,
|
||||
hang_detected : 1,
|
||||
softirq_activated : 1;
|
||||
softirq_activated : 1,
|
||||
online : 1;
|
||||
#ifdef CONFIG_HIGH_RES_TIMERS
|
||||
unsigned int nr_events;
|
||||
unsigned short nr_retries;
|
||||
|
||||
@@ -1085,6 +1085,7 @@ static int enqueue_hrtimer(struct hrtimer *timer,
|
||||
enum hrtimer_mode mode)
|
||||
{
|
||||
debug_activate(timer, mode);
|
||||
WARN_ON_ONCE(!base->cpu_base->online);
|
||||
|
||||
base->cpu_base->active_bases |= 1 << base->index;
|
||||
|
||||
@@ -2183,6 +2184,7 @@ int hrtimers_prepare_cpu(unsigned int cpu)
|
||||
cpu_base->softirq_next_timer = NULL;
|
||||
cpu_base->expires_next = KTIME_MAX;
|
||||
cpu_base->softirq_expires_next = KTIME_MAX;
|
||||
cpu_base->online = 1;
|
||||
hrtimer_cpu_base_init_expiry_lock(cpu_base);
|
||||
return 0;
|
||||
}
|
||||
@@ -2250,6 +2252,7 @@ int hrtimers_cpu_dying(unsigned int dying_cpu)
|
||||
smp_call_function_single(ncpu, retrigger_next_event, NULL, 0);
|
||||
|
||||
raw_spin_unlock(&new_base->lock);
|
||||
old_base->online = 0;
|
||||
raw_spin_unlock(&old_base->lock);
|
||||
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user