lkml.org 
[lkml]   [2012]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] x86, smp: Fix topology checks on AMD MCM
    Date
    From: Borislav Petkov <borislav.petkov@amd.com>

    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

    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Andreas Herrmann <andreas.herrmann3@amd.com>
    Link: http://lkml.kernel.org/r/20120529135442.GE29157@aftab.osrc.amd.com
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    ---
    arch/x86/kernel/smpboot.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
    index f56f96da77f5..912e5cac61d8 100644
    --- a/arch/x86/kernel/smpboot.c
    +++ b/arch/x86/kernel/smpboot.c
    @@ -350,7 +350,8 @@ static bool __cpuinit match_llc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
    static bool __cpuinit match_mc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
    {
    if (c->phys_proc_id == o->phys_proc_id)
    - return topology_sane(c, o, "mc");
    + if (!cpu_has(c, X86_FEATURE_AMD_DCM))
    + return topology_sane(c, o, "mc");

    return false;
    }
    --
    1.7.9.3.362.g71319


    \
     
     \ /
      Last update: 2012-06-04 15:43    [W:5.168 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site