From: Alex Shi <alex.shi@intel.com>
To: mingo@redhat.com, peterz@infradead.org, tglx@linutronix.de,
akpm@linux-foundation.org, bp@alien8.de, pjt@google.com,
namhyung@kernel.org, efault@gmx.de, morten.rasmussen@arm.com
Cc: vincent.guittot@linaro.org, preeti@linux.vnet.ibm.com,
viresh.kumar@linaro.org, linux-kernel@vger.kernel.org,
alex.shi@intel.com, mgorman@suse.de, riel@redhat.com,
wangyun@linux.vnet.ibm.com, Jason Low <jason.low2@hp.com>,
Changlong Xie <changlongx.xie@intel.com>,
sgruszka@redhat.com, fweisbec@gmail.com
Subject: [patch v8 8/9] sched: consider runnable load average in move_tasks
Date: Fri, 7 Jun 2013 15:20:51 +0800 [thread overview]
Message-ID: <1370589652-24549-9-git-send-email-alex.shi@intel.com> (raw)
In-Reply-To: <1370589652-24549-1-git-send-email-alex.shi@intel.com>
Except using runnable load average in background, move_tasks is also
the key functions in load balance. We need consider the runnable load
average in it in order to the apple to apple load comparison.
Morten had caught a div u64 bug on ARM, thanks!
Signed-off-by: Alex Shi <alex.shi@intel.com>
---
kernel/sched/fair.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index eadd2e7..3aa1dc0 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4178,11 +4178,14 @@ static int tg_load_down(struct task_group *tg, void *data)
long cpu = (long)data;
if (!tg->parent) {
- load = cpu_rq(cpu)->load.weight;
+ load = cpu_rq(cpu)->avg.load_avg_contrib;
} else {
+ unsigned long tmp_rla;
+ tmp_rla = tg->parent->cfs_rq[cpu]->runnable_load_avg + 1;
+
load = tg->parent->cfs_rq[cpu]->h_load;
- load *= tg->se[cpu]->load.weight;
- load /= tg->parent->cfs_rq[cpu]->load.weight + 1;
+ load *= tg->se[cpu]->avg.load_avg_contrib;
+ load /= tmp_rla;
}
tg->cfs_rq[cpu]->h_load = load;
@@ -4208,12 +4211,9 @@ static void update_h_load(long cpu)
static unsigned long task_h_load(struct task_struct *p)
{
struct cfs_rq *cfs_rq = task_cfs_rq(p);
- unsigned long load;
-
- load = p->se.load.weight;
- load = div_u64(load * cfs_rq->h_load, cfs_rq->load.weight + 1);
- return load;
+ return div64_ul(p->se.avg.load_avg_contrib * cfs_rq->h_load,
+ cfs_rq->runnable_load_avg + 1);
}
#else
static inline void update_blocked_averages(int cpu)
--
1.7.12
next prev parent reply other threads:[~2013-06-07 7:22 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-07 7:20 [patch 0/9] sched: use runnable load avg in balance Alex Shi
2013-06-07 7:20 ` [patch v8 1/9] Revert "sched: Introduce temporary FAIR_GROUP_SCHED dependency for load-tracking" Alex Shi
2013-06-07 7:20 ` [patch v8 2/9] sched: move few runnable tg variables into CONFIG_SMP Alex Shi
2013-06-17 12:26 ` Paul Turner
2013-06-17 15:32 ` Alex Shi
2013-06-07 7:20 ` [patch v8 3/9] sched: set initial value of runnable avg for new forked task Alex Shi
2013-06-10 1:51 ` Gu Zheng
2013-06-14 10:02 ` Lei Wen
2013-06-14 13:59 ` Alex Shi
2013-06-15 12:09 ` Lei Wen
2013-06-17 0:33 ` Alex Shi
2013-06-20 10:23 ` Morten Rasmussen
2013-06-21 2:57 ` Lei Wen
2013-06-17 9:20 ` Peter Zijlstra
2013-06-17 12:26 ` Lei Wen
2013-06-17 12:33 ` Peter Zijlstra
2013-06-14 11:09 ` Paul Turner
2013-06-14 14:16 ` Alex Shi
2013-06-17 9:21 ` Peter Zijlstra
2013-06-17 9:39 ` Paul Turner
2013-06-17 13:00 ` Peter Zijlstra
2013-06-17 9:57 ` Alex Shi
2013-06-17 13:07 ` Peter Zijlstra
2013-06-17 13:23 ` Alex Shi
2013-06-07 7:20 ` [patch v8 4/9] sched: fix slept time double counting in enqueue entity Alex Shi
2013-06-17 11:51 ` Paul Turner
2013-06-17 15:41 ` Alex Shi
2013-06-20 1:43 ` Lei Wen
2013-06-20 1:46 ` Alex Shi
2013-06-20 2:46 ` Lei Wen
2013-06-20 14:59 ` Alex Shi
2013-06-21 2:30 ` Lei Wen
2013-06-21 2:39 ` Alex Shi
2013-06-21 2:50 ` Lei Wen
2013-06-21 8:56 ` Alex Shi
2013-06-21 9:18 ` Lei Wen
2013-06-21 11:09 ` Alex Shi
2013-06-21 13:26 ` Lei Wen
2013-06-07 7:20 ` [patch v8 5/9] sched: update cpu load after task_tick Alex Shi
2013-06-17 11:54 ` Paul Turner
2013-06-07 7:20 ` [patch v8 6/9] sched: compute runnable load avg in cpu_load and cpu_avg_load_per_task Alex Shi
2013-06-10 1:49 ` Gu Zheng
2013-06-10 2:01 ` Alex Shi
2013-06-10 2:05 ` Gu Zheng
2013-06-17 10:51 ` Paul Turner
2013-06-17 12:17 ` Paul Turner
2013-06-17 13:39 ` Peter Zijlstra
2013-06-17 13:59 ` Alex Shi
2013-06-17 13:57 ` Alex Shi
2013-06-17 23:00 ` Paul Turner
2013-06-18 3:44 ` Alex Shi
2013-06-18 9:44 ` Alex Shi
2013-06-19 8:15 ` Alex Shi
2013-06-20 0:33 ` Alex Shi
2013-06-17 14:57 ` Alex Shi
2013-06-17 15:21 ` Alex Shi
2013-06-07 7:20 ` [patch v8 7/9] math64: add div64_ul macro Alex Shi
2013-06-07 7:20 ` Alex Shi [this message]
2013-06-17 10:58 ` [patch v8 8/9] sched: consider runnable load average in move_tasks Paul Turner
2013-06-17 14:01 ` Alex Shi
2013-06-17 14:15 ` Alex Shi
2013-06-17 13:59 ` Peter Zijlstra
2013-06-17 14:29 ` Alex Shi
2013-06-07 7:20 ` [patch v8 9/9] sched/tg: remove blocked_load_avg in balance Alex Shi
2013-06-17 9:38 ` Peter Zijlstra
2013-06-17 12:20 ` Paul Turner
2013-06-17 14:01 ` Peter Zijlstra
2013-06-19 9:49 ` Alex Shi
2013-06-20 1:33 ` Alex Shi
2013-06-08 2:37 ` [patch 0/9] sched: use runnable load avg " Alex Shi
2013-06-10 1:35 ` Alex Shi
2013-06-10 15:01 ` Peter Zijlstra
2013-06-11 3:30 ` Alex Shi
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=1370589652-24549-9-git-send-email-alex.shi@intel.com \
--to=alex.shi@intel.com \
--cc=akpm@linux-foundation.org \
--cc=bp@alien8.de \
--cc=changlongx.xie@intel.com \
--cc=efault@gmx.de \
--cc=fweisbec@gmail.com \
--cc=jason.low2@hp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mgorman@suse.de \
--cc=mingo@redhat.com \
--cc=morten.rasmussen@arm.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=preeti@linux.vnet.ibm.com \
--cc=riel@redhat.com \
--cc=sgruszka@redhat.com \
--cc=tglx@linutronix.de \
--cc=vincent.guittot@linaro.org \
--cc=viresh.kumar@linaro.org \
--cc=wangyun@linux.vnet.ibm.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).