Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-01 16:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

arch_topology: Fix cache attributes detection in the CPU hotplug path

Browse Source 
init_cpu_topology() is called only once at the boot and all the cache
attributes are detected early for all the possible CPUs. However when
the CPUs are hotplugged out, the cacheinfo gets removed. While the
attributes are added back when the CPUs are hotplugged back in as part
of CPU hotplug state machine, it ends up called quite late after the
update_siblings_masks() are called in the secondary_start_kernel()
resulting in wrong llc_sibling_masks.

Move the call to detect_cache_attributes() inside update_siblings_masks()
to ensure the cacheinfo is updated before the LLC sibling masks are
updated. This will fix the incorrect LLC sibling masks generated when
the CPUs are hotplugged out and hotplugged back in again.

Reported-by: Ionela Voinescu <ionela.voinescu@arm.com>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Ionela Voinescu <ionela.voinescu@arm.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Reviewed-by: Ionela Voinescu <ionela.voinescu@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Link: https://lore.kernel.org/r/20220720-arch_topo_fixes-v3-3-43d696288e84@arm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sudeep Holla 2022-07-20 13:55:40 +01:00 committed by Greg Kroah-Hartman
parent 0c80f9e165
commit 3fcbf1c77d
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/base/arch_topology.c
View File

@ -732,7 +732,11 @@ const struct cpumask *cpu_clustergroup_mask(int cpu)
void update_siblings_masks(unsigned int cpuid) void update_siblings_masks(unsigned int cpuid)
{ {
struct cpu_topology *cpu_topo, *cpuid_topo = &cpu_topology[cpuid]; struct cpu_topology *cpu_topo, *cpuid_topo = &cpu_topology[cpuid];
int cpu; int cpu, ret;
ret = detect_cache_attributes(cpuid);
if (ret)
pr_info("Early cacheinfo failed, ret = %d\n", ret);
/* update core and thread sibling masks */ /* update core and thread sibling masks */
for_each_online_cpu(cpu) { for_each_online_cpu(cpu) {
@ -821,7 +825,7 @@ __weak int __init parse_acpi_topology(void)
#if defined(CONFIG_ARM64) || defined(CONFIG_RISCV) #if defined(CONFIG_ARM64) || defined(CONFIG_RISCV)
void __init init_cpu_topology(void) void __init init_cpu_topology(void)
{ {
int ret, cpu; int ret;
reset_cpu_topology(); reset_cpu_topology();
ret = parse_acpi_topology(); ret = parse_acpi_topology();
@ -836,13 +840,5 @@ void __init init_cpu_topology(void)
reset_cpu_topology(); reset_cpu_topology();
return; return;
} }
for_each_possible_cpu(cpu) {
ret = detect_cache_attributes(cpu);
if (ret) {
pr_info("Early cacheinfo failed, ret = %d\n", ret);
break;
}
}
} }
#endif #endif