diff options
| author | Peter Zijlstra <[email protected]> | 2014-07-22 11:47:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2014-07-28 10:04:13 +0200 |
| commit | 6ae72dff37596f736b795426306404f0793e4b1b (patch) | |
| tree | 89a6488a4766e799312672baae3350ade42cf276 | |
| parent | ca5bc6cd5de5b53eb8fd6fea39aa3fe2a1e8c3d9 (diff) | |
sched: Robustify topology setup
We hard assume that higher topology levels are supersets of lower
levels.
Detect, warn and try to fixup when we encounter this violated.
Tested-by: Dietmar Eggemann <[email protected]>
Signed-off-by: Peter Zijlstra <[email protected]>
Cc: Josh Boyer <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Bruno Wolff III <[email protected]>
Cc: Linus Torvalds <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
| -rw-r--r-- | kernel/sched/core.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 415ab0268b51..2a36a74c16ae 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6481,6 +6481,20 @@ struct sched_domain *build_sched_domain(struct sched_domain_topology_level *tl, sched_domain_level_max = max(sched_domain_level_max, sd->level); child->parent = sd; sd->child = child; + + if (!cpumask_subset(sched_domain_span(child), + sched_domain_span(sd))) { + pr_err("BUG: arch topology borken\n"); +#ifdef CONFIG_SCHED_DEBUG + pr_err(" the %s domain not a subset of the %s domain\n", + child->name, sd->name); +#endif + /* Fixup, ensure @sd has at least @child cpus. */ + cpumask_or(sched_domain_span(sd), + sched_domain_span(sd), + sched_domain_span(child)); + } + } set_domain_attribute(sd, attr); |