Commit 4c9017cc authored Nov 25, 2024 by Matthew Wilcox (Oracle) Committed by Andrew Morton Jan 13, 2025

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>

parent efabfe14

mm/page_alloc.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -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 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
		* 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;