| From 5e85d2382df7708d08e338a710d3255c414d7fe6 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 21 Sep 2020 10:39:36 +0800 |
| Subject: arm64/mm: return cpu_all_mask when node is NUMA_NO_NODE |
| |
| From: Zhengyuan Liu <liuzhengyuan@tj.kylinos.cn> |
| |
| [ Upstream commit a194c5f2d2b3a05428805146afcabe5140b5d378 ] |
| |
| The @node passed to cpumask_of_node() can be NUMA_NO_NODE, in that |
| case it will trigger the following WARN_ON(node >= nr_node_ids) due to |
| mismatched data types of @node and @nr_node_ids. Actually we should |
| return cpu_all_mask just like most other architectures do if passed |
| NUMA_NO_NODE. |
| |
| Also add a similar check to the inline cpumask_of_node() in numa.h. |
| |
| Signed-off-by: Zhengyuan Liu <liuzhengyuan@tj.kylinos.cn> |
| Reviewed-by: Gavin Shan <gshan@redhat.com> |
| Link: https://lore.kernel.org/r/20200921023936.21846-1-liuzhengyuan@tj.kylinos.cn |
| Signed-off-by: Will Deacon <will@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm64/include/asm/numa.h | 3 +++ |
| arch/arm64/mm/numa.c | 6 +++++- |
| 2 files changed, 8 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h |
| index 626ad01e83bf0..dd870390d639f 100644 |
| --- a/arch/arm64/include/asm/numa.h |
| +++ b/arch/arm64/include/asm/numa.h |
| @@ -25,6 +25,9 @@ const struct cpumask *cpumask_of_node(int node); |
| /* Returns a pointer to the cpumask of CPUs on Node 'node'. */ |
| static inline const struct cpumask *cpumask_of_node(int node) |
| { |
| + if (node == NUMA_NO_NODE) |
| + return cpu_all_mask; |
| + |
| return node_to_cpumask_map[node]; |
| } |
| #endif |
| diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c |
| index 73f8b49d485c2..88e51aade0da0 100644 |
| --- a/arch/arm64/mm/numa.c |
| +++ b/arch/arm64/mm/numa.c |
| @@ -46,7 +46,11 @@ EXPORT_SYMBOL(node_to_cpumask_map); |
| */ |
| const struct cpumask *cpumask_of_node(int node) |
| { |
| - if (WARN_ON(node >= nr_node_ids)) |
| + |
| + if (node == NUMA_NO_NODE) |
| + return cpu_all_mask; |
| + |
| + if (WARN_ON(node < 0 || node >= nr_node_ids)) |
| return cpu_none_mask; |
| |
| if (WARN_ON(node_to_cpumask_map[node] == NULL)) |
| -- |
| 2.27.0 |
| |