There are four locations in gup.c that have a fair amount of code
duplication. This means that changing one requires making the same
changes in four places, not to mention reading the same code four
times, and wondering if there are subtle differences.

Factor out the common code into static functions, thus reducing the
overall line count and the code's complexity.

Also, take the opportunity to slightly improve the efficiency of the
error cases, by doing a mass subtraction of the refcount, surrounded
by get_page()/put_page().

Also, further simplify (slightly), by waiting until the the successful
end of each routine, to increment *nr.

Reviewed-by: Christoph Hellwig <h...@lst.de>
Reviewed-by: Jérôme Glisse <jgli...@redhat.com>
Reviewed-by: Jan Kara <j...@suse.cz>
Cc: Ira Weiny <ira.we...@intel.com>
Cc: Christoph Hellwig <h...@lst.de>
Cc: Aneesh Kumar K.V <aneesh.ku...@linux.ibm.com>
Signed-off-by: John Hubbard <jhubb...@nvidia.com>
---
 mm/gup.c | 91 ++++++++++++++++++++++----------------------------------
 1 file changed, 36 insertions(+), 55 deletions(-)

diff --git a/mm/gup.c b/mm/gup.c
index 7646bf993b25..f764432914c4 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1978,6 +1978,25 @@ 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)
+{
+       int nr;
+
+       for (nr = 0; addr != end; addr += PAGE_SIZE)
+               pages[nr++] = page++;
+
+       return nr;
+}
+
+static void put_compound_head(struct page *page, int refs)
+{
+       /* Do a get_page() first, in case refs == page->_refcount */
+       get_page(page);
+       page_ref_sub(page, refs);
+       put_page(page);
+}
+
 #ifdef CONFIG_ARCH_HAS_HUGEPD
 static unsigned long hugepte_addr_end(unsigned long addr, unsigned long end,
                                      unsigned long sz)
@@ -2007,32 +2026,20 @@ 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)));
 
-       refs = 0;
        head = pte_page(pte);
-
        page = head + ((addr & (sz-1)) >> PAGE_SHIFT);
-       do {
-               VM_BUG_ON(compound_head(page) != head);
-               pages[*nr] = page;
-               (*nr)++;
-               page++;
-               refs++;
-       } while (addr += PAGE_SIZE, addr != end);
+       refs = record_subpages(page, addr, end, pages + *nr);
 
        head = try_get_compound_head(head, refs);
-       if (!head) {
-               *nr -= refs;
+       if (!head)
                return 0;
-       }
 
        if (unlikely(pte_val(pte) != pte_val(*ptep))) {
-               /* Could be optimized better */
-               *nr -= refs;
-               while (refs--)
-                       put_page(head);
+               put_compound_head(head, refs);
                return 0;
        }
 
+       *nr += refs;
        SetPageReferenced(head);
        return 1;
 }
@@ -2079,28 +2086,19 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, 
unsigned long addr,
                return __gup_device_huge_pmd(orig, pmdp, addr, end, pages, nr);
        }
 
-       refs = 0;
        page = pmd_page(orig) + ((addr & ~PMD_MASK) >> PAGE_SHIFT);
-       do {
-               pages[*nr] = page;
-               (*nr)++;
-               page++;
-               refs++;
-       } while (addr += PAGE_SIZE, addr != end);
+       refs = record_subpages(page, addr, end, pages + *nr);
 
        head = try_get_compound_head(pmd_page(orig), refs);
-       if (!head) {
-               *nr -= refs;
+       if (!head)
                return 0;
-       }
 
        if (unlikely(pmd_val(orig) != pmd_val(*pmdp))) {
-               *nr -= refs;
-               while (refs--)
-                       put_page(head);
+               put_compound_head(head, refs);
                return 0;
        }
 
+       *nr += refs;
        SetPageReferenced(head);
        return 1;
 }
@@ -2120,28 +2118,19 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, 
unsigned long addr,
                return __gup_device_huge_pud(orig, pudp, addr, end, pages, nr);
        }
 
-       refs = 0;
        page = pud_page(orig) + ((addr & ~PUD_MASK) >> PAGE_SHIFT);
-       do {
-               pages[*nr] = page;
-               (*nr)++;
-               page++;
-               refs++;
-       } while (addr += PAGE_SIZE, addr != end);
+       refs = record_subpages(page, addr, end, pages + *nr);
 
        head = try_get_compound_head(pud_page(orig), refs);
-       if (!head) {
-               *nr -= refs;
+       if (!head)
                return 0;
-       }
 
        if (unlikely(pud_val(orig) != pud_val(*pudp))) {
-               *nr -= refs;
-               while (refs--)
-                       put_page(head);
+               put_compound_head(head, refs);
                return 0;
        }
 
+       *nr += refs;
        SetPageReferenced(head);
        return 1;
 }
@@ -2157,28 +2146,20 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, 
unsigned long addr,
                return 0;
 
        BUILD_BUG_ON(pgd_devmap(orig));
-       refs = 0;
+
        page = pgd_page(orig) + ((addr & ~PGDIR_MASK) >> PAGE_SHIFT);
-       do {
-               pages[*nr] = page;
-               (*nr)++;
-               page++;
-               refs++;
-       } while (addr += PAGE_SIZE, addr != end);
+       refs = record_subpages(page, addr, end, pages + *nr);
 
        head = try_get_compound_head(pgd_page(orig), refs);
-       if (!head) {
-               *nr -= refs;
+       if (!head)
                return 0;
-       }
 
        if (unlikely(pgd_val(orig) != pgd_val(*pgdp))) {
-               *nr -= refs;
-               while (refs--)
-                       put_page(head);
+               put_compound_head(head, refs);
                return 0;
        }
 
+       *nr += refs;
        SetPageReferenced(head);
        return 1;
 }
-- 
2.24.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to