Skip to contentSkip to conversation

mm/migrate: Continue to migrate for non-hugetlb folios

PATCH In review Chen Wandun 2 participants 2 messages Jan 29, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mm/migrate: Continue to migrate for non-hugetlb folios

migrate_hugetlbs returns -ENOMEM when no enough hugetlb, however there may be free non-hugetlb folios available, so continue to migrate for non-hugetlb folios.

Nowdays the only negtive return value of migrate_hugetlbs is -ENOMEM, keep compatible for coming negtive return value instead of ignore return value.

---
v1 --> v2: modify changelog and comment. thanks Huang Ying.

---
 mm/migrate.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
mm/migrate.c +2 -1
index b971edbf32fc..68927aa06f9b 100644
@@ -1939,7 +1939,8 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
 
 	rc_gather = migrate_hugetlbs(from, get_new_page, put_new_page, private,
 				     mode, reason, &stats, &ret_folios);
-	if (rc_gather < 0)
+	/* There may be free non-hugetlb folios available, continue to migrate. */
+	if (rc_gather < 0 && rc_gather != -ENOMEM)
 		goto out;
 again:
 	nr_pages = 0;
Signature · 1 line
2.25.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 9 lines · Chen Wandun

migrate_hugetlbs returns -ENOMEM when no enough hugetlb, however there may be free non-hugetlb folios available, so continue to migrate for non-hugetlb folios.

Nowdays the only negtive return value of migrate_hugetlbs is -ENOMEM, keep compatible for coming negtive return value instead of ignore return value.

LGTM, Thanks!

Quoted 21 lines

---
v1 --> v2: modify changelog and comment. thanks Huang Ying.

---
 mm/migrate.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
mm/migrate.c +2 -1
index b971edbf32fc..68927aa06f9b 100644
@@ -1939,7 +1939,8 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
 
 	rc_gather = migrate_hugetlbs(from, get_new_page, put_new_page, private,
 				     mode, reason, &stats, &ret_folios);
-	if (rc_gather < 0)
+	/* There may be free non-hugetlb folios available, continue to migrate. */
+	if (rc_gather < 0 && rc_gather != -ENOMEM)
 		goto out;
 again:
 	nr_pages = 0;