Skip to content

Commit 2066f00

Browse files
KAGA-KOKObp3tk0v
authored andcommitted
x86/topology: Implement topology_is_core_online() to address SMT regression
Christian reported that commit a430c11 ("intel_idle: Rescan "dead" SMT siblings during initialization") broke the use case in which both 'nosmt' and 'maxcpus' are on the kernel command line because it onlines primary threads, which were offline due to the maxcpus limit. The initially proposed fix to skip primary threads in the loop is inconsistent. While it prevents the primary thread to be onlined, it then onlines the corresponding hyperthread(s), which does not really make sense. The CPU iterator in cpuhp_smt_enable() contains a check which excludes all threads of a core, when the primary thread is offline. The default implementation is a NOOP and therefore not effective on x86. Implement topology_is_core_online() on x86 to address this issue. This makes the behaviour consistent between x86 and PowerPC. Fixes: a430c11 ("intel_idle: Rescan "dead" SMT siblings during initialization") Fixes: f694481 ("ACPI: processor: Rescan "dead" SMT siblings during initialization") Closes: https://lore.kernel.org/linux-pm/724616a2-6374-4ba3-8ce3-ea9c45e2ae3b@arm.com/ Reported-by: Christian Loehle <christian.loehle@arm.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Rafael J. Wysocki (Intel) <rafael@kernel.org> Tested-by: Christian Loehle <christian.loehle@arm.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/12740505.O9o76ZdvQC@rafael.j.wysocki
1 parent 4f11559 commit 2066f00

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

arch/x86/include/asm/topology.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,16 @@ static inline bool topology_is_primary_thread(unsigned int cpu)
231231
}
232232
#define topology_is_primary_thread topology_is_primary_thread
233233

234+
int topology_get_primary_thread(unsigned int cpu);
235+
236+
static inline bool topology_is_core_online(unsigned int cpu)
237+
{
238+
int pcpu = topology_get_primary_thread(cpu);
239+
240+
return pcpu >= 0 ? cpu_online(pcpu) : false;
241+
}
242+
#define topology_is_core_online topology_is_core_online
243+
234244
#else /* CONFIG_SMP */
235245
static inline int topology_phys_to_logical_pkg(unsigned int pkg) { return 0; }
236246
static inline int topology_max_smt_threads(void) { return 1; }

arch/x86/kernel/cpu/topology.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,19 @@ unsigned int topology_unit_count(u32 apicid, enum x86_topology_domains which_uni
372372
return topo_unit_count(lvlid, at_level, apic_maps[which_units].map);
373373
}
374374

375+
#ifdef CONFIG_SMP
376+
int topology_get_primary_thread(unsigned int cpu)
377+
{
378+
u32 apic_id = cpuid_to_apicid[cpu];
379+
380+
/*
381+
* Get the core domain level APIC id, which is the primary thread
382+
* and return the CPU number assigned to it.
383+
*/
384+
return topo_lookup_cpuid(topo_apicid(apic_id, TOPO_CORE_DOMAIN));
385+
}
386+
#endif
387+
375388
#ifdef CONFIG_ACPI_HOTPLUG_CPU
376389
/**
377390
* topology_hotplug_apic - Handle a physical hotplugged APIC after boot

0 commit comments

Comments
 (0)