mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 08:58:07 +00:00
91cb8860cb
There is no device node for the empty NUMA node. However, the corresponding NUMA node ID and distance map is still valid in "numa-distance-map-v1" compatible device node. This fetches the NUMA node ID and distance map for these empty NUMA node from "numa-distance-map-v1" compatible device node. Signed-off-by: Gavin Shan <gshan@redhat.com> Link: https://lore.kernel.org/r/20210927064119.127285-3-gshan@redhat.com Signed-off-by: Rob Herring <robh@kernel.org>
186 lines
3.9 KiB
C
186 lines
3.9 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* OF NUMA Parsing support.
|
|
*
|
|
* Copyright (C) 2015 - 2016 Cavium Inc.
|
|
*/
|
|
|
|
#define pr_fmt(fmt) "OF: NUMA: " fmt
|
|
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/nodemask.h>
|
|
|
|
#include <asm/numa.h>
|
|
|
|
/* define default numa node to 0 */
|
|
#define DEFAULT_NODE 0
|
|
|
|
/*
|
|
* Even though we connect cpus to numa domains later in SMP
|
|
* init, we need to know the node ids now for all cpus.
|
|
*/
|
|
static void __init of_numa_parse_cpu_nodes(void)
|
|
{
|
|
u32 nid;
|
|
int r;
|
|
struct device_node *np;
|
|
|
|
for_each_of_cpu_node(np) {
|
|
r = of_property_read_u32(np, "numa-node-id", &nid);
|
|
if (r)
|
|
continue;
|
|
|
|
pr_debug("CPU on %u\n", nid);
|
|
if (nid >= MAX_NUMNODES)
|
|
pr_warn("Node id %u exceeds maximum value\n", nid);
|
|
else
|
|
node_set(nid, numa_nodes_parsed);
|
|
}
|
|
}
|
|
|
|
static int __init of_numa_parse_memory_nodes(void)
|
|
{
|
|
struct device_node *np = NULL;
|
|
struct resource rsrc;
|
|
u32 nid;
|
|
int i, r;
|
|
|
|
for_each_node_by_type(np, "memory") {
|
|
r = of_property_read_u32(np, "numa-node-id", &nid);
|
|
if (r == -EINVAL)
|
|
/*
|
|
* property doesn't exist if -EINVAL, continue
|
|
* looking for more memory nodes with
|
|
* "numa-node-id" property
|
|
*/
|
|
continue;
|
|
|
|
if (nid >= MAX_NUMNODES) {
|
|
pr_warn("Node id %u exceeds maximum value\n", nid);
|
|
r = -EINVAL;
|
|
}
|
|
|
|
for (i = 0; !r && !of_address_to_resource(np, i, &rsrc); i++)
|
|
r = numa_add_memblk(nid, rsrc.start, rsrc.end + 1);
|
|
|
|
if (!i || r) {
|
|
of_node_put(np);
|
|
pr_err("bad property in memory node\n");
|
|
return r ? : -EINVAL;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __init of_numa_parse_distance_map_v1(struct device_node *map)
|
|
{
|
|
const __be32 *matrix;
|
|
int entry_count;
|
|
int i;
|
|
|
|
pr_info("parsing numa-distance-map-v1\n");
|
|
|
|
matrix = of_get_property(map, "distance-matrix", NULL);
|
|
if (!matrix) {
|
|
pr_err("No distance-matrix property in distance-map\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
entry_count = of_property_count_u32_elems(map, "distance-matrix");
|
|
if (entry_count <= 0) {
|
|
pr_err("Invalid distance-matrix\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
for (i = 0; i + 2 < entry_count; i += 3) {
|
|
u32 nodea, nodeb, distance;
|
|
|
|
nodea = of_read_number(matrix, 1);
|
|
matrix++;
|
|
nodeb = of_read_number(matrix, 1);
|
|
matrix++;
|
|
distance = of_read_number(matrix, 1);
|
|
matrix++;
|
|
|
|
if ((nodea == nodeb && distance != LOCAL_DISTANCE) ||
|
|
(nodea != nodeb && distance <= LOCAL_DISTANCE)) {
|
|
pr_err("Invalid distance[node%d -> node%d] = %d\n",
|
|
nodea, nodeb, distance);
|
|
return -EINVAL;
|
|
}
|
|
|
|
node_set(nodea, numa_nodes_parsed);
|
|
|
|
numa_set_distance(nodea, nodeb, distance);
|
|
|
|
/* Set default distance of node B->A same as A->B */
|
|
if (nodeb > nodea)
|
|
numa_set_distance(nodeb, nodea, distance);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __init of_numa_parse_distance_map(void)
|
|
{
|
|
int ret = 0;
|
|
struct device_node *np;
|
|
|
|
np = of_find_compatible_node(NULL, NULL,
|
|
"numa-distance-map-v1");
|
|
if (np)
|
|
ret = of_numa_parse_distance_map_v1(np);
|
|
|
|
of_node_put(np);
|
|
return ret;
|
|
}
|
|
|
|
int of_node_to_nid(struct device_node *device)
|
|
{
|
|
struct device_node *np;
|
|
u32 nid;
|
|
int r = -ENODATA;
|
|
|
|
np = of_node_get(device);
|
|
|
|
while (np) {
|
|
r = of_property_read_u32(np, "numa-node-id", &nid);
|
|
/*
|
|
* -EINVAL indicates the property was not found, and
|
|
* we walk up the tree trying to find a parent with a
|
|
* "numa-node-id". Any other type of error indicates
|
|
* a bad device tree and we give up.
|
|
*/
|
|
if (r != -EINVAL)
|
|
break;
|
|
|
|
np = of_get_next_parent(np);
|
|
}
|
|
if (np && r)
|
|
pr_warn("Invalid \"numa-node-id\" property in node %pOFn\n",
|
|
np);
|
|
of_node_put(np);
|
|
|
|
/*
|
|
* If numa=off passed on command line, or with a defective
|
|
* device tree, the nid may not be in the set of possible
|
|
* nodes. Check for this case and return NUMA_NO_NODE.
|
|
*/
|
|
if (!r && nid < MAX_NUMNODES && node_possible(nid))
|
|
return nid;
|
|
|
|
return NUMA_NO_NODE;
|
|
}
|
|
|
|
int __init of_numa_init(void)
|
|
{
|
|
int r;
|
|
|
|
of_numa_parse_cpu_nodes();
|
|
r = of_numa_parse_memory_nodes();
|
|
if (r)
|
|
return r;
|
|
return of_numa_parse_distance_map();
|
|
}
|