The quilt patch titled
Subject: mm/page_alloc: move set_page_refcounted() to callers of get_page_from_freelist()
has been removed from the -mm tree. Its filename was
mm-page_alloc-move-set_page_refcounted-to-callers-of-get_page_from_freelist.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: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx>
Subject: mm/page_alloc: move set_page_refcounted() to callers of get_page_from_freelist()
Date: Mon, 25 Nov 2024 21:01:38 +0000
In preparation for allocating frozen pages, stop initialising the page
refcount in get_page_from_freelist().
Link: https://lkml.kernel.org/r/20241125210149.2976098-7-willy@xxxxxxxxxxxxx
Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Reviewed-by: Zi Yan <ziy@xxxxxxxxxx>
Reviewed-by: Vlastimil Babka <vbabka@xxxxxxx>
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: Hyeonggon Yoo <42.hyeyoo@xxxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Cc: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Cc: Muchun Song <songmuchun@xxxxxxxxxxxxx>
Cc: William Kucharski <william.kucharski@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
--- a/mm/page_alloc.c~mm-page_alloc-move-set_page_refcounted-to-callers-of-get_page_from_freelist
+++ a/mm/page_alloc.c
@@ -3473,7 +3473,6 @@ try_this_zone:
gfp_mask, alloc_flags, ac->migratetype);
if (page) {
prep_new_page(page, order, gfp_mask, alloc_flags);
- set_page_refcounted(page);
/*
* If this is a high-order atomic allocation then check
@@ -3568,6 +3567,8 @@ __alloc_pages_cpuset_fallback(gfp_t gfp_
page = get_page_from_freelist(gfp_mask, order,
alloc_flags, ac);
+ if (page)
+ set_page_refcounted(page);
return page;
}
@@ -3606,8 +3607,10 @@ __alloc_pages_may_oom(gfp_t gfp_mask, un
page = get_page_from_freelist((gfp_mask | __GFP_HARDWALL) &
~__GFP_DIRECT_RECLAIM, order,
ALLOC_WMARK_HIGH|ALLOC_CPUSET, ac);
- if (page)
+ if (page) {
+ set_page_refcounted(page);
goto out;
+ }
/* Coredumps can quickly deplete all memory reserves */
if (current->flags & PF_DUMPCORE)
@@ -3698,10 +3701,8 @@ __alloc_pages_direct_compact(gfp_t gfp_m
count_vm_event(COMPACTSTALL);
/* Prep a captured page if available */
- if (page) {
+ if (page)
prep_new_page(page, order, gfp_mask, alloc_flags);
- set_page_refcounted(page);
- }
/* Try get a page from the freelist if available */
if (!page)
@@ -3710,6 +3711,7 @@ __alloc_pages_direct_compact(gfp_t gfp_m
if (page) {
struct zone *zone = page_zone(page);
+ set_page_refcounted(page);
zone->compact_blockskip_flush = false;
compaction_defer_reset(zone, order, true);
count_vm_event(COMPACTSUCCESS);
@@ -3968,6 +3970,7 @@ retry:
drained = true;
goto retry;
}
+ set_page_refcounted(page);
out:
psi_memstall_leave(&pflags);
@@ -4288,8 +4291,10 @@ restart:
* that first
*/
page = get_page_from_freelist(gfp_mask, order, alloc_flags, ac);
- if (page)
+ if (page) {
+ set_page_refcounted(page);
goto got_pg;
+ }
/*
* For costly allocations, try direct compaction first, as it's likely
@@ -4369,8 +4374,10 @@ retry:
/* Attempt with potentially adjusted zonelist and alloc_flags */
page = get_page_from_freelist(gfp_mask, order, alloc_flags, ac);
- if (page)
+ if (page) {
+ set_page_refcounted(page);
goto got_pg;
+ }
/* Caller is not willing to reclaim, we can't balance anything */
if (!can_direct_reclaim)
@@ -4754,8 +4761,10 @@ struct page *__alloc_pages_noprof(gfp_t
/* First allocation attempt */
page = get_page_from_freelist(alloc_gfp, order, alloc_flags, &ac);
- if (likely(page))
+ if (likely(page)) {
+ set_page_refcounted(page);
goto out;
+ }
alloc_gfp = gfp;
ac.spread_dirty_pages = false;
_
Patches currently in -mm which might be from willy@xxxxxxxxxxxxx are
mm-remove-pagetranstail.patch
