[v2,5/7] mm: migrate: don't split THP for misplaced NUMA page
diff mbox series

Message ID 20210413212416.3273-6-shy828301@gmail.com
State New
Headers show
  • mm: thp: use generic THP migration for NUMA hinting fault
Related show

Commit Message

Yang Shi April 13, 2021, 9:24 p.m. UTC
The old behavior didn't split THP if migration is failed due to lack of
memory on the target node.  But the THP migration does split THP, so keep
the old behavior for misplaced NUMA page migration.

Signed-off-by: Yang Shi <shy828301@gmail.com>
 mm/migrate.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff mbox series

diff --git a/mm/migrate.c b/mm/migrate.c
index a473f25fbd01..a72994c68ec6 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1417,6 +1417,7 @@  int migrate_pages(struct list_head *from, new_page_t get_new_page,
 	int swapwrite = current->flags & PF_SWAPWRITE;
 	int rc, nr_subpages;
+	bool nosplit = (reason == MR_NUMA_MISPLACED);
 	trace_mm_migrate_pages_start(mode, reason);
@@ -1488,8 +1489,9 @@  int migrate_pages(struct list_head *from, new_page_t get_new_page,
 				 * When memory is low, don't bother to try to migrate
 				 * other pages, just exit.
+				 * THP NUMA faulting doesn't split THP to retry.
-				if (is_thp) {
+				if (is_thp && !nosplit) {
 					if (!try_split_thp(page, &page2, from)) {
 						goto retry;