mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	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>
This commit is contained in:
		
							parent
							
								
									8e4c8a9702
								
							
						
					
					
						commit
						30fdb6df4c
					
				
					 1 changed files with 3 additions and 2 deletions
				
			
		| 
						 | 
					@ -3964,7 +3964,6 @@ __alloc_pages_direct_reclaim(gfp_t gfp_mask, unsigned int order,
 | 
				
			||||||
		drained = true;
 | 
							drained = true;
 | 
				
			||||||
		goto retry;
 | 
							goto retry;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	set_page_refcounted(page);
 | 
					 | 
				
			||||||
out:
 | 
					out:
 | 
				
			||||||
	psi_memstall_leave(&pflags);
 | 
						psi_memstall_leave(&pflags);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4386,8 +4385,10 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
 | 
				
			||||||
	/* Try direct reclaim and then allocating */
 | 
						/* Try direct reclaim and then allocating */
 | 
				
			||||||
	page = __alloc_pages_direct_reclaim(gfp_mask, order, alloc_flags, ac,
 | 
						page = __alloc_pages_direct_reclaim(gfp_mask, order, alloc_flags, ac,
 | 
				
			||||||
							&did_some_progress);
 | 
												&did_some_progress);
 | 
				
			||||||
	if (page)
 | 
						if (page) {
 | 
				
			||||||
 | 
							set_page_refcounted(page);
 | 
				
			||||||
		goto got_pg;
 | 
							goto got_pg;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* Try direct compaction and then allocating */
 | 
						/* Try direct compaction and then allocating */
 | 
				
			||||||
	page = __alloc_pages_direct_compact(gfp_mask, order, alloc_flags, ac,
 | 
						page = __alloc_pages_direct_compact(gfp_mask, order, alloc_flags, ac,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue