From: Andreas Grünbacher <andreas.gruenbacher@gmail.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH v2 07/14] buffer: Convert block_page_mkwrite() to use a folio
Date: Wed, 7 Jun 2023 01:26:03 +0200 [thread overview]
Message-ID: <CAHpGcMJgZ3ik4NBW5fY-3nZcQRF+GCfJ=S9+mtndokOi8Lc1fA@mail.gmail.com> (raw)
In-Reply-To: <20230606223346.3241328-8-willy@infradead.org>
Am Mi., 7. Juni 2023 um 00:48 Uhr schrieb Matthew Wilcox (Oracle)
<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.
>
> 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 d8c2c000676b..f34ed29b1085 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)) {
This should probably also be 'folio_pos(folio) >= size', but this was
wrong before this patch already.
> /* 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_set_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
>
Thanks,
Andreas
next prev parent reply other threads:[~2023-06-06 23:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-06 22:33 [Cluster-devel] [PATCH v2 00/14] gfs2/buffer folio changes for 6.5 Matthew Wilcox
2023-06-06 22:33 ` [Cluster-devel] [PATCH v2 01/14] gfs2: Use a folio inside gfs2_jdata_writepage() Matthew Wilcox
2023-06-06 22:33 ` [Cluster-devel] [PATCH v2 02/14] gfs2: Pass a folio to __gfs2_jdata_write_folio() Matthew Wilcox
2023-06-06 22:33 ` [Cluster-devel] [PATCH v2 03/14] gfs2: Convert gfs2_write_jdata_page() to gfs2_write_jdata_folio() Matthew Wilcox
2023-06-06 22:33 ` [Cluster-devel] [PATCH v2 04/14] buffer: Convert __block_write_full_page() to __block_write_full_folio() Matthew Wilcox
2023-06-06 22:33 ` [Cluster-devel] [PATCH v2 05/14] gfs2: Support ludicrously large folios in gfs2_trans_add_databufs() Matthew Wilcox
2023-06-06 22:33 ` [Cluster-devel] [PATCH v2 06/14] buffer: Make block_write_full_page() handle large folios correctly Matthew Wilcox
2023-06-06 23:15 ` Andreas Grünbacher
2023-06-06 22:33 ` [Cluster-devel] [PATCH v2 07/14] buffer: Convert block_page_mkwrite() to use a folio Matthew Wilcox
2023-06-06 23:26 ` Andreas Grünbacher [this message]
2023-06-06 22:33 ` [Cluster-devel] [PATCH v2 08/14] buffer: Convert __block_commit_write() to take " Matthew Wilcox
2023-06-06 22:33 ` [Cluster-devel] [PATCH v2 09/14] buffer; Convert page_zero_new_buffers() to folio_zero_new_buffers() Matthew Wilcox
2023-06-06 22:33 ` [Cluster-devel] [PATCH v2 10/14] buffer: Convert grow_dev_page() to use a folio Matthew Wilcox
2023-06-06 22:33 ` [Cluster-devel] [PATCH v2 11/14] buffer: Convert init_page_buffers() to folio_init_buffers() Matthew Wilcox
2023-06-06 22:33 ` [Cluster-devel] [PATCH v2 12/14] buffer: Convert link_dev_buffers to take a folio Matthew Wilcox
2023-06-06 22:33 ` [Cluster-devel] [PATCH v2 13/14] buffer: Use a folio in __find_get_block_slow() Matthew Wilcox
2023-06-06 22:33 ` [Cluster-devel] [PATCH v2 14/14] buffer: Convert block_truncate_page() to use a folio Matthew Wilcox
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='CAHpGcMJgZ3ik4NBW5fY-3nZcQRF+GCfJ=S9+mtndokOi8Lc1fA@mail.gmail.com' \
--to=andreas.gruenbacher@gmail.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).