linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "tip-bot2 for Thara Gopinath" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Thara Gopinath <thara.gopinath@linaro.org>,
	"Peter Zijlstra (Intel)" <peterz@infradead.org>,
	Ingo Molnar <mingo@kernel.org>, x86 <x86@kernel.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [tip: sched/core] sched/fair: Update cpu_capacity to reflect thermal pressure
Date: Fri, 06 Mar 2020 14:42:08 -0000	[thread overview]
Message-ID: <158350572893.28353.7818128953864188600.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200222005213.3873-8-thara.gopinath@linaro.org>

The following commit has been merged into the sched/core branch of tip:

Commit-ID:     467b7d01c469dc6aa492c17d1f1d1952632728f1
Gitweb:        https://git.kernel.org/tip/467b7d01c469dc6aa492c17d1f1d1952632728f1
Author:        Thara Gopinath <thara.gopinath@linaro.org>
AuthorDate:    Fri, 21 Feb 2020 19:52:11 -05:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 06 Mar 2020 12:57:20 +01:00

sched/fair: Update cpu_capacity to reflect thermal pressure

cpu_capacity initially reflects the maximum possible capacity of a CPU.
Thermal pressure on a CPU means this maximum possible capacity is
unavailable due to thermal events. This patch subtracts the average
thermal pressure for a CPU from its maximum possible capacity so that
cpu_capacity reflects the remaining maximum capacity.

Signed-off-by: Thara Gopinath <thara.gopinath@linaro.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lkml.kernel.org/r/20200222005213.3873-8-thara.gopinath@linaro.org
---
 kernel/sched/fair.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 11f8488..aa51286 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -7984,8 +7984,15 @@ static unsigned long scale_rt_capacity(struct sched_domain *sd, int cpu)
 	if (unlikely(irq >= max))
 		return 1;
 
+	/*
+	 * 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;

  reply	other threads:[~2020-03-06 14:43 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-22  0:52 [Patch v10 0/9] Introduce Thermal Pressure Thara Gopinath
2020-02-22  0:52 ` [Patch v10 1/9] sched/pelt: Add support to track thermal pressure Thara Gopinath
2020-02-22  0:59   ` Randy Dunlap
2020-02-22 18:27     ` Thara Gopinath
2020-02-22 18:50       ` Randy Dunlap
2020-02-24 14:33         ` Thara Gopinath
2020-02-25 15:47           ` Peter Zijlstra
2020-02-25 16:43             ` Thara Gopinath
2020-03-06 14:42   ` [tip: sched/core] " tip-bot2 for Thara Gopinath
2020-02-22  0:52 ` [Patch v10 2/9] sched/topology: Add hook to read per cpu " Thara Gopinath
2020-03-06 14:42   ` [tip: sched/core] sched/topology: Add callback to read per CPU " tip-bot2 for Thara Gopinath
2020-02-22  0:52 ` [Patch v10 3/9] drivers/base/arch_topology: Add infrastructure to store and update instantaneous " Thara Gopinath
2020-03-06 14:42   ` [tip: sched/core] " tip-bot2 for Thara Gopinath
2020-02-22  0:52 ` [Patch v10 4/9] arm64/topology: Populate arch_scale_thermal_pressure for arm64 platforms Thara Gopinath
2020-03-06 14:42   ` [tip: sched/core] arm64/topology: Populate arch_scale_thermal_pressure() " tip-bot2 for Thara Gopinath
2020-02-22  0:52 ` [Patch v10 5/9] arm/topology: Populate arch_scale_thermal_pressure for arm platforms Thara Gopinath
2020-03-06 14:42   ` [tip: sched/core] arm/topology: Populate arch_scale_thermal_pressure() for ARM platforms tip-bot2 for Thara Gopinath
2020-02-22  0:52 ` [Patch v10 6/9] sched/fair: Enable periodic update of average thermal pressure Thara Gopinath
2020-02-27  9:03   ` Amit Kucheria
2020-03-06 14:42   ` [tip: sched/core] " tip-bot2 for Thara Gopinath
2020-02-22  0:52 ` [Patch v10 7/9] sched/fair: update cpu_capacity to reflect " Thara Gopinath
2020-03-06 14:42   ` tip-bot2 for Thara Gopinath [this message]
2020-02-22  0:52 ` [Patch v10 8/9] thermal/cpu-cooling: Update thermal pressure in case of a maximum frequency capping Thara Gopinath
2020-03-06 14:42   ` [tip: sched/core] " tip-bot2 for Thara Gopinath
2020-02-22  0:52 ` [Patch v10 9/9] sched/fair: Enable tuning of decay period Thara Gopinath
2020-03-06 14:42   ` [tip: sched/core] " tip-bot2 for Thara Gopinath
2020-02-27  9:01 ` [Patch v10 0/9] Introduce Thermal Pressure Amit Kucheria
     [not found] ` <CAP=VYLqWfqOZT6ec9cKyKOsOhu7HhVn2f_eU+ca006i4CV8R-w@mail.gmail.com>
2020-04-16 13:40   ` Thara Gopinath

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=158350572893.28353.7818128953864188600.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=thara.gopinath@linaro.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).