From patchwork Wed Feb 21 09:05:39 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: 204046 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp921032dyc; Wed, 21 Feb 2024 01:14:10 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXVXs67wSNiT99VPh6FlqxfnRPI+F9FicTMbJLVwAVKKGh2QzFp+8qbjC+5fZ2mHF56VU4+XBbrlLx/Krm/Nm7JVQIILg== X-Google-Smtp-Source: AGHT+IF4/OEf4QwKakhf9XRPeQYHIW7blOHhky49lgaAT5IJg6/oooKATRe4MWeelihppRFQ+YxQ X-Received: by 2002:a17:903:486:b0:1db:a2e7:1b94 with SMTP id jj6-20020a170903048600b001dba2e71b94mr13672590plb.19.1708506850001; Wed, 21 Feb 2024 01:14:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708506849; cv=pass; d=google.com; s=arc-20160816; b=S1TFHoBWm5TSzhXnaTT00Z4fYXGVrOxQpDCguyBhj+vnqdB8xEmbNG/24E3tD0ZqIF qQyqaxHgu1lvuYWV2ymOW0Y4lzio5dFGlTq1aIHdDLcLY/3cQc7G2nB9rhyadojwssOd vbqwpLYVZXxtsZCO/vk3EfUOFVxBClF9HwmR6JvQQvItll5b5lUUH4vL1rY9ej6r8QBC MacYoqeKIw755yhigUzPOcqisq+383c7ZXFErgpmJNTk96KHvz+zcpB6Urh2G5A4L/bt NoQ8Wui52+iW3GH7EOm0SPx/L46ULSaFFO5Hoz46uweRkU+5ayLhrbp+vqUx4mpaDKnM 0IXg== ARC-Message-Signature: i=2; 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=0rdV5ipuCK7k881Y4gsklU0XL1atEsQC6N/1j4oq3gU=; fh=UyYALGSm//Y7venVD8hN44UibCXnYUm1mVNGtcl9feo=; b=phMvVaLjwlq886+deR1DyG/iW4xODjALBn1OUFp7DIw5NUQcQ5EVqPJtWk5Lesa9cC HOHjc5Z0nCMzP+mxyBtV+zERjqxAXATMl39OLmpcNiQCB8uR0+Bv3v5/guIaSzR1FZ4i cQUnjhQ08snkPC7PCdiwYL3Bdg1366Z/yj0YJjXa1xVXh55yxEcXwhCQwH1l65YZEnR2 tcurkNtvWXfq/PwABvaVpuwpOGWkjkBQmp6E9GXfuPggeAjg5j0AkO0QYRd+5UmEVHGC 4qcXgOaCzBU5JefkjrnKqNmaBBEV7+vzpvQLndQRNiUonj2czSy+PfLpTZYqYwNVQfOl 2tEQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=erx+rjUr; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-74359-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74359-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id x10-20020a170902ec8a00b001db40e91bf8si7814557plg.249.2024.02.21.01.14.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 01:14:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-74359-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=erx+rjUr; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-74359-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74359-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 5DE11B21548 for ; Wed, 21 Feb 2024 09:10:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EB40446441; Wed, 21 Feb 2024 09:06:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="erx+rjUr"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="ALe/TX7h" 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 29F9E3D570 for ; Wed, 21 Feb 2024 09:06:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708506382; cv=none; b=j/jFcqXtP24xwM9p9WR3TSGQeBJHlB/IBmLwHamsGtSdle6+OKFQPBCWjc0N3oVjrDBwDyCfw8RNsdjsPrMRJWZKcj+TE5niGZswmQaouUeYC6MQRfORmIXLOS3IeDYmzckrvP7GwQJcH5FUplmD+Y8mttYHlB7K0BBwsKFKO1Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708506382; c=relaxed/simple; bh=+PFtgywkqe7EU2O4wsgXtoFK8yKu231t3eYiycwv0as=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=l2ggfdbk5fAl+h3Qw58r8ScCzH/SCpMdYqLiqxoeSSpvBE5wReMoUASKrF7I+1BRTyrXQXfeASM5Zvigr/pQ2Zx5R/UzZEp1rfKXFiLFxu0bho//Mmv63RpyZDKo/f3pu/1PLSGtpguGg9waG6tFVkFItWG4abfxbQ08s9LR3y8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=erx+rjUr; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=ALe/TX7h; arc=none smtp.client-ip=193.142.43.55 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=1708506373; 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=0rdV5ipuCK7k881Y4gsklU0XL1atEsQC6N/1j4oq3gU=; b=erx+rjUrJdkST1kCUsNdV3qpWn4r06LFiSqvkL7kmB4JHRJ9LiuzUpm9g63+X8yOzssUjl sk3O9UMZK+QH6OrOfToxhnMwwKJv1ABH8CinEpiw5cqz+SH+qjq3cEKUIa8C8BNxiXl3LV wZI8VvXSqNZ10X9/mTy02OFuQDVje6Diz8yLYnTqbyTr+wNtM/EO2CxMa/5At/82+G7Rq+ Tha+7iNgOUlyRPFqLDHPzjo2Xpy6f5jkAiVFTAjNPNKkt+B6MBN+ofr4agIfeSP5ongHnE vVuefPq1ocPlR932unA/U6qIYuFxxbCeHZyDVw/cufC81ligWvamgylWIbkKgg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708506373; 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=0rdV5ipuCK7k881Y4gsklU0XL1atEsQC6N/1j4oq3gU=; b=ALe/TX7h7OMA4pyk46Rv7ZfsqFG3JzoYB32BJWYlgCRvXZET1YkekoXmmuFdcUshUynjrc 9kP8mFmyhR+x/VCw== 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 , Christian Loehle , Anna-Maria Behnsen , Richard Cochran Subject: [PATCH v11 11/20] timers: Retrieve next expiry of pinned/non-pinned timers separately Date: Wed, 21 Feb 2024 10:05:39 +0100 Message-Id: <20240221090548.36600-12-anna-maria@linutronix.de> In-Reply-To: <20240221090548.36600-1-anna-maria@linutronix.de> References: <20240221090548.36600-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: 1791499278745587550 X-GMAIL-MSGID: 1791499278745587550 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); }