[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <aCcPAV0RiVp0iq9W@kernel.org>
Date: Fri, 16 May 2025 13:10:09 +0300
From: Mike Rapoport <rppt@...nel.org>
To: Donet Tom <donettom@...ux.ibm.com>
Cc: David Hildenbrand <david@...hat.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Oscar Salvador <osalvador@...e.de>, Zi Yan <ziy@...dia.com>,
Ritesh Harjani <ritesh.list@...il.com>, rafael@...nel.org,
Danilo Krummrich <dakr@...nel.org>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
linux-kernel@...r.kernel.org, linux-mm@...ck.org,
Jonathan Cameron <Jonathan.Cameron@...wei.com>,
Alison Schofield <alison.schofield@...el.com>,
Yury Norov <yury.norov@...il.com>,
Dave Jiang <dave.jiang@...el.com>
Subject: Re: [PATCH v4 2/4] driver/base: remove
register_mem_block_under_node_early()
On Fri, May 16, 2025 at 03:19:52AM -0500, Donet Tom wrote:
> The function register_mem_block_under_node_early() is no longer used,
> as register_memory_blocks_under_node_early() now handles memory block
> registration during early boot.
>
> Removed register_mem_block_under_node_early() and get_nid_for_pfn(),
> the latter was only used by the former.
>
> Acked-by: David Hildenbrand <david@...hat.com>
> Acked-by: Zi Yan <ziy@...dia.com>
> Signed-off-by: Donet Tom <donettom@...ux.ibm.com>
Acked-by: Mike Rapoport (Microsoft) <rppt@...nel.org>
> ---
> v3->v4
>
> Added Acked-by tag
>
> v3 - https://lore.kernel.org/all/b49ed289096643ff5b5fbedcf1d1c1be42845a74.1746250339.git.donettom@linux.ibm.com/
> v2 - https://lore.kernel.org/all/fbe1e0c7d91bf3fa9a64ff5d84b53ded1d0d5ac7.1745852397.git.donettom@linux.ibm.com/
> v1 - https://lore.kernel.org/all/50142a29010463f436dc5c4feb540e5de3bb09df.1744175097.git.donettom@linux.ibm.com/
> ---
> drivers/base/node.c | 58 +--------------------------------------------
> 1 file changed, 1 insertion(+), 57 deletions(-)
>
> diff --git a/drivers/base/node.c b/drivers/base/node.c
> index f8cafd8c8fb1..8a14ebcae3b9 100644
> --- a/drivers/base/node.c
> +++ b/drivers/base/node.c
> @@ -748,15 +748,6 @@ int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)
> }
>
> #ifdef CONFIG_MEMORY_HOTPLUG
> -static int __ref get_nid_for_pfn(unsigned long pfn)
> -{
> -#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
> - if (system_state < SYSTEM_RUNNING)
> - return early_pfn_to_nid(pfn);
> -#endif
> - return pfn_to_nid(pfn);
> -}
> -
> static void do_register_memory_block_under_node(int nid,
> struct memory_block *mem_blk,
> enum meminit_context context)
> @@ -783,46 +774,6 @@ 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)
> -{
> - 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;
> -
> - for (pfn = start_pfn; pfn <= end_pfn; pfn++) {
> - int page_nid;
> -
> - /*
> - * memory block could have several absent sections from start.
> - * skip pfn range from absent section
> - */
> - if (!pfn_in_present_section(pfn)) {
> - pfn = round_down(pfn + PAGES_PER_SECTION,
> - PAGES_PER_SECTION) - 1;
> - continue;
> - }
> -
> - /*
> - * We need to check if page belongs to nid only at the boot
> - * case because node's ranges can be interleaved.
> - */
> - page_nid = get_nid_for_pfn(pfn);
> - if (page_nid < 0)
> - continue;
> - if (page_nid != nid)
> - continue;
> -
> - do_register_memory_block_under_node(nid, mem_blk, MEMINIT_EARLY);
> - return 0;
> - }
> - /* mem section does not span the specified node */
> - return 0;
> -}
> -
> /*
> * During hotplug we know that all pages in the memory block belong to the same
> * node.
> @@ -892,15 +843,8 @@ void register_memory_blocks_under_node(int nid, unsigned long start_pfn,
> unsigned long end_pfn,
> enum meminit_context context)
> {
> - walk_memory_blocks_func_t func;
> -
> - if (context == MEMINIT_HOTPLUG)
> - func = register_mem_block_under_node_hotplug;
> - else
> - func = register_mem_block_under_node_early;
> -
> walk_memory_blocks(PFN_PHYS(start_pfn), PFN_PHYS(end_pfn - start_pfn),
> - (void *)&nid, func);
> + (void *)&nid, register_mem_block_under_node_hotplug);
> return;
> }
> #endif /* CONFIG_MEMORY_HOTPLUG */
> --
> 2.43.5
>
--
Sincerely yours,
Mike.
Powered by blists - more mailing lists