Skip to content

Commit 13bb06f

Browse files
committed
tick/common: Align tick period during sched_timer setup
The tick period is aligned very early while the first clock_event_device is registered. At that point the system runs in periodic mode and switches later to one-shot mode if possible. The next wake-up event is programmed based on the aligned value (tick_next_period) but the delta value, that is used to program the clock_event_device, is computed based on ktime_get(). With the subtracted offset, the device fires earlier than the exact time frame. With a large enough offset the system programs the timer for the next wake-up and the remaining time left is too small to make any boot progress. The system hangs. Move the alignment later to the setup of tick_sched timer. At this point the system switches to oneshot mode and a high resolution clocksource is available. At this point it is safe to align tick_next_period because ktime_get() will now return accurate (not jiffies based) time. [bigeasy: Patch description + testing]. Fixes: e9523a0 ("tick/common: Align tick period with the HZ tick.") Reported-by: Mathias Krause <[email protected]> Reported-by: "Bhatnagar, Rishabh" <[email protected]> Suggested-by: Mathias Krause <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Tested-by: Richard W.M. Jones <[email protected]> Tested-by: Mathias Krause <[email protected]> Acked-by: SeongJae Park <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/[email protected] Link: https://lore.kernel.org/[email protected] Link: https://lore.kernel.org/r/[email protected]
1 parent 858fd16 commit 13bb06f

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

kernel/time/tick-common.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -218,19 +218,8 @@ static void tick_setup_device(struct tick_device *td,
218218
* this cpu:
219219
*/
220220
if (tick_do_timer_cpu == TICK_DO_TIMER_BOOT) {
221-
ktime_t next_p;
222-
u32 rem;
223-
224221
tick_do_timer_cpu = cpu;
225-
226-
next_p = ktime_get();
227-
div_u64_rem(next_p, TICK_NSEC, &rem);
228-
if (rem) {
229-
next_p -= rem;
230-
next_p += TICK_NSEC;
231-
}
232-
233-
tick_next_period = next_p;
222+
tick_next_period = ktime_get();
234223
#ifdef CONFIG_NO_HZ_FULL
235224
/*
236225
* The boot CPU may be nohz_full, in which case set

kernel/time/tick-sched.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,19 @@ static ktime_t tick_init_jiffy_update(void)
161161
raw_spin_lock(&jiffies_lock);
162162
write_seqcount_begin(&jiffies_seq);
163163
/* Did we start the jiffies update yet ? */
164-
if (last_jiffies_update == 0)
164+
if (last_jiffies_update == 0) {
165+
u32 rem;
166+
167+
/*
168+
* Ensure that the tick is aligned to a multiple of
169+
* TICK_NSEC.
170+
*/
171+
div_u64_rem(tick_next_period, TICK_NSEC, &rem);
172+
if (rem)
173+
tick_next_period += TICK_NSEC - rem;
174+
165175
last_jiffies_update = tick_next_period;
176+
}
166177
period = last_jiffies_update;
167178
write_seqcount_end(&jiffies_seq);
168179
raw_spin_unlock(&jiffies_lock);

0 commit comments

Comments
 (0)