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 1/8] mm/migrate: extract folio unmap phase
Date: Thu, 19 Nov 2026 07:11:56 +0000 [thread overview]
Message-ID: <20261119-migrate-refactor-shivank-v2-1-f4535bd0bc52@amd.com> (raw)
In-Reply-To: <20261119-migrate-refactor-shivank-v2-0-f4535bd0bc52@amd.com>
migrate_pages_batch() was hard to follow with the unmap retry handling
inline alongside TLB flush, move, and cleanup. Extract the unmap phase
into migrate_folios_unmap(), which fills @unmap_folios and @dst_folios
for the steps that follow. This makes the unmap phase boundaries clear
and the code more readable.
No functional change intended.
Suggested-by: Zi Yan <ziy@nvidia.com>
Signed-off-by: Shivank Garg <shivankg@amd.com>
---
mm/migrate.c | 88 ++++++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 59 insertions(+), 29 deletions(-)
diff --git a/mm/migrate.c b/mm/migrate.c
index a7c94c5fdfd2..3f1639516623 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1833,36 +1833,31 @@ static void migrate_folios_undo(struct list_head *src_folios,
}
/*
- * migrate_pages_batch() first unmaps folios in the from list as many as
- * possible, then move the unmapped folios.
+ * Unmap the folios in @from, queuing successfully unmapped sources on
+ * @unmap_folios and their destinations on @dst_folios. Increment @nr_failed
+ * for each failure.
*
- * We only batch migration if mode == MIGRATE_ASYNC to avoid to wait a
- * lock or bit when we have locked more than one folio. Which may cause
- * deadlock (e.g., for loop device). So, if mode != MIGRATE_ASYNC, the
- * length of the from list must be <= 1.
+ * Return: -ENOMEM if a destination allocation failure stopped the unmap
+ * phase, otherwise 0. Folios already unmapped remain queued for the move
+ * phase.
*/
-static int migrate_pages_batch(struct list_head *from,
+static int migrate_folios_unmap(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 list_head *split_folios,
- struct migrate_pages_stats *stats, int nr_pass)
+ struct list_head *unmap_folios, struct list_head *dst_folios,
+ struct migrate_pages_stats *stats, int nr_pass, int *nr_failed)
{
int retry = 1;
int thp_retry = 1;
- int nr_failed = 0;
int nr_retry_pages = 0;
int pass = 0;
bool is_thp = false;
bool is_large = false;
struct folio *folio, *folio2, *dst = NULL;
- int rc, rc_saved = 0, nr_pages;
- LIST_HEAD(unmap_folios);
- LIST_HEAD(dst_folios);
+ int rc, nr_pages;
bool nosplit = (reason == MR_NUMA_MISPLACED);
- VM_WARN_ON_ONCE(mode != MIGRATE_ASYNC &&
- !list_empty(from) && !list_is_singular(from));
-
for (pass = 0; pass < nr_pass && retry; pass++) {
retry = 0;
thp_retry = 0;
@@ -1902,7 +1897,7 @@ static int migrate_pages_batch(struct list_head *from,
!list_empty(&folio->_deferred_list) &&
folio_test_partially_mapped(folio)) {
if (!try_split_folio(folio, split_folios, mode)) {
- nr_failed++;
+ *nr_failed += 1;
stats->nr_thp_failed += is_thp;
stats->nr_thp_split += is_thp;
stats->nr_split++;
@@ -1921,7 +1916,7 @@ static int migrate_pages_batch(struct list_head *from,
* list is processed.
*/
if (!thp_migration_supported() && is_thp) {
- nr_failed++;
+ *nr_failed += 1;
stats->nr_thp_failed++;
if (!try_split_folio(folio, split_folios, mode)) {
stats->nr_thp_split++;
@@ -1964,7 +1959,7 @@ static int migrate_pages_batch(struct list_head *from,
* When memory is low, don't bother to try to migrate
* other folios, move unmapped folios, then exit.
*/
- nr_failed++;
+ *nr_failed += 1;
stats->nr_thp_failed += is_thp;
/* Large folio NUMA faulting doesn't split to retry. */
if (is_large && !nosplit) {
@@ -1984,7 +1979,7 @@ static int migrate_pages_batch(struct list_head *from,
thp_retry += is_thp;
nr_retry_pages += nr_pages;
/* Undo duplicated failure counting. */
- nr_failed--;
+ *nr_failed -= 1;
stats->nr_thp_failed -= is_thp;
break;
}
@@ -1993,19 +1988,15 @@ static int migrate_pages_batch(struct list_head *from,
stats->nr_failed_pages += nr_pages + nr_retry_pages;
/* nr_failed isn't updated for not used */
stats->nr_thp_failed += thp_retry;
- rc_saved = rc;
- if (list_empty(&unmap_folios))
- goto out;
- else
- goto move;
+ return -ENOMEM;
case -EAGAIN:
retry++;
thp_retry += is_thp;
nr_retry_pages += nr_pages;
break;
case 0:
- list_move_tail(&folio->lru, &unmap_folios);
- list_add_tail(&dst->lru, &dst_folios);
+ list_move_tail(&folio->lru, unmap_folios);
+ list_add_tail(&dst->lru, dst_folios);
break;
default:
/*
@@ -2014,17 +2005,56 @@ static int migrate_pages_batch(struct list_head *from,
* removed from migration folio list and not
* retried in the next outer loop.
*/
- nr_failed++;
+ *nr_failed += 1;
stats->nr_thp_failed += is_thp;
stats->nr_failed_pages += nr_pages;
break;
}
}
}
- nr_failed += retry;
+ *nr_failed += retry;
stats->nr_thp_failed += thp_retry;
stats->nr_failed_pages += nr_retry_pages;
-move:
+
+ return 0;
+}
+
+/*
+ * migrate_pages_batch() first unmaps as many folios in the source list as
+ * possible, flushes the TLBs, then moves the unmapped folios.
+ *
+ * Only MIGRATE_ASYNC may batch multiple folios. Waiting for a lock or bit
+ * while multiple folios are locked may deadlock (e.g. with a loop device).
+ * Therefore, if mode != MIGRATE_ASYNC, the source list must contain at most
+ * one folio.
+ */
+static int migrate_pages_batch(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 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);
+
+ VM_WARN_ON_ONCE(mode != MIGRATE_ASYNC &&
+ !list_empty(from) && !list_is_singular(from));
+
+ rc_saved = migrate_folios_unmap(from, get_new_folio, put_new_folio,
+ private, mode, reason, ret_folios, split_folios,
+ &unmap_folios, &dst_folios, stats, nr_pass,
+ &nr_failed);
+ if (rc_saved && list_empty(&unmap_folios)) {
+ rc = rc_saved;
+ goto out;
+ }
+
/* Flush TLBs for all unmapped folios */
try_to_unmap_flush();
--
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 ` Shivank Garg [this message]
2026-11-19 7:11 ` [PATCH v2 2/8] mm/migrate: handle retries in migrate_folios_move() Shivank Garg
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-1-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®