[PATCH v3 06/12] mm/gup: Refactor record_subpages() to find 1st small page

[peterx]

From: Peter Xu <pet...@redhat.com>

All the fast-gup functions take a tail page to operate, always need to do
page mask calculations before feeding that into record_subpages().

Merge that logic into record_subpages(), so that it will do the nth_page()
calculation.

Reviewed-by: Jason Gunthorpe <j...@nvidia.com>
Signed-off-by: Peter Xu <pet...@redhat.com>
---
 mm/gup.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/mm/gup.c b/mm/gup.c
index 9127ec5515ac..f3ae8f6ce8a4 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2778,13 +2778,16 @@ static int __gup_device_huge_pud(pud_t pud, pud_t 
*pudp, unsigned long addr,
 }
 #endif
 
-static int record_subpages(struct page *page, unsigned long addr,
-                          unsigned long end, struct page **pages)
+static int record_subpages(struct page *page, unsigned long sz,
+                          unsigned long addr, unsigned long end,
+                          struct page **pages)
 {
+       struct page *start_page;
        int nr;
 
+       start_page = nth_page(page, (addr & (sz - 1)) >> PAGE_SHIFT);
        for (nr = 0; addr != end; nr++, addr += PAGE_SIZE)
-               pages[nr] = nth_page(page, nr);
+               pages[nr] = nth_page(start_page, nr);
 
        return nr;
 }
@@ -2819,8 +2822,8 @@ static int gup_hugepte(pte_t *ptep, unsigned long sz, 
unsigned long addr,
        /* hugepages are never "special" */
        VM_BUG_ON(!pfn_valid(pte_pfn(pte)));
 
-       page = nth_page(pte_page(pte), (addr & (sz - 1)) >> PAGE_SHIFT);
-       refs = record_subpages(page, addr, end, pages + *nr);
+       page = pte_page(pte);
+       refs = record_subpages(page, sz, addr, end, pages + *nr);
 
        folio = try_grab_folio(page, refs, flags);
        if (!folio)
@@ -2893,8 +2896,8 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned 
long addr,
                                             pages, nr);
        }
 
-       page = nth_page(pmd_page(orig), (addr & ~PMD_MASK) >> PAGE_SHIFT);
-       refs = record_subpages(page, addr, end, pages + *nr);
+       page = pmd_page(orig);
+       refs = record_subpages(page, PMD_SIZE, addr, end, pages + *nr);
 
        folio = try_grab_folio(page, refs, flags);
        if (!folio)
@@ -2937,8 +2940,8 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned 
long addr,
                                             pages, nr);
        }
 
-       page = nth_page(pud_page(orig), (addr & ~PUD_MASK) >> PAGE_SHIFT);
-       refs = record_subpages(page, addr, end, pages + *nr);
+       page = pud_page(orig);
+       refs = record_subpages(page, PUD_SIZE, addr, end, pages + *nr);
 
        folio = try_grab_folio(page, refs, flags);
        if (!folio)
@@ -2977,8 +2980,8 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, unsigned 
long addr,
 
        BUILD_BUG_ON(pgd_devmap(orig));
 
-       page = nth_page(pgd_page(orig), (addr & ~PGDIR_MASK) >> PAGE_SHIFT);
-       refs = record_subpages(page, addr, end, pages + *nr);
+       page = pgd_page(orig);
+       refs = record_subpages(page, PGDIR_SIZE, addr, end, pages + *nr);
 
        folio = try_grab_folio(page, refs, flags);
        if (!folio)
-- 
2.44.0