Re: [PATCH v3 05/12] mm/gup: pass gup flags to two more routines

On Fri 31-01-20 19:40:22, John Hubbard wrote:

In preparation for an upcoming patch, send gup flags args to two more routines: put_compound_head(), and undo_dev_pagemap().

Signed-off-by: John Hubbard jhubbard@nvidia.com

Looks good to me. You can add:

Reviewed-by: Jan Kara jack@suse.cz

Honza

---

mm/gup.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/mm/gup.c b/mm/gup.c index 65a40560c8d0..83473c2165f4 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1870,6 +1870,7 @@ static inline pte_t gup_get_pte(pte_t *ptep) #endif /* CONFIG_GUP_GET_PTE_LOW_HIGH */ static void __maybe_unused undo_dev_pagemap(int *nr, int nr_start,

• 			    unsigned int flags,
  		    struct page **pages)
  

{ while ((*nr) - nr_start) { @@ -1909,7 +1910,7 @@ static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end, pgmap = get_dev_pagemap(pte_pfn(pte), pgmap); if (unlikely(!pgmap)) {

• 		undo_dev_pagemap(nr, nr_start, pages);
  

• 		undo_dev_pagemap(nr, nr_start, flags, pages);
  	goto pte_unmap;
  }
  

  } else if (pte_special(pte))

@@ -1974,7 +1975,7 @@ static int __gup_device_huge(unsigned long pfn, unsigned long addr, pgmap = get_dev_pagemap(pfn, pgmap); if (unlikely(!pgmap)) {

• 	undo_dev_pagemap(nr, nr_start, pages);
  

• 	undo_dev_pagemap(nr, nr_start, flags, pages);
  return 0;
  

  } SetPageReferenced(page);

@@ -2001,7 +2002,7 @@ static int __gup_device_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr, return 0; if (unlikely(pmd_val(orig) != pmd_val(*pmdp))) {

• undo_dev_pagemap(nr, nr_start, pages);
  

• undo_dev_pagemap(nr, nr_start, flags, pages);
  

  return 0; } return 1;

@@ -2019,7 +2020,7 @@ static int __gup_device_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr, return 0; if (unlikely(pud_val(orig) != pud_val(*pudp))) {

• undo_dev_pagemap(nr, nr_start, pages);
  

• undo_dev_pagemap(nr, nr_start, flags, pages);
  

  return 0; } return 1;

@@ -2053,7 +2054,7 @@ static int record_subpages(struct page *page, unsigned long addr, return nr; } -static void put_compound_head(struct page *page, int refs) +static void put_compound_head(struct page *page, int refs, unsigned int flags) { VM_BUG_ON_PAGE(page_ref_count(page) < refs, page); /* @@ -2103,7 +2104,7 @@ static int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr, return 0; if (unlikely(pte_val(pte) != pte_val(*ptep))) {

• put_compound_head(head, refs);
  

• put_compound_head(head, refs, flags);
  

  return 0; }

@@ -2163,7 +2164,7 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr, return 0; if (unlikely(pmd_val(orig) != pmd_val(*pmdp))) {

• put_compound_head(head, refs);
  

• put_compound_head(head, refs, flags);
  

  return 0; }

@@ -2197,7 +2198,7 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr, return 0; if (unlikely(pud_val(orig) != pud_val(*pudp))) {

• put_compound_head(head, refs);
  

• put_compound_head(head, refs, flags);
  

  return 0; }

@@ -2226,7 +2227,7 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, unsigned long addr, return 0; if (unlikely(pgd_val(orig) != pgd_val(*pgdp))) {

• put_compound_head(head, refs);
  

• put_compound_head(head, refs, flags);
  

  return 0; }

2.25.0