[PATCH v2 7/9] sparc64: numa: check the node id consistently for sparc64

From: Yunsheng Lin
Date: Sat Aug 31 2019 - 02:01:03 EST


According to Section 6.2.14 from ACPI spec 6.3 [1], the setting
of proximity domain is optional, as below:

This optional object is used to describe proximity domain
associations within a machine. _PXM evaluates to an integer
that identifies a device as belonging to a Proximity Domain
defined in the System Resource Affinity Table (SRAT).

This patch checks node id with the below case before returning
&numa_cpumask_lookup_table[node]:
1. if node_id >= nr_node_ids, return cpu_none_mask
2. if node_id < 0, return cpu_online_mask
3. Since numa_cpumask_lookup_table is not a pointer, a comment
is added to indicate that

[1] https://uefi.org/sites/default/files/resources/ACPI_6_3_final_Jan30.pdf

Signed-off-by: Yunsheng Lin <linyunsheng@xxxxxxxxxx>
---
arch/sparc/include/asm/topology_64.h | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h
index 34c628a..66a7917 100644
--- a/arch/sparc/include/asm/topology_64.h
+++ b/arch/sparc/include/asm/topology_64.h
@@ -11,9 +11,19 @@ static inline int cpu_to_node(int cpu)
return numa_cpu_lookup_table[cpu];
}

-#define cpumask_of_node(node) ((node) == -1 ? \
- cpu_all_mask : \
- &numa_cpumask_lookup_table[node])
+static inline const struct cpumask *cpumask_of_node(int node)
+{
+ if (node >= MAX_NUMNODES)
+ return cpu_none_mask;
+
+ /* numa_cpumask_lookup_table[node] is not a pointer, so
+ * no need to check for NULL here.
+ */
+ if (node < 0)
+ return cpu_online_mask;
+
+ return &numa_cpumask_lookup_table[node];
+}

struct pci_bus;
#ifdef CONFIG_PCI
--
2.8.1