* [PATCH v3] arch_topology: Make cluster topology span at least SMT CPUs
@ 2022-09-05 12:26 Yicong Yang
2022-09-05 17:07 ` Sudeep Holla
0 siblings, 1 reply; 2+ messages in thread
From: Yicong Yang @ 2022-09-05 12:26 UTC (permalink / raw)
To: sudeep.holla, vincent.guittot, ionela.voinescu, gregkh, linux-kernel
Cc: rafael, 21cnbao, jonathan.cameron, linuxarm, prime.zeng, yangyicong
From: Yicong Yang <yangyicong@hisilicon.com>
Currently cpu_clustergroup_mask() will return CPU mask if cluster span more
or the same CPUs as cpu_coregroup_mask(). This will result topology borken
on non-Cluster SMT machines when building with CONFIG_SCHED_CLUSTER=y.
Test with:
qemu-system-aarch64 -enable-kvm -machine virt \
-net none \
-cpu host \
-bios ./QEMU_EFI.fd \
-m 2G \
-smp 48,sockets=2,cores=12,threads=2 \
-kernel $Image \
-initrd $Rootfs \
-nographic
-append "rdinit=init console=ttyAMA0 sched_verbose loglevel=8"
We'll get below error:
[ 3.084568] BUG: arch topology borken
[ 3.084570] the SMT domain not a subset of the CLS domain
Since cluster is a level higher than SMT, fix this by making cluster
spans at least SMT CPUs.
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
Cc: Ionela Voinescu <ionela.voinescu@arm.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
Fixes: bfcc4397435d ("arch_topology: Limit span of cpu_clustergroup_mask()")
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
---
Change since v2:
- Use topology_sibling_cpumask() instead of cpu_smt_mask(), which is unavailable
when CONFIG_SCHED_SMT=n. Sorry for the build regression.
- Drop RB from Ionela and Sudeep since code changed. Expect a regain. Thanks!
Link: https://lore.kernel.org/lkml/20220825092007.8129-1-yangyicong@huawei.com/
Change since v1:
- mention the kernel config CONFIG_SCHED_CLUSTER=y, per Ionela
Link:https://lore.kernel.org/lkml/20220823073044.58697-1-yangyicong@huawei.com/
drivers/base/arch_topology.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index 0424b59b695e..7e7e373ffab2 100644
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -724,7 +724,7 @@ const struct cpumask *cpu_clustergroup_mask(int cpu)
*/
if (cpumask_subset(cpu_coregroup_mask(cpu),
&cpu_topology[cpu].cluster_sibling))
- return get_cpu_mask(cpu);
+ return topology_sibling_cpumask(cpu);
return &cpu_topology[cpu].cluster_sibling;
}
--
2.24.0
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH v3] arch_topology: Make cluster topology span at least SMT CPUs
2022-09-05 12:26 [PATCH v3] arch_topology: Make cluster topology span at least SMT CPUs Yicong Yang
@ 2022-09-05 17:07 ` Sudeep Holla
0 siblings, 0 replies; 2+ messages in thread
From: Sudeep Holla @ 2022-09-05 17:07 UTC (permalink / raw)
To: Yicong Yang
Cc: vincent.guittot, ionela.voinescu, gregkh, linux-kernel, rafael,
21cnbao, jonathan.cameron, linuxarm, prime.zeng, yangyicong
On Mon, Sep 05, 2022 at 08:26:15PM +0800, Yicong Yang wrote:
> From: Yicong Yang <yangyicong@hisilicon.com>
>
> Currently cpu_clustergroup_mask() will return CPU mask if cluster span more
> or the same CPUs as cpu_coregroup_mask(). This will result topology borken
> on non-Cluster SMT machines when building with CONFIG_SCHED_CLUSTER=y.
>
> Test with:
> qemu-system-aarch64 -enable-kvm -machine virt \
> -net none \
> -cpu host \
> -bios ./QEMU_EFI.fd \
> -m 2G \
> -smp 48,sockets=2,cores=12,threads=2 \
> -kernel $Image \
> -initrd $Rootfs \
> -nographic
> -append "rdinit=init console=ttyAMA0 sched_verbose loglevel=8"
>
> We'll get below error:
> [ 3.084568] BUG: arch topology borken
> [ 3.084570] the SMT domain not a subset of the CLS domain
>
> Since cluster is a level higher than SMT, fix this by making cluster
> spans at least SMT CPUs.
>
> Cc: Sudeep Holla <sudeep.holla@arm.com>
Sorry for missing to figure this out earlier and thanks for fixing it.
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
--
Regards,
Sudeep
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-05 17:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-05 12:26 [PATCH v3] arch_topology: Make cluster topology span at least SMT CPUs Yicong Yang
2022-09-05 17:07 ` Sudeep Holla
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®