From: Peter Zijlstra <peterz@infradead.org>
To: Vincent Guittot <vincent.guittot@linaro.org>
Cc: Yuyang Du <yuyang.du@intel.com>, Ingo Molnar <mingo@kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Mike Galbraith <umgwanakikbuti@gmail.com>,
Benjamin Segall <bsegall@google.com>,
Paul Turner <pjt@google.com>,
Morten Rasmussen <morten.rasmussen@arm.com>,
Dietmar Eggemann <dietmar.eggemann@arm.com>,
Matt Fleming <matt@codeblueprint.co.uk>
Subject: Re: [PATCH 4/4] sched,fair: Fix PELT integrity for new tasks
Date: Mon, 20 Jun 2016 11:52:14 +0200 [thread overview]
Message-ID: <20160620095214.GF30154@twins.programming.kicks-ass.net> (raw)
In-Reply-To: <20160620092339.GA4526@vingu-laptop>
On Mon, Jun 20, 2016 at 11:23:39AM +0200, Vincent Guittot wrote:
> > @@ -738,7 +739,20 @@ void post_init_entity_util_avg(struct sc
> > sa->util_sum = sa->util_avg * LOAD_AVG_MAX;
> > }
> >
> > - update_cfs_rq_load_avg(cfs_rq_clock_task(cfs_rq), cfs_rq, false);
> > + if (entity_is_task(se)) {
>
> Why only task ?
Only tasks can be of another class, the cgroup se's must be fair.
> > + struct task_struct *p = task_of(se);
> > + if (p->sched_class != &fair_sched_class) {
> > + /*
> > + * For !fair tasks do attach_entity_load_avg()
> > + * followed by detach_entity_load_avg() as per
> > + * switched_from_fair().
> > + */
> > + se->avg.last_update_time = now;
> > + return;
> > + }
> > + }
> > +
> > + update_cfs_rq_load_avg(now, cfs_rq, false);
> > attach_entity_load_avg(cfs_rq, se);
>
> Don't we have to do a complete attach with attach_task_cfs_rq instead
> of just the load_avg ? to set also depth ?
init_tg_cfs_entity() sets depth for cgroup entities,
attach_task_cfs_rq() reset depth on switched_to().
So that should be fine.
> ---
> --- a/kernel/sched/fair.c
> +++ b/kernel/sched/fair.c
> @@ -723,6 +723,7 @@ void post_init_entity_util_avg(struct sched_entity *se)
> struct cfs_rq *cfs_rq = cfs_rq_of(se);
> struct sched_avg *sa = &se->avg;
> long cap = (long)(SCHED_CAPACITY_SCALE - cfs_rq->avg.util_avg) / 2;
> + u64 now = cfs_rq_clock_task(cfs_rq);
>
> if (cap > 0) {
> if (cfs_rq->avg.util_avg != 0) {
> @@ -737,8 +738,18 @@ void post_init_entity_util_avg(struct sched_entity *se)
> sa->util_sum = sa->util_avg * LOAD_AVG_MAX;
> }
>
> - update_cfs_rq_load_avg(cfs_rq_clock_task(cfs_rq), cfs_rq, false);
> - attach_entity_load_avg(cfs_rq, se);
There is no p here...
> + if (p->sched_class == &fair_sched_class) {
> + /* fair entity must be attached to cfs_rq */
> + attach_task_cfs_rq(se);
> + } else {
> + /*
> + * For !fair tasks do attach_entity_load_avg()
> + * followed by detach_entity_load_avg() as per
> + * switched_from_fair().
> + */
> + se->avg.last_update_time = now;
> + }
> +
> }
And you're now not attaching new cgroup thingies.
next prev parent reply other threads:[~2016-06-20 9:52 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-17 12:01 [PATCH 0/4] sched/fair: Fix PELT wobblies Peter Zijlstra
2016-06-17 12:01 ` [PATCH 1/4] sched: Optimize fork() paths Peter Zijlstra
2016-06-17 12:01 ` [PATCH 2/4] sched/fair: Fix PELT integrity for new groups Peter Zijlstra
2016-06-17 13:51 ` Vincent Guittot
2016-06-17 12:01 ` [PATCH 3/4] sched,cgroup: Fix cpu_cgroup_fork() Peter Zijlstra
2016-06-17 13:58 ` Vincent Guittot
2016-06-17 14:06 ` Peter Zijlstra
2016-06-17 12:01 ` [PATCH 4/4] sched,fair: Fix PELT integrity for new tasks Peter Zijlstra
2016-06-17 14:09 ` Vincent Guittot
2016-06-17 14:28 ` Peter Zijlstra
2016-06-17 16:02 ` Peter Zijlstra
2016-06-17 16:14 ` Vincent Guittot
2016-06-17 16:18 ` Peter Zijlstra
2016-06-19 22:55 ` Yuyang Du
2016-06-20 9:23 ` Vincent Guittot
2016-06-20 9:52 ` Peter Zijlstra [this message]
2016-06-20 10:07 ` Vincent Guittot
2016-06-21 11:43 ` Peter Zijlstra
2016-06-21 12:36 ` Vincent Guittot
2016-06-21 12:47 ` Peter Zijlstra
2016-06-21 12:56 ` Vincent Guittot
2016-06-20 11:35 ` Dietmar Eggemann
2016-06-20 12:35 ` Vincent Guittot
2016-06-20 14:49 ` Dietmar Eggemann
2016-06-21 8:41 ` Peter Zijlstra
2016-06-21 4:51 ` Yuyang Du
2016-06-24 13:03 ` Peter Zijlstra
2016-08-09 23:19 ` Yuyang Du
2016-06-21 13:17 ` Peter Zijlstra
2016-06-21 13:29 ` Vincent Guittot
2016-06-22 11:46 ` Peter Zijlstra
2016-06-23 15:35 ` Dietmar Eggemann
2016-06-23 17:15 ` Peter Zijlstra
2016-06-20 14:27 ` Peter Zijlstra
2016-06-23 11:19 ` Peter Zijlstra
2016-08-01 7:30 ` Wanpeng Li
2016-08-01 9:31 ` Mike Galbraith
2016-08-01 9:56 ` Wanpeng Li
2016-08-01 11:52 ` Mike Galbraith
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=20160620095214.GF30154@twins.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=bsegall@google.com \
--cc=dietmar.eggemann@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=mingo@kernel.org \
--cc=morten.rasmussen@arm.com \
--cc=pjt@google.com \
--cc=umgwanakikbuti@gmail.com \
--cc=vincent.guittot@linaro.org \
--cc=yuyang.du@intel.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).