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 02/28] gup: Remove for_each_compound_head()
Date: Mon, 10 Jan 2022 04:23:40 +0000 [thread overview]
Message-ID: <20220110042406.499429-3-willy@infradead.org> (raw)
In-Reply-To: <20220110042406.499429-1-willy@infradead.org>
This macro doesn't simplify the users; it's easier to just call
compound_next() inside a standard loop.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
mm/gup.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/mm/gup.c b/mm/gup.c
index 7a07e0c00bf5..86f8d843de72 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -253,9 +253,6 @@ static inline void compound_next(unsigned long i, unsigned long npages,
struct page *page;
unsigned int nr;
- if (i >= npages)
- return;
-
page = compound_head(list[i]);
for (nr = i + 1; nr < npages; nr++) {
if (compound_head(list[nr]) != page)
@@ -266,12 +263,6 @@ static inline void compound_next(unsigned long i, unsigned long npages,
*ntails = nr - i;
}
-#define for_each_compound_head(__i, __list, __npages, __head, __ntails) \
- for (__i = 0, \
- compound_next(__i, __npages, __list, &(__head), &(__ntails)); \
- __i < __npages; __i += __ntails, \
- compound_next(__i, __npages, __list, &(__head), &(__ntails)))
-
/**
* unpin_user_pages_dirty_lock() - release and optionally dirty gup-pinned pages
* @pages: array of pages to be maybe marked dirty, and definitely released.
@@ -306,7 +297,8 @@ void unpin_user_pages_dirty_lock(struct page **pages, unsigned long npages,
return;
}
- for_each_compound_head(index, pages, npages, head, ntails) {
+ for (index = 0; index < npages; index += ntails) {
+ compound_next(index, npages, pages, &head, &ntails);
/*
* Checking PageDirty at this point may race with
* clear_page_dirty_for_io(), but that's OK. Two key
@@ -394,8 +386,10 @@ void unpin_user_pages(struct page **pages, unsigned long npages)
if (WARN_ON(IS_ERR_VALUE(npages)))
return;
- for_each_compound_head(index, pages, npages, head, ntails)
+ for (index = 0; index < npages; index += ntails) {
+ compound_next(index, npages, pages, &head, &ntails);
put_compound_head(head, ntails, FOLL_PIN);
+ }
}
EXPORT_SYMBOL(unpin_user_pages);
--
2.33.0
next prev parent reply other threads:[~2022-01-10 4:26 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-10 4:23 [PATCH v2 00/28] Convert GUP to folios Matthew Wilcox (Oracle)
2022-01-10 4:23 ` [PATCH v2 01/28] gup: Remove for_each_compound_range() Matthew Wilcox (Oracle)
2022-01-10 8:22 ` Christoph Hellwig
2022-01-11 1:07 ` John Hubbard
2022-01-10 4:23 ` Matthew Wilcox (Oracle) [this message]
2022-01-10 8:23 ` [PATCH v2 02/28] gup: Remove for_each_compound_head() Christoph Hellwig
2022-01-11 1:11 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 03/28] gup: Change the calling convention for compound_range_next() Matthew Wilcox (Oracle)
2022-01-10 8:25 ` Christoph Hellwig
2022-01-11 1:14 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 04/28] gup: Optimise compound_range_next() Matthew Wilcox (Oracle)
2022-01-10 8:26 ` Christoph Hellwig
2022-01-11 1:16 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 05/28] gup: Change the calling convention for compound_next() Matthew Wilcox (Oracle)
2022-01-10 8:27 ` Christoph Hellwig
2022-01-10 13:28 ` Matthew Wilcox
2022-01-11 1:18 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 06/28] gup: Fix some contiguous memmap assumptions Matthew Wilcox (Oracle)
2022-01-10 8:29 ` Christoph Hellwig
2022-01-10 13:37 ` Matthew Wilcox
2022-01-10 19:05 ` [External] : " Mike Kravetz
2022-01-11 1:47 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 07/28] gup: Remove an assumption of a contiguous memmap Matthew Wilcox (Oracle)
2022-01-10 8:30 ` Christoph Hellwig
2022-01-11 3:27 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 08/28] gup: Handle page split race more efficiently Matthew Wilcox (Oracle)
2022-01-10 8:31 ` Christoph Hellwig
2022-01-11 3:30 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 09/28] gup: Turn hpage_pincount_add() into page_pincount_add() Matthew Wilcox (Oracle)
2022-01-10 8:31 ` Christoph Hellwig
2022-01-11 3:35 ` John Hubbard
2022-01-11 4:32 ` John Hubbard
2022-01-11 13:46 ` Matthew Wilcox
2022-01-10 4:23 ` [PATCH v2 10/28] gup: Turn hpage_pincount_sub() into page_pincount_sub() Matthew Wilcox (Oracle)
2022-01-10 8:32 ` Christoph Hellwig
2022-01-11 6:40 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 11/28] mm: Make compound_pincount always available Matthew Wilcox (Oracle)
2022-01-11 4:06 ` John Hubbard
2022-01-11 4:38 ` Matthew Wilcox
2022-01-11 5:10 ` John Hubbard
2022-01-20 9:15 ` Christoph Hellwig
2022-01-10 4:23 ` [PATCH v2 12/28] mm: Add folio_put_refs() Matthew Wilcox (Oracle)
2022-01-10 8:32 ` Christoph Hellwig
2022-01-11 4:14 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 13/28] mm: Add folio_pincount_ptr() Matthew Wilcox (Oracle)
2022-01-10 8:33 ` Christoph Hellwig
2022-01-11 4:22 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 14/28] mm: Convert page_maybe_dma_pinned() to use a folio Matthew Wilcox (Oracle)
2022-01-10 8:33 ` Christoph Hellwig
2022-01-11 4:27 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 15/28] gup: Add try_get_folio() and try_grab_folio() Matthew Wilcox (Oracle)
2022-01-10 8:34 ` Christoph Hellwig
2022-01-11 5:00 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 16/28] mm: Remove page_cache_add_speculative() and page_cache_get_speculative() Matthew Wilcox (Oracle)
2022-01-10 8:35 ` Christoph Hellwig
2022-01-11 5:14 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 17/28] gup: Add gup_put_folio() Matthew Wilcox (Oracle)
2022-01-10 8:35 ` Christoph Hellwig
2022-01-11 6:44 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 18/28] hugetlb: Use try_grab_folio() instead of try_grab_compound_head() Matthew Wilcox (Oracle)
2022-01-10 8:36 ` Christoph Hellwig
2022-01-11 6:47 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 19/28] gup: Convert try_grab_page() to call try_grab_folio() Matthew Wilcox (Oracle)
2022-01-10 8:36 ` Christoph Hellwig
2022-01-11 7:01 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 20/28] gup: Convert gup_pte_range() to use a folio Matthew Wilcox (Oracle)
2022-01-10 8:37 ` Christoph Hellwig
2022-01-11 7:06 ` John Hubbard
2022-01-10 4:23 ` [PATCH v2 21/28] gup: Convert gup_hugepte() " Matthew Wilcox (Oracle)
2022-01-10 8:37 ` Christoph Hellwig
2022-01-11 7:33 ` John Hubbard
2022-01-10 4:24 ` [PATCH v2 22/28] gup: Convert gup_huge_pmd() " Matthew Wilcox (Oracle)
2022-01-10 8:37 ` Christoph Hellwig
2022-01-11 7:36 ` John Hubbard
2022-01-10 4:24 ` [PATCH v2 23/28] gup: Convert gup_huge_pud() " Matthew Wilcox (Oracle)
2022-01-10 8:38 ` Christoph Hellwig
2022-01-11 7:38 ` John Hubbard
2022-01-10 4:24 ` [PATCH v2 24/28] gup: Convert gup_huge_pgd() " Matthew Wilcox (Oracle)
2022-01-10 8:38 ` Christoph Hellwig
2022-01-11 7:38 ` John Hubbard
2022-01-10 4:24 ` [PATCH v2 25/28] gup: Convert compound_next() to gup_folio_next() Matthew Wilcox (Oracle)
2022-01-10 8:39 ` Christoph Hellwig
2022-01-11 7:41 ` John Hubbard
2022-01-10 4:24 ` [PATCH v2 26/28] gup: Convert compound_range_next() to gup_folio_range_next() Matthew Wilcox (Oracle)
2022-01-10 8:41 ` Christoph Hellwig
2022-01-10 13:41 ` Matthew Wilcox
2022-01-11 7:44 ` John Hubbard
2022-01-10 4:24 ` [PATCH v2 27/28] mm: Add isolate_lru_folio() Matthew Wilcox (Oracle)
2022-01-10 8:42 ` Christoph Hellwig
2022-01-11 7:49 ` John Hubbard
2022-01-10 4:24 ` [PATCH v2 28/28] gup: Convert check_and_migrate_movable_pages() to use a folio Matthew Wilcox (Oracle)
2022-01-10 8:42 ` Christoph Hellwig
2022-01-11 7:52 ` John Hubbard
2022-01-10 15:31 ` [PATCH v2 00/28] Convert GUP to folios Jason Gunthorpe
2022-01-10 16:09 ` Matthew Wilcox
2022-01-10 17:26 ` William Kucharski
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=20220110042406.499429-3-willy@infradead.org \
--to=willy@infradead.org \
--cc=hch@infradead.org \
--cc=jgg@ziepe.ca \
--cc=jhubbard@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=william.kucharski@oracle.com \
/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;
as well as URLs for NNTP newsgroup(s).