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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E30BC7EE23 for ; Wed, 24 May 2023 04:59:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 52B58900002; Wed, 24 May 2023 00:59:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4DB646B0075; Wed, 24 May 2023 00:59:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C9F8900002; Wed, 24 May 2023 00:59:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2A3626B0074 for ; Wed, 24 May 2023 00:59:45 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id DFE1D407B2 for ; Wed, 24 May 2023 04:59:44 +0000 (UTC) X-FDA: 80823945888.28.DC52550 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf18.hostedemail.com (Postfix) with ESMTP id B73321C0007 for ; Wed, 24 May 2023 04:59:42 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf18.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684904383; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yYague9EiqMJoECDAP2HsngkwYcbd6SDfrT9sn8qgMw=; b=NGLrT+1FhO2l+yHs/7pURK5iR7pSISN42I8YGKmAHrTf4jcoGTSqbbkjzMGHOaYXKJ4mR7 EBO0UqwzpinNhYqTGr8WO0TXL8YBDcMTV88J/esk8yF+FDroNSAJAmeka/BfUBmDX4Gal+ WGwnTHRsx9dK6WYB/ExDW0fAU9CdlSI= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf18.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684904383; a=rsa-sha256; cv=none; b=faenj/D2/+wq/Wq6MDMcZCKrOSqtDurgNmED5mg+ZHZu2qsV2AcSybRDvAFbnI8QOYV7Ta L3AuFH/70A0L5/0cvKHAzxrnpRDjkKjh9toKyGCS92sNY8gZgTdsNkSYIa5qo20R2xCXh6 93qf7QWI5Ye0a1PbNUPi/s4nCNeW//0= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BC4DD1042; Tue, 23 May 2023 22:00:26 -0700 (PDT) Received: from [10.163.72.91] (unknown [10.163.72.91]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E456B3F840; Tue, 23 May 2023 21:59:38 -0700 (PDT) Message-ID: <03cdccc3-8b8a-d972-bbad-d60966e59ca9@arm.com> Date: Wed, 24 May 2023 10:29:36 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH] memblock: update numa node of memblk reserved type Content-Language: en-US To: 20230519105321.333-1-ssawgyw@gmail.com, Mike Rapoport , Andrew Morton , linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, tsahu@linux.ibm.com, ssawgyw@gmail.com, Kefeng Wang References: <20230523115708.195597-1-wangkefeng.wang@huawei.com> From: Anshuman Khandual In-Reply-To: <20230523115708.195597-1-wangkefeng.wang@huawei.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: B73321C0007 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: m1ojhm579sorzkyeojoag6dm416op4z3 X-HE-Tag: 1684904382-572982 X-HE-Meta: U2FsdGVkX193ea8+nfuTM9UpMgI8TK7riKFKL/tFjguuu/yoAqGr6Zn9tIKUevtFlAp9xM5Xu9gvAplPz0k1cyXdyQPEwCqLsq+oI5w+EshG52HZ7lYxoQRdXsqF9WjYdLF5v9HkPvyDbxiqv1wj4BcqwC+4JDYq1Ko0hUltK4qS0GYdR9/CXsctF6cnwPI5dR76AH3PZ/xYfs9IFnjHrGakDrvn4DEbEtMYPSpG1nm4DerF2eWqVpA4AePKzUq7CV7COjico04yAebToHTy8BG+pMYvWYzC2VZXZJE6lewGKWohsLzH3IWqhXmDTMVTHO7eBWN+Rmcu1C8J0YV1DnJDZhde34JfrWp8BwTM58Np6jEdtpcKLnBVUDHKDV2rshZmXfccRrxpbGWxtBLW0iBtCCvzYOZF+k9ISwvoTzYW9ft9tj+2PezKWR8ApF6VeNqFK5QGgdNdCOhT0WMeijO050BBGqquRW2EySv7R47UCCBy9sJY1CFGijlqlFtjC29y8cWIQNCvn5UBAYmfGFC+O3ZIwudrZtVgSlKYYOac1rsILsI6JqJwkrZISTpVhjfqqCEk5NxLyjXszXxrgKSFHeijbDOVjaSkYr9SG8IcuZ4BW6kM3Ie//oRgEsDYBpPopBau9+2JK61CQCbhZkJ+SShwrWqOBrfDe1ajUp4vjQzKjAlk6Agt8jWNNhgUg4UuixZ/CCwKcBgY+ZxP3HAY1TvIISjj6toBN8MzrJEaPxgr77YdJ34P6YnIruPhvp4C7/ExBn9BSE2ZdkCDl6CUZeg2XS1UOpX8cMeVxE0q+N1R9c7tBdJ4FDeMEuqTJA6UWcZzEEQEm7HOKKFWdqahd1Rj0nwV00E62SpHQjh0V6NOnKv60QkLsQGn81SnDiFwefJKNVAes39uk1l53Uqsb97m41BvYLc7+ZUvgZQ4s6eMT7t+dVtLcAc9unJjKpPZt2g+xRIgNS3L0eo 5RfyyVC+ XM+dxAQfmxWgyxpUTeO1VIbmdRCYgVdl4w5GHT5HRyBl+p8OTASzWEJ5rxf12T9fQkA9Q4mZq4wsgBrXZ9vOLV3OLeQSHQg4bZsWAX+QVO2esQ4AUEaIYaXXHASeiz7IqvSMbEx/SE+fZm/NbzmMHtFUs1JAkRSsWXd3DWkvW9Dt9ImhzA93Yy2c2OXNNi1abrDRR80OurpzZKBM= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 5/23/23 17:27, Kefeng Wang wrote: > The numa node of memblk reserved type is wrong, it could update > according to the numa node information from memblk memory type, > let's fix it. Indeed it's wrong at present and can be verified from sysfs file (/sys/kernel/debug/memblock/reserved) accessed in user space. > > Signed-off-by: Kefeng Wang > --- > mm/memblock.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/mm/memblock.c b/mm/memblock.c > index a50447d970ef..45a0781cda31 100644 > --- a/mm/memblock.c > +++ b/mm/memblock.c > @@ -1922,6 +1922,28 @@ phys_addr_t __init_memblock memblock_get_current_limit(void) > return memblock.current_limit; > } > > +static void __init_memblock memblock_reserved_update_node(void) > +{ > + struct memblock_region *rgn; > + phys_addr_t base, end, size; > + int ret; > + > + if (!IS_ENABLED(CONFIG_NUMA)) > + return; > + > + for_each_mem_region(rgn) { > + base = rgn->base; > + size = rgn->size; > + end = base + size - 1; > + > + ret = memblock_set_node(base, size, &memblock.reserved, > + memblock_get_region_node(rgn)); > + if (ret) > + pr_err("memblock: Failed to update reserved [%pa-%pa] node", > + &base, &end); > + } > +} > + > static void __init_memblock memblock_dump(struct memblock_type *type) > { > phys_addr_t base, end, size; > @@ -1955,6 +1977,7 @@ static void __init_memblock __memblock_dump_all(void) > &memblock.memory.total_size, > &memblock.reserved.total_size); > > + memblock_reserved_update_node(); __memblock_dump_all() gets called only when memblock_debug is enabled. This helper should be called directly inside memblock_dump_all() right at the beginning, regardless of memblock_debug. diff --git a/mm/memblock.c b/mm/memblock.c index 804fae92d56f..008c4e86d7f3 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1954,7 +1954,6 @@ static void __init_memblock __memblock_dump_all(void) &memblock.memory.total_size, &memblock.reserved.total_size); - memblock_reserved_update_node(); memblock_dump(&memblock.memory); memblock_dump(&memblock.reserved); #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP @@ -1964,6 +1963,8 @@ static void __init_memblock __memblock_dump_all(void) void __init_memblock memblock_dump_all(void) { + memblock_reserved_update_node(); + if (memblock_debug) __memblock_dump_all(); } > memblock_dump(&memblock.memory); > memblock_dump(&memblock.reserved); > #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP > @@ -2196,6 +2219,8 @@ static int memblock_debug_show(struct seq_file *m, void *private) > unsigned int count = ARRAY_SIZE(flagname); > phys_addr_t end; > > + memblock_reserved_update_node(); > + This is redundant, should be dropped. Reserved memblock ranges need not be scanned, each time the sysfs file is accessed from user space. > for (i = 0; i < type->cnt; i++) { > reg = &type->regions[i]; > end = reg->base + reg->size - 1;