lkml.org 
[lkml]   [2013]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:sched/core] sched/fair: Move load idx selection in find_idlest_group
    Commit-ID:  c44f2a020072d75d6b0cbf9f139a09719cda9367
    Gitweb: http://git.kernel.org/tip/c44f2a020072d75d6b0cbf9f139a09719cda9367
    Author: Vincent Guittot <vincent.guittot@linaro.org>
    AuthorDate: Fri, 18 Oct 2013 13:52:21 +0200
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Wed, 27 Nov 2013 13:50:54 +0100

    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>
    ---
    kernel/sched/fair.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
    index e8b652e..6cb36c7 100644
    --- a/kernel/sched/fair.c
    +++ b/kernel/sched/fair.c
    @@ -4110,12 +4110,16 @@ static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync)
    */
    static struct sched_group *
    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;
    unsigned long min_load = ULONG_MAX, this_load = 0;
    + int load_idx = sd->forkexec_idx;
    int imbalance = 100 + (sd->imbalance_pct-100)/2;

    + if (sd_flag & SD_BALANCE_WAKE)
    + load_idx = sd->wake_idx;
    +
    do {
    unsigned long load, avg_load;
    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) {
    - int load_idx = sd->forkexec_idx;
    struct sched_group *group;
    int weight;

    @@ -4292,10 +4295,7 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f
    continue;
    }

    - if (sd_flag & SD_BALANCE_WAKE)
    - load_idx = sd->wake_idx;
    -
    - group = find_idlest_group(sd, p, cpu, load_idx);
    + group = find_idlest_group(sd, p, cpu, sd_flag);
    if (!group) {
    sd = sd->child;
    continue;

    \
     
     \ /
      Last update: 2013-11-27 15:41    [W:4.082 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site