mm: memory_hotplug: unify Huge/LRU/non-LRU movable folio isolation

Use the isolate_folio_to_list() to unify hugetlb/LRU/non-LRU folio
isolation, which cleanup code a bit and save a few calls to
compound_head().

Link: https://lkml.kernel.org/r/20240816090435.888946-6-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Naoya Horiguchi <nao.horiguchi@gmail.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Kalesh Singh <kaleshsingh@google.com>
Cc: Shaohua Li <shli@fb.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Yu Zhao <yuzhao@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 02a0d4fbc3fe10ec65604e891e00a9732721ea2e..cc9c16db2f8cbeb7c7a48bcda19b40883f1cf195 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1773,14 +1773,14 @@ found:
 static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
 {
        unsigned long pfn;
-       struct page *page;
        LIST_HEAD(source);
+       struct folio *folio;
        static DEFINE_RATELIMIT_STATE(migrate_rs, DEFAULT_RATELIMIT_INTERVAL,
                                      DEFAULT_RATELIMIT_BURST);
 
        for (pfn = start_pfn; pfn < end_pfn; pfn++) {
-               struct folio *folio;
-               bool isolated;
+               struct page *page;
+               bool huge;
 
                if (!pfn_valid(pfn))
                        continue;
@@ -1812,34 +1812,22 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
                        continue;
                }
 
-               if (folio_test_hugetlb(folio)) {
-                       isolate_hugetlb(folio, &source);
-                       continue;
+               huge = folio_test_hugetlb(folio);
+               if (!huge) {
+                       folio = folio_get_nontail_page(page);
+                       if (!folio)
+                               continue;
                }
 
-               if (!get_page_unless_zero(page))
-                       continue;
-               /*
-                * We can skip free pages. And we can deal with pages on
-                * LRU and non-lru movable pages.
-                */
-               if (PageLRU(page))
-                       isolated = isolate_lru_page(page);
-               else
-                       isolated = isolate_movable_page(page, ISOLATE_UNEVICTABLE);
-               if (isolated) {
-                       list_add_tail(&page->lru, &source);
-                       if (!__PageMovable(page))
-                               inc_node_page_state(page, NR_ISOLATED_ANON +
-                                                   page_is_file_lru(page));
-
-               } else {
+               if (!isolate_folio_to_list(folio, &source)) {
                        if (__ratelimit(&migrate_rs)) {
                                pr_warn("failed to isolate pfn %lx\n", pfn);
                                dump_page(page, "isolation failed");
                        }
                }
-               put_page(page);
+
+               if (!huge)
+                       folio_put(folio);
        }
        if (!list_empty(&source)) {
                nodemask_t nmask = node_states[N_MEMORY];
@@ -1854,7 +1842,7 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
                 * We have checked that migration range is on a single zone so
                 * we can use the nid of the first page to all the others.
                 */
-               mtc.nid = page_to_nid(list_first_entry(&source, struct page, lru));
+               mtc.nid = folio_nid(list_first_entry(&source, struct folio, lru));
 
                /*
                 * try to allocate from a different node but reuse this node
@@ -1867,11 +1855,12 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
                ret = migrate_pages(&source, alloc_migration_target, NULL,
                        (unsigned long)&mtc, MIGRATE_SYNC, MR_MEMORY_HOTPLUG, NULL);
                if (ret) {
-                       list_for_each_entry(page, &source, lru) {
+                       list_for_each_entry(folio, &source, lru) {
                                if (__ratelimit(&migrate_rs)) {
                                        pr_warn("migrating pfn %lx failed ret:%d\n",
-                                               page_to_pfn(page), ret);
-                                       dump_page(page, "migration failure");
+                                               folio_pfn(folio), ret);
+                                       dump_page(&folio->page,
+                                                 "migration failure");
                                }
                        }
                        putback_movable_pages(&source);