From patchwork Wed May 24 07:06:22 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: 98335 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2651082vqo; Wed, 24 May 2023 00:11:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5AKhsSesOVaIHsIHh6pORKvAtAoUkIlEv4ixD/PI9OipSC3bq0HSxEl3TVhe4a/g5fODu3 X-Received: by 2002:a17:90a:d98f:b0:253:62c2:4e1b with SMTP id d15-20020a17090ad98f00b0025362c24e1bmr14135092pjv.48.1684912263165; Wed, 24 May 2023 00:11:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684912263; cv=none; d=google.com; s=arc-20160816; b=mWpZAuYm16Lou0+bbKmWZvpUi4JyxRypYkdIQ0JCUixIFke0yJOPeRb9vqP/0RO20R nxRcuQTESIURiWPf4h91GDDlkqEUCZKG9feEHVBLuBGYaaHwFrqv9txSDAHSaV70Rg/H wBcVlFjfR85S/bDnwcMLaw34AuqfXeWeqBQ6qFExEMG/NXGppT5NCT344NC1maa5kJRR Ee4tSufrNzcVSSy6sXpREqGQ3faC4ZoTLDhJFjBKAi+QU6x8oS2EsP+lvVI+NINOyX5f Qqq1ZkXt8EfMSIx1pHoSMpHdERGEEUgj5kiigrukcflNhTXhc/CDkXF7diWoJyTZMPD/ 2EPA== 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=toZ3+ufortFTTBI6OBlc3a3bWizxyvQL3TeTeVCWUqU=; b=hvYAMllEu+dAA5MPXf1l8Jn84VGUuVj7FGbSVtg21TDArxedyhQ/TQMkY1ZxLjcdiv TN2j56rexjg60+gcOYADSphBCN5jnvIqFzjWWbMQq5napNm9AbffxoqnoGrbCF4A6DbB /2FJ5R/qEny8YI1gBXs741IAQq7PLp7TTsUwHFjqV9fsGk7CH4NoGrUWx3MPiEZayD9p rZUoyGExibY74yv6Nd0ZrY0bTtWt4WaJU+E84t6QxX6qdi7USg5cLY3IlJWTT/GvzTSb jwKqqn5HYBI0SCoIhc7CjzcHMj54C18vIUm5bpzq1HTFfPG6kxKLkzXr+IIGcH0WHCfV fvEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=U34zMuW1; 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 d23-20020a17090ab31700b0025352448b95si411036pjr.172.2023.05.24.00.10.50; Wed, 24 May 2023 00:11:03 -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=U34zMuW1; 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 S239592AbjEXHIL (ORCPT + 99 others); Wed, 24 May 2023 03:08:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239900AbjEXHHf (ORCPT ); Wed, 24 May 2023 03:07:35 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1212D9B for ; Wed, 24 May 2023 00:07:05 -0700 (PDT) From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1684912023; 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=toZ3+ufortFTTBI6OBlc3a3bWizxyvQL3TeTeVCWUqU=; b=U34zMuW1T+0NnQXAvVtSY/xZY7B7AQ7PK8D6JhE/lZ1vlJJHSyGCug8oKFSSY6GfcUSSem OM4sDozDQ4U0INnjdI3PqmVxW7nh64lVuYkniLfwzSvxwbrJxXCtCa4ZFWTb2i00I6APFe dpt+deuVti3Iz2xiYd7oJ6Tr8tVnItyPTYwLdWzBvigEbXV52YFOFu0at7N7LNQE1zJ653 ouL0EHo+QPmUrip6shzvzXom8mYh+fTYI2YKXsG2zjZBZgGkurWZ2FxKGoLzzUGJG6zU/b pz5DNTg3yX5Y2iKbF2oBAP685kys/zSFqBsNpFRNwB+PeV8ctvXzgGw9Is2Dig== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1684912023; 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=toZ3+ufortFTTBI6OBlc3a3bWizxyvQL3TeTeVCWUqU=; b=8TaUbW9PT2Pjl6QzwXtZA7s6O4RZP3SC15HsBKLr6IdomKYrFDQbeYwL8DNCNf+UBNnkEZ zZ7dqhWkv502wlAA== 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 v7 14/21] timer: Split out "get next timer interrupt" functionality Date: Wed, 24 May 2023 09:06:22 +0200 Message-Id: <20230524070629.6377-15-anna-maria@linutronix.de> In-Reply-To: <20230524070629.6377-1-anna-maria@linutronix.de> References: <20230524070629.6377-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 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?1766758560837519342?= X-GMAIL-MSGID: =?utf-8?q?1766758560837519342?= The functionality for getting the next timer interrupt in get_next_timer_interrupt() is split into a separate function fetch_next_timer_interrupt() to be usable by other call sites. This is preparatory work for the conversion of the NOHZ timer placement to a pull at expiry time model. No functional change. Signed-off-by: Anna-Maria Behnsen Reviewed-by: Frederic Weisbecker --- v6: s/splitted/split v5: Update commit message v4: Fix typo in comment --- kernel/time/timer.c | 91 +++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 41 deletions(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index e4b50760da3f..4bb6c168d106 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1973,6 +1973,46 @@ static unsigned long next_timer_interrupt(struct timer_base *base) return base->next_expiry; } +static unsigned long fetch_next_timer_interrupt(struct timer_base *base_local, + struct timer_base *base_global, + unsigned long basej, u64 basem, + struct timer_events *tevt) +{ + unsigned long nextevt_local, nextevt_global; + bool local_first; + + nextevt_local = next_timer_interrupt(base_local); + nextevt_global = next_timer_interrupt(base_global); + + /* + * Check whether the local event is expiring before or at the same + * time as the global event. + * + * Note, that nextevt_global and nextevt_local might be based on + * different base->clk values. So it's not guaranteed that + * comparing with empty bases results in a correct local_first. + */ + if (base_local->timers_pending && base_global->timers_pending) + local_first = time_before_eq(nextevt_local, nextevt_global); + else + local_first = base_local->timers_pending; + + /* + * Update tevt->* values: + * + * If the local queue expires first, then the global event can + * be ignored. If the global queue is empty, nothing to do + * either. + */ + if (!local_first && base_global->timers_pending) + tevt->global = basem + (u64)(nextevt_global - basej) * TICK_NSEC; + + if (base_local->timers_pending) + tevt->local = basem + (u64)(nextevt_local - basej) * TICK_NSEC; + + return local_first ? nextevt_local : nextevt_global; +} + /* * Forward base clock is done only when @basej is past base->clk, otherwise * base-clk might be rewind. @@ -2005,7 +2045,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem) struct timer_events tevt = { .local = KTIME_MAX, .global = KTIME_MAX }; unsigned long nextevt, nextevt_local, nextevt_global; struct timer_base *base_local, *base_global; - bool local_first, is_idle; + bool is_idle; /* * Pretend that there is no timer pending if the cpu is offline. @@ -2020,8 +2060,11 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem) raw_spin_lock(&base_local->lock); raw_spin_lock_nested(&base_global->lock, SINGLE_DEPTH_NESTING); - nextevt_local = next_timer_interrupt(base_local); - nextevt_global = next_timer_interrupt(base_global); + nextevt = fetch_next_timer_interrupt(base_local, base_global, + basej, basem, &tevt); + + nextevt_local = base_local->next_expiry; + nextevt_global = base_global->next_expiry; /* * We have a fresh next event. Check whether we can forward the @@ -2030,21 +2073,6 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem) forward_base_clk(base_local, nextevt_local, basej); forward_base_clk(base_global, nextevt_global, basej); - /* - * Check whether the local event is expiring before or at the same - * time as the global event. - * - * Note, that nextevt_global and nextevt_local might be based on - * different base->clk values. So it's not guaranteed that - * comparing with empty bases results in a correct local_first. - */ - if (base_local->timers_pending && base_global->timers_pending) - local_first = time_before_eq(nextevt_local, nextevt_global); - else - local_first = base_local->timers_pending; - - nextevt = local_first ? nextevt_local : nextevt_global; - /* * Bases are idle if the next event is more than a tick away. Also * the tick is stopped so any added timer must forward the base clk @@ -2057,6 +2085,9 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem) /* We need to mark both bases in sync */ base_local->is_idle = base_global->is_idle = is_idle; + raw_spin_unlock(&base_global->lock); + raw_spin_unlock(&base_local->lock); + /* * If the bases are not marked idle, i.e one of the events is at * max. one tick away, then the CPU can't go into a NOHZ idle @@ -2069,31 +2100,9 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem) if (time_before(nextevt, basej)) nextevt = basej; tevt.local = basem + (u64)(nextevt - basej) * TICK_NSEC; - goto unlock; + tevt.global = KTIME_MAX; } - /* - * If the bases are marked idle, i.e. the next event on both the - * local and the global queue are farther away than a tick, - * evaluate both bases. No need to check whether one of the bases - * has an already expired timer as this is caught by the !is_idle - * condition above. - */ - if (base_local->timers_pending) - tevt.local = basem + (u64)(nextevt_local - basej) * TICK_NSEC; - - /* - * If the local queue expires first, then the global event can be - * ignored. The CPU wakes up before that. If the global queue is - * empty, nothing to do either. - */ - if (!local_first && base_global->timers_pending) - tevt.global = basem + (u64)(nextevt_global - basej) * TICK_NSEC; - -unlock: - raw_spin_unlock(&base_global->lock); - raw_spin_unlock(&base_local->lock); - tevt.local = min_t(u64, tevt.local, tevt.global); return cmp_next_hrtimer_event(basem, tevt.local);