LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: John Hubbard <jhubbard@nvidia.com>
To: William Kucharski <william.kucharski@oracle.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Heiko Carstens <hca@linux.ibm.com>,
	Vasily Gorbik <gor@linux.ibm.com>,
	Christian Borntraeger <borntraeger@de.ibm.com>,
	LKML <linux-kernel@vger.kernel.org>,
	"linux-mm@kvack.org" <linux-mm@kvack.org>,
	"linux-s390@vger.kernel.org" <linux-s390@vger.kernel.org>,
	"linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>,
	Christoph Hellwig <hch@lst.de>,
	Matthew Wilcox <willy@infradead.org>
Subject: Re: [PATCH v2 3/3] mm/gup: Remove try_get_page(), call try_get_compound_head() directly
Date: Wed, 11 Aug 2021 15:07:16 -0700	[thread overview]
Message-ID: <0253d7e6-8377-a197-f131-e73249d8dbe8@nvidia.com> (raw)
In-Reply-To: <20FB1F52-61FB-47DB-8777-E7C880FD875E@oracle.com>

On 8/11/21 1:35 PM, William Kucharski wrote:
> I agree that try_get_page() should probably be removed entirely; is there
> a reason you didn't in v2 of the patch?

Hi William,

This patch *does* remove try_get_page() entirely! Look below. I'll reply
inline, below, to show where that happens.

> 
> I'm also curious why you changed try_get_compound_head() into a routine
> from an inline.

It was part of the change to make it available to callers outside of
gup.c. try_get_compound_head() is slightly messy and doesn't like to
live in mm.h, because it calls page_cache_add_speculative(), which lives
in linux-pagemap.h, which, in turn, has its own set of different headers
that it pulls in.

So, leaving it in gup.c, and exposing it to the other callers as a
non-static function, seemed appropriate here.

> 
> If you want to retain try_get_page() it should be an inline as well, especially
> in its current implementation.
> 
>      William Kucharski
> 
>> On Aug 11, 2021, at 1:05 AM, John Hubbard <jhubbard@nvidia.com> wrote:
>>
>> try_get_page() is very similar to try_get_compound_head(), and in fact
>> try_get_page() has fallen a little behind in terms of maintenance:
>> try_get_compound_head() handles speculative page references more
>> thoroughly.
>>
>> There are only two try_get_page() callsites, so just call
>> try_get_compound_head() directly from those, and remove try_get_page()
>> entirely.
>>
>> Also, seeing as how this changes try_get_compound_head() into a
>> non-static function, provide some kerneldoc documentation for it.
>>
>> Cc: Christoph Hellwig <hch@lst.de>
>> Cc: Matthew Wilcox <willy@infradead.org>
>> Signed-off-by: John Hubbard <jhubbard@nvidia.com>
>> ---
>> arch/s390/mm/fault.c |  2 +-
>> fs/pipe.c            |  2 +-
>> include/linux/mm.h   | 10 +---------
>> mm/gup.c             | 21 +++++++++++++++++----
>> 4 files changed, 20 insertions(+), 15 deletions(-)
>>
>> diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
>> index 212632d57db9..fe1d2c1dbe3b 100644
>> --- a/arch/s390/mm/fault.c
>> +++ b/arch/s390/mm/fault.c
>> @@ -822,7 +822,7 @@ void do_secure_storage_access(struct pt_regs *regs)
>> 		break;
>> 	case KERNEL_FAULT:
>> 		page = phys_to_page(addr);
>> -		if (unlikely(!try_get_page(page)))
>> +		if (unlikely(try_get_compound_head(page, 1) == NULL))
>> 			break;
>> 		rc = arch_make_page_accessible(page);
>> 		put_page(page);
>> diff --git a/fs/pipe.c b/fs/pipe.c
>> index 8e6ef62aeb1c..06ba9df37410 100644
>> --- a/fs/pipe.c
>> +++ b/fs/pipe.c
>> @@ -191,7 +191,7 @@ EXPORT_SYMBOL(generic_pipe_buf_try_steal);
>>   */
>> bool generic_pipe_buf_get(struct pipe_inode_info *pipe, struct pipe_buffer *buf)
>> {
>> -	return try_get_page(buf->page);
>> +	return try_get_compound_head(buf->page, 1) != NULL;
>> }
>> EXPORT_SYMBOL(generic_pipe_buf_get);
>>
>> diff --git a/include/linux/mm.h b/include/linux/mm.h
>> index ce8fc0fd6d6e..cd00d1222235 100644
>> --- a/include/linux/mm.h
>> +++ b/include/linux/mm.h
>> @@ -1207,15 +1207,7 @@ bool __must_check try_grab_page(struct page *page, unsigned int flags);
>> __maybe_unused struct page *try_grab_compound_head(struct page *page, int refs,
>> 						   unsigned int flags);
>>
>> -
>> -static inline __must_check bool try_get_page(struct page *page)
>> -{
>> -	page = compound_head(page);
>> -	if (WARN_ON_ONCE(page_ref_count(page) <= 0))
>> -		return false;
>> -	page_ref_inc(page);
>> -	return true;
>> -}

This is where try_get_page() is removed entirely.

thanks,
-- 
John Hubbard
NVIDIA


>> +struct page *try_get_compound_head(struct page *page, int refs);
>>
>> /**
>>   * folio_put - Decrement the reference count on a folio.
>> diff --git a/mm/gup.c b/mm/gup.c
>> index 64798d6b5043..c2d19d370c99 100644
>> --- a/mm/gup.c
>> +++ b/mm/gup.c
>> @@ -62,11 +62,24 @@ static void put_page_refs(struct page *page, int refs)
>> 	put_page(page);
>> }
>>
>> -/*
>> - * Return the compound head page with ref appropriately incremented,
>> - * or NULL if that failed.
>> +/**
>> + * try_get_compound_head() - return the compound head page with refcount
>> + * appropriately incremented, or NULL if that failed.
>> + *
>> + * This handles potential refcount overflow correctly. It also works correctly
>> + * for various lockless get_user_pages()-related callers, due to the use of
>> + * page_cache_add_speculative().
>> + *
>> + * Even though the name includes "compound_head", this function is still
>> + * appropriate for callers that have a non-compound @page to get.
>> + *
>> + * @page:  pointer to page to be gotten
>> + * @refs:  the value to add to the page's refcount
>> + *
>> + * Return: head page (with refcount appropriately incremented) for success, or
>> + * NULL upon failure.
>>   */
>> -static inline struct page *try_get_compound_head(struct page *page, int refs)
>> +struct page *try_get_compound_head(struct page *page, int refs)
>> {
>> 	struct page *head = compound_head(page);
>>
>> -- 
>> 2.32.0
>>
>>
> 
> 

  reply	other threads:[~2021-08-11 22:07 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-11  7:05 [PATCH v2 0/3] A few gup refactorings and documentation updates John Hubbard
2021-08-11  7:05 ` [PATCH v2 1/3] mm/gup: documentation corrections for gup/pup John Hubbard
2021-08-11  7:05 ` [PATCH v2 2/3] mm/gup: small refactoring: simplify try_grab_page() John Hubbard
2021-08-12  9:20   ` Christoph Hellwig
2021-08-12 21:59     ` John Hubbard
2021-08-11  7:05 ` [PATCH v2 3/3] mm/gup: Remove try_get_page(), call try_get_compound_head() directly John Hubbard
2021-08-11 20:35   ` William Kucharski
2021-08-11 22:07     ` John Hubbard [this message]
2021-08-12  2:17       ` William Kucharski
2021-08-12  9:22   ` Christoph Hellwig
2021-08-12 18:19     ` John Hubbard

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=0253d7e6-8377-a197-f131-e73249d8dbe8@nvidia.com \
    --to=jhubbard@nvidia.com \
    --cc=akpm@linux-foundation.org \
    --cc=borntraeger@de.ibm.com \
    --cc=gor@linux.ibm.com \
    --cc=hca@linux.ibm.com \
    --cc=hch@lst.de \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=william.kucharski@oracle.com \
    --cc=willy@infradead.org \
    --subject='Re: [PATCH v2 3/3] mm/gup: Remove try_get_page(), call try_get_compound_head() directly' \
    /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

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).