arch/arm64: Fix topology initialization for core scheduling
PATCH v3 1/1 arch/arm64: Fix topology initialization for core scheduling
Arm64 systems rely on store_cpu_topology() to call update_siblings_masks() to transfer the toplogy to the various cpu masks. This needs to be done before the call to notify_cpu_starting() which tells the scheduler about each cpu found, otherwise the core scheduling data structures are setup in a way that does not match the actual topology.
With smt_mask not setup correctly we bail on cpumask_weight(smt_mask) == 1 for !leaders in:
notify_cpu_starting()
cpuhp_invoke_callback_range()
sched_cpu_starting()
sched_core_cpu_starting()
which leads to rq->core not being correctly set for !leader-rq's.
Without this change stress-ng (which enables core scheduling in its prctl tests in newer versions -- i.e. with PR_SCHED_CORE support) causes a warning and then a crash (trimmed for legibility):
[ 1853.805168] ------------[ cut here ]------------ [ 1853.809784] task_rq(b)->core != rq->core [ 1853.809792] WARNING: CPU: 117 PID: 0 at kernel/sched/fair.c:11102 cfs_prio_less+0x1b4/0x1c4 ... [ 1854.015210] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000010 ... [ 1854.231256] Call trace: [ 1854.233689] pick_next_task+0x3dc/0x81c [ 1854.237512] __schedule+0x10c/0x4cc [ 1854.240988] schedule_idle+0x34/0x54
---
This is a similar issue to
f2703def339c ("MIPS: smp: fill in sibling and core maps earlier")
which fixed it for MIPS.
v2: Fixed the commit message. No code change.
arch/arm64/kernel/smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/smp.c +1 -1
@@ -234,6 +234,7 @@ asmlinkage notrace void secondary_start_kernel(void)* Log the CPU info before it is marked online and might get read. */ cpuinfo_store_cpu (); +store_cpu_topology (cpu);/* * Enable GIC and timers.
@@ -242,7 +243,6 @@ asmlinkage notrace void secondary_start_kernel(void)ipi_setup (cpu); -store_cpu_topology (cpu);numa_add_cpu (cpu);/*
Signature · 7 lines
2.18.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 10 lines · Phil Auld
Arm64 systems rely on
store_cpu_topology()to callupdate_siblings_masks()to transfer the toplogy to the various cpu masks. This needs to be done before the call tonotify_cpu_starting()which tells the scheduler about each cpu found, otherwise the core scheduling data structures are setup in a way that does not match the actual topology.With
smt_masknot setup correctly we bail oncpumask_weight(smt_mask) == 1for !leaders in:[...]
Applied to arm64 (for-next/fixes), thanks!
[1/1] arch/arm64: Fix topology initialization for core scheduling
https://git.kernel.org/arm64/c/5524cbb1bfcd
Cheers,
Signature · 5 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev
Quoted 7 lines · On Mon, Apr 04, 2022 at 11:10:48AM +0100 Will Deacon wrote:
Quoted 6 lines · Phil Auld
Arm64 systems rely on
store_cpu_topology()to callupdate_siblings_masks()to transfer the toplogy to the various cpu masks. This needs to be done before the call tonotify_cpu_starting()which tells the scheduler about each cpu found, otherwise the core scheduling data structures are setup in a way that does not match the actual topology.
Quoted 7 lines
Quoted 4 lines
With
smt_masknot setup correctly we bail oncpumask_weight(smt_mask) == 1for !leaders in:[...]
Applied to arm64 (for-next/fixes), thanks!
Thanks, Will!
Cheers,
Phil
Quoted 11 lines
[1/1]
arch/arm64: Fix topology initialization for core schedulinghttps://git.kernel.org/arm64/c/5524cbb1bfcdCheers,
Signature · 5 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev