summaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-04-07 14:10:00 +0200
committerIngo Molnar <mingo@elte.hu>2011-04-11 14:09:26 +0200
commiteb7a74e6cd936c00749e2921b9e058631d986648 (patch)
tree3efb7b3d2560a4121226900edb433c7f2c50684c /kernel/sched.c
parentd3081f52f29da1ba6c27685519a9222b39eac763 (diff)
downloadop-kernel-dev-eb7a74e6cd936c00749e2921b9e058631d986648.zip
op-kernel-dev-eb7a74e6cd936c00749e2921b9e058631d986648.tar.gz
sched: Stuff the sched_domain creation in a data-structure
In order to make the topology contruction fully dynamic, remove the still hard-coded list of possible domains and stick them in a data-structure. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Mike Galbraith <efault@gmx.de> Cc: Nick Piggin <npiggin@kernel.dk> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Link: http://lkml.kernel.org/r/20110407122942.770335383@chello.nl Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c32
1 files changed, 26 insertions, 6 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 3ae1e02..f0e1821 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -6843,6 +6843,16 @@ enum s_alloc {
sa_none,
};
+typedef struct sched_domain *(*sched_domain_build_f)(struct s_data *d,
+ const struct cpumask *cpu_map, struct sched_domain_attr *attr,
+ struct sched_domain *parent, int cpu);
+
+typedef const struct cpumask *(*sched_domain_mask_f)(int cpu);
+
+struct sched_domain_topology_level {
+ sched_domain_build_f build;
+};
+
/*
* Assumes the sched_domain tree is fully constructed
*/
@@ -7185,6 +7195,18 @@ static struct sched_domain *__build_smt_sched_domain(struct s_data *d,
return sd;
}
+static struct sched_domain_topology_level default_topology[] = {
+ { __build_allnodes_sched_domain, },
+ { __build_node_sched_domain, },
+ { __build_cpu_sched_domain, },
+ { __build_book_sched_domain, },
+ { __build_mc_sched_domain, },
+ { __build_smt_sched_domain, },
+ { NULL, },
+};
+
+static struct sched_domain_topology_level *sched_domain_topology = default_topology;
+
/*
* Build sched domains for a given set of cpus and attach the sched domains
* to the individual cpus
@@ -7203,13 +7225,11 @@ 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_topology_level *tl;
+
sd = NULL;
- sd = __build_allnodes_sched_domain(&d, cpu_map, attr, sd, i);
- sd = __build_node_sched_domain(&d, cpu_map, attr, sd, i);
- sd = __build_cpu_sched_domain(&d, cpu_map, attr, sd, i);
- sd = __build_book_sched_domain(&d, cpu_map, attr, sd, i);
- sd = __build_mc_sched_domain(&d, cpu_map, attr, sd, i);
- sd = __build_smt_sched_domain(&d, cpu_map, attr, sd, i);
+ for (tl = sched_domain_topology; tl->build; tl++)
+ sd = tl->build(&d, cpu_map, attr, sd, i);
*per_cpu_ptr(d.sd, i) = sd;
}
OpenPOWER on IntegriCloud