Commit 69a041ff authored by Miaohe Lin's avatar Miaohe Lin Committed by Andrew Morton
Browse files

mm/migration: fix potential page refcounts leak in migrate_pages 

In -ENOMEM case, there might be some subpages of fail-to-migrate THPs left
in thp_split_pages list.  We should move them back to migration list so
that they could be put back to the right list by the caller otherwise the
page refcnt will be leaked here.  Also adjust nr_failed and nr_thp_failed
accordingly to make vm events account more accurate.

Link: https://lkml.kernel.org/r/20220318111709.60311-10-linmiaohe@huawei.com


Fixes: b5bade97 ("mm: migrate: fix the return value of migrate_pages()")
Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarZi Yan <ziy@nvidia.com>
Reviewed-by: default avatar"Huang, Ying" <ying.huang@intel.com>
Reviewed-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Reviewed-by: default avatarMuchun Song <songmuchun@bytedance.com>
Cc: Alistair Popple <apopple@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f430893b

mm/migrate.c

+8 −0
Original line number Diff line number Diff line
@@ -1434,6 +1434,14 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, 
				}



				nr_failed_pages += nr_subpages;

				/*

				 * There might be some subpages of fail-to-migrate THPs

				 * left in thp_split_pages list. Move them back to migration

				 * list so that they could be put back to the right list by

				 * the caller otherwise the page refcnt will be leaked.

				 */

				list_splice_init(&thp_split_pages, from);

				nr_thp_failed += thp_retry;

				goto out;

			case -EAGAIN:

				if (is_thp)