From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org
Subject: [PATCH 19/22] xfs: allow writeback on pages without buffer heads
Date: Mon, 2 Jul 2018 08:58:10 -0600 [thread overview]
Message-ID: <20180702145813.22496-20-hch@lst.de> (raw)
In-Reply-To: <20180702145813.22496-1-hch@lst.de>
Disable the IOMAP_F_BUFFER_HEAD flag on file systems with a block size
equal to the page size, and deal with pages without buffer heads in
writeback. Thanks to the previous refactoring this is basically trivial
now.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/xfs_aops.c | 51 +++++++++++++++++++++++++++++++++-------------
fs/xfs/xfs_iomap.c | 3 ++-
2 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index c8e0d3055153..0058f9893705 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -79,6 +79,19 @@ xfs_find_daxdev_for_inode(
return mp->m_ddev_targp->bt_daxdev;
}
+static void
+xfs_finish_page_writeback(
+ struct inode *inode,
+ struct bio_vec *bvec,
+ int error)
+{
+ if (error) {
+ SetPageError(bvec->bv_page);
+ mapping_set_error(inode->i_mapping, -EIO);
+ }
+ end_page_writeback(bvec->bv_page);
+}
+
/*
* We're now finished for good with this page. Update the page state via the
* associated buffer_heads, paying attention to the start and end offsets that
@@ -91,7 +104,7 @@ xfs_find_daxdev_for_inode(
* and buffers potentially freed after every call to end_buffer_async_write.
*/
static void
-xfs_finish_page_writeback(
+xfs_finish_buffer_writeback(
struct inode *inode,
struct bio_vec *bvec,
int error)
@@ -166,9 +179,12 @@ xfs_destroy_ioend(
next = bio->bi_private;
/* walk each page on bio, ending page IO on them */
- bio_for_each_segment_all(bvec, bio, i)
- xfs_finish_page_writeback(inode, bvec, error);
-
+ bio_for_each_segment_all(bvec, bio, i) {
+ if (page_has_buffers(bvec->bv_page))
+ xfs_finish_buffer_writeback(inode, bvec, error);
+ else
+ xfs_finish_page_writeback(inode, bvec, error);
+ }
bio_put(bio);
}
@@ -792,13 +808,16 @@ xfs_writepage_map(
{
LIST_HEAD(submit_list);
struct xfs_ioend *ioend, *next;
- struct buffer_head *bh;
+ struct buffer_head *bh = NULL;
ssize_t len = i_blocksize(inode);
uint64_t file_offset; /* file offset of page */
unsigned poffset; /* offset into page */
int error = 0;
int count = 0;
+ if (page_has_buffers(page))
+ bh = page_buffers(page);
+
/*
* Walk the blocks on the page, and if we run off the end of the current
* map or find the current map invalid, grab a new one. We only use
@@ -806,28 +825,34 @@ xfs_writepage_map(
* the iteration through the page. This allows us to replace the
* bufferhead with some other state tracking mechanism in future.
*/
- file_offset = page_offset(page);
- bh = page_buffers(page);
- for (poffset = 0;
+ for (poffset = 0, file_offset = page_offset(page);
poffset < PAGE_SIZE;
- poffset += len, file_offset += len, bh = bh->b_this_page) {
+ poffset += len, file_offset += len) {
/* past the range we are writing, so nothing more to write. */
if (file_offset >= end_offset)
break;
- if (!buffer_uptodate(bh)) {
+ if (bh && !buffer_uptodate(bh)) {
if (PageUptodate(page))
ASSERT(buffer_mapped(bh));
+ bh = bh->b_this_page;
continue;
}
error = xfs_map_blocks(wpc, inode, file_offset);
if (error)
break;
- if (wpc->io_type == XFS_IO_HOLE)
+
+ if (wpc->io_type == XFS_IO_HOLE) {
+ if (bh)
+ bh = bh->b_this_page;
continue;
+ }
- xfs_map_at_offset(inode, bh, &wpc->imap, file_offset);
+ if (bh) {
+ xfs_map_at_offset(inode, bh, &wpc->imap, file_offset);
+ bh = bh->b_this_page;
+ }
xfs_add_to_ioend(inode, file_offset, page, wpc, wbc,
&submit_list);
count++;
@@ -925,8 +950,6 @@ xfs_do_writepage(
trace_xfs_writepage(inode, page, 0, 0);
- ASSERT(page_has_buffers(page));
-
/*
* Refuse to write the page out if we are called from reclaim context.
*
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 10c54fc7d1b4..7fe42a126ec1 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -1032,7 +1032,8 @@ xfs_file_iomap_begin(
if (XFS_FORCED_SHUTDOWN(mp))
return -EIO;
- iomap->flags |= IOMAP_F_BUFFER_HEAD;
+ if (i_blocksize(inode) < PAGE_SIZE)
+ iomap->flags |= IOMAP_F_BUFFER_HEAD;
if (((flags & (IOMAP_WRITE | IOMAP_DIRECT)) == IOMAP_WRITE) &&
!IS_DAX(inode) && !xfs_get_extsz_hint(ip)) {
--
2.18.0
next prev parent reply other threads:[~2018-07-02 14:58 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-02 14:57 stop using buffer heads in xfs v7 Christoph Hellwig
2018-07-02 14:57 ` [PATCH 01/22] xfs: use iomap for blocksize == PAGE_SIZE readpage and readpages Christoph Hellwig
2018-07-02 14:57 ` [PATCH 02/22] xfs: simplify xfs_aops_discard_page Christoph Hellwig
2018-07-02 14:57 ` [PATCH 03/22] xfs: move locking into xfs_bmap_punch_delalloc_range Christoph Hellwig
2018-07-02 14:57 ` [PATCH 04/22] xfs: do not set the page uptodate in xfs_writepage_map Christoph Hellwig
2018-07-02 14:57 ` [PATCH 05/22] xfs: don't clear imap_valid for a non-uptodate buffers Christoph Hellwig
2018-07-02 14:57 ` [PATCH 06/22] xfs: don't use XFS_BMAPI_IGSTATE in xfs_map_blocks Christoph Hellwig
2018-07-02 14:57 ` [PATCH 07/22] xfs: remove xfs_reflink_trim_irec_to_next_cow Christoph Hellwig
2018-07-02 14:57 ` [PATCH 08/22] xfs: remove xfs_map_cow Christoph Hellwig
2018-07-02 14:58 ` [PATCH 09/22] xfs: rename the offset variable in xfs_writepage_map Christoph Hellwig
2018-07-02 14:58 ` [PATCH 10/22] xfs: make xfs_writepage_map extent map centric Christoph Hellwig
2018-07-02 14:58 ` [PATCH 11/22] xfs: remove the now unused XFS_BMAPI_IGSTATE flag Christoph Hellwig
2018-07-02 14:58 ` [PATCH 12/22] xfs: remove xfs_reflink_find_cow_mapping Christoph Hellwig
2018-07-02 14:58 ` [PATCH 13/22] xfs: simplify xfs_map_blocks by using xfs_iext_lookup_extent directly Christoph Hellwig
2018-07-02 14:58 ` [PATCH 14/22] xfs: remove the imap_valid flag Christoph Hellwig
2018-07-02 14:58 ` [PATCH 15/22] xfs: don't look at buffer heads in xfs_add_to_ioend Christoph Hellwig
2018-07-02 14:58 ` [PATCH 16/22] xfs: move all writeback buffer_head manipulation into xfs_map_at_offset Christoph Hellwig
2018-07-02 14:58 ` [PATCH 17/22] xfs: remove xfs_start_page_writeback Christoph Hellwig
2018-07-02 14:58 ` [PATCH 18/22] xfs: refactor the tail of xfs_writepage_map Christoph Hellwig
2018-07-02 14:58 ` Christoph Hellwig [this message]
2018-07-02 14:58 ` [PATCH 20/22] iomap: add support for sub-pagesize buffered I/O without buffer heads Christoph Hellwig
2018-07-03 12:31 ` Brian Foster
2018-07-03 21:52 ` Darrick J. Wong
2018-07-02 14:58 ` [PATCH 21/22] xfs: add support for sub-pagesize writeback without buffer_heads Christoph Hellwig
2018-07-03 12:36 ` Brian Foster
2018-07-03 22:05 ` Darrick J. Wong
2018-07-08 15:16 ` Christoph Hellwig
2018-07-10 1:02 ` Brian Foster
2018-07-10 12:15 ` Christoph Hellwig
2018-07-11 10:58 ` Brian Foster
2018-07-02 14:58 ` [PATCH 22/22] xfs: update my copyrights for the writeback and iomap code Christoph Hellwig
2018-07-03 12:36 ` Brian Foster
2018-07-03 21:51 ` Darrick J. Wong
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=20180702145813.22496-20-hch@lst.de \
--to=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.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).