From patchwork Wed Feb 1 14:36:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 51361 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp316455wrn; Wed, 1 Feb 2023 06:42:31 -0800 (PST) X-Google-Smtp-Source: AK7set9naT52CKYAHACOw+ETeC0fyMUcbbbfvSByh6dEGLNYfbuLpLSwgs0fNn7t3VSAHuMc9mzA X-Received: by 2002:a17:906:c30b:b0:878:7cf3:a9e7 with SMTP id s11-20020a170906c30b00b008787cf3a9e7mr2767993ejz.65.1675262551120; Wed, 01 Feb 2023 06:42:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675262551; cv=none; d=google.com; s=arc-20160816; b=0tIonI2OyvaHnjie+zxINk3sBFVJxzW7iAVu1utcfyqphKLUKlH7PV/i/JfsOfJO5c tcre4UKxVMcQRXjxgjLR52sGkY7TowYqILRxZlIxhLRhzKiGTVmW45CDKtJNB2hf5L74 VWKgMyrLf/bF+tjtfhjRaXY5n0vSKtA16N1FLs0zOwX3DlxCv7Whs6QRYyq5vS7s5uUD UB6K+JiSOMsAGF480vpDxekUuUOOXVXhfbsE+1dFQEhmXc4v3gYKvQUwOgwtCVgO+S9K crr60+G1ItMQ3kYKZg28WZgf+/7zGS2PGvEU1uCafHkvQhYIeoPu5bePHmgF9Q8kQU0A E69w== 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:from :dkim-signature; bh=GVFffFUJyNe63P9deX/q/1x3JqOMjHMY9wDsGNLAhQY=; b=MOFN91DQOo+/XIFIrgWh5fhdtHuTIVpTwO8P0vni7XEHveSPYl2XhJ34FdYD4H5e/I MoPio+g7QxgKZhmK84iSITybOIzyeKeHnLCrkUG6PKfUnKPcgkaDOmH83+LNvZYSLdf+ UUHvZq0GxfWevU/TnZt1wpY5KiWznbg7Rzrcksofok8PbXojnJrJN//F1294Pc6ewG/X rahcRAmrQYfUG9rwtVh88TIBnoZU21ma2lBGHQ+HMENFwmmyHWwf6i2Gdv5ZbueAMiD9 Tst1gF+jrgY1356OWgehaujpTf1IDnynb9MaRAd0G75rxRqMImt0QIogtHgj+yNXQcZ+ NOWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nQoLDhX2; 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=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id wi15-20020a170906fd4f00b0087bce1ccb1dsi17384151ejb.48.2023.02.01.06.42.07; Wed, 01 Feb 2023 06:42:31 -0800 (PST) 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=@linaro.org header.s=google header.b=nQoLDhX2; 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=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232471AbjBAOgp (ORCPT + 99 others); Wed, 1 Feb 2023 09:36:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232305AbjBAOgh (ORCPT ); Wed, 1 Feb 2023 09:36:37 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DB9C48A1F for ; Wed, 1 Feb 2023 06:36:35 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id k8-20020a05600c1c8800b003dc57ea0dfeso1566631wms.0 for ; Wed, 01 Feb 2023 06:36:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GVFffFUJyNe63P9deX/q/1x3JqOMjHMY9wDsGNLAhQY=; b=nQoLDhX2M8zRGalNQj4VJ9YYRnwMuT93/fFzauSFDXE8V5j21MFrqIsiXzY/Cd85rN aXpBoA3jsl0AdcdAEUsgsgnSc/G635Y3W56OfUWBm895mo12PbpkwPtjI+bIU0kOojIs 4lwTbqripg3IYy0r2o80nccIbYAC2JTt+xNHBDCbrbo6BBDRd7nG6jkkbNbNjpxrAjGp CbpSXyOKZQ/auwrNkK0Zl5IfRmTnwbPVdQSR3aNrm8QCmTDevm31aGcmYF+/OFRGO3PI 2XfrIwStxKDeZsmoG8CIxwy31o3pafq96rIxtXkjXcdpkWtppNEaM1UHeHwsFPu1jFTC EOEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GVFffFUJyNe63P9deX/q/1x3JqOMjHMY9wDsGNLAhQY=; b=oi9NVQB4cDpesez+fYq3wkqEAxvytUoY9tcIWmpYO51zs2plnNp9q9+UOib/52Zgu5 9nRBh5gf0l4+Z42ONT6zIqEfuqbXV4043ro7jA7Jas2YMwQwUzmCwBFrdM8Pw/MoU8j/ A1V1r/DDrfqB60GLxv/u6IPqmW6YegK8Zif2zNgZdFqqVwZ5a7kiUHZ506agZyojFRTK 2zCfwp+7wNIb8gpLbM+wuCobnp/054fxWA8Lxbrz4w8Awe7DnYBlsQlcwfcr9i9duKWF liqYOgfnqc2GnpexRs7H+1jnpCrvHe5zXfLNTBCgsFpiVpZ8/Fd3FGWxZ9BztJtoba1l /uHQ== X-Gm-Message-State: AO0yUKWJ6ZG0pNd6AUVVqLdMTYBtbDhHrlwideBKn2A9FD258RmbeHM7 WDNv3UkNW/0pYR7Vn3uASDshmA== X-Received: by 2002:a05:600c:4f90:b0:3db:419:8d3b with SMTP id n16-20020a05600c4f9000b003db04198d3bmr2401314wmq.39.1675262193423; Wed, 01 Feb 2023 06:36:33 -0800 (PST) Received: from vingu-book.. ([2a01:e0a:f:6020:3db4:bf23:5fd8:a5]) by smtp.gmail.com with ESMTPSA id l19-20020a05600c2cd300b003cf71b1f66csm1846756wmc.0.2023.02.01.06.36.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 06:36:32 -0800 (PST) From: Vincent Guittot To: mingo@kernel.org, peterz@infradead.org, dietmar.eggemann@arm.com, qyousef@layalina.io, rafael@kernel.org, viresh.kumar@linaro.org, vschneid@redhat.com, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, kajetan.puchalski@arm.com Cc: lukasz.luba@arm.com, wvw@google.com, xuewen.yan94@gmail.com, han.lin@mediatek.com, Jonathan.JMChen@mediatek.com, Vincent Guittot Subject: [PATCH 1/2 v5] sched/fair: unlink misfit task from cpu overutilized Date: Wed, 1 Feb 2023 15:36:27 +0100 Message-Id: <20230201143628.270912-2-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230201143628.270912-1-vincent.guittot@linaro.org> References: <20230201143628.270912-1-vincent.guittot@linaro.org> MIME-Version: 1.0 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_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1756640104879592239?= X-GMAIL-MSGID: =?utf-8?q?1756640104879592239?= By taking into account uclamp_min, the 1:1 relation between task misfit and cpu overutilized is no more true as a task with a small util_avg may not fit a high capacity cpu because of uclamp_min constraint. Add a new state in util_fits_cpu() to reflect the case that task would fit a CPU except for the uclamp_min hint which is a performance requirement. Use -1 to reflect that a CPU doesn't fit only because of uclamp_min so we can use this new value to take additional action to select the best CPU that doesn't match uclamp_min hint. When util_fits_cpu() returns -1, we will continue to look for a possible CPU with better performance, which replaces Capacity Inversion detection with capacity_orig_of() - thermal_load_avg to detect a capacity inversion. Signed-off-by: Vincent Guittot Tested-by: Kajetan Puchalski Reviewed-and-tested-by: Qais Yousef Reviewed-by: Dietmar Eggemann --- Change since v4: - Add more details in commit message - Fix typo - Add Tag kernel/sched/fair.c | 105 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 82 insertions(+), 23 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 7c46485d65d7..074742f107c0 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4561,8 +4561,8 @@ static inline int util_fits_cpu(unsigned long util, * handle the case uclamp_min > uclamp_max. */ uclamp_min = min(uclamp_min, uclamp_max); - if (util < uclamp_min && capacity_orig != SCHED_CAPACITY_SCALE) - fits = fits && (uclamp_min <= capacity_orig_thermal); + if (fits && (util < uclamp_min) && (uclamp_min > capacity_orig_thermal)) + return -1; return fits; } @@ -4572,7 +4572,11 @@ static inline int task_fits_cpu(struct task_struct *p, int cpu) unsigned long uclamp_min = uclamp_eff_value(p, UCLAMP_MIN); unsigned long uclamp_max = uclamp_eff_value(p, UCLAMP_MAX); unsigned long util = task_util_est(p); - return util_fits_cpu(util, uclamp_min, uclamp_max, cpu); + /* + * Return true only if the cpu fully fits the task requirements, which + * include the utilization but also the performance hints. + */ + return (util_fits_cpu(util, uclamp_min, uclamp_max, cpu) > 0); } static inline void update_misfit_status(struct task_struct *p, struct rq *rq) @@ -6138,6 +6142,7 @@ static inline bool cpu_overutilized(int cpu) unsigned long rq_util_min = uclamp_rq_get(cpu_rq(cpu), UCLAMP_MIN); unsigned long rq_util_max = uclamp_rq_get(cpu_rq(cpu), UCLAMP_MAX); + /* Return true only if the utilization doesn't fit CPU's capacity */ return !util_fits_cpu(cpu_util_cfs(cpu), rq_util_min, rq_util_max, cpu); } @@ -6931,6 +6936,7 @@ static int select_idle_capacity(struct task_struct *p, struct sched_domain *sd, int target) { unsigned long task_util, util_min, util_max, best_cap = 0; + int fits, best_fits = 0; int cpu, best_cpu = -1; struct cpumask *cpus; @@ -6946,12 +6952,28 @@ select_idle_capacity(struct task_struct *p, struct sched_domain *sd, int target) if (!available_idle_cpu(cpu) && !sched_idle_cpu(cpu)) continue; - if (util_fits_cpu(task_util, util_min, util_max, cpu)) + + fits = util_fits_cpu(task_util, util_min, util_max, cpu); + + /* This CPU fits with all requirements */ + if (fits > 0) return cpu; + /* + * Only the min performance hint (i.e. uclamp_min) doesn't fit. + * Look for the CPU with best capacity. + */ + else if (fits < 0) + cpu_cap = capacity_orig_of(cpu) - thermal_load_avg(cpu_rq(cpu)); - if (cpu_cap > best_cap) { + /* + * First, select CPU which fits better (-1 being better than 0). + * Then, select the one with best capacity at same level. + */ + if ((fits < best_fits) || + ((fits == best_fits) && (cpu_cap > best_cap))) { best_cap = cpu_cap; best_cpu = cpu; + best_fits = fits; } } @@ -6964,7 +6986,11 @@ static inline bool asym_fits_cpu(unsigned long util, int cpu) { if (sched_asym_cpucap_active()) - return util_fits_cpu(util, util_min, util_max, cpu); + /* + * Return true only if the cpu fully fits the task requirements + * which include the utilization and the performance hints. + */ + return (util_fits_cpu(util, util_min, util_max, cpu) > 0); return true; } @@ -7331,6 +7357,9 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu) unsigned long p_util_max = uclamp_is_used() ? uclamp_eff_value(p, UCLAMP_MAX) : 1024; struct root_domain *rd = this_rq()->rd; int cpu, best_energy_cpu, target = -1; + int prev_fits = -1, best_fits = -1; + unsigned long best_thermal_cap = 0; + unsigned long prev_thermal_cap = 0; struct sched_domain *sd; struct perf_domain *pd; struct energy_env eenv; @@ -7366,6 +7395,7 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu) unsigned long prev_spare_cap = 0; int max_spare_cap_cpu = -1; unsigned long base_energy; + int fits, max_fits = -1; cpumask_and(cpus, perf_domain_span(pd), cpu_online_mask); @@ -7415,7 +7445,9 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu) util_min = max(rq_util_min, p_util_min); util_max = max(rq_util_max, p_util_max); } - if (!util_fits_cpu(util, util_min, util_max, cpu)) + + fits = util_fits_cpu(util, util_min, util_max, cpu); + if (!fits) continue; lsub_positive(&cpu_cap, util); @@ -7423,7 +7455,9 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu) if (cpu == prev_cpu) { /* Always use prev_cpu as a candidate. */ prev_spare_cap = cpu_cap; - } else if (cpu_cap > max_spare_cap) { + prev_fits = fits; + } else if ((fits > max_fits) || + ((fits == max_fits) && (cpu_cap > max_spare_cap))) { /* * Find the CPU with the maximum spare capacity * among the remaining CPUs in the performance @@ -7431,6 +7465,7 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu) */ max_spare_cap = cpu_cap; max_spare_cap_cpu = cpu; + max_fits = fits; } } @@ -7449,26 +7484,50 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu) if (prev_delta < base_energy) goto unlock; prev_delta -= base_energy; + prev_thermal_cap = cpu_thermal_cap; best_delta = min(best_delta, prev_delta); } /* Evaluate the energy impact of using max_spare_cap_cpu. */ if (max_spare_cap_cpu >= 0 && max_spare_cap > prev_spare_cap) { + /* Current best energy cpu fits better */ + if (max_fits < best_fits) + continue; + + /* + * Both don't fit performance hint (i.e. uclamp_min) + * but best energy cpu has better capacity. + */ + if ((max_fits < 0) && + (cpu_thermal_cap <= best_thermal_cap)) + continue; + cur_delta = compute_energy(&eenv, pd, cpus, p, max_spare_cap_cpu); /* CPU utilization has changed */ if (cur_delta < base_energy) goto unlock; cur_delta -= base_energy; - if (cur_delta < best_delta) { - best_delta = cur_delta; - best_energy_cpu = max_spare_cap_cpu; - } + + /* + * Both fit for the task but best energy cpu has lower + * energy impact. + */ + if ((max_fits > 0) && (best_fits > 0) && + (cur_delta >= best_delta)) + continue; + + best_delta = cur_delta; + best_energy_cpu = max_spare_cap_cpu; + best_fits = max_fits; + best_thermal_cap = cpu_thermal_cap; } } rcu_read_unlock(); - if (best_delta < prev_delta) + if ((best_fits > prev_fits) || + ((best_fits > 0) && (best_delta < prev_delta)) || + ((best_fits < 0) && (best_thermal_cap > prev_thermal_cap))) target = best_energy_cpu; return target; @@ -10271,24 +10330,23 @@ static struct sched_group *find_busiest_group(struct lb_env *env) */ update_sd_lb_stats(env, &sds); - if (sched_energy_enabled()) { - struct root_domain *rd = env->dst_rq->rd; - - if (rcu_dereference(rd->pd) && !READ_ONCE(rd->overutilized)) - goto out_balanced; - } - - local = &sds.local_stat; - busiest = &sds.busiest_stat; - /* There is no busy sibling group to pull tasks from */ if (!sds.busiest) goto out_balanced; + busiest = &sds.busiest_stat; + /* Misfit tasks should be dealt with regardless of the avg load */ if (busiest->group_type == group_misfit_task) goto force_balance; + if (sched_energy_enabled()) { + struct root_domain *rd = env->dst_rq->rd; + + if (rcu_dereference(rd->pd) && !READ_ONCE(rd->overutilized)) + goto out_balanced; + } + /* ASYM feature bypasses nice load balance check */ if (busiest->group_type == group_asym_packing) goto force_balance; @@ -10301,6 +10359,7 @@ static struct sched_group *find_busiest_group(struct lb_env *env) if (busiest->group_type == group_imbalanced) goto force_balance; + local = &sds.local_stat; /* * If the local group is busier than the selected busiest group * don't try and pull any tasks. From patchwork Wed Feb 1 14:36:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 51363 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp316953wrn; Wed, 1 Feb 2023 06:43:37 -0800 (PST) X-Google-Smtp-Source: AK7set92oUkYurXOE++P197Ek+Ym5pK60tiL5v7h7td+qIbG6VTNIZCeVOnUKdxktax1/bA/GjLT X-Received: by 2002:a17:907:1607:b0:87b:6aa1:c87f with SMTP id hb7-20020a170907160700b0087b6aa1c87fmr3302915ejc.26.1675262617563; Wed, 01 Feb 2023 06:43:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675262617; cv=none; d=google.com; s=arc-20160816; b=cGvjtcuhDMRbo05Zxsp5eftw/GCXlnyuO8YpZoVv4B5ySPIT0YIj/XAD9fqpnZ1bTf ym3KbiGIrtA/PXpSwxwlqglIapP587VsKIIv3LdgK2KPKXlSSJX+4kU3CvVPx6vA2Q7Q GOrQVpjGEnSffr6CuJ1ocVXp6wmUyyPbwvv1ecQOK2H68XfEfmacjgWqsdCvB9lFm6rn MzeQzKeaUFnK+2GrlQOJTwErspBtqMvqTzxpQx1+oCpfrO4yCJGA4ko0RJKmCmNjIwXd AvEEkEwMu26vSdm6MrF71fazXCbEkK8SGnRoLfX162MeaCvM2KSdYsUdbDk+4oZUkMVz vE/Q== 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:from :dkim-signature; bh=+blrN7WtKKrcrfUwE6iTjyvPLjyIFloAnSM6+cYP9Uk=; b=GzLeCYPWgc1HX1PWXVOq5mCerDh9Dzq0r5GoyIogb9tXTcvM01ucOtHFSPsZmWTyQf 1/BUpvYk+xtJPO+iCX/HK8zqz9GdZelvqz/P+xloQJIUdl5vAVl6Bwzytbo7FZzaQ/yh VhgydfuSHEKclFkFNBL9QVAPzyS5pyP758ljuCzhRbpPdn9XXLaVLk8qYwi2ULgAr+cp L8Dxm2gaAYIF9MAgNj2G+Fa94U1WoaNHTFKbzEQMxxHDbChsfRsV3ixU3ehIDydcEfw1 1kIpVFiLUZbwKTLzsljAkP8xi9cc5TgQO/ZM+xyooRIp2G68LcTYPG95bWj4j9haNY9m j1Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VoIZNY1a; 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=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 13-20020a170906224d00b00870c5d344easi22495356ejr.727.2023.02.01.06.43.14; Wed, 01 Feb 2023 06:43:37 -0800 (PST) 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=@linaro.org header.s=google header.b=VoIZNY1a; 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=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232453AbjBAOgm (ORCPT + 99 others); Wed, 1 Feb 2023 09:36:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232308AbjBAOgh (ORCPT ); Wed, 1 Feb 2023 09:36:37 -0500 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6029F46D6B for ; Wed, 1 Feb 2023 06:36:36 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id bg13-20020a05600c3c8d00b003d9712b29d2so1544338wmb.2 for ; Wed, 01 Feb 2023 06:36:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+blrN7WtKKrcrfUwE6iTjyvPLjyIFloAnSM6+cYP9Uk=; b=VoIZNY1ahARaxgQK+WsGmW+yafJimH556eH2h3BQf6MxR48n3HvHMamvnzY+f31LIZ Z6By6S502dma8DVrDBpercD15jqm/Qrur6fh4vxnu5hZLf86o3KWsGn8OkuxIUy0iYw1 mxxcLo39RlC9eOuhCz4muhe8bgRyhq0x1RU3eeLhlUn++ERMZ3t8sq2R8e16kFYs+0kv 5FfMHJGgjGHksOVTOA+nq6vVE+0r68LOVVtjcOEX0GXU+Pk/W8/MqYtkyKN1jSZmhng3 M7b1hCvxkiSwo6/HayWcEs8chxCT5nscIoJFLziTWuZ782cxtsN/bsqPFcH1XracuGQi QDWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+blrN7WtKKrcrfUwE6iTjyvPLjyIFloAnSM6+cYP9Uk=; b=NQnVv/cUNRoiGHIwuggBEN4yxsdKCCzwk4FlSuKc+xyF9NfbDWbHMFwVba1dCm2vHt A35h054kz2U6K8dl3tzTOcYRkoYnDPky7f50nUFFMDAW5h5q3cP/pRIsLK9YIuRk995K gBv/yYh6K27YaD2LlFyiUBd8tGM75oEKpty0XvIte6YvM0aUAWEAvd+Brc0zZ0KJKdu4 Yc4v1DrcfsJlY5sXqKMJZHpMLRZX47JTGkpAKBXMwP9whgu1elMuAGvwGjeU1cKs6U5i sQO4D0zHWEgSo64VkbjuN8gLcnUqZCN/pFuW/YCNP53e9Uups5KXH/RcMlCnP3xeyJUj wCNg== X-Gm-Message-State: AO0yUKW9smEJpBXDrZxMJCrgJ7obwfqiaB35fDCClYhQ9W8ePikSMsvY N7TuLLerDow1OfcFtbf8xwh84g== X-Received: by 2002:a05:600c:4f42:b0:3dc:5984:a16c with SMTP id m2-20020a05600c4f4200b003dc5984a16cmr2312966wmq.31.1675262194788; Wed, 01 Feb 2023 06:36:34 -0800 (PST) Received: from vingu-book.. ([2a01:e0a:f:6020:3db4:bf23:5fd8:a5]) by smtp.gmail.com with ESMTPSA id l19-20020a05600c2cd300b003cf71b1f66csm1846756wmc.0.2023.02.01.06.36.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 06:36:34 -0800 (PST) From: Vincent Guittot To: mingo@kernel.org, peterz@infradead.org, dietmar.eggemann@arm.com, qyousef@layalina.io, rafael@kernel.org, viresh.kumar@linaro.org, vschneid@redhat.com, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, kajetan.puchalski@arm.com Cc: lukasz.luba@arm.com, wvw@google.com, xuewen.yan94@gmail.com, han.lin@mediatek.com, Jonathan.JMChen@mediatek.com, Vincent Guittot Subject: [PATCH 2/2 v5] sched/fair: Remove capacity inversion detection Date: Wed, 1 Feb 2023 15:36:28 +0100 Message-Id: <20230201143628.270912-3-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230201143628.270912-1-vincent.guittot@linaro.org> References: <20230201143628.270912-1-vincent.guittot@linaro.org> MIME-Version: 1.0 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_NONE, 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756640174418091500?= X-GMAIL-MSGID: =?utf-8?q?1756640174418091500?= Remove the capacity inversion detection which is now handled by util_fits_cpu() returning -1 when we need to continue to look for a potential CPU with better performance. This ends up almost reverting patches below except for some comments: commit da07d2f9c153 ("sched/fair: Fixes for capacity inversion detection") commit aa69c36f31aa ("sched/fair: Consider capacity inversion in util_fits_cpu()") commit 44c7b80bffc3 ("sched/fair: Detect capacity inversion") Signed-off-by: Vincent Guittot Reviewed-by: Qais Yousef --- kernel/sched/fair.c | 84 +++----------------------------------------- kernel/sched/sched.h | 19 ---------- 2 files changed, 5 insertions(+), 98 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 074742f107c0..c6c8e7f52935 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4476,17 +4476,9 @@ static inline int util_fits_cpu(unsigned long util, * * For uclamp_max, we can tolerate a drop in performance level as the * goal is to cap the task. So it's okay if it's getting less. - * - * In case of capacity inversion we should honour the inverted capacity - * for both uclamp_min and uclamp_max all the time. */ - capacity_orig = cpu_in_capacity_inversion(cpu); - if (capacity_orig) { - capacity_orig_thermal = capacity_orig; - } else { - capacity_orig = capacity_orig_of(cpu); - capacity_orig_thermal = capacity_orig - arch_scale_thermal_pressure(cpu); - } + capacity_orig = capacity_orig_of(cpu); + capacity_orig_thermal = capacity_orig - arch_scale_thermal_pressure(cpu); /* * We want to force a task to fit a cpu as implied by uclamp_max. @@ -9027,82 +9019,16 @@ static unsigned long scale_rt_capacity(int cpu) static void update_cpu_capacity(struct sched_domain *sd, int cpu) { - unsigned long capacity_orig = arch_scale_cpu_capacity(cpu); unsigned long capacity = scale_rt_capacity(cpu); struct sched_group *sdg = sd->groups; - struct rq *rq = cpu_rq(cpu); - rq->cpu_capacity_orig = capacity_orig; + cpu_rq(cpu)->cpu_capacity_orig = arch_scale_cpu_capacity(cpu); if (!capacity) capacity = 1; - rq->cpu_capacity = capacity; - - /* - * Detect if the performance domain is in capacity inversion state. - * - * Capacity inversion happens when another perf domain with equal or - * lower capacity_orig_of() ends up having higher capacity than this - * domain after subtracting thermal pressure. - * - * We only take into account thermal pressure in this detection as it's - * the only metric that actually results in *real* reduction of - * capacity due to performance points (OPPs) being dropped/become - * unreachable due to thermal throttling. - * - * We assume: - * * That all cpus in a perf domain have the same capacity_orig - * (same uArch). - * * Thermal pressure will impact all cpus in this perf domain - * equally. - */ - if (sched_energy_enabled()) { - unsigned long inv_cap = capacity_orig - thermal_load_avg(rq); - struct perf_domain *pd; - - rcu_read_lock(); - - pd = rcu_dereference(rq->rd->pd); - rq->cpu_capacity_inverted = 0; - - for (; pd; pd = pd->next) { - struct cpumask *pd_span = perf_domain_span(pd); - unsigned long pd_cap_orig, pd_cap; - - /* We can't be inverted against our own pd */ - if (cpumask_test_cpu(cpu_of(rq), pd_span)) - continue; - - cpu = cpumask_any(pd_span); - pd_cap_orig = arch_scale_cpu_capacity(cpu); - - if (capacity_orig < pd_cap_orig) - continue; - - /* - * handle the case of multiple perf domains have the - * same capacity_orig but one of them is under higher - * thermal pressure. We record it as capacity - * inversion. - */ - if (capacity_orig == pd_cap_orig) { - pd_cap = pd_cap_orig - thermal_load_avg(cpu_rq(cpu)); - - if (pd_cap > inv_cap) { - rq->cpu_capacity_inverted = inv_cap; - break; - } - } else if (pd_cap_orig > inv_cap) { - rq->cpu_capacity_inverted = inv_cap; - break; - } - } - - rcu_read_unlock(); - } - - trace_sched_cpu_capacity_tp(rq); + cpu_rq(cpu)->cpu_capacity = capacity; + trace_sched_cpu_capacity_tp(cpu_rq(cpu)); sdg->sgc->capacity = capacity; sdg->sgc->min_capacity = capacity; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 1072502976df..3e8df6d31c1e 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1044,7 +1044,6 @@ struct rq { unsigned long cpu_capacity; unsigned long cpu_capacity_orig; - unsigned long cpu_capacity_inverted; struct balance_callback *balance_callback; @@ -2899,24 +2898,6 @@ static inline unsigned long capacity_orig_of(int cpu) return cpu_rq(cpu)->cpu_capacity_orig; } -/* - * Returns inverted capacity if the CPU is in capacity inversion state. - * 0 otherwise. - * - * Capacity inversion detection only considers thermal impact where actual - * performance points (OPPs) gets dropped. - * - * Capacity inversion state happens when another performance domain that has - * equal or lower capacity_orig_of() becomes effectively larger than the perf - * domain this CPU belongs to due to thermal pressure throttling it hard. - * - * See comment in update_cpu_capacity(). - */ -static inline unsigned long cpu_in_capacity_inversion(int cpu) -{ - return cpu_rq(cpu)->cpu_capacity_inverted; -} - /** * enum cpu_util_type - CPU utilization type * @FREQUENCY_UTIL: Utilization used to select frequency