Commit 30fdb6df 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_direct_reclaim()

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

Link: https://lkml.kernel.org/r/20241125210149.2976098-11-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 8e4c8a97

mm/page_alloc.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -3964,7 +3964,6 @@ __alloc_pages_direct_reclaim(gfp_t gfp_mask, unsigned int order,
		drained = true;
		goto retry;
		}
		set_page_refcounted(page);
		out:
		psi_memstall_leave(&pflags);

		@@ -4386,8 +4385,10 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
		/* Try direct reclaim and then allocating */
		page = __alloc_pages_direct_reclaim(gfp_mask, order, alloc_flags, ac,
		&did_some_progress);
		if (page)
		if (page) {
		set_page_refcounted(page);
		goto got_pg;
		}

		/* Try direct compaction and then allocating */
		page = __alloc_pages_direct_compact(gfp_mask, order, alloc_flags, ac,