migrate_pages(): fix failure counting for retry

After 10 retries, we will give up and the remaining pages will be counted
as failure in nr_failed and nr_thp_failed.  We should count the failure in
nr_failed_pages too.  This is done in this patch.

Link: https://lkml.kernel.org/r/20220817081408.513338-8-ying.huang@intel.com
Fixes: 3bbdfa3d7520 ("mm: move_pages: report the number of non-attempted pages")
Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Yang Shi <shy828301@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/migrate.c b/mm/migrate.c
index 81daa4dd3bb6c58694a8006fc2b48e788f1df061..55fbf96694313ff6758c00053d715195ceb977b4 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1413,6 +1413,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
        int thp_retry = 1;
        int nr_failed = 0;
        int nr_failed_pages = 0;
+       int nr_retry_pages = 0;
        int nr_succeeded = 0;
        int nr_thp_succeeded = 0;
        int nr_thp_failed = 0;
@@ -1433,6 +1434,7 @@ thp_subpage_migration:
        for (pass = 0; pass < 10 && (retry || thp_retry); pass++) {
                retry = 0;
                thp_retry = 0;
+               nr_retry_pages = 0;
 
                list_for_each_entry_safe(page, page2, from, lru) {
                        /*
@@ -1506,7 +1508,7 @@ thp_subpage_migration:
                                        nr_failed++;
                                }
 
-                               nr_failed_pages += nr_subpages;
+                               nr_failed_pages += nr_subpages + nr_retry_pages;
                                /*
                                 * There might be some subpages of fail-to-migrate THPs
                                 * left in thp_split_pages list. Move them back to migration
@@ -1522,6 +1524,7 @@ thp_subpage_migration:
                                        thp_retry++;
                                else
                                        retry++;
+                               nr_retry_pages += nr_subpages;
                                break;
                        case MIGRATEPAGE_SUCCESS:
                                nr_succeeded += nr_subpages;
@@ -1548,6 +1551,7 @@ thp_subpage_migration:
        if (!no_subpage_counting)
                nr_failed += retry;
        nr_thp_failed += thp_retry;
+       nr_failed_pages += nr_retry_pages;
        /*
         * Try to migrate subpages of fail-to-migrate THPs, no nr_failed
         * counting in this round, since all subpages of a THP is counted