Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB690C4363A for ; Tue, 27 Oct 2020 00:24:17 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 877A520759 for ; Tue, 27 Oct 2020 00:24:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="RyP8t6iN"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="kfc7E0nn"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="kzvZRhm+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 877A520759 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Qk0M39kjnaVjWQ4COzEoOoJM8eOoJtZLSlPy4Ogkllo=; b=RyP8t6iNL3TmTnINkH7mAfQNz yHLusD4nSDCEi58+Fkd9UaV/yTfu5D4Gvo2Ux2XxlhTN+N+fbjdEcyaPaGlIGSxsnj17FoxjrhHVj 9m0BJSY6rSxjysZYTHSXCB66y3gTYYHgQYAy75MPQdnPk9Az8pCusQf1sqEsu37ijdgR7hysAOO3c KQ+zSvVm6L5wDQEeQ+un0jeXDn4RSptWgpL32n+Rr3wEbFU42ollQlFV/v/YLZtZXkoQJxq8nNFFv RPUBZhGC+2rE0kN6SH9OVPHVGRy2fQsGcxytSg8drVjOr63QeI6F5wpFy9hjUAUuj2/HA9Y1J6+tS Y0hyaueBQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXCkj-0007Oe-9C; Tue, 27 Oct 2020 00:22:17 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXCYV-0001Zz-Go for linux-arm-kernel@merlin.infradead.org; Tue, 27 Oct 2020 00:09:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=3LTy92e7JTfYzIk+7cGz1OUHdaVDCqG6qnwKoof2L88=; b=kfc7E0nn9TcBFnZkfqPSHPnLrH zmumetDwScT8omqbBFvz6yIiH2oz3r0Dhok1yjJVmXtqEyvaMbflaExOOqzqsxGl9kfqmeWWg6EUZ E6+Js9GqrUr72+o2j6eaQ1r8sWYkffLe2Q76uurTSM4eG8AFSpD41VB0iV7z/EH8cCCzEsqXrYwa9 Kg6Uq/PduKWybxZCVK365QtHUVZeDBtVEEpi3/UJqhdBFxULf6dg6s54FoMMS5sOEnEpTdUyUf3/8 JkIAqYAdDnPppPNi1SoJlhExz6GTg1EnmoUdqkWLB+sMYIHKnR3e0Ts155LGsA5T6AYKnkFM8HSn3 QJG2ljwA==; Received: from mail.kernel.org ([198.145.29.99]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXCIz-0006MA-KI for linux-arm-kernel@lists.infradead.org; Mon, 26 Oct 2020 23:53:41 +0000 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 841A1221FA; Mon, 26 Oct 2020 23:53:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603756416; bh=kNN9WeQP4nWaV6sEsJfgKe5aLQBNl0cTieqmXZ4EBm0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kzvZRhm+jR9f7blfvwVD4aHtSJABMuqVtRLvF7xPHtRirh8DgHBlT29uufBrvhXv7 k1jXd51tAFrMbwWzhL6oWOXcxrUqFx1w2ih5UpGp+928aq55+14c5KnRANB8j9sOId T/8To7/Lm5r/Au6rBWAfLfAREk/+llE1v0eojIlA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.8 073/132] arm64/mm: return cpu_all_mask when node is NUMA_NO_NODE Date: Mon, 26 Oct 2020 19:51:05 -0400 Message-Id: <20201026235205.1023962-73-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201026235205.1023962-1-sashal@kernel.org> References: <20201026235205.1023962-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201026_235338_350281_DE23A6E0 X-CRM114-Status: GOOD ( 14.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Will Deacon , Gavin Shan , Zhengyuan Liu , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Zhengyuan Liu [ Upstream commit a194c5f2d2b3a05428805146afcabe5140b5d378 ] The @node passed to cpumask_of_node() can be NUMA_NO_NODE, in that case it will trigger the following WARN_ON(node >= nr_node_ids) due to mismatched data types of @node and @nr_node_ids. Actually we should return cpu_all_mask just like most other architectures do if passed NUMA_NO_NODE. Also add a similar check to the inline cpumask_of_node() in numa.h. Signed-off-by: Zhengyuan Liu Reviewed-by: Gavin Shan Link: https://lore.kernel.org/r/20200921023936.21846-1-liuzhengyuan@tj.kylinos.cn Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/include/asm/numa.h | 3 +++ arch/arm64/mm/numa.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h index 626ad01e83bf0..dd870390d639f 100644 --- a/arch/arm64/include/asm/numa.h +++ b/arch/arm64/include/asm/numa.h @@ -25,6 +25,9 @@ const struct cpumask *cpumask_of_node(int node); /* Returns a pointer to the cpumask of CPUs on Node 'node'. */ static inline const struct cpumask *cpumask_of_node(int node) { + if (node == NUMA_NO_NODE) + return cpu_all_mask; + return node_to_cpumask_map[node]; } #endif diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c index aafcee3e3f7ef..58c83c2b8748f 100644 --- a/arch/arm64/mm/numa.c +++ b/arch/arm64/mm/numa.c @@ -46,7 +46,11 @@ EXPORT_SYMBOL(node_to_cpumask_map); */ const struct cpumask *cpumask_of_node(int node) { - if (WARN_ON(node >= nr_node_ids)) + + if (node == NUMA_NO_NODE) + return cpu_all_mask; + + if (WARN_ON(node < 0 || node >= nr_node_ids)) return cpu_none_mask; if (WARN_ON(node_to_cpumask_map[node] == NULL)) -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel