From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
cluster-devel@redhat.com, Hannes Reinecke <hare@suse.com>,
Luis Chamberlain <mcgrof@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Andreas Gruenbacher <agruenba@redhat.com>
Subject: [PATCH v3 07/14] buffer: Convert block_page_mkwrite() to use a folio
Date: Mon, 12 Jun 2023 22:01:34 +0100 [thread overview]
Message-ID: <20230612210141.730128-8-willy@infradead.org> (raw)
In-Reply-To: <20230612210141.730128-1-willy@infradead.org>
If any page in a folio is dirtied, dirty the entire folio. Removes a
number of hidden calls to compound_head() and references to page->mapping
and page->index. Fixes a pre-existing bug where we could mark a folio
as dirty if the file is truncated to a multiple of the page size just
as we take the page fault. I don't believe this bug has any bad effect,
it's just inefficient.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
fs/buffer.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/fs/buffer.c b/fs/buffer.c
index 34ecf55d2f12..0af167e8a9c6 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2564,38 +2564,37 @@ EXPORT_SYMBOL(block_commit_write);
int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
get_block_t get_block)
{
- struct page *page = vmf->page;
+ struct folio *folio = page_folio(vmf->page);
struct inode *inode = file_inode(vma->vm_file);
unsigned long end;
loff_t size;
int ret;
- lock_page(page);
+ folio_lock(folio);
size = i_size_read(inode);
- if ((page->mapping != inode->i_mapping) ||
- (page_offset(page) > size)) {
+ if ((folio->mapping != inode->i_mapping) ||
+ (folio_pos(folio) >= size)) {
/* We overload EFAULT to mean page got truncated */
ret = -EFAULT;
goto out_unlock;
}
- /* page is wholly or partially inside EOF */
- if (((page->index + 1) << PAGE_SHIFT) > size)
- end = size & ~PAGE_MASK;
- else
- end = PAGE_SIZE;
+ end = folio_size(folio);
+ /* folio is wholly or partially inside EOF */
+ if (folio_pos(folio) + end > size)
+ end = size - folio_pos(folio);
- ret = __block_write_begin(page, 0, end, get_block);
+ ret = __block_write_begin_int(folio, 0, end, get_block, NULL);
if (!ret)
- ret = block_commit_write(page, 0, end);
+ ret = block_commit_write(&folio->page, 0, end);
if (unlikely(ret < 0))
goto out_unlock;
- set_page_dirty(page);
- wait_for_stable_page(page);
+ folio_mark_dirty(folio);
+ folio_wait_stable(folio);
return 0;
out_unlock:
- unlock_page(page);
+ folio_unlock(folio);
return ret;
}
EXPORT_SYMBOL(block_page_mkwrite);
--
2.39.2
next prev parent reply other threads:[~2023-06-12 21:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-12 21:01 [PATCH v3 00/14] gfs2/buffer folio changes for 6.5 Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 01/14] gfs2: Use a folio inside gfs2_jdata_writepage() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 02/14] gfs2: Pass a folio to __gfs2_jdata_write_folio() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 03/14] gfs2: Convert gfs2_write_jdata_page() to gfs2_write_jdata_folio() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 04/14] buffer: Convert __block_write_full_page() to __block_write_full_folio() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 05/14] gfs2: Support ludicrously large folios in gfs2_trans_add_databufs() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 06/14] buffer: Make block_write_full_page() handle large folios correctly Matthew Wilcox (Oracle)
2023-06-12 21:01 ` Matthew Wilcox (Oracle) [this message]
2023-06-12 21:01 ` [PATCH v3 08/14] buffer: Convert __block_commit_write() to take a folio Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 09/14] buffer: Convert page_zero_new_buffers() to folio_zero_new_buffers() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 10/14] buffer: Convert grow_dev_page() to use a folio Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 11/14] buffer: Convert init_page_buffers() to folio_init_buffers() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 12/14] buffer: Convert link_dev_buffers to take a folio Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 13/14] buffer: Use a folio in __find_get_block_slow() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 14/14] buffer: Convert block_truncate_page() to use a folio Matthew Wilcox (Oracle)
2023-06-12 21:28 ` [PATCH v3 00/14] gfs2/buffer folio changes for 6.5 Andreas Gruenbacher
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=20230612210141.730128-8-willy@infradead.org \
--to=willy@infradead.org \
--cc=agruenba@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=cluster-devel@redhat.com \
--cc=hare@suse.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=mcgrof@kernel.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).