mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-04 00:15:49 -04:00
mm/hugetlb: move huge_boot_pages list init to hugetlb_bootmem_alloc
Instead of initializing the per-node hugetlb bootmem pages list from the alloc function, we can now do it in a somewhat cleaner way, since there is an explicit hugetlb_bootmem_alloc function. Initialize the lists there. Link: https://lkml.kernel.org/r/20250228182928.2645936-17-fvdl@google.com Signed-off-by: Frank van der Linden <fvdl@google.com> Cc: Alexander Gordeev <agordeev@linux.ibm.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Dan Carpenter <dan.carpenter@linaro.org> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: David Hildenbrand <david@redhat.com> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Joao Martins <joao.m.martins@oracle.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Madhavan Srinivasan <maddy@linux.ibm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Muchun Song <muchun.song@linux.dev> Cc: Oscar Salvador <osalvador@suse.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Roman Gushchin (Cruise) <roman.gushchin@linux.dev> Cc: Usama Arif <usamaarif642@gmail.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Yu Zhao <yuzhao@google.com> Cc: Zi Yan <ziy@nvidia.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
committed by
Andrew Morton
parent
d58b249820
commit
91ec71872a
19
mm/hugetlb.c
19
mm/hugetlb.c
@@ -3586,7 +3586,6 @@ static unsigned long __init hugetlb_pages_alloc_boot(struct hstate *h)
|
||||
static void __init hugetlb_hstate_alloc_pages(struct hstate *h)
|
||||
{
|
||||
unsigned long allocated;
|
||||
static bool initialized __initdata;
|
||||
|
||||
/* skip gigantic hugepages allocation if hugetlb_cma enabled */
|
||||
if (hstate_is_gigantic(h) && hugetlb_cma_size) {
|
||||
@@ -3594,17 +3593,6 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h)
|
||||
return;
|
||||
}
|
||||
|
||||
/* hugetlb_hstate_alloc_pages will be called many times, initialize huge_boot_pages once */
|
||||
if (!initialized) {
|
||||
int i = 0;
|
||||
|
||||
for (i = 0; i < MAX_NUMNODES; i++)
|
||||
INIT_LIST_HEAD(&huge_boot_pages[i]);
|
||||
h->next_nid_to_alloc = first_online_node;
|
||||
h->next_nid_to_free = first_online_node;
|
||||
initialized = true;
|
||||
}
|
||||
|
||||
/* do node specific alloc */
|
||||
if (hugetlb_hstate_alloc_pages_specific_nodes(h))
|
||||
return;
|
||||
@@ -4928,13 +4916,20 @@ bool __init hugetlb_bootmem_allocated(void)
|
||||
void __init hugetlb_bootmem_alloc(void)
|
||||
{
|
||||
struct hstate *h;
|
||||
int i;
|
||||
|
||||
if (__hugetlb_bootmem_allocated)
|
||||
return;
|
||||
|
||||
for (i = 0; i < MAX_NUMNODES; i++)
|
||||
INIT_LIST_HEAD(&huge_boot_pages[i]);
|
||||
|
||||
hugetlb_parse_params();
|
||||
|
||||
for_each_hstate(h) {
|
||||
h->next_nid_to_alloc = first_online_node;
|
||||
h->next_nid_to_free = first_online_node;
|
||||
|
||||
if (hstate_is_gigantic(h))
|
||||
hugetlb_hstate_alloc_pages(h);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user