aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time/tick-common.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-09-22 12:46:37 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-09-23 05:38:52 -0400
commit6441402b1f173fa38e561d3cee7c01c32e5281ad (patch)
treefd7c81337354f39e44581530d499bcdda06d76c4 /kernel/time/tick-common.c
parent72d31053f62c4bc464c2783974926969614a8649 (diff)
clockevents: prevent cpu online to interfere with nohz
Impact: rare hang which can be triggered on CPU online. tick_do_timer_cpu keeps track of the CPU which updates jiffies via do_timer. The value -1 is used to signal, that currently no CPU is doing this. There are two cases, where the variable can have this state: boot: necessary for systems where the boot cpu id can be != 0 nohz long idle sleep: When the CPU which did the jiffies update last goes into a long idle sleep it drops the update jiffies duty so another CPU which is not idle can pick it up and keep jiffies going. Using the same value for both situations is wrong, as the CPU online code can see the -1 state when the timer of the newly onlined CPU is setup. The setup for a newly onlined CPU goes through periodic mode and can pick up the do_timer duty without being aware of the nohz / highres mode of the already running system. Use two separate states and make them constants to avoid magic numbers confusion. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time/tick-common.c')
-rw-r--r--kernel/time/tick-common.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 019315ebf9de..b523d095decf 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -33,7 +33,7 @@ DEFINE_PER_CPU(struct tick_device, tick_cpu_device);
33 */ 33 */
34ktime_t tick_next_period; 34ktime_t tick_next_period;
35ktime_t tick_period; 35ktime_t tick_period;
36int tick_do_timer_cpu __read_mostly = -1; 36int tick_do_timer_cpu __read_mostly = TICK_DO_TIMER_BOOT;
37DEFINE_SPINLOCK(tick_device_lock); 37DEFINE_SPINLOCK(tick_device_lock);
38 38
39/* 39/*
@@ -148,7 +148,7 @@ static void tick_setup_device(struct tick_device *td,
148 * If no cpu took the do_timer update, assign it to 148 * If no cpu took the do_timer update, assign it to
149 * this cpu: 149 * this cpu:
150 */ 150 */
151 if (tick_do_timer_cpu == -1) { 151 if (tick_do_timer_cpu == TICK_DO_TIMER_BOOT) {
152 tick_do_timer_cpu = cpu; 152 tick_do_timer_cpu = cpu;
153 tick_next_period = ktime_get(); 153 tick_next_period = ktime_get();
154 tick_period = ktime_set(0, NSEC_PER_SEC / HZ); 154 tick_period = ktime_set(0, NSEC_PER_SEC / HZ);
@@ -300,7 +300,8 @@ static void tick_shutdown(unsigned int *cpup)
300 if (*cpup == tick_do_timer_cpu) { 300 if (*cpup == tick_do_timer_cpu) {
301 int cpu = first_cpu(cpu_online_map); 301 int cpu = first_cpu(cpu_online_map);
302 302
303 tick_do_timer_cpu = (cpu != NR_CPUS) ? cpu : -1; 303 tick_do_timer_cpu = (cpu != NR_CPUS) ? cpu :
304 TICK_DO_TIMER_NONE;
304 } 305 }
305 spin_unlock_irqrestore(&tick_device_lock, flags); 306 spin_unlock_irqrestore(&tick_device_lock, flags);
306} 307}