The patch titled
Subject: mm/page_alloc: move set_page_refcounted() to callers of __alloc_pages_slowpath()
has been added to the -mm mm-unstable branch. Its filename is
mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_slowpath.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_slowpath.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx>
Subject: mm/page_alloc: move set_page_refcounted() to callers of __alloc_pages_slowpath()
Date: Mon, 25 Nov 2024 21:01:43 +0000
In preparation for allocating frozen pages, stop initialising the page
refcount in __alloc_pages_slowpath().
Link: https://lkml.kernel.org/r/20241125210149.2976098-12-willy@xxxxxxxxxxxxx
Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: Hyeonggon Yoo <42.hyeyoo@xxxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxxx>
Cc: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Cc: Muchun Song <songmuchun@xxxxxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Cc: William Kucharski <william.kucharski@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 30 +++++++++---------------------
1 file changed, 9 insertions(+), 21 deletions(-)
--- a/mm/page_alloc.c~mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_slowpath
+++ a/mm/page_alloc.c
@@ -4282,10 +4282,8 @@ restart:
* that first
*/
page = get_page_from_freelist(gfp_mask, order, alloc_flags, ac);
- if (page) {
- set_page_refcounted(page);
+ if (page)
goto got_pg;
- }
/*
* For costly allocations, try direct compaction first, as it's likely
@@ -4304,10 +4302,8 @@ restart:
alloc_flags, ac,
INIT_COMPACT_PRIORITY,
&compact_result);
- if (page) {
- set_page_refcounted(page);
+ if (page)
goto got_pg;
- }
/*
* Checks for costly allocations with __GFP_NORETRY, which
@@ -4367,10 +4363,8 @@ retry:
/* Attempt with potentially adjusted zonelist and alloc_flags */
page = get_page_from_freelist(gfp_mask, order, alloc_flags, ac);
- if (page) {
- set_page_refcounted(page);
+ if (page)
goto got_pg;
- }
/* Caller is not willing to reclaim, we can't balance anything */
if (!can_direct_reclaim)
@@ -4383,18 +4377,14 @@ retry:
/* Try direct reclaim and then allocating */
page = __alloc_pages_direct_reclaim(gfp_mask, order, alloc_flags, ac,
&did_some_progress);
- if (page) {
- set_page_refcounted(page);
+ if (page)
goto got_pg;
- }
/* Try direct compaction and then allocating */
page = __alloc_pages_direct_compact(gfp_mask, order, alloc_flags, ac,
compact_priority, &compact_result);
- if (page) {
- set_page_refcounted(page);
+ if (page)
goto got_pg;
- }
/* Do not loop if specifically requested */
if (gfp_mask & __GFP_NORETRY)
@@ -4435,10 +4425,8 @@ retry:
/* Reclaim has failed us, start killing things */
page = __alloc_pages_may_oom(gfp_mask, order, ac, &did_some_progress);
- if (page) {
- set_page_refcounted(page);
+ if (page)
goto got_pg;
- }
/* Avoid allocations with no watermarks from looping endlessly */
if (tsk_is_oom_victim(current) &&
@@ -4482,10 +4470,8 @@ nopage:
* the situation worse.
*/
page = __alloc_pages_cpuset_fallback(gfp_mask, order, ALLOC_MIN_RESERVE, ac);
- if (page) {
- set_page_refcounted(page);
+ if (page)
goto got_pg;
- }
cond_resched();
goto retry;
@@ -4777,6 +4763,8 @@ struct page *__alloc_pages_noprof(gfp_t
ac.nodemask = nodemask;
page = __alloc_pages_slowpath(alloc_gfp, order, &ac);
+ if (page)
+ set_page_refcounted(page);
out:
if (memcg_kmem_online() && (gfp & __GFP_ACCOUNT) && page &&
_
Patches currently in -mm which might be from willy@xxxxxxxxxxxxx are
mm-page_alloc-cache-page_zone-result-in-free_unref_page.patch
mm-make-alloc_pages_mpol-static.patch
mm-page_alloc-export-free_frozen_pages-instead-of-free_unref_page.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-post_alloc_hook.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-prep_new_page.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-get_page_from_freelist.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_cpuset_fallback.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_may_oom.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_direct_compact.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_direct_reclaim.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_slowpath.patch
mm-page_alloc-move-set_page_refcounted-to-end-of-__alloc_pages.patch
mm-page_alloc-add-__alloc_frozen_pages.patch
mm-mempolicy-add-alloc_frozen_pages.patch
slab-allocate-frozen-pages.patch
