From patchwork Mon Jan 15 14:37:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna-Maria Behnsen X-Patchwork-Id: 188187 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp1744116dyc; Mon, 15 Jan 2024 06:41:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IEgJQBkTjpuKuvU5S7Fnco9J3NB1MIm3hVJSIZ0mZbGhYcDvEXrFPrtMBd3pOrqGB7U8b0D X-Received: by 2002:aa7:cf04:0:b0:554:3ba8:f804 with SMTP id a4-20020aa7cf04000000b005543ba8f804mr2427622edy.28.1705329675428; Mon, 15 Jan 2024 06:41:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705329675; cv=none; d=google.com; s=arc-20160816; b=RVKeHh9q5gm44+ljjybMuHT7XCLd2qE+m6UWRHrnwiC5LLsnO/Sr9UiJ0XW55F/9Ym ZztAbPC9TsEZqmC148Fsbaq7AiuH0kAsBGDIIv1ULRgCTWUyA5CWAaL39LIHbv2yVzGj WyUWk1QHoDBWiCgVLvbHDzNRZMyDMdNloFgtUGRHdZkDK6ron7N3nzHynCBsCmhL885T IAKfF0+CzU0YdCTXQZE1PL+OdixOFvi5sjI/e+LtJ1slLJZdzD6UD9Qv7qusgsYRjzSO rmo8TIxj59jGAxcfo6Ze/gc5BVkm2bUrqG2pZk+V4GzOhcKIKZGWZkBjlW+w0WPFx/by Q+3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=Fr+0oSb+AndOblwVvQzleNBKd5oIVJXXyPBNDPB6wYY=; fh=Qsvhj/y6vhUDpzzDJgUZ1ZrqVjoqsWAHfqtsSs/uzrU=; b=s4p4w2zznOee0w9qV30JUL6nspIDqlLnuRIRIIyWK/7ifUOOsc51mxKsra4vmsAQT2 bOJO7lDRRCydwF+jTbXi2SsVsqnJXRoabeDmf5N/Q6Dr5bfxWurHNmNJt/IuSy0ULk11 VU8+ilmxYkLyhvKYS9Z4CJjlqJSpP0YGIe2Z7dtzAPCkyon9XZmoR/09BVjS+KSjVOUd /tAhaezsugyawwAdLJlJSBRxiZxmwmrjZ72EiaAp5ZzYlxZXo00uvJtnUhryBhzCAEyH 6wJlF9o1Rt+0bhme0lIJ3IBiyl356KJxQ07iUHzNqrBGlQdDNVUvkXCppUsuFDCns5e9 MUDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=YbSTa+5p; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel+bounces-26107-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26107-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id fj15-20020a0564022b8f00b005581ef9ccdesi4079914edb.318.2024.01.15.06.41.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 06:41:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-26107-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=YbSTa+5p; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel+bounces-26107-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26107-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id DBFC41F2289C for ; Mon, 15 Jan 2024 14:41:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9A7B818ED4; Mon, 15 Jan 2024 14:38:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="YbSTa+5p"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="tgJIiLML" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9314A17C7C for ; Mon, 15 Jan 2024 14:38:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1705329489; 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=Fr+0oSb+AndOblwVvQzleNBKd5oIVJXXyPBNDPB6wYY=; b=YbSTa+5pAcCvS4Wu/iTQy+7Efu4QkhWpb+LdmNJp3T/95XWrgehdESVtjUbLKPcQ8dqMlU xTtHaf5bF+8GKvsYaB8Zc4mQY3fFJllBcgiuJwZJVmpMbgjbBL6lGTx55h54r4OezUZbhJ IRfBUP3Fa9GZ2DU7soBptOC0lTWKHmFgDVNIl+gktGqF+yxvkowCu4DaEYTF5aWLhwyADV rhtl+MyMqATNTeqPe6pdPEZnmoqfzEb9MOzS/vp1sBQraZjg5f3rfPf69ytEIbn8MvtVPa JfKEhZ75t3n/omQyjat4E3DSeqNK2T2SXL16Hd0hAvPIDhx+wuEz99NmmAcH4Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1705329489; 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=Fr+0oSb+AndOblwVvQzleNBKd5oIVJXXyPBNDPB6wYY=; b=tgJIiLMLs5RmyS9MgTYmslgvJZvQpm6vHXIxjarUqg90tW0RG5XhKAJ8G2UwoJYq3URsi7 On9mOU4z1EnxBhAw== 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" , Srinivas Pandruvada , K Prateek Nayak , Anna-Maria Behnsen , Richard Cochran Subject: [PATCH v10 11/20] timers: Retrieve next expiry of pinned/non-pinned timers separately Date: Mon, 15 Jan 2024 15:37:34 +0100 Message-Id: <20240115143743.27827-12-anna-maria@linutronix.de> In-Reply-To: <20240115143743.27827-1-anna-maria@linutronix.de> References: <20240115143743.27827-1-anna-maria@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788167769884791416 X-GMAIL-MSGID: 1788167769884791416 timers separately For the conversion of the NOHZ timer placement to a pull at expiry time model it's required to have separate expiry times for the pinned and the non-pinned (movable) timers. Therefore struct timer_events is introduced. No functional change Originally-by: Richard Cochran (linutronix GmbH) Signed-off-by: Anna-Maria Behnsen Reviewed-by: Frederic Weisbecker --- v10: Fix no functional change message v9: Update was required (change of preceding patches) --- kernel/time/timer.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 5ca831444954..f119b44e44e0 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -221,6 +221,11 @@ struct timer_base { static DEFINE_PER_CPU(struct timer_base, timer_bases[NR_BASES]); +struct timer_events { + u64 local; + u64 global; +}; + #ifdef CONFIG_NO_HZ_COMMON static DEFINE_STATIC_KEY_FALSE(timers_nohz_active); @@ -1986,10 +1991,11 @@ static unsigned long next_timer_interrupt(struct timer_base *base, static inline u64 __get_next_timer_interrupt(unsigned long basej, u64 basem, bool *idle) { + struct timer_events tevt = { .local = KTIME_MAX, .global = KTIME_MAX }; unsigned long nextevt, nextevt_local, nextevt_global; struct timer_base *base_local, *base_global; - u64 expires = KTIME_MAX; bool local_first; + u64 expires; /* * Pretend that there is no timer pending if the cpu is offline. @@ -1998,7 +2004,7 @@ static inline u64 __get_next_timer_interrupt(unsigned long basej, u64 basem, if (cpu_is_offline(smp_processor_id())) { if (idle) *idle = true; - return expires; + return tevt.local; } base_local = this_cpu_ptr(&timer_bases[BASE_LOCAL]); @@ -2014,13 +2020,32 @@ static inline u64 __get_next_timer_interrupt(unsigned long basej, u64 basem, nextevt = local_first ? nextevt_local : nextevt_global; - if (base_local->timers_pending || base_global->timers_pending) { + /* + * If the @nextevt is at max. one tick away, use @nextevt and store + * it in the local expiry value. The next global event is irrelevant in + * this case and can be left as KTIME_MAX. + */ + if (time_before_eq(nextevt, basej + 1)) { /* If we missed a tick already, force 0 delta */ if (time_before(nextevt, basej)) nextevt = basej; - expires = basem + (u64)(nextevt - basej) * TICK_NSEC; + tevt.local = basem + (u64)(nextevt - basej) * TICK_NSEC; + goto forward; } + /* + * 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; + +forward: /* * We have a fresh next event. Check whether we can forward the * base. @@ -2051,6 +2076,8 @@ static inline u64 __get_next_timer_interrupt(unsigned long basej, u64 basem, raw_spin_unlock(&base_global->lock); raw_spin_unlock(&base_local->lock); + expires = min_t(u64, tevt.local, tevt.global); + return cmp_next_hrtimer_event(basem, expires); }