mm: migrate: use folio_xchg_last_cpupid() in folio_migrate_flags()

Convert to use folio_xchg_last_cpupid() in folio_migrate_flags(), also
directly use folio_nid() instead of page_to_nid(&folio->page).

Link: https://lkml.kernel.org/r/20231018140806.2783514-15-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Juri Lelli <juri.lelli@redhat.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/migrate.c b/mm/migrate.c
index c602bf6dec97833fe334294b5555c456e88dc31f..71fc5064cec669a628529a3cdd94d2be585b537f 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -588,20 +588,20 @@ void folio_migrate_flags(struct folio *newfolio, struct folio *folio)
         * Copy NUMA information to the new page, to prevent over-eager
         * future migrations of this same page.
         */
-       cpupid = page_cpupid_xchg_last(&folio->page, -1);
+       cpupid = folio_xchg_last_cpupid(folio, -1);
        /*
         * For memory tiering mode, when migrate between slow and fast
         * memory node, reset cpupid, because that is used to record
         * page access time in slow memory node.
         */
        if (sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) {
-               bool f_toptier = node_is_toptier(page_to_nid(&folio->page));
-               bool t_toptier = node_is_toptier(page_to_nid(&newfolio->page));
+               bool f_toptier = node_is_toptier(folio_nid(folio));
+               bool t_toptier = node_is_toptier(folio_nid(newfolio));
 
                if (f_toptier != t_toptier)
                        cpupid = -1;
        }
-       page_cpupid_xchg_last(&newfolio->page, cpupid);
+       folio_xchg_last_cpupid(newfolio, cpupid);
 
        folio_migrate_ksm(newfolio, folio);
        /*