Commit 077309bc authored by Huang Ying's avatar Huang Ying Committed by Andrew Morton

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: 5984fabb ("mm: move_pages: report the number of non-attempted pages")
Signed-off-by: default avatar"Huang, Ying" <ying.huang@intel.com>
Reviewed-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Reviewed-by: default avatarOscar Salvador <osalvador@suse.de>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Yang Shi <shy828301@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent e6fa8a79
...@@ -1413,6 +1413,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, ...@@ -1413,6 +1413,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
int thp_retry = 1; int thp_retry = 1;
int nr_failed = 0; int nr_failed = 0;
int nr_failed_pages = 0; int nr_failed_pages = 0;
int nr_retry_pages = 0;
int nr_succeeded = 0; int nr_succeeded = 0;
int nr_thp_succeeded = 0; int nr_thp_succeeded = 0;
int nr_thp_failed = 0; int nr_thp_failed = 0;
...@@ -1433,6 +1434,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, ...@@ -1433,6 +1434,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
for (pass = 0; pass < 10 && (retry || thp_retry); pass++) { for (pass = 0; pass < 10 && (retry || thp_retry); pass++) {
retry = 0; retry = 0;
thp_retry = 0; thp_retry = 0;
nr_retry_pages = 0;
list_for_each_entry_safe(page, page2, from, lru) { list_for_each_entry_safe(page, page2, from, lru) {
/* /*
...@@ -1506,7 +1508,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, ...@@ -1506,7 +1508,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
nr_failed++; 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 * There might be some subpages of fail-to-migrate THPs
* left in thp_split_pages list. Move them back to migration * left in thp_split_pages list. Move them back to migration
...@@ -1522,6 +1524,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, ...@@ -1522,6 +1524,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
thp_retry++; thp_retry++;
else else
retry++; retry++;
nr_retry_pages += nr_subpages;
break; break;
case MIGRATEPAGE_SUCCESS: case MIGRATEPAGE_SUCCESS:
nr_succeeded += nr_subpages; nr_succeeded += nr_subpages;
...@@ -1548,6 +1551,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, ...@@ -1548,6 +1551,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
if (!no_subpage_counting) if (!no_subpage_counting)
nr_failed += retry; nr_failed += retry;
nr_thp_failed += thp_retry; nr_thp_failed += thp_retry;
nr_failed_pages += nr_retry_pages;
/* /*
* Try to migrate subpages of fail-to-migrate THPs, no nr_failed * Try to migrate subpages of fail-to-migrate THPs, no nr_failed
* counting in this round, since all subpages of a THP is counted * counting in this round, since all subpages of a THP is counted
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment