From: Christoph Hellwig <hch@lst.de>
To: "Darrick J . Wong" <darrick.wong@oracle.com>
Cc: Damien Le Moal <Damien.LeMoal@wdc.com>,
Andreas Gruenbacher <agruenba@redhat.com>,
linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org, Dave Chinner <dchinner@redhat.com>
Subject: [PATCH 01/14] iomap: iomap that extends beyond EOF should be marked dirty
Date: Thu, 17 Oct 2019 19:56:11 +0200 [thread overview]
Message-ID: <20191017175624.30305-2-hch@lst.de> (raw)
In-Reply-To: <20191017175624.30305-1-hch@lst.de>
From: Dave Chinner <dchinner@redhat.com>
When doing a direct IO that spans the current EOF, and there are
written blocks beyond EOF that extend beyond the current write, the
only metadata update that needs to be done is a file size extension.
However, we don't mark such iomaps as IOMAP_F_DIRTY to indicate that
there is IO completion metadata updates required, and hence we may
fail to correctly sync file size extensions made in IO completion
when O_DSYNC writes are being used and the hardware supports FUA.
Hence when setting IOMAP_F_DIRTY, we need to also take into account
whether the iomap spans the current EOF. If it does, then we need to
mark it dirty so that IO completion will call generic_write_sync()
to flush the inode size update to stable storage correctly.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/ext4/inode.c | 9 ++++++++-
fs/xfs/xfs_iomap.c | 7 +++++++
include/linux/iomap.h | 2 ++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 516faa280ced..e9dc52537e5b 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3523,9 +3523,16 @@ static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
return ret;
}
+ /*
+ * Writes that span EOF might trigger an IO size update on completion,
+ * so consider them to be dirty for the purposes of O_DSYNC even if
+ * there is no other metadata changes being made or are pending here.
+ */
iomap->flags = 0;
- if (ext4_inode_datasync_dirty(inode))
+ if (ext4_inode_datasync_dirty(inode) ||
+ offset + length > i_size_read(inode))
iomap->flags |= IOMAP_F_DIRTY;
+
iomap->bdev = inode->i_sb->s_bdev;
iomap->dax_dev = sbi->s_daxdev;
iomap->offset = (u64)first_block << blkbits;
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index f780e223b118..32993c2acbd9 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -1049,6 +1049,13 @@ xfs_file_iomap_begin(
trace_xfs_iomap_alloc(ip, offset, length, XFS_DATA_FORK, &imap);
out_finish:
+ /*
+ * Writes that span EOF might trigger an IO size update on completion,
+ * so consider them to be dirty for the purposes of O_DSYNC even if
+ * there is no other metadata changes pending or have been made here.
+ */
+ if ((flags & IOMAP_WRITE) && offset + length > i_size_read(inode))
+ iomap->flags |= IOMAP_F_DIRTY;
return xfs_bmbt_to_iomap(ip, iomap, &imap, shared);
out_found:
diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index 7aa5d6117936..24bd227d59f9 100644
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -32,6 +32,8 @@ struct vm_fault;
*
* IOMAP_F_DIRTY indicates the inode has uncommitted metadata needed to access
* written data and requires fdatasync to commit them to persistent storage.
+ * This needs to take into account metadata changes that *may* be made at IO
+ * completion, such as file size updates from direct IO.
*/
#define IOMAP_F_NEW 0x01 /* blocks have been newly allocated */
#define IOMAP_F_DIRTY 0x02 /* uncommitted metadata */
--
2.20.1
next prev parent reply other threads:[~2019-10-17 17:56 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-17 17:56 lift the xfs writepage code into iomap v8 Christoph Hellwig
2019-10-17 17:56 ` Christoph Hellwig [this message]
2019-10-17 18:39 ` [PATCH 01/14] iomap: iomap that extends beyond EOF should be marked dirty Darrick J. Wong
2019-10-17 21:56 ` Dave Chinner
2019-10-17 23:08 ` Matthew Bobrowski
2019-10-18 1:02 ` Darrick J. Wong
2019-10-18 7:20 ` Christoph Hellwig
2019-10-17 17:56 ` [PATCH 02/14] xfs: initialize iomap->flags in xfs_bmbt_to_iomap Christoph Hellwig
2019-10-17 17:56 ` [PATCH 03/14] xfs: set IOMAP_F_NEW more carefully Christoph Hellwig
2019-10-17 17:56 ` [PATCH 04/14] xfs: use a struct iomap in xfs_writepage_ctx Christoph Hellwig
2019-10-17 17:56 ` [PATCH 05/14] xfs: refactor the ioend merging code Christoph Hellwig
2019-10-17 18:40 ` Darrick J. Wong
2019-10-17 17:56 ` [PATCH 06/14] xfs: turn io_append_trans into an io_private void pointer Christoph Hellwig
2019-10-17 17:56 ` [PATCH 07/14] xfs: remove the fork fields in the writepage_ctx and ioend Christoph Hellwig
2019-10-17 17:56 ` [PATCH 08/14] iomap: zero newly allocated mapped blocks Christoph Hellwig
2019-10-17 17:56 ` [PATCH 09/14] iomap: lift common tracing code from xfs to iomap Christoph Hellwig
2019-10-17 17:56 ` [PATCH 10/14] iomap: lift the xfs writeback code " Christoph Hellwig
2019-10-17 18:48 ` Darrick J. Wong
2019-10-17 22:01 ` Dave Chinner
2019-10-17 17:56 ` [PATCH 11/14] iomap: warn on inline maps in iomap_writepage_map Christoph Hellwig
2019-10-17 17:56 ` [PATCH 12/14] iomap: move struct iomap_page out of iomap.h Christoph Hellwig
2019-10-17 17:56 ` [PATCH 13/14] iomap: cleanup iomap_ioend_compare Christoph Hellwig
2019-10-17 17:56 ` [PATCH 14/14] iomap: pass a struct page to iomap_finish_page_writeback Christoph Hellwig
2019-10-17 18:41 ` Darrick J. Wong
2019-10-17 20:49 ` lift the xfs writepage code into iomap v8 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=20191017175624.30305-2-hch@lst.de \
--to=hch@lst.de \
--cc=Damien.LeMoal@wdc.com \
--cc=agruenba@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=dchinner@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@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).