mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 4/8] mm/migrate: use a dedicated list for hugetlb folios
Date: Thu, 19 Nov 2026 07:11:59 +0000	[thread overview]
Message-ID: <20261119-migrate-refactor-shivank-v2-4-f4535bd0bc52@amd.com> (raw)
In-Reply-To: <20261119-migrate-refactor-shivank-v2-0-f4535bd0bc52@amd.com>

migrate_hugetlbs() scans the full source list on every retry pass, even
though it only handles hugetlb folios, and migrate_pages() then scans the
list again to set aside hugetlb folios that exhausted their retries.

Move hugetlb folios to a local list in migrate_pages() before migration
and let migrate_hugetlbs() work on that list alone. Whatever was not
migrated is put back through @ret_folios on the way out, which removes the
later hugetlb check from the batching loop.

While at it, fix the function comment which was copied from migrate_pages()
and drop what is migrate_pages()'s contract with outside callers.

No functional change intended.

Signed-off-by: Shivank Garg <shivankg@amd.com>
---
 mm/migrate.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/mm/migrate.c b/mm/migrate.c
index e4e3d1683d1e..3dfdf46681e3 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1662,11 +1662,11 @@ struct migrate_pages_stats {
 };
 
 /*
- * Returns the number of hugetlb folios that were not migrated, or an error code
- * after NR_MAX_MIGRATE_PAGES_RETRY attempts or if no hugetlb folios are movable
- * any more because the list has become empty or no retryable hugetlb folios
- * exist any more. It is caller's responsibility to call putback_movable_pages()
- * only if ret != 0.
+ * Migrate the hugetlb folios on @from, trying each folio up to
+ * NR_MAX_MIGRATE_PAGES_RETRY times.  Permanent failures are moved to
+ * @ret_folios; any other folio that was not migrated stays on @from.
+ *
+ * Return the number of failed folios, or a negative errno.
  */
 static int migrate_hugetlbs(struct list_head *from, new_folio_t get_new_folio,
 			    free_folio_t put_new_folio, unsigned long private,
@@ -1686,9 +1686,6 @@ static int migrate_hugetlbs(struct list_head *from, new_folio_t get_new_folio,
 		nr_retry_pages = 0;
 
 		list_for_each_entry_safe(folio, folio2, from, lru) {
-			if (!folio_test_hugetlb(folio))
-				continue;
-
 			nr_pages = folio_nr_pages(folio);
 
 			cond_resched();
@@ -2184,6 +2181,7 @@ int migrate_pages(struct list_head *from, new_folio_t get_new_folio,
 	int nr_pages;
 	struct folio *folio, *folio2;
 	LIST_HEAD(folios);
+	LIST_HEAD(hugetlb_folios);
 	LIST_HEAD(ret_folios);
 	LIST_HEAD(split_folios);
 	struct migrate_pages_stats stats;
@@ -2192,20 +2190,19 @@ int migrate_pages(struct list_head *from, new_folio_t get_new_folio,
 
 	memset(&stats, 0, sizeof(stats));
 
-	rc_gather = migrate_hugetlbs(from, get_new_folio, put_new_folio, private,
-				     mode, reason, &stats, &ret_folios);
+	list_for_each_entry_safe(folio, folio2, from, lru)
+		if (folio_test_hugetlb(folio))
+			list_move_tail(&folio->lru, &hugetlb_folios);
+
+	rc_gather = migrate_hugetlbs(&hugetlb_folios, get_new_folio,
+				     put_new_folio, private, mode, reason,
+				     &stats, &ret_folios);
 	if (rc_gather < 0)
 		goto out;
 
 again:
 	nr_pages = 0;
 	list_for_each_entry_safe(folio, folio2, from, lru) {
-		/* Retried hugetlb folios will be kept in list  */
-		if (folio_test_hugetlb(folio)) {
-			list_move_tail(&folio->lru, &ret_folios);
-			continue;
-		}
-
 		nr_pages += folio_nr_pages(folio);
 		if (nr_pages >= NR_MAX_BATCHED_MIGRATION)
 			break;
@@ -2248,6 +2245,7 @@ int migrate_pages(struct list_head *from, new_folio_t get_new_folio,
 	 * Put the permanent failure folio back to migration list, they
 	 * will be put back to the right list by the caller.
 	 */
+	list_splice_tail(&hugetlb_folios, &ret_folios);
 	list_splice(&ret_folios, from);
 
 	/*

-- 
2.53.0


  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 ` [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 ` Shivank Garg [this message]
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-4-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®