lkml.org 
[lkml]   [2016]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/4] x86/topology: Fix AMD core count
    Date
    From: Peter Zijlstra <peterz@infradead.org>

    It turns out AMD gets x86_max_cores wrong when there are compute
    units.

    The issue is that Linux assumes:

    nr_logical_cpus = nr_cores * nr_siblings

    But AMD reports its CU unit as 2 cores, but then sets num_smp_siblings
    to 2 as well.

    Boris: fixup ras/mce_amd_inj.c too, to compute the Node Base Core
    properly, according to the new nomenclature.

    Reported-by: Xiong Zhou <jencce.kernel@gmail.com>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Cc: Andreas Herrmann <aherrmann@suse.com>
    Cc: Andy Lutomirski <luto@kernel.org>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: x86-ml <x86@kernel.org>
    Fixes: 1f12e32f4cd5 ("x86/topology: Create logical package id")
    Link: http://lkml.kernel.org/r/20160317095220.GO6344@twins.programming.kicks-ass.net
    Signed-off-by: Borislav Petkov <bp@suse.de>
    ---
    arch/x86/include/asm/smp.h | 1 +
    arch/x86/kernel/cpu/amd.c | 8 ++++----
    arch/x86/ras/mce_amd_inj.c | 3 ++-
    3 files changed, 7 insertions(+), 5 deletions(-)

    diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
    index 20a3de5cb3b0..66b057306f40 100644
    --- a/arch/x86/include/asm/smp.h
    +++ b/arch/x86/include/asm/smp.h
    @@ -155,6 +155,7 @@ static inline int wbinvd_on_all_cpus(void)
    wbinvd();
    return 0;
    }
    +#define smp_num_siblings 1
    #endif /* CONFIG_SMP */

    extern unsigned disabled_cpus;
    diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
    index b39338c4b260..b8d7f3012340 100644
    --- a/arch/x86/kernel/cpu/amd.c
    +++ b/arch/x86/kernel/cpu/amd.c
    @@ -310,9 +310,9 @@ static void amd_get_topology(struct cpuinfo_x86 *c)
    node_id = ecx & 7;

    /* get compute unit information */
    - smp_num_siblings = ((ebx >> 8) & 3) + 1;
    + cores_per_cu = smp_num_siblings = ((ebx >> 8) & 3) + 1;
    + c->x86_max_cores /= smp_num_siblings;
    c->compute_unit_id = ebx & 0xff;
    - cores_per_cu += ((ebx >> 8) & 3);
    } else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) {
    u64 value;

    @@ -328,8 +328,8 @@ static void amd_get_topology(struct cpuinfo_x86 *c)
    u32 cus_per_node;

    set_cpu_cap(c, X86_FEATURE_AMD_DCM);
    - cores_per_node = c->x86_max_cores / nodes_per_socket;
    - cus_per_node = cores_per_node / cores_per_cu;
    + cus_per_node = c->x86_max_cores / nodes_per_socket;
    + cores_per_node = cus_per_node * cores_per_cu;

    /* store NodeID, use llc_shared_map to store sibling info */
    per_cpu(cpu_llc_id, cpu) = node_id;
    diff --git a/arch/x86/ras/mce_amd_inj.c b/arch/x86/ras/mce_amd_inj.c
    index 55d38cfa46c2..9e02dcaef683 100644
    --- a/arch/x86/ras/mce_amd_inj.c
    +++ b/arch/x86/ras/mce_amd_inj.c
    @@ -20,6 +20,7 @@
    #include <linux/pci.h>

    #include <asm/mce.h>
    +#include <asm/smp.h>
    #include <asm/amd_nb.h>
    #include <asm/irq_vectors.h>

    @@ -206,7 +207,7 @@ static u32 get_nbc_for_node(int node_id)
    struct cpuinfo_x86 *c = &boot_cpu_data;
    u32 cores_per_node;

    - cores_per_node = c->x86_max_cores / amd_get_nodes_per_socket();
    + cores_per_node = (c->x86_max_cores * smp_num_siblings) / amd_get_nodes_per_socket();

    return cores_per_node * node_id;
    }
    --
    2.7.3
    \
     
     \ /
      Last update: 2016-03-25 16:01    [W:3.008 / U:0.540 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site