Commit c5fc5c3a authored by Yang Shi's avatar Yang Shi Committed by Linus Torvalds
Browse files

mm: migrate: account THP NUMA migration counters correctly 

Now both base page and THP NUMA migration is done via
migrate_misplaced_page(), keep the counters correctly for THP.

Link: https://lkml.kernel.org/r/20210518200801.7413-5-shy828301@gmail.com


Signed-off-by: default avatarYang Shi <shy828301@gmail.com>
Acked-by: default avatarMel Gorman <mgorman@suse.de>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c5b5a3dd

mm/migrate.c

+4 −3
Original line number Diff line number Diff line
@@ -2117,6 +2117,7 @@ int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma, 
	LIST_HEAD(migratepages);

	new_page_t *new;

	bool compound;

	unsigned int nr_pages = thp_nr_pages(page);



	/*

	 * PTE mapped THP or HugeTLB page can't reach here so the page could
@@ -2155,13 +2156,13 @@ int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma, 
	if (nr_remaining) {

		if (!list_empty(&migratepages)) {

			list_del(&page->lru);

			dec_node_page_state(page, NR_ISOLATED_ANON +

					page_is_file_lru(page));

			mod_node_page_state(page_pgdat(page), NR_ISOLATED_ANON +

					page_is_file_lru(page), -nr_pages);

			putback_lru_page(page);

		}

		isolated = 0;

	} else

		count_vm_numa_event(NUMA_PAGE_MIGRATE);

		count_vm_numa_events(NUMA_PAGE_MIGRATE, nr_pages);

	BUG_ON(!list_empty(&migratepages));

	return isolated;