hrtimer: Return ktime_t from hrtimer_get_next_event()/hrtimer_next_event_without()

These functions really work in terms of ktime_t and not u64.

Change their return types and adapt the callers.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260504-hrtimer-next_event-v2-1-7a5d0550b42f@linutronix.de

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 66cc98c773cf95fad78cc0adc6e1120e982f924d..6862dea0acc52f3aa61ab5508a300be4fda2873f 100644 (file)
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -268,8 +268,8 @@ static inline ktime_t hrtimer_get_remaining(const struct hrtimer *timer)
        return __hrtimer_get_remaining(timer, false);
 }
 
-extern u64 hrtimer_get_next_event(void);
-extern u64 hrtimer_next_event_without(const struct hrtimer *exclude);
+extern ktime_t hrtimer_get_next_event(void);
+extern ktime_t hrtimer_next_event_without(const struct hrtimer *exclude);
 
 extern bool hrtimer_active(const struct hrtimer *timer);
 

diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 8cfc7aacece1817bb8c9e15b88787c3d202d2c37..8a19a61f6feeacb8b0058cd50e97ed2e4fe89d68 100644 (file)
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1783,10 +1783,10 @@ EXPORT_SYMBOL_GPL(__hrtimer_get_remaining);
  *
  * Returns the next expiry time or KTIME_MAX if no timer is pending.
  */
-u64 hrtimer_get_next_event(void)
+ktime_t hrtimer_get_next_event(void)
 {
        struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases);
-       u64 expires = KTIME_MAX;
+       ktime_t expires = KTIME_MAX;
 
        guard(raw_spinlock_irqsave)(&cpu_base->lock);
        if (!hrtimer_hres_active(cpu_base))
@@ -1802,10 +1802,10 @@ u64 hrtimer_get_next_event(void)
  * Returns the next expiry time over all timers except for the @exclude one or
  * KTIME_MAX if none of them is pending.
  */
-u64 hrtimer_next_event_without(const struct hrtimer *exclude)
+ktime_t hrtimer_next_event_without(const struct hrtimer *exclude)
 {
        struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases);
-       u64 expires = KTIME_MAX;
+       ktime_t expires = KTIME_MAX;
        unsigned int active;
 
        guard(raw_spinlock_irqsave)(&cpu_base->lock);

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index cbbb87a0c6e7ceed82e1ad25e79a6eb258128994..3026a301dff7e445b6ee31728c75ed05e776390c 100644 (file)
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -1407,8 +1407,7 @@ ktime_t tick_nohz_get_sleep_length(ktime_t *delta_next)
         * If the next highres timer to expire is earlier than 'next_event', the
         * idle governor needs to know that.
         */
-       next_event = min_t(u64, next_event,
-                          hrtimer_next_event_without(&ts->sched_timer));
+       next_event = min(next_event, hrtimer_next_event_without(&ts->sched_timer));
 
        return ktime_sub(next_event, now);
 }

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 04d928c21aba571e2439f99421cf230de5cc075d..655a8c6cd84d718d7a4c6e699396f3622129bf57 100644 (file)
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1932,7 +1932,7 @@ static void timer_recalc_next_expiry(struct timer_base *base)
  */
 static u64 cmp_next_hrtimer_event(u64 basem, u64 expires)
 {
-       u64 nextevt = hrtimer_get_next_event();
+       u64 nextevt = ktime_to_ns(hrtimer_get_next_event());
 
        /*
         * If high resolution timers are enabled