From patchwork Wed May 24 07:06:29 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: 98340 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2651416vqo; Wed, 24 May 2023 00:11:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6lCmg5IjcJ5JKjvNJHoZRU7/7RcQSXvbhLmR+ohtHmVEW7iJIsyFp0oMldVg8V6kWdpbHv X-Received: by 2002:a17:902:f809:b0:1ad:e19f:bb66 with SMTP id ix9-20020a170902f80900b001ade19fbb66mr13964154plb.12.1684912304454; Wed, 24 May 2023 00:11:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684912304; cv=none; d=google.com; s=arc-20160816; b=mluFYzCxTUfEUrHLMBv1PgY45dK2qS+MTVD3R1Dz+8Ie7c1Hg+3YuvMzC23aiMAip9 Qr/pe+ZfV2Lc0QPdLQYXne+A988NFAh4477C5ZPvPQwQhDvzfnpZW1wzIlRjCavQf7WA RmIdzPBsbqQNx6OdGqXSC1E/gTLooYB13UT9G9YLscdaLwf+3ilVt2ks2AQ+wheBJTcK pqezbscEDcOEPw9BAXwzVeOP8hgTe0hWfzxGwCs6JZx5WOkek1xhbtXIRmLFTTd7fq6m 3Xha3Rho3yuBPXkuC8I7LAA37dc2p3F5Y3O4hY09EioHAZufjCCV4BOJq6t3feInnTkS Ktdw== 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=PX0GvnZSgqnY7ujdUpceDcnNQERZiJCc/4B3rZc0yHo=; b=Kj4ChQyY98aKiOMcG7RfJLPLuv5sbD8eefi63cYA5BGRtYalMMUPJrO7ZB3jlRvcoK /VNe3h7LzkHkASAyDmiblMchRts7uUtfRC/2FQTIV7dvZW7GDcu/1UwRJlQH7VE8SfXF C8cB/qUghVS6pN++NUFxKaPJrpulGRaFtaz/0al6FsDpumanLrBFZR7/1XJcatPJ523L 1R0JDmmf8tWjNL+lwc1jPRrVo8AsCE+SFp7KLJaYlh61cOCrFCgooDCnBPn1TnVUOlAN 470QaQDqVsylrzABRVT061HbVkAsbe83gBEJ7wKfMIidqZAKJuJlM/pil98VJzg5drur o5eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=M1lPBF68; 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 i191-20020a6387c8000000b0051b1b5917f6si5176027pge.160.2023.05.24.00.11.31; Wed, 24 May 2023 00:11:44 -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=M1lPBF68; 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 S239580AbjEXHIh (ORCPT + 99 others); Wed, 24 May 2023 03:08:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236054AbjEXHHs (ORCPT ); Wed, 24 May 2023 03:07:48 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E254E4C for ; Wed, 24 May 2023 00:07:09 -0700 (PDT) From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1684912027; 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=PX0GvnZSgqnY7ujdUpceDcnNQERZiJCc/4B3rZc0yHo=; b=M1lPBF6845MzsyeOBpjLeY1pl8JgglaBl2uHsm3bwxPuuZWmq+QSirNVsls5WMnSiNCFKG 4MqE3IHpGtJP137BrpDVIbWx8i2UxrtQjMlU2xgvHY2O8Au4kB24qHoSXdDKGdd3rma9Su NcFMLMjcAjeQA9hYFNJ8P/L+tHboXwxkIlJDQ2BENHnItXcSPspiaSpcpTbPYvWw9Plgc2 gALlUvfZeN3ocZF01n9aTw9r7OnsXqlILeqXYiwkNJbDfBxELm3mT60g51RmrhrDIFI/L+ VHSG6X03uZOkl3gHU+b8YF0aJWGxxDx9QMkv5DI7ax7bvMk7FvlLyMNMdSiM6Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1684912027; 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=PX0GvnZSgqnY7ujdUpceDcnNQERZiJCc/4B3rZc0yHo=; b=+crOMjFeguP3vUg6/IQZCce+puEbkWgVGvZRsY2g8vVwueZ4wcL0A73C7NsiRL4C2JcigC o41MRjH8uIEJcuCg== 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 , Richard Cochran Subject: [PATCH v7 21/21] timer: Always queue timers on the local CPU Date: Wed, 24 May 2023 09:06:29 +0200 Message-Id: <20230524070629.6377-22-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?1766758604439703407?= X-GMAIL-MSGID: =?utf-8?q?1766758604439703407?= The timer pull model is in place so we can remove the heuristics which try to guess the best target CPU at enqueue/modification time. All non pinned timers are queued on the local CPU in the separate storage and eventually pulled at expiry time to a remote CPU. Originally-by: Richard Cochran (linutronix GmbH) Signed-off-by: Anna-Maria Behnsen --- v6: - Update TIMER_PINNED flag description. v5: - Move WARN_ONCE() in add_timer_on() into a previous patch - Fold crystallball magic related hunks into this patch v4: Update comment about TIMER_PINNED flag (heristic is removed) --- include/linux/timer.h | 14 ++++---------- kernel/time/timer.c | 42 ++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 32 deletions(-) diff --git a/include/linux/timer.h b/include/linux/timer.h index 6f96661480dd..c39ae2ad0035 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -50,16 +50,10 @@ struct timer_list { * workqueue locking issues. It's not meant for executing random crap * with interrupts disabled. Abuse is monitored! * - * @TIMER_PINNED: A pinned timer will not be affected by any timer - * placement heuristics (like, NOHZ) and will always expire on the CPU - * on which the timer was enqueued. - * - * Note: Because enqueuing of timers can migrate the timer from one - * CPU to another, pinned timers are not guaranteed to stay on the - * initialy selected CPU. They move to the CPU on which the enqueue - * function is invoked via mod_timer() or add_timer(). If the timer - * should be placed on a particular CPU, then add_timer_on() has to be - * used. + * @TIMER_PINNED: A pinned timer will always expire on the CPU on which the + * timer was enqueued. When a particular CPU is required, add_timer_on() + * has to be used. Enqueue via mod_timer() and add_timer() is always done + * on the local CPU. */ #define TIMER_CPUMASK 0x0003FFFF #define TIMER_MIGRATING 0x00040000 diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 3a8c2c88f845..5602d411a70e 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -590,10 +590,13 @@ trigger_dyntick_cpu(struct timer_base *base, struct timer_list *timer) /* * We might have to IPI the remote CPU if the base is idle and the - * timer is not deferrable. If the other CPU is on the way to idle - * then it can't set base->is_idle as we hold the base lock: + * timer is pinned. If it is a non pinned timer, it is only queued + * on the remote CPU, when timer was running during queueing. Then + * everything is handled by remote CPU anyway. If the other CPU is + * on the way to idle then it can't set base->is_idle as we hold + * the base lock: */ - if (base->is_idle) + if (base->is_idle && timer->flags & TIMER_PINNED) wake_up_nohz_cpu(base->cpu); } @@ -941,17 +944,6 @@ static inline struct timer_base *get_timer_base(u32 tflags) return get_timer_cpu_base(tflags, tflags & TIMER_CPUMASK); } -static inline struct timer_base * -get_target_base(struct timer_base *base, unsigned tflags) -{ -#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON) - if (static_branch_likely(&timers_migration_enabled) && - !(tflags & TIMER_PINNED)) - return get_timer_cpu_base(tflags, get_nohz_timer_target()); -#endif - return get_timer_this_cpu_base(tflags); -} - static inline void forward_timer_base(struct timer_base *base) { unsigned long jnow = READ_ONCE(jiffies); @@ -1103,7 +1095,7 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option if (!ret && (options & MOD_TIMER_PENDING_ONLY)) goto out_unlock; - new_base = get_target_base(base, timer->flags); + new_base = get_timer_this_cpu_base(timer->flags); if (base != new_base) { /* @@ -2202,8 +2194,14 @@ 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; + /* + * base->is_idle information is required to wakeup a idle CPU when + * a new timer was enqueued. Only pinned timers could be enqueued + * remotely into a idle base. Therefore do maintain only + * base_local->is_idle information and ignore base_global->is_idle + * information. + */ + base_local->is_idle = is_idle; raw_spin_unlock(&base_global->lock); raw_spin_unlock(&base_local->lock); @@ -2233,13 +2231,13 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem) void timer_clear_idle(void) { /* - * We do this unlocked. The worst outcome is a remote enqueue sending - * a pointless IPI, but taking the lock would just make the window for - * sending the IPI a few instructions smaller for the cost of taking - * the lock in the exit from idle path. + * We do this unlocked. The worst outcome is a remote pinned timer + * enqueue sending a pointless IPI, but taking the lock would just + * make the window for sending the IPI a few instructions smaller + * for the cost of taking the lock in the exit from idle + * path. Required for BASE_LOCAL only. */ __this_cpu_write(timer_bases[BASE_LOCAL].is_idle, false); - __this_cpu_write(timer_bases[BASE_GLOBAL].is_idle, false); /* Activate without holding the timer_base->lock */ tmigr_cpu_activate();