From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-mm@kvack.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-cachefs@redhat.com, linux-afs@lists.infradead.org
Subject: [PATCH v6 23/27] mm/writeback: Add wait_on_folio_writeback
Date: Wed, 31 Mar 2021 19:47:24 +0100 [thread overview]
Message-ID: <20210331184728.1188084-24-willy@infradead.org> (raw)
In-Reply-To: <20210331184728.1188084-1-willy@infradead.org>
wait_on_page_writeback_killable() only has one caller, so convert it to
call wait_on_folio_writeback_killable(). For the wait_on_page_writeback()
callers, add a compatibility wrapper around wait_on_folio_writeback().
Turning PageWriteback() into FolioWriteback() eliminates a call to
compound_head() which saves 8 bytes and 15 bytes in the two functions.
That is more than offset by adding the wait_on_page_writeback
compatibility wrapper for a net increase in text of 15 bytes.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
fs/afs/write.c | 5 +++--
include/linux/pagemap.h | 3 ++-
mm/folio-compat.c | 6 ++++++
mm/page-writeback.c | 48 ++++++++++++++++++++++++++++-------------
4 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/fs/afs/write.c b/fs/afs/write.c
index 106a864b6a93..7af2b57e601b 100644
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@ -831,7 +831,8 @@ int afs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
*/
vm_fault_t afs_page_mkwrite(struct vm_fault *vmf)
{
- struct page *page = thp_head(vmf->page);
+ struct folio *folio = page_folio(vmf->page);
+ struct page *page = &folio->page;
struct file *file = vmf->vma->vm_file;
struct inode *inode = file_inode(file);
struct afs_vnode *vnode = AFS_FS_I(inode);
@@ -850,7 +851,7 @@ vm_fault_t afs_page_mkwrite(struct vm_fault *vmf)
return VM_FAULT_RETRY;
#endif
- if (wait_on_page_writeback_killable(page))
+ if (wait_on_folio_writeback_killable(folio))
return VM_FAULT_RETRY;
if (lock_page_killable(page) < 0)
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 36c31cfa3e64..2be3a028eb3d 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -829,7 +829,8 @@ static inline int wait_on_page_locked_killable(struct page *page)
int put_and_wait_on_page_locked(struct page *page, int state);
void wait_on_page_writeback(struct page *page);
-int wait_on_page_writeback_killable(struct page *page);
+void wait_on_folio_writeback(struct folio *folio);
+int wait_on_folio_writeback_killable(struct folio *folio);
void end_page_writeback(struct page *page);
void end_folio_writeback(struct folio *folio);
void wait_for_stable_page(struct page *page);
diff --git a/mm/folio-compat.c b/mm/folio-compat.c
index d1a1dfe52589..6aadecc39fba 100644
--- a/mm/folio-compat.c
+++ b/mm/folio-compat.c
@@ -23,3 +23,9 @@ void end_page_writeback(struct page *page)
return end_folio_writeback(page_folio(page));
}
EXPORT_SYMBOL(end_page_writeback);
+
+void wait_on_page_writeback(struct page *page)
+{
+ return wait_on_folio_writeback(page_folio(page));
+}
+EXPORT_SYMBOL_GPL(wait_on_page_writeback);
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 0062d5c57d41..8271f9b24b69 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -2818,33 +2818,51 @@ int __test_set_page_writeback(struct page *page, bool keep_write)
}
EXPORT_SYMBOL(__test_set_page_writeback);
-/*
- * Wait for a page to complete writeback
+/**
+ * wait_on_folio_writeback - Wait for a folio to finish writeback.
+ * @folio: The folio to wait for.
+ *
+ * If the folio is currently being written back to storage, wait for the
+ * I/O to complete.
+ *
+ * Context: Sleeps. Must be called in process context and with
+ * no spinlocks held. Caller should hold a reference on the folio.
+ * If the folio is not locked, writeback may start again after writeback
+ * has finished.
*/
-void wait_on_page_writeback(struct page *page)
+void wait_on_folio_writeback(struct folio *folio)
{
- while (PageWriteback(page)) {
- trace_wait_on_page_writeback(page, page_mapping(page));
- wait_on_page_bit(page, PG_writeback);
+ while (FolioWriteback(folio)) {
+ trace_wait_on_page_writeback(&folio->page, folio_mapping(folio));
+ wait_on_page_bit(&folio->page, PG_writeback);
}
}
-EXPORT_SYMBOL_GPL(wait_on_page_writeback);
+EXPORT_SYMBOL_GPL(wait_on_folio_writeback);
-/*
- * Wait for a page to complete writeback. Returns -EINTR if we get a
- * fatal signal while waiting.
+/**
+ * wait_on_folio_writeback_killable - Wait for a folio to finish writeback.
+ * @folio: The folio to wait for.
+ *
+ * If the folio is currently being written back to storage, wait for the
+ * I/O to complete or a fatal signal to arrive.
+ *
+ * Context: Sleeps. Must be called in process context and with
+ * no spinlocks held. Caller should hold a reference on the folio.
+ * If the folio is not locked, writeback may start again after writeback
+ * has finished.
+ * Return: 0 on success, -EINTR if we get a fatal signal while waiting.
*/
-int wait_on_page_writeback_killable(struct page *page)
+int wait_on_folio_writeback_killable(struct folio *folio)
{
- while (PageWriteback(page)) {
- trace_wait_on_page_writeback(page, page_mapping(page));
- if (wait_on_page_bit_killable(page, PG_writeback))
+ while (FolioWriteback(folio)) {
+ trace_wait_on_page_writeback(&folio->page, folio_mapping(folio));
+ if (wait_on_page_bit_killable(&folio->page, PG_writeback))
return -EINTR;
}
return 0;
}
-EXPORT_SYMBOL_GPL(wait_on_page_writeback_killable);
+EXPORT_SYMBOL_GPL(wait_on_folio_writeback_killable);
/**
* wait_for_stable_page() - wait for writeback to finish, if necessary.
--
2.30.2
next prev parent reply other threads:[~2021-03-31 18:55 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-31 18:47 [PATCH v6 00/27] Memory Folios Matthew Wilcox (Oracle)
2021-03-31 18:47 ` [PATCH v6 01/27] mm: Introduce struct folio Matthew Wilcox (Oracle)
2021-04-06 12:29 ` Kirill A. Shutemov
2021-04-06 12:48 ` Matthew Wilcox
2021-04-06 14:21 ` Kirill A. Shutemov
2021-04-06 14:31 ` Christoph Hellwig
2021-04-06 14:40 ` Matthew Wilcox
2021-04-06 14:47 ` Christoph Hellwig
2021-04-06 14:55 ` Matthew Wilcox
2021-04-06 15:05 ` Christoph Hellwig
2021-04-06 16:25 ` Matthew Wilcox
2021-04-07 6:09 ` Christoph Hellwig
2021-04-08 9:01 ` Rasmus Villemoes
2021-03-31 18:47 ` [PATCH v6 02/27] mm: Add folio_pgdat and folio_zone Matthew Wilcox (Oracle)
2021-04-06 13:23 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 03/27] mm/vmstat: Add functions to account folio statistics Matthew Wilcox (Oracle)
2021-04-06 13:25 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 04/27] mm/debug: Add VM_BUG_ON_FOLIO and VM_WARN_ON_ONCE_FOLIO Matthew Wilcox (Oracle)
2021-04-06 13:26 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 05/27] mm: Add folio reference count functions Matthew Wilcox (Oracle)
2021-04-06 13:30 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 06/27] mm: Add put_folio Matthew Wilcox (Oracle)
2021-04-06 13:31 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 07/27] mm: Add get_folio Matthew Wilcox (Oracle)
2021-04-06 13:32 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 08/27] mm: Create FolioFlags Matthew Wilcox (Oracle)
2021-04-06 13:34 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 09/27] mm: Handle per-folio private data Matthew Wilcox (Oracle)
2021-04-06 13:37 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 10/27] mm/filemap: Add folio_index, folio_file_page and folio_contains Matthew Wilcox (Oracle)
2021-04-06 13:39 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 11/27] mm/filemap: Add folio_next_index Matthew Wilcox (Oracle)
2021-04-06 13:40 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 12/27] mm/filemap: Add folio_offset and folio_file_offset Matthew Wilcox (Oracle)
2021-04-06 13:42 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 13/27] mm/util: Add folio_mapping and folio_file_mapping Matthew Wilcox (Oracle)
2021-04-06 13:45 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 14/27] mm: Add folio_mapcount Matthew Wilcox (Oracle)
2021-04-06 13:46 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 15/27] mm/memcg: Add folio wrappers for various functions Matthew Wilcox (Oracle)
2021-04-06 13:48 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 16/27] mm/filemap: Add unlock_folio Matthew Wilcox (Oracle)
2021-04-06 13:51 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 17/27] mm/filemap: Add lock_folio Matthew Wilcox (Oracle)
2021-04-06 13:52 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 18/27] mm/filemap: Add lock_folio_killable Matthew Wilcox (Oracle)
2021-04-06 13:53 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 19/27] mm/filemap: Add __lock_folio_async Matthew Wilcox (Oracle)
2021-04-06 13:55 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 20/27] mm/filemap: Add __lock_folio_or_retry Matthew Wilcox (Oracle)
2021-04-06 13:57 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 21/27] mm/filemap: Add wait_on_folio_locked Matthew Wilcox (Oracle)
2021-04-06 14:11 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 22/27] mm/filemap: Add end_folio_writeback Matthew Wilcox (Oracle)
2021-04-06 14:13 ` Christoph Hellwig
2021-03-31 18:47 ` Matthew Wilcox (Oracle) [this message]
2021-04-06 14:15 ` [PATCH v6 23/27] mm/writeback: Add wait_on_folio_writeback Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 24/27] mm/writeback: Add wait_for_stable_folio Matthew Wilcox (Oracle)
2021-04-06 14:18 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 25/27] mm/filemap: Convert wait_on_page_bit to wait_on_folio_bit Matthew Wilcox (Oracle)
2021-04-06 14:19 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 26/27] mm/filemap: Convert wake_up_page_bit to wake_up_folio_bit Matthew Wilcox (Oracle)
2021-04-06 14:23 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 27/27] mm/filemap: Convert page wait queues to be folios Matthew Wilcox (Oracle)
2021-04-06 14:25 ` Christoph Hellwig
2021-04-01 7:05 ` [PATCH v6 00/27] Memory Folios Christoph Hellwig
2021-04-01 11:26 ` Matthew Wilcox
2021-04-01 12:28 ` Jason Gunthorpe
2021-04-01 12:52 ` Matthew Wilcox
2021-04-01 13:30 ` Jason Gunthorpe
2021-04-02 14:37 ` Christoph Hellwig
2021-04-02 14:49 ` Matthew Wilcox
2021-04-03 0:31 ` Kent Overstreet
2021-04-05 19:14 ` Jeff Layton
2021-04-05 19:31 ` Matthew Wilcox
2021-04-06 15:14 ` Jeff Layton
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=20210331184728.1188084-24-willy@infradead.org \
--to=willy@infradead.org \
--cc=linux-afs@lists.infradead.org \
--cc=linux-cachefs@redhat.com \
--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).