Received: by 2002:a05:7412:98c1:b0:fa:551:50a7 with SMTP id kc1csp1633966rdb; Mon, 8 Jan 2024 05:49:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IFdrLSIatic5WUDdcIIe0yUw7oFoM0hrtsDMLc6Q1ZK98/yyP+Pn3ezFBUR0QJr74wDBCaN X-Received: by 2002:a17:902:ea06:b0:1d4:1199:1cbb with SMTP id s6-20020a170902ea0600b001d411991cbbmr5294436plg.98.1704721798176; Mon, 08 Jan 2024 05:49:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704721798; cv=none; d=google.com; s=arc-20160816; b=diiwC7GVHY7VCdpVjXgZZ/Uw1a3aQ1JKebv8o4VQt1o/nwgXAyq/h4htP2+t+S1jxu u0ISWKgThktJhBNmbMVeEIeUTVSp5JgDex16xmn6eE33kmY25gPWj/bdH27fdS4Ejurv KSB7Ve1ZgR1wvpcp7PYfQXSDT4+MQNpTQeE74ckIh+vQpKLbNw9lviG4+eX9qFqOi4el bFuL3z+Pq9OoZgVwvxblxKzFUkYez5Ln9bQCMP6YKg/XIIzmBb00BPPPxFd/7fgAXMhl LNFTK/K8EITR9EXqYvOxRwx+A8BuO/VrHJJRGVMcFtkG9A764Y61q0fRHHW+8/f8JSS1 bhfQ== ARC-Message-Signature: i=1; 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:from:dkim-signature; bh=phTXHvJ5StdCWYZVkAY/BBaxM+ZVuOBK1aqv/JPv6kA=; fh=ckb4uIHbQxCINhPspZAm7nYFj+6K7jiYA7oZvU68Qj8=; b=QJllRhMaGD5HTDtfHwvAXL59WvdU/4viRagfBEmkx0ggV48yGLrD0r8Mpw7maX7FHy zPFrCxOKdKNWilp0UImf0Xeva+BspY95zUfz+X+nCPywXL7EXD6JgTcG5nTkrH3F8aRp NBFsl7iV4Z2OarlNgN3WG9VqzBEMu+VCNeSUYfed3JrL4A0JJdOS31dHBTdW/UnQyKXl M3u1Tn6vJi9ND02AoUulFb1Rhz1fMLNsbgCbPTyeyaY1NoAcTTg/Ypug62b9dSylllrj HcjTnNik/bFp5kgkhYay5yIMySuGv4reJo9O6XyBp95ERm6tIUpW9/D3sKbRkE/AX4Mv B1TA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NSgT++Ys; spf=pass (google.com: domain of linux-kernel+bounces-19645-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-19645-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id y1-20020a170902864100b001d41409c6d8si6110402plt.577.2024.01.08.05.49.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 05:49:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-19645-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NSgT++Ys; spf=pass (google.com: domain of linux-kernel+bounces-19645-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-19645-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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 5996FB2216A for ; Mon, 8 Jan 2024 13:49:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2A8FD4642F; Mon, 8 Jan 2024 13:48:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="NSgT++Ys" X-Original-To: linux-kernel@vger.kernel.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 680E545972 for ; Mon, 8 Jan 2024 13:48:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-40d5aefcc2fso21578095e9.0 for ; Mon, 08 Jan 2024 05:48:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704721729; x=1705326529; darn=vger.kernel.org; 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=phTXHvJ5StdCWYZVkAY/BBaxM+ZVuOBK1aqv/JPv6kA=; b=NSgT++YsMpmFNXYZKwkWwOHVZCBQgQItZARrotRJz1JpnE4UNdaukMlBbTsR80ADzI PNcu82mU0Ix/0h6IZOoR6lI1VWTOSRT8Km8a6RX4tQBKyYWQgL2C1WjBZcF/8iIVJ3t0 KjJQz9g4bapet4+C5L9c+rZkeKZdreQ9rHTqSgf8TFV7ILHfm7asDXbQqNqzgcZcsPJ1 DPkEJ1oPcoufBQk6oHOYDT9QFeXbMc3xMhvjX6+v/plTG0QIS7zvGqtLhvgVeCfpysHl kcPjd5Qd3mWSa5nRJHKOMG8Rlv451rXjAGab+jj4ifLK58+4rhNfNJa0f6px04AZJEbb K+Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704721729; x=1705326529; 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=phTXHvJ5StdCWYZVkAY/BBaxM+ZVuOBK1aqv/JPv6kA=; b=gM+tQgiR/R7Ux4Tq+Ecbn0N9IZ2wPXCPRrJBoxy+sg5FaS/BfcnccKbdVlVvK4NEEk LOz/iVIlHHudPO7xLh6pOXgw5rOOR+wbgtXeJQgIUL/TJjkI1gqI+TDtcHtZENLBHyIg Y07Re1SaTT5qwTB5YfcIOunUF4CpFB+x+WMS4s0Q1NNT0aKkhpuabFDdzvcKXrSaGFKS qYuDX2BxyrzDIgmJtniv5ccO4frGuTUyPbf8RvJVBlg7TM2f36m3Y9OTZLmrusQ30xFk +96b8ZjNms0Oj4sWSACvYxToFD5IVdOnfe7WgWOqvA6ESmNO2JFL9M7qhme9yo+MzfOh HDHA== X-Gm-Message-State: AOJu0YzEe31RaLrTspFLvDD6mFhDAH/CAspjFLc1BScrKVqUbNMGFe8d GNF6iRaibeyeH6owDFMLUJ0AARrYgAZukQ== X-Received: by 2002:a05:600c:3483:b0:40e:4af2:c1f with SMTP id a3-20020a05600c348300b0040e4af20c1fmr159196wmq.50.1704721729693; Mon, 08 Jan 2024 05:48:49 -0800 (PST) Received: from vingu-book.. ([2a01:e0a:f:6020:53aa:59bc:34ea:bb2c]) by smtp.gmail.com with ESMTPSA id n34-20020a05600c3ba200b0040d5b984668sm11165003wms.9.2024.01.08.05.48.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 05:48:49 -0800 (PST) From: Vincent Guittot To: linux@armlinux.org.uk, catalin.marinas@arm.com, will@kernel.org, sudeep.holla@arm.com, rafael@kernel.org, viresh.kumar@linaro.org, agross@kernel.org, andersson@kernel.org, konrad.dybcio@linaro.org, mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, lukasz.luba@arm.com, rui.zhang@intel.com, mhiramat@kernel.org, daniel.lezcano@linaro.org, amit.kachhap@gmail.com, corbet@lwn.net, gregkh@linuxfoundation.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-doc@vger.kernel.org Cc: qyousef@layalina.io, Vincent Guittot Subject: [PATCH v3 2/5] sched: Take cpufreq feedback into account Date: Mon, 8 Jan 2024 14:48:40 +0100 Message-Id: <20240108134843.429769-3-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240108134843.429769-1-vincent.guittot@linaro.org> References: <20240108134843.429769-1-vincent.guittot@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Aggregate the different pressures applied on the capacity of CPUs and create a new function that returns the actual capacity of the CPU: get_actual_cpu_capacity() Signed-off-by: Vincent Guittot Reviewed-by: Lukasz Luba --- kernel/sched/fair.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 9cc20855dc2b..e54bbf8b4936 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4910,13 +4910,22 @@ static inline void util_est_update(struct cfs_rq *cfs_rq, trace_sched_util_est_se_tp(&p->se); } +static inline unsigned long get_actual_cpu_capacity(int cpu) +{ + unsigned long capacity = arch_scale_cpu_capacity(cpu); + + capacity -= max(thermal_load_avg(cpu_rq(cpu)), cpufreq_get_pressure(cpu)); + + return capacity; +} + static inline int util_fits_cpu(unsigned long util, unsigned long uclamp_min, unsigned long uclamp_max, int cpu) { - unsigned long capacity_orig, capacity_orig_thermal; unsigned long capacity = capacity_of(cpu); + unsigned long capacity_orig; bool fits, uclamp_max_fits; /* @@ -4948,7 +4957,6 @@ static inline int util_fits_cpu(unsigned long util, * goal is to cap the task. So it's okay if it's getting less. */ capacity_orig = arch_scale_cpu_capacity(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. @@ -5023,7 +5031,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 (fits && (util < uclamp_min) && (uclamp_min > capacity_orig_thermal)) + if (fits && (util < uclamp_min) && + (uclamp_min > get_actual_cpu_capacity(cpu))) return -1; return fits; @@ -7404,7 +7413,7 @@ select_idle_capacity(struct task_struct *p, struct sched_domain *sd, int target) * Look for the CPU with best capacity. */ else if (fits < 0) - cpu_cap = arch_scale_cpu_capacity(cpu) - thermal_load_avg(cpu_rq(cpu)); + cpu_cap = get_actual_cpu_capacity(cpu); /* * First, select CPU which fits better (-1 being better than 0). @@ -7897,8 +7906,8 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu) 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; + unsigned long best_actual_cap = 0; + unsigned long prev_actual_cap = 0; struct sched_domain *sd; struct perf_domain *pd; struct energy_env eenv; @@ -7928,7 +7937,7 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu) for (; pd; pd = pd->next) { unsigned long util_min = p_util_min, util_max = p_util_max; - unsigned long cpu_cap, cpu_thermal_cap, util; + unsigned long cpu_cap, cpu_actual_cap, util; long prev_spare_cap = -1, max_spare_cap = -1; unsigned long rq_util_min, rq_util_max; unsigned long cur_delta, base_energy; @@ -7940,18 +7949,17 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu) if (cpumask_empty(cpus)) continue; - /* Account thermal pressure for the energy estimation */ + /* Account external pressure for the energy estimation */ cpu = cpumask_first(cpus); - cpu_thermal_cap = arch_scale_cpu_capacity(cpu); - cpu_thermal_cap -= arch_scale_thermal_pressure(cpu); + cpu_actual_cap = get_actual_cpu_capacity(cpu); - eenv.cpu_cap = cpu_thermal_cap; + eenv.cpu_cap = cpu_actual_cap; eenv.pd_cap = 0; for_each_cpu(cpu, cpus) { struct rq *rq = cpu_rq(cpu); - eenv.pd_cap += cpu_thermal_cap; + eenv.pd_cap += cpu_actual_cap; if (!cpumask_test_cpu(cpu, sched_domain_span(sd))) continue; @@ -8022,7 +8030,7 @@ 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; + prev_actual_cap = cpu_actual_cap; best_delta = min(best_delta, prev_delta); } @@ -8037,7 +8045,7 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu) * but best energy cpu has better capacity. */ if ((max_fits < 0) && - (cpu_thermal_cap <= best_thermal_cap)) + (cpu_actual_cap <= best_actual_cap)) continue; cur_delta = compute_energy(&eenv, pd, cpus, p, @@ -8058,14 +8066,14 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu) best_delta = cur_delta; best_energy_cpu = max_spare_cap_cpu; best_fits = max_fits; - best_thermal_cap = cpu_thermal_cap; + best_actual_cap = cpu_actual_cap; } } rcu_read_unlock(); if ((best_fits > prev_fits) || ((best_fits > 0) && (best_delta < prev_delta)) || - ((best_fits < 0) && (best_thermal_cap > prev_thermal_cap))) + ((best_fits < 0) && (best_actual_cap > prev_actual_cap))) target = best_energy_cpu; return target; @@ -9441,8 +9449,8 @@ static inline void init_sd_lb_stats(struct sd_lb_stats *sds) static unsigned long scale_rt_capacity(int cpu) { + unsigned long max = get_actual_cpu_capacity(cpu); struct rq *rq = cpu_rq(cpu); - unsigned long max = arch_scale_cpu_capacity(cpu); unsigned long used, free; unsigned long irq; @@ -9454,12 +9462,9 @@ static unsigned long scale_rt_capacity(int cpu) /* * avg_rt.util_avg and avg_dl.util_avg track binary signals * (running and not running) with weights 0 and 1024 respectively. - * avg_thermal.load_avg tracks thermal pressure and the weighted - * average uses the actual delta max capacity(load). */ used = READ_ONCE(rq->avg_rt.util_avg); used += READ_ONCE(rq->avg_dl.util_avg); - used += thermal_load_avg(rq); if (unlikely(used >= max)) return 1; -- 2.34.1