From: Eric Whitney <enwlinux@gmail.com>
To: Jan Kara <jack@suse.cz>
Cc: Ted Tso <tytso@mit.edu>,
linux-ext4@vger.kernel.org, Eric Whitney <enwlinux@gmail.com>,
stable@vger.kernel.org
Subject: Re: [PATCH v3] ext4: Fix occasional generic/418 failure
Date: Thu, 15 Apr 2021 15:58:50 -0400 [thread overview]
Message-ID: <20210415195850.GA16226@localhost.localdomain> (raw)
In-Reply-To: <20210415155417.4734-1-jack@suse.cz>
* Jan Kara <jack@suse.cz>:
> Eric has noticed that after pagecache read rework, generic/418 is
> occasionally failing for ext4 when blocksize < pagesize. In fact, the
> pagecache rework just made hard to hit race in ext4 more likely. The
> problem is that since ext4 conversion of direct IO writes to iomap
> framework (commit 378f32bab371), we update inode size after direct IO
> write only after invalidating page cache. Thus if buffered read sneaks
> at unfortunate moment like:
>
> CPU1 - write at offset 1k CPU2 - read from offset 0
> iomap_dio_rw(..., IOMAP_DIO_FORCE_WAIT);
> ext4_readpage();
> ext4_handle_inode_extension()
>
> the read will zero out tail of the page as it still sees smaller inode
> size and thus page cache becomes inconsistent with on-disk contents with
> all the consequences.
>
> Fix the problem by moving inode size update into end_io handler which
> gets called before the page cache is invalidated.
>
> Reported-and-tested-by: Eric Whitney <enwlinux@gmail.com>
> Fixes: 378f32bab371 ("ext4: introduce direct I/O write using iomap infrastructure")
> CC: stable@vger.kernel.org
> Signed-off-by: Jan Kara <jack@suse.cz>
> ---
> fs/ext4/file.c | 25 +++++++++++++++++++++----
> 1 file changed, 21 insertions(+), 4 deletions(-)
>
> diff --git a/fs/ext4/file.c b/fs/ext4/file.c
> index 194f5d00fa32..7924634ab0bf 100644
> --- a/fs/ext4/file.c
> +++ b/fs/ext4/file.c
> @@ -371,15 +371,32 @@ static ssize_t ext4_handle_inode_extension(struct inode *inode, loff_t offset,
> static int ext4_dio_write_end_io(struct kiocb *iocb, ssize_t size,
> int error, unsigned int flags)
> {
> - loff_t offset = iocb->ki_pos;
> + loff_t pos = iocb->ki_pos;
> struct inode *inode = file_inode(iocb->ki_filp);
>
> if (error)
> return error;
>
> - if (size && flags & IOMAP_DIO_UNWRITTEN)
> - return ext4_convert_unwritten_extents(NULL, inode,
> - offset, size);
> + if (size && flags & IOMAP_DIO_UNWRITTEN) {
> + error = ext4_convert_unwritten_extents(NULL, inode, pos, size);
> + if (error < 0)
> + return error;
> + }
> + /*
> + * If we are extending the file, we have to update i_size here before
> + * page cache gets invalidated in iomap_dio_rw(). Otherwise racing
> + * buffered reads could zero out too much from page cache pages. Update
> + * of on-disk size will happen later in ext4_dio_write_iter() where
> + * we have enough information to also perform orphan list handling etc.
> + * Note that we perform all extending writes synchronously under
> + * i_rwsem held exclusively so i_size update is safe here in that case.
> + * If the write was not extending, we cannot see pos > i_size here
> + * because operations reducing i_size like truncate wait for all
> + * outstanding DIO before updating i_size.
> + */
> + pos += size;
> + if (pos > i_size_read(inode))
> + i_size_write(inode, pos);
>
> return 0;
> }
> --
> 2.26.2
>
With additional data, the generic/068 failure I saw on the data=journal test
configuration when testing the v2 version of this patch doesn't appear to be
a regression. 100 runs of 068 on a v2 patched -rc7 kernel failed five times,
and it failed three times on an unpatched -rc7 kernel. So, that failure is
most likely a latent problem unrelated to this patch.
Thanks,
Eric
next prev parent reply other threads:[~2021-04-15 19:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-15 15:54 [PATCH v3] ext4: Fix occasional generic/418 failure Jan Kara
2021-04-15 19:58 ` Eric Whitney [this message]
2021-04-15 22:01 ` Dave Chinner
2021-04-22 20:52 ` Theodore Ts'o
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=20210415195850.GA16226@localhost.localdomain \
--to=enwlinux@gmail.com \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tytso@mit.edu \
/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).