gup: use folios for gup_devmap

Use try_grab_folio() instead of try_grab_page() so we get the folio back
that we calculated, and then use folio_set_referenced() instead of
SetPageReferenced().  Correspondingly, use gup_put_folio() to put any
unneeded references.

Link: https://lkml.kernel.org/r/20240424191914.361554-6-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/gup.c b/mm/gup.c
index 44c6ceee7e1f79dde00d45fd8d21b8222ad7d025..2f7baf96f655936d5085f17557d8ea14e6f24634 100644 (file)
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2877,13 +2877,10 @@ static void __maybe_unused gup_fast_undo_dev_pagemap(int *nr, int nr_start,
                unsigned int flags, struct page **pages)
 {
        while ((*nr) - nr_start) {
-               struct page *page = pages[--(*nr)];
+               struct folio *folio = page_folio(pages[--(*nr)]);
 
-               ClearPageReferenced(page);
-               if (flags & FOLL_PIN)
-                       unpin_user_page(page);
-               else
-                       put_page(page);
+               folio_clear_referenced(folio);
+               gup_put_folio(folio, 1, flags);
        }
 }
 
@@ -3024,6 +3021,7 @@ static int gup_fast_devmap_leaf(unsigned long pfn, unsigned long addr,
        struct dev_pagemap *pgmap = NULL;
 
        do {
+               struct folio *folio;
                struct page *page = pfn_to_page(pfn);
 
                pgmap = get_dev_pagemap(pfn, pgmap);
@@ -3037,12 +3035,13 @@ static int gup_fast_devmap_leaf(unsigned long pfn, unsigned long addr,
                        break;
                }
 
-               SetPageReferenced(page);
-               pages[*nr] = page;
-               if (unlikely(try_grab_page(page, flags))) {
+               folio = try_grab_folio(page, 1, flags);
+               if (!folio) {
                        gup_fast_undo_dev_pagemap(nr, nr_start, flags, pages);
                        break;
                }
+               folio_set_referenced(folio);
+               pages[*nr] = page;
                (*nr)++;
                pfn++;
        } while (addr += PAGE_SIZE, addr != end);