Skip to contentSkip to conversation

mm-migrate-make-migrate_pages_batch-stats-consistent.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Jun 25, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/migrate: make migrate_pages_batch() stats consistent
has been removed from the -mm tree. Its filename was
mm-migrate-make-migrate_pages_batch-stats-consistent.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Zi Yan <[email protected]>
Subject: mm/migrate: make migrate_pages_batch() stats consistent
Date: Tue, 18 Jun 2024 09:41:51 -0400

As Ying pointed out in [1], stats->nr_thp_failed needs to be updated to avoid stats inconsistency between MIGRATE_SYNC and MIGRATE_ASYNC when calling migrate_pages_batch().

Because if not, when migrate_pages_batch() is called via migrate_pages(MIGRATE_ASYNC), nr_thp_failed will not be increased and when migrate_pages_batch() is called via migrate_pages(MIGRATE_SYNC*), nr_thp_failed will be increase in migrate_pages_sync() by stats->nr_thp_failed += astats.nr_thp_split.

[1] https://lore.kernel.org/linux-mm/[email protected]/

Fixes 7262f208ca68 ("mm/migrate: split source folio if it is on deferred split list")
Cc David Hildenbrand <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Cc Yang Shi <[email protected]>
Cc Yin Fengwei <[email protected]>

---

 mm/migrate.c |    5 +++++
 1 file changed, 5 insertions(+)
mm/migrate.c renamed from mm/migrate.c~mm-migrate-make-migrate_pages_batch-stats-consistent +5 -0
@@ -1659,6 +1659,10 @@ static int migrate_pages_batch(struct li
 			 * migrate_pages() may report success with (split but
 			 * unmigrated) pages still on its fromlist; whereas it
 			 * always reports success when its fromlist is empty.
+			 * stats->nr_thp_failed should be increased too,
+			 * otherwise stats inconsistency will happen when
+			 * migrate_pages_batch is called via migrate_pages()
+			 * with MIGRATE_SYNC and MIGRATE_ASYNC.
 			 *
 			 * Only check it without removing it from the list.
 			 * Since the folio can be on deferred_split_scan()
@@ -1675,6 +1679,7 @@ static int migrate_pages_batch(struct li
 			   !list_empty(&folio->_deferred_list)) {
 				if (try_split_folio(folio, split_folios) == 0) {
 					nr_failed++;
+					stats->nr_thp_failed += is_thp;
 					stats->nr_thp_split += is_thp;
 					stats->nr_split++;
 					continue;

_

Patches currently in -mm which might be from [email protected] are