Message ID | 20230510072817.116056-6-anna-maria@linutronix.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp3436441vqo; Wed, 10 May 2023 00:47:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5wlTusASNrO8MGPwHPXDKCtW3nHen4iP1swgqLs8StISyvAdwZG/ryeIDjtQlTJTN3ypyB X-Received: by 2002:a05:6a21:6da3:b0:101:438d:2567 with SMTP id wl35-20020a056a216da300b00101438d2567mr6696843pzb.31.1683704843118; Wed, 10 May 2023 00:47:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683704843; cv=none; d=google.com; s=arc-20160816; b=YF0KooO22RnvhrwyZ/vkFK56dqZsgJwyCpyPK2vRkhpUXt2DVYMPUPSbKjbnujkbBT lZFfYEKOYGahYOLm+2NXORvcor+Nig8QenEaD5BnZWdt/jz3ri+fUbSbwh7GK1HnLCjG j/dKr/k9lgdkY8efviO3Z/qhWuk8azamdY5A7qAYbyM1MaDr7AnflxatMP4765H7S+x6 MvVpVV7mpsjUDiV4xPPbACee1t+y9OB8FpDpF+7VEkPNnamVBehmGMmrerklrf3cvgAs BGs8/szzs81Vm79BqVqSipb33V6mn7/QC5QlCA3Gl4Aob1jlCUxmNM40ZoOlyziKLWBG vIzw== 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=HxmCND6qgUOL8dSwqTz+jvdhC0vJDN9Q/b7YApMcna0=; b=a1D9iKu2OvO6E7hU6hzMasCnK3e2xDFl2gFf2tNEcDDtYOCFvehYHPL79ihQsiZlOV SfgOcNfgngI+JkPOFSBpNbIt6r0EH73trd6ZY/sBPHQegSEE2EBdXmYGqukGJAscz8m7 6FLz+fuhvLLTvmz3jJeRjfXbYZ/43KwOO/Jw9tPNQIbkJfyVRyaoLUiRHBrpscPOAHAL DuJ/l+p0+Xsb8XTwKSDxnS+lQgYuimYBEWO4Zh5a+KK5YiB4ZIkXtWGWBTPIZ3GICYu1 sfkVQJgDDSjLqGmxcxUQPhc0PC0t1mzwXepdi5/Mb8PTv8p/eB1gLuRVo9fxFCNqETZZ RN3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=XWUWH0Gs; 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 j3-20020a636e03000000b0053059dfafe4si1062809pgc.86.2023.05.10.00.47.10; Wed, 10 May 2023 00:47:23 -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=XWUWH0Gs; 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 S235952AbjEJH32 (ORCPT <rfc822;jeantsuru.cumc.mandola@gmail.com> + 99 others); Wed, 10 May 2023 03:29:28 -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 <rfc822;linux-kernel@vger.kernel.org>); 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 <linux-kernel@vger.kernel.org>; Wed, 10 May 2023 00:28:52 -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=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 <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>, Steven Rostedt <rostedt@goodmis.org>, Sebastian Siewior <bigeasy@linutronix.de>, Giovanni Gherdovich <ggherdovich@suse.cz>, Lukasz Luba <lukasz.luba@arm.com>, "Gautham R . Shenoy" <gautham.shenoy@amd.com>, Anna-Maria Behnsen <anna-maria@linutronix.de>, Frederic Weisbecker <frederic@kernel.org> 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: 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,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: <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?1765492489532410385?= X-GMAIL-MSGID: =?utf-8?q?1765492489532410385?= |
Series |
timer: Move from a push remote at enqueue to a pull at expiry model
|
|
Commit Message
Anna-Maria Behnsen
May 10, 2023, 7:28 a.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 | 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 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 @@ -1934,9 +1942,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