From patchwork Fri Nov 4 14:57:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna-Maria Behnsen X-Patchwork-Id: 15612 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp453529wru; Fri, 4 Nov 2022 07:58:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6wyY1mEfH7HR9e6vkjQDCGZ91Bn8ACgzDUj+bRtnhoS5hW9j5weZck8kbI/JawKINKtiD7 X-Received: by 2002:a05:6402:847:b0:45c:c716:4b76 with SMTP id b7-20020a056402084700b0045cc7164b76mr36132116edz.113.1667573935653; Fri, 04 Nov 2022 07:58:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667573935; cv=none; d=google.com; s=arc-20160816; b=yb0dKhVBr9t0fBCOq/nmKqOlh8MHklEofshC/NQL8+q1c51xy8MT9EztnNAdSqXCl/ vBKwpjfULCC9x7fT4RZoLPYIrxbYzspiH/p7iDC2sytLCcjllbHiHr5riz2txpCjG+i+ 8ONPTfYwYemQmyGHEcqFDT/9oj/CMmvMWs2gJtHBC1wArIwHRnNSVBKsFI2tdWGi/8Y+ QrSE3PJzCzQHEb0CYu8ckWE6Ro9NWH+VfnYxEkiqzYR1EANuMk/WEjT1C1YjPEdu70B2 0EL/ICUg5H4oYZmX0tj2ftP9DYX0KvdJEx0yPIELvzFt3DjYwE+kry44cndvPZfqbnsn lWvQ== 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=5SYFJLwFPZaNWscBGLUeDFCSexiFqWz1WiWI/WoTB14=; b=X4irYEBHZNySIiTbnFouDCyP29xMyDkqwh2RdDI4+g1SxufanK/7L9xp0BVRSqBjRx 47/Lgk0GKDFhEW6JI67bjwZ6ED1R1BQoOyk1UJfCK3Ld3s6jbVLnks7v9KVG6nHn8YDY a6zaiWXBF0iX8CN6DfnuoQDYX1jYyjta8JkVCPbYC0jQ327lgYRKOJyX3zS1LPjO69yo HpN517SIz1BtdYKHrDVNvmDqA255cKbCht1r+kZ/w1E5f4PjOM3jvVwx6hNT2GkvH8EB 0/6zSCa0g8kSsZ0O77jgxY1uHiBkqIyqLJ4i+pC0ihJ4vabtVgF2KcO7P0Fn0hzRzq4N CmOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=HepTyuV7; 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 j14-20020a05640211ce00b00458ac23f0b8si6177845edw.399.2022.11.04.07.58.31; Fri, 04 Nov 2022 07:58:55 -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=HepTyuV7; 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 S232199AbiKDO56 (ORCPT + 99 others); Fri, 4 Nov 2022 10:57:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229900AbiKDO54 (ORCPT ); Fri, 4 Nov 2022 10:57:56 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3042A2EF24 for ; Fri, 4 Nov 2022 07:57:55 -0700 (PDT) From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1667573873; 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=5SYFJLwFPZaNWscBGLUeDFCSexiFqWz1WiWI/WoTB14=; b=HepTyuV7cID1C6WhAFE5nDOjWovpqnf2mAD+QoOGGtwSB2pzdpjQpFbtanayuzYfIxZBlj DpjP8aKCE+zvmVQ7CEQRmzL3mQfgMC8fOS+nNb7FCdGVHb3PgPEOKF7TAzFpYQtHWtZuKC FTHIXytnit5sNnDqSc7ulMD9nSDY/bOydhleEbiRAYfLgoM0T7II3MAsghJGPVlz18fK37 r7UCrr6jiNtGfBAjzjgBrjdsuFKWlcNcD5/IiyyQ8TDuAJhUEsTmjDdjjjcxllUt829kyr +iVxsJiyAMhktP2JMtuqtNIcF0TZ4kKKobS4qg4SMfbSm5fzWRtdZufUlc3UoA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1667573873; 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=5SYFJLwFPZaNWscBGLUeDFCSexiFqWz1WiWI/WoTB14=; b=y36jNLIMEgsBqxw3naxkOK6Uo0wMHAOxboaACW0IAppPXCX8uFHWUmBI9B1Zl7G/MZG7aj FA/TKfCCFzaIsyCw== 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 Subject: [PATCH v4 02/16] timer: Move store of next event into __next_timer_interrupt() Date: Fri, 4 Nov 2022 15:57:23 +0100 Message-Id: <20221104145737.71236-3-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 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?1748578006934558106?= X-GMAIL-MSGID: =?utf-8?q?1748578006934558106?= Both call sides of __next_timer_interrupt() store return value directly in base->next_expiry. Move the store into __next_timer_interrupt() and to make purpose more clear, rename function to next_expiry_recalc(). No functional change. Signed-off-by: Anna-Maria Behnsen Reviewed-by: Thomas Gleixner --- v4: rename function as suggested by Frederic Weisbecker --- kernel/time/timer.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 717fcb9fb14a..2fd5de648d7c 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1571,8 +1571,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; @@ -1638,10 +1640,11 @@ 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; + return; } #ifdef CONFIG_NO_HZ_COMMON @@ -1701,7 +1704,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; /* @@ -1784,7 +1787,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);