On 2024/2/13 13:46, Christoph Hellwig wrote:
> Wouldn't it make more sense to just move the size manipulation to the
> write-only code? An untested version of that is below. With this
> the naming of the status variable becomes even more confusing than
> it already is, maybe we need to do a cleanup of the *_write_end
> calling conventions as it always returns the passed in copied value
> or 0.
>
> diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
> index 3dab060aed6d7b..8401a9ca702fc0 100644
> --- a/fs/iomap/buffered-io.c
> +++ b/fs/iomap/buffered-io.c
> @@ -876,34 +876,13 @@ static size_t iomap_write_end(struct iomap_iter *iter, loff_t pos, size_t len,
> size_t copied, struct folio *folio)
> {
> const struct iomap *srcmap = iomap_iter_srcmap(iter);
> - loff_t old_size = iter->inode->i_size;
> - size_t ret;
> -
> - if (srcmap->type == IOMAP_INLINE) {
> - ret = iomap_write_end_inline(iter, folio, pos, copied);
> - } else if (srcmap->flags & IOMAP_F_BUFFER_HEAD) {
> - ret = block_write_end(NULL, iter->inode->i_mapping, pos, len,
> - copied, &folio->page, NULL);
> - } else {
> - ret = __iomap_write_end(iter->inode, pos, len, copied, folio);
> - }
> -
> - /*
> - * Update the in-memory inode size after copying the data into the page
> - * cache. It's up to the file system to write the updated size to disk,
> - * preferably after I/O completion so that no stale data is exposed.
> - */
> - if (pos + ret > old_size) {
> - i_size_write(iter->inode, pos + ret);
> - iter->iomap.flags |= IOMAP_F_SIZE_CHANGED;
> - }
I've recently discovered that if we don't increase i_size in
iomap_zero_iter(), it would break fstests generic/476 on xfs. xfs
depends on iomap_zero_iter() to increase i_size in some cases.
generic/476 75s ... _check_xfs_filesystem: filesystem on /dev/pmem2 is inconsistent (r)
(see /home/zhangyi/xfstests-dev/results//xfs/generic/476.full for details)
_check_xfs_filesystem: filesystem on /dev/pmem2 is inconsistent (r)
*** xfs_repair -n output ***
Phase 1 - find and verify superblock...
Phase 2 - using internal log
- zero log...
- scan filesystem freespace and inode maps...
sb_fdblocks 10916, counted 10923
- found root inode chunk
...
After debugging and analysis, I found the root cause of the problem is
related to the pre-allocations of xfs. xfs pre-allocates some blocks to
reduce fragmentation during buffer append writing, then if we write new
data or do file copy(reflink) after the end of the pre-allocating range,
xfs would zero-out and write back the pre-allocate space(e.g.
xfs_file_write_checks() -> xfs_zero_range()), so we have to update
i_size before writing back in iomap_zero_iter(), otherwise, it will
result in stale delayed extent.
For more details, let's think about this case,
1. Buffered write from range [A, B) of an empty file foo, and
xfs_buffered_write_iomap_begin() prealloc blocks for it, then create
a delayed extent from [A, D).
2. Write back process map blocks but only convert above delayed extent
from [A, C) since the lack of a contiguous physical blocks, now we
have a left over delayed extent from [C, D), and the file size is B.
3. Copy range from another file to range [E, F), then
xfs_reflink_zero_posteof() would zero-out post eof range [B, E), it
writes zero, dirty and write back [C, E).
4. Since we don't update i_size in iomap_zero_iter()，the writeback
doesn't write anything back, also doesn't convert the delayed extent.
After copy range, the file size will update to F.
5. Finally, the delayed extent becomes stale, and the free blocks count
becomes incorrect.
So, we have to handle above case for xfs. I suppose we could keep
increasing i_size if the zeroed folio is entirely outside of i_size,
make sure we could write back and allocate blocks for the
zeroed & delayed extent, something like below, any suggestions ?
@@ -1390,6 +1390,7 @@ static loff_t iomap_zero_iter(struct iomap_iter *iter, bool *did_zero)
do {
struct folio *folio;
+ loff_t old_size;
int status;
size_t offset;
size_t bytes = min_t(u64, SIZE_MAX, length);
@@ -1408,6 +1409,28 @@ static loff_t iomap_zero_iter(struct iomap_iter *iter, bool *did_zero)
folio_mark_accessed(folio);
bytes = iomap_write_end(iter, pos, bytes, bytes, folio);
+
+ /*
+ * If folio is entirely outside of i_size, update the
+ * in-memory inode size after zeroing the data in the page
+ * cache to prevent the write-back process from not writing
+ * back zeroed pages.
+ */
+ old_size = iter->inode->i_size;
+ if (pos + bytes > old_size) {
+ size_t offset = offset_in_folio(folio, old_size);
+ pgoff_t end_index = old_size >> PAGE_SHIFT;
+
+ if (folio->index > end_index ||
+ (folio->index == end_index && offset == 0)) {
+ i_size_write(iter->inode, pos + bytes);
+ iter->iomap.flags |= IOMAP_F_SIZE_CHANGED;
+ }
+ }
+ __iomap_put_folio(iter, pos, bytes, folio);
+ if (old_size < pos)
+ pagecache_isize_extended(iter->inode, old_size, pos);
+
if (WARN_ON_ONCE(bytes == 0))
return -EIO;
Thansk,
Yi.
