From: Patrick Bellasi <patrick.bellasi@arm.com>
To: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
linux-api@vger.kernel.org
Cc: Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>, Tejun Heo <tj@kernel.org>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
Vincent Guittot <vincent.guittot@linaro.org>,
Viresh Kumar <viresh.kumar@linaro.org>,
Paul Turner <pjt@google.com>,
Quentin Perret <quentin.perret@arm.com>,
Dietmar Eggemann <dietmar.eggemann@arm.com>,
Morten Rasmussen <morten.rasmussen@arm.com>,
Juri Lelli <juri.lelli@redhat.com>, Todd Kjos <tkjos@google.com>,
Joel Fernandes <joelaf@google.com>,
Steve Muckle <smuckle@google.com>,
Suren Baghdasaryan <surenb@google.com>
Subject: [PATCH v7 14/15] sched/core: uclamp: Use TG's clamps to restrict TASK's clamps
Date: Fri, 8 Feb 2019 10:05:53 +0000 [thread overview]
Message-ID: <20190208100554.32196-15-patrick.bellasi@arm.com> (raw)
In-Reply-To: <20190208100554.32196-1-patrick.bellasi@arm.com>
When a task specific clamp value is configured via sched_setattr(2),
this value is accounted in the corresponding clamp bucket every time the
task is {en,de}qeued. However, when cgroups are also in use, the task
specific clamp values could be restricted by the task_group (TG)
clamp values.
Update uclamp_cpu_inc() to aggregate task and TG clamp values. Every
time a task is enqueued, it's accounted in the clamp_bucket defining the
smaller clamp between the task specific value and its TG effective
value. This allows to:
1. ensure cgroup clamps are always used to restrict task specific
requests, i.e. boosted only up to the effective granted value or
clamped at least to a certain value
2. implement a "nice-like" policy, where tasks are still allowed to
request less then what enforced by their current TG
This mimics what already happens for a task's CPU affinity mask when the
task is also in a cpuset, i.e. cgroup attributes are always used to
restrict per-task attributes.
Do this by exploiting the concept of "effective" clamp, which is already
used by a TG to track parent enforced restrictions.
Apply task group clamp restrictions only to tasks belonging to a child
group. While, for tasks in the root group or in an autogroup, only
system defaults are enforced.
Signed-off-by: Patrick Bellasi <patrick.bellasi@arm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Tejun Heo <tj@kernel.org>
---
kernel/sched/core.c | 42 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 41 insertions(+), 1 deletion(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 35e9f06af08d..6f8f68d18d0f 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -823,10 +823,44 @@ static inline void uclamp_rq_update(struct rq *rq, unsigned int clamp_id,
WRITE_ONCE(rq->uclamp[clamp_id].value, max_value);
}
+static inline bool
+uclamp_tg_restricted(struct task_struct *p, unsigned int clamp_id,
+ unsigned int *clamp_value, unsigned int *bucket_id)
+{
+#ifdef CONFIG_UCLAMP_TASK_GROUP
+ unsigned int clamp_max, bucket_max;
+ struct uclamp_se *tg_clamp;
+
+ /*
+ * Tasks in an autogroup or the root task group are restricted by
+ * system defaults.
+ */
+ if (task_group_is_autogroup(task_group(p)))
+ return false;
+ if (task_group(p) == &root_task_group)
+ return false;
+
+ tg_clamp = &task_group(p)->uclamp[clamp_id];
+ bucket_max = tg_clamp->effective.bucket_id;
+ clamp_max = tg_clamp->effective.value;
+
+ if (!p->uclamp[clamp_id].user_defined || *clamp_value > clamp_max) {
+ *clamp_value = clamp_max;
+ *bucket_id = bucket_max;
+ }
+
+ return true;
+#else
+ return false;
+#endif
+}
+
/*
* The effective clamp bucket index of a task depends on, by increasing
* priority:
* - the task specific clamp value, when explicitly requested from userspace
+ * - the task group effective clamp value, for tasks not either in the root
+ * group or in an autogroup
* - the system default clamp value, defined by the sysadmin
*
* As a side effect, update the task's effective value:
@@ -841,7 +875,13 @@ uclamp_effective_get(struct task_struct *p, unsigned int clamp_id,
*bucket_id = p->uclamp[clamp_id].bucket_id;
*clamp_value = p->uclamp[clamp_id].value;
- /* Always apply system default restrictions */
+ /*
+ * If we have task groups and we are running in a child group, system
+ * default are already affecting the group's clamp values.
+ */
+ if (uclamp_tg_restricted(p, clamp_id, clamp_value, bucket_id))
+ return;
+
if (unlikely(*clamp_value > uclamp_default[clamp_id].value)) {
*clamp_value = uclamp_default[clamp_id].value;
*bucket_id = uclamp_default[clamp_id].bucket_id;
--
2.20.1
next prev parent reply other threads:[~2019-02-08 10:07 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-08 10:05 [PATCH v7 00/15] Add utilization clamping support Patrick Bellasi
2019-02-08 10:05 ` [PATCH v7 01/15] sched/core: uclamp: Add CPU's clamp buckets refcounting Patrick Bellasi
2019-03-12 12:52 ` Dietmar Eggemann
2019-03-13 15:15 ` Patrick Bellasi
2019-03-13 21:01 ` Suren Baghdasaryan
2019-03-14 14:54 ` Patrick Bellasi
2019-03-14 15:00 ` Patrick Bellasi
2019-03-12 15:20 ` Peter Zijlstra
2019-03-12 15:50 ` Patrick Bellasi
2019-03-13 8:19 ` Peter Zijlstra
2019-03-13 11:37 ` Patrick Bellasi
2019-03-13 13:40 ` Peter Zijlstra
2019-03-13 16:12 ` Patrick Bellasi
2019-03-13 17:22 ` Peter Zijlstra
2019-03-13 18:22 ` Patrick Bellasi
2019-03-13 19:48 ` Peter Zijlstra
2019-03-14 12:13 ` Patrick Bellasi
2019-03-14 13:32 ` Peter Zijlstra
2019-03-14 15:07 ` Patrick Bellasi
2019-03-14 19:18 ` Peter Zijlstra
2019-03-13 13:52 ` Peter Zijlstra
2019-03-13 15:59 ` Patrick Bellasi
2019-03-13 19:30 ` Peter Zijlstra
2019-03-14 11:03 ` Patrick Bellasi
2019-03-14 13:27 ` Peter Zijlstra
2019-03-13 19:39 ` Peter Zijlstra
2019-03-14 11:18 ` Patrick Bellasi
2019-03-13 21:23 ` Suren Baghdasaryan
2019-03-14 12:43 ` Patrick Bellasi
2019-03-13 14:06 ` Peter Zijlstra
2019-03-13 15:28 ` Patrick Bellasi
2019-03-13 14:09 ` Peter Zijlstra
2019-03-13 15:23 ` Patrick Bellasi
2019-03-13 19:46 ` Peter Zijlstra
2019-03-13 21:08 ` Suren Baghdasaryan
2019-03-14 12:22 ` Patrick Bellasi
2019-03-14 11:45 ` Patrick Bellasi
2019-03-13 21:32 ` Suren Baghdasaryan
2019-03-14 14:46 ` Patrick Bellasi
2019-03-14 15:29 ` Suren Baghdasaryan
2019-03-14 15:40 ` Patrick Bellasi
2019-03-14 16:39 ` Suren Baghdasaryan
2019-02-08 10:05 ` [PATCH v7 02/15] sched/core: uclamp: Enforce last task UCLAMP_MAX Patrick Bellasi
2019-03-13 14:10 ` Peter Zijlstra
2019-03-13 16:20 ` Patrick Bellasi
2019-03-13 17:29 ` Peter Zijlstra
2019-03-13 18:29 ` Patrick Bellasi
2019-03-13 14:12 ` Peter Zijlstra
2019-03-13 16:16 ` Patrick Bellasi
2019-03-14 0:29 ` Suren Baghdasaryan
2019-03-14 17:06 ` Patrick Bellasi
2019-02-08 10:05 ` [PATCH v7 03/15] sched/core: uclamp: Add system default clamps Patrick Bellasi
2019-03-13 14:32 ` Peter Zijlstra
2019-03-13 17:09 ` Patrick Bellasi
2019-03-13 19:58 ` Peter Zijlstra
2019-03-13 20:10 ` Peter Zijlstra
2019-03-15 13:41 ` Patrick Bellasi
2019-03-13 20:13 ` Peter Zijlstra
2019-03-13 20:18 ` Peter Zijlstra
2019-03-18 12:18 ` Patrick Bellasi
2019-03-18 13:10 ` Peter Zijlstra
2019-03-18 14:21 ` Patrick Bellasi
2019-03-18 14:29 ` Peter Zijlstra
2019-02-08 10:05 ` [PATCH v7 04/15] sched/core: Allow sched_setattr() to use the current policy Patrick Bellasi
2019-02-08 10:05 ` [PATCH v7 05/15] sched/core: uclamp: Extend sched_setattr() to support utilization clamping Patrick Bellasi
2019-02-08 10:05 ` [PATCH v7 06/15] sched/core: uclamp: Reset uclamp values on RESET_ON_FORK Patrick Bellasi
2019-03-13 20:52 ` Peter Zijlstra
2019-03-18 12:58 ` Patrick Bellasi
2019-02-08 10:05 ` [PATCH v7 07/15] sched/core: uclamp: Set default clamps for RT tasks Patrick Bellasi
2019-02-08 10:05 ` [PATCH v7 08/15] sched/cpufreq: uclamp: Add clamps for FAIR and " Patrick Bellasi
2019-02-08 10:05 ` [PATCH v7 09/15] sched/core: uclamp: Add uclamp_util_with() Patrick Bellasi
2019-02-08 10:05 ` [PATCH v7 10/15] sched/fair: uclamp: Add uclamp support to energy_compute() Patrick Bellasi
2019-03-06 17:21 ` Quentin Perret
2019-03-18 15:19 ` Patrick Bellasi
2019-02-08 10:05 ` [PATCH v7 11/15] sched/core: uclamp: Extend CPU's cgroup controller Patrick Bellasi
2019-02-14 15:48 ` Tejun Heo
2019-03-19 10:00 ` Patrick Bellasi
2019-02-08 10:05 ` [PATCH v7 12/15] sched/core: uclamp: Propagate parent clamps Patrick Bellasi
2019-03-14 16:17 ` Suren Baghdasaryan
2019-03-18 16:54 ` Patrick Bellasi
2019-03-18 16:58 ` Suren Baghdasaryan
2019-02-08 10:05 ` [PATCH v7 13/15] sched/core: uclamp: Propagate system defaults to root group Patrick Bellasi
2019-02-08 10:05 ` Patrick Bellasi [this message]
2019-02-08 10:05 ` [PATCH v7 15/15] sched/core: uclamp: Update CPU's refcount on TG's clamp changes Patrick Bellasi
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=20190208100554.32196-15-patrick.bellasi@arm.com \
--to=patrick.bellasi@arm.com \
--cc=dietmar.eggemann@arm.com \
--cc=joelaf@google.com \
--cc=juri.lelli@redhat.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=morten.rasmussen@arm.com \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=quentin.perret@arm.com \
--cc=rafael.j.wysocki@intel.com \
--cc=smuckle@google.com \
--cc=surenb@google.com \
--cc=tj@kernel.org \
--cc=tkjos@google.com \
--cc=vincent.guittot@linaro.org \
--cc=viresh.kumar@linaro.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).