From: Brian Foster <bfoster@redhat.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-mm@kvack.org
Subject: Re: [PATCH 04/18] xfs: simplify xfs_aops_discard_page
Date: Wed, 30 May 2018 09:35:46 -0400 [thread overview]
Message-ID: <20180530133546.GD112411@bfoster.bfoster> (raw)
In-Reply-To: <20180530100013.31358-5-hch@lst.de>
On Wed, May 30, 2018 at 11:59:59AM +0200, Christoph Hellwig wrote:
> Instead of looking at the buffer heads to see if a block is delalloc just
> call xfs_bmap_punch_delalloc_range on the whole page - this will leave
> any non-delalloc block intact and handle the iteration for us. As a side
> effect one more place stops caring about buffer heads and we can remove the
> xfs_check_page_type function entirely.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_aops.c | 85 +++++------------------------------------------
> 1 file changed, 9 insertions(+), 76 deletions(-)
>
> diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
> index c631c457b444..f2333e351e07 100644
> --- a/fs/xfs/xfs_aops.c
> +++ b/fs/xfs/xfs_aops.c
> @@ -711,49 +711,6 @@ xfs_map_at_offset(
> clear_buffer_unwritten(bh);
> }
>
> -/*
> - * Test if a given page contains at least one buffer of a given @type.
> - * If @check_all_buffers is true, then we walk all the buffers in the page to
> - * try to find one of the type passed in. If it is not set, then the caller only
> - * needs to check the first buffer on the page for a match.
> - */
> -STATIC bool
> -xfs_check_page_type(
> - struct page *page,
> - unsigned int type,
> - bool check_all_buffers)
> -{
> - struct buffer_head *bh;
> - struct buffer_head *head;
> -
> - if (PageWriteback(page))
> - return false;
> - if (!page->mapping)
> - return false;
> - if (!page_has_buffers(page))
> - return false;
> -
> - bh = head = page_buffers(page);
> - do {
> - if (buffer_unwritten(bh)) {
> - if (type == XFS_IO_UNWRITTEN)
> - return true;
> - } else if (buffer_delay(bh)) {
> - if (type == XFS_IO_DELALLOC)
> - return true;
> - } else if (buffer_dirty(bh) && buffer_mapped(bh)) {
> - if (type == XFS_IO_OVERWRITE)
> - return true;
> - }
> -
> - /* If we are only checking the first buffer, we are done now. */
> - if (!check_all_buffers)
> - break;
> - } while ((bh = bh->b_this_page) != head);
> -
> - return false;
> -}
> -
> STATIC void
> xfs_vm_invalidatepage(
> struct page *page,
> @@ -785,9 +742,6 @@ xfs_vm_invalidatepage(
> * transaction. Indeed - if we get ENOSPC errors, we have to be able to do this
> * truncation without a transaction as there is no space left for block
> * reservation (typically why we see a ENOSPC in writeback).
> - *
> - * This is not a performance critical path, so for now just do the punching a
> - * buffer head at a time.
> */
> STATIC void
> xfs_aops_discard_page(
> @@ -795,47 +749,26 @@ xfs_aops_discard_page(
> {
> struct inode *inode = page->mapping->host;
> struct xfs_inode *ip = XFS_I(inode);
> - struct buffer_head *bh, *head;
> + struct xfs_mount *mp = ip->i_mount;
> loff_t offset = page_offset(page);
> + xfs_fileoff_t start_fsb = XFS_B_TO_FSBT(mp, offset);
> + int error;
>
> - if (!xfs_check_page_type(page, XFS_IO_DELALLOC, true))
> - goto out_invalidate;
> -
> - if (XFS_FORCED_SHUTDOWN(ip->i_mount))
> + if (XFS_FORCED_SHUTDOWN(mp))
> goto out_invalidate;
>
> - xfs_alert(ip->i_mount,
> + xfs_alert(mp,
> "page discard on page "PTR_FMT", inode 0x%llx, offset %llu.",
> page, ip->i_ino, offset);
>
> xfs_ilock(ip, XFS_ILOCK_EXCL);
> - bh = head = page_buffers(page);
> - do {
> - int error;
> - xfs_fileoff_t start_fsb;
> -
> - if (!buffer_delay(bh))
> - goto next_buffer;
> -
> - start_fsb = XFS_B_TO_FSBT(ip->i_mount, offset);
> - error = xfs_bmap_punch_delalloc_range(ip, start_fsb, 1);
> - if (error) {
> - /* something screwed, just bail */
> - if (!XFS_FORCED_SHUTDOWN(ip->i_mount)) {
> - xfs_alert(ip->i_mount,
> - "page discard unable to remove delalloc mapping.");
> - }
> - break;
> - }
> -next_buffer:
> - offset += i_blocksize(inode);
> -
> - } while ((bh = bh->b_this_page) != head);
> -
> + error = xfs_bmap_punch_delalloc_range(ip, start_fsb,
> + PAGE_SIZE / i_blocksize(inode));
> xfs_iunlock(ip, XFS_ILOCK_EXCL);
> + if (error && !XFS_FORCED_SHUTDOWN(mp))
> + xfs_alert(mp, "page discard unable to remove delalloc mapping.");
> out_invalidate:
> xfs_vm_invalidatepage(page, 0, PAGE_SIZE);
> - return;
> }
>
> static int
> --
> 2.17.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2018-05-30 13:35 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-30 9:59 buffered writes without buffer heads in xfs and iomap v4 Christoph Hellwig
2018-05-30 9:59 ` [PATCH 01/18] fs: factor out a __generic_write_end helper Christoph Hellwig
2018-05-30 13:34 ` Brian Foster
2018-05-30 16:26 ` Darrick J. Wong
2018-05-30 9:59 ` [PATCH 02/18] iomap: add initial support for writes without buffer heads Christoph Hellwig
2018-05-30 13:34 ` Brian Foster
2018-05-30 16:33 ` Darrick J. Wong
2018-05-30 9:59 ` [PATCH 03/18] xfs: simplify xfs_bmap_punch_delalloc_range Christoph Hellwig
2018-05-30 13:35 ` Brian Foster
2018-05-30 16:55 ` Darrick J. Wong
2018-05-30 9:59 ` [PATCH 04/18] xfs: simplify xfs_aops_discard_page Christoph Hellwig
2018-05-30 13:35 ` Brian Foster [this message]
2018-05-30 16:40 ` Darrick J. Wong
2018-05-30 10:00 ` [PATCH 05/18] xfs: move locking into xfs_bmap_punch_delalloc_range Christoph Hellwig
2018-05-30 13:35 ` Brian Foster
2018-05-30 16:58 ` Darrick J. Wong
2018-05-30 17:40 ` Brian Foster
2018-05-30 10:00 ` [PATCH 06/18] xfs: make xfs_writepage_map extent map centric Christoph Hellwig
2018-05-30 17:19 ` Darrick J. Wong
2018-05-30 17:39 ` Brian Foster
2018-05-31 16:11 ` Christoph Hellwig
2018-05-31 16:12 ` Christoph Hellwig
2018-05-30 10:00 ` [PATCH 07/18] xfs: remove the now unused XFS_BMAPI_IGSTATE flag Christoph Hellwig
2018-05-30 17:19 ` Darrick J. Wong
2018-05-31 13:46 ` Brian Foster
2018-05-31 16:11 ` Christoph Hellwig
2018-05-30 10:00 ` [PATCH 08/18] xfs: remove xfs_reflink_find_cow_mapping Christoph Hellwig
2018-05-30 17:23 ` Darrick J. Wong
2018-05-31 13:46 ` Brian Foster
2018-05-30 10:00 ` [PATCH 09/18] xfs: remove xfs_reflink_trim_irec_to_next_cow Christoph Hellwig
2018-05-30 17:27 ` Darrick J. Wong
2018-05-31 13:46 ` Brian Foster
2018-05-30 10:00 ` [PATCH 10/18] xfs: simplify xfs_map_blocks by using xfs_iext_lookup_extent directly Christoph Hellwig
2018-05-30 17:32 ` Darrick J. Wong
2018-05-31 13:46 ` Brian Foster
2018-05-30 10:00 ` [PATCH 11/18] xfs: don't clear imap_valid for a non-uptodate buffers Christoph Hellwig
2018-05-30 17:34 ` Darrick J. Wong
2018-05-31 13:46 ` Brian Foster
2018-05-30 10:00 ` [PATCH 12/18] xfs: remove the imap_valid flag Christoph Hellwig
2018-05-30 17:44 ` Darrick J. Wong
2018-05-31 13:47 ` Brian Foster
2018-05-30 10:00 ` [PATCH 13/18] xfs: don't look at buffer heads in xfs_add_to_ioend Christoph Hellwig
2018-05-30 17:55 ` Darrick J. Wong
2018-05-31 7:03 ` Christoph Hellwig
2018-05-31 13:49 ` Brian Foster
2018-05-30 10:00 ` [PATCH 14/18] xfs: move all writeback buffer_head manipulation into xfs_map_at_offset Christoph Hellwig
2018-05-30 17:56 ` Darrick J. Wong
2018-05-31 13:49 ` Brian Foster
2018-05-30 10:00 ` [PATCH 15/18] xfs: remove xfs_start_page_writeback Christoph Hellwig
2018-05-30 17:57 ` Darrick J. Wong
2018-05-31 13:49 ` Brian Foster
2018-05-30 10:00 ` [PATCH 16/18] xfs: refactor the tail of xfs_writepage_map Christoph Hellwig
2018-05-30 18:00 ` Darrick J. Wong
2018-05-31 13:49 ` Brian Foster
2018-05-30 10:00 ` [PATCH 17/18] xfs: do not set the page uptodate in xfs_writepage_map Christoph Hellwig
2018-05-30 18:08 ` Darrick J. Wong
2018-05-31 7:04 ` Christoph Hellwig
2018-05-31 13:49 ` Brian Foster
2018-05-30 10:00 ` [PATCH 18/18] xfs: allow writeback on pages without buffer heads Christoph Hellwig
2018-05-30 18:08 ` Darrick J. Wong
2018-05-31 13:49 ` Brian Foster
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=20180530133546.GD112411@bfoster.bfoster \
--to=bfoster@redhat.com \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-xfs@vger.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).