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: Yang Shi <shy828301@gmail.com>
Acked-by: Mel 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/mm/migrate.c b/mm/migrate.c
index 8b75b2412bf6f1dac7f02e34f266e94515aa9a70..485781f294c10810cd54c352f5093631883ea765 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -2121,6 +2121,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
@@ -2159,13 +2160,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;