From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-mm@kvack.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
John Hubbard <jhubbard@nvidia.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH 12/17] gup: Convert gup_huge_pud() to use a folio
Date: Sun, 2 Jan 2022 21:57:24 +0000 [thread overview]
Message-ID: <20220102215729.2943705-13-willy@infradead.org> (raw)
In-Reply-To: <20220102215729.2943705-1-willy@infradead.org>
Use the new folio-based APIs. Also fix an assumption that memmap is
contiguous.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
mm/gup.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/mm/gup.c b/mm/gup.c
index be965c965484..e7bcee8776e1 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2552,7 +2552,8 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, 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 (!pud_access_permitted(orig, flags & FOLL_WRITE))
@@ -2565,20 +2566,20 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr,
pages, nr);
}
- page = pud_page(orig) + ((addr & ~PUD_MASK) >> PAGE_SHIFT);
+ page = nth_page(pud_page(orig), (addr & ~PUD_MASK) >> PAGE_SHIFT);
refs = record_subpages(page, addr, end, pages + *nr);
- head = try_grab_compound_head(pud_page(orig), refs, flags);
- if (!head)
+ folio = try_grab_folio(page, refs, flags);
+ if (!folio)
return 0;
if (unlikely(pud_val(orig) != pud_val(*pudp))) {
- put_compound_head(head, refs, flags);
+ gup_put_folio(folio, refs, flags);
return 0;
}
*nr += refs;
- SetPageReferenced(head);
+ folio_set_referenced(folio);
return 1;
}
--
2.33.0
next prev parent reply other threads:[~2022-01-02 21:58 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-02 21:57 [PATCH 00/17] Convert GUP to folios Matthew Wilcox (Oracle)
2022-01-02 21:57 ` [PATCH 01/17] mm: Add folio_put_refs() Matthew Wilcox (Oracle)
2022-01-04 8:00 ` Christoph Hellwig
2022-01-04 21:15 ` John Hubbard
2022-01-02 21:57 ` [PATCH 02/17] mm: Add folio_pincount_available() Matthew Wilcox (Oracle)
2022-01-04 8:01 ` Christoph Hellwig
2022-01-04 18:25 ` Matthew Wilcox
2022-01-04 21:40 ` John Hubbard
2022-01-05 5:04 ` Matthew Wilcox
2022-01-05 6:24 ` John Hubbard
2022-01-02 21:57 ` [PATCH 03/17] mm: Add folio_pincount_ptr() Matthew Wilcox (Oracle)
2022-01-04 8:02 ` Christoph Hellwig
2022-01-04 21:43 ` John Hubbard
2022-01-06 21:57 ` William Kucharski
2022-01-02 21:57 ` [PATCH 04/17] mm: Convert page_maybe_dma_pinned() to use a folio Matthew Wilcox (Oracle)
2022-01-04 8:03 ` Christoph Hellwig
2022-01-04 22:01 ` John Hubbard
2022-01-02 21:57 ` [PATCH 05/17] gup: Add try_get_folio() Matthew Wilcox (Oracle)
2022-01-04 8:18 ` Christoph Hellwig
2022-01-05 1:25 ` John Hubbard
2022-01-05 7:00 ` John Hubbard
2022-01-07 18:23 ` Jason Gunthorpe
2022-01-08 1:37 ` Matthew Wilcox
2022-01-08 2:36 ` John Hubbard
2022-01-10 15:01 ` Jason Gunthorpe
2022-01-02 21:57 ` [PATCH 06/17] mm: Remove page_cache_add_speculative() and page_cache_get_speculative() Matthew Wilcox (Oracle)
2022-01-04 8:18 ` Christoph Hellwig
2022-01-05 1:29 ` John Hubbard
2022-01-02 21:57 ` [PATCH 07/17] gup: Add gup_put_folio() Matthew Wilcox (Oracle)
2022-01-04 8:22 ` Christoph Hellwig
2022-01-05 6:52 ` John Hubbard
2022-01-06 22:05 ` William Kucharski
2022-01-02 21:57 ` [PATCH 08/17] gup: Add try_grab_folio() Matthew Wilcox (Oracle)
2022-01-04 8:24 ` Christoph Hellwig
2022-01-05 7:06 ` John Hubbard
2022-01-02 21:57 ` [PATCH 09/17] gup: Convert gup_pte_range() to use a folio Matthew Wilcox (Oracle)
2022-01-04 8:25 ` Christoph Hellwig
2022-01-05 7:36 ` John Hubbard
2022-01-05 7:52 ` Matthew Wilcox
2022-01-05 7:57 ` John Hubbard
2022-01-02 21:57 ` [PATCH 10/17] gup: Convert gup_hugepte() " Matthew Wilcox (Oracle)
2022-01-04 8:26 ` Christoph Hellwig
2022-01-05 7:46 ` John Hubbard
2022-01-02 21:57 ` [PATCH 11/17] gup: Convert gup_huge_pmd() " Matthew Wilcox (Oracle)
2022-01-04 8:26 ` Christoph Hellwig
2022-01-05 7:50 ` John Hubbard
2022-01-02 21:57 ` Matthew Wilcox (Oracle) [this message]
2022-01-05 7:58 ` [PATCH 12/17] gup: Convert gup_huge_pud() " John Hubbard
2022-01-02 21:57 ` [PATCH 13/17] gup: Convert gup_huge_pgd() " Matthew Wilcox (Oracle)
2022-01-05 7:58 ` John Hubbard
2022-01-02 21:57 ` [PATCH 14/17] gup: Convert for_each_compound_head() to gup_for_each_folio() Matthew Wilcox (Oracle)
2022-01-04 8:32 ` Christoph Hellwig
2022-01-05 8:17 ` John Hubbard
2022-01-09 4:39 ` Matthew Wilcox
2022-01-09 8:01 ` John Hubbard
2022-01-10 15:22 ` Jan Kara
2022-01-10 15:52 ` Matthew Wilcox
2022-01-10 20:36 ` Jan Kara
2022-01-10 21:10 ` Matthew Wilcox
2022-01-17 12:07 ` Jan Kara
2022-01-02 21:57 ` [PATCH 15/17] gup: Convert for_each_compound_range() to gup_for_each_folio_range() Matthew Wilcox (Oracle)
2022-01-04 8:35 ` Christoph Hellwig
2022-01-05 8:30 ` John Hubbard
2022-01-02 21:57 ` [PATCH 16/17] mm: Add isolate_lru_folio() Matthew Wilcox (Oracle)
2022-01-04 8:36 ` Christoph Hellwig
2022-01-05 8:44 ` John Hubbard
2022-01-06 0:34 ` Matthew Wilcox
2022-01-02 21:57 ` [PATCH 17/17] gup: Convert check_and_migrate_movable_pages() to use a folio Matthew Wilcox (Oracle)
2022-01-04 8:37 ` Christoph Hellwig
2022-01-05 9:00 ` John Hubbard
2022-01-06 22:12 ` [PATCH 00/17] Convert GUP to folios William Kucharski
2022-01-07 18:54 ` Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220102215729.2943705-13-willy@infradead.org \
--to=willy@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=jhubbard@nvidia.com \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox