Commit 29ea0409 authored by SeongJae Park's avatar SeongJae Park Committed by Andrew Morton
Browse files

Revert "mm: rename alloc_demote_folio to alloc_migrate_folio" 

This reverts commit 8f75267d.

Commit 8f75267d ("mm: rename alloc_demote_folio to
alloc_migrate_folio") was to reflect the fact the function is called for
not only demotion, but also general migrations from
DAMOS_MIGRATE_{HOT,COLD}.  The previous commit made the DAMOS actions to
not use alloc_migrate_folio(), though.  So, demote_folio_list() is the
only caller of alloc_migrate_folio(), and the name could now be rather
confusing.  Revert the renaming commit.

Link: https://lkml.kernel.org/r/20250616172346.67659-3-sj@kernel.org


Signed-off-by: default avatarSeongJae Park <sj@kernel.org>
Reviewed-by: default avatarJoshua Hahn <joshua.hahnjy@gmail.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Honggyu Kim <honggyu.kim@sk.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Qi Zheng <zhengqi.arch@bytedance.com>
Cc: Shakeel Butt <shakeel.butt@linux.dev>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent b435415e

mm/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -1226,7 +1226,7 @@ extern unsigned long __must_check vm_mmap_pgoff(struct file *, unsigned long, 
        unsigned long, unsigned long);



extern void set_pageblock_order(void);

struct folio *alloc_migrate_folio(struct folio *src, unsigned long private);

struct folio *alloc_demote_folio(struct folio *src, unsigned long private);

unsigned long reclaim_pages(struct list_head *folio_list);

unsigned int reclaim_clean_pages_from_list(struct zone *zone,

					    struct list_head *folio_list);

mm/vmscan.c

+2 −2
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ static void folio_check_dirty_writeback(struct folio *folio, 
		mapping->a_ops->is_dirty_writeback(folio, dirty, writeback);

}



struct folio *alloc_migrate_folio(struct folio *src, unsigned long private)

struct folio *alloc_demote_folio(struct folio *src, unsigned long private)

{

	struct folio *dst;

	nodemask_t *allowed_mask;
@@ -1069,7 +1069,7 @@ static unsigned int demote_folio_list(struct list_head *demote_folios, 
	node_get_allowed_targets(pgdat, &allowed_mask);



	/* Demotion ignores all cpuset and mempolicy settings */

	migrate_pages(demote_folios, alloc_migrate_folio, NULL,

	migrate_pages(demote_folios, alloc_demote_folio, NULL,

		      (unsigned long)&mtc, MIGRATE_ASYNC, MR_DEMOTION,

		      &nr_succeeded);