Fix next_timer_interrupt() for hrtimer
PATCH 1/1 Fix next_timer_interrupt() for hrtimer
Hi all,
Looks like next_timer_interrupt() got broken recently with sys_nanosleep move to hrtimer. Here's a patch to fix it. Anybody got any better ideas for ktime_to_jiffies() ?
Regards,
Tony
This patch adds support for hrtimer to next_timer_interrupt() and fixes current breakage.
Function next_timer_interrupt() got broken with a recent patch 6ba1b91213e81aa92b5cf7539f7d2a94ff54947c as sys_nanosleep() was moved to hrtimer. This broke things as next_timer_interrupt() did not check hrtimer tree for next event.
Function next_timer_interrupt() is needed with dyntick (CONFIG_NO_IDLE_HZ, VST) implementations, as the system can be in idle when next hrtimer event was supposed to happen. At least ARM and S390 currently use next_timer_interrupt().
kernel/hrtimer.c +88 -0
@@ -505,6 +505,94 @@return rem; } +#ifdef CONFIG_NO_IDLE_HZ + +/** +* hrtimer_get_next - get next hrtimer to expire +* +* @bases: ktimer base array +*/ +static inline struct hrtimer *hrtimer_get_next (struct hrtimer_base *bases) +{ +unsigned long flags; +struct hrtimer *timer =NULL ; +int i; + +for (i =0 ; i <MAX_HRTIMER_BASES ; i++) { +struct hrtimer_base *base; +struct hrtimer *cur; + + base = &bases[i]; +spin_lock_irqsave (&base->lock, flags); + cur = rb_entry(base->first, struct hrtimer, node); +spin_unlock_irqrestore (&base->lock, flags); + +if (cur ==NULL ) +continue ; + +if (timer ==NULL || cur->expires.tv64 < timer->expires.tv64) + timer = cur; + } + +return timer; +} + +/** +* ktime_to_jiffies - converts ktime to jiffies +* +* @event: ktime event to be converted +* +* Caller must take care xtime locking. +*/ +static inline unsigned long ktime_to_jiffies (const ktime_t event) +{ +ktime_t now, delta; +unsigned long sec, nsec; +struct timespec tv; + + tv =ktime_to_timespec (event); + +/* Assume read xtime_lock is held, so we can't use getnstimeofday() */ + sec = xtime.tv_sec; + nsec = xtime.tv_nsec; +while (unlikely (nsec >=NSEC_PER_SEC )) { + nsec -=NSEC_PER_SEC ; + ++sec; + } + tv.tv_sec = sec; + tv.tv_nsec = nsec; + + now =timespec_to_ktime (tv); + delta =ktime_sub (event, now); + + tv =ktime_to_timespec (delta); + +return jiffies -1 +timespec_to_jiffies (&tv); +} + +/** +* hrtimer_next_jiffie - get next hrtimer event in jiffies +* +* Called from next_timer_interrupt() to get the next hrtimer event. +* Eventually we should change next_timer_interrupt() to return +* results in nanoseconds instead of jiffies. Caller must host xtime_lock. +*/ +int hrtimer_next_jiffie (unsigned long *next_jiffie) +{ +struct hrtimer_base *base =__get_cpu_var (hrtimer_bases); +struct hrtimer * timer; + + timer =hrtimer_get_next (base); +if (timer ==NULL ) +return -EAGAIN ; + + *next_jiffie =ktime_to_jiffies (timer->expires); + +return 0 ; +} + +#endif +/** * hrtimer_init - initialize a timer to the given clock *
kernel/timer.c +11 -0
@@ -478,6 +478,7 @@ }#ifdef CONFIG_NO_IDLE_HZ +/* * Find out when the next timer event is due to happen. This * is used on S/390 to stop all activity when a cpus is idle.
@@ -489,9 +490,15 @@struct list_head *list;struct timer_list *nte;unsigned long expires; +unsigned long hr_expires = jiffies +10 *HZ ;/* Anything far ahead */ tvec_t *varray[4 ];int i, j; +/* Look for timer events in hrtimer. */ +if ((hrtimer_next_jiffie (&hr_expires) ==0 ) + && (time_before (hr_expires, jiffies +2 ))) +return hr_expires; + base = &__get_cpu_var (tvec_bases);spin_lock (&base->t_base.lock); expires = base->timer_jiffies + (LONG_MAX >>1 );
@@ -542,6 +549,10 @@ } }spin_unlock (&base->t_base.lock); + +if (time_before (hr_expires, expires)) + expires = hr_expires; +return expires; }#endif
include/linux/hrtimer.h +1 -0
@@ -115,6 +115,7 @@ extern int hrtimer_try_to_cancel(struct/* Query timers: */ extern ktime_t hrtimer_get_remaining (const struct hrtimer *timer);extern int hrtimer_get_res (const clockid_t which_clock,struct timespec *tp); +extern int hrtimer_next_jiffie (unsigned long *next_jiffie);static inline int hrtimer_active (const struct hrtimer *timer) {
kernel/hrtimer.c line 563
Quoted 11 lines · Tony Lindgren
kernel/hrtimer.c +11
-0+ tv =ktime_to_timespec (event); + +/* Assume read xtime_lock is held, so we can't use getnstimeofday() */ + sec = xtime.tv_sec; + nsec = xtime.tv_nsec; +while (unlikely (nsec >=NSEC_PER_SEC )) { + nsec -=NSEC_PER_SEC ; + ++sec; + } + tv.tv_sec = sec; + tv.tv_nsec = nsec;
Er, I think you should be able to nest readers. Thus getnstimeofday() should be safe to call. Or is the comment wrong and you are assuming a write lock is held?
thanks
-john
Quoted 16 lines · john stultz
kernel/hrtimer.c line 563
Quoted 11 lines · Tony Lindgren
kernel/hrtimer.c +11
-0+ tv =ktime_to_timespec (event); + +/* Assume read xtime_lock is held, so we can't use getnstimeofday() */ + sec = xtime.tv_sec; + nsec = xtime.tv_nsec; +while (unlikely (nsec >=NSEC_PER_SEC )) { + nsec -=NSEC_PER_SEC ; + ++sec; + } + tv.tv_sec = sec; + tv.tv_nsec = nsec;Er, I think you should be able to nest readers. Thus
getnstimeofday()should be safe to call. Or is the comment wrong and you are assuming a write lock is held?
Oops, it's a write lock as next_timer_interrupt gets called from arch/*/time.c.
Tony
Quoted 18 lines · Tony Lindgren
Quoted 16 lines · john stultz
kernel/hrtimer.c line 563
Quoted 11 lines · Tony Lindgren
kernel/hrtimer.c +11
-0+ tv =ktime_to_timespec (event); + +/* Assume read xtime_lock is held, so we can't use getnstimeofday() */ + sec = xtime.tv_sec; + nsec = xtime.tv_nsec; +while (unlikely (nsec >=NSEC_PER_SEC )) { + nsec -=NSEC_PER_SEC ; + ++sec; + } + tv.tv_sec = sec; + tv.tv_nsec = nsec;Er, I think you should be able to nest readers. Thus
getnstimeofday()should be safe to call. Or is the comment wrong and you are assuming a write lock is held?
Quoted 2 lines
Oops, it's a write lock as
next_timer_interruptgets called fromarch/*/time.c.
Also the above code just overwrites tv.
Do you intend instead to add xtime to tv?
thanks
-john
Quoted 19 lines · john stultz
Quoted 18 lines · Tony Lindgren
Quoted 16 lines · john stultz
Review
Quoted 11 lines · Tony Lindgren
(quoted diff) +11
-0+ tv = ktime_to_timespec(event); + + /* Assume read xtime_lock is held, so we can't use getnstimeofday() */ + sec = xtime.tv_sec; + nsec = xtime.tv_nsec; + while (unlikely(nsec >= NSEC_PER_SEC)) { + nsec -= NSEC_PER_SEC; + ++sec; + } + tv.tv_sec = sec; + tv.tv_nsec = nsec;Er, I think you should be able to nest readers. Thus
getnstimeofday()should be safe to call. Or is the comment wrong and you are assuming a write lock is held?
Quoted 4 lines
Quoted 2 lines
Oops, it's a write lock as
next_timer_interruptgets called fromarch/*/time.c.Also the above code just overwrites tv.
That's a bug from clean-up... Actually I just shrunk the ktime_to_jiffies(), see below.
Quoted 1 line
Do you intend instead to add xtime to tv?
No, just get current time in ktime. But turns out tv is not needed at all :)
Tony
This patch adds support for hrtimer to next_timer_interrupt() and fixes current breakage.
Function next_timer_interrupt() got broken with a recent patch 6ba1b91213e81aa92b5cf7539f7d2a94ff54947c as sys_nanosleep() was moved to hrtimer. This broke things as next_timer_interrupt() did not check hrtimer tree for next event.
Function next_timer_interrupt() is needed with dyntick (CONFIG_NO_IDLE_HZ, VST) implementations, as the system can be in idle when next hrtimer event was supposed to happen. At least ARM and S390 currently use next_timer_interrupt().
kernel/hrtimer.c +74 -0
@@ -505,6 +505,80 @@return rem; } +#ifdef CONFIG_NO_IDLE_HZ + +/** +* hrtimer_get_next - get next hrtimer to expire +* +* @bases: ktimer base array +*/ +static inline struct hrtimer *hrtimer_get_next (struct hrtimer_base *bases) +{ +unsigned long flags; +struct hrtimer *timer =NULL ; +int i; + +for (i =0 ; i <MAX_HRTIMER_BASES ; i++) { +struct hrtimer_base *base; +struct hrtimer *cur; + + base = &bases[i]; +spin_lock_irqsave (&base->lock, flags); + cur = rb_entry(base->first, struct hrtimer, node); +spin_unlock_irqrestore (&base->lock, flags); + +if (cur ==NULL ) +continue ; + +if (timer ==NULL || cur->expires.tv64 < timer->expires.tv64) + timer = cur; + } + +return timer; +} + +/** +* ktime_to_jiffies - converts ktime to jiffies +* +* @event: ktime event to be converted +* +* Caller must take care xtime locking. +*/ +static inline unsigned long ktime_to_jiffies (const ktime_t event) +{ +ktime_t now, delta; +struct timespec tv; + + now =timespec_to_ktime (xtime); + delta =ktime_sub (event, now); + tv =ktime_to_timespec (delta); + +return jiffies -1 +timespec_to_jiffies (&tv); +} + +/** +* hrtimer_next_jiffie - get next hrtimer event in jiffies +* +* Called from next_timer_interrupt() to get the next hrtimer event. +* Eventually we should change next_timer_interrupt() to return +* results in nanoseconds instead of jiffies. Caller must host xtime_lock. +*/ +int hrtimer_next_jiffie (unsigned long *next_jiffie) +{ +struct hrtimer_base *base =__get_cpu_var (hrtimer_bases); +struct hrtimer * timer; + + timer =hrtimer_get_next (base); +if (timer ==NULL ) +return -EAGAIN ; + + *next_jiffie =ktime_to_jiffies (timer->expires); + +return 0 ; +} + +#endif +/** * hrtimer_init - initialize a timer to the given clock *
kernel/timer.c +11 -0
@@ -478,6 +478,7 @@ }#ifdef CONFIG_NO_IDLE_HZ +/* * Find out when the next timer event is due to happen. This * is used on S/390 to stop all activity when a cpus is idle.
@@ -489,9 +490,15 @@struct list_head *list;struct timer_list *nte;unsigned long expires; +unsigned long hr_expires = jiffies +10 *HZ ;/* Anything far ahead */ tvec_t *varray[4 ];int i, j; +/* Look for timer events in hrtimer. */ +if ((hrtimer_next_jiffie (&hr_expires) ==0 ) + && (time_before (hr_expires, jiffies +2 ))) +return hr_expires; + base = &__get_cpu_var (tvec_bases);spin_lock (&base->t_base.lock); expires = base->timer_jiffies + (LONG_MAX >>1 );
@@ -542,6 +549,10 @@ } }spin_unlock (&base->t_base.lock); + +if (time_before (hr_expires, expires)) + expires = hr_expires; +return expires; }#endif
include/linux/hrtimer.h +1 -0
@@ -115,6 +115,7 @@/* Query timers: */ extern ktime_t hrtimer_get_remaining (const struct hrtimer *timer);extern int hrtimer_get_res (const clockid_t which_clock,struct timespec *tp); +extern int hrtimer_next_jiffie (unsigned long *next_jiffie);static inline int hrtimer_active (const struct hrtimer *timer) {
Hi all,
Here's one more version. This one fixes a bug in ktime_to_jiffies() by removing - 1 from jiffies and cuts down some conversions too.
Regards,
Tony
This patch adds support for hrtimer to next_timer_interrupt() and fixes current breakage.
Function next_timer_interrupt() got broken with a recent patch 6ba1b91213e81aa92b5cf7539f7d2a94ff54947c as sys_nanosleep() was moved to hrtimer. This broke things as next_timer_interrupt() did not check hrtimer tree for next event.
Function next_timer_interrupt() is needed with dyntick (CONFIG_NO_IDLE_HZ, VST) implementations, as the system can be in idle when next hrtimer event was supposed to happen. At least ARM and S390 currently use next_timer_interrupt().
kernel/hrtimer.c +73 -0
@@ -505,6 +505,79 @@return rem; } +#ifdef CONFIG_NO_IDLE_HZ + +/** +* hrtimer_get_next - get next hrtimer to expire +* +* @bases: ktimer base array +*/ +static inline struct hrtimer *hrtimer_get_next (struct hrtimer_base *bases) +{ +unsigned long flags; +struct hrtimer *timer =NULL ; +int i; + +for (i =0 ; i <MAX_HRTIMER_BASES ; i++) { +struct hrtimer_base *base; +struct hrtimer *cur; + + base = &bases[i]; +spin_lock_irqsave (&base->lock, flags); + cur = rb_entry(base->first, struct hrtimer, node); +spin_unlock_irqrestore (&base->lock, flags); + +if (cur ==NULL ) +continue ; + +if (timer ==NULL || cur->expires.tv64 < timer->expires.tv64) + timer = cur; + } + +return timer; +} + +/** +* ktime_to_jiffies - converts ktime to jiffies +* +* @event: ktime event to be converted to jiffies +* +* Caller must take care xtime locking. +*/ +static inline unsigned long ktime_to_jiffies (const ktime_t event) +{ +ktime_t now, delta; + + now =timespec_to_ktime (xtime); + delta =ktime_sub (event, now); + +return jiffies + (((delta.tv64 *NSEC_CONVERSION ) >> + (NSEC_JIFFIE_SC -SEC_JIFFIE_SC )) >>SEC_JIFFIE_SC ); +} + +/** +* hrtimer_next_jiffie - get next hrtimer event in jiffies +* +* Called from next_timer_interrupt() to get the next hrtimer event. +* Eventually we should change next_timer_interrupt() to return +* results in nanoseconds instead of jiffies. Caller must host xtime_lock. +*/ +int hrtimer_next_jiffie (unsigned long *next_jiffie) +{ +struct hrtimer_base *base =__get_cpu_var (hrtimer_bases); +struct hrtimer * timer; + + timer =hrtimer_get_next (base); +if (timer ==NULL ) +return -EAGAIN ; + + *next_jiffie =ktime_to_jiffies (timer->expires); + +return 0 ; +} + +#endif +/** * hrtimer_init - initialize a timer to the given clock *
kernel/timer.c +11 -0
@@ -478,6 +478,7 @@ }#ifdef CONFIG_NO_IDLE_HZ +/* * Find out when the next timer event is due to happen. This * is used on S/390 to stop all activity when a cpus is idle.
@@ -489,9 +490,15 @@struct list_head *list;struct timer_list *nte;unsigned long expires; +unsigned long hr_expires = jiffies +10 *HZ ;/* Anything far ahead */ tvec_t *varray[4 ];int i, j; +/* Look for timer events in hrtimer. */ +if ((hrtimer_next_jiffie (&hr_expires) ==0 ) + && (time_before (hr_expires, jiffies +2 ))) +return hr_expires; + base = &__get_cpu_var (tvec_bases);spin_lock (&base->t_base.lock); expires = base->timer_jiffies + (LONG_MAX >>1 );
@@ -542,6 +549,10 @@ } }spin_unlock (&base->t_base.lock); + +if (time_before (hr_expires, expires)) + expires = hr_expires; +return expires; }#endif
include/linux/hrtimer.h +1 -0
@@ -115,6 +115,7 @@/* Query timers: */ extern ktime_t hrtimer_get_remaining (const struct hrtimer *timer);extern int hrtimer_get_res (const clockid_t which_clock,struct timespec *tp); +extern int hrtimer_next_jiffie (unsigned long *next_jiffie);static inline int hrtimer_active (const struct hrtimer *timer) {
Quoted 2 lines · Tony Lindgren
Here's one more version. This one fixes a bug in
ktime_to_jiffies()by removing - 1 from jiffies and cuts down some conversions too.
Tony, thanks for picking this up. I like how you keep the semantics of next_timer_interrupt intact. As you've mentioned in your comments we should move the users of that function to nanosecond timers, and it would be nice to use a different function name so there's no confusion (suggest next_hrtimer_interrupt).
Cheers,
Con