Message ID | 20221104145737.71236-4-anna-maria@linutronix.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp453697wru; Fri, 4 Nov 2022 07:59:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM44mAI4TTCnb4+HR61RWwyg97dzcU1cjwMnhU6BNR/vmogT+Ckt+8vpnj3ZbDh7vMoqxAy6 X-Received: by 2002:a17:907:1de6:b0:7a5:ea4b:ddbb with SMTP id og38-20020a1709071de600b007a5ea4bddbbmr35143281ejc.757.1667573953288; Fri, 04 Nov 2022 07:59:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667573953; cv=none; d=google.com; s=arc-20160816; b=jLqoXqlfGD5SjRYasmjKN7qB834/f03fPjgwI6VCXzQ+kjbKEobarbuvNs0wXSt+6D YAoMkZA9+jBsVupxsZwpsGYB0f1CymNclR7RLxJjcgdPb6d1IX3+F4jwAYYecj4+8Nyn DlNmCYeAGPU+s3/fi6ukSLtrbj6fRjmVCFqdaLD3dgq/yTEQthUflx1mdRe5NHtRWt+/ Ay1rVxhBm0N/baCbiLv83vRWH3vxMlzh3qiBKv89a8Cw/W4lqozW9RLwbos2t4JfjCxR 8Cb0SNi5CF48wyeIJuOSpI7NdRR3x1S+QtDO/FW5veosJzREvtmRNs7s3JzP10JNo7VF Gk4Q== 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=TfKpQBhTGidhSKvCEygfZZ4AX4EB6wM0N8LXrGnUD24=; b=USlQCzqAcl12sSJLJo1IxfcSELrBpA24EvTuUOxe68HJvNTSy4l8FGGDxUjJphyfHW 2NEEXh8fqkscTEQD9PUaZzgzoJlUHdDstnIcfEthJjisCP11gNcLI7ZLaWOWEHvYPKnN W9SNoBQKS7hhB8KdRo3HY9Cb3tIlU4Hyd7VE0dKaaBxixbBJpg8FRTuKC3hyrOI3g+AN jsnVgaZyE2OqG4XmYpRccizCeWMDS8z784k6kihSb9t6El3szMZqlwQqKeTtzO+HROH3 DMWkfhfGHGQ9aaSIWX5pV8ccfbEo3WIUyCn6Jvh1D4MajZw10LMTSZsZJXH58wRgoOiL TZXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Li15vs6H; dkim=neutral (no key) header.i=@linutronix.de; 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 u1-20020a1709064ac100b0077cfec3a52fsi3891705ejt.839.2022.11.04.07.58.49; Fri, 04 Nov 2022 07:59:13 -0700 (PDT) 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=Li15vs6H; dkim=neutral (no key) header.i=@linutronix.de; 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 S231903AbiKDO6R (ORCPT <rfc822;jimliu8233@gmail.com> + 99 others); Fri, 4 Nov 2022 10:58:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231901AbiKDO55 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 4 Nov 2022 10:57:57 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A76DA2EF67 for <linux-kernel@vger.kernel.org>; Fri, 4 Nov 2022 07:57:55 -0700 (PDT) From: Anna-Maria Behnsen <anna-maria@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1667573874; 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=TfKpQBhTGidhSKvCEygfZZ4AX4EB6wM0N8LXrGnUD24=; b=Li15vs6HYf2iWUIGpE4I1OaOJmwT7R+ogU+5n+djOv+2u2zdPW7B4EQp6vAiS9RuJOlFId enH2ahXusKWnGN+ALobtamjmrupAMOAXNBXnXu1CCxGlzPKMFvh7/+It5kKUnLPh6aSTTE Yzu+y9b7+n74NxalFS69SPWHKNaM2UOVzOxu0irdhf7EDkw5YfHQ/U3O4/QmBXzUghf0t4 wcq+r9MBiobk9xeDuxt/QzBrCxR6DkuVrW4uET+VO1ffPunu8QrkIvV5SXzmQrW4z7yO2u DqtONqF9xIhaTzOodPOx2f1VxME4m8tTvzsX36KicLE5b0T86UdFKXy/Jh4MHQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1667573874; 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=TfKpQBhTGidhSKvCEygfZZ4AX4EB6wM0N8LXrGnUD24=; b=/ldAXVLBpjPFC9LLcqYeRHoQ5QvVVt44qSu/1rWNPnSiE+Cp1FRl8h2wIXyzbaE1eR9iWy wE8xaPJVKR6jhuAg== To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra <peterz@infradead.org>, John Stultz <jstultz@google.com>, Thomas Gleixner <tglx@linutronix.de>, Eric Dumazet <edumazet@google.com>, "Rafael J . Wysocki" <rafael.j.wysocki@intel.com>, Arjan van de Ven <arjan@infradead.org>, "Paul E . McKenney" <paulmck@kernel.org>, Frederic Weisbecker <fweisbec@gmail.com>, Rik van Riel <riel@surriel.com>, Anna-Maria Behnsen <anna-maria@linutronix.de>, Frederic Weisbecker <frederic@kernel.org> Subject: [PATCH v4 03/16] timer: Split next timer interrupt logic Date: Fri, 4 Nov 2022 15:57:24 +0100 Message-Id: <20221104145737.71236-4-anna-maria@linutronix.de> In-Reply-To: <20221104145737.71236-1-anna-maria@linutronix.de> References: <20221104145737.71236-1-anna-maria@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748578025679528303?= X-GMAIL-MSGID: =?utf-8?q?1748578025679528303?= |
Series |
timer: Move from a push remote at enqueue to a pull at expiry model
|
|
Commit Message
Anna-Maria Behnsen
Nov. 4, 2022, 2:57 p.m. UTC
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 <anna-maria@linutronix.de> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Frederic Weisbecker <frederic@kernel.org> --- kernel/time/timer.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 2fd5de648d7c..4547d2efcb86 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1681,6 +1681,15 @@ 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 @@ -1703,9 +1712,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