Commit df544c5e authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

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

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

Link: https://lkml.kernel.org/r/20241125210149.2976098-9-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarZi Yan <ziy@nvidia.com>
Reviewed-by: default avatarVlastimil 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 4c9017cc

mm/page_alloc.c

+4 −6
Original line number Diff line number Diff line
@@ -3604,10 +3604,8 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order, 
	page = get_page_from_freelist((gfp_mask | __GFP_HARDWALL) &

				      ~__GFP_DIRECT_RECLAIM, order,

				      ALLOC_WMARK_HIGH|ALLOC_CPUSET, ac);

	if (page) {

		set_page_refcounted(page);

	if (page)

		goto out;

	}



	/* Coredumps can quickly deplete all memory reserves */

	if (current->flags & PF_DUMPCORE)
@@ -3652,8 +3650,6 @@ __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);
@@ -4437,8 +4433,10 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, 


	/* Reclaim has failed us, start killing things */

	page = __alloc_pages_may_oom(gfp_mask, order, ac, &did_some_progress);

	if (page)

	if (page) {

		set_page_refcounted(page);

		goto got_pg;

	}



	/* Avoid allocations with no watermarks from looping endlessly */

	if (tsk_is_oom_victim(current) &&