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 10CBDC369A2 for ; Thu, 10 Apr 2025 08:07:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1AFE72800CC; Thu, 10 Apr 2025 04:07:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 15FD52800CA; Thu, 10 Apr 2025 04:07:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 025E22800CC; Thu, 10 Apr 2025 04:07:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id DA6022800CA for ; Thu, 10 Apr 2025 04:07:51 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 24E52B9A85 for ; Thu, 10 Apr 2025 08:07:53 +0000 (UTC) X-FDA: 83317405626.30.6F2F04A Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf17.hostedemail.com (Postfix) with ESMTP id 7F0F640002 for ; Thu, 10 Apr 2025 08:07:51 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=sCMZi2RI; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf17.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744272471; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=6KFsthHXsuOsrTlgSpkmmtByAGXe7QWTe3gxz4ZU3eU=; b=dVXqrc2puxMTFmG7jFWZef24JcpB9i4E3X8bX+XAG6+dwTjX9pS5TdkWQ74cpHY4PgsrSI FX19x59wXT9yWY0FqYCbG2nrCuCpqKxQo6bN1HNviStrVo6BLnjqsBxutW2kw8kLKDo3hr 1qRBR3GGpoh0qY8+5TVZshY8xqt5aC0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744272471; a=rsa-sha256; cv=none; b=UvJyHywy2zrHM2eebar8w+NkySvSXOQVYFlF8AFtUoVSrLAybbzCgGS3+bRneuF7aESYta 3NdPePLGLYsBZORUxEz9LDZvkeQeW7pw5Oces0eSmgKIOgwREi6aqgRiLa2ITgSI+9H/Ch 1Nr4l+jGHi6GHkxVyJLJdqbX6OHZwQM= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=sCMZi2RI; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf17.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 0C3C3A49A2D; Thu, 10 Apr 2025 08:02:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37BD0C4CEEB; Thu, 10 Apr 2025 08:07:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744272470; bh=H7Rr6CifLf6QgJhumDAIt1E3qwzpwA0TrV+uAgCK1VU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=sCMZi2RIQ6T607JQU0kvnz/SfZhePCZ9j3K2fWu174vju//7Xvbw1VryurqK2fWMY 1FPAHjmV/L7SvqNqp5XPe+CNdpsUlN1T2srtBX+kkJTg3Bmhpc4pX7pTCjgERo8Nyg Ajjsu9rYwr+Nlm3k5nV61nMHVxtx1YrjjahCRyZSAKkIEdFzECRCHYpX4t8BSZhp53 YCLDYaugP8YIUkWwFrjPX/6EodDuyNyEBBZlrJgB25MPmeOMKzyWUC6/WATI3enia/ WcfWcZorvfnUYQBaOxhfD5wCsNmgcMLAgLIy1JLFHYKhT1Wgp5VAEHFsVhzH4Y4Y2s da4qpnUgk2m3A== Date: Thu, 10 Apr 2025 11:07:43 +0300 From: Mike Rapoport To: Donet Tom Cc: Greg Kroah-Hartman , linux-kernel@vger.kernel.org, David Hildenbrand , Andrew Morton , linux-mm@kvack.org, Ritesh Harjani , rafael@kernel.org, Danilo Krummrich Subject: Re: [PATCH 2/2] base/node: Use curr_node_memblock_intersect_memory_block to Get Memory Block NID if CONFIG_DEFERRED_STRUCT_PAGE_INIT is Set Message-ID: References: <50142a29010463f436dc5c4feb540e5de3bb09df.1744175097.git.donettom@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 7F0F640002 X-Stat-Signature: hgjkjg3rkbxdy7xr1f3jbrfmjyz8aahw X-Rspam-User: X-HE-Tag: 1744272471-976992 X-HE-Meta: U2FsdGVkX1981R1ey9+KrlEGvJs66B6ku+uWrab/+kXrYsUR4aFI3JMUsvdED3b8MG0vKn8+NU6j16ALjNUNRdpKmz6INfCQ3bQERh+s+TBRbpwoALnwJwUWzvAr4tko57LlKUqltkDVKUq/TUeRN5D93I6AlbZcHBdQbblXbEss0uN+hQikbYLeEr0W6gRTcpBg4+dALC+U1LkWH91akBWAmGNLARl5p7X3FJw4A+enTviHgGLhALXm5fLA1mr4PIgjQv2xc1DyIucgwuO+jhkUZR173OoY/NHBZ5KCH4jP4Dtqgm56r4Y3d8bn0EbbwG8kQJ61dGxYiBjA7ZBAT1BorPvdx/ml73HI77mLrDVF4LjE9xl0x4G8Xll9+w7Kx7ZoKJnxaKye2OtCqnj3hU4Nywvky6NF6A6tRgenmSl6QLxT79mI/zFEi42KgkAwC905B0qSr+yaMtstFlHlqb09Eb1VtL1he0hjaxBgZQJS5S0NGc/aRBNUuhcY9kmW+ioRTgsldSat+L9zRmbUQ5Y5WZov7LdzqPu7U/5V5stG3k1y5Ag+cdKOU2N2H67iNzEWYiqe7NmUaNSMqHbCriY4j+LVnLQp1nqIQIv7lk97S9zRMgjPXOWj/xVelGsZTMP3Q6vrCLkjNsjmsM2gIhXbJMDZwmW9Tnb3GzWI7iNl29ByXJ+sYJS3PQZj0xZ54tvjGnL35UOHWVDxhUE6Nw8/Ovt+k/3Ew2pr+9Bujjn1DkVjittyQqzzesbrHFkhrffORi2q1ev1S/kIbRHBIimdJRRxi4HXNdccCx1i2JJMM1lnZLzbRLQis3OIkhqwvrUyTVXqxrcLdePg2TrlgkN3fhFbWqojUJd5CQAAhFh8CQtodPH0J6einwrEgV8qSLNVLa8mkaeZyKSbdilPWqz14xENOJok7UQ0iOr9f1K9FopHVwdSLYij/FJLQjQSvHGUyy8wd2wRRcukIma R4QJxCzr shcSjSpL525qcn4mvTL7lFEXLJhtXDHH/tOdzAHG6BzNsyRK15NpJamUjXPne0E6Ei+to/bFxVO9CiPJcuBuJaTnhRTctZl84Jysz+BmKrCZHljM7ztuRIiyci5S1LCdiSQfdEjIhJMJSzwduIKWaPEG0Kzn70DiwDnxtkIYf3FSs+k54O9p5SY+QhQnDTEXDIRH4XYgk5jvzPzBy6OTaz1AtS0GCU4nzSVCfkkmjnD/76zQatX6AL9gDEVwrwHjuYy0R4JrTl/Wr9E9F3MxvBNhVG5ez0Gj1ToK30f9zILQlBoOFwK25xnd9g22BBaNDpE0AwewkSZOYctlQSJiBLREaDVeTKvkCcg3V1mFXktVpZM1Zmlg46LgtJ6gYRG4jewaIKdsV5S0U/Jh+MIgpXjo92Kstp7JdwMfXsqZbDElc4k4= 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: List-Subscribe: List-Unsubscribe: On Wed, Apr 09, 2025 at 10:57:57AM +0530, Donet Tom wrote: > In the current implementation, when CONFIG_DEFERRED_STRUCT_PAGE_INIT is > set, we iterate over all PFNs in the memory block and use > early_pfn_to_nid to find the NID until a match is found. > > This patch we are using curr_node_memblock_intersect_memory_block() to > check if the current node's memblock intersects with the memory block > passed when CONFIG_DEFERRED_STRUCT_PAGE_INIT is set. If an intersection > is found, the memory block is added to the current node. > > If CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set, the existing mechanism > for finding the NID will continue to be used. I don't think we really need different mechanisms for different settings of CONFIG_DEFERRED_STRUCT_PAGE_INIT. node_dev_init() runs after all struct pages are already initialized and can always use pfn_to_nid(). kernel_init_freeable() -> page_alloc_init_late(); /* completes initialization of deferred pages */ ... do_basic_setup() -> driver_init() -> node_dev_init(); The next step could be refactoring register_mem_block_under_node_early() to loop over memblock regions rather than over pfns. > Signed-off-by: Donet Tom > --- > drivers/base/node.c | 37 +++++++++++++++++++++++++++++-------- > 1 file changed, 29 insertions(+), 8 deletions(-) > > diff --git a/drivers/base/node.c b/drivers/base/node.c > index cd13ef287011..5c5dd02b8bdd 100644 > --- a/drivers/base/node.c > +++ b/drivers/base/node.c > @@ -20,6 +20,8 @@ > #include > #include > #include > +#include > + > > static const struct bus_type node_subsys = { > .name = "node", > @@ -782,16 +784,19 @@ static void do_register_memory_block_under_node(int nid, > ret); > } > > -/* register memory section under specified node if it spans that node */ > -static int register_mem_block_under_node_early(struct memory_block *mem_blk, > - void *arg) > +static int register_mem_block_early_if_dfer_page_init(struct memory_block *mem_blk, > + unsigned long start_pfn, unsigned long end_pfn, int nid) > { > - unsigned long memory_block_pfns = memory_block_size_bytes() / PAGE_SIZE; > - unsigned long start_pfn = section_nr_to_pfn(mem_blk->start_section_nr); > - unsigned long end_pfn = start_pfn + memory_block_pfns - 1; > - int nid = *(int *)arg; > - unsigned long pfn; > > + if (curr_node_memblock_intersect_memory_block(start_pfn, end_pfn, nid)) > + do_register_memory_block_under_node(nid, mem_blk, MEMINIT_EARLY); > + return 0; > +} > + > +static int register_mem_block_early__normal(struct memory_block *mem_blk, > + unsigned long start_pfn, unsigned long end_pfn, int nid) > +{ > + unsigned long pfn; > for (pfn = start_pfn; pfn <= end_pfn; pfn++) { > int page_nid; > > @@ -821,6 +826,22 @@ static int register_mem_block_under_node_early(struct memory_block *mem_blk, > /* mem section does not span the specified node */ > return 0; > } > +/* register memory section under specified node if it spans that node */ > +static int register_mem_block_under_node_early(struct memory_block *mem_blk, > + void *arg) > +{ > + unsigned long memory_block_pfns = memory_block_size_bytes() / PAGE_SIZE; > + unsigned long start_pfn = section_nr_to_pfn(mem_blk->start_section_nr); > + unsigned long end_pfn = start_pfn + memory_block_pfns - 1; > + int nid = *(int *)arg; > + > +#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT > + if (system_state < SYSTEM_RUNNING) > + return register_mem_block_early_if_dfer_page_init(mem_blk, start_pfn, end_pfn, nid); > +#endif > + return register_mem_block_early__normal(mem_blk, start_pfn, end_pfn, nid); > + > +} > > /* > * During hotplug we know that all pages in the memory block belong to the same > -- > 2.48.1 > -- Sincerely yours, Mike.