From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Daney Subject: [PATCH 2/2] arm64, numa: Force of_node_to_nid to return NUMA_NO_NODE when numa=off. Date: Tue, 25 Oct 2016 14:31:01 -0700 Message-ID: <1477431061-7258-3-git-send-email-ddaney.cavm@gmail.com> References: <1477431061-7258-1-git-send-email-ddaney.cavm@gmail.com> Return-path: In-Reply-To: <1477431061-7258-1-git-send-email-ddaney.cavm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Herring , Frank Rowand , devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Will Deacon , Catalin Marinas Cc: Robert Richter , Hanjun Guo , Ganapatrao Kulkarni , Gilbert Netzer , David Daney List-Id: devicetree@vger.kernel.org From: David Daney When "numa=off" is passed on the command line, of_node_to_nid() still returns the node number (which can be greater than zero). However, in this case all the memory is associated with the dummy node zero. This causes OOPS in kernel/irq/irqdomain.c: domain = kzalloc_node(sizeof(*domain) + (sizeof(unsigned int) * size), GFP_KERNEL, of_node_to_nid(of_node)); ... which in my case then caused the kernel to OOPS for the IRQ controller on node 1: [ 0.000000] [] __alloc_pages_nodemask+0xa4/0xe68 [ 0.000000] [] new_slab+0xd0/0x57c [ 0.000000] [] ___slab_alloc+0x2e4/0x514 [ 0.000000] [] __slab_alloc+0x48/0x58 [ 0.000000] [] __kmalloc_node+0xd0/0x2e0 [ 0.000000] [] __irq_domain_add+0x7c/0x164 [ 0.000000] [] its_probe+0x784/0x81c [ 0.000000] [] its_init+0x48/0x1b0 Fix by forcing of_node_to_nid() to return NUMA_NO_NODE when numa=off. The kmalloc_node() family is perfectly happy when the node is specified as NUMA_NO_NODE. Reported-by: Gilbert Netzer Signed-off-by: David Daney --- arch/arm64/mm/numa.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c index 778a985..6d34ebb 100644 --- a/arch/arm64/mm/numa.c +++ b/arch/arm64/mm/numa.c @@ -41,8 +41,10 @@ static __init int numa_parse_early_param(char *opt) { if (!opt) return -EINVAL; - if (!strncmp(opt, "off", 3)) + if (!strncmp(opt, "off", 3)) { + __of_force_no_numa(); numa_off = true; + } return 0; } @@ -432,6 +434,7 @@ static int __init dummy_numa_init(void) return ret; } + __of_force_no_numa(); numa_off = true; return 0; } -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html