| Message ID | 1568283334-178380-5-git-send-email-linyunsheng@huawei.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | make node_to_cpumask_map() NUMA_NO_NODE aware | expand |
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h index 2f7e1ea..107f5cd 100644 --- a/arch/powerpc/include/asm/topology.h +++ b/arch/powerpc/include/asm/topology.h @@ -17,8 +17,8 @@ struct device_node; #include <asm/mmzone.h> -#define cpumask_of_node(node) ((node) == -1 ? \ - cpu_all_mask : \ +#define cpumask_of_node(node) ((node) == NUMA_NO_NODE ? \ + cpu_online_mask : \ node_to_cpumask_map[node]) struct pci_bus;
When passing the return value of dev_to_node() to cpumask_of_node() without checking the node id if the node id is NUMA_NO_NODE, there is global-out-of-bounds detected by KASAN. From the discussion [1], NUMA_NO_NODE really means no node affinity, which also means all cpus should be usable. So the cpumask_of_node() should always return all cpus online when user passes the node id as NUMA_NO_NODE, just like similar semantic that page allocator handles NUMA_NO_NODE. But we cannot really copy the page allocator logic. Simply because the page allocator doesn't enforce the near node affinity. It just picks it up as a preferred node but then it is free to fallback to any other numa node. This is not the case here and node_to_cpumask_map will only restrict to the particular node's cpus which would have really non deterministic behavior depending on where the code is executed. So in fact we really want to return cpu_online_mask for NUMA_NO_NODE. Since this arch was already NUMA_NO_NODE aware, this patch only changes it to return cpu_online_mask and use NUMA_NO_NODE instead of "-1". [1] https://lore.kernel.org/patchwork/patch/1125789/ Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com> Suggested-by: Michal Hocko <mhocko@kernel.org> --- V3: Change to only handle NUMA_NO_NODE, and return cpu_online_mask for NUMA_NO_NODE case, and change the commit log to better justify the change. --- arch/powerpc/include/asm/topology.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)