From: Joseph Qi <joseph.qi@linux.alibaba.com>
To: Junxiao Bi <junxiao.bi@oracle.com>,
ocfs2-devel@oss.oracle.com, akpm <akpm@linux-foundation.org>
Cc: linux-fsdevel@vger.kernel.org
Subject: Re: [Ocfs2-devel] [PATCH V3] ocfs2: fix data corruption by fallocate
Date: Sun, 30 May 2021 19:53:30 +0800 [thread overview]
Message-ID: <4d48a59f-e7b6-0e37-3d8c-c24fa7572693@linux.alibaba.com> (raw)
In-Reply-To: <20210528210648.9124-1-junxiao.bi@oracle.com>
On 5/29/21 5:06 AM, Junxiao Bi wrote:
> When fallocate punches holes out of inode size, if original isize is in
> the middle of last cluster, then the part from isize to the end of the
> cluster will be zeroed with buffer write, at that time isize is not
> yet updated to match the new size, if writeback is kicked in, it will
> invoke ocfs2_writepage()->block_write_full_page() where the pages out
> of inode size will be dropped. That will cause file corruption. Fix
> this by zero out eof blocks when extending the inode size.
>
> Running the following command with qemu-image 4.2.1 can get a corrupted
> coverted image file easily.
>
> qemu-img convert -p -t none -T none -f qcow2 $qcow_image \
> -O qcow2 -o compat=1.1 $qcow_image.conv
>
> The usage of fallocate in qemu is like this, it first punches holes out of
> inode size, then extend the inode size.
>
> fallocate(11, FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE, 2276196352, 65536) = 0
> fallocate(11, 0, 2276196352, 65536) = 0
>
> v1: https://www.spinics.net/lists/linux-fsdevel/msg193999.html
> v2: https://lore.kernel.org/linux-fsdevel/20210525093034.GB4112@quack2.suse.cz/T/
>
> Cc: <stable@vger.kernel.org>
> Cc: Jan Kara <jack@suse.cz>
> Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
> ---
>
> Changes in v3:
> - move i_size_write after zeroout done, this can remove duplicated code and kill possible race.
>
> Changes in v2:
> - suggested by Jan Kara, using sb_issue_zeroout to zero eof blocks in disk directly.
>
> fs/ocfs2/file.c | 55 ++++++++++++++++++++++++++++++++++++++++++++-----
> 1 file changed, 50 insertions(+), 5 deletions(-)
>
> diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
> index f17c3d33fb18..775657943057 100644
> --- a/fs/ocfs2/file.c
> +++ b/fs/ocfs2/file.c
> @@ -1855,6 +1855,45 @@ int ocfs2_remove_inode_range(struct inode *inode,
> return ret;
> }
>
> +/*
> + * zero out partial blocks of one cluster.
> + *
> + * start: file offset where zero starts, will be made upper block aligned.
> + * len: it will be trimmed to the end of current cluster if "start + len"
> + * is bigger than it.
> + */
> +static int ocfs2_zeroout_partial_cluster(struct inode *inode,
> + u64 start, u64 len)
> +{
> + int ret;
> + u64 start_block, end_block, nr_blocks;
> + u64 p_block, offset;
> + u32 cluster, p_cluster, nr_clusters;
> + struct super_block *sb = inode->i_sb;
> + u64 end = ocfs2_align_bytes_to_clusters(sb, start);
> +
> + if (start + len < end)
> + end = start + len;
> +
> + start_block = ocfs2_blocks_for_bytes(sb, start);
> + end_block = ocfs2_blocks_for_bytes(sb, end);
> + nr_blocks = end_block - start_block;
> + if (!nr_blocks)
> + return 0;
> +
> + cluster = ocfs2_bytes_to_clusters(sb, start);
> + ret = ocfs2_get_clusters(inode, cluster, &p_cluster,
> + &nr_clusters, NULL);
> + if (ret)
> + return ret;
> + if (!p_cluster)
> + return 0;
> +
> + offset = start_block - ocfs2_clusters_to_blocks(sb, cluster);
> + p_block = ocfs2_clusters_to_blocks(sb, p_cluster) + offset;
> + return sb_issue_zeroout(sb, p_block, nr_blocks, GFP_NOFS);
> +}
> +
> /*
> * Parts of this function taken from xfs_change_file_space()
> */
> @@ -1865,7 +1904,7 @@ static int __ocfs2_change_file_space(struct file *file, struct inode *inode,
> {
> int ret;
> s64 llen;
> - loff_t size;
> + loff_t size, orig_isize;
> struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
> struct buffer_head *di_bh = NULL;
> handle_t *handle;
> @@ -1896,6 +1935,7 @@ static int __ocfs2_change_file_space(struct file *file, struct inode *inode,
> goto out_inode_unlock;
> }
>
> + orig_isize = i_size_read(inode);
> switch (sr->l_whence) {
> case 0: /*SEEK_SET*/
> break;
> @@ -1903,7 +1943,7 @@ static int __ocfs2_change_file_space(struct file *file, struct inode *inode,
> sr->l_start += f_pos;
> break;
> case 2: /*SEEK_END*/
> - sr->l_start += i_size_read(inode);
> + sr->l_start += orig_isize;
> break;
> default:
> ret = -EINVAL;
> @@ -1957,6 +1997,14 @@ static int __ocfs2_change_file_space(struct file *file, struct inode *inode,
> default:
> ret = -EINVAL;
> }
> +
> + /* zeroout eof blocks in the cluster. */
> + if (!ret && change_size && orig_isize < size) {
> + ret = ocfs2_zeroout_partial_cluster(inode, orig_isize,
> + size - orig_isize);
> + if (!ret)
> + i_size_write(inode, size);
> + }
> up_write(&OCFS2_I(inode)->ip_alloc_sem);
> if (ret) {
> mlog_errno(ret);
> @@ -1973,9 +2021,6 @@ static int __ocfs2_change_file_space(struct file *file, struct inode *inode,
> goto out_inode_unlock;
> }
>
> - if (change_size && i_size_read(inode) < size)
> - i_size_write(inode, size);
> -
> inode->i_ctime = inode->i_mtime = current_time(inode);
> ret = ocfs2_mark_inode_dirty(handle, inode, di_bh);
> if (ret < 0)
>
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
prev parent reply other threads:[~2021-05-30 11:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-28 21:06 [Ocfs2-devel] [PATCH V3] ocfs2: fix data corruption by fallocate Junxiao Bi
2021-05-30 11:53 ` Joseph Qi [this message]
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=4d48a59f-e7b6-0e37-3d8c-c24fa7572693@linux.alibaba.com \
--to=joseph.qi@linux.alibaba.com \
--cc=akpm@linux-foundation.org \
--cc=junxiao.bi@oracle.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=ocfs2-devel@oss.oracle.com \
/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).