mm/page_alloc: move set_page_refcounted() to callers of __alloc_pages_cpuset_fallback()

In preparation for allocating frozen pages, stop initialising the page
refcount in __alloc_pages_cpuset_fallback().

Link: https://lkml.kernel.org/r/20241125210149.2976098-8-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Zi Yan <ziy@nvidia.com>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Cc: David Hildenbrand <david@redhat.com>
Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: William Kucharski <william.kucharski@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 2786117a50ee64ad61944cd6eab8764214ef960c..40ffc7f41b73a7fc23d6252f2ae682eede7878bc 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3566,9 +3566,6 @@ __alloc_pages_cpuset_fallback(gfp_t gfp_mask, unsigned int order,
        if (!page)
                page = get_page_from_freelist(gfp_mask, order,
                                alloc_flags, ac);
-
-       if (page)
-               set_page_refcounted(page);
        return page;
 }
 
@@ -3655,6 +3652,8 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
                if (gfp_mask & __GFP_NOFAIL)
                        page = __alloc_pages_cpuset_fallback(gfp_mask, order,
                                        ALLOC_NO_WATERMARKS, ac);
+               if (page)
+                       set_page_refcounted(page);
        }
 out:
        mutex_unlock(&oom_lock);
@@ -4483,8 +4482,10 @@ nopage:
                 * the situation worse.
                 */
                page = __alloc_pages_cpuset_fallback(gfp_mask, order, ALLOC_MIN_RESERVE, ac);
-               if (page)
+               if (page) {
+                       set_page_refcounted(page);
                        goto got_pg;
+               }
 
                cond_resched();
                goto retry;