linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dietmar Eggemann <dietmar.eggemann@arm.com>
To: Ingo Molnar <mingo@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Juri Lelli <juri.lelli@redhat.com>
Cc: Vincent Guittot <vincent.guittot@linaro.org>,
	Steven Rostedt <rostedt@goodmis.org>,
	Luca Abeni <luca.abeni@santannapisa.it>,
	Daniel Bristot de Oliveira <bristot@redhat.com>,
	Wei Wang <wvw@google.com>, Quentin Perret <qperret@google.com>,
	Alessio Balsini <balsini@google.com>,
	Pavan Kondeti <pkondeti@codeaurora.org>,
	Patrick Bellasi <patrick.bellasi@matbug.net>,
	Morten Rasmussen <morten.rasmussen@arm.com>,
	Valentin Schneider <valentin.schneider@arm.com>,
	Qais Yousef <qais.yousef@arm.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH v2 1/6] sched/topology: Store root domain CPU capacity sum
Date: Mon, 27 Apr 2020 10:37:04 +0200	[thread overview]
Message-ID: <20200427083709.30262-2-dietmar.eggemann@arm.com> (raw)
In-Reply-To: <20200427083709.30262-1-dietmar.eggemann@arm.com>

Add sum of (original) CPU capacity of all member CPUs to root domain.

This is needed for capacity-aware SCHED_DEADLINE admission control.

Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
---
 kernel/sched/sched.h    |  1 +
 kernel/sched/topology.c | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index db3a57675ccf..58e1d3903ab9 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -803,6 +803,7 @@ struct root_domain {
 	cpumask_var_t		rto_mask;
 	struct cpupri		cpupri;
 
+	unsigned long           sum_cpu_capacity;
 	unsigned long		max_cpu_capacity;
 
 	/*
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index 8344757bba6e..fbb20b7a80c0 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -2052,12 +2052,18 @@ build_sched_domains(const struct cpumask *cpu_map, struct sched_domain_attr *att
 	/* Attach the domains */
 	rcu_read_lock();
 	for_each_cpu(i, cpu_map) {
+		unsigned long cap;
+
 		rq = cpu_rq(i);
 		sd = *per_cpu_ptr(d.sd, i);
+		cap = rq->cpu_capacity_orig;
 
 		/* Use READ_ONCE()/WRITE_ONCE() to avoid load/store tearing: */
-		if (rq->cpu_capacity_orig > READ_ONCE(d.rd->max_cpu_capacity))
-			WRITE_ONCE(d.rd->max_cpu_capacity, rq->cpu_capacity_orig);
+		if (cap > READ_ONCE(d.rd->max_cpu_capacity))
+			WRITE_ONCE(d.rd->max_cpu_capacity, cap);
+
+		WRITE_ONCE(d.rd->sum_cpu_capacity,
+			   READ_ONCE(d.rd->sum_cpu_capacity) + cap);
 
 		cpu_attach_domain(sd, d.rd, i);
 	}
@@ -2067,8 +2073,9 @@ build_sched_domains(const struct cpumask *cpu_map, struct sched_domain_attr *att
 		static_branch_inc_cpuslocked(&sched_asym_cpucapacity);
 
 	if (rq && sched_debug_enabled) {
-		pr_info("root domain span: %*pbl (max cpu_capacity = %lu)\n",
-			cpumask_pr_args(cpu_map), rq->rd->max_cpu_capacity);
+		pr_info("root domain span: %*pbl (capacity = %lu max cpu_capacity = %lu)\n",
+			cpumask_pr_args(cpu_map), rq->rd->sum_cpu_capacity,
+			rq->rd->max_cpu_capacity);
 	}
 
 	ret = 0;
-- 
2.17.1


  reply	other threads:[~2020-04-27  8:37 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-27  8:37 [PATCH v2 0/6] Capacity awareness for SCHED_DEADLINE Dietmar Eggemann
2020-04-27  8:37 ` Dietmar Eggemann [this message]
2020-04-27  8:37 ` [PATCH v2 2/6] sched/deadline: Optimize dl_bw_cpus() Dietmar Eggemann
2020-04-30 10:55   ` Pavan Kondeti
2020-05-01 16:12     ` Dietmar Eggemann
2020-04-27  8:37 ` [PATCH v2 3/6] sched/deadline: Add dl_bw_capacity() Dietmar Eggemann
2020-05-06 10:54   ` Dietmar Eggemann
2020-05-06 12:37     ` Juri Lelli
2020-05-06 15:09       ` Dietmar Eggemann
2020-05-11  8:01         ` Juri Lelli
2020-05-12 12:39           ` Dietmar Eggemann
2020-05-15 12:26             ` Juri Lelli
2020-04-27  8:37 ` [PATCH v2 4/6] sched/deadline: Improve admission control for asymmetric CPU capacities Dietmar Eggemann
2020-04-27  8:37 ` [PATCH v2 5/6] sched/deadline: Make DL capacity-aware Dietmar Eggemann
2020-04-30 13:10   ` Pavan Kondeti
2020-05-01 16:12     ` Dietmar Eggemann
2020-05-04  3:58       ` Pavan Kondeti
2020-05-05 18:02         ` Dietmar Eggemann
2020-04-27  8:37 ` [PATCH v2 6/6] sched/deadline: Implement fallback mechanism for !fit case Dietmar Eggemann
2020-04-27 13:34   ` Juri Lelli
2020-04-27 14:17     ` luca abeni
2020-04-29 17:39       ` Dietmar Eggemann
2020-04-30 11:00         ` Pavan Kondeti
2020-05-01 16:12           ` Dietmar Eggemann

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=20200427083709.30262-2-dietmar.eggemann@arm.com \
    --to=dietmar.eggemann@arm.com \
    --cc=balsini@google.com \
    --cc=bristot@redhat.com \
    --cc=juri.lelli@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luca.abeni@santannapisa.it \
    --cc=mingo@redhat.com \
    --cc=morten.rasmussen@arm.com \
    --cc=patrick.bellasi@matbug.net \
    --cc=peterz@infradead.org \
    --cc=pkondeti@codeaurora.org \
    --cc=qais.yousef@arm.com \
    --cc=qperret@google.com \
    --cc=rostedt@goodmis.org \
    --cc=valentin.schneider@arm.com \
    --cc=vincent.guittot@linaro.org \
    --cc=wvw@google.com \
    /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).