diff options
| author |   Huang, Ying <ying.huang@intel.com> | 2022-03-22 08:39:22 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2022-03-22 08:49:22 +0100 |
| commit | ab31c7fd2d37bc3580d9d712d5f2dfb69901fca9 (patch) | |
| tree | e924fd304530194eaab0b4b30361f6170206bdee /kernel/sched/fair.c | |
| parent | headers/prep: Fix header to build standalone: <linux/psi.h> (diff) | |
| download | linux-dev-ab31c7fd2d37bc3580d9d712d5f2dfb69901fca9.tar.xz linux-dev-ab31c7fd2d37bc3580d9d712d5f2dfb69901fca9.zip | |
sched/numa: Fix boot crash on arm64 systems
Qian Cai reported a boot crash on arm64 systems, caused by:
0fb3978b0aac ("sched/numa: Fix NUMA topology for systems with CPU-less nodes")
The bug is that node_state() must be supplied a valid node_states[] array index,
but in task_numa_placement() the max_nid search can fail with NUMA_NO_NODE,
which is not a valid index.
Fix it by checking that max_nid is a valid index.
[ mingo: Added changelog. ]
Fixes: 0fb3978b0aac ("sched/numa: Fix NUMA topology for systems with CPU-less nodes")
Reported-by: Qian Cai <quic_qiancai@quicinc.com>
Tested-by: Qian Cai <quic_qiancai@quicinc.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | kernel/sched/fair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 89d21fda106c..ee0664c9d291 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2437,7 +2437,7 @@ static void task_numa_placement(struct task_struct *p) } /* Cannot migrate task to CPU-less node */ - if (!node_state(max_nid, N_CPU)) { + if (max_nid != NUMA_NO_NODE && !node_state(max_nid, N_CPU)) { int near_nid = max_nid; int distance, near_distance = INT_MAX; |