From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 16/25] mm: Convert lock_page_async to lock_folio_async
Date: Thu, 28 Jan 2021 07:03:55 +0000 [thread overview]
Message-ID: <20210128070404.1922318-17-willy@infradead.org> (raw)
In-Reply-To: <20210128070404.1922318-1-willy@infradead.org>
When the caller already has a folio, this saves a call to compound_head().
If not, the call to compound_head() is merely moved.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
fs/io_uring.c | 2 +-
include/linux/pagemap.h | 14 +++++++-------
mm/filemap.c | 12 ++++++------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 03748faa5295..2627160ffd4c 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3398,7 +3398,7 @@ static int io_read_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
}
/*
- * This is our waitqueue callback handler, registered through lock_page_async()
+ * This is our waitqueue callback handler, registered through lock_folio_async()
* when we initially tried to do the IO with the iocb armed our waitqueue.
* This gets called when the page is unlocked, and we generally expect that to
* happen when the page IO is completed and the page is now uptodate. This will
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 93a4ab9feaa8..131d1aa2af61 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -620,7 +620,7 @@ static inline bool wake_page_match(struct wait_page_queue *wait_page,
void __lock_folio(struct folio *folio);
int __lock_folio_killable(struct folio *folio);
-extern int __lock_page_async(struct page *page, struct wait_page_queue *wait);
+int __lock_folio_async(struct folio *folio, struct wait_page_queue *wait);
extern int __lock_page_or_retry(struct page *page, struct mm_struct *mm,
unsigned int flags);
void unlock_folio(struct folio *folio);
@@ -687,18 +687,18 @@ static inline int lock_page_killable(struct page *page)
}
/*
- * lock_page_async - Lock the page, unless this would block. If the page
- * is already locked, then queue a callback when the page becomes unlocked.
+ * lock_folio_async - Lock the folio, unless this would block. If the folio
+ * is already locked, then queue a callback when the folio becomes unlocked.
* This callback can then retry the operation.
*
- * Returns 0 if the page is locked successfully, or -EIOCBQUEUED if the page
+ * Returns 0 if the folio is locked successfully, or -EIOCBQUEUED if the folio
* was already locked and the callback defined in 'wait' was queued.
*/
-static inline int lock_page_async(struct page *page,
+static inline int lock_folio_async(struct folio *folio,
struct wait_page_queue *wait)
{
- if (!trylock_page(page))
- return __lock_page_async(page, wait);
+ if (!trylock_folio(folio))
+ return __lock_folio_async(folio, wait);
return 0;
}
diff --git a/mm/filemap.c b/mm/filemap.c
index c378b28c2bdc..a54eb4641385 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1524,18 +1524,18 @@ int __lock_folio_killable(struct folio *folio)
}
EXPORT_SYMBOL_GPL(__lock_folio_killable);
-int __lock_page_async(struct page *page, struct wait_page_queue *wait)
+int __lock_folio_async(struct folio *folio, struct wait_page_queue *wait)
{
- struct wait_queue_head *q = page_waitqueue(page);
+ struct wait_queue_head *q = page_waitqueue(&folio->page);
int ret = 0;
- wait->page = page;
+ wait->page = &folio->page;
wait->bit_nr = PG_locked;
spin_lock_irq(&q->lock);
__add_wait_queue_entry_tail(q, &wait->wait);
- SetPageWaiters(page);
- ret = !trylock_page(page);
+ SetFolioWaiters(folio);
+ ret = !trylock_folio(folio);
/*
* If we were successful now, we know we're still on the
* waitqueue as we're still under the lock. This means it's
@@ -2293,7 +2293,7 @@ static int filemap_update_page(struct kiocb *iocb,
put_and_wait_on_page_locked(page, TASK_KILLABLE);
return AOP_TRUNCATED_PAGE;
}
- error = __lock_page_async(page, iocb->ki_waitq);
+ error = __lock_folio_async(page_folio(page), iocb->ki_waitq);
if (error)
return error;
}
--
2.29.2
next prev parent reply other threads:[~2021-01-28 7:04 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-28 7:03 [PATCH v3 00/25] Page folios Matthew Wilcox (Oracle)
2021-01-28 7:03 ` [PATCH v3 01/25] mm: Introduce struct folio Matthew Wilcox (Oracle)
2021-03-01 20:26 ` Zi Yan
2021-03-01 20:53 ` Matthew Wilcox
2021-03-01 21:03 ` Zi Yan
2021-01-28 7:03 ` [PATCH v3 02/25] mm: Add folio_pgdat Matthew Wilcox (Oracle)
2021-03-01 21:05 ` Zi Yan
2021-01-28 7:03 ` [PATCH v3 03/25] mm/vmstat: Add folio stat wrappers Matthew Wilcox (Oracle)
2021-03-01 21:17 ` Zi Yan
2021-03-01 22:15 ` Matthew Wilcox
2021-01-28 7:03 ` [PATCH v3 04/25] mm/debug: Add VM_BUG_ON_FOLIO and VM_WARN_ON_ONCE_FOLIO Matthew Wilcox (Oracle)
2021-03-01 21:25 ` Zi Yan
2021-01-28 7:03 ` [PATCH v3 05/25] mm: Add put_folio Matthew Wilcox (Oracle)
2021-03-01 21:41 ` Zi Yan
2021-01-28 7:03 ` [PATCH v3 06/25] mm: Add get_folio Matthew Wilcox (Oracle)
2021-03-01 21:45 ` Zi Yan
2021-01-28 7:03 ` [PATCH v3 07/25] mm: Create FolioFlags Matthew Wilcox (Oracle)
2021-01-28 7:03 ` [PATCH v3 08/25] mm: Handle per-folio private data Matthew Wilcox (Oracle)
2021-01-28 7:03 ` [PATCH v3 09/25] mm: Add folio_index, folio_page and folio_contains Matthew Wilcox (Oracle)
2021-01-28 7:03 ` [PATCH v3 10/25] mm/util: Add folio_mapping and folio_file_mapping Matthew Wilcox (Oracle)
2021-01-28 7:03 ` [PATCH v3 11/25] mm/memcg: Add folio_memcg, lock_folio_memcg and unlock_folio_memcg Matthew Wilcox (Oracle)
2021-01-28 7:03 ` [PATCH v3 12/25] mm/memcg: Add mem_cgroup_folio_lruvec Matthew Wilcox (Oracle)
2021-01-28 7:03 ` [PATCH v3 13/25] mm: Add unlock_folio Matthew Wilcox (Oracle)
2021-01-28 7:03 ` [PATCH v3 14/25] mm: Add lock_folio Matthew Wilcox (Oracle)
2021-01-28 7:03 ` [PATCH v3 15/25] mm: Add lock_folio_killable Matthew Wilcox (Oracle)
2021-01-28 7:03 ` Matthew Wilcox (Oracle) [this message]
2021-01-28 7:03 ` [PATCH v3 17/25] mm/filemap: Convert end_page_writeback to end_folio_writeback Matthew Wilcox (Oracle)
2021-01-28 7:03 ` [PATCH v3 18/25] mm: Convert wait_on_page_bit to wait_on_folio_bit Matthew Wilcox (Oracle)
2021-01-28 7:03 ` [PATCH v3 19/25] mm: Add wait_for_stable_folio and wait_on_folio_writeback Matthew Wilcox (Oracle)
2021-01-28 7:03 ` [PATCH v3 20/25] mm: Add wait_on_folio_locked & wait_on_folio_locked_killable Matthew Wilcox (Oracle)
2021-01-28 7:04 ` [PATCH v3 21/25] mm: Convert lock_page_or_retry to lock_folio_or_retry Matthew Wilcox (Oracle)
2021-01-28 7:04 ` [PATCH v3 22/25] mm/filemap: Convert wake_up_page_bit to wake_up_folio_bit Matthew Wilcox (Oracle)
2021-01-28 7:04 ` [PATCH v3 23/25] mm: Convert test_clear_page_writeback to test_clear_folio_writeback Matthew Wilcox (Oracle)
2021-01-28 7:04 ` [PATCH v3 24/25] mm/filemap: Convert page wait queues to be folios Matthew Wilcox (Oracle)
2021-01-28 7:04 ` [PATCH v3 25/25] cachefiles: Switch to wait_page_key Matthew Wilcox (Oracle)
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=20210128070404.1922318-17-willy@infradead.org \
--to=willy@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.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).