From nobody Sat Jun 13 17:07:05 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 246802E762C; Wed, 6 May 2026 07:11:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778051496; cv=none; b=PVHsQqePV7dMDo25P+L6xPhS08fS77IlNcHbf/DRhWL/sp9M6ErhNboUeY58OXqC82i2BoTa2+MEAxJJqN4fGRGb9p8RNt/7rQwSCwQtxUzygRDyMx0AEJtYJZZvUFFGM3e9WFUvqeIqNYvenExMEfHtsib69xinRETwdu6WOyQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778051496; c=relaxed/simple; bh=uYZbi3PmBPCmnTX0UwGLTymWrdYYEvr/RdQnEDPp1yw=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=gwEvuv1Oz6JwASANWdBcUoM2ZeqTqhODc+6wmeN+Hq3t2eHO2Aa+vxLuNnMUFG1wKq7AEC6bLJSFIPj1EsjqZ/STxerF57NXQ52aeNnq745LyeWff5hFNsC0vFvWcyqKY7DCD4TxyuNMA26RYyuanwr05dMrqq00L9MLfswKdbc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=uukjQEJ1; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=F/4brPkl; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="uukjQEJ1"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="F/4brPkl" Date: Wed, 06 May 2026 07:11:32 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1778051493; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=av2iNY0iFdjcZOZBEszl9u9j1YVqUo/yxRUavh19w0o=; b=uukjQEJ1sza8lqpTFH69gxnIqXnZkXFTjzT0cnoGkEC4p+j8L8Di9tsyFbb3CwqBljALlh xLfjSv99RUjB5em034iIgk0c4GDxF/LS5DfuuoSjSir5R6G6o8ZN1FZXmgjtYtlYhN4FZX JnOYIfdSKvzjZO12buVatMRJXrYRdPeEYSogBW8FKckyJ3niB7kX6Xavxwbr25u1U3TFJW CCdop+e3Aq6xrFjDEobke8MxFI6JyjFyNqPBLk7ZkewAsAvB2U+meAs3otThiNOlWrGYRs 7QjuDVoA8ZS4tiGr2zs+cJc4CFYsFmOcDYenjRcvKiq0HW6CPLQPKElnnC+mmg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1778051493; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=av2iNY0iFdjcZOZBEszl9u9j1YVqUo/yxRUavh19w0o=; b=F/4brPkl9+i6AYUIu9hG0xZNdSl5aOJlDukK1qSCtzX2UNyDuwWN2o4+rSrUHKf52vRQsg X1r5WSdD65uen3DQ== From: tip-bot2 for Thomas =?utf-8?q?Wei=C3=9Fschuh?= Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] hrtimer: Return ktime_t from hrtimer_get_next_event()/hrtimer_next_event_without() Cc: thomas.weissschuh@linutronix.de, Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260504-hrtimer-next_event-v2-1-7a5d0550b42f@linutronix.de> References: <20260504-hrtimer-next_event-v2-1-7a5d0550b42f@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177805149210.424702.12788927469877476764.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the timers/core branch of tip: Commit-ID: 3af1f49f415dcac8c0df8bfc593df0371c219876 Gitweb: https://git.kernel.org/tip/3af1f49f415dcac8c0df8bfc593df0371= c219876 Author: Thomas Wei=C3=9Fschuh AuthorDate: Mon, 04 May 2026 08:56:10 +02:00 Committer: Thomas Gleixner CommitterDate: Wed, 06 May 2026 08:33:09 +02:00 hrtimer: Return ktime_t from hrtimer_get_next_event()/hrtimer_next_event_wi= thout() 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=C3=9Fschuh Signed-off-by: Thomas Gleixner Link: https://patch.msgid.link/20260504-hrtimer-next_event-v2-1-7a5d0550b42= f@linutronix.de --- include/linux/hrtimer.h | 4 ++-- kernel/time/hrtimer.c | 8 ++++---- kernel/time/tick-sched.c | 3 +-- kernel/time/timer.c | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 66cc98c..6862dea 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -268,8 +268,8 @@ static inline ktime_t hrtimer_get_remaining(const struc= t hrtimer *timer) return __hrtimer_get_remaining(timer, false); } =20 -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); =20 extern bool hrtimer_active(const struct hrtimer *timer); =20 diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 8cfc7aa..8a19a61 100644 --- 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 =3D this_cpu_ptr(&hrtimer_bases); - u64 expires =3D KTIME_MAX; + ktime_t expires =3D KTIME_MAX; =20 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 on= e 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 =3D this_cpu_ptr(&hrtimer_bases); - u64 expires =3D KTIME_MAX; + ktime_t expires =3D KTIME_MAX; unsigned int active; =20 guard(raw_spinlock_irqsave)(&cpu_base->lock); diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index cbbb87a..3026a30 100644 --- 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_nex= t) * If the next highres timer to expire is earlier than 'next_event', the * idle governor needs to know that. */ - next_event =3D min_t(u64, next_event, - hrtimer_next_event_without(&ts->sched_timer)); + next_event =3D min(next_event, hrtimer_next_event_without(&ts->sched_time= r)); =20 return ktime_sub(next_event, now); } diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 04d928c..655a8c6 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1932,7 +1932,7 @@ static void timer_recalc_next_expiry(struct timer_bas= e *base) */ static u64 cmp_next_hrtimer_event(u64 basem, u64 expires) { - u64 nextevt =3D hrtimer_get_next_event(); + u64 nextevt =3D ktime_to_ns(hrtimer_get_next_event()); =20 /* * If high resolution timers are enabled