On Mon, 21 Jul 2014 10:52:41 -0700, Nishanth Aravamudan <nacc@xxxxxxxxxxxxxxxxxx> wrote: > On 11.07.2014 [15:37:39 +0800], Jiang Liu wrote: > > When CONFIG_HAVE_MEMORYLESS_NODES is enabled, cpu_to_node()/numa_node_id() > > may return a node without memory, and later cause system failure/panic > > when calling kmalloc_node() and friends with returned node id. > > So use cpu_to_mem()/numa_mem_id() instead to get the nearest node with > > memory for the/current cpu. > > > > If CONFIG_HAVE_MEMORYLESS_NODES is disabled, cpu_to_mem()/numa_mem_id() > > is the same as cpu_to_node()/numa_node_id(). > > > > Signed-off-by: Jiang Liu <jiang.liu@xxxxxxxxxxxxxxx> > > --- > > drivers/of/base.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/of/base.c b/drivers/of/base.c > > index b9864806e9b8..40d4772973ad 100644 > > --- a/drivers/of/base.c > > +++ b/drivers/of/base.c > > @@ -85,7 +85,7 @@ EXPORT_SYMBOL(of_n_size_cells); > > #ifdef CONFIG_NUMA > > int __weak of_node_to_nid(struct device_node *np) > > { > > - return numa_node_id(); > > + return numa_mem_id(); > > } > > #endif > > Um, NAK. of_node_to_nid() returns the NUMA node ID for a given device > tree node. The default should be the physically local NUMA node, not the > nearest memory-containing node. That description doesn't match the code. This patch only changes the default implementation of of_node_to_nid() which doesn't take the device node into account *at all* when returning a node ID. Just look at the diff. I think this patch is correct, and it doesn't affect the override versions provided by powerpc and sparc. g. > > I think the general direction of this patchset is good -- what NUMA > information do we actually are about at each callsite. But the execution > is blind and doesn't consider at all what the code is actually doing. > The changelogs are all identical and don't actually provide any > information about what errors this (or any) specific patch are > resolving. > > Thanks, > Nish > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html