From: Vlastimil Babka <vbabka@suse.cz>
To: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
akpm@linux-foundation.org
Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
Jeff Layton <jlayton@kernel.org>
Subject: Re: [PATCH v10 19/33] mm/filemap: Add folio_lock
Date: Tue, 18 May 2021 12:26:03 +0200 [thread overview]
Message-ID: <eed3b8f5-42b8-d7d7-7b6d-1512091485e6@suse.cz> (raw)
In-Reply-To: <20210511214735.1836149-20-willy@infradead.org>
On 5/11/21 11:47 PM, Matthew Wilcox (Oracle) wrote:
> This is like lock_page() but for use by callers who know they have a folio.
> Convert __lock_page() to be __folio_lock(). This saves one call to
> compound_head() per contended call to lock_page().
>
> Saves 362 bytes of text; mostly from improved register allocation and
> inlining decisions. __folio_lock is 59 bytes while __lock_page was 79.
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> Acked-by: Jeff Layton <jlayton@kernel.org>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
> ---
> include/linux/pagemap.h | 24 +++++++++++++++++++-----
> mm/filemap.c | 29 +++++++++++++++--------------
> 2 files changed, 34 insertions(+), 19 deletions(-)
>
> diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
> index 8dbba0074536..9a78397609b8 100644
> --- a/include/linux/pagemap.h
> +++ b/include/linux/pagemap.h
> @@ -638,7 +638,7 @@ static inline bool wake_page_match(struct wait_page_queue *wait_page,
> return true;
> }
>
> -extern void __lock_page(struct page *page);
> +void __folio_lock(struct folio *folio);
> extern int __lock_page_killable(struct page *page);
> extern int __lock_page_async(struct page *page, struct wait_page_queue *wait);
> extern int __lock_page_or_retry(struct page *page, struct mm_struct *mm,
> @@ -646,13 +646,24 @@ extern int __lock_page_or_retry(struct page *page, struct mm_struct *mm,
> void unlock_page(struct page *page);
> void folio_unlock(struct folio *folio);
>
> +static inline bool folio_trylock(struct folio *folio)
> +{
> + return likely(!test_and_set_bit_lock(PG_locked, folio_flags(folio, 0)));
> +}
> +
> /*
> * Return true if the page was successfully locked
> */
> static inline int trylock_page(struct page *page)
> {
> - page = compound_head(page);
> - return (likely(!test_and_set_bit_lock(PG_locked, &page->flags)));
> + return folio_trylock(page_folio(page));
> +}
> +
> +static inline void folio_lock(struct folio *folio)
> +{
> + might_sleep();
> + if (!folio_trylock(folio))
> + __folio_lock(folio);
> }
>
> /*
> @@ -660,9 +671,12 @@ static inline int trylock_page(struct page *page)
> */
> static inline void lock_page(struct page *page)
> {
> + struct folio *folio;
> might_sleep();
> - if (!trylock_page(page))
> - __lock_page(page);
> +
> + folio = page_folio(page);
> + if (!folio_trylock(folio))
> + __folio_lock(folio);
> }
>
> /*
> diff --git a/mm/filemap.c b/mm/filemap.c
> index e7a6a58d6cd9..c6e5ba176764 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -1187,7 +1187,7 @@ static void wake_up_page(struct page *page, int bit)
> */
> enum behavior {
> EXCLUSIVE, /* Hold ref to page and take the bit when woken, like
> - * __lock_page() waiting on then setting PG_locked.
> + * __folio_lock() waiting on then setting PG_locked.
> */
> SHARED, /* Hold ref to page and check the bit when woken, like
> * wait_on_page_writeback() waiting on PG_writeback.
> @@ -1576,17 +1576,16 @@ void page_endio(struct page *page, bool is_write, int err)
> EXPORT_SYMBOL_GPL(page_endio);
>
> /**
> - * __lock_page - get a lock on the page, assuming we need to sleep to get it
> - * @__page: the page to lock
> + * __folio_lock - Get a lock on the folio, assuming we need to sleep to get it.
> + * @folio: The folio to lock
> */
> -void __lock_page(struct page *__page)
> +void __folio_lock(struct folio *folio)
> {
> - struct page *page = compound_head(__page);
> - wait_queue_head_t *q = page_waitqueue(page);
> - wait_on_page_bit_common(q, page, PG_locked, TASK_UNINTERRUPTIBLE,
> + wait_queue_head_t *q = page_waitqueue(&folio->page);
> + wait_on_page_bit_common(q, &folio->page, PG_locked, TASK_UNINTERRUPTIBLE,
> EXCLUSIVE);
> }
> -EXPORT_SYMBOL(__lock_page);
> +EXPORT_SYMBOL(__folio_lock);
>
> int __lock_page_killable(struct page *__page)
> {
> @@ -1661,10 +1660,10 @@ int __lock_page_or_retry(struct page *page, struct mm_struct *mm,
> return 0;
> }
> } else {
> - __lock_page(page);
> + __folio_lock(page_folio(page));
> }
> - return 1;
>
> + return 1;
> }
>
> /**
> @@ -2835,7 +2834,9 @@ loff_t mapping_seek_hole_data(struct address_space *mapping, loff_t start,
> static int lock_page_maybe_drop_mmap(struct vm_fault *vmf, struct page *page,
> struct file **fpin)
> {
> - if (trylock_page(page))
> + struct folio *folio = page_folio(page);
> +
> + if (folio_trylock(folio))
> return 1;
>
> /*
> @@ -2848,7 +2849,7 @@ static int lock_page_maybe_drop_mmap(struct vm_fault *vmf, struct page *page,
>
> *fpin = maybe_unlock_mmap_for_io(vmf, *fpin);
> if (vmf->flags & FAULT_FLAG_KILLABLE) {
> - if (__lock_page_killable(page)) {
> + if (__lock_page_killable(&folio->page)) {
> /*
> * We didn't have the right flags to drop the mmap_lock,
> * but all fault_handlers only check for fatal signals
> @@ -2860,11 +2861,11 @@ static int lock_page_maybe_drop_mmap(struct vm_fault *vmf, struct page *page,
> return 0;
> }
> } else
> - __lock_page(page);
> + __folio_lock(folio);
> +
> return 1;
> }
>
> -
> /*
> * Synchronous readahead happens when we don't even find a page in the page
> * cache at all. We don't want to perform IO under the mmap sem, so if we have
>
next prev parent reply other threads:[~2021-05-18 10:26 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-11 21:47 [PATCH v10 00/33] Memory folios Matthew Wilcox (Oracle)
2021-05-11 21:47 ` [PATCH v10 01/33] mm: Introduce struct folio Matthew Wilcox (Oracle)
2021-05-14 10:34 ` Vlastimil Babka
2021-05-14 10:40 ` Vlastimil Babka
2021-05-14 11:47 ` Matthew Wilcox
2021-05-15 10:55 ` William Kucharski
2021-05-15 20:14 ` Matthew Wilcox
2021-05-16 19:26 ` William Kucharski
2021-05-27 8:09 ` Christoph Hellwig
2021-05-11 21:47 ` [PATCH v10 02/33] mm: Add folio_pgdat and folio_zone Matthew Wilcox (Oracle)
2021-05-14 10:35 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 03/33] mm/vmstat: Add functions to account folio statistics Matthew Wilcox (Oracle)
2021-05-14 10:36 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 04/33] mm/debug: Add VM_BUG_ON_FOLIO and VM_WARN_ON_ONCE_FOLIO Matthew Wilcox (Oracle)
2021-05-14 10:44 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 05/33] mm: Add folio reference count functions Matthew Wilcox (Oracle)
2021-05-14 11:04 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 06/33] mm: Add folio_put Matthew Wilcox (Oracle)
2021-05-14 11:52 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 07/33] mm: Add folio_get Matthew Wilcox (Oracle)
2021-05-14 11:56 ` Vlastimil Babka
2021-05-14 14:24 ` Matthew Wilcox
2021-05-14 15:39 ` Vlastimil Babka
2021-05-27 8:10 ` Christoph Hellwig
2021-05-27 22:53 ` Andrew Morton
2021-05-11 21:47 ` [PATCH v10 08/33] mm: Add folio_try_get_rcu Matthew Wilcox (Oracle)
2021-05-14 12:11 ` Vlastimil Babka
2021-05-27 8:16 ` Christoph Hellwig
2021-06-05 4:26 ` Matthew Wilcox
2021-06-06 14:13 ` Christoph Hellwig
2021-05-11 21:47 ` [PATCH v10 09/33] mm: Add folio flag manipulation functions Matthew Wilcox (Oracle)
2021-05-14 15:29 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 10/33] mm: Add folio_young and folio_idle Matthew Wilcox (Oracle)
2021-05-14 15:33 ` Vlastimil Babka
2021-05-27 8:17 ` Christoph Hellwig
2021-05-11 21:47 ` [PATCH v10 11/33] mm: Handle per-folio private data Matthew Wilcox (Oracle)
2021-05-14 15:41 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 12/33] mm/filemap: Add folio_index, folio_file_page and folio_contains Matthew Wilcox (Oracle)
2021-05-14 15:55 ` Vlastimil Babka
2021-05-15 15:51 ` Matthew Wilcox
2021-05-11 21:47 ` [PATCH v10 13/33] mm/filemap: Add folio_next_index Matthew Wilcox (Oracle)
2021-05-14 17:07 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 14/33] mm/filemap: Add folio_offset and folio_file_offset Matthew Wilcox (Oracle)
2021-05-14 17:08 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 15/33] mm/util: Add folio_mapping and folio_file_mapping Matthew Wilcox (Oracle)
2021-05-14 17:29 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 16/33] mm: Add folio_mapcount Matthew Wilcox (Oracle)
2021-05-14 17:39 ` Vlastimil Babka
2021-05-18 18:45 ` Matthew Wilcox
2021-05-11 21:47 ` [PATCH v10 17/33] mm/memcg: Add folio wrappers for various functions Matthew Wilcox (Oracle)
2021-05-18 9:57 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 18/33] mm/filemap: Add folio_unlock Matthew Wilcox (Oracle)
2021-05-18 10:06 ` Vlastimil Babka
2021-05-18 11:30 ` Matthew Wilcox
2021-05-11 21:47 ` [PATCH v10 19/33] mm/filemap: Add folio_lock Matthew Wilcox (Oracle)
2021-05-18 10:26 ` Vlastimil Babka [this message]
2021-05-11 21:47 ` [PATCH v10 20/33] mm/filemap: Add folio_lock_killable Matthew Wilcox (Oracle)
2021-05-18 10:31 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 21/33] mm/filemap: Add __folio_lock_async Matthew Wilcox (Oracle)
2021-05-18 10:34 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 22/33] mm/filemap: Add __folio_lock_or_retry Matthew Wilcox (Oracle)
2021-05-18 10:38 ` Vlastimil Babka
2021-05-18 10:45 ` Vlastimil Babka
2021-05-18 13:35 ` Matthew Wilcox
2021-05-11 21:47 ` [PATCH v10 23/33] mm/filemap: Add folio_wait_locked Matthew Wilcox (Oracle)
2021-05-18 10:41 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 24/33] mm/swap: Add folio_rotate_reclaimable Matthew Wilcox (Oracle)
2021-05-18 10:48 ` Vlastimil Babka
2021-05-27 8:19 ` Christoph Hellwig
2021-05-11 21:47 ` [PATCH v10 25/33] mm/filemap: Add folio_end_writeback Matthew Wilcox (Oracle)
2021-05-18 11:08 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 26/33] mm/writeback: Add folio_wait_writeback Matthew Wilcox (Oracle)
2021-05-18 11:12 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 27/33] mm/writeback: Add folio_wait_stable Matthew Wilcox (Oracle)
2021-05-18 11:42 ` Vlastimil Babka
2021-05-18 13:55 ` Matthew Wilcox
2021-05-11 21:47 ` [PATCH v10 28/33] mm/filemap: Add folio_wait_bit Matthew Wilcox (Oracle)
2021-05-18 11:51 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 29/33] mm/filemap: Add folio_wake_bit Matthew Wilcox (Oracle)
2021-05-18 11:53 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 30/33] mm/filemap: Convert page wait queues to be folios Matthew Wilcox (Oracle)
2021-05-18 12:23 ` Vlastimil Babka
2021-05-11 21:47 ` [PATCH v10 31/33] mm/filemap: Add folio private_2 functions Matthew Wilcox (Oracle)
2021-05-18 12:26 ` Vlastimil Babka
2021-05-27 8:21 ` Christoph Hellwig
2021-05-11 21:47 ` [PATCH v10 32/33] fs/netfs: Add folio fscache functions Matthew Wilcox (Oracle)
2021-05-18 13:48 ` Vlastimil Babka
2021-05-27 8:23 ` Christoph Hellwig
2021-05-11 21:47 ` [PATCH v10 33/33] mm: Add folio_mapped Matthew Wilcox (Oracle)
2021-05-18 14:17 ` Vlastimil Babka
2021-05-27 8:31 ` Christoph Hellwig
2021-05-13 14:50 ` [PATCH v10 00/33] Memory folios Matthew Wilcox
2021-05-15 10:26 ` William Kucharski
2021-06-04 1:07 ` Matteo Croce
2021-06-04 2:13 ` Matthew Wilcox
2021-06-08 14:56 ` Matteo Croce
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=eed3b8f5-42b8-d7d7-7b6d-1512091485e6@suse.cz \
--to=vbabka@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=hch@lst.de \
--cc=jlayton@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=willy@infradead.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;
as well as URLs for NNTP newsgroup(s).