diff mbox series

[v2,22/28] gup: Convert gup_huge_pmd() to use a folio

Message ID	20220110042406.499429-23-willy@infradead.org (mailing list archive)
State	New
Headers	show Return-Path: <owner-linux-mm@kvack.org> From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, John Hubbard <jhubbard@nvidia.com>, Christoph Hellwig <hch@infradead.org>, William Kucharski <william.kucharski@oracle.com>, linux-kernel@vger.kernel.org, Jason Gunthorpe <jgg@ziepe.ca> Subject: [PATCH v2 22/28] gup: Convert gup_huge_pmd() to use a folio Date: Mon, 10 Jan 2022 04:24:00 +0000 Message-Id: <20220110042406.499429-23-willy@infradead.org> In-Reply-To: <20220110042406.499429-1-willy@infradead.org> References: <20220110042406.499429-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	Convert GUP to folios \| expand [v2,00/28] Convert GUP to folios [v2,01/28] gup: Remove for_each_compound_range() [v2,02/28] gup: Remove for_each_compound_head() [v2,03/28] gup: Change the calling convention for compound_range_next() [v2,04/28] gup: Optimise compound_range_next() [v2,05/28] gup: Change the calling convention for compound_next() [v2,06/28] gup: Fix some contiguous memmap assumptions [v2,07/28] gup: Remove an assumption of a contiguous memmap [v2,08/28] gup: Handle page split race more efficiently [v2,09/28] gup: Turn hpage_pincount_add() into page_pincount_add() [v2,10/28] gup: Turn hpage_pincount_sub() into page_pincount_sub() [v2,11/28] mm: Make compound_pincount always available [v2,12/28] mm: Add folio_put_refs() [v2,13/28] mm: Add folio_pincount_ptr() [v2,14/28] mm: Convert page_maybe_dma_pinned() to use a folio [v2,15/28] gup: Add try_get_folio() and try_grab_folio() [v2,16/28] mm: Remove page_cache_add_speculative() and page_cache_get_speculative() [v2,17/28] gup: Add gup_put_folio() [v2,18/28] hugetlb: Use try_grab_folio() instead of try_grab_compound_head() [v2,19/28] gup: Convert try_grab_page() to call try_grab_folio() [v2,20/28] gup: Convert gup_pte_range() to use a folio [v2,21/28] gup: Convert gup_hugepte() to use a folio [v2,22/28] gup: Convert gup_huge_pmd() to use a folio [v2,23/28] gup: Convert gup_huge_pud() to use a folio [v2,24/28] gup: Convert gup_huge_pgd() to use a folio [v2,25/28] gup: Convert compound_next() to gup_folio_next() [v2,26/28] gup: Convert compound_range_next() to gup_folio_range_next() [v2,27/28] mm: Add isolate_lru_folio() [v2,28/28] gup: Convert check_and_migrate_movable_pages() to use a folio

Commit Message

Matthew Wilcox Jan. 10, 2022, 4:24 a.m. UTC

Use the new folio-based APIs.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 mm/gup.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Comments

Christoph Hellwig Jan. 10, 2022, 8:37 a.m. UTC | #1

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

John Hubbard Jan. 11, 2022, 7:36 a.m. UTC | #2

On 1/9/22 20:24, Matthew Wilcox (Oracle) wrote:
> Use the new folio-based APIs.
> 
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> ---
>   mm/gup.c | 11 ++++++-----
>   1 file changed, 6 insertions(+), 5 deletions(-)
> 

Reviewed-by: John Hubbard <jhubbard@nvidia.com>


thanks,

diff mbox series

Patch

diff --git a/mm/gup.c b/mm/gup.c
index 250326458df6..a006bce2d47b 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2492,7 +2492,8 @@  static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr,
 			unsigned long end, unsigned int flags,
 			struct page **pages, int *nr)
 {
-	struct page *head, *page;
+	struct page *page;
+	struct folio *folio;
 	int refs;
 
 	if (!pmd_access_permitted(orig, flags & FOLL_WRITE))
@@ -2508,17 +2509,17 @@  static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr,
 	page = nth_page(pmd_page(orig), (addr & ~PMD_MASK) >> PAGE_SHIFT);
 	refs = record_subpages(page, addr, end, pages + *nr);
 
-	head = try_grab_compound_head(pmd_page(orig), refs, flags);
-	if (!head)
+	folio = try_grab_folio(page, refs, flags);
+	if (!folio)
 		return 0;
 
 	if (unlikely(pmd_val(orig) != pmd_val(*pmdp))) {
-		put_compound_head(head, refs, flags);
+		gup_put_folio(folio, refs, flags);
 		return 0;
 	}
 
 	*nr += refs;
-	SetPageReferenced(head);
+	folio_set_referenced(folio);
 	return 1;
 }