mm-page_alloc-unify-__alloc_frozen_pages_noprof.patch removed from -mm tree
The quilt patch titled
Subject: mm/page_alloc: unify __alloc_frozen_pages[_nolock]_noprof()
has been removed from the -mm tree. Its filename was
mm-page_alloc-unify-__alloc_frozen_pages_noprof.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Brendan Jackman <[email protected]>
Subject: mm/page_alloc: unify __alloc_frozen_pages[_nolock]_noprof()
Date: Fri, 03 Jul 2026 12:31:45 +0000
Currently the core allocator code is controlled by ALLOC_NOLOCK, but the main entry point function is significantly different from the normal __alloc_frozen_pages_nolock(), this is tiring when reading the code.
Plumb the ALLOC_NOLOCK control one layer up in the call stack: create an alloc_flags argument to __alloc_frozen_pages_nolock() (which is only exposed to mm/) and then turn the nolock variant into a thin wrapper that just sets that flag (as well as handling NUMA_NO_NODE, similar to how some of the wrappers in gfp.h do).
For consistency, set ALLOC_WMARK_MIN explicitly in fastpath_alloc_flags for the new ALLOC_NOLOCK path. This was already "done" silently in __alloc_frozen_pages_nolock_noprof(): ALLOC_WMARK_MIN is 0.
Rationale that this doesn't change anything:
1. Simple bits: A bunch of the nolock-specific handling is just moved to the new alloc_order_allowed(), alloc_nolock_allowed() and gfp_nolock.
2. __alloc_frozen_pages_noprof() has some extra logic that wasn't previously in the nolock variant:
a. Application of gfp_allowed_mask; this only affects early boot,
only flags that affect the slowpath get changed here, and the nolock allocation path isn't allowed to the GFP_BOOT_MASK flags.
b. Application of current_gfp_context() - also only affects the
slowpath
3. The slowpath itself: this is now just explicitly skipped under !ALLOC_NOLOCK.
Ulterior motive: adding an alloc_flags arg to the allocator's mm-internal entrypoint can later be used to do more allocation customisation without needing to create new GFP flags.
No functional change intended.
---
mm/hugetlb.c | 3 mm/mempolicy.c | 10 +- mm/page_alloc.c | 186 ++++++++++++++++++++++++---------------------- mm/page_alloc.h | 6 - mm/slub.c | 6 - 5 files changed, 114 insertions(+), 97 deletions(-)
mm/hugetlb.c renamed from mm/hugetlb.c~mm-page_alloc-unify-__alloc_frozen_pages_noprof +2 -1
@@ -1790,7 +1790,8 @@ static struct folio *alloc_buddy_frozen_if (alloc_try_hard) gfp_mask |= __GFP_RETRY_MAYFAIL; - folio = (struct folio *)__alloc_frozen_pages (gfp_mask, order, nid, nmask); + folio = (struct folio *)__alloc_frozen_pages (gfp_mask, order, nid, nmask, +ALLOC_DEFAULT );/* * If we did not specify __GFP_RETRY_MAYFAIL, but still got a
mm/mempolicy.c renamed from mm/mempolicy.c~mm-page_alloc-unify-__alloc_frozen_pages_noprof +6 -4
@@ -2426,9 +2426,11 @@ static struct page *alloc_pages_preferre*/ preferred_gfp = gfp | __GFP_NOWARN; preferred_gfp &= ~(__GFP_DIRECT_RECLAIM | __GFP_NOFAIL); - page =__alloc_frozen_pages_noprof (preferred_gfp, order, nid, nodemask); + page =__alloc_frozen_pages_noprof (preferred_gfp, order, nid, nodemask, +ALLOC_DEFAULT );if (!page) - page =__alloc_frozen_pages_noprof (gfp, order, nid,NULL ); + page =__alloc_frozen_pages_noprof (gfp, order, nid,NULL , +ALLOC_DEFAULT );return page; }
@@ -2476,7 +2478,7 @@ static struct page *alloc_pages_mpol(gfp*/ page =__alloc_frozen_pages_noprof ( gfp | __GFP_THISNODE | __GFP_NORETRY, order, - nid,NULL ); + nid,NULL ,ALLOC_DEFAULT );if (page || !(gfp & __GFP_DIRECT_RECLAIM))return page;/*
@@ -2488,7 +2490,7 @@ static struct page *alloc_pages_mpol(gfp } } - page =__alloc_frozen_pages_noprof (gfp, order, nid, nodemask); + page =__alloc_frozen_pages_noprof (gfp, order, nid, nodemask,ALLOC_DEFAULT );if (unlikely (pol->mode ==MPOL_INTERLEAVE || pol->mode ==MPOL_WEIGHTED_INTERLEAVE ) && page) {
mm/page_alloc.c renamed from mm/page_alloc.c~mm-page_alloc-unify-__alloc_frozen_pages_noprof +98 -88
239 lines not on this page · raw message
mm/page_alloc.h renamed from mm/page_alloc.h~mm-page_alloc-unify-__alloc_frozen_pages_noprof +4 -2
@@ -11,6 +11,7 @@#include <linux/nodemask.h> #include <linux/types.h> +#define ALLOC_DEFAULT 0/* The ALLOC_WMARK bits are used as an index to zone->watermark */ #define ALLOC_WMARK_MIN WMARK_MIN#define ALLOC_WMARK_LOW WMARK_LOW
@@ -219,7 +220,7 @@ extern bool free_pages_prepare(struct paextern int user_min_free_kbytes;struct page *__alloc_frozen_pages_noprof (gfp_t gfp,unsigned int order,int nid, -nodemask_t *nodemask); +nodemask_t *nodemask,unsigned int alloc_flags);#define __alloc_frozen_pages (...) \ alloc_hooks(__alloc_frozen_pages_noprof(__VA_ARGS__))void free_frozen_pages (struct page *page,unsigned int order);
@@ -230,7 +231,8 @@ struct page *alloc_frozen_pages_noprof(g#else static inline struct page *alloc_frozen_pages_noprof (gfp_t gfp,unsigned int order) { -return __alloc_frozen_pages_noprof (gfp, order,numa_node_id (),NULL ); +return __alloc_frozen_pages_noprof (gfp, order,numa_node_id (),NULL , +ALLOC_DEFAULT ); }#endif
mm/slub.c renamed from mm/slub.c~mm-page_alloc-unify-__alloc_frozen_pages_noprof +4 -2
@@ -3264,7 +3264,8 @@ static inline struct slab *alloc_slab_paelse if (node ==NUMA_NO_NODE ) page =alloc_frozen_pages (flags, order);else - page =__alloc_frozen_pages (flags, order, node,NULL ); + page =__alloc_frozen_pages (flags, order, node,NULL , +ALLOC_DEFAULT );if (!page)return NULL ;
@@ -5274,7 +5275,8 @@ static void *___kmalloc_large_node(size_if (node ==NUMA_NO_NODE ) page =alloc_frozen_pages_noprof (flags, order);else - page =__alloc_frozen_pages_noprof (flags, order, node,NULL ); + page =__alloc_frozen_pages_noprof (flags, order, node,NULL , +ALLOC_DEFAULT );if (page) { ptr =page_address (page);
_
Patches currently in -mm which might be from [email protected] are
mm-secretmem-dont-allow-highmem-folios.patch mm-page_alloc-dont-spin_trylock-in-nmi-on-up.patch mm-page_alloc-dont-spin_trylock-when-disallowed-in-free_one_page.patch mm-page_alloc-rename-fpi_trylock-fpi_nolock.patch cgroup-cpuset-update-some-comments-about-the-page-allocator.patch mm-page_alloc-fixup-alloc_pages_nolock_noprof-comment.patch mm-page_alloc-remove-a-couple-of-vm_bug_onst.patch