From patchwork Fri Oct 28 21:15:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 9402697 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ED13660231 for ; Fri, 28 Oct 2016 21:16:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBFE22A78D for ; Fri, 28 Oct 2016 21:16:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D07D82A833; Fri, 28 Oct 2016 21:16:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DDD1C2A78D for ; Fri, 28 Oct 2016 21:16:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c0EUw-0000O9-8Z; Fri, 28 Oct 2016 21:15:34 +0000 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c0EUr-0007wF-Iw for linux-arm-kernel@lists.infradead.org; Fri, 28 Oct 2016 21:15:30 +0000 Received: by mail-pf0-x242.google.com with SMTP id i85so2170633pfa.0 for ; Fri, 28 Oct 2016 14:15:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=N9wz3FQ3ToQ80yb8vz6IrFszq875/OG4vN2vBfpEgBo=; b=aDpUXUPE/WftWpu0THeCvLm1/x3F0jvPEIU7gTaRiI145KVXH4zAg5H01+MomvU5qL Lgf/ylOlgqbeec2Ry4p5NRlbw6JWAQQraOo3xbyc2MNOl9XVqR1V3s0Y5KIuFr4n0DIF hHoWyBVM8hOhVMxiZWtQCDO5Z96vTj1P2j/x+/yGIvcpIpyZn99QkYMYHOnMD1I6XKwV 485aOvjGIarVEYQqcwQrcBVjD+LG9AKau6A4uYkmvwWHwZ6tZ+96AoZ4A5vf/Lc/R9lm sdXeizzwC/ReiN9rHVuheoBZONwFXeym8Ro+q737omIeXxDWdT9y5x2utbO7IADuKIOS M7Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=N9wz3FQ3ToQ80yb8vz6IrFszq875/OG4vN2vBfpEgBo=; b=JzX2A2Dpum+fvopk80/KiAThhhnCxsTmjmg4Hbmw3CjFq4oQDLxJOehdYAKneHUmkE doLcQ86NFOsqI4RrPxWWkOqWVwuHPYUv3KEDcEXNEIMJlCAzKeDtyXI9SyZFYARGkbda tyvShQO96omJlqwGZ3pjudvPTt/SKJzIDDmYj/miZ5WeX5jQlGVej3qZPup7T+4ZbLuw NzC90PGnW7Ooy0WzPoUFAHjKh6ydLcHYF9GVtIAVwiGtGyX1Ps6FtfGJ4W7bU6P/YEBK zhvHDMmQm9fYKJmCJIoggCLghdkzuv1VsU6cLMwdZML6bE8GPTXHwWZ2fyGfJUH/a5LP ghWw== X-Gm-Message-State: ABUngvf7W8t/xALtt0Pa8L/XXxaDpYVuSMzjseKI53rxGYjgEvNjtVK/gLzFtqNZQOH8nA== X-Received: by 10.99.148.26 with SMTP id m26mr23189697pge.8.1477689309019; Fri, 28 Oct 2016 14:15:09 -0700 (PDT) Received: from dl.caveonetworks.com (50-233-148-156-static.hfc.comcastbusiness.net. [50.233.148.156]) by smtp.gmail.com with ESMTPSA id ah5sm20950253pad.30.2016.10.28.14.15.07 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 28 Oct 2016 14:15:07 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id u9SLF6gQ032705; Fri, 28 Oct 2016 14:15:06 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u9SLF4wQ032703; Fri, 28 Oct 2016 14:15:04 -0700 From: David Daney To: linux-kernel@vger.kernel.org, Rob Herring , Frank Rowand , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Will Deacon , Catalin Marinas Subject: [PATCH v2] of, numa: Return NUMA_NO_NODE from disable of_node_to_nid() if nid not possible. Date: Fri, 28 Oct 2016 14:15:02 -0700 Message-Id: <1477689302-32671-1-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161028_141529_694291_3693D1CC X-CRM114-Status: GOOD ( 14.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Daney , Ganapatrao Kulkarni , Robert Richter , Hanjun Guo , Gilbert Netzer MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: David Daney On arm64 NUMA kernels we can pass "numa=off" on the command line to disable NUMA. A side effect of this is that kmalloc_node() calls to non-zero nodes will crash the system with an OOPS: [ 0.000000] ITS@0x0000901000020000: allocated 2097152 Devices @10002000000 (flat, esz 8, psz 64K, shr 1) [ 0.000000] Unable to handle kernel NULL pointer dereference at virtual address 00001680 [ 0.000000] pgd = fffffc0009470000 [ 0.000000] [00001680] *pgd=0000010ffff90003, *pud=0000010ffff90003, *pmd=0000010ffff90003, *pte=0000000000000000 [ 0.000000] Internal error: Oops: 96000006 [#1] SMP . . . [ 0.000000] [] __alloc_pages_nodemask+0xa4/0xe68 [ 0.000000] [] new_slab+0xd0/0x564 [ 0.000000] [] ___slab_alloc+0x2e4/0x514 [ 0.000000] [] __slab_alloc+0x48/0x58 [ 0.000000] [] __kmalloc_node+0xd0/0x2dc [ 0.000000] [] __irq_domain_add+0x7c/0x164 [ 0.000000] [] its_probe+0x784/0x81c [ 0.000000] [] its_init+0x48/0x1b0 [ 0.000000] [] gic_init_bases+0x228/0x360 [ 0.000000] [] gic_of_init+0x148/0x1cc [ 0.000000] [] of_irq_init+0x184/0x298 [ 0.000000] [] irqchip_init+0x14/0x38 [ 0.000000] [] init_IRQ+0xc/0x30 [ 0.000000] [] start_kernel+0x240/0x3b8 [ 0.000000] [] __primary_switched+0x30/0x6c [ 0.000000] Code: 912ec2a0 b9403809 0a0902fb 37b007db (f9400300) . . . This is caused by code like this in kernel/irq/irqdomain.c domain = kzalloc_node(sizeof(*domain) + (sizeof(unsigned int) * size), GFP_KERNEL, of_node_to_nid(of_node)); When NUMA is disabled, the concept of a node is really undefined, so of_node_to_nid() should unconditionally return NUMA_NO_NODE. Fix by returning NUMA_NO_NODE when the nid is not in the set of possible nodes. Reported-by: Gilbert Netzer Signed-off-by: David Daney --- drivers/of/of_numa.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c index f63d4b0d..a53982a 100644 --- a/drivers/of/of_numa.c +++ b/drivers/of/of_numa.c @@ -176,7 +176,12 @@ int of_node_to_nid(struct device_node *device) np->name); of_node_put(np); - if (!r) + /* + * 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;