stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ira Weiny <ira.weiny@intel.com>
To: Jan Kara <jack@suse.cz>
Cc: Ted Tso <tytso@mit.edu>,
	linux-ext4@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH 1/3] ext4: Wait for outstanding dio during truncate in nojournal mode
Date: Tue, 21 May 2019 11:07:38 -0700	[thread overview]
Message-ID: <20190521180737.GA31888@iweiny-DESK2.sc.intel.com> (raw)
In-Reply-To: <20190521074358.17186-2-jack@suse.cz>

On Tue, May 21, 2019 at 09:43:56AM +0200, Jan Kara wrote:
> We didn't wait for outstanding direct IO during truncate in nojournal
> mode (as we skip orphan handling in that case). This can lead to fs
> corruption or stale data exposure if truncate ends up freeing blocks
> and these get reallocated before direct IO finishes. Fix the condition
> determining whether the wait is necessary.
> 
> CC: stable@vger.kernel.org
> Fixes: 1c9114f9c0f1 ("ext4: serialize unlocked dio reads with truncate")
> Signed-off-by: Jan Kara <jack@suse.cz>

Reviewed-by: Ira Weiny <ira.weiny@intel.com>

> ---
>  fs/ext4/inode.c | 21 +++++++++------------
>  1 file changed, 9 insertions(+), 12 deletions(-)
> 
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index 82298c63ea6d..9bcb7f2b86dd 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -5630,20 +5630,17 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
>  				goto err_out;
>  			}
>  		}
> -		if (!shrink)
> +		if (!shrink) {
>  			pagecache_isize_extended(inode, oldsize, inode->i_size);
> -
> -		/*
> -		 * Blocks are going to be removed from the inode. Wait
> -		 * for dio in flight.  Temporarily disable
> -		 * dioread_nolock to prevent livelock.
> -		 */
> -		if (orphan) {
> -			if (!ext4_should_journal_data(inode)) {
> -				inode_dio_wait(inode);
> -			} else
> -				ext4_wait_for_tail_page_commit(inode);
> +		} else {
> +			/*
> +			 * Blocks are going to be removed from the inode. Wait
> +			 * for dio in flight.
> +			 */
> +			inode_dio_wait(inode);
>  		}
> +		if (orphan && ext4_should_journal_data(inode))
> +			ext4_wait_for_tail_page_commit(inode);
>  		down_write(&EXT4_I(inode)->i_mmap_sem);
>  
>  		rc = ext4_break_layouts(inode);
> -- 
> 2.16.4
> 

  reply	other threads:[~2019-05-21 18:06 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20190521074358.17186-1-jack@suse.cz>
2019-05-21  7:43 ` [PATCH 1/3] ext4: Wait for outstanding dio during truncate in nojournal mode Jan Kara
2019-05-21 18:07   ` Ira Weiny [this message]
     [not found] <20190522090317.28716-1-jack@suse.cz>
2019-05-22  9:03 ` Jan Kara
2019-05-24  3:46   ` 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=20190521180737.GA31888@iweiny-DESK2.sc.intel.com \
    --to=ira.weiny@intel.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).