From patchwork Fri Dec 1 09:26:45 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: 172357 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp992026vqy; Fri, 1 Dec 2023 01:28:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IFlGFcySYzBXdFZ0/zEBJz0Z9eZh5BkLG/BZiYOXzprY8ZeHc6dwQ7aiq6i8bG3gopGRp8H X-Received: by 2002:a05:6a00:3989:b0:6c3:1b90:8552 with SMTP id fi9-20020a056a00398900b006c31b908552mr26241198pfb.17.1701422922204; Fri, 01 Dec 2023 01:28:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701422922; cv=none; d=google.com; s=arc-20160816; b=iEUOfA6d0A1WChgbNu7nUW86pfbhwraSeTeKpb6s7NJGvzeoPc1KHePDqllZ6tAQJg BqhHPFvlnTW95booII7ofnLzb1EktBqzgN8bq1QyEWGlxIOeuhy/hCa64bpTmzIXwqrD UEQr1oNiocZMqyu4/Hq9kiRxOSmH46iT+oAh8bli106DcbxBBm2Rt9KDyE7szrWX68kj jX2f4NtcKBMr7jFylIkVsLTWmlRIvWttXE36X1nLE8O6PYk2+MAeeUQyCULUfw5Y6CFC kyDzbojh252inJGXVPL750HK1QNE7wYraXg8s7GF2zQ7cvNrSD2Pr5QVhNOCE6saBVPG hdgw== 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=IdBDR0/tYNJhJm6cSGNxPr1uzJXFKTmkB6lItnLpMig=; fh=Qsvhj/y6vhUDpzzDJgUZ1ZrqVjoqsWAHfqtsSs/uzrU=; b=u9ccqCIQs3wwTcxx4nbf2lYyJhAgwoD48E2nvzK5QfBz8Jrx69VJdT76wvTwWwzilF o8I4GfeXj7HPSr7F85MVTo3vEalsSCgddAsraTnXUO+md469FGJfs+vzUNHm+jmbIQFq dnEuY13Z7oiwvM4FpbgmRq+AU5y0Yd9vHl02m2sGN0Skk6aCfz739SdLHSxCGr9AZuNJ Q1RK8ltPyzrXKJ0rO7Yn7lJ/1rf3hyYUSEPD0oIsG6WDma3ujBXTjQKro223LALWaXgR IaJO1BH6hbZhgQgWNEMFHZx8osl2UIpUd1ed2jvjOnKcFXIFiBacoVFcvx56lggEsa4b PeKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=3VH7dqj9; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=ObRXt5dM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id f7-20020a056a00228700b006cdef1e9ab8si2545617pfe.245.2023.12.01.01.28.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 01:28:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=3VH7dqj9; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=ObRXt5dM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 7ED28815CD84; Fri, 1 Dec 2023 01:28:39 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378057AbjLAJ21 (ORCPT + 99 others); Fri, 1 Dec 2023 04:28:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378167AbjLAJ16 (ORCPT ); Fri, 1 Dec 2023 04:27:58 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 439561BD6 for ; Fri, 1 Dec 2023 01:27:24 -0800 (PST) From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1701422842; 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=IdBDR0/tYNJhJm6cSGNxPr1uzJXFKTmkB6lItnLpMig=; b=3VH7dqj99SCQxtKQ1cSHqIAwzHimk0La70Y55WoifDDH6FVLlQTD7yElldyys8j5ak6Ljq YM2qwCAcIoxkO3hle8SiRG4mhPdiNBC/EL0AwtvgMX4Kqp1sbL/KJu9cLEaFC1rpO7xrQr D42gEzHFUKk9udutpeiMZHyEuXmMHcC/OsdsNl1AYyKkSb8mRAHkzDl6n6TU3xEWUhsY3K usjBau79n5bQPwp4uEWs/boCxqsThIyOccM08vg6aBAC9p8HXqfiG9EV+O2fxtx/1XSuGd 0lItm/ND1gNEZOUCslMqCpUE3+It9I2+8K80cO721GJVXTEDDgT7kZwG9JbByA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1701422842; 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=IdBDR0/tYNJhJm6cSGNxPr1uzJXFKTmkB6lItnLpMig=; b=ObRXt5dMA2n4hQG6FSjAmMYBdk0L7rGzSvM/iGKlEi37gmbtj9rRCfhmDpjRCr0+YuSwYw jMbfdkMFH/57TNBQ== 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 v9 23/32] timers: Retrieve next expiry of pinned/non-pinned timers separately Date: Fri, 1 Dec 2023 10:26:45 +0100 Message-Id: <20231201092654.34614-24-anna-maria@linutronix.de> In-Reply-To: <20231201092654.34614-1-anna-maria@linutronix.de> References: <20231201092654.34614-1-anna-maria@linutronix.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, 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 lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 01 Dec 2023 01:28:39 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784071241643567206 X-GMAIL-MSGID: 1784071241643567206 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 --- 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 366ea26ce3ba..0d53d853ae22 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); @@ -1983,10 +1988,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. @@ -1995,7 +2001,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]); @@ -2022,13 +2028,31 @@ 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 unlock; } + /* + * 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; + /* * We have a fresh next event. Check whether we can forward the * base. @@ -2058,9 +2082,12 @@ static inline u64 __get_next_timer_interrupt(unsigned long basej, u64 basem, trace_timer_base_idle(base_local->is_idle, base_local->cpu); } +unlock: 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); }