superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
pull/1134/merge
Matthew Wilcox (Oracle) 2024-11-25 21:01:39 +00:00 committed by Andrew Morton
parent efabfe1420
commit 4c9017cc4c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mm/page_alloc.c
View File

@ -3566,9 +3566,6 @@ __alloc_pages_cpuset_fallback(gfp_t gfp_mask, unsigned int order,
if (!page) if (!page)
page = get_page_from_freelist(gfp_mask, order, page = get_page_from_freelist(gfp_mask, order,
alloc_flags, ac); alloc_flags, ac);
if (page)
set_page_refcounted(page);
return page; return page;
} }
@ -3655,6 +3652,8 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
if (gfp_mask & __GFP_NOFAIL) if (gfp_mask & __GFP_NOFAIL)
page = __alloc_pages_cpuset_fallback(gfp_mask, order, page = __alloc_pages_cpuset_fallback(gfp_mask, order,
ALLOC_NO_WATERMARKS, ac); ALLOC_NO_WATERMARKS, ac);
if (page)
set_page_refcounted(page);
} }
out: out:
mutex_unlock(&oom_lock); mutex_unlock(&oom_lock);
@ -4483,8 +4482,10 @@ nopage:
* the situation worse. * the situation worse.
*/ */
page = __alloc_pages_cpuset_fallback(gfp_mask, order, ALLOC_MIN_RESERVE, ac); page = __alloc_pages_cpuset_fallback(gfp_mask, order, ALLOC_MIN_RESERVE, ac);
if (page) if (page) {
set_page_refcounted(page);
goto got_pg; goto got_pg;
}
cond_resched(); cond_resched();
goto retry; goto retry;