diff mbox series

[v2,2/3] mm/gup: small refactoring: simplify try_grab_page()

Message ID 20210811070542.3403116-3-jhubbard@nvidia.com (mailing list archive)
State New, archived
Headers show
Series A few gup refactorings and documentation updates | expand

Commit Message

John Hubbard Aug. 11, 2021, 7:05 a.m. UTC 
try_grab_page() does the same thing as try_grab_compound_head(...,
refs=1, ...), just with a different API. So there is a lot of code
duplication there.

Change try_grab_page() to call try_grab_compound_head(), while keeping
the API contract identical for callers.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 mm/gup.c | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

Comments

Christoph Hellwig Aug. 12, 2021, 9:20 a.m. UTC | #1 
Looks good,

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

Note: the __maybe_unused on try_grab_compound_head should be dropped now
that there is always a user.
John Hubbard Aug. 12, 2021, 9:59 p.m. UTC | #2 
On 8/12/21 2:20 AM, Christoph Hellwig wrote:
> Looks good,
> 
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> 
> Note: the __maybe_unused on try_grab_compound_head should be dropped now
> that there is always a user.


Good point, fixed in v3.


thanks,
diff mbox series

Patch

diff --git a/mm/gup.c b/mm/gup.c
index 52f08e3177e9..64798d6b5043 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -208,35 +208,10 @@  static void put_compound_head(struct page *page, int refs, unsigned int flags)
  */
 bool __must_check try_grab_page(struct page *page, unsigned int flags)
 {
-	WARN_ON_ONCE((flags & (FOLL_GET | FOLL_PIN)) == (FOLL_GET | FOLL_PIN));
+	if (!(flags & (FOLL_GET | FOLL_PIN)))
+		return true;
 
-	if (flags & FOLL_GET)
-		return try_get_page(page);
-	else if (flags & FOLL_PIN) {
-		int refs = 1;
-
-		page = compound_head(page);
-
-		if (WARN_ON_ONCE(page_ref_count(page) <= 0))
-			return false;
-
-		if (hpage_pincount_available(page))
-			hpage_pincount_add(page, 1);
-		else
-			refs = GUP_PIN_COUNTING_BIAS;
-
-		/*
-		 * Similar to try_grab_compound_head(): even if using the
-		 * hpage_pincount_add/_sub() routines, be sure to
-		 * *also* increment the normal page refcount field at least
-		 * once, so that the page really is pinned.
-		 */
-		page_ref_add(page, refs);
-
-		mod_node_page_state(page_pgdat(page), NR_FOLL_PIN_ACQUIRED, 1);
-	}
-
-	return true;
+	return try_grab_compound_head(page, 1, flags) != NULL;
 }
 
 /**