From: Muchun Song <songmuchun@bytedance.com>
To: Andrew Morton <akpm@linux-foundation.org>,
David Hildenbrand <david@kernel.org>,
Oscar Salvador <osalvador@suse.de>,
Mike Rapoport <rppt@kernel.org>
Cc: "Liam R . Howlett" <liam@infradead.org>,
Vlastimil Babka <vbabka@kernel.org>,
Michal Hocko <mhocko@suse.com>,
Muchun Song <muchun.song@linux.dev>,
Li Zhe <lizhe.67@bytedance.com>,
Andrew Popple <apopple@nvidia.com>,
Balbir Singh <balbirs@nvidia.com>,
Lorenzo Stoakes <ljs@kernel.org>,
Suren Baghdasaryan <surenb@google.com>,
James Houghton <jthoughton@google.com>,
Lance Yang <lance.yang@linux.dev>, Qi Zheng <qi.zheng@linux.dev>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Muchun Song <songmuchun@bytedance.com>
Subject: [PATCH v3 09/11] mm/cma: centralize CMA pageblock initialization
Date: Fri, 20 Nov 2026 18:08:54 +0800 [thread overview]
Message-ID: <20261120100856.16929-10-songmuchun@bytedance.com> (raw)
In-Reply-To: <20261120100856.16929-1-songmuchun@bytedance.com>
Early CMA reservations currently require callers to maintain CMA state.
This exposes internal bookkeeping requirements and splits responsibility
for the same area between CMA and its users.
Make CMA fully responsible for the state of early reservations. Pages
already handed to a caller remain owned by that caller if activation
fails, so keep their managed-page accounting intact regardless of whether
CMA retains the rest of the area.
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
---
v3:
- Restore managed-page accounting for early-reserved pages regardless of
CMA_RESERVE_PAGES_ON_ERROR (reported by Sashiko)
---
mm/cma.c | 30 ++++++++++++++++++------------
mm/hugetlb.c | 8 +++-----
2 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/mm/cma.c b/mm/cma.c
index 61fc59fa70f8..3e4366213b49 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -174,6 +174,10 @@ static void __init cma_activate_area(struct cma *cma)
count = early_pfn[r] - cmr->base_pfn;
bitmap_count = cma_bitmap_pages_to_bits(cma, count);
bitmap_set(cmr->bitmap, 0, bitmap_count);
+
+ for (pfn = cmr->base_pfn; pfn < early_pfn[r];
+ pfn += pageblock_nr_pages)
+ init_cma_pageblock(pfn_to_page(pfn));
}
WARN_ON_ONCE(!pfn_valid(cmr->base_pfn));
@@ -199,17 +203,20 @@ static void __init cma_activate_area(struct cma *cma)
for (r = 0; r < allocrange; r++)
bitmap_free(cma->ranges[r].bitmap);
- /* Expose all pages to the buddy, they are useless for CMA. */
- if (!test_bit(CMA_RESERVE_PAGES_ON_ERROR, &cma->flags)) {
- for (r = 0; r < cma->nranges; r++) {
- unsigned long start_pfn;
+ for (r = 0; r < cma->nranges; r++) {
+ cmr = &cma->ranges[r];
+ end_pfn = r <= allocrange ? early_pfn[r] : cmr->early_pfn;
+ /* Restore managed page accounting for early-reserved pages. */
+ for (pfn = cmr->base_pfn; pfn < end_pfn; pfn++)
+ adjust_managed_page_count(pfn_to_page(pfn), 1);
- cmr = &cma->ranges[r];
- start_pfn = r <= allocrange ? early_pfn[r] : cmr->early_pfn;
- end_pfn = cmr->base_pfn + cmr->count;
- for (pfn = start_pfn; pfn < end_pfn; pfn++)
- free_reserved_page(pfn_to_page(pfn));
- }
+ if (test_bit(CMA_RESERVE_PAGES_ON_ERROR, &cma->flags))
+ continue;
+
+ /* Expose the remaining pages to the buddy. */
+ end_pfn = cmr->base_pfn + cmr->count;
+ for (; pfn < end_pfn; pfn++)
+ free_reserved_page(pfn_to_page(pfn));
}
totalcma_pages -= cma->count;
cma->available_count = cma->count = 0;
@@ -1020,8 +1027,7 @@ bool cma_intersects(struct cma *cma, unsigned long start, unsigned long end)
*
* The caller is responsible for initializing the page structures
* in the area properly, since this just points to memblock-allocated
- * memory. The caller should subsequently use init_cma_pageblock to
- * set the migrate type and CMA stats the pageblocks that were reserved.
+ * memory.
*
* If the CMA area fails to activate later, memory obtained through
* this interface is not handed to the page allocator, this is
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 6a613d9c9332..7de65b540438 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -3337,9 +3337,7 @@ 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) {
- if (folio_test_hugetlb_cma(folio))
- init_cma_pageblock(folio_page(folio, i));
- else
+ if (!folio_test_hugetlb_cma(folio))
init_pageblock_migratetype(folio_page(folio, i),
MIGRATE_MOVABLE, false);
}
@@ -3402,8 +3400,8 @@ static void __init gather_bootmem_prealloc_node(unsigned long nid)
* 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.
+ * For CMA pages, this is done in cma_activate_area(), so skip
+ * it here.
*/
if (hugetlb_early_cma(h))
folio_set_hugetlb_cma(folio);
--
2.54.0
next prev parent reply other threads:[~2026-11-20 10:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 10:08 [PATCH v3 00/11] mm: Unify memmap initialization for compound pages Muchun Song
2026-11-20 10:08 ` [PATCH v3 01/11] mm/mm_init: verify zones for template-initialized pages Muchun Song
2026-11-20 10:08 ` [PATCH v3 02/11] mm/mm_init: factor out common struct page initialization Muchun Song
2026-11-20 10:08 ` [PATCH v3 03/11] mm/mm_init: simplify zone device " Muchun Song
2026-11-20 10:08 ` [PATCH v3 04/11] mm/mm_init: factor out compound " Muchun Song
2026-11-20 10:08 ` [PATCH v3 05/11] mm/hugetlb: drop boot-time HVO handling for gigantic folios Muchun Song
2026-11-20 10:08 ` [PATCH v3 06/11] mm/hugetlb: initialize all struct pages for bootmem hugepages Muchun Song
2026-11-20 10:08 ` [PATCH v3 07/11] mm/hugetlb: use common compound page initialization helper Muchun Song
2026-11-20 10:08 ` [PATCH v3 08/11] mm/mm_init: make __init_single_page() static Muchun Song
2026-11-20 10:08 ` Muchun Song [this message]
2026-11-20 10:08 ` [PATCH v3 10/11] mm/cma: localize init_cma_pageblock() to cma.c Muchun Song
2026-11-20 10:08 ` [PATCH v3 11/11] mm/mm_init: move pageblock migratetype init to memmap helpers Muchun Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261120100856.16929-10-songmuchun@bytedance.com \
--to=songmuchun@bytedance.com \
--cc=akpm@linux-foundation.org \
--cc=apopple@nvidia.com \
--cc=balbirs@nvidia.com \
--cc=david@kernel.org \
--cc=jthoughton@google.com \
--cc=lance.yang@linux.dev \
--cc=liam@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lizhe.67@bytedance.com \
--cc=ljs@kernel.org \
--cc=mhocko@suse.com \
--cc=muchun.song@linux.dev \
--cc=osalvador@suse.de \
--cc=qi.zheng@linux.dev \
--cc=rppt@kernel.org \
--cc=surenb@google.com \
--cc=vbabka@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®