From nobody Wed Feb 11 10:52:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7909CC77B7D for ; Wed, 10 May 2023 07:29:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236081AbjEJH3Q (ORCPT ); Wed, 10 May 2023 03:29:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235899AbjEJH2z (ORCPT ); Wed, 10 May 2023 03:28:55 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C46D7D90 for ; Wed, 10 May 2023 00:28:39 -0700 (PDT) From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1683703718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zI+0rerNf99sxfZIFO3XWHcHmkxmJchxL7sCWUUXfOI=; b=cubjBPJ6w7yZsWbNwTtfJiVIkOdWjbLVzWAKrA/CxiHY70vdb82ccK7VPJmgc6J45GXpsz ZJUISZremxccjGXa1MMQ4ENiQf7QWVjG5cNnEXe6L/d0Z449yW9FUQI9ybiP4C1G3+X/Bm +C6ZVcBJSJgPo0Hzfo4PjRCeJxvnPF9cKAhpaAadBuVdaPgk5KaUabADlIP12zVpCHDWlk C91vPCWTyeuPG+5TaTripFMz0lSTIQdzsW5NqYmh/ooXydaKTI3HUYaKHdQPheY0ZfHJv9 CHrjLcKjpqzFez8aqrfxhOsHUqxAfotmgSAnoI2UExZt8ABPy2rUfyFSpPphCg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1683703718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zI+0rerNf99sxfZIFO3XWHcHmkxmJchxL7sCWUUXfOI=; b=qHDgQCtXSdmZ/zO2kHapQ/1F28a/IGTGVsZppPRHxB8YM8kzsBMjT8rjWlmBWcEGf/QhkV lzfB0lb6SBMx95DA== To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , John Stultz , Thomas Gleixner , Eric Dumazet , "Rafael J . Wysocki" , Arjan van de Ven , "Paul E . McKenney" , Frederic Weisbecker , Rik van Riel , Steven Rostedt , Sebastian Siewior , Giovanni Gherdovich , Lukasz Luba , "Gautham R . Shenoy" , Anna-Maria Behnsen , Frederic Weisbecker Subject: [PATCH v6 04/21] timer: Move store of next event into __next_timer_interrupt() Date: Wed, 10 May 2023 09:28:00 +0200 Message-Id: <20230510072817.116056-5-anna-maria@linutronix.de> In-Reply-To: <20230510072817.116056-1-anna-maria@linutronix.de> References: <20230510072817.116056-1-anna-maria@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Both call sites of __next_timer_interrupt() store return value directly in base->next_expiry. Move the store into __next_timer_interrupt() and to make its purpose more clear, rename function to next_expiry_recalc(). No functional change. Signed-off-by: Anna-Maria Behnsen Reviewed-by: Thomas Gleixner Reviewed-by: Frederic Weisbecker --- v6: Fix typos in commit message and drop not required return as suggested by Peter Zijlstra) v4: rename function as suggested by Frederic Weisbecker --- kernel/time/timer.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 0699fd14d00a..59f2e15733ab 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1800,8 +1800,10 @@ static int next_pending_bucket(struct timer_base *ba= se, unsigned offset, /* * Search the first expiring timer in the various clock levels. Caller must * hold base->lock. + * + * Store next expiry time in base->next_expiry. */ -static unsigned long __next_timer_interrupt(struct timer_base *base) +static void next_expiry_recalc(struct timer_base *base) { unsigned long clk, next, adj; unsigned lvl, offset =3D 0; @@ -1867,10 +1869,9 @@ static unsigned long __next_timer_interrupt(struct t= imer_base *base) clk +=3D adj; } =20 + base->next_expiry =3D next; base->next_expiry_recalc =3D false; base->timers_pending =3D !(next =3D=3D base->clk + NEXT_TIMER_MAX_DELTA); - - return next; } =20 #ifdef CONFIG_NO_HZ_COMMON @@ -1934,7 +1935,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64= basem) =20 raw_spin_lock(&base->lock); if (base->next_expiry_recalc) - base->next_expiry =3D __next_timer_interrupt(base); + next_expiry_recalc(base); nextevt =3D base->next_expiry; =20 /* @@ -2017,7 +2018,7 @@ static inline void __run_timers(struct timer_base *ba= se) WARN_ON_ONCE(!levels && !base->next_expiry_recalc && base->timers_pending); base->clk++; - base->next_expiry =3D __next_timer_interrupt(base); + next_expiry_recalc(base); =20 while (levels--) expire_timers(base, heads + levels); --=20 2.30.2