mm-replace-__gfp_no_codetag-with-alloc_no_codetag.patch removed from -mm tree
The quilt patch titled
Subject: mm: replace __GFP_NO_CODETAG with ALLOC_NO_CODETAG
has been removed from the -mm tree. Its filename was
mm-replace-__gfp_no_codetag-with-alloc_no_codetag.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: replace __GFP_NO_CODETAG with ALLOC_NO_CODETAG
Date: Fri, 03 Jul 2026 12:31:55 +0000
Now that alloc_pages has an entrypoint that allows passing alloc_flags, we can take advantage of this to start removing GFP flags that are only used for mm-internal stuff.
This requires also plumbing the alloc_flags into some more of the allocator code, in particular __alloc_pages[_noprof]() gets an alloc_flags arg to go along with its callees, and we now need to pass those flags deeper into the allocator so they can reach the alloc_tag code.
While moving the flag definition into page_alloc.h, also update the comment per Hao's suggestion.
No functional change intended.
---
include/linux/alloc_tag.h | 4 +- mm/alloc_tag.c | 23 ++++----------- mm/compaction.c | 4 +- mm/page_alloc.c | 52 ++++++++++++++++++++---------------- mm/page_alloc.h | 14 ++++++++- mm/page_frag_cache.c | 4 +- 6 files changed, 55 insertions(+), 46 deletions(-)
include/linux/alloc_tag.h renamed from include/linux/alloc_tag.h~mm-replace-__gfp_no_codetag-with-alloc_no_codetag +2 -2
@@ -165,11 +165,11 @@ static inline void alloc_tag_sub_check(u {WARN_ONCE (ref && !ref->ct,"alloc_tag was not set\n" ); } -void alloc_tag_add_early_pfn (unsigned long pfn,gfp_t gfp_flags); +void alloc_tag_add_early_pfn (unsigned long pfn,unsigned int alloc_flags);#else static inline void alloc_tag_add_check (union codetag_ref *ref,struct alloc_tag *tag) {}static inline void alloc_tag_sub_check (union codetag_ref *ref) {} -static inline void alloc_tag_add_early_pfn (unsigned long pfn,gfp_t gfp_flags) {} +static inline void alloc_tag_add_early_pfn (unsigned long pfn,unsigned int alloc_flags) {}#endif /* Caller should verify both ref and tag to be valid */
mm/alloc_tag.c renamed from mm/alloc_tag.c~mm-replace-__gfp_no_codetag-with-alloc_no_codetag +7 -16
@@ -15,6 +15,9 @@#include <linux/vmalloc.h> #include <linux/kmemleak.h> +#include "internal.h" +#include "page_alloc.h" +#define ALLOCINFO_FILE_NAME "allocinfo"#define MODULE_ALLOC_TAG_VMAP_SIZE (100000UL * sizeof(struct alloc_tag))#define SECTION_START (NAME ) (CODETAG_SECTION_START_PREFIX NAME)
@@ -792,19 +795,6 @@ struct pfn_pool {#define PFN_POOL_SIZE ((PAGE_SIZE - offsetof(struct pfn_pool, pfns)) / \ sizeof(unsigned long)) - -/* -* Skip early PFN recording for a page allocation. Reuses the -* %__GFP_NO_OBJ_EXT bit. Used by __alloc_tag_add_early_pfn() to avoid -* recursion when allocating pages for the early PFN tracking list -* itself. -* -* Codetags of the pages allocated with __GFP_NO_CODETAG should be -* cleared (via clear_page_tag_ref()) before freeing the pages to prevent -* alloc_tag_sub_check() from triggering a warning. -*/ -#define __GFP_NO_CODETAG __GFP_NO_OBJ_EXT -static struct pfn_pool *current_pfn_pool__initdata ;static void __init __alloc_tag_add_early_pfn (unsigned long pfn)
@@ -815,7 +805,8 @@ static void __init __alloc_tag_add_early do { pool = READ_ONCE(current_pfn_pool); if (!pool || atomic_read(&pool->count) >= PFN_POOL_SIZE) { - struct page *new_page = alloc_page(__GFP_HIGH | __GFP_NO_CODETAG); + struct page *new_page = __alloc_pages(__GFP_HIGH, 0, numa_mem_id(), + NULL, ALLOC_NO_CODETAG); struct pfn_pool *new; if (!new_page) {
@@ -846,7 +837,7 @@ typedef void alloc_tag_add_func(unsignedstatic alloc_tag_add_func __rcu *alloc_tag_add_early_pfn_ptr__refdata =RCU_INITIALIZER (__alloc_tag_add_early_pfn); -void alloc_tag_add_early_pfn (unsigned long pfn,gfp_t gfp_flags) +void alloc_tag_add_early_pfn (unsigned long pfn,unsigned int alloc_flags) {alloc_tag_add_func *alloc_tag_add;
@@ -854,7 +845,7 @@ void alloc_tag_add_early_pfn(unsigned loreturn ;/* Skip allocations for the tracking list itself to avoid recursion. */ -if (gfp_flags & __GFP_NO_CODETAG) +if (alloc_flags &ALLOC_NO_CODETAG )return ;rcu_read_lock ();
mm/compaction.c renamed from mm/compaction.c~mm-replace-__gfp_no_codetag-with-alloc_no_codetag +2 -2
@@ -83,7 +83,7 @@ static inline bool is_via_compact_memorystatic struct page *mark_allocated_noprof (struct page *page,unsigned int order,gfp_t gfp_flags) { -post_alloc_hook (page, order, __GFP_MOVABLE); +post_alloc_hook (page, order, __GFP_MOVABLE,ALLOC_DEFAULT );set_page_refcounted (page);return page; }
@@ -1851,7 +1851,7 @@ again: } dst = (struct folio *)freepage; -post_alloc_hook (&dst->page, order, __GFP_MOVABLE); +post_alloc_hook (&dst->page, order, __GFP_MOVABLE,ALLOC_DEFAULT );set_page_refcounted (&dst->page);if (order)prep_compound_page (&dst->page, order);
mm/page_alloc.c renamed from mm/page_alloc.c~mm-replace-__gfp_no_codetag-with-alloc_no_codetag +30 -22
181 lines not on this page · raw message
mm/page_alloc.h renamed from mm/page_alloc.h~mm-replace-__gfp_no_codetag-with-alloc_no_codetag +12 -2
@@ -49,6 +49,13 @@#define ALLOC_HIGHATOMIC 0x200/* Allows access to MIGRATE_HIGHATOMIC */ #define ALLOC_NOLOCK 0x400/* Only use spin_trylock in allocation path */ #define ALLOC_KSWAPD 0x800/* allow waking of kswapd, __GFP_KSWAPD_RECLAIM set */ +/* +* Avoid alloc_tag recursion for internal allocations. +* +* Callers must clear_page_tag_ref() before freeing to avoid warnings from +* alloc_tag_sub_check(). +*/ +#define ALLOC_NO_CODETAG 0x1000/* Flags that allow allocations below the min watermark. */ #define ALLOC_RESERVES (ALLOC_NON_BLOCK|ALLOC_MIN_RESERVE|ALLOC_HIGHATOMIC|ALLOC_OOM)
@@ -84,6 +91,8 @@ struct alloc_context {*/ enum zone_type highest_zoneidx;bool spread_dirty_pages; +/* Only flags that are global to the whole allocation go here. */ +unsigned int alloc_flags; };/*
@@ -214,7 +223,8 @@ static inline struct page *pageblock_pfnextern void __free_pages_core (struct page *page,unsigned int order,enum meminit_context context); -void post_alloc_hook (struct page *page,unsigned int order,gfp_t gfp_flags); +void post_alloc_hook (struct page *page,unsigned int order,gfp_t gfp_flags, +unsigned int alloc_flags);extern bool free_pages_prepare (struct page *page,unsigned int order);extern int user_min_free_kbytes;
@@ -245,7 +255,7 @@ struct page *alloc_frozen_pages_nolock_nvoid free_frozen_pages_nolock (struct page *page,unsigned int order);struct page *__alloc_pages_noprof (gfp_t gfp,unsigned int order,int preferred_nid, -nodemask_t *nodemask); +nodemask_t *nodemask,unsigned int alloc_flags);#define __alloc_pages (...) alloc_hooks(__alloc_pages_noprof(__VA_ARGS__))extern void zone_pcp_reset (struct zone *zone);
mm/page_frag_cache.c renamed from mm/page_frag_cache.c~mm-replace-__gfp_no_codetag-with-alloc_no_codetag +2 -2
@@ -57,10 +57,10 @@ static struct page *__page_frag_cache_re gfp_mask = (gfp_mask & ~__GFP_DIRECT_RECLAIM) | __GFP_COMP | __GFP_NOWARN | __GFP_NORETRY | __GFP_NOMEMALLOC; page =__alloc_pages (gfp_mask,PAGE_FRAG_CACHE_MAX_ORDER , -numa_mem_id (),NULL ); +numa_mem_id (),NULL ,ALLOC_DEFAULT );#endif if (unlikely (!page)) { - page =__alloc_pages (gfp,0 ,numa_mem_id (),NULL ); + page =__alloc_pages (gfp,0 ,numa_mem_id (),NULL ,ALLOC_DEFAULT ); order =0 ; }
_
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