From patchwork Wed May 10 07:28:00 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: 91931 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp3436070vqo; Wed, 10 May 2023 00:46:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ75/wOgDBsSDh+dkjBt48WTnYJps9Roz49CY8PhS4kM/WBQJPyXMorRA+TyZazkhpUNlyq3 X-Received: by 2002:a17:902:e751:b0:1ab:1eca:f6b6 with SMTP id p17-20020a170902e75100b001ab1ecaf6b6mr23277096plf.13.1683704791815; Wed, 10 May 2023 00:46:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683704791; cv=none; d=google.com; s=arc-20160816; b=AOqEJ4o8jwdKAAdkU3FJRSpnwW2wTRwt7mK5ye4jffXWiyDhNo12k8m4v+bo/oMChY 0twLbs+6hAzFdNPlbjsApUInK1QMrjc6T6ifon739i3az67Zgkckxu5EGF8QGTPDjVYG vFb6y5g7tP9u+5m+jb17UoB4/NmMqiQnPM2btiroQeJC03bhOq2a/h4By6Pi6QOWBsE4 UbvskxDAz/l+WFgTMnMzTp7ObFKfUHGUP/CieaGmw5CmjvN0yIra4waTMc7eq9uzFchc sws1jvMDzDwK2xjYSAOdKS+y4NdNS+vlajsG2qiuZj0LmOfAEu3jILA951HRObSUJIhF q/nA== 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=zI+0rerNf99sxfZIFO3XWHcHmkxmJchxL7sCWUUXfOI=; b=iKnMPYCFvK348rMcpN7uzCYi0LPeSHfXiA+oOndDUmsHV5B7LNRvi891bUs7RA50Y+ QRC7BzsTg+N3bDMZ16Lc0FTHPa1CdpMndhRBj0DdL31Oj3+HoJPWys7jtoDJMU+p90oh 2896EFlJ1uVGqFd7HE73qErSnZNFIXOaQgLHQNsFCZhv6o1D7mdGXMzm0HBUME3GCIAh RCVsCfv0fAUEo1g+L5nZvgZtQipW7MtKu5Mjrl/OXw8M1NyWq307btOJLGtOt4idlA4a j+3TB5+/JHi2VLsziZp64ndlhPZ9isARwmna7YG91bQM7qafJ7100L1am51LQgzDY3If zJvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=cubjBPJ6; 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 u10-20020a17090282ca00b001ac94b7f2f0si3251857plz.523.2023.05.10.00.46.20; Wed, 10 May 2023 00:46:31 -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=cubjBPJ6; 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 S236079AbjEJH3P (ORCPT + 99 others); Wed, 10 May 2023 03:29:15 -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 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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1765492435976511861?= X-GMAIL-MSGID: =?utf-8?q?1765492435976511861?= 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 *base, 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 = 0; @@ -1867,10 +1869,9 @@ static unsigned long __next_timer_interrupt(struct timer_base *base) clk += adj; } + base->next_expiry = next; base->next_expiry_recalc = false; base->timers_pending = !(next == base->clk + NEXT_TIMER_MAX_DELTA); - - return next; } #ifdef CONFIG_NO_HZ_COMMON @@ -1934,7 +1935,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem) raw_spin_lock(&base->lock); if (base->next_expiry_recalc) - base->next_expiry = __next_timer_interrupt(base); + next_expiry_recalc(base); nextevt = base->next_expiry; /* @@ -2017,7 +2018,7 @@ static inline void __run_timers(struct timer_base *base) WARN_ON_ONCE(!levels && !base->next_expiry_recalc && base->timers_pending); base->clk++; - base->next_expiry = __next_timer_interrupt(base); + next_expiry_recalc(base); while (levels--) expire_timers(base, heads + levels);