From patchwork Wed Mar 1 14:17:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna-Maria Behnsen X-Patchwork-Id: 62914 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3658384wrd; Wed, 1 Mar 2023 06:22:32 -0800 (PST) X-Google-Smtp-Source: AK7set9jaSC5AUYEijQ96csDKldgWwC3NkJdVjCX5YICSr7vYxQsOEiHtX8/RImySbCubl3iOoSs X-Received: by 2002:a17:906:859:b0:872:84dd:8903 with SMTP id f25-20020a170906085900b0087284dd8903mr6078371ejd.59.1677680552501; Wed, 01 Mar 2023 06:22:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677680552; cv=none; d=google.com; s=arc-20160816; b=rC4j7fu87X/sHt24lV5g/MZkqCfmGXhq1Asb4PwPffQioyBJY0HgPrZ5BISV+9P1gs vaemQ/zJYPzJVz9ty2GFoQ+PORE9CA7BknFwuLpVytlY6A6LEbmpfNcODdyu0GDXKpeU NdlF3IzTeiDoeimCbY+Qn0FpOF90WYqVdw6wieCHcoNB45Uge3hhAIpctEfhAnV+Enmf L3hvSQOJRHeEXaM1ctF7qnQNu0O0AFCfJlMz/eLw2EcV+za/fXDvs27V0+TezlfROvi9 PnDcQy/kW4hgnamIRIJzbblgYFwp9G8SRpBIfjkoOG0j0XyxChuENtTZ4ep8Pa48XySt hJzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:dkim-signature :dkim-signature:from; bh=A3VhrY17dPpOY3y4FlMoo2pmszX0SRI6dHh159vCceQ=; b=u1PqnD7FY970b0fltku/sS6fANrvyO2dOHctkGxxFiH8UeLkNt1Q6QWpoy+xLMKXHP adGqL3M6JL1f5HWyQPiH2MB3WIKSVjb3LgswoQDmbxGsadNJRaOZnYPVg75MgZKKuIaS nr23AYzxlD7WRoaEXyWcUUMaq0Nj4HRbz72CxboGFv0v3HNWQbphGlOisBcK6ZFjv6Po cWw7VpHmQaEEYJigb7OWQ8qZLKKciJvsHlsHwnCqlpeqH6IqYcJTsurUKA+Zu506U2Dr 5kL3nIaRw6h/Nlic3xpJMLlJ1eq8RhuMBfb8NP3b1nDP/wsMBheLW+RM6Uh8Vbdaho8F wWkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Zcha6x1H; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=iq9Z6Stf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b21-20020aa7c6d5000000b0049f1fb93929si1965024eds.164.2023.03.01.06.20.54; Wed, 01 Mar 2023 06:22:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Zcha6x1H; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=iq9Z6Stf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230051AbjCAOSV (ORCPT + 99 others); Wed, 1 Mar 2023 09:18:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230042AbjCAOSG (ORCPT ); Wed, 1 Mar 2023 09:18:06 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93C7C303C6 for ; Wed, 1 Mar 2023 06:18:05 -0800 (PST) From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1677680284; 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=A3VhrY17dPpOY3y4FlMoo2pmszX0SRI6dHh159vCceQ=; b=Zcha6x1HtunQVxVsE5cwm1zCjM17QNul8CZuCnZdpsd+0xfgMvLqTKgFOsJyVh09MRLaOO laXLfzFngjJL119Am6gvRYJnsGTXx+MlTNlJgwsHTbJWwN/Clj8JRiRkrINaQrVklaFoZb Kki/VJSYpu65N/DRF8iakrixsY2EPqHqCl/XHZ6WP1hfe57XwSPORenLPR2nhY7xZsapDK rbkS80MR9/AKm8e9WFpt1Lrrn8J9OOqB548uuCO/P7rLasKRMOroVO2SYET2lv8FtFf/1M 1pVDkAf4IHr6E16ODitO8+Z41PhIWwLHQWJRqkGjLf/cIzXrN7XkGyKBSjWy+w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1677680284; 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=A3VhrY17dPpOY3y4FlMoo2pmszX0SRI6dHh159vCceQ=; b=iq9Z6Stf0/aTlghbUUKcQsToba/xMsTjP5ZEpIa9jo7mP50KPoT0L0WOZixlsaeHZUMXXV CH5R+PzcM08S2WBA== 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 , Anna-Maria Behnsen , Frederic Weisbecker Subject: [PATCH v5 04/18] timer: Split next timer interrupt logic Date: Wed, 1 Mar 2023 15:17:30 +0100 Message-Id: <20230301141744.16063-5-anna-maria@linutronix.de> In-Reply-To: <20230301141744.16063-1-anna-maria@linutronix.de> References: <20230301141744.16063-1-anna-maria@linutronix.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759175563270795043?= X-GMAIL-MSGID: =?utf-8?q?1759175563270795043?= 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 08e855727ff8..9e6c2058889b 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1913,6 +1913,14 @@ static u64 cmp_next_hrtimer_event(u64 basem, u64 expires) return DIV_ROUND_UP_ULL(nextevt, TICK_NSEC) * TICK_NSEC; } +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 timer * @basej: base time jiffies @@ -1939,9 +1947,8 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem) return expires; raw_spin_lock(&base->lock); - if (base->next_expiry_recalc) - next_expiry_recalc(base); - nextevt = base->next_expiry; + + nextevt = next_timer_interrupt(base); /* * We have a fresh next event. Check whether we can forward the