From nobody Wed Feb 11 10:53:02 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 948BEC7EE22 for ; Wed, 10 May 2023 07:29:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235938AbjEJH33 (ORCPT ); Wed, 10 May 2023 03:29:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236094AbjEJH3T (ORCPT ); Wed, 10 May 2023 03:29:19 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDA5B76AF for ; Wed, 10 May 2023 00:28:52 -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=HxmCND6qgUOL8dSwqTz+jvdhC0vJDN9Q/b7YApMcna0=; b=XWUWH0GscHjTRl3H4xgx88NZeHsgTy4iUqZjXr+6uKPVXYXGjZ7FR+WzX93IMLB/U0a8QX 1Q2Wdk2UKSe0ULh6w0nnTsvVaPK1APdofX/PD9H5BDwACYUJeCYLpGukIjl1yyafieh6N4 avwjdy1/caXB5FoBo1DDqigwbMKBQHZB7yFs7XaUDWbQQU0Tjtz0teGqHND1X1elbBdunW 7JUeOTyuKZkoV+yF6PH7aomNAJ2aEkhArzMV+KZHrcqrRDEXN9xgQEw/pV/ncWTrIgpnC/ EoNhcmyM93tn1hXPoCLiVatqLkHirp4jVyaxG3Wgd03XtFtlDDQXFMugykF8uQ== 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=HxmCND6qgUOL8dSwqTz+jvdhC0vJDN9Q/b7YApMcna0=; b=nGLlMHuPr9HC7/Yc0uHmIVoEAaPrSfCoVswkLV+jVtDPjSywRiSgeLp8vYai7CYqYVtvOK ItGyXcefco+T15Cw== 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 05/21] timer: Split next timer interrupt logic Date: Wed, 10 May 2023 09:28:01 +0200 Message-Id: <20230510072817.116056-6-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" Logic for getting next timer interrupt (no matter of recalculated or already stored in base->next_expiry) is split into a separate function "next_timer_interrupt()" to make it available for new call sites. No functional change. Signed-off-by: Anna-Maria Behnsen Reviewed-by: Thomas Gleixner Reviewed-by: Frederic Weisbecker --- kernel/time/timer.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 59f2e15733ab..1a61977f9efa 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1908,6 +1908,14 @@ static u64 cmp_next_hrtimer_event(u64 basem, u64 exp= ires) return DIV_ROUND_UP_ULL(nextevt, TICK_NSEC) * TICK_NSEC; } =20 +static unsigned long next_timer_interrupt(struct timer_base *base) +{ + if (base->next_expiry_recalc) + next_expiry_recalc(base); + + return base->next_expiry; +} + /** * get_next_timer_interrupt - return the time (clock mono) of the next tim= er * @basej: base time jiffies @@ -1934,9 +1942,8 @@ u64 get_next_timer_interrupt(unsigned long basej, u64= basem) return expires; =20 raw_spin_lock(&base->lock); - if (base->next_expiry_recalc) - next_expiry_recalc(base); - nextevt =3D base->next_expiry; + + nextevt =3D next_timer_interrupt(base); =20 /* * We have a fresh next event. Check whether we can forward the --=20 2.30.2