From: Vincent Guittot <vincent.guittot@linaro.org>
To: peterz@infradead.org, mingo@kernel.org,
linux-kernel@vger.kernel.org, yuyang.du@intel.com,
Morten.Rasmussen@arm.com
Cc: linaro-kernel@lists.linaro.org, dietmar.eggemann@arm.com,
pjt@google.com, bsegall@google.com,
Vincent Guittot <vincent.guittot@linaro.org>
Subject: [PATCH 1/7 v3] sched: factorize attach entity
Date: Mon, 12 Sep 2016 09:47:46 +0200 [thread overview]
Message-ID: <1473666472-13749-2-git-send-email-vincent.guittot@linaro.org> (raw)
In-Reply-To: <1473666472-13749-1-git-send-email-vincent.guittot@linaro.org>
Factorize post_init_entity_util_avg and part of attach_task_cfs_rq
in one function attach_entity_cfs_rq
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
---
kernel/sched/fair.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index a6820b3..dfd9c0c 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -694,9 +694,7 @@ void init_entity_runnable_average(struct sched_entity *se)
}
static inline u64 cfs_rq_clock_task(struct cfs_rq *cfs_rq);
-static int update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq, bool update_freq);
-static void update_tg_load_avg(struct cfs_rq *cfs_rq, int force);
-static void attach_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se);
+static void attach_entity_cfs_rq(struct sched_entity *se);
/*
* With new tasks being created, their initial util_avgs are extrapolated
@@ -761,9 +759,7 @@ void post_init_entity_util_avg(struct sched_entity *se)
}
}
- update_cfs_rq_load_avg(now, cfs_rq, false);
- attach_entity_load_avg(cfs_rq, se);
- update_tg_load_avg(cfs_rq, false);
+ attach_entity_cfs_rq(se);
}
#else /* !CONFIG_SMP */
@@ -8498,9 +8494,8 @@ static void detach_task_cfs_rq(struct task_struct *p)
update_tg_load_avg(cfs_rq, false);
}
-static void attach_task_cfs_rq(struct task_struct *p)
+static void attach_entity_cfs_rq(struct sched_entity *se)
{
- struct sched_entity *se = &p->se;
struct cfs_rq *cfs_rq = cfs_rq_of(se);
u64 now = cfs_rq_clock_task(cfs_rq);
@@ -8516,6 +8511,14 @@ static void attach_task_cfs_rq(struct task_struct *p)
update_cfs_rq_load_avg(now, cfs_rq, false);
attach_entity_load_avg(cfs_rq, se);
update_tg_load_avg(cfs_rq, false);
+}
+
+static void attach_task_cfs_rq(struct task_struct *p)
+{
+ struct sched_entity *se = &p->se;
+ struct cfs_rq *cfs_rq = cfs_rq_of(se);
+
+ attach_entity_cfs_rq(se);
if (!vruntime_normalized(p))
se->vruntime += cfs_rq->min_vruntime;
--
1.9.1
next prev parent reply other threads:[~2016-09-12 7:48 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-12 7:47 [PATCH 0/7 v3] sched: reflect sched_entity move into task_group's load Vincent Guittot
2016-09-12 7:47 ` Vincent Guittot [this message]
2016-09-12 7:47 ` [PATCH 2/7 v3] sched: fix hierarchical order in rq->leaf_cfs_rq_list Vincent Guittot
2016-09-21 10:14 ` Dietmar Eggemann
2016-09-21 12:34 ` Vincent Guittot
2016-09-21 17:25 ` Dietmar Eggemann
2016-09-21 18:02 ` Vincent Guittot
2016-09-12 7:47 ` [PATCH 3/7 v3] sched: factorize PELT update Vincent Guittot
2016-09-15 13:09 ` Peter Zijlstra
2016-09-15 13:30 ` Vincent Guittot
2016-09-12 7:47 ` [PATCH 4/7 v3] sched: propagate load during synchronous attach/detach Vincent Guittot
2016-09-15 12:55 ` Peter Zijlstra
2016-09-15 13:01 ` Vincent Guittot
2016-09-15 12:59 ` Peter Zijlstra
2016-09-15 13:11 ` Vincent Guittot
2016-09-15 13:11 ` Dietmar Eggemann
2016-09-15 14:31 ` Vincent Guittot
2016-09-15 17:20 ` Dietmar Eggemann
2016-09-15 15:14 ` Peter Zijlstra
2016-09-15 17:36 ` Dietmar Eggemann
2016-09-15 17:54 ` Peter Zijlstra
2016-09-15 14:43 ` Peter Zijlstra
2016-09-15 14:51 ` Vincent Guittot
2016-09-19 3:19 ` Wanpeng Li
2016-09-12 7:47 ` [PATCH 5/7 v3] sched: propagate asynchrous detach Vincent Guittot
2016-09-12 7:47 ` [PATCH 6/7 v3] sched: fix task group initialization Vincent Guittot
2016-09-12 7:47 ` [PATCH 7/7 v3] sched: fix wrong utilization accounting when switching to fair class Vincent Guittot
2016-09-15 13:18 ` Peter Zijlstra
2016-09-15 15:36 ` Vincent Guittot
2016-09-16 12:16 ` Peter Zijlstra
2016-09-16 14:23 ` Vincent Guittot
2016-09-20 11:54 ` Peter Zijlstra
2016-09-20 13:06 ` Vincent Guittot
2016-09-22 12:25 ` Peter Zijlstra
2016-09-26 14:53 ` Peter Zijlstra
2016-09-20 16:59 ` bsegall
2016-09-22 8:33 ` Peter Zijlstra
2016-09-22 17:10 ` bsegall
2016-09-16 10:51 ` Peter Zijlstra
2016-09-16 12:45 ` Vincent Guittot
2016-09-30 12:01 ` [tip:sched/core] sched/core: Fix incorrect " tip-bot for Vincent Guittot
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=1473666472-13749-2-git-send-email-vincent.guittot@linaro.org \
--to=vincent.guittot@linaro.org \
--cc=Morten.Rasmussen@arm.com \
--cc=bsegall@google.com \
--cc=dietmar.eggemann@arm.com \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.