* [PATCH v5 1/3] x86: hugetlb: disable default CMA reservations on 32-bit kernel
2026-11-17 9:33 [PATCH v5 0/3] mm: hugetlb: fix CMA-related issues Qi Zheng
@ 2026-11-17 9:33 ` Qi Zheng
2026-11-17 9:33 ` [PATCH v5 2/3] mm: gup: allow long-term pins of CMA-allocated HugeTLB folios Qi Zheng
2026-11-17 9:33 ` [PATCH v5 3/3] mm: hugetlb: fix GFP mask propagation to CMA Qi Zheng
2 siblings, 0 replies; 5+ messages in thread
From: Qi Zheng @ 2026-11-17 9:33 UTC (permalink / raw)
To: muchun.song, osalvador, david, akpm, azpijr, lance.yang, fvdl
Cc: linux-kernel, linux-mm, Qi Zheng, stable
From: Qi Zheng <zhengqi.arch@bytedance.com>
A 32-bit x86 kernel can run on a 64-bit-capable CPU advertising GBPAGES.
arch_hugetlb_cma_order() checks only this feature and returns a nonzero
order, although gigantic HugeTLB support on x86 requires CONFIG_X86_64.
Specifying hugetlb_cma= can therefore reserve a CMA area that cannot
serve the intended gigantic HugeTLB allocations.
On non-PAE kernels, the folded PUD_SHIFT yields a 4 MiB order, which is
equal to MAX_PAGE_ORDER. With CONFIG_DEBUG_VM enabled, this triggers the
VM_WARN_ON(order <= MAX_PAGE_ORDER) check in hugetlb_cma_reserve(),
warning that hugetlb_cma is attempting to reserve a non-gigantic order.
Require CONFIG_X86_64 as well as GBPAGES when selecting the default CMA
order to avoid these ineffective reservations.
Fixes: cf11e85fc08c ("mm: hugetlb: optionally allocate gigantic hugepages using cma")
Cc: stable@vger.kernel.org
Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
Acked-by: Muchun Song <muchun.song@linux.dev>
Reviewed-by: Jose A. Perez de Azpillaga <azpijr@gmail.com>
Acked-by: Oscar Salvador <osalvador@suse.de>
---
arch/x86/mm/hugetlbpage.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
index 3b26621c91286..70726a99ede7b 100644
--- a/arch/x86/mm/hugetlbpage.c
+++ b/arch/x86/mm/hugetlbpage.c
@@ -45,7 +45,7 @@ arch_initcall(gigantic_pages_init);
unsigned int __init arch_hugetlb_cma_order(void)
{
- if (boot_cpu_has(X86_FEATURE_GBPAGES))
+ if (IS_ENABLED(CONFIG_X86_64) && boot_cpu_has(X86_FEATURE_GBPAGES))
return PUD_SHIFT - PAGE_SHIFT;
return 0;
--
2.54.0
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v5 2/3] mm: gup: allow long-term pins of CMA-allocated HugeTLB folios
2026-11-17 9:33 [PATCH v5 0/3] mm: hugetlb: fix CMA-related issues Qi Zheng
2026-11-17 9:33 ` [PATCH v5 1/3] x86: hugetlb: disable default CMA reservations on 32-bit kernel Qi Zheng
@ 2026-11-17 9:33 ` Qi Zheng
2026-11-17 9:43 ` David Hildenbrand (Arm)
2026-11-17 9:33 ` [PATCH v5 3/3] mm: hugetlb: fix GFP mask propagation to CMA Qi Zheng
2 siblings, 1 reply; 5+ messages in thread
From: Qi Zheng @ 2026-11-17 9:33 UTC (permalink / raw)
To: muchun.song, osalvador, david, akpm, azpijr, lance.yang, fvdl
Cc: linux-kernel, linux-mm, Qi Zheng, stable
From: Qi Zheng <zhengqi.arch@bytedance.com>
Long-term pinning rejects HugeTLB folios explicitly allocated from CMA,
causing unnecessary migration or pinning failures. These folios already
own their CMA memory and do not need to be migrated out for future CMA
allocations.
Add cma_folio_is_longterm_pinnable() to recognize these allocations
through HPG_cma. Allow them to be pinned even in ZONE_MOVABLE, since
memory blocks overlapping boot-time CMA areas cannot be offlined. Ordinary
movable allocations that borrow CMA memory remain unpinnable.
Fixes: cf11e85fc08c ("mm: hugetlb: optionally allocate gigantic hugepages using cma")
Cc: stable@vger.kernel.org
Suggested-by: Muchun Song <muchun.song@linux.dev>
Suggested-by: David Hildenbrand (Arm) <david@kernel.org>
Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
Acked-by: Muchun Song <muchun.song@linux.dev>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Reviewed-by: Jose A. Perez de Azpillaga <azpijr@gmail.com>
Reviewed-by: Frank van der Linden <fvdl@google.com>
---
include/linux/cma.h | 3 +++
include/linux/mm.h | 9 ++++++---
mm/cma.c | 11 +++++++++++
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/include/linux/cma.h b/include/linux/cma.h
index 8555d38a97b1a..d829fd0355bae 100644
--- a/include/linux/cma.h
+++ b/include/linux/cma.h
@@ -21,6 +21,9 @@
#define CMA_MIN_ALIGNMENT_BYTES (PAGE_SIZE * CMA_MIN_ALIGNMENT_PAGES)
struct cma;
+struct folio;
+
+bool cma_folio_is_longterm_pinnable(struct folio *folio);
extern unsigned long totalcma_pages;
extern phys_addr_t cma_get_base(const struct cma *cma);
diff --git a/include/linux/mm.h b/include/linux/mm.h
index daf5c5b567ebc..e71aae8001831 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -38,6 +38,7 @@
#include <linux/bitops.h>
#include <linux/iommu-debug-pagealloc.h>
#include <linux/kcsan-checks.h>
+#include <linux/cma.h>
struct mempolicy;
struct anon_vma;
@@ -3015,15 +3016,18 @@ static inline bool is_zero_folio(const struct folio *folio)
return is_zero_page(&folio->page);
}
-/* MIGRATE_CMA and ZONE_MOVABLE do not allow pin folios */
#ifdef CONFIG_MIGRATION
+/*
+ * MIGRATE_CMA and ZONE_MOVABLE folios cannot normally be long-term pinned.
+ * CMA may allow pinning folios explicitly allocated from its areas.
+ */
static inline bool folio_is_longterm_pinnable(struct folio *folio)
{
#ifdef CONFIG_CMA
int mt = folio_migratetype(folio);
if (mt == MIGRATE_CMA || mt == MIGRATE_ISOLATE)
- return false;
+ return cma_folio_is_longterm_pinnable(folio);
#endif
/* The zero page can be "pinned" but gets special handling. */
if (is_zero_folio(folio))
@@ -3042,7 +3046,6 @@ static inline bool folio_is_longterm_pinnable(struct folio *folio)
/* Otherwise, non-movable zone folios can be pinned. */
return !folio_is_zone_movable(folio);
-
}
#else
static inline bool folio_is_longterm_pinnable(struct folio *folio)
diff --git a/mm/cma.c b/mm/cma.c
index 9ec1d1fd5dff5..fea5d1015319d 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -29,6 +29,7 @@
#include <linux/highmem.h>
#include <linux/io.h>
#include <linux/kmemleak.h>
+#include <linux/hugetlb.h>
#include <trace/events/cma.h>
#include "internal.h"
@@ -38,6 +39,16 @@
struct cma cma_areas[MAX_CMA_AREAS];
unsigned int cma_area_count;
+bool cma_folio_is_longterm_pinnable(struct folio *folio)
+{
+ /*
+ * Explicitly allocated CMA folios own their CMA memory and can be
+ * pinned even in ZONE_MOVABLE, as CMA memory cannot be offlined.
+ * For now, only HugeTLB tracks these allocations with a folio flag.
+ */
+ return folio_test_hugetlb(folio) && folio_test_hugetlb_cma(folio);
+}
+
phys_addr_t cma_get_base(const struct cma *cma)
{
WARN_ON_ONCE(cma->nranges != 1);
--
2.54.0
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v5 2/3] mm: gup: allow long-term pins of CMA-allocated HugeTLB folios
2026-11-17 9:33 ` [PATCH v5 2/3] mm: gup: allow long-term pins of CMA-allocated HugeTLB folios Qi Zheng
@ 2026-11-17 9:43 ` David Hildenbrand (Arm)
0 siblings, 0 replies; 5+ messages in thread
From: David Hildenbrand (Arm) @ 2026-11-17 9:43 UTC (permalink / raw)
To: Qi Zheng, muchun.song, osalvador, akpm, azpijr, lance.yang, fvdl
Cc: linux-kernel, linux-mm, Qi Zheng, stable
On 11/17/26 10:33, Qi Zheng wrote:
> From: Qi Zheng <zhengqi.arch@bytedance.com>
>
> Long-term pinning rejects HugeTLB folios explicitly allocated from CMA,
> causing unnecessary migration or pinning failures. These folios already
> own their CMA memory and do not need to be migrated out for future CMA
> allocations.
>
> Add cma_folio_is_longterm_pinnable() to recognize these allocations
> through HPG_cma. Allow them to be pinned even in ZONE_MOVABLE, since
> memory blocks overlapping boot-time CMA areas cannot be offlined. Ordinary
> movable allocations that borrow CMA memory remain unpinnable.
>
> Fixes: cf11e85fc08c ("mm: hugetlb: optionally allocate gigantic hugepages using cma")
> Cc: stable@vger.kernel.org
> Suggested-by: Muchun Song <muchun.song@linux.dev>
> Suggested-by: David Hildenbrand (Arm) <david@kernel.org>
> Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
> Acked-by: Muchun Song <muchun.song@linux.dev>
> Reviewed-by: Oscar Salvador <osalvador@suse.de>
> Reviewed-by: Jose A. Perez de Azpillaga <azpijr@gmail.com>
> Reviewed-by: Frank van der Linden <fvdl@google.com>
> ---
> include/linux/cma.h | 3 +++
> include/linux/mm.h | 9 ++++++---
> mm/cma.c | 11 +++++++++++
> 3 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/cma.h b/include/linux/cma.h
> index 8555d38a97b1a..d829fd0355bae 100644
> --- a/include/linux/cma.h
> +++ b/include/linux/cma.h
> @@ -21,6 +21,9 @@
> #define CMA_MIN_ALIGNMENT_BYTES (PAGE_SIZE * CMA_MIN_ALIGNMENT_PAGES)
>
> struct cma;
> +struct folio;
> +
> +bool cma_folio_is_longterm_pinnable(struct folio *folio);
>
> extern unsigned long totalcma_pages;
> extern phys_addr_t cma_get_base(const struct cma *cma);
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index daf5c5b567ebc..e71aae8001831 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -38,6 +38,7 @@
> #include <linux/bitops.h>
> #include <linux/iommu-debug-pagealloc.h>
> #include <linux/kcsan-checks.h>
> +#include <linux/cma.h>
>
> struct mempolicy;
> struct anon_vma;
> @@ -3015,15 +3016,18 @@ static inline bool is_zero_folio(const struct folio *folio)
> return is_zero_page(&folio->page);
> }
>
> -/* MIGRATE_CMA and ZONE_MOVABLE do not allow pin folios */
> #ifdef CONFIG_MIGRATION
> +/*
> + * MIGRATE_CMA and ZONE_MOVABLE folios cannot normally be long-term pinned.
> + * CMA may allow pinning folios explicitly allocated from its areas.
> + */
> static inline bool folio_is_longterm_pinnable(struct folio *folio)
> {
> #ifdef CONFIG_CMA
> int mt = folio_migratetype(folio);
>
> if (mt == MIGRATE_CMA || mt == MIGRATE_ISOLATE)
> - return false;
> + return cma_folio_is_longterm_pinnable(folio);
> #endif
> /* The zero page can be "pinned" but gets special handling. */
> if (is_zero_folio(folio))
> @@ -3042,7 +3046,6 @@ static inline bool folio_is_longterm_pinnable(struct folio *folio)
>
> /* Otherwise, non-movable zone folios can be pinned. */
> return !folio_is_zone_movable(folio);
> -
> }
> #else
> static inline bool folio_is_longterm_pinnable(struct folio *folio)
> diff --git a/mm/cma.c b/mm/cma.c
> index 9ec1d1fd5dff5..fea5d1015319d 100644
> --- a/mm/cma.c
> +++ b/mm/cma.c
> @@ -29,6 +29,7 @@
> #include <linux/highmem.h>
> #include <linux/io.h>
> #include <linux/kmemleak.h>
> +#include <linux/hugetlb.h>
> #include <trace/events/cma.h>
>
> #include "internal.h"
> @@ -38,6 +39,16 @@
> struct cma cma_areas[MAX_CMA_AREAS];
> unsigned int cma_area_count;
>
> +bool cma_folio_is_longterm_pinnable(struct folio *folio)
> +{
> + /*
> + * Explicitly allocated CMA folios own their CMA memory and can be
> + * pinned even in ZONE_MOVABLE, as CMA memory cannot be offlined.
> + * For now, only HugeTLB tracks these allocations with a folio flag.
> + */
> + return folio_test_hugetlb(folio) && folio_test_hugetlb_cma(folio);
> +}
> +
> phys_addr_t cma_get_base(const struct cma *cma)
> {
> WARN_ON_ONCE(cma->nranges != 1);
Thanks.
Reviewed-by: David Hildenbrand (Arm) <david@kernel.org>
This can go through Andrew's tree with the other hugetlb stuff.
--
Cheers,
David
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v5 3/3] mm: hugetlb: fix GFP mask propagation to CMA
2026-11-17 9:33 [PATCH v5 0/3] mm: hugetlb: fix CMA-related issues Qi Zheng
2026-11-17 9:33 ` [PATCH v5 1/3] x86: hugetlb: disable default CMA reservations on 32-bit kernel Qi Zheng
2026-11-17 9:33 ` [PATCH v5 2/3] mm: gup: allow long-term pins of CMA-allocated HugeTLB folios Qi Zheng
@ 2026-11-17 9:33 ` Qi Zheng
2 siblings, 0 replies; 5+ messages in thread
From: Qi Zheng @ 2026-11-17 9:33 UTC (permalink / raw)
To: muchun.song, osalvador, david, akpm, azpijr, lance.yang, fvdl
Cc: linux-kernel, linux-mm, Qi Zheng, stable, Oscar Salvador (SUSE)
From: Qi Zheng <zhengqi.arch@bytedance.com>
cma_alloc_frozen_compound() uses GFP_KERNEL, allowing direct reclaim
during the first MPOL_PREFERRED_MANY allocation attempt even though
the caller clears __GFP_DIRECT_RECLAIM.
Pass the caller's GFP mask through the helper so CMA respects its
reclaim constraints when trying the preferred nodes.
Fixes: 9bda131c6093 ("mm: cma: add cma_alloc_frozen{_compound}()")
Cc: stable@vger.kernel.org
Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
Acked-by: Muchun Song <muchun.song@linux.dev>
Reviewed-by: Jose A. Perez de Azpillaga <azpijr@gmail.com>
Reviewed-by: Oscar Salvador (SUSE) <osalvador@kernel.org>
---
include/linux/cma.h | 2 +-
mm/cma.c | 10 ++++++++--
mm/hugetlb_cma.c | 4 ++--
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/include/linux/cma.h b/include/linux/cma.h
index d829fd0355bae..d6e97e831d970 100644
--- a/include/linux/cma.h
+++ b/include/linux/cma.h
@@ -56,7 +56,7 @@ extern bool cma_release(struct cma *cma, const struct page *pages, unsigned long
struct page *cma_alloc_frozen(struct cma *cma, unsigned long count,
unsigned int align, bool no_warn);
-struct page *cma_alloc_frozen_compound(struct cma *cma, unsigned int order);
+struct page *cma_alloc_frozen_compound(struct cma *cma, unsigned int order, gfp_t gfp);
bool cma_release_frozen(struct cma *cma, const struct page *pages,
unsigned long count);
diff --git a/mm/cma.c b/mm/cma.c
index fea5d1015319d..225e3bbaecf9a 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -944,9 +944,15 @@ struct page *cma_alloc_frozen(struct cma *cma, unsigned long count,
return __cma_alloc_frozen(cma, count, align, gfp);
}
-struct page *cma_alloc_frozen_compound(struct cma *cma, unsigned int order)
+struct page *cma_alloc_frozen_compound(struct cma *cma, unsigned int order, gfp_t gfp)
{
- gfp_t gfp = GFP_KERNEL | __GFP_COMP | __GFP_NOWARN;
+ /*
+ * The only caller of cma_alloc_frozen_compound() is hugetlb, and
+ * hugetlb constructs its gfp mask via htlb_alloc_mask(), which already
+ * sets __GFP_COMP. Check here for usecases bypassing htlb_alloc_mask().
+ */
+ if (WARN_ON_ONCE(!(gfp & __GFP_COMP)))
+ return NULL;
return __cma_alloc_frozen(cma, 1 << order, order, gfp);
}
diff --git a/mm/hugetlb_cma.c b/mm/hugetlb_cma.c
index cd6f64da31a2c..1eb9d8d8732ba 100644
--- a/mm/hugetlb_cma.c
+++ b/mm/hugetlb_cma.c
@@ -71,14 +71,14 @@ struct folio *hugetlb_cma_alloc_frozen_folio(int order, gfp_t gfp_mask,
}
if (hugetlb_cma[nid] && node_isset(nid, *nmask))
- page = cma_alloc_frozen_compound(hugetlb_cma[nid], order);
+ page = cma_alloc_frozen_compound(hugetlb_cma[nid], order, gfp_mask);
if (!page && !(gfp_mask & __GFP_THISNODE)) {
for_each_node_mask(node, *nmask) {
if (node == nid || !hugetlb_cma[node])
continue;
- page = cma_alloc_frozen_compound(hugetlb_cma[node], order);
+ page = cma_alloc_frozen_compound(hugetlb_cma[node], order, gfp_mask);
if (page)
break;
}
--
2.54.0
^ permalink raw reply [flat|nested] 5+ messages in thread