mm/migrate: correct thp migration stats.
Subsystems (2)
PATCH v2 1/1 mm/migrate: correct thp migration stats.
From: Zi Yan <[email protected]>
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.
--- mm/migrate.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
mm/migrate.c +3 -4
@@ -1445,7 +1445,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,* 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 ();
@@ -1471,7 +1471,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,* 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);
@@ -1480,8 +1480,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, nr_thp_split++; goto retry; } - } -if (is_thp) { + nr_thp_failed++; nr_failed += nr_subpages; goto out;
Signature · 1 line
2.28.0
Hi Zi,
Quoted 5 lines · Zi Yan
From: Zi Yan <[email protected]>
PageTransHuge returns true for both thp and hugetlb, so thp stats was counting both thp and hugetlb migrations. Exclude hugetlb migration by setting
is_thpvariable right.
Coincidentally, I had just detected this problem last evening and was in the process of sending a patch this morning :) Nonetheless, thanks for the patch.
Earlier there was a similar THP-HugeTLB ambiguity down the error path as well. In hindsight, I should have noticed or remembered about this earlier fix during the THP stats patch.
e6112fc30070 (mm/migrate.c: split only transparent huge pages when allocation fails)
Quoted 36 lines
Clean up thp handling code too when we are there.
Fixes 1a5bae25e3cf ("mm/vmstat: add events for THP migration without split")Signed-off-by Zi Yan <[email protected]>Reviewed-by Daniel Jordan <[email protected]>Cc Daniel Jordan <[email protected]>Cc Anshuman Khandual <[email protected]>--- mm/migrate.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)mm/migrate.c +2
-2@@ -1445,7 +1445,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,* 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 ();@@ -1471,7 +1471,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,* 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);
mm/migrate.c int migrate_pages(struct list_head *from, new_page_t get_new_page, · line 1486
Quoted 9 lines
mm/migrate.c +1
-2@@ -1480,8 +1480,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, nr_thp_split++; goto retry; } - } -if (is_thp) { + nr_thp_failed++; nr_failed += nr_subpages; goto out;
Moving the failure path inside the split path makes sense, now that it is already established that the page is indeed a THP.