浏览代码

of/numa: add nid check for memory block

If the numa-id which was configured in memory@ devicetree node is greater
than MAX_NUMNODES, we should report a warning. We have done this for cpus
and distance-map dt nodes, this patch help them to be consistent.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Zhen Lei 9 年之前
父节点
当前提交
571a588fec
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      drivers/of/of_numa.c

+ 5 - 0
drivers/of/of_numa.c

@@ -75,6 +75,11 @@ static int __init of_numa_parse_memory_nodes(void)
 			 */
 			 */
 			continue;
 			continue;
 
 
+		if (nid >= MAX_NUMNODES) {
+			pr_warn("NUMA: Node id %u exceeds maximum value\n", nid);
+			r = -EINVAL;
+		}
+
 		for (i = 0; !r && !of_address_to_resource(np, i, &rsrc); i++)
 		for (i = 0; !r && !of_address_to_resource(np, i, &rsrc); i++)
 			r = numa_add_memblk(nid, rsrc.start, rsrc.end + 1);
 			r = numa_add_memblk(nid, rsrc.start, rsrc.end + 1);