mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-13 19:04:11 -04:00
mm/page_alloc: move set_page_refcounted() to callers of __alloc_pages_direct_compact()
In preparation for allocating frozen pages, stop initialising the page refcount in __alloc_pages_direct_compact(). Link: https://lkml.kernel.org/r/20241125210149.2976098-10-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>
This commit is contained in:
committed by
Andrew Morton
parent
df544c5eef
commit
8e4c8a9702
@@ -3706,7 +3706,6 @@ __alloc_pages_direct_compact(gfp_t gfp_mask, unsigned int order,
|
||||
if (page) {
|
||||
struct zone *zone = page_zone(page);
|
||||
|
||||
set_page_refcounted(page);
|
||||
zone->compact_blockskip_flush = false;
|
||||
compaction_defer_reset(zone, order, true);
|
||||
count_vm_event(COMPACTSUCCESS);
|
||||
@@ -4308,8 +4307,10 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
|
||||
alloc_flags, ac,
|
||||
INIT_COMPACT_PRIORITY,
|
||||
&compact_result);
|
||||
if (page)
|
||||
if (page) {
|
||||
set_page_refcounted(page);
|
||||
goto got_pg;
|
||||
}
|
||||
|
||||
/*
|
||||
* Checks for costly allocations with __GFP_NORETRY, which
|
||||
@@ -4391,8 +4392,10 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
|
||||
/* Try direct compaction and then allocating */
|
||||
page = __alloc_pages_direct_compact(gfp_mask, order, alloc_flags, ac,
|
||||
compact_priority, &compact_result);
|
||||
if (page)
|
||||
if (page) {
|
||||
set_page_refcounted(page);
|
||||
goto got_pg;
|
||||
}
|
||||
|
||||
/* Do not loop if specifically requested */
|
||||
if (gfp_mask & __GFP_NORETRY)
|
||||
|
||||
Reference in New Issue
Block a user