From: Shivank Garg <shivankg@amd.com>
To: Andrew Morton <akpm@linux-foundation.org>,
David Hildenbrand <david@kernel.org>, Zi Yan <ziy@nvidia.com>,
Matthew Brost <matthew.brost@intel.com>,
Joshua Hahn <joshua.hahnjy@gmail.com>,
"Byungchul Park" <byungchul@sk.com>,
Gregory Price <gourry@gourry.net>,
Ying Huang <ying.huang@linux.alibaba.com>,
Alistair Popple <apopple@nvidia.com>,
"Lorenzo Stoakes" <ljs@kernel.org>,
Muchun Song <muchun.song@linux.dev>,
Oscar Salvador <osalvador@suse.de>,
Yiannis Nikolakopoulos <yiannis@zptcorp.com>,
"Bharata B Rao" <bharata@amd.com>,
David Rientjes <rientjes@google.com>,
Huan Nguyen <nhuhuan@google.com>,
Baolin Wang <baolin.wang@linux.alibaba.com>,
"Matthew Wilcox" <willy@infradead.org>,
Hugh Dickins <hughd@google.com>,
"Vlastimil Babka" <vbabka@kernel.org>
Cc: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
Shivank Garg <shivankg@amd.com>
Subject: [PATCH v2 2/8] mm/migrate: handle retries in migrate_folios_move()
Date: Thu, 19 Nov 2026 07:11:57 +0000 [thread overview]
Message-ID: <20261119-migrate-refactor-shivank-v2-2-f4535bd0bc52@amd.com> (raw)
In-Reply-To: <20261119-migrate-refactor-shivank-v2-0-f4535bd0bc52@amd.com>
After extracting the unmap phase, migrate_pages_batch() still drives the
retry loop for the move phase and passes its retry bookkeeping to
migrate_folios_move(). This splits the move phase across the two
functions and requires several output parameters.
Move the retry loop and its bookkeeping into migrate_folios_move().
The function now takes the number of passes and reports failures through
@nr_failed, matching migrate_folios_unmap().
No functional change is intended.
Signed-off-by: Shivank Garg <shivankg@amd.com>
---
mm/migrate.c | 109 +++++++++++++++++++++++++++++------------------------------
1 file changed, 54 insertions(+), 55 deletions(-)
diff --git a/mm/migrate.c b/mm/migrate.c
index 3f1639516623..1f4ddd23cea1 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1757,56 +1757,71 @@ static int migrate_hugetlbs(struct list_head *from, new_folio_t get_new_folio,
return nr_failed;
}
+/*
+ * Move each folio on @src_folios to its destination on @dst_folios, retrying
+ * folios that return -EAGAIN for up to @nr_pass passes. Pending folios stay on
+ * @src_folios for migrate_folios_undo().
+ */
static void migrate_folios_move(struct list_head *src_folios,
struct list_head *dst_folios,
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,
- int *retry, int *thp_retry, int *nr_failed,
- int *nr_retry_pages)
+ struct migrate_pages_stats *stats, int nr_pass,
+ int *nr_failed)
{
struct folio *folio, *folio2, *dst, *dst2;
+ int retry = 1;
+ int thp_retry = 0;
+ int nr_retry_pages = 0;
bool is_thp;
int nr_pages;
- int rc;
+ int pass, rc;
- dst = list_first_entry(dst_folios, struct folio, lru);
- dst2 = list_next_entry(dst, lru);
- list_for_each_entry_safe(folio, folio2, src_folios, lru) {
- is_thp = folio_test_large(folio) && folio_test_pmd_mappable(folio);
- nr_pages = folio_nr_pages(folio);
+ for (pass = 0; pass < nr_pass && retry; pass++) {
+ retry = 0;
+ thp_retry = 0;
+ nr_retry_pages = 0;
- cond_resched();
+ dst = list_first_entry(dst_folios, struct folio, lru);
+ dst2 = list_next_entry(dst, lru);
+ list_for_each_entry_safe(folio, folio2, src_folios, lru) {
+ is_thp = folio_test_large(folio) && folio_test_pmd_mappable(folio);
+ nr_pages = folio_nr_pages(folio);
- rc = migrate_folio_move(put_new_folio, private,
- folio, dst, mode,
- reason, ret_folios);
- /*
- * The rules are:
- * 0: folio will be freed
- * -EAGAIN: stay on the src_folios list
- * Other errno: put on ret_folios list
- */
- switch (rc) {
- case -EAGAIN:
- *retry += 1;
- *thp_retry += is_thp;
- *nr_retry_pages += nr_pages;
- break;
- case 0:
- stats->nr_succeeded += nr_pages;
- stats->nr_thp_succeeded += is_thp;
- break;
- default:
- *nr_failed += 1;
- stats->nr_thp_failed += is_thp;
- stats->nr_failed_pages += nr_pages;
- break;
+ cond_resched();
+
+ rc = migrate_folio_move(put_new_folio, private,
+ folio, dst, mode, reason, ret_folios);
+ /*
+ * The rules are:
+ * 0: folio will be freed
+ * -EAGAIN: stay on the src_folios list
+ * Other errno: put on ret_folios list
+ */
+ switch (rc) {
+ case -EAGAIN:
+ retry++;
+ thp_retry += is_thp;
+ nr_retry_pages += nr_pages;
+ break;
+ case 0:
+ stats->nr_succeeded += nr_pages;
+ stats->nr_thp_succeeded += is_thp;
+ break;
+ default:
+ *nr_failed += 1;
+ stats->nr_thp_failed += is_thp;
+ stats->nr_failed_pages += nr_pages;
+ break;
+ }
+ dst = dst2;
+ dst2 = list_next_entry(dst, lru);
}
- dst = dst2;
- dst2 = list_next_entry(dst, lru);
}
+ *nr_failed += retry;
+ stats->nr_thp_failed += thp_retry;
+ stats->nr_failed_pages += nr_retry_pages;
}
static void migrate_folios_undo(struct list_head *src_folios,
@@ -2034,11 +2049,7 @@ static int migrate_pages_batch(struct list_head *from,
struct list_head *ret_folios, struct list_head *split_folios,
struct migrate_pages_stats *stats, int nr_pass)
{
- int retry = 1;
- int thp_retry = 1;
int nr_failed = 0;
- int nr_retry_pages = 0;
- int pass = 0;
int rc, rc_saved;
LIST_HEAD(unmap_folios);
LIST_HEAD(dst_folios);
@@ -2058,21 +2069,9 @@ static int migrate_pages_batch(struct list_head *from,
/* Flush TLBs for all unmapped folios */
try_to_unmap_flush();
- retry = 1;
- for (pass = 0; pass < nr_pass && retry; pass++) {
- retry = 0;
- thp_retry = 0;
- nr_retry_pages = 0;
-
- /* Move the unmapped folios */
- migrate_folios_move(&unmap_folios, &dst_folios,
- put_new_folio, private, mode, reason,
- ret_folios, stats, &retry, &thp_retry,
- &nr_failed, &nr_retry_pages);
- }
- nr_failed += retry;
- stats->nr_thp_failed += thp_retry;
- stats->nr_failed_pages += nr_retry_pages;
+ /* Move the unmapped folios */
+ migrate_folios_move(&unmap_folios, &dst_folios, put_new_folio, private,
+ mode, reason, ret_folios, stats, nr_pass, &nr_failed);
rc = rc_saved ? : nr_failed;
out:
--
2.53.0
next prev parent reply other threads:[~2026-11-19 7:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 7:11 [PATCH v2 0/8] mm/migrate: separate hugetlb, movable_ops and LRU migration paths Shivank Garg
2026-11-19 7:11 ` [PATCH v2 1/8] mm/migrate: extract folio unmap phase Shivank Garg
2026-11-19 7:11 ` Shivank Garg [this message]
2026-11-19 7:11 ` [PATCH v2 3/8] mm/migrate: factor out folio splitting on allocation failure Shivank Garg
2026-11-19 7:11 ` [PATCH v2 4/8] mm/migrate: use a dedicated list for hugetlb folios Shivank Garg
2026-11-19 7:12 ` [PATCH v2 5/8] mm/migrate: add a dedicated movable_ops migration pass Shivank Garg
2026-11-19 7:12 ` [PATCH v2 6/8] mm/migrate: rename migrate_pages_batch() to migrate_folios_batch() Shivank Garg
2026-11-19 7:12 ` [PATCH v2 7/8] mm/migrate: fold the LRU batch paths into __migrate_lru_folios() Shivank Garg
2026-11-19 7:12 ` [PATCH v2 8/8] mm/migrate: add migrate_lru_folios() entry point Shivank Garg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261119-migrate-refactor-shivank-v2-2-f4535bd0bc52@amd.com \
--to=shivankg@amd.com \
--cc=akpm@linux-foundation.org \
--cc=apopple@nvidia.com \
--cc=baolin.wang@linux.alibaba.com \
--cc=bharata@amd.com \
--cc=byungchul@sk.com \
--cc=david@kernel.org \
--cc=gourry@gourry.net \
--cc=hughd@google.com \
--cc=joshua.hahnjy@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=ljs@kernel.org \
--cc=matthew.brost@intel.com \
--cc=muchun.song@linux.dev \
--cc=nhuhuan@google.com \
--cc=osalvador@suse.de \
--cc=rientjes@google.com \
--cc=vbabka@kernel.org \
--cc=willy@infradead.org \
--cc=yiannis@zptcorp.com \
--cc=ying.huang@linux.alibaba.com \
--cc=ziy@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®