| Message ID | 20240904062925.716856-2-yi.zhang@huaweicloud.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | ext4: clean up and refactor fallocate | expand |
On Wed 04-09-24 14:29:16, Zhang Yi wrote: > From: Zhang Yi <yi.zhang@huawei.com> > > Current zero range, punch hole and collapse range have a common > potential data loss problem. In general, ext4_zero_range(), > ext4_collapse_range() and ext4_punch_hold() will discard all page cache > of the operation range before converting the extents status. However, > the first two functions don't write back dirty data before discarding > page cache, and ext4_punch_hold() write back at the very beginning > without holding i_rwsem and mapping invalidate lock. Hence, if some bad > things (e.g. EIO or ENOMEM) happens just after dropping dirty page > cache, the operation will failed but the user's valid data in the dirty > page cache will be lost. Fix this by write all dirty data under i_rwsem > and mapping invalidate lock before discarding pages. > > Signed-off-by: Zhang Yi <yi.zhang@huawei.com> I'm not sure this is the direction we want to go. When zeroing / collapsing / punching writing out all the data we are going to remove seems suboptimal and we can spend significant time doing work that is mostly unnecessary. After all with truncate we also drop pagecache pages and the do on-disk modification which can fail. The case of EIO is in my opinion OK - when there are disk errors, we are going to loose data and e2fsck is needed. So protecting with writeout against possible damage is pointless. For ENOMEM I agree we should better preserve filesystem consistency. Is there some case where we would keep filesystem inconsistent on ENOMEM? Honza > --- > fs/ext4/extents.c | 77 +++++++++++++++++------------------------------ > fs/ext4/inode.c | 19 +++++------- > 2 files changed, 36 insertions(+), 60 deletions(-) > > diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c > index e067f2dd0335..7d5edfa2e630 100644 > --- a/fs/ext4/extents.c > +++ b/fs/ext4/extents.c > @@ -4602,6 +4602,24 @@ static long ext4_zero_range(struct file *file, loff_t offset, > if (ret) > goto out_mutex; > > + /* > + * Prevent page faults from reinstantiating pages we have released > + * from page cache. > + */ > + filemap_invalidate_lock(mapping); > + > + ret = ext4_break_layouts(inode); > + if (ret) > + goto out_invalidate_lock; > + > + /* > + * Write data that will be zeroed to preserve them when successfully > + * discarding page cache below but fail to convert extents. > + */ > + ret = filemap_write_and_wait_range(mapping, start, end - 1); > + if (ret) > + goto out_invalidate_lock; > + > /* Preallocate the range including the unaligned edges */ > if (partial_begin || partial_end) { > ret = ext4_alloc_file_blocks(file, > @@ -4610,7 +4628,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, > round_down(offset, 1 << blkbits)) >> blkbits, > new_size, flags); > if (ret) > - goto out_mutex; > + goto out_invalidate_lock; > > } > > @@ -4619,37 +4637,9 @@ static long ext4_zero_range(struct file *file, loff_t offset, > flags |= (EXT4_GET_BLOCKS_CONVERT_UNWRITTEN | > EXT4_EX_NOCACHE); > > - /* > - * Prevent page faults from reinstantiating pages we have > - * released from page cache. > - */ > - filemap_invalidate_lock(mapping); > - > - ret = ext4_break_layouts(inode); > - if (ret) { > - filemap_invalidate_unlock(mapping); > - goto out_mutex; > - } > - > ret = ext4_update_disksize_before_punch(inode, offset, len); > - if (ret) { > - filemap_invalidate_unlock(mapping); > - goto out_mutex; > - } > - > - /* > - * For journalled data we need to write (and checkpoint) pages > - * before discarding page cache to avoid inconsitent data on > - * disk in case of crash before zeroing trans is committed. > - */ > - if (ext4_should_journal_data(inode)) { > - ret = filemap_write_and_wait_range(mapping, start, > - end - 1); > - if (ret) { > - filemap_invalidate_unlock(mapping); > - goto out_mutex; > - } > - } > + if (ret) > + goto out_invalidate_lock; > > /* Now release the pages and zero block aligned part of pages */ > truncate_pagecache_range(inode, start, end - 1); > @@ -4657,12 +4647,11 @@ static long ext4_zero_range(struct file *file, loff_t offset, > > ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size, > flags); > - filemap_invalidate_unlock(mapping); > if (ret) > - goto out_mutex; > + goto out_invalidate_lock; > } > if (!partial_begin && !partial_end) > - goto out_mutex; > + goto out_invalidate_lock; > > /* > * In worst case we have to writeout two nonadjacent unwritten > @@ -4675,7 +4664,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, > if (IS_ERR(handle)) { > ret = PTR_ERR(handle); > ext4_std_error(inode->i_sb, ret); > - goto out_mutex; > + goto out_invalidate_lock; > } > > inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); > @@ -4694,6 +4683,8 @@ static long ext4_zero_range(struct file *file, loff_t offset, > > out_handle: > ext4_journal_stop(handle); > +out_invalidate_lock: > + filemap_invalidate_unlock(mapping); > out_mutex: > inode_unlock(inode); > return ret; > @@ -5363,20 +5354,8 @@ static int ext4_collapse_range(struct file *file, loff_t offset, loff_t len) > * for page size > block size. > */ > ioffset = round_down(offset, PAGE_SIZE); > - /* > - * Write tail of the last page before removed range since it will get > - * removed from the page cache below. > - */ > - ret = filemap_write_and_wait_range(mapping, ioffset, offset); > - if (ret) > - goto out_mmap; > - /* > - * Write data that will be shifted to preserve them when discarding > - * page cache below. We are also protected from pages becoming dirty > - * by i_rwsem and invalidate_lock. > - */ > - ret = filemap_write_and_wait_range(mapping, offset + len, > - LLONG_MAX); > + /* Write out all dirty pages */ > + ret = filemap_write_and_wait_range(mapping, ioffset, LLONG_MAX); > if (ret) > goto out_mmap; > truncate_pagecache(inode, ioffset); > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index 941c1c0d5c6e..c3d7606a5315 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -3957,17 +3957,6 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) > > trace_ext4_punch_hole(inode, offset, length, 0); > > - /* > - * Write out all dirty pages to avoid race conditions > - * Then release them. > - */ > - if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) { > - ret = filemap_write_and_wait_range(mapping, offset, > - offset + length - 1); > - if (ret) > - return ret; > - } > - > inode_lock(inode); > > /* No need to punch hole beyond i_size */ > @@ -4021,6 +4010,14 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) > if (ret) > goto out_dio; > > + /* Write out all dirty pages to avoid race conditions */ > + if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) { > + ret = filemap_write_and_wait_range(mapping, offset, > + offset + length - 1); > + if (ret) > + goto out_dio; > + } > + > first_block_offset = round_up(offset, sb->s_blocksize); > last_block_offset = round_down((offset + length), sb->s_blocksize) - 1; > > -- > 2.39.2 >
On 2024/9/18 0:50, Jan Kara wrote: > On Wed 04-09-24 14:29:16, Zhang Yi wrote: >> From: Zhang Yi <yi.zhang@huawei.com> >> >> Current zero range, punch hole and collapse range have a common >> potential data loss problem. In general, ext4_zero_range(), >> ext4_collapse_range() and ext4_punch_hold() will discard all page cache >> of the operation range before converting the extents status. However, >> the first two functions don't write back dirty data before discarding >> page cache, and ext4_punch_hold() write back at the very beginning >> without holding i_rwsem and mapping invalidate lock. Hence, if some bad >> things (e.g. EIO or ENOMEM) happens just after dropping dirty page >> cache, the operation will failed but the user's valid data in the dirty >> page cache will be lost. Fix this by write all dirty data under i_rwsem >> and mapping invalidate lock before discarding pages. >> >> Signed-off-by: Zhang Yi <yi.zhang@huawei.com> > > I'm not sure this is the direction we want to go. When zeroing / collapsing > / punching writing out all the data we are going to remove seems suboptimal > and we can spend significant time doing work that is mostly unnecessary. Yes, I agree with you that it do bring some performance sacrifices and seems not the best solution, but at the moment, I can't find a simple and better solution. I've also checked some other modern disk filesystems. IIUC, it seems that each filesystem is different when doing this 3 operations, bcachefs only do write back before dropping pagecache when collapsing, f2fs do write back when zeroing range and collapsing, btrfs do write back when punching and zeroing(it doesn't support collapse), xfs do write back for all of the three operations. So, it seems that only btrfs and xfs can survival now. > After all with truncate we also drop pagecache pages and the do on-disk > modification which can fail. Yeah, right, truncate may have the same problem too, and all of the above other 4 filesystems are the same. > The case of EIO is in my opinion OK - when there are disk errors, we are > going to loose data and e2fsck is needed. So protecting with writeout > against possible damage is pointless. Yeah, please forgive me for this not good example. > For ENOMEM I agree we should better > preserve filesystem consistency. Is there some case where we would keep > filesystem inconsistent on ENOMEM? The ENOMEM case were seldom happen on our products, so it hasn't trigger any real problem so far. I find it when I was refactoring these fallocate functions. Theoretically, I believe it should be a problem, but based on current filesystems' implementation, I'm not sure if we really need to care about it, maybe xfs and btrfs do write back because they could have more opportunity to fail after dropping pagecache when punching/zeroing/ (collapsing), so they have to write data back? Thanks, Yi. > >> --- >> fs/ext4/extents.c | 77 +++++++++++++++++------------------------------ >> fs/ext4/inode.c | 19 +++++------- >> 2 files changed, 36 insertions(+), 60 deletions(-) >> >> diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c >> index e067f2dd0335..7d5edfa2e630 100644 >> --- a/fs/ext4/extents.c >> +++ b/fs/ext4/extents.c >> @@ -4602,6 +4602,24 @@ static long ext4_zero_range(struct file *file, loff_t offset, >> if (ret) >> goto out_mutex; >> >> + /* >> + * Prevent page faults from reinstantiating pages we have released >> + * from page cache. >> + */ >> + filemap_invalidate_lock(mapping); >> + >> + ret = ext4_break_layouts(inode); >> + if (ret) >> + goto out_invalidate_lock; >> + >> + /* >> + * Write data that will be zeroed to preserve them when successfully >> + * discarding page cache below but fail to convert extents. >> + */ >> + ret = filemap_write_and_wait_range(mapping, start, end - 1); >> + if (ret) >> + goto out_invalidate_lock; >> + >> /* Preallocate the range including the unaligned edges */ >> if (partial_begin || partial_end) { >> ret = ext4_alloc_file_blocks(file, >> @@ -4610,7 +4628,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, >> round_down(offset, 1 << blkbits)) >> blkbits, >> new_size, flags); >> if (ret) >> - goto out_mutex; >> + goto out_invalidate_lock; >> >> } >> >> @@ -4619,37 +4637,9 @@ static long ext4_zero_range(struct file *file, loff_t offset, >> flags |= (EXT4_GET_BLOCKS_CONVERT_UNWRITTEN | >> EXT4_EX_NOCACHE); >> >> - /* >> - * Prevent page faults from reinstantiating pages we have >> - * released from page cache. >> - */ >> - filemap_invalidate_lock(mapping); >> - >> - ret = ext4_break_layouts(inode); >> - if (ret) { >> - filemap_invalidate_unlock(mapping); >> - goto out_mutex; >> - } >> - >> ret = ext4_update_disksize_before_punch(inode, offset, len); >> - if (ret) { >> - filemap_invalidate_unlock(mapping); >> - goto out_mutex; >> - } >> - >> - /* >> - * For journalled data we need to write (and checkpoint) pages >> - * before discarding page cache to avoid inconsitent data on >> - * disk in case of crash before zeroing trans is committed. >> - */ >> - if (ext4_should_journal_data(inode)) { >> - ret = filemap_write_and_wait_range(mapping, start, >> - end - 1); >> - if (ret) { >> - filemap_invalidate_unlock(mapping); >> - goto out_mutex; >> - } >> - } >> + if (ret) >> + goto out_invalidate_lock; >> >> /* Now release the pages and zero block aligned part of pages */ >> truncate_pagecache_range(inode, start, end - 1); >> @@ -4657,12 +4647,11 @@ static long ext4_zero_range(struct file *file, loff_t offset, >> >> ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size, >> flags); >> - filemap_invalidate_unlock(mapping); >> if (ret) >> - goto out_mutex; >> + goto out_invalidate_lock; >> } >> if (!partial_begin && !partial_end) >> - goto out_mutex; >> + goto out_invalidate_lock; >> >> /* >> * In worst case we have to writeout two nonadjacent unwritten >> @@ -4675,7 +4664,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, >> if (IS_ERR(handle)) { >> ret = PTR_ERR(handle); >> ext4_std_error(inode->i_sb, ret); >> - goto out_mutex; >> + goto out_invalidate_lock; >> } >> >> inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); >> @@ -4694,6 +4683,8 @@ static long ext4_zero_range(struct file *file, loff_t offset, >> >> out_handle: >> ext4_journal_stop(handle); >> +out_invalidate_lock: >> + filemap_invalidate_unlock(mapping); >> out_mutex: >> inode_unlock(inode); >> return ret; >> @@ -5363,20 +5354,8 @@ static int ext4_collapse_range(struct file *file, loff_t offset, loff_t len) >> * for page size > block size. >> */ >> ioffset = round_down(offset, PAGE_SIZE); >> - /* >> - * Write tail of the last page before removed range since it will get >> - * removed from the page cache below. >> - */ >> - ret = filemap_write_and_wait_range(mapping, ioffset, offset); >> - if (ret) >> - goto out_mmap; >> - /* >> - * Write data that will be shifted to preserve them when discarding >> - * page cache below. We are also protected from pages becoming dirty >> - * by i_rwsem and invalidate_lock. >> - */ >> - ret = filemap_write_and_wait_range(mapping, offset + len, >> - LLONG_MAX); >> + /* Write out all dirty pages */ >> + ret = filemap_write_and_wait_range(mapping, ioffset, LLONG_MAX); >> if (ret) >> goto out_mmap; >> truncate_pagecache(inode, ioffset); >> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c >> index 941c1c0d5c6e..c3d7606a5315 100644 >> --- a/fs/ext4/inode.c >> +++ b/fs/ext4/inode.c >> @@ -3957,17 +3957,6 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) >> >> trace_ext4_punch_hole(inode, offset, length, 0); >> >> - /* >> - * Write out all dirty pages to avoid race conditions >> - * Then release them. >> - */ >> - if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) { >> - ret = filemap_write_and_wait_range(mapping, offset, >> - offset + length - 1); >> - if (ret) >> - return ret; >> - } >> - >> inode_lock(inode); >> >> /* No need to punch hole beyond i_size */ >> @@ -4021,6 +4010,14 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) >> if (ret) >> goto out_dio; >> >> + /* Write out all dirty pages to avoid race conditions */ >> + if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) { >> + ret = filemap_write_and_wait_range(mapping, offset, >> + offset + length - 1); >> + if (ret) >> + goto out_dio; >> + } >> + >> first_block_offset = round_up(offset, sb->s_blocksize); >> last_block_offset = round_down((offset + length), sb->s_blocksize) - 1; >> >> -- >> 2.39.2 >>
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index e067f2dd0335..7d5edfa2e630 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4602,6 +4602,24 @@ static long ext4_zero_range(struct file *file, loff_t offset, if (ret) goto out_mutex; + /* + * Prevent page faults from reinstantiating pages we have released + * from page cache. + */ + filemap_invalidate_lock(mapping); + + ret = ext4_break_layouts(inode); + if (ret) + goto out_invalidate_lock; + + /* + * Write data that will be zeroed to preserve them when successfully + * discarding page cache below but fail to convert extents. + */ + ret = filemap_write_and_wait_range(mapping, start, end - 1); + if (ret) + goto out_invalidate_lock; + /* Preallocate the range including the unaligned edges */ if (partial_begin || partial_end) { ret = ext4_alloc_file_blocks(file, @@ -4610,7 +4628,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, round_down(offset, 1 << blkbits)) >> blkbits, new_size, flags); if (ret) - goto out_mutex; + goto out_invalidate_lock; } @@ -4619,37 +4637,9 @@ static long ext4_zero_range(struct file *file, loff_t offset, flags |= (EXT4_GET_BLOCKS_CONVERT_UNWRITTEN | EXT4_EX_NOCACHE); - /* - * Prevent page faults from reinstantiating pages we have - * released from page cache. - */ - filemap_invalidate_lock(mapping); - - ret = ext4_break_layouts(inode); - if (ret) { - filemap_invalidate_unlock(mapping); - goto out_mutex; - } - ret = ext4_update_disksize_before_punch(inode, offset, len); - if (ret) { - filemap_invalidate_unlock(mapping); - goto out_mutex; - } - - /* - * For journalled data we need to write (and checkpoint) pages - * before discarding page cache to avoid inconsitent data on - * disk in case of crash before zeroing trans is committed. - */ - if (ext4_should_journal_data(inode)) { - ret = filemap_write_and_wait_range(mapping, start, - end - 1); - if (ret) { - filemap_invalidate_unlock(mapping); - goto out_mutex; - } - } + if (ret) + goto out_invalidate_lock; /* Now release the pages and zero block aligned part of pages */ truncate_pagecache_range(inode, start, end - 1); @@ -4657,12 +4647,11 @@ static long ext4_zero_range(struct file *file, loff_t offset, ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size, flags); - filemap_invalidate_unlock(mapping); if (ret) - goto out_mutex; + goto out_invalidate_lock; } if (!partial_begin && !partial_end) - goto out_mutex; + goto out_invalidate_lock; /* * In worst case we have to writeout two nonadjacent unwritten @@ -4675,7 +4664,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, if (IS_ERR(handle)) { ret = PTR_ERR(handle); ext4_std_error(inode->i_sb, ret); - goto out_mutex; + goto out_invalidate_lock; } inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); @@ -4694,6 +4683,8 @@ static long ext4_zero_range(struct file *file, loff_t offset, out_handle: ext4_journal_stop(handle); +out_invalidate_lock: + filemap_invalidate_unlock(mapping); out_mutex: inode_unlock(inode); return ret; @@ -5363,20 +5354,8 @@ static int ext4_collapse_range(struct file *file, loff_t offset, loff_t len) * for page size > block size. */ ioffset = round_down(offset, PAGE_SIZE); - /* - * Write tail of the last page before removed range since it will get - * removed from the page cache below. - */ - ret = filemap_write_and_wait_range(mapping, ioffset, offset); - if (ret) - goto out_mmap; - /* - * Write data that will be shifted to preserve them when discarding - * page cache below. We are also protected from pages becoming dirty - * by i_rwsem and invalidate_lock. - */ - ret = filemap_write_and_wait_range(mapping, offset + len, - LLONG_MAX); + /* Write out all dirty pages */ + ret = filemap_write_and_wait_range(mapping, ioffset, LLONG_MAX); if (ret) goto out_mmap; truncate_pagecache(inode, ioffset); diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 941c1c0d5c6e..c3d7606a5315 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3957,17 +3957,6 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) trace_ext4_punch_hole(inode, offset, length, 0); - /* - * Write out all dirty pages to avoid race conditions - * Then release them. - */ - if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) { - ret = filemap_write_and_wait_range(mapping, offset, - offset + length - 1); - if (ret) - return ret; - } - inode_lock(inode); /* No need to punch hole beyond i_size */ @@ -4021,6 +4010,14 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) if (ret) goto out_dio; + /* Write out all dirty pages to avoid race conditions */ + if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) { + ret = filemap_write_and_wait_range(mapping, offset, + offset + length - 1); + if (ret) + goto out_dio; + } + first_block_offset = round_up(offset, sb->s_blocksize); last_block_offset = round_down((offset + length), sb->s_blocksize) - 1;