From: peterz@infradead.org (Peter Zijlstra)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 11/12] sched: replace capacity_factor by utilization
Date: Thu, 11 Sep 2014 17:39:10 +0200 [thread overview]
Message-ID: <20140911153910.GZ3190@worktop.ger.corp.intel.com> (raw)
In-Reply-To: <1409051215-16788-12-git-send-email-vincent.guittot@linaro.org>
On Tue, Aug 26, 2014 at 01:06:54PM +0200, Vincent Guittot wrote:
> The scheduler tries to compute how many tasks a group of CPUs can handle by
> assuming that a task's load is SCHED_LOAD_SCALE and a CPU capacity is
> SCHED_CAPACITY_SCALE.
> We can now have a better idea of the capacity of a group of CPUs and of the
> utilization of this group thanks to the rework of group_capacity_orig and the
> group_utilization. We can now deduct how many capacity is still available.
>
> Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
> ---
A few minor changes I did while going through it.
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5669,7 +5669,7 @@ struct sg_lb_stats {
unsigned int idle_cpus;
unsigned int group_weight;
enum group_type group_type;
- int group_out_of_capacity;
+ int group_no_capacity;
#ifdef CONFIG_NUMA_BALANCING
unsigned int nr_numa_running;
unsigned int nr_preferred_running;
@@ -5931,37 +5931,37 @@ static inline int sg_imbalanced(struct s
return group->sgc->imbalance;
}
-static inline int group_has_free_capacity(struct sg_lb_stats *sgs,
- struct lb_env *env)
+static inline bool
+group_has_capacity(struct lb_env *env, struct sg_lb_stats *sgs)
{
if ((sgs->group_capacity_orig * 100) >
(sgs->group_utilization * env->sd->imbalance_pct))
- return 1;
+ return true;
if (sgs->sum_nr_running < sgs->group_weight)
- return 1;
+ return true;
- return 0;
+ return false;
}
-static inline int group_is_overloaded(struct sg_lb_stats *sgs,
- struct lb_env *env)
+static inline bool
+group_is_overloaded(struct lb_env *env, struct sg_lb_stats *sgs)
{
if (sgs->sum_nr_running <= sgs->group_weight)
- return 0;
+ return false;
if ((sgs->group_capacity_orig * 100) <
(sgs->group_utilization * env->sd->imbalance_pct))
- return 1;
+ return true;
- return 0;
+ return false;
}
-static enum group_type
-group_classify(struct sched_group *group, struct sg_lb_stats *sgs,
- struct lb_env *env)
+static enum group_type group_classify(struct lb_env *env,
+ struct sched_group *group,
+ struct sg_lb_stats *sgs)
{
- if (group_is_overloaded(sgs, env))
+ if (group_is_overloaded(env, sgs))
return group_overloaded;
if (sg_imbalanced(group))
@@ -6024,9 +6024,8 @@ static inline void update_sg_lb_stats(st
sgs->group_weight = group->group_weight;
- sgs->group_type = group_classify(group, sgs, env);
-
- sgs->group_out_of_capacity = group_is_overloaded(sgs, env);
+ sgs->group_type = group_classify(env, group, sgs);
+ sgs->group_no_capacity = group_is_overloaded(env, sgs);
}
/**
@@ -6157,9 +6156,9 @@ static inline void update_sd_lb_stats(st
* with a large weight task outweighs the tasks on the system).
*/
if (prefer_sibling && sds->local &&
- group_has_free_capacity(&sds->local_stat, env)) {
+ group_has_capacity(env, &sds->local_stat)) {
if (sgs->sum_nr_running > 1)
- sgs->group_out_of_capacity = 1;
+ sgs->group_no_capacity = 1;
sgs->group_capacity = min(sgs->group_capacity,
SCHED_CAPACITY_SCALE);
}
@@ -6430,9 +6429,8 @@ static struct sched_group *find_busiest_
goto force_balance;
/* SD_BALANCE_NEWIDLE trumps SMP nice when underutilized */
- if (env->idle == CPU_NEWLY_IDLE &&
- group_has_free_capacity(local, env) &&
- busiest->group_out_of_capacity)
+ if (env->idle == CPU_NEWLY_IDLE && group_has_capacity(env, local) &&
+ busiest->group_no_capacity)
goto force_balance;
/*
next prev parent reply other threads:[~2014-09-11 15:39 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-26 11:06 [PATCH v5 00/12] sched: consolidation of cpu_capacity Vincent Guittot
2014-08-26 11:06 ` [PATCH v5 01/12] sched: fix imbalance flag reset Vincent Guittot
2014-08-26 11:06 ` [PATCH v5 02/12] sched: remove a wake_affine condition Vincent Guittot
2014-08-26 11:06 ` [PATCH v5 03/12] sched: fix avg_load computation Vincent Guittot
2014-08-30 12:00 ` Preeti U Murthy
2014-09-03 11:09 ` Vincent Guittot
2014-09-03 23:43 ` Tim Chen
2014-09-04 7:17 ` Vincent Guittot
2014-09-04 16:26 ` Tim Chen
2014-09-05 11:10 ` Preeti U Murthy
2014-08-26 11:06 ` [PATCH v5 04/12] sched: Allow all archs to set the capacity_orig Vincent Guittot
2014-08-27 13:12 ` Kamalesh Babulal
2014-08-30 17:07 ` Preeti U Murthy
2014-09-01 8:05 ` Vincent Guittot
2014-09-03 8:41 ` Preeti U Murthy
2014-09-10 13:50 ` Peter Zijlstra
2014-09-10 14:22 ` Vincent Guittot
2014-09-11 10:36 ` Preeti U Murthy
2014-08-26 11:06 ` [PATCH v5 05/12] ARM: topology: use new cpu_capacity interface Vincent Guittot
2014-09-11 18:52 ` Nicolas Pitre
2014-08-26 11:06 ` [PATCH v5 06/12] sched: add per rq cpu_capacity_orig Vincent Guittot
2014-08-27 13:32 ` Kamalesh Babulal
2014-08-28 7:34 ` Vincent Guittot
2014-09-10 13:53 ` Peter Zijlstra
2014-09-10 14:19 ` Vincent Guittot
2014-09-11 19:02 ` Nicolas Pitre
2014-09-15 21:22 ` Vincent Guittot
2014-08-26 11:06 ` [PATCH v5 07/12] sched: test the cpu's capacity in wake affine Vincent Guittot
2014-09-10 14:19 ` Peter Zijlstra
2014-08-26 11:06 ` [PATCH v5 08/12] sched: move cfs task on a CPU with higher capacity Vincent Guittot
2014-08-30 17:50 ` Preeti U Murthy
2014-09-01 8:45 ` Vincent Guittot
2014-09-03 9:11 ` Preeti U Murthy
2014-09-03 11:44 ` Vincent Guittot
2014-09-03 12:26 ` Preeti U Murthy
2014-09-03 12:49 ` Vincent Guittot
2014-09-11 9:27 ` Peter Zijlstra
2014-09-05 12:06 ` Preeti U Murthy
2014-09-05 12:24 ` Vincent Guittot
2014-09-11 10:07 ` Peter Zijlstra
2014-09-11 11:20 ` Vincent Guittot
2014-09-11 10:13 ` Peter Zijlstra
2014-09-11 12:14 ` Vincent Guittot
2014-09-11 11:54 ` Peter Zijlstra
2014-08-26 11:06 ` [PATCH v5 09/12] sched: add usage_load_avg Vincent Guittot
2014-09-04 7:34 ` [PATCH v5 09/11] " Vincent Guittot
2014-09-11 11:17 ` Peter Zijlstra
2014-09-11 11:17 ` [PATCH v5 09/12] " Peter Zijlstra
2014-09-11 12:18 ` Vincent Guittot
2014-09-11 12:20 ` Vincent Guittot
2014-09-15 19:15 ` Morten Rasmussen
2014-09-15 22:33 ` Vincent Guittot
2014-08-26 11:06 ` [PATCH v5 10/12] sched: get CPU's utilization statistic Vincent Guittot
2014-09-11 12:34 ` Peter Zijlstra
2014-09-11 13:07 ` Vincent Guittot
2014-09-11 14:04 ` Peter Zijlstra
2014-09-11 19:17 ` Nicolas Pitre
2014-09-12 7:41 ` Vincent Guittot
2014-09-15 19:45 ` Morten Rasmussen
2014-09-16 22:43 ` Vincent Guittot
2014-09-15 19:28 ` Morten Rasmussen
2014-08-26 11:06 ` [PATCH v5 11/12] sched: replace capacity_factor by utilization Vincent Guittot
2014-09-11 15:39 ` Peter Zijlstra [this message]
2014-09-11 16:15 ` Peter Zijlstra
2014-09-11 17:26 ` Vincent Guittot
2014-09-14 19:41 ` Peter Zijlstra
2014-09-14 19:51 ` Peter Zijlstra
2014-09-15 11:42 ` Peter Zijlstra
2014-09-15 19:07 ` Nicolas Pitre
2014-09-15 20:01 ` Peter Zijlstra
2014-09-17 18:45 ` Morten Rasmussen
2014-09-17 18:58 ` Morten Rasmussen
2014-09-17 23:03 ` Peter Zijlstra
2014-09-15 22:14 ` Vincent Guittot
2014-09-15 22:18 ` Vincent Guittot
2014-09-17 22:25 ` Peter Zijlstra
2014-09-18 1:32 ` Vincent Guittot
2014-09-16 17:00 ` Dietmar Eggemann
2014-08-26 11:06 ` [PATCH v5 12/12] sched: add SD_PREFER_SIBLING for SMT level 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=20140911153910.GZ3190@worktop.ger.corp.intel.com \
--to=peterz@infradead.org \
--cc=linux-arm-kernel@lists.infradead.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).