The NR_MAX_BATCHED_MIGRATION limit is specific to LRU folio migration, where the batch engine can keep multiple folios locked at once. Move the batching loop out of migrate_pages() into a new migrate_lru_folios(), which feeds __migrate_lru_folios() one batch at a time. This leaves migrate_pages() responsible only for sorting folios by migration class and dispatching each class to its entry point. No functional change intended. Signed-off-by: Shivank Garg --- mm/migrate.c | 57 ++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index bad69e1e2ac4..9a39468797d1 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -2281,6 +2281,45 @@ static int __migrate_lru_folios(struct list_head *from, new_folio_t get_new_foli return rc; } +/* + * Migrate LRU folios. The batch engine keeps every folio of a batch locked + * at once, so feed it at most NR_MAX_BATCHED_MIGRATION pages at a time + * rather than however many the caller supplied. + */ +static int migrate_lru_folios(struct list_head *from, new_folio_t get_new_folio, + free_folio_t put_new_folio, unsigned long private, + enum migrate_mode mode, enum migrate_reason reason, + struct list_head *ret_folios, + struct migrate_pages_stats *stats) +{ + struct folio *folio, *folio2; + int rc, nr_failed = 0; + int nr_pages; + LIST_HEAD(folios); + + while (!list_empty(from)) { + nr_pages = 0; + list_for_each_entry_safe(folio, folio2, from, lru) { + nr_pages += folio_nr_pages(folio); + if (nr_pages >= NR_MAX_BATCHED_MIGRATION) + break; + } + if (nr_pages >= NR_MAX_BATCHED_MIGRATION) + list_cut_before(&folios, from, &folio2->lru); + else + list_splice_init(from, &folios); + + rc = __migrate_lru_folios(&folios, get_new_folio, put_new_folio, + private, mode, reason, ret_folios, stats); + list_splice_tail_init(&folios, ret_folios); + if (rc < 0) + return rc; + nr_failed += rc; + } + + return nr_failed; +} + /* * migrate_pages - migrate the folios specified in a list, to the free folios * supplied as the target for the page migration @@ -2312,9 +2351,7 @@ int migrate_pages(struct list_head *from, new_folio_t get_new_folio, enum migrate_mode mode, enum migrate_reason reason, unsigned int *ret_succeeded) { int rc, rc_gather; - int nr_pages; struct folio *folio, *folio2; - LIST_HEAD(folios); LIST_HEAD(hugetlb_folios); LIST_HEAD(movable_ops_pages); LIST_HEAD(ret_folios); @@ -2346,27 +2383,13 @@ int migrate_pages(struct list_head *from, new_folio_t get_new_folio, } rc_gather += rc; -again: - nr_pages = 0; - list_for_each_entry_safe(folio, folio2, from, lru) { - nr_pages += folio_nr_pages(folio); - if (nr_pages >= NR_MAX_BATCHED_MIGRATION) - break; - } - if (nr_pages >= NR_MAX_BATCHED_MIGRATION) - list_cut_before(&folios, from, &folio2->lru); - else - list_splice_init(from, &folios); - rc = __migrate_lru_folios(&folios, get_new_folio, put_new_folio, + rc = migrate_lru_folios(from, get_new_folio, put_new_folio, private, mode, reason, &ret_folios, &stats); - list_splice_tail_init(&folios, &ret_folios); if (rc < 0) { rc_gather = rc; goto out; } rc_gather += rc; - if (!list_empty(from)) - goto again; out: /* * Put the permanent failure folio back to migration list, they -- 2.53.0