From: Nikhil Rao <ncrao@google.com>
To: Ingo Molnar <mingo@elte.hu>, Peter Zijlstra <peterz@infradead.org>
Cc: Paul Turner <pjt@google.com>, Mike Galbraith <efault@gmx.de>,
linux-kernel@vger.kernel.org, Nikhil Rao <ncrao@google.com>
Subject: [RFC][Patch 10/18] sched: update wake_affine path to use u64, s64 for weights
Date: Wed, 20 Apr 2011 13:51:29 -0700 [thread overview]
Message-ID: <1303332697-16426-11-git-send-email-ncrao@google.com> (raw)
In-Reply-To: <1303332697-16426-1-git-send-email-ncrao@google.com>
Update the s64/u64 math in wake_affine() and effective_load() to handle
increased resolution.
Signed-off-by: Nikhil Rao <ncrao@google.com>
---
kernel/sched_fair.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 029dd4f..2b030f4 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1388,7 +1388,7 @@ static void task_waking_fair(struct rq *rq, struct task_struct *p)
* of group shares between cpus. Assuming the shares were perfectly aligned one
* can calculate the shift in shares.
*/
-static long effective_load(struct task_group *tg, int cpu, long wl, long wg)
+static s64 effective_load(struct task_group *tg, int cpu, s64 wl, s64 wg)
{
struct sched_entity *se = tg->se[cpu];
@@ -1396,7 +1396,7 @@ static long effective_load(struct task_group *tg, int cpu, long wl, long wg)
return wl;
for_each_sched_entity(se) {
- long lw, w;
+ s64 lw, w;
tg = se->my_q->tg;
w = se->my_q->load.weight;
@@ -1409,7 +1409,7 @@ static long effective_load(struct task_group *tg, int cpu, long wl, long wg)
wl += w;
if (lw > 0 && wl < lw)
- wl = (wl * tg->shares) / lw;
+ wl = div64_s64(wl * tg->shares, lw);
else
wl = tg->shares;
@@ -1504,7 +1504,7 @@ static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync)
if (balanced ||
(this_load <= load &&
- this_load + target_load(prev_cpu, idx) <= tl_per_task)) {
+ this_load + target_load(prev_cpu, idx) <= (u64)tl_per_task)) {
/*
* This domain has SD_WAKE_AFFINE and
* p is cache cold in this domain, and
--
1.7.3.1
next prev parent reply other threads:[~2011-04-20 20:52 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-20 20:51 [RFC][PATCH 00/18] Increase resolution of load weights Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 01/18] sched: introduce SCHED_POWER_SCALE to scale cpu_power calculations Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 02/18] sched: increase SCHED_LOAD_SCALE resolution Nikhil Rao
2011-04-28 9:54 ` Nikunj A. Dadhania
2011-04-28 17:11 ` Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 03/18] sched: use u64 for load_weight fields Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 04/18] sched: update cpu_load to be u64 Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 05/18] sched: update this_cpu_load() to return u64 value Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 06/18] sched: update source_load(), target_load() and weighted_cpuload() to use u64 Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 07/18] sched: update find_idlest_cpu() to use u64 for load Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 08/18] sched: update find_idlest_group() to use u64 Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 09/18] sched: update division in cpu_avg_load_per_task to use div_u64 Nikhil Rao
2011-04-20 20:51 ` Nikhil Rao [this message]
2011-04-20 20:51 ` [RFC][Patch 11/18] sched: update update_sg_lb_stats() to use u64 Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 12/18] sched: Update update_sd_lb_stats() " Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 13/18] sched: update f_b_g() to use u64 for weights Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 14/18] sched: change type of imbalance to be u64 Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 15/18] sched: update h_load to use u64 Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 16/18] sched: update move_task() and helper functions to use u64 for weights Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 17/18] sched: update f_b_q() to use u64 for weighted cpuload Nikhil Rao
2011-04-20 20:51 ` [RFC][Patch 18/18] sched: update shares distribution to use u64 Nikhil Rao
2011-04-21 6:16 ` [RFC][PATCH 00/18] Increase resolution of load weights Ingo Molnar
2011-04-21 16:32 ` Peter Zijlstra
2011-04-26 16:11 ` Nikhil Rao
2011-04-21 16:40 ` Peter Zijlstra
2011-04-28 7:07 ` Nikunj A. Dadhania
2011-04-28 11:48 ` Nikunj A. Dadhania
2011-04-28 12:12 ` Srivatsa Vaddagiri
2011-04-28 18:33 ` Nikhil Rao
2011-04-28 18:51 ` Paul Turner
2011-04-28 18:53 ` Paul Turner
2011-04-28 21:27 ` Nikhil Rao
2011-04-29 16:55 ` Paul Turner
2011-04-28 18:20 ` Nikhil Rao
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=1303332697-16426-11-git-send-email-ncrao@google.com \
--to=ncrao@google.com \
--cc=efault@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=pjt@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