From patchwork Wed May 10 07:28:06 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: 91918 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp3430085vqo; Wed, 10 May 2023 00:31:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4I5uolHTfq8gSPegqBbCQv1G0IqjMDIWGVx4BxCw0dO+714s/fC6XBwXak2KEaeZylAHjY X-Received: by 2002:a17:902:b94c:b0:1a9:8769:36b7 with SMTP id h12-20020a170902b94c00b001a9876936b7mr16810543pls.5.1683703911056; 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=WRMAc4qzdJ7MZjuBbXcNG+OKa26EbCXuBUml723SMWjMLUG9htxElbaAOKcMtp06rT w0xWTQr28vhOq34jWmodq8Wj4JhKf6ktrYxIfF/8nKr5gLK0FiNZvuNOu5z4oZAsSvu7 Ha3tAS9DmpzjlZfOA7skdGhwBW2UuN2uAElPO2REBl0w+V7lsDAvnx+KzxS0Iia4N9SV 2xltQ5RWPKPnpTYYDIE6kN6Lt46pGPZqwPL19xhgHri/1/izb8/2eHXCviCaNMFOLj5J OJ6smJslrzYSkfuOKn+RQgtYyysUsLFsWO5L2AH5dRBynL8Ihk2qw2sOyH1oAEZjJuIt lNmg== 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=LtOGw35GRW9p2fx5MhyE24mUeYiFRQ6uZYmjDalJe0M=; b=z6P664e5/5iFGAmgiPW9zcaksCS/QGnrccQ8zb6ghA3EEhz/BcUy3p8Vw+3+EIH3oF D1sP8ulBTt0vUojkOZgv02lYaxo49cn2GKj9s/2VrHYQM4nHOCWGnvtVz5UqDjH4IW6w pn+fHSOUFSTJ5uynaWtZg/DbLePpbQkr2Nzike86GQX6fWxwUoChD+1f70BJ8YXP0Pgm Pp94cNDk4EIu1sYFchYiMnvxCri3jXQ9q0j/zeS7XErURxKnRRjfHojmMXZqajRUtHoy zXWPPA3QZwv9cqvJja9DirhGpn60mE1WK+XLsOyuNMxeCcGKrUGR4sFJycNCsH4Xk8xp zY3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=g43kSLsC; 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 y5-20020a17090322c500b001ac718c3fc6si3649911plg.78.2023.05.10.00.31.36; 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=g43kSLsC; 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 S236226AbjEJH34 (ORCPT + 99 others); Wed, 10 May 2023 03:29:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235989AbjEJH3Y (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 B8FBE7D9E 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=1683703721; 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=LtOGw35GRW9p2fx5MhyE24mUeYiFRQ6uZYmjDalJe0M=; b=g43kSLsCvsBVYt75QYo04ZxrbB29sC2d+aq9pvzsoClHr1seHUwqJkztn/XgKOFRIFE9y1 JEs1Mcmz/tmhNYEOK0yDxAHf5gFHj9dua+rM69MZ3BAfN40fVs19yVxTOyKSo+WESXmBZ3 JH0/6w9U7VfTvDDVVHZeH/HBmc/4KMXbwGjxih5LvQljMsOJ3ub0sShZ34Ge2i+6rHleTD 25bgQbgG8F3fC0Sl1XAaC0hLUnzdCYiGLkBJzeRyKIiz7bo68iAVnj5JL2lgdqE8zPg00J LXQXnWbk5rO3KzUC7j5TDIWDGjO6bHEMiuibTuzzXZwmJMKZHxZkAcV3V0cRaA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1683703721; 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=LtOGw35GRW9p2fx5MhyE24mUeYiFRQ6uZYmjDalJe0M=; b=cKwyVn7or9yQccCxK2Rm204woR9anf0wh7qVDvxMzmu4DFf0GoQoJ1yEZ1B/vouRtywvn7 nC7j3KTcBt0P0ZDw== 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 10/21] timers: Ease code in run_local_timers() Date: Wed, 10 May 2023 09:28:06 +0200 Message-Id: <20230510072817.116056-11-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?1765491512131727390?= X-GMAIL-MSGID: =?utf-8?q?1765491512131727390?= The logic for raising a softirq the way it is implemented right now, is readable for two timer bases. When increasing numbers of timer bases, code gets harder to read. With the introduction of the timer migration hierarchy, there will be three timer bases. Therefore ease the code. No functional change. Signed-off-by: Anna-Maria Behnsen Reviewed-by: Frederic Weisbecker --- v5: New patch to decrease patch size of follow up patches --- kernel/time/timer.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index b7599216d183..749b1570bdcd 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -2093,16 +2093,14 @@ static void run_local_timers(void) struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]); hrtimer_run_queues(); - /* Raise the softirq only if required. */ - if (time_before(jiffies, base->next_expiry)) { - if (!IS_ENABLED(CONFIG_NO_HZ_COMMON)) - return; - /* CPU is awake, so check the deferrable base. */ - base++; - if (time_before(jiffies, base->next_expiry)) + + for (int i = 0; i < NR_BASES; i++, base++) { + /* Raise the softirq only if required. */ + if (time_after_eq(jiffies, base->next_expiry)) { + raise_softirq(TIMER_SOFTIRQ); return; + } } - raise_softirq(TIMER_SOFTIRQ); } /*