• Borislav Petkov's avatar
    x86/smp: Fix topology checks on AMD MCM CPUs · 161270fc
    Borislav Petkov authored
    The warning below triggers on AMD MCM packages because physical package
    IDs on the cores of a _physical_ socket are the same. I.e., this field
    says which CPUs belong to the same physical package.
    
    However, the same two CPUs belong to two different internal, i.e.
    "logical" nodes in the same physical socket which is reflected in the
    CPU-to-node map on x86 with NUMA.
    
    Which makes this check wrong on the above topologies so circumvent it.
    
    [    0.444413] Booting Node   0, Processors  #1 #2 #3 #4 #5 Ok.
    [    0.461388] ------------[ cut here ]------------
    [    0.465997] WARNING: at arch/x86/kernel/smpboot.c:310 topology_sane.clone.1+0x6e/0x81()
    [    0.473960] Hardware name: Dinar
    [    0.477170] sched: CPU #6's mc-sibling CPU #0 is not on the same node! [node: 1 != 0]. Ignoring dependency.
    [    0.486860] Booting Node   1, Processors  #6
    [    0.491104] Modules linked in:
    [    0.494141] Pid: 0, comm: swapper/6 Not tainted 3.4.0+ #1
    [    0.499510] Call Trace:
    [    0.501946]  [<ffffffff8144bf92>] ? topology_sane.clone.1+0x6e/0x81
    [    0.508185]  [<ffffffff8102f1fc>] warn_slowpath_common+0x85/0x9d
    [    0.514163]  [<ffffffff8102f2b7>] warn_slowpath_fmt+0x46/0x48
    [    0.519881]  [<ffffffff8144bf92>] topology_sane.clone.1+0x6e/0x81
    [    0.525943]  [<ffffffff8144c234>] set_cpu_sibling_map+0x251/0x371
    [    0.532004]  [<ffffffff8144c4ee>] start_secondary+0x19a/0x218
    [    0.537729] ---[ end trace 4eaa2a86a8e2da22 ]---
    [    0.628197]  #7 #8 #9 #10 #11 Ok.
    [    0.807108] Booting Node   3, Processors  #12 #13 #14 #15 #16 #17 Ok.
    [    0.897587] Booting Node   2, Processors  #18 #19 #20 #21 #22 #23 Ok.
    [    0.917443] Brought up 24 CPUs
    
    We ran a topology sanity check test we have here on it and
    it all looks ok... hopefully :).
    Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
    Cc: Andreas Herrmann <andreas.herrmann3@amd.com>
    Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/20120529135442.GE29157@aftab.osrc.amd.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
    161270fc
smpboot.c 33.6 KB