[v2] arm64/mm: return cpu_all_mask when node is NUMA_NO_NODE

Commit Message

Zhengyuan Liu Sept. 21, 2020, 2:39 a.m. UTC

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.

Reviewed-by: Gavin Shan <[e-mail]>
Signed-off-by: Zhengyuan Liu <[e-mail]>
---
 arch/arm64/include/asm/numa.h | 3 +++
 arch/arm64/mm/numa.c          | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

Comments

Will Deacon Sept. 21, 2020, 10:14 p.m. UTC | #1

On Mon, 21 Sep 2020 10:39:36 +0800, Zhengyuan Liu wrote:
> 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.

Applied to arm64 (for-next/misc), thanks!

[1/1] arm64/mm: return cpu_all_mask when node is NUMA_NO_NODE
      https://git.kernel.org/arm64/c/a194c5f2d2b3

Cheers,

Patch

diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
index 626ad01e83bf..dd870390d639 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 73f8b49d485c..88e51aade0da 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))