From: Dave Hansen <dave.han...@linux.intel.com>
The MC (MultiCore) sched domain was originally intended to
represent the groupings of cores in a multi-core CPU.
The sched domains code has essentially two kinds of topology
levels:
1. CPU levels, like hyperthreads or cores that share cache
2. NUMA levels derived from the system's NUMA topology
The domains are built by first going through the CPU levels, then
through the NUMA levels. However, we now have at least two
instances of systems where a single CPU "package" has multiple
NUMA nodes.
To fix this, we redefine the multi-core level. Previously, it
was defined as stopping at the CPU package. Now, we define it as
grouping similar CPUs that are both in the same package *and*
that have the same access to some set of memory. Essentially an
MC group must be in the same package *and* be on the same NUMA
node.
This does no harm because there is a NUMA precisely at the level
which "MC" used to represent.
Signed-off-by: Dave Hansen <dave.han...@linux.intel.com>
---
b/arch/x86/kernel/smpboot.c | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff -puN arch/x86/kernel/smpboot.c~keep-mc-from-crossing-nodes-or-package
arch/x86/kernel/smpboot.c
--- a/arch/x86/kernel/smpboot.c~keep-mc-from-crossing-nodes-or-package
2014-09-17 15:28:58.226604751 -0700
+++ b/arch/x86/kernel/smpboot.c 2014-09-17 15:28:58.230604935 -0700
@@ -345,13 +345,27 @@ static bool match_llc(struct cpuinfo_x86
static bool match_mc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
{
- if (c->phys_proc_id == o->phys_proc_id) {
- if (cpu_has(c, X86_FEATURE_AMD_DCM))
- return true;
+ /*
+ * Do not allow a multi-core group
+ * ouside of a package.
+ */
+ if (c->phys_proc_id != o->phys_proc_id)
+ return false;
- return topology_sane(c, o, "mc");
- }
- return false;
+ /*
+ * Do not allow a multi-core group
+ * ouside of a NUMA node.
+ */
+ if (cpu_to_node(c->cpu_index) !=
+ cpu_to_node(o->cpu_index))
+ return false;
+
+ /*
+ * This pretty much repeats the NUMA node
+ * check above, but leave it here for
+ * consistency.
+ */
+ return topology_sane(c, o, "mc");
}
static bool match_pkg(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
