From patchwork Tue Oct 24 08:52:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 157302 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1805270vqx; Tue, 24 Oct 2023 01:52:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFkKFLTWAfgsyiWLMz9RNbqFehQ7vuIVgppB6LRQu/f06b+3WzoOZ4I/+hP0ihkB2KVwrtI X-Received: by 2002:a17:90b:a48:b0:27d:21dd:258f with SMTP id gw8-20020a17090b0a4800b0027d21dd258fmr9926738pjb.37.1698137566057; Tue, 24 Oct 2023 01:52:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698137566; cv=none; d=google.com; s=arc-20160816; b=PTWz21SUdwR/orpM5Ir5iKiaBRIOgV0Ci6ckjWl6KpY89eZV1ES1bBW2U67KwKKkMg HI9o6MZEOjuSSwsqh2f4/G+8fHCTAq/tiZgtlrWXUFHvJXTX657iGaI3FptiyA/rbDJK RsQrpJjY9fPJj9zDd4mtCbO2fozzTfJNnUB+miZdAHKfmQSO6hbB8Ex+Rdw2H87zIML4 h9lBI8QaCnhKvvmYgz1S2CrOrUhqwP0PDguReu/GFb+TFr6b5/1nN9aHnHCoj9voGDCc 0kpAw5lYNjv5GJoy/cStb7xcUcZwjJP63wSh+qNutQuA5HO1W+y9Uf5XXE6JzD6Pszm0 eJxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=aYLSgSmfEX5h8g1Cbl2QcHxaZ5RLzEHT9cO/7p5eK40=; fh=py3/rF+0WXabj6bLqGaRNzfsxbNn7U4liua4z23pYuY=; b=zKXDcBa1eZ85ipWwCoEl0V7GTsE0sKsv3fTcthv+eEBFWyqpwaMXXloZlIeCo12PZd VNxQHjNiIVwaxVK8GQ4saHu1eMo8WqlA3AYw54unrCIGuhGkhRd+LEsYyL22buxGKWfT MhEJ3mIlFbOpkfI6T+WS6ETNOq4Up2bSFaJvdZzNlZ/Af6tExd+v5f47mnOp64eg/uM+ FA6ue+UGF1jNAiapaSjWKQ672y7xtgLLHJaCBfsXdg9UJmpMyVo5dAgjdKNqe7Po2RlT If/xOiuet3oEJl0rnEd2E5CWQ5KTYBcXcWM0ApI2dKGE1PzDscRX7Nd80xaZqtQHl+Ux MxOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=dqPk5plG; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id lw17-20020a17090b181100b0027756e1f0c2si8524601pjb.7.2023.10.24.01.52.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 01:52:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=dqPk5plG; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id D5DE38030BA5; Tue, 24 Oct 2023 01:52:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233992AbjJXIwg (ORCPT + 26 others); Tue, 24 Oct 2023 04:52:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233939AbjJXIwc (ORCPT ); Tue, 24 Oct 2023 04:52:32 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 864C0D7B; Tue, 24 Oct 2023 01:52:27 -0700 (PDT) Date: Tue, 24 Oct 2023 08:52:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1698137545; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aYLSgSmfEX5h8g1Cbl2QcHxaZ5RLzEHT9cO/7p5eK40=; b=dqPk5plGFRfPN6j5SsqQ2dLpn9CstUX5V+BwlWsGlZftHcfZd9DWea06+YsU1kwSQKOopR wfQ4WR5G4Gi033by+kFDDh8GoqI+gK1EhrSImndhD67WV6dm5kDPr5/lqWLK0YjrBpbP2B rSknM388wB5k3cZAiGUb7b2NtzCrT5aRUZuXuGd/qOTomho/f68LY91TI8v0KtH/0liYMW sKwi/A7hpnRQ2B9lnAO6MiO+iSfeHKLJzq9RZGzi1yC39MGOs2okDWtRkhd0kKamRm84+F VhjP7bTwYAL0tCd0BoCM61dTEtYAQZQd+/53ioan/sevpCYrbWDqYloPIXoHRA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1698137545; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aYLSgSmfEX5h8g1Cbl2QcHxaZ5RLzEHT9cO/7p5eK40=; b=FAywwt2CHktB+tK0j79Tdakp8Lj6tZQlmXXwKdX95RZH4KSwL0ATbumMyFKWz6z3nqjLOe eFGtfjnFbikdMbAQ== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched/fair: Remove SIS_PROP Cc: "Peter Zijlstra (Intel)" , Vincent Guittot , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231020134337.GD33965@noisy.programming.kicks-ass.net> References: <20231020134337.GD33965@noisy.programming.kicks-ass.net> MIME-Version: 1.0 Message-ID: <169813754422.3135.6065400628387990388.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 24 Oct 2023 01:52:44 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780282294319890164 X-GMAIL-MSGID: 1780626296149636000 The following commit has been merged into the sched/core branch of tip: Commit-ID: 984ffb6a4366752c949f7b39640aecdce222607f Gitweb: https://git.kernel.org/tip/984ffb6a4366752c949f7b39640aecdce222607f Author: Peter Zijlstra AuthorDate: Fri, 20 Oct 2023 12:35:33 +02:00 Committer: Peter Zijlstra CommitterDate: Tue, 24 Oct 2023 10:38:44 +02:00 sched/fair: Remove SIS_PROP SIS_UTIL seems to work well, lets remove the old thing. Signed-off-by: Peter Zijlstra (Intel) Acked-by: Vincent Guittot Link: https://lkml.kernel.org/r/20231020134337.GD33965@noisy.programming.kicks-ass.net --- include/linux/sched/topology.h | 2 +- kernel/sched/core.c | 5 +--- kernel/sched/fair.c | 48 +--------------------------------- kernel/sched/features.h | 1 +- kernel/sched/sched.h | 3 +-- 5 files changed, 59 deletions(-) diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h index 4c14fe1..de545ba 100644 --- a/include/linux/sched/topology.h +++ b/include/linux/sched/topology.h @@ -109,8 +109,6 @@ struct sched_domain { u64 max_newidle_lb_cost; unsigned long last_decay_max_lb_cost; - u64 avg_scan_cost; /* select_idle_sibling */ - #ifdef CONFIG_SCHEDSTATS /* load_balance() stats */ unsigned int lb_count[CPU_MAX_IDLE_TYPES]; diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 5e1fb8a..7a0c161 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3792,9 +3792,6 @@ ttwu_do_activate(struct rq *rq, struct task_struct *p, int wake_flags, if (rq->avg_idle > max) rq->avg_idle = max; - rq->wake_stamp = jiffies; - rq->wake_avg_idle = rq->avg_idle / 2; - rq->idle_stamp = 0; } #endif @@ -9953,8 +9950,6 @@ void __init sched_init(void) rq->online = 0; rq->idle_stamp = 0; rq->avg_idle = 2*sysctl_sched_migration_cost; - rq->wake_stamp = jiffies; - rq->wake_avg_idle = rq->avg_idle; rq->max_idle_balance_cost = sysctl_sched_migration_cost; INIT_LIST_HEAD(&rq->cfs_tasks); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 523b5ae..8767988 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7209,45 +7209,9 @@ static int select_idle_cpu(struct task_struct *p, struct sched_domain *sd, bool struct cpumask *cpus = this_cpu_cpumask_var_ptr(select_rq_mask); int i, cpu, idle_cpu = -1, nr = INT_MAX; struct sched_domain_shared *sd_share; - struct rq *this_rq = this_rq(); - int this = smp_processor_id(); - struct sched_domain *this_sd = NULL; - u64 time = 0; cpumask_and(cpus, sched_domain_span(sd), p->cpus_ptr); - if (sched_feat(SIS_PROP) && !has_idle_core) { - u64 avg_cost, avg_idle, span_avg; - unsigned long now = jiffies; - - this_sd = rcu_dereference(*this_cpu_ptr(&sd_llc)); - if (!this_sd) - return -1; - - /* - * If we're busy, the assumption that the last idle period - * predicts the future is flawed; age away the remaining - * predicted idle time. - */ - if (unlikely(this_rq->wake_stamp < now)) { - while (this_rq->wake_stamp < now && this_rq->wake_avg_idle) { - this_rq->wake_stamp++; - this_rq->wake_avg_idle >>= 1; - } - } - - avg_idle = this_rq->wake_avg_idle; - avg_cost = this_sd->avg_scan_cost + 1; - - span_avg = sd->span_weight * avg_idle; - if (span_avg > 4*avg_cost) - nr = div_u64(span_avg, avg_cost); - else - nr = 4; - - time = cpu_clock(this); - } - if (sched_feat(SIS_UTIL)) { sd_share = rcu_dereference(per_cpu(sd_llc_shared, target)); if (sd_share) { @@ -7301,18 +7265,6 @@ static int select_idle_cpu(struct task_struct *p, struct sched_domain *sd, bool if (has_idle_core) set_idle_cores(target, false); - if (sched_feat(SIS_PROP) && this_sd && !has_idle_core) { - time = cpu_clock(this) - time; - - /* - * Account for the scan cost of wakeups against the average - * idle time. - */ - this_rq->wake_avg_idle -= min(this_rq->wake_avg_idle, time); - - update_avg(&this_sd->avg_scan_cost, time); - } - return idle_cpu; } diff --git a/kernel/sched/features.h b/kernel/sched/features.h index f770168..a3ddf84 100644 --- a/kernel/sched/features.h +++ b/kernel/sched/features.h @@ -49,7 +49,6 @@ SCHED_FEAT(TTWU_QUEUE, true) /* * When doing wakeups, attempt to limit superfluous scans of the LLC domain. */ -SCHED_FEAT(SIS_PROP, false) SCHED_FEAT(SIS_UTIL, true) /* diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index ef4fe7b..2e5a954 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1059,9 +1059,6 @@ struct rq { u64 idle_stamp; u64 avg_idle; - unsigned long wake_stamp; - u64 wake_avg_idle; - /* This is used to determine avg_idle's max value */ u64 max_idle_balance_cost;