mm/migrate: Add folio_migrate_copy()

This is the folio equivalent of migrate_page_copy(), which is retained
as a wrapper for filesystems which are not yet converted to folios.
Also convert copy_huge_page() to folio_copy().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Zi Yan <ziy@nvidia.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>

diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index ba0a554b3eae499120f9f9809c6fe2c4103c0bfa..6a01de9faff589430ad63c3b4cbee43c362ac5ed 100644 (file)
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -52,6 +52,7 @@ extern int migrate_huge_page_move_mapping(struct address_space *mapping,
 extern int migrate_page_move_mapping(struct address_space *mapping,
                struct page *newpage, struct page *page, int extra_count);
 void folio_migrate_flags(struct folio *newfolio, struct folio *folio);
+void folio_migrate_copy(struct folio *newfolio, struct folio *folio);
 int folio_migrate_mapping(struct address_space *mapping,
                struct folio *newfolio, struct folio *folio, int extra_count);
 #else

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 9a670af47ca789e1a64219eab6d2c04daeb98086..01f16537ab0ca7b81ac8e9f31b81a68f8baa7d6c 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -911,7 +911,7 @@ void __put_page(struct page *page);
 void put_pages_list(struct list_head *pages);
 
 void split_page(struct page *page, unsigned int order);
-void copy_huge_page(struct page *dst, struct page *src);
+void folio_copy(struct folio *dst, struct folio *src);
 
 /*
  * Compound pages have a destructor function.  Provide a

diff --git a/mm/folio-compat.c b/mm/folio-compat.c
index 3f00ad92d1ff5a0a0107ae987250c438e2fcc3ef..2ccd8f213fc4dabafe7603b08f5d5d51c2a86e71 100644 (file)
--- a/mm/folio-compat.c
+++ b/mm/folio-compat.c
@@ -64,4 +64,10 @@ void migrate_page_states(struct page *newpage, struct page *page)
        folio_migrate_flags(page_folio(newpage), page_folio(page));
 }
 EXPORT_SYMBOL(migrate_page_states);
+
+void migrate_page_copy(struct page *newpage, struct page *page)
+{
+       folio_migrate_copy(page_folio(newpage), page_folio(page));
+}
+EXPORT_SYMBOL(migrate_page_copy);
 #endif

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index dfc940d5221dca12017307f4a6c905b68dea0257..68eead0259ccbabfe07adf2a85eca929d8cbac74 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -5200,7 +5200,7 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm,
                        *pagep = NULL;
                        goto out;
                }
-               copy_huge_page(page, *pagep);
+               folio_copy(page_folio(page), page_folio(*pagep));
                put_page(*pagep);
                *pagep = NULL;
        }

diff --git a/mm/migrate.c b/mm/migrate.c
index f514cdabd7aeb7d4792b16bc928c4efae947325f..ec4013408de76c73b1cb830febef721cd21b7d85 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -613,16 +613,12 @@ void folio_migrate_flags(struct folio *newfolio, struct folio *folio)
 }
 EXPORT_SYMBOL(folio_migrate_flags);
 
-void migrate_page_copy(struct page *newpage, struct page *page)
+void folio_migrate_copy(struct folio *newfolio, struct folio *folio)
 {
-       if (PageHuge(page) || PageTransHuge(page))
-               copy_huge_page(newpage, page);
-       else
-               copy_highpage(newpage, page);
-
-       migrate_page_states(newpage, page);
+       folio_copy(newfolio, folio);
+       folio_migrate_flags(newfolio, folio);
 }
-EXPORT_SYMBOL(migrate_page_copy);
+EXPORT_SYMBOL(folio_migrate_copy);
 
 /************************************************************
  *                    Migration functions
@@ -650,7 +646,7 @@ int migrate_page(struct address_space *mapping,
                return rc;
 
        if (mode != MIGRATE_SYNC_NO_COPY)
-               migrate_page_copy(newpage, page);
+               folio_migrate_copy(newfolio, folio);
        else
                folio_migrate_flags(newfolio, folio);
        return MIGRATEPAGE_SUCCESS;

diff --git a/mm/util.c b/mm/util.c
index d020c077a44c4074c7e9c494686fb459ff73c12c..811a246f83b395e09b65591228ea25342691e4e4 100644 (file)
--- a/mm/util.c
+++ b/mm/util.c
@@ -728,13 +728,26 @@ int __page_mapcount(struct page *page)
 }
 EXPORT_SYMBOL_GPL(__page_mapcount);
 
-void copy_huge_page(struct page *dst, struct page *src)
+/**
+ * folio_copy - Copy the contents of one folio to another.
+ * @dst: Folio to copy to.
+ * @src: Folio to copy from.
+ *
+ * The bytes in the folio represented by @src are copied to @dst.
+ * Assumes the caller has validated that @dst is at least as large as @src.
+ * Can be called in atomic context for order-0 folios, but if the folio is
+ * larger, it may sleep.
+ */
+void folio_copy(struct folio *dst, struct folio *src)
 {
-       unsigned i, nr = compound_nr(src);
+       long i = 0;
+       long nr = folio_nr_pages(src);
 
-       for (i = 0; i < nr; i++) {
+       for (;;) {
+               copy_highpage(folio_page(dst, i), folio_page(src, i));
+               if (++i == nr)
+                       break;
                cond_resched();
-               copy_highpage(nth_page(dst, i), nth_page(src, i));
        }
 }