x86/cpu/AMD: Clean up cpu_llc_id assignment per topology feature

These changes do not affect current hw - just a cleanup:

Currently, we assume that a system has a single Last Level Cache (LLC)
per node, and that the cpu_llc_id is thus equal to the node_id. This no
longer applies since Fam17h can have multiple last level caches within a
node.

So group the cpu_llc_id assignment by topology feature and family in
order to make the computation of cpu_llc_id on the different families
more clear.

Here is how the LLC ID is being computed on the different families:

The NODEID_MSR feature only applies to Fam10h in which case the LLC is
at the node level.

The TOPOEXT feature is used on families 15h, 16h and 17h. So far we only
see multiple last level caches if L3 caches are available. Otherwise,
the cpu_llc_id will default to be the phys_proc_id.

We have L3 caches only on families 15h and 17h:

 - on Fam15h, the LLC is at the node level.

 - on Fam17h, the LLC is at the core complex level and can be found by
   right shifting the APIC ID. Also, keep the family checks explicit so that
   new families will fall back to the default, which will be node_id for
   TOPOEXT systems.

Single node systems in families 10h and 15h will have a Node ID of 0
which will be the same as the phys_proc_id, so we don't need to check
for multiple nodes before using the node_id.

Tested-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Yazen Ghannam <Yazen.Ghannam@amd.com>
[ Rewrote the commit message. ]
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Aravind Gopalakrishnan <aravindksg.lkml@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20161108153054.bs3sajbyevq6a6uu@pd.tnic
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 1e81a37c034e7821580f5165eb4359e209ef7823..4daad1e39352eabe3af012bca81b93bd77e05178 100644 (file)
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -314,11 +314,30 @@ static void amd_get_topology(struct cpuinfo_x86 *c)
                smp_num_siblings = ((ebx >> 8) & 3) + 1;
                c->x86_max_cores /= smp_num_siblings;
                c->cpu_core_id = ebx & 0xff;
+
+               /*
+                * We may have multiple LLCs if L3 caches exist, so check if we
+                * have an L3 cache by looking at the L3 cache CPUID leaf.
+                */
+               if (cpuid_edx(0x80000006)) {
+                       if (c->x86 == 0x17) {
+                               /*
+                                * LLC is at the core complex level.
+                                * Core complex id is ApicId[3].
+                                */
+                               per_cpu(cpu_llc_id, cpu) = c->apicid >> 3;
+                       } else {
+                               /* LLC is at the node level. */
+                               per_cpu(cpu_llc_id, cpu) = node_id;
+                       }
+               }
        } else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) {
                u64 value;
 
                rdmsrl(MSR_FAM10H_NODE_ID, value);
                node_id = value & 7;
+
+               per_cpu(cpu_llc_id, cpu) = node_id;
        } else
                return;
 
@@ -329,9 +348,6 @@ static void amd_get_topology(struct cpuinfo_x86 *c)
                set_cpu_cap(c, X86_FEATURE_AMD_DCM);
                cus_per_node = c->x86_max_cores / nodes_per_socket;
 
-               /* store NodeID, use llc_shared_map to store sibling info */
-               per_cpu(cpu_llc_id, cpu) = node_id;
-
                /* core id has to be in the [0 .. cores_per_node - 1] range */
                c->cpu_core_id %= cus_per_node;
        }
@@ -356,15 +372,6 @@ static void amd_detect_cmp(struct cpuinfo_x86 *c)
        /* use socket ID also for last level cache */
        per_cpu(cpu_llc_id, cpu) = c->phys_proc_id;
        amd_get_topology(c);
-
-       /*
-        * Fix percpu cpu_llc_id here as LLC topology is different
-        * for Fam17h systems.
-        */
-        if (c->x86 != 0x17 || !cpuid_edx(0x80000006))
-               return;
-
-       per_cpu(cpu_llc_id, cpu) = c->apicid >> 3;
 #endif
 }