From patchwork Wed May 10 07:28:07 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: 91919 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp3430088vqo; Wed, 10 May 2023 00:31:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7GwMgqA2EhK8w3iN3vv2LY2Y53qe5CFvpeixKg75JIyxrjGufPXDq+muJN4iIa4oSGkXMB X-Received: by 2002:a05:6a20:1048:b0:ff:1df3:51dd with SMTP id gt8-20020a056a20104800b000ff1df351ddmr18007502pzc.37.1683703911697; Wed, 10 May 2023 00:31:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683703911; cv=none; d=google.com; s=arc-20160816; b=gdzVYfJ8e62KSEtsnNnYfqIkx9oPq90GtxgTUOSFZsIE2qVGIqmZCOguBaWVtuqnKN CLWdA6Zd3eEu9Hi11SRth+ncK9SXZ/L9hJMaXLRGlvy7To1Zj+qosZu1+0AHboL+ZlJz eMzS76qGSFFIDzZh818EMBO9wzf7bAletZ/uAeM0JFk1KJkW4h26elfE9yEBwll44TJx Td3Lv67mQw3K7ge2r6bKDKV1BZMfH/6FPbATZTx1+bY0rP6BO6ovjw78GSXh0KYiiE63 etod0Yw902PqWleTujnwSxX8LEThWTOtQGe+/hwva2SQin11xBUCnUYevYKLtQ/foXH1 tR1g== 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=69v6KAzJ3Kkk+I5jf4FnTJ5YhbczmyAfH/JLKYuJ49U=; b=cKW1K+hDEsUKDqLgBwOt0cm1oqFj4v876xARh/8oPFHqdz5MKgRgfAeiCGDV26b5RY sShi/yChOozZYmsn1zl0UoVhfPZrdqQpcL03HGwgMJCASQggGtstl329lnT6JFl/E7Fi kE1qGEDlafgjy08C98duJCLGcE6bgKlYqnrlHu9ywk0o+twZH05EoV1MY7Ro6C774lcL Bf6yeE5hMlIq4Hctr9OAsDnwXOZ3V2e1Zxvanm2o3PKNmpJ2fIIJXOpP/aGiS9SySENo jnJO1cp22FgWHHdhKYjY1cYs5TWsU5PQ1leLWZWsq9faUtxnvpXFUQFOlsNYDmiZqbQe S0eA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="ort/MizP"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=NHF3tyxr; 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 a19-20020aa795b3000000b0064309797534si4461894pfk.182.2023.05.10.00.31.37; Wed, 10 May 2023 00:31:51 -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="ort/MizP"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=NHF3tyxr; 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 S236250AbjEJH37 (ORCPT + 99 others); Wed, 10 May 2023 03:29:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236162AbjEJH3Y (ORCPT ); Wed, 10 May 2023 03:29:24 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7A7A7DAA for ; Wed, 10 May 2023 00:28:56 -0700 (PDT) From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1683703722; 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=69v6KAzJ3Kkk+I5jf4FnTJ5YhbczmyAfH/JLKYuJ49U=; b=ort/MizPAQRjug1cpO5V76d+o0kH9EOtU3NooWECbmCMSHsUJ9BsPnYTvkoSGt0/FllTIF mPs2M4WwKbQaWnpmgfP7rM/XKAkmfnjK7RgP3JlafpaRkbzl2wD7FWQ6hpsyv6vIggPXmh yxIHR018jsAuub4Mrvl4B2lUt14741d4pKDJ4Nf7YEi/w3fekZ4TQpSFE7asccR7kmEvmM ynZD4SmgV8Gl0ewQygBRrXDT5NcGtqpeaEmYou2MJ1g0ryD76ES0j/ExwKXw3w7Zcl77i5 Yv1yHFsfV8SHoM19uY9sd6HcjXL7/yjM2RXfq6BXbbUr0flnLGPktKQ29DSRiQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1683703722; 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=69v6KAzJ3Kkk+I5jf4FnTJ5YhbczmyAfH/JLKYuJ49U=; b=NHF3tyxr5Z1uDfafIdKw68O2IwIGpYgOVy361Q8iRzykDyfB9A34s957lnuD2iBrsYrnTJ Z1w2voSoU9DipeBw== 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 11/21] timers: Create helper function to forward timer base clk Date: Wed, 10 May 2023 09:28:07 +0200 Message-Id: <20230510072817.116056-12-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?1765491512964841238?= X-GMAIL-MSGID: =?utf-8?q?1765491512964841238?= The logic for forwarding timer base clock is split into a separate function to make it accessible for other call sites. No functional change. Signed-off-by: Anna-Maria Behnsen Reviewed-by: Frederic Weisbecker --- v6: s/splitted/split v5: New patch to simplify next patch --- kernel/time/timer.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 749b1570bdcd..fcff03757641 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1956,6 +1956,21 @@ static unsigned long next_timer_interrupt(struct timer_base *base) return base->next_expiry; } +/* + * Forward base clock is done only when @basej is past base->clk, otherwise + * base-clk might be rewind. + */ +static void forward_base_clk(struct timer_base *base, unsigned long nextevt, + unsigned long basej) +{ + if (time_after(basej, base->clk)) { + if (time_after(nextevt, basej)) + base->clk = basej; + else if (time_after(nextevt, base->clk)) + base->clk = nextevt; + } +} + /** * get_next_timer_interrupt - return the time (clock mono) of the next timer * @basej: base time jiffies @@ -1987,15 +2002,9 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem) /* * We have a fresh next event. Check whether we can forward the - * base. We can only do that when @basej is past base->clk - * otherwise we might rewind base->clk. + * base. */ - if (time_after(basej, base->clk)) { - if (time_after(nextevt, basej)) - base->clk = basej; - else if (time_after(nextevt, base->clk)) - base->clk = nextevt; - } + forward_base_clk(base, nextevt, basej); /* * Base is idle if the next event is more than a tick away. Also