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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 9E8CBC17440 for ; Wed, 13 Nov 2019 02:16:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D49621783 for ; Wed, 13 Nov 2019 02:16:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573611361; bh=YJh3dwXnlo6J40iWdRCkulTOyWzvrfmmV1Y3oAGdLM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HUC16A+BAdjZRGE7He7mXgSgsaSLXLUJVbMc+Haepx1clrJ3qM5pQhOs0eA++Zs8o QAUEQLHwdgErIaYi22GHWarrUhE9SjB5uX1vAz8Iyf3dPOl5Kc4rmev4mfaobHSstj yfW+9ERqTu1y84tcY0Nh0Fo1+F+TXitlASJmG1LU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729557AbfKMB4m (ORCPT ); Tue, 12 Nov 2019 20:56:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:49170 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729479AbfKMB4k (ORCPT ); Tue, 12 Nov 2019 20:56:40 -0500 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 6BBB1222D3; Wed, 13 Nov 2019 01:56:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610200; bh=YJh3dwXnlo6J40iWdRCkulTOyWzvrfmmV1Y3oAGdLM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=idSZaHTSYdFHjVSJUV9M2haWsfcp29MQR8GKEAj4c59gjJF+suVi4VguBpQyZ7xeR Xw63dZ66t6fT9lvZr4Y//x0QzA74JfrRXWqAZDIVFo4h0mS88Q8MbmwUq9vXwPuBmB yRDE0AoQYUxfPrmLCGoGUQqWPZqGDpFRPfr9eDSw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Anshuman Khandual , Punit Agrawal , Catalin Marinas , Sasha Levin Subject: [PATCH AUTOSEL 4.14 012/115] arm64/numa: Report correct memblock range for the dummy node Date: Tue, 12 Nov 2019 20:54:39 -0500 Message-Id: <20191113015622.11592-12-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113015622.11592-1-sashal@kernel.org> References: <20191113015622.11592-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Anshuman Khandual [ Upstream commit 77cfe950901e5c13aca2df6437a05f39dd9a929b ] The dummy node ID is marked into all memory ranges on the system. So the dummy node really extends the entire memblock.memory. Hence report correct extent information for the dummy node using memblock range helper functions instead of the range [0LLU, PFN_PHYS(max_pfn) - 1)]. Fixes: 1a2db30034 ("arm64, numa: Add NUMA support for arm64 platforms") Acked-by: Punit Agrawal Signed-off-by: Anshuman Khandual Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/mm/numa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c index dad128ba98bf8..e9c843e0c1727 100644 --- a/arch/arm64/mm/numa.c +++ b/arch/arm64/mm/numa.c @@ -419,7 +419,7 @@ static int __init dummy_numa_init(void) if (numa_off) pr_info("NUMA disabled\n"); /* Forced off on command line. */ pr_info("Faking a node at [mem %#018Lx-%#018Lx]\n", - 0LLU, PFN_PHYS(max_pfn) - 1); + memblock_start_of_DRAM(), memblock_end_of_DRAM() - 1); for_each_memblock(memory, mblk) { ret = numa_add_memblk(0, mblk->base, mblk->base + mblk->size); -- 2.20.1