lkml.org 
[lkml]   [2009]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 06/12] sched: Seperate out build of SMT sched domain from __build_sched_domains

    ... to further strip down __build_sched_domains().

    Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
    ---
    kernel/sched.c | 32 +++++++++++++++++++-------------
    1 files changed, 19 insertions(+), 13 deletions(-)

    diff --git a/kernel/sched.c b/kernel/sched.c
    index e24cb49..a253ca6 100644
    --- a/kernel/sched.c
    +++ b/kernel/sched.c
    @@ -8652,6 +8652,23 @@ static struct sched_domain *__build_mc_sched_domain(struct s_data *d,
    return sd;
    }

    +static struct sched_domain *__build_smt_sched_domain(struct s_data *d,
    + const struct cpumask *cpu_map, struct sched_domain_attr *attr,
    + struct sched_domain *parent, int i)
    +{
    + struct sched_domain *sd = parent;
    +#ifdef CONFIG_SCHED_SMT
    + sd = &per_cpu(cpu_domains, i).sd;
    + SD_INIT(sd, SIBLING);
    + set_domain_attribute(sd, attr);
    + cpumask_and(sched_domain_span(sd), cpu_map, topology_thread_cpumask(i));
    + sd->parent = parent;
    + parent->child = sd;
    + cpu_to_cpu_group(i, cpu_map, &sd->groups, d->tmpmask);
    +#endif
    + return sd;
    +}
    +
    /*
    * Build sched domains for a given set of cpus and attach the sched domains
    * to the individual cpus
    @@ -8675,7 +8692,7 @@ static int __build_sched_domains(const struct cpumask *cpu_map,
    * Set up domains for cpus specified by the cpu_map.
    */
    for_each_cpu(i, cpu_map) {
    - struct sched_domain *sd = NULL, *p;
    + struct sched_domain *sd;

    cpumask_and(d.nodemask, cpumask_of_node(cpu_to_node(i)),
    cpu_map);
    @@ -8683,18 +8700,7 @@ static int __build_sched_domains(const struct cpumask *cpu_map,
    sd = __build_numa_sched_domains(&d, cpu_map, attr, i);
    sd = __build_cpu_sched_domain(&d, cpu_map, attr, sd, i);
    sd = __build_mc_sched_domain(&d, cpu_map, attr, sd, i);
    -
    -#ifdef CONFIG_SCHED_SMT
    - p = sd;
    - sd = &per_cpu(cpu_domains, i).sd;
    - SD_INIT(sd, SIBLING);
    - set_domain_attribute(sd, attr);
    - cpumask_and(sched_domain_span(sd),
    - topology_thread_cpumask(i), cpu_map);
    - sd->parent = p;
    - p->child = sd;
    - cpu_to_cpu_group(i, cpu_map, &sd->groups, d.tmpmask);
    -#endif
    + sd = __build_smt_sched_domain(&d, cpu_map, attr, sd, i);
    }

    #ifdef CONFIG_SCHED_SMT
    --
    1.6.4




    \
     
     \ /
      Last update: 2009-08-18 12:59    [W:0.036 / U:29.940 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site