Skip to contentSkip to conversation

mm-migrate-correct-thp-migration-stats.patch removed from -mm tree

merged [email protected] 1 participant 1 message Sep 28, 2020

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

The patch titled
Subject: mm/migrate: correct thp migration stats
has been removed from the -mm tree. Its filename was
mm-migrate-correct-thp-migration-stats.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Zi Yan <[email protected]>
Subject: mm/migrate: correct thp migration stats

PageTransHuge returns true for both thp and hugetlb, so thp stats was counting both thp and hugetlb migrations. Exclude hugetlb migration by setting is_thp variable right.

Clean up thp handling code too when we are there.

Fixes 1a5bae25e3cf ("mm/vmstat: add events for THP migration without split")
Cc Anshuman Khandual <[email protected]>

---

 mm/migrate.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
mm/migrate.c renamed from mm/migrate.c~mm-migrate-correct-thp-migration-stats +3 -4
@@ -1446,7 +1446,7 @@ retry:
 			 * Capture required information that might get lost
 			 * during migration.
 			 */
-			is_thp = PageTransHuge(page);
+			is_thp = PageTransHuge(page) && !PageHuge(page);
 			nr_subpages = thp_nr_pages(page);
 			cond_resched();
 
@@ -1472,7 +1472,7 @@ retry:
 				 * we encounter them after the rest of the list
 				 * is processed.
 				 */
-				if (PageTransHuge(page) && !PageHuge(page)) {
+				if (is_thp) {
 					lock_page(page);
 					rc = split_huge_page_to_list(page, from);
 					unlock_page(page);
@@ -1481,8 +1481,7 @@ retry:
 						nr_thp_split++;
 						goto retry;
 					}
-				}
-				if (is_thp) {
+
 					nr_thp_failed++;
 					nr_failed += nr_subpages;
 					goto out;

_

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