Commit 6315d8a2 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

mm/gup: Remove hpage_pincount_sub() 



Move the assertion (and correct it to be a cheaper variant),
and inline the atomic_sub() operation.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarWilliam Kucharski <william.kucharski@oracle.com>
parent 78d9d6ce

mm/gup.c

+3 −10
Original line number Diff line number Diff line
@@ -29,14 +29,6 @@ struct follow_page_context { 
	unsigned int page_mask;

};



static void hpage_pincount_sub(struct page *page, int refs)

{

	VM_BUG_ON_PAGE(!hpage_pincount_available(page), page);

	VM_BUG_ON_PAGE(page != compound_head(page), page);



	atomic_sub(refs, compound_pincount_ptr(page));

}



/* Equivalent to calling put_page() @refs times. */

static void put_page_refs(struct page *page, int refs)

{
@@ -169,12 +161,13 @@ __maybe_unused struct page *try_grab_compound_head(struct page *page, 


static void put_compound_head(struct page *page, int refs, unsigned int flags)

{

	VM_BUG_ON_PAGE(PageTail(page), page);



	if (flags & FOLL_PIN) {

		mod_node_page_state(page_pgdat(page), NR_FOLL_PIN_RELEASED,

				    refs);



		if (hpage_pincount_available(page))

			hpage_pincount_sub(page, refs);

			atomic_sub(refs, compound_pincount_ptr(page));

		else

			refs *= GUP_PIN_COUNTING_BIAS;

	}