From mboxrd@z Thu Jan 1 00:00:00 1970 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 563A6C4363A for ; Tue, 27 Oct 2020 00:32:58 +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 ECA17216FD for ; Tue, 27 Oct 2020 00:32:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="1gsPdk9D"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="opcFoJlj"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="qK453AhC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ECA17216FD 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=RyboFykkv5L3Q3BXenZmXPXjQzAPKgb5AMzIhouEJNI=; b=1gsPdk9DVprc3Cag+zbHxRinf vTe/o69KHTVXpkTMa+gdT6VLC2BK8BWB8z2p8s5tQSxeqeuIPJ9+C4LWBGOXSgfBjkkcheZk8zdUE B9IOarkDBQIXFNV/CpktTUlHht6OpVjKX0YsmR31mcmvCQbZRCH0Gv4iPddDBv+sQs5QFvQOrv5b/ VtbkFKCM1ofGPmMnEI00zmBh7u+FzndtNndkJ0ZC+KPAdBDttDjq0i4LFKrKTOswM1JNJlew7RGvM Aff0NhXaDCTFdoCwlsBXv55PUdbTe48nf1iNaBSU5sf392VTX8OY+sr8+GPx5pQ38Y704rOU+ptRo hfyWqvuKA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXCsd-0002lv-94; Tue, 27 Oct 2020 00:30:27 +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 1kXCnv-0000QA-Cm for linux-arm-kernel@merlin.infradead.org; Tue, 27 Oct 2020 00:25:35 +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=HOJjfXJxE3xMnNsxHE6FWJ74C9YZiwgceChBYq0Pudg=; b=opcFoJljwoLhy3GRRaqWIoyQDo ckB8/sJsAnnaTVpsbngKTSBmGeQnf0jdoJEWC3h6Xx7fv52YMmvhPcQUSN9chjVAp32+OPujueRQo cSooG7spY9I14OAJlB61JVjOxrHYj2Sgb6j2dsk87upTt+KHw1ipNLz1VxrxPitsOX54C3gLRdQFv rMKcN2xnAdfjATgIJc9lJthPvPLyybAiYOq0n37nJoZaJyND1oSR8lYa6nl5Y71MBLaQtWN2bL59i sw+Ki1pUmzQh2xcouC+X7yy1tiSze1jfw28hU2WEtlytVMxasOfWPGKArh9zcfBSh8RbMvgt1GQc/ L00EUQiw==; Received: from mail.kernel.org ([198.145.29.99]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXCZt-0000AK-C4 for linux-arm-kernel@lists.infradead.org; Tue, 27 Oct 2020 00:11:13 +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 EDEF821707; Tue, 27 Oct 2020 00:11:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603757463; bh=BwupmBDswhSQPc+BSWOZaSaXkxDY4WOEsIFc7F0E5HY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qK453AhCyO8+cJ2CKVC88EN0oNX4VZyRvYcJS7CRXDeMhbckNnzqUPeA89cr/UzHg kDZpgqhCZcOQb8UqDZ+s2nF3dtqnUVZ1hpBv+zFRgdbjZcM8ra1vjL4WB1GXM15qxy i2iTQ57cWwamN6ylrL9DX/6YmxggY7hCMHo82F98= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 16/30] arm64/mm: return cpu_all_mask when node is NUMA_NO_NODE Date: Mon, 26 Oct 2020 20:10:30 -0400 Message-Id: <20201027001044.1027349-16-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201027001044.1027349-1-sashal@kernel.org> References: <20201027001044.1027349-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-20201027_001106_175502_DE972D3F X-CRM114-Status: GOOD ( 14.97 ) 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 600887e491fdf..496070f97c541 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 b1e42bad69ac3..fddae9b8e1bf1 100644 --- a/arch/arm64/mm/numa.c +++ b/arch/arm64/mm/numa.c @@ -58,7 +58,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 From mboxrd@z Thu Jan 1 00:00:00 1970 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.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 B9712C2D0A3 for ; Tue, 27 Oct 2020 00:11:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7214D2087C for ; Tue, 27 Oct 2020 00:11:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603757511; bh=BwupmBDswhSQPc+BSWOZaSaXkxDY4WOEsIFc7F0E5HY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EGC01CdYEUn/PMYXDLLd0BMG7go6gbG16HWSTrDArmQm97RZqIYG885XX4rWS/1v7 owBHr13xCBjoWcF4HxraW5EGKyBpGXg1OMFl8F8lTdhKAFqfl+9MJIG6SYlaCEsilz OFueatetG4gYyBDa0JCncsIHX8MhmgdKu5WwjApI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2411830AbgJ0ALu (ORCPT ); Mon, 26 Oct 2020 20:11:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:60490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2411676AbgJ0ALE (ORCPT ); Mon, 26 Oct 2020 20:11:04 -0400 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 EDEF821707; Tue, 27 Oct 2020 00:11:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603757463; bh=BwupmBDswhSQPc+BSWOZaSaXkxDY4WOEsIFc7F0E5HY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qK453AhCyO8+cJ2CKVC88EN0oNX4VZyRvYcJS7CRXDeMhbckNnzqUPeA89cr/UzHg kDZpgqhCZcOQb8UqDZ+s2nF3dtqnUVZ1hpBv+zFRgdbjZcM8ra1vjL4WB1GXM15qxy i2iTQ57cWwamN6ylrL9DX/6YmxggY7hCMHo82F98= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhengyuan Liu , Gavin Shan , Will Deacon , Sasha Levin , linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.9 16/30] arm64/mm: return cpu_all_mask when node is NUMA_NO_NODE Date: Mon, 26 Oct 2020 20:10:30 -0400 Message-Id: <20201027001044.1027349-16-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201027001044.1027349-1-sashal@kernel.org> References: <20201027001044.1027349-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 600887e491fdf..496070f97c541 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 b1e42bad69ac3..fddae9b8e1bf1 100644 --- a/arch/arm64/mm/numa.c +++ b/arch/arm64/mm/numa.c @@ -58,7 +58,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