mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 12:42:02 +00:00
89c38422e0
Currently the NUMA distance map parsing does not validate the distance table for the distance-matrix rules 1-2 in [1]. However the arch NUMA code may enforce some of these rules, but not all. Such is the case for the arm64 port, which does not enforce the rule that the distance between separates nodes cannot equal LOCAL_DISTANCE. The patch adds the following rules validation: - distance of node to self equals LOCAL_DISTANCE - distance of separate nodes > LOCAL_DISTANCE This change avoids a yet-unresolved crash reported in [2]. A note on dealing with symmetrical distances between nodes: Validating symmetrical distances between nodes is difficult. If it were mandated in the bindings that every distance must be recorded in the table, then it would be easy. However, it isn't. In addition to this, it is also possible to record [b, a] distance only (and not [a, b]). So, when processing the table for [b, a], we cannot assert that current distance of [a, b] != [b, a] as invalid, as [a, b] distance may not be present in the table and current distance would be default at REMOTE_DISTANCE. As such, we maintain the policy that we overwrite distance [a, b] = [b, a] for b > a. This policy is different to kernel ACPI SLIT validation, which allows non-symmetrical distances (ACPI spec SLIT rules allow it). However, the distance debug message is dropped as it may be misleading (for a distance which is later overwritten). Some final notes on semantics: - It is implied that it is the responsibility of the arch NUMA code to reset the NUMA distance map for an error in distance map parsing. - It is the responsibility of the FW NUMA topology parsing (whether OF or ACPI) to enforce NUMA distance rules, and not arch NUMA code. [1] Documents/devicetree/bindings/numa.txt [2] https://www.spinics.net/lists/arm-kernel/msg683304.html Cc: stable@vger.kernel.org # 4.7 Signed-off-by: John Garry <john.garry@huawei.com> Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Rob Herring <robh@kernel.org>
185 lines
3.9 KiB
C
185 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;
|
|
}
|
|
|
|
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();
|
|
}
|