x86/CPU/AMD: Bring back Compute Unit ID
Borislav Petkov
maintainerPATCH 1/2 x86/CPU/AMD: Bring back Compute Unit ID
From: Borislav Petkov <[email protected]>
a33d331761bc ("x86/CPU/AMD: Fix Bulldozer topology") restored the initial approach we had with the Fam15h topology of enumerating CU (Compute Unit) threads as cores. And this is still correct - they're beefier than HT threads but still have some shared functionality.
Our current approach has a problem with the Mad Max Steam game, for example. Yves Dionne reported a certain "choppiness" while playing on 4.9.5.
That problem stems most likely from the fact that the CU threads share resources within one CU and when we schedule to a thread of a different compute unit, this incurs latency due to migrating the working set to a different CU through the caches.
When the thread siblings mask mirrors that aspect of the CUs and threads, the scheduler pays attention to it and tries to schedule within one CU first. Which takes care of the latency, of course.
--- arch/x86/include/asm/processor.h | 1 + arch/x86/kernel/cpu/amd.c | 9 ++++++++- arch/x86/kernel/cpu/common.c | 1 + arch/x86/kernel/smpboot.c | 12 +++++++++--- 4 files changed, 19 insertions(+), 4 deletions(-)
arch/x86/include/asm/processor.h +1 -0
@@ -104,6 +104,7 @@ struct cpuinfo_x86 {__u8 x86_phys_bits;/* CPUID returned core id bits: */ __u8 x86_coreid_bits; +__u8 cu_id;/* Max extended CPUID function supported: */ __u32 extended_cpuid_level;/* Maximum supported CPUID level, -1=no CPUID: */
arch/x86/kernel/cpu/amd.c +8 -1
@@ -309,8 +309,15 @@ static void amd_get_topology(struct cpuinfo_x86 *c)/* get information required for multi-node processors */ if (boot_cpu_has (X86_FEATURE_TOPOEXT )) { +u32 eax, ebx, ecx, edx; - node_id =cpuid_ecx (0x8000001e ) &7 ; +cpuid (0x8000001e , &eax, &ebx, &ecx, &edx); + + node_id = ecx &0xff ; + smp_num_siblings = ((ebx >>8 ) &0xff ) +1 ; + +if (c->x86 ==0x15 ) + c->cu_id = ebx &0xff ;/* * We may have multiple LLCs if L3 caches exist, so check if we
arch/x86/kernel/cpu/common.c +1 -0
@@ -1034,6 +1034,7 @@ static void identify_cpu(struct cpuinfo_x86 *c) c->x86_model_id[0 ] ='\0' ;/* Unset */ c->x86_max_cores =1 ; c->x86_coreid_bits =0 ; + c->cu_id =0xff ;#ifdef CONFIG_X86_64 c->x86_clflush_size =64 ; c->x86_phys_bits =36 ;
arch/x86/kernel/smpboot.c +9 -3
@@ -433,9 +433,15 @@ static bool match_smt(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)int cpu1 = c->cpu_index, cpu2 = o->cpu_index;if (c->phys_proc_id == o->phys_proc_id && -per_cpu (cpu_llc_id, cpu1) ==per_cpu (cpu_llc_id, cpu2) && - c->cpu_core_id == o->cpu_core_id) -return topology_sane (c, o,"smt" ); +per_cpu (cpu_llc_id, cpu1) ==per_cpu (cpu_llc_id, cpu2)) { +if (c->cpu_core_id == o->cpu_core_id) +return topology_sane (c, o,"smt" ); + +if ((c->cu_id !=0xff ) && + (o->cu_id !=0xff ) && + (c->cu_id == o->cu_id)) +return topology_sane (c, o,"smt" ); + } }else if (c->phys_proc_id == o->phys_proc_id && c->cpu_core_id == o->cpu_core_id) {
Signature · 1 line
2.11.0
Borislav Petkov
maintainerPATCH 2/2 x86/CPU/AMD: Fix Zen SMT topology
From: Yazen Ghannam <[email protected]>
After a33d331761bc ("x86/CPU/AMD: Fix Bulldozer topology"), SMT scheduling topology for Fam17h systems is broken because the ThreadId is included in the ApicId when SMT is enabled.
So, without further decoding cpu_core_id is unique for each thread rather than the same for threads on the same core. This didn't affect systems with SMT disabled. Make cpu_core_id be what it is defined to be.
--- arch/x86/kernel/cpu/amd.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/x86/kernel/cpu/amd.c +7 -0
@@ -319,6 +319,13 @@ static void amd_get_topology(struct cpuinfo_x86 *c)if (c->x86 ==0x15 ) c->cu_id = ebx &0xff ; +if (c->x86 >=0x17 ) { + c->cpu_core_id = ebx &0xff ; + +if (smp_num_siblings >1 ) + c->x86_max_cores /= smp_num_siblings; + } +/* * 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.
Signature · 1 line
2.11.0
tip-bot for Yazen Ghannam
merge bot[tip:x86/urgent] x86/CPU/AMD: Fix Zen SMT topology
x86/CPU/AMD: Fix Zen SMT topology
Commit-ID: 08b259631b5a1d912af4832847b5642f377d9101 Gitweb: http://git.kernel.org/tip/08b259631b5a1d912af4832847b5642f377d9101 Author: Yazen Ghannam <[email protected]> AuthorDate: Sun, 5 Feb 2017 11:50:22 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 5 Feb 2017 12:18:45 +0100
x86/CPU/AMD: Fix Zen SMT topology
After:
a33d331761bc ("x86/CPU/AMD: Fix Bulldozer topology")
our SMT scheduling topology for Fam17h systems is broken, because the ThreadId is included in the ApicId when SMT is enabled.
So, without further decoding cpu_core_id is unique for each thread rather than the same for threads on the same core. This didn't affect systems with SMT disabled. Make cpu_core_id be what it is defined to be.
--- arch/x86/kernel/cpu/amd.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/x86/kernel/cpu/amd.c +7 -0
@@ -319,6 +319,13 @@ static void amd_get_topology(struct cpuinfo_x86 *c)if (c->x86 ==0x15 ) c->cu_id = ebx &0xff ; +if (c->x86 >=0x17 ) { + c->cpu_core_id = ebx &0xff ; + +if (smp_num_siblings >1 ) + c->x86_max_cores /= smp_num_siblings; + } +/* * 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.
tip-bot for Borislav Petkov
merge botx86/CPU/AMD: Bring back Compute Unit ID
Commit-ID: 79a8b9aa388b0620cc1d525d7c0f0d9a8a85e08e Gitweb: http://git.kernel.org/tip/79a8b9aa388b0620cc1d525d7c0f0d9a8a85e08e Author: Borislav Petkov <[email protected]> AuthorDate: Sun, 5 Feb 2017 11:50:21 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 5 Feb 2017 12:18:45 +0100
x86/CPU/AMD: Bring back Compute Unit ID
Commit:
a33d331761bc ("x86/CPU/AMD: Fix Bulldozer topology")
restored the initial approach we had with the Fam15h topology of enumerating CU (Compute Unit) threads as cores. And this is still correct - they're beefier than HT threads but still have some shared functionality.
Our current approach has a problem with the Mad Max Steam game, for example. Yves Dionne reported a certain "choppiness" while playing on v4.9.5.
That problem stems most likely from the fact that the CU threads share resources within one CU and when we schedule to a thread of a different compute unit, this incurs latency due to migrating the working set to a different CU through the caches.
When the thread siblings mask mirrors that aspect of the CUs and threads, the scheduler pays attention to it and tries to schedule within one CU first. Which takes care of the latency, of course.
--- arch/x86/include/asm/processor.h | 1 + arch/x86/kernel/cpu/amd.c | 9 ++++++++- arch/x86/kernel/cpu/common.c | 1 + arch/x86/kernel/smpboot.c | 12 +++++++++--- 4 files changed, 19 insertions(+), 4 deletions(-)
arch/x86/include/asm/processor.h +1 -0
@@ -104,6 +104,7 @@ struct cpuinfo_x86 {__u8 x86_phys_bits;/* CPUID returned core id bits: */ __u8 x86_coreid_bits; +__u8 cu_id;/* Max extended CPUID function supported: */ __u32 extended_cpuid_level;/* Maximum supported CPUID level, -1=no CPUID: */
arch/x86/kernel/cpu/amd.c +8 -1
@@ -309,8 +309,15 @@ static void amd_get_topology(struct cpuinfo_x86 *c)/* get information required for multi-node processors */ if (boot_cpu_has (X86_FEATURE_TOPOEXT )) { +u32 eax, ebx, ecx, edx; - node_id =cpuid_ecx (0x8000001e ) &7 ; +cpuid (0x8000001e , &eax, &ebx, &ecx, &edx); + + node_id = ecx &0xff ; + smp_num_siblings = ((ebx >>8 ) &0xff ) +1 ; + +if (c->x86 ==0x15 ) + c->cu_id = ebx &0xff ;/* * We may have multiple LLCs if L3 caches exist, so check if we
arch/x86/kernel/cpu/common.c +1 -0
@@ -1015,6 +1015,7 @@ static void identify_cpu(struct cpuinfo_x86 *c) c->x86_model_id[0 ] ='\0' ;/* Unset */ c->x86_max_cores =1 ; c->x86_coreid_bits =0 ; + c->cu_id =0xff ;#ifdef CONFIG_X86_64 c->x86_clflush_size =64 ; c->x86_phys_bits =36 ;
arch/x86/kernel/smpboot.c +9 -3
@@ -433,9 +433,15 @@ static bool match_smt(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)int cpu1 = c->cpu_index, cpu2 = o->cpu_index;if (c->phys_proc_id == o->phys_proc_id && -per_cpu (cpu_llc_id, cpu1) ==per_cpu (cpu_llc_id, cpu2) && - c->cpu_core_id == o->cpu_core_id) -return topology_sane (c, o,"smt" ); +per_cpu (cpu_llc_id, cpu1) ==per_cpu (cpu_llc_id, cpu2)) { +if (c->cpu_core_id == o->cpu_core_id) +return topology_sane (c, o,"smt" ); + +if ((c->cu_id !=0xff ) && + (o->cu_id !=0xff ) && + (c->cu_id == o->cu_id)) +return topology_sane (c, o,"smt" ); + } }else if (c->phys_proc_id == o->phys_proc_id && c->cpu_core_id == o->cpu_core_id) {