mm-page_alloc-rename-alloc_trylock-alloc_nolock.patch removed from -mm tree
The quilt patch titled
Subject: mm/page_alloc: rename ALLOC_TRYLOCK -> ALLOC_NOLOCK
has been removed from the -mm tree. Its filename was
mm-page_alloc-rename-alloc_trylock-alloc_nolock.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: rename ALLOC_TRYLOCK -> ALLOC_NOLOCK
Date: Fri, 03 Jul 2026 12:31:41 +0000
Patch series "mm: Some cleanups for page allocator APIs", v5.
Some tweaks and cleanups for page allocator entrypoint and flags. This is motivated by preparation for __GFP_UNMAPPED [1] (which will probably become ALLOC_UNMAPPED in its next iteration), but all this is supposed to be an improvement to the codebase in its own right: unifying code paths, reducing API surface, and removing GFP flags.
This started with unifying __alloc_frozen_pages[_nolock]_noprof() and expanded from there.
Unifying the nolock allocator entrypoint with the normal allocator entrypoint means adding an alloc_flags argument to the later (only exposed within mm/). This presents an opportunity to take advantage of that arg to remove some GFP flags, if we add that alloc_flags arg a bit more broadly to allocator entrypoints.
To distinguish between mm-internal and "public" allocator entrypoints, it makes sense to use the __ prefix. There are already some public APIs with that prefix. For *alloc_pages*, just removing those variants seems like a nice cleanup anyway, so do that. For get_free_pages, the "__" variant is the _only_ variant and it's very widely used, so it doesn't seem worthwhile to modify that. Therefore, scope this "__" change specifically to the *alloc_pages* API, which means we leave the *folio_alloc* API untouched too, even though that could probably be cleaned up if so desired.
This patch (of 18):
It's confusing that the function is called "nolock" but the flag is called "trylock", align them.
The function's terminology is more visible and has more mindshare so use that.
---
mm/internal.h | 2 +- mm/page_alloc.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
mm/internal.h renamed from mm/internal.h~mm-page_alloc-rename-alloc_trylock-alloc_nolock +1 -1
@@ -1480,7 +1480,7 @@ unsigned int reclaim_clean_pages_from_li#define ALLOC_NOFRAGMENT 0x0#endif #define ALLOC_HIGHATOMIC 0x200/* Allows access to MIGRATE_HIGHATOMIC */ -#define ALLOC_TRYLOCK 0x400/* Only use spin_trylock in allocation path */ +#define ALLOC_NOLOCK 0x400/* Only use spin_trylock in allocation path */ #define ALLOC_KSWAPD 0x800/* allow waking of kswapd, __GFP_KSWAPD_RECLAIM set */ /* Flags that allow allocations below the min watermark. */
mm/page_alloc.c renamed from mm/page_alloc.c~mm-page_alloc-rename-alloc_trylock-alloc_nolock +5 -5
@@ -2530,7 +2530,7 @@ static int rmqueue_bulk(struct zone *zonunsigned long flags;int i; -if (unlikely (alloc_flags &ALLOC_TRYLOCK )) { +if (unlikely (alloc_flags &ALLOC_NOLOCK )) {if (!spin_trylock_irqsave (&zone->lock, flags))return 0 ; }else {
@@ -3218,7 +3218,7 @@ struct page *rmqueue_buddy(struct zone * do { page = NULL; - if (unlikely(alloc_flags & ALLOC_TRYLOCK)) { + if (unlikely(alloc_flags & ALLOC_NOLOCK)) { if (!spin_trylock_irqsave(&zone->lock, flags)) return NULL; } else {
@@ -5059,7 +5059,7 @@ static inline bool prepare_alloc_pages(g* Don't invoke should_fail logic, since it may call * get_random_u32() and printk() which need to spin_lock. */ -if (!(*alloc_flags &ALLOC_TRYLOCK ) && +if (!(*alloc_flags &ALLOC_NOLOCK ) &&should_fail_alloc_page (gfp_mask, order))return false;
@@ -7804,7 +7804,7 @@ static bool cond_accept_memory(struct zoreturn false;/* Bailout, since try_to_accept_memory_one() needs to take a lock */ -if (alloc_flags &ALLOC_TRYLOCK ) +if (alloc_flags &ALLOC_NOLOCK )return false; wmark =promo_wmark_pages (zone);
@@ -7896,7 +7896,7 @@ struct page *alloc_frozen_pages_nolock_n*/ gfp_t alloc_gfp = __GFP_NOWARN | __GFP_ZERO | __GFP_NOMEMALLOC | __GFP_COMP | gfp_flags; -unsigned int alloc_flags =ALLOC_TRYLOCK ; +unsigned int alloc_flags =ALLOC_NOLOCK ;struct alloc_context ac = { };struct page *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