sched/fair: Move load idx selection in find_idlest_group
load_idx is used in find_idlest_group but initialized in select_task_rq_fair even when not used. The load_idx initialisation is moved in find_idlest_group and the sd_flag replaces it in the function's args. Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> Cc: len.brown@intel.com Cc: amit.kucheria@linaro.org Cc: pjt@google.com Cc: l.majewski@samsung.com Cc: Morten.Rasmussen@arm.com Cc: cmetcalf@tilera.com Cc: tony.luck@intel.com Cc: alex.shi@intel.com Cc: preeti@linux.vnet.ibm.com Cc: linaro-kernel@lists.linaro.org Cc: rjw@sisk.pl Cc: paulmck@linux.vnet.ibm.com Cc: corbet@lwn.net Cc: arjan@linux.intel.com Signed-off-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1382097147-30088-8-git-send-email-vincent.guittot@linaro.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
192301e70a
commit
c44f2a0200
|
@ -4110,12 +4110,16 @@ static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync)
|
||||||
*/
|
*/
|
||||||
static struct sched_group *
|
static struct sched_group *
|
||||||
find_idlest_group(struct sched_domain *sd, struct task_struct *p,
|
find_idlest_group(struct sched_domain *sd, struct task_struct *p,
|
||||||
int this_cpu, int load_idx)
|
int this_cpu, int sd_flag)
|
||||||
{
|
{
|
||||||
struct sched_group *idlest = NULL, *group = sd->groups;
|
struct sched_group *idlest = NULL, *group = sd->groups;
|
||||||
unsigned long min_load = ULONG_MAX, this_load = 0;
|
unsigned long min_load = ULONG_MAX, this_load = 0;
|
||||||
|
int load_idx = sd->forkexec_idx;
|
||||||
int imbalance = 100 + (sd->imbalance_pct-100)/2;
|
int imbalance = 100 + (sd->imbalance_pct-100)/2;
|
||||||
|
|
||||||
|
if (sd_flag & SD_BALANCE_WAKE)
|
||||||
|
load_idx = sd->wake_idx;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
unsigned long load, avg_load;
|
unsigned long load, avg_load;
|
||||||
int local_group;
|
int local_group;
|
||||||
|
@ -4283,7 +4287,6 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f
|
||||||
}
|
}
|
||||||
|
|
||||||
while (sd) {
|
while (sd) {
|
||||||
int load_idx = sd->forkexec_idx;
|
|
||||||
struct sched_group *group;
|
struct sched_group *group;
|
||||||
int weight;
|
int weight;
|
||||||
|
|
||||||
|
@ -4292,10 +4295,7 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sd_flag & SD_BALANCE_WAKE)
|
group = find_idlest_group(sd, p, cpu, sd_flag);
|
||||||
load_idx = sd->wake_idx;
|
|
||||||
|
|
||||||
group = find_idlest_group(sd, p, cpu, load_idx);
|
|
||||||
if (!group) {
|
if (!group) {
|
||||||
sd = sd->child;
|
sd = sd->child;
|
||||||
continue;
|
continue;
|
||||||
|
|
Loading…
Reference in New Issue