Commit 7047b5a4 authored by Baolin Wang's avatar Baolin Wang Committed by Andrew Morton

mm: migrate: do not retry 10 times for the subpages of fail-to-migrate THP

If THP is failed to migrate due to -ENOSYS or -ENOMEM case, the THP will
be split, and the subpages of fail-to-migrate THP will be tried to migrate
again, so we should not account the retry counter in the second loop,
since we already accounted 'nr_thp_failed' in the first loop.

Moreover we also do not need retry 10 times for -EAGAIN case for the
subpages of fail-to-migrate THP in the second loop, since we already
regarded the THP as migration failure, and save some migration time (for
the worst case, will try 512 * 10 times) according to previous discussion
[1].

[1] https://lore.kernel.org/linux-mm/87r13a7n04.fsf@yhuang6-desk2.ccr.corp.intel.com/

Link: https://lkml.kernel.org/r/20220817081408.513338-9-ying.huang@intel.comTested-by: default avatar"Huang, Ying" <ying.huang@intel.com>
Signed-off-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Signed-off-by: default avatar"Huang, Ying" <ying.huang@intel.com>
Cc: Oscar 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 077309bc
...@@ -1522,7 +1522,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, ...@@ -1522,7 +1522,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
case -EAGAIN: case -EAGAIN:
if (is_thp) if (is_thp)
thp_retry++; thp_retry++;
else else if (!no_subpage_counting)
retry++; retry++;
nr_retry_pages += nr_subpages; nr_retry_pages += nr_subpages;
break; break;
...@@ -1548,8 +1548,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, ...@@ -1548,8 +1548,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
} }
} }
} }
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; nr_failed_pages += nr_retry_pages;
/* /*
......
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