From patchwork Tue Feb 18 18:16:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank van der Linden X-Patchwork-Id: 13980425 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 E0BBCC021AF for ; Tue, 18 Feb 2025 18:18:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4076D2800D5; Tue, 18 Feb 2025 13:17:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 38A892800FF; Tue, 18 Feb 2025 13:17:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E1FB2800D5; Tue, 18 Feb 2025 13:17:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id DC8D0280181 for ; Tue, 18 Feb 2025 13:17:50 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A80761403F8 for ; Tue, 18 Feb 2025 18:17:50 +0000 (UTC) X-FDA: 83133873900.27.3925D9E Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf07.hostedemail.com (Postfix) with ESMTP id C7F6140014 for ; Tue, 18 Feb 2025 18:17:48 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=et6w9nHQ; spf=pass (imf07.hostedemail.com: domain of 3y860ZwQKCIAjzhpksskpi.gsqpmry1-qqozego.svk@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3y860ZwQKCIAjzhpksskpi.gsqpmry1-qqozego.svk@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739902668; 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=RAaWg9KYrhZaw2brRcaZF018Jxd4YVbeijwcOr2BboU=; b=2nyG3xNReh+yylucroFH3RjvuMt/DdSlsXSkooPa4Q3AUGQS/3us7A4FaEjNR2e539OBnG lgof9erFnAsaozaM0uc0Ez8AletaLYV01c1NtwqPC59zFXM5hcekMiiZrVwm5lyQXwQhzy TwEF4UmUIsj4oiKcHB7vK9ns9AtnLaE= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=et6w9nHQ; spf=pass (imf07.hostedemail.com: domain of 3y860ZwQKCIAjzhpksskpi.gsqpmry1-qqozego.svk@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3y860ZwQKCIAjzhpksskpi.gsqpmry1-qqozego.svk@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902668; a=rsa-sha256; cv=none; b=4oUuaIorMFIZhLq/gN2sLMUKNa1vFZXdrGPDVai7YLNrsbY01zzBmljJCmQSfQ0OO+C3k/ irc0CAb8n3Luh/W4EPD57EVQPZMkJPSdh6djMAYvbhyWm6PGMwOng0+pRVRJw/kFSP9J5q peyXYJNOu2wstyAIDk71HZfqGDSa2n8= Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2fc1a70935fso10797814a91.1 for ; Tue, 18 Feb 2025 10:17:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902668; x=1740507468; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=RAaWg9KYrhZaw2brRcaZF018Jxd4YVbeijwcOr2BboU=; b=et6w9nHQFzcgsgOiklHj6iQa+UuMWbcy9s5VUdViEHIHwkdow7uzKN4iLnFBSYdjx/ 4j0eviBLF3GwpvzoanFcRQIqOph93YSYMH5w2uBF7ONcMWo3kcGpbC0nR0kM/GaHCU0X lrFBndfvXPqvFpZF5vlJNo6LE5Am3wEBfQOftM2Ppkd0f5SM/N30KkjpDjCmEmaXkYut 8ANfbMy9Pu+zqjWKgPq8V4a16yZ1gPQaRO/CefCeYD9xCPcVDb6wHam4W+iRoJafLBGV v7i99F/0w2iZJxXLxwE/66vveIhFO7ZaGuyngnnY6T73nJMXiBPaycVmLO/4x0q1AXn1 lbTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902668; x=1740507468; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=RAaWg9KYrhZaw2brRcaZF018Jxd4YVbeijwcOr2BboU=; b=DVfmdBFB0ggC6R6MlMllkY5ZVH95LD8AuvpmbZoG/36oPCrub+Ydolune0kCWhXw6a 6ORjYZmd+Cp+XvxZ5wu+jv6DhIR+oy0qBJzHJm/PakLSPsrXJv61hzShk5mPvN4f1F1w N+nvTBaT2uV4TH02JnrpP/x0Pmshi6l1YwHyEPeg5sXgVK8WjtpbEF195M464hbJE5OM Fs2lh+RGJhu/FqGROWxXqqFF7BGn9oa+iran/VHV3IWQMhA7uWLKoBmzixxnB/ZJZQmw /dZ6FSqKzHVjv5rUI19JhDUs/hFJajgwWyVXn1vmpeLtHB50OyMsVkemfF2XzfD/Ta+T g+ug== X-Forwarded-Encrypted: i=1; AJvYcCUmEATwt473RVt59buGKVu7PQe27vPQaAS/osicQidG7XL9B1JBxy1vHiOOCQCf/FlN33H6QE/c9g==@kvack.org X-Gm-Message-State: AOJu0YzRgc32XH442H8qWi8QvNVb0qTHk9KyFNfT65KFP3Dvdk3MWomP v6kv35D9hQ9+eRpSQ15OSFfTaQDaQV8yd6tY7HtXVqTPks5O+GjTfamvfsSmo/p467FK/g== X-Google-Smtp-Source: AGHT+IFTowpNXmQaQo2ZlNPe3XcaUbY9NeJGdz1k0h7kWZZVby74hjlLnGRqAtEkQUq9LQ1hBIGCheef X-Received: from pfaz25.prod.google.com ([2002:aa7:91d9:0:b0:730:7485:6b59]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:198c:b0:732:2484:e0ce with SMTP id d2e1a72fcca58-732618c1cf1mr20924088b3a.17.1739902667774; Tue, 18 Feb 2025 10:17:47 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:54 +0000 In-Reply-To: <20250218181656.207178-1-fvdl@google.com> Mime-Version: 1.0 References: <20250218181656.207178-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Message-ID: <20250218181656.207178-27-fvdl@google.com> Subject: [PATCH v4 26/27] mm/hugetlb: enable bootmem allocation from CMA areas From: Frank van der Linden To: akpm@linux-foundation.org, muchun.song@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: yuzhao@google.com, usamaarif642@gmail.com, joao.m.martins@oracle.com, roman.gushchin@linux.dev, Frank van der Linden , Madhavan Srinivasan , Michael Ellerman , linuxppc-dev@lists.ozlabs.org X-Rspam-User: X-Stat-Signature: yktg6k49sqzk9yf9tzc39oopx3rm1umf X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: C7F6140014 X-HE-Tag: 1739902668-989773 X-HE-Meta: U2FsdGVkX19pHkX9IR0Vbcxyz+9GgSth00Z6MzeWdnXjaVF2p1wYikAKDaS9Y7RuJQD+6btqCyUlMiGyXUFDcMwvlnl1563btoRv5nQ6WqD2n04mEGipQSNkj8yrOECL+3+H7D9PKuY1fP/9lZGS+Ee/2oHsVxH6zNg+dSAhHxi+URiULFN9lcGl9pLhh7CBfbZvUeUnKwD/99JW+RtGh5G6yXbjlz3YNl1GMHm7aYXNPj+r7N0Pg6ISPuVtkvJWte0Tknfhg9kCZuduO09RlzQ+cMvNRRWd9rJwq2q0TCqTvCU66BuQh3ZO3laQQsA249T+/RRSzoldy9QBOX3tC8+xlJCz632D4J/exqesY3CEbXsLZGv5wrYGG9lZ/SjMNCGIqNmv7FA1KPZtbfhKAIdwIyK3/hv0U7NmyXSg5EKOlm4VmChHFFBPFoIzrb6E0T2VkIIMD6KwHNg2gUZwS/m2qWrOdT75EnqGAlKa7NP1bD5g3EUkX4AsHmjGyOc8Hn9Why3vRhkx71aUMv8rT/jsJMKONjD1RZobUheIo+fVp5uHzqRdJdxpaTOV8Y5s/9HHHbU8UK74OFKuMiyiHdyEXcbOmVd4/T3ivOGyL0WIaGDYH2+Y79cpKSW9lJGgFyfElg6DrPz/DxE/bSku7UZShcHZM4MGpXE03EbDXZgv9b5kyy6iQvT7SeJXSbQab/h0y2eXkbQquYnL/VYsg4laj+uzmPf2xvyY31a+oVGZvNpjXw6ggJPSPUddX8G/tyc0uceVcnDEsSNp9e+0JCmSCCfHRzKVIuiK/uiDeE6BOkOTTPrEwc2GYMuM/2/U+KrcK3to5KAUr/Hv1+swPJ0/4o0L5oserNGSCMwloawpYsknurj8s5M4Lybu/RD77AQQoMMd+OW+TpoQbWjH8QI/O4RC7xlSnDdTUNltEB763OjQgDZsHUSaQkTaIsZ59hD3zZihE/EDLQgYSwe ROS1RxXV 2DuCYfyTORPCcKj4f8ndbFjUEf/tBoxiXsNbV0q9cbsGz8t2rpnOzyvEvAdGHXOCDoUdtHi2aL09JTDThuDSDLWKCQYBBrpalsg1xPXzC0Yf5oFsABhQ6bjA2MoiFg+Arhn6WEJIP4uZCF7cOodH7fnAyzWDDkqsK46V3HXmD5oywGzRyF9Tkfi4rcx3s1IN/INRXAVMsu2XsMT/zkM3toOzqeuocYWwW/MOxxLBQnHAIQ7L2MRojcng6gKVF0kMY+uD+03ndAzLi8q13frj4hQcuWQNPOw9DM1nTYcZR9auHwsiZFreS6VtWvzm0fLT528yGdQ9z83loyeBXH/nolu7XoG8RIAP1RAFkHtvQGuKXuVdxn4OG5/MOHI6t1XF+Lx68Vv0ny3Qja6Y2ZGUr/aK2gtJADYXh8UeX0FMiC4Q6VI9ziYXdpebeCIVmBBBFPErGWb7719Mis/tT7WmruxcBlcyKAuJ/DW+kluJ2WWaBwL2PuCkdihoHQZtYRraG71YaRU6BD+a3jLlNy+JBk1/abaQGDqJFRhzhvz0ushMXsTUgPAWRTXLhF2mgz1hRUVvK/QgsVM3Mh/L9V1DT+ryMw2v9p8qLQcQ53I6Kev/7CoM= 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: If hugetlb_cma_only is enabled, we know that hugetlb pages can only be allocated from CMA. Now that there is an interface to do early reservations from a CMA area (returning memblock memory), it can be used to allocate hugetlb pages from CMA. This also allows for doing pre-HVO on these pages (if enabled). Make sure to initialize the page structures and associated data correctly. Create a flag to signal that a hugetlb page has been allocated from CMA to make things a little easier. Some configurations of powerpc have a special hugetlb bootmem allocator, so introduce a boolean arch_specific_huge_bootmem_alloc that returns true if such an allocator is present. In that case, CMA bootmem allocations can't be used, so check that function before trying. Cc: Madhavan Srinivasan Cc: Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Frank van der Linden --- arch/powerpc/include/asm/book3s/64/hugetlb.h | 6 + include/linux/hugetlb.h | 17 ++ mm/hugetlb.c | 168 ++++++++++++++----- 3 files changed, 152 insertions(+), 39 deletions(-) diff --git a/arch/powerpc/include/asm/book3s/64/hugetlb.h b/arch/powerpc/include/asm/book3s/64/hugetlb.h index f0bba9c5f9c3..bb786694dd26 100644 --- a/arch/powerpc/include/asm/book3s/64/hugetlb.h +++ b/arch/powerpc/include/asm/book3s/64/hugetlb.h @@ -94,4 +94,10 @@ static inline int check_and_get_huge_psize(int shift) return mmu_psize; } +#define arch_has_huge_bootmem_alloc arch_has_huge_bootmem_alloc + +static inline bool arch_has_huge_bootmem_alloc(void) +{ + return (firmware_has_feature(FW_FEATURE_LPAR) && !radix_enabled()); +} #endif diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 2512463bca49..6c6546b54934 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -591,6 +591,7 @@ enum hugetlb_page_flags { HPG_freed, HPG_vmemmap_optimized, HPG_raw_hwp_unreliable, + HPG_cma, __NR_HPAGEFLAGS, }; @@ -650,6 +651,7 @@ HPAGEFLAG(Temporary, temporary) HPAGEFLAG(Freed, freed) HPAGEFLAG(VmemmapOptimized, vmemmap_optimized) HPAGEFLAG(RawHwpUnreliable, raw_hwp_unreliable) +HPAGEFLAG(Cma, cma) #ifdef CONFIG_HUGETLB_PAGE @@ -678,14 +680,18 @@ struct hstate { char name[HSTATE_NAME_LEN]; }; +struct cma; + struct huge_bootmem_page { struct list_head list; struct hstate *hstate; unsigned long flags; + struct cma *cma; }; #define HUGE_BOOTMEM_HVO 0x0001 #define HUGE_BOOTMEM_ZONES_VALID 0x0002 +#define HUGE_BOOTMEM_CMA 0x0004 bool hugetlb_bootmem_page_zones_valid(int nid, struct huge_bootmem_page *m); @@ -823,6 +829,17 @@ static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, } #endif +#ifndef arch_has_huge_bootmem_alloc +/* + * Some architectures do their own bootmem allocation, so they can't use + * early CMA allocation. + */ +static inline bool arch_has_huge_bootmem_alloc(void) +{ + return false; +} +#endif + static inline struct hstate *folio_hstate(struct folio *folio) { VM_BUG_ON_FOLIO(!folio_test_hugetlb(folio), folio); diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 0b483c466656..664ccaaa717a 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -131,8 +131,10 @@ static void hugetlb_free_folio(struct folio *folio) #ifdef CONFIG_CMA int nid = folio_nid(folio); - if (cma_free_folio(hugetlb_cma[nid], folio)) + if (folio_test_hugetlb_cma(folio)) { + WARN_ON_ONCE(!cma_free_folio(hugetlb_cma[nid], folio)); return; + } #endif folio_put(folio); } @@ -1508,6 +1510,9 @@ static struct folio *alloc_gigantic_folio(struct hstate *h, gfp_t gfp_mask, break; } } + + if (folio) + folio_set_hugetlb_cma(folio); } #endif if (!folio) { @@ -3174,6 +3179,86 @@ struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, return ERR_PTR(-ENOSPC); } +static bool __init hugetlb_early_cma(struct hstate *h) +{ + if (arch_has_huge_bootmem_alloc()) + return false; + + return (hstate_is_gigantic(h) && hugetlb_cma_only); +} + +static __init void *alloc_bootmem(struct hstate *h, int nid, bool node_exact) +{ + struct huge_bootmem_page *m; + unsigned long flags; + struct cma *cma; + int listnode = nid; + +#ifdef CONFIG_CMA + if (hugetlb_early_cma(h)) { + flags = HUGE_BOOTMEM_CMA; + cma = hugetlb_cma[nid]; + m = cma_reserve_early(cma, huge_page_size(h)); + if (!m) { + int node; + + if (node_exact) + return NULL; + for_each_online_node(node) { + cma = hugetlb_cma[node]; + if (!cma || node == nid) + continue; + m = cma_reserve_early(cma, huge_page_size(h)); + if (m) { + listnode = node; + break; + } + } + } + } else +#endif + { + flags = 0; + cma = NULL; + if (node_exact) + m = memblock_alloc_exact_nid_raw(huge_page_size(h), + huge_page_size(h), 0, + MEMBLOCK_ALLOC_ACCESSIBLE, nid); + else { + m = memblock_alloc_try_nid_raw(huge_page_size(h), + huge_page_size(h), 0, + MEMBLOCK_ALLOC_ACCESSIBLE, nid); + /* + * For pre-HVO to work correctly, pages need to be on + * the list for the node they were actually allocated + * from. That node may be different in the case of + * fallback by memblock_alloc_try_nid_raw. So, + * extract the actual node first. + */ + if (m) + listnode = early_pfn_to_nid(PHYS_PFN(virt_to_phys(m))); + } + } + + if (m) { + /* + * Use the beginning of the huge page to store the + * huge_bootmem_page struct (until gather_bootmem + * puts them into the mem_map). + * + * Put them into a private list first because mem_map + * is not up yet. + */ + INIT_LIST_HEAD(&m->list); + list_add(&m->list, &huge_boot_pages[listnode]); + m->hstate = h; + m->flags = flags; + m->cma = cma; + } + + return m; +} + int alloc_bootmem_huge_page(struct hstate *h, int nid) __attribute__ ((weak, alias("__alloc_bootmem_huge_page"))); int __alloc_bootmem_huge_page(struct hstate *h, int nid) @@ -3183,22 +3268,15 @@ int __alloc_bootmem_huge_page(struct hstate *h, int nid) /* do node specific alloc */ if (nid != NUMA_NO_NODE) { - m = memblock_alloc_exact_nid_raw(huge_page_size(h), huge_page_size(h), - 0, MEMBLOCK_ALLOC_ACCESSIBLE, nid); + m = alloc_bootmem(h, node, true); if (!m) return 0; goto found; } + /* allocate from next node when distributing huge pages */ for_each_node_mask_to_alloc(&h->next_nid_to_alloc, nr_nodes, node, &node_states[N_ONLINE]) { - m = memblock_alloc_try_nid_raw( - huge_page_size(h), huge_page_size(h), - 0, MEMBLOCK_ALLOC_ACCESSIBLE, node); - /* - * Use the beginning of the huge page to store the - * huge_bootmem_page struct (until gather_bootmem - * puts them into the mem_map). - */ + m = alloc_bootmem(h, node, false); if (!m) return 0; goto found; @@ -3216,21 +3294,6 @@ int __alloc_bootmem_huge_page(struct hstate *h, int nid) memblock_reserved_mark_noinit(virt_to_phys((void *)m + PAGE_SIZE), huge_page_size(h) - PAGE_SIZE); - /* - * Put them into a private list first because mem_map is not up yet. - * - * For pre-HVO to work correctly, pages need to be on the list for - * the node they were actually allocated from. That node may be - * different in the case of fallback by memblock_alloc_try_nid_raw. - * So, extract the actual node first. - */ - if (nid == NUMA_NO_NODE) - node = early_pfn_to_nid(PHYS_PFN(virt_to_phys(m))); - - INIT_LIST_HEAD(&m->list); - list_add(&m->list, &huge_boot_pages[node]); - m->hstate = h; - m->flags = 0; return 1; } @@ -3271,13 +3334,25 @@ static void __init hugetlb_folio_init_vmemmap(struct folio *folio, prep_compound_head((struct page *)folio, huge_page_order(h)); } +static bool __init hugetlb_bootmem_page_prehvo(struct huge_bootmem_page *m) +{ + return m->flags & HUGE_BOOTMEM_HVO; +} + +static bool __init hugetlb_bootmem_page_earlycma(struct huge_bootmem_page *m) +{ + return m->flags & HUGE_BOOTMEM_CMA; +} + /* * memblock-allocated pageblocks might not have the migrate type set * if marked with the 'noinit' flag. Set it to the default (MIGRATE_MOVABLE) - * here. + * here, or MIGRATE_CMA if this was a page allocated through an early CMA + * reservation. * - * Note that this will not write the page struct, it is ok (and necessary) - * to do this on vmemmap optimized folios. + * In case of vmemmap optimized folios, the tail vmemmap pages are mapped + * read-only, but that's ok - for sparse vmemmap this does not write to + * the page structure. */ static void __init hugetlb_bootmem_init_migratetype(struct folio *folio, struct hstate *h) @@ -3286,9 +3361,13 @@ static void __init hugetlb_bootmem_init_migratetype(struct folio *folio, WARN_ON_ONCE(!pageblock_aligned(folio_pfn(folio))); - for (i = 0; i < nr_pages; i += pageblock_nr_pages) - set_pageblock_migratetype(folio_page(folio, i), + for (i = 0; i < nr_pages; i += pageblock_nr_pages) { + if (folio_test_hugetlb_cma(folio)) + init_cma_pageblock(folio_page(folio, i)); + else + set_pageblock_migratetype(folio_page(folio, i), MIGRATE_MOVABLE); + } } static void __init prep_and_add_bootmem_folios(struct hstate *h, @@ -3334,10 +3413,16 @@ bool __init hugetlb_bootmem_page_zones_valid(int nid, return true; } + if (hugetlb_bootmem_page_earlycma(m)) { + valid = cma_validate_zones(m->cma); + goto out; + } + start_pfn = virt_to_phys(m) >> PAGE_SHIFT; valid = !pfn_range_intersects_zones(nid, start_pfn, pages_per_huge_page(m->hstate)); +out: if (!valid) hstate_boot_nrinvalid[hstate_index(m->hstate)]++; @@ -3366,11 +3451,6 @@ static void __init hugetlb_bootmem_free_invalid_page(int nid, struct page *page, } } -static bool __init hugetlb_bootmem_page_prehvo(struct huge_bootmem_page *m) -{ - return (m->flags & HUGE_BOOTMEM_HVO); -} - /* * Put bootmem huge pages into the standard lists after mem_map is up. * Note: This only applies to gigantic (order > MAX_PAGE_ORDER) pages. @@ -3420,14 +3500,21 @@ static void __init gather_bootmem_prealloc_node(unsigned long nid) */ folio_set_hugetlb_vmemmap_optimized(folio); + if (hugetlb_bootmem_page_earlycma(m)) + folio_set_hugetlb_cma(folio); + list_add(&folio->lru, &folio_list); /* * We need to restore the 'stolen' pages to totalram_pages * in order to fix confusing memory reports from free(1) and * other side-effects, like CommitLimit going negative. + * + * For CMA pages, this is done in init_cma_pageblock + * (via hugetlb_bootmem_init_migratetype), so skip it here. */ - adjust_managed_page_count(page, pages_per_huge_page(h)); + if (!folio_test_hugetlb_cma(folio)) + adjust_managed_page_count(page, pages_per_huge_page(h)); cond_resched(); } @@ -3612,8 +3699,11 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) { unsigned long allocated; - /* skip gigantic hugepages allocation if hugetlb_cma enabled */ - if (hstate_is_gigantic(h) && hugetlb_cma_size) { + /* + * Skip gigantic hugepages allocation if early CMA + * reservations are not available. + */ + if (hstate_is_gigantic(h) && hugetlb_cma_size && !hugetlb_early_cma(h)) { pr_warn_once("HugeTLB: hugetlb_cma is enabled, skip boot time allocation\n"); return; }