xfs: rework zero range to prevent invalid i_size updates
The zero range operation is analogous to fallocate with the exception of converting the range to zeroes. E.g., it attempts to allocate zeroed blocks over the range specified by the caller. The XFS implementation kills all delalloc blocks currently over the aligned range, converts the range to allocated zero blocks (unwritten extents) and handles the partial pages at the ends of the range by sending writes through the pagecache. The current implementation suffers from several problems associated with inode size. If the aligned range covers an extending I/O, said I/O is discarded and an inode size update from a previous write never makes it to disk. Further, if an unaligned zero range extends beyond eof, the page write induced for the partial end page can itself increase the inode size, even if the zero range request is not supposed to update i_size (via KEEP_SIZE, similar to an fallocate beyond EOF). The latter behavior not only incorrectly increases the inode size, but can lead to stray delalloc blocks on the inode. Typically, post-eof preallocation blocks are either truncated on release or inode eviction or explicitly written to by xfs_zero_eof() on natural file size extension. If the inode size increases due to zero range, however, associated blocks leak into the address space having never been converted or mapped to pagecache pages. A direct I/O to such an uncovered range cannot convert the extent via writeback and will BUG(). For example: $ xfs_io -fc "pwrite 0 128k" -c "fzero -k 1m 54321" <file> ... $ xfs_io -d -c "pread 128k 128k" <file> <BUG> If the entire delalloc extent happens to not have page coverage whatsoever (e.g., delalloc conversion couldn't find a large enough free space extent), even a full file writeback won't convert what's left of the extent and we'll assert on inode eviction. Rework xfs_zero_file_space() to avoid buffered I/O for partial pages. Use the existing hole punch and prealloc mechanisms as primitives for zero range. This implementation is not efficient nor ideal as we writeback dirty data over the range and remove existing extents rather than convert to unwrittern. The former writeback, however, is currently the only mechanism available to ensure consistency between pagecache and extent state. Even a pagecache truncate/delalloc punch prior to hole punch has lead to inconsistencies due to racing with writeback. This provides a consistent, correct implementation of zero range that survives fsstress/fsx testing without assert failures. The implementation can be optimized from this point forward once the fundamental issue of pagecache and delalloc extent state consistency is addressed. Signed-off-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Родитель
f55fefd1a5
Коммит
5d11fb4b9a
|
@ -1338,7 +1338,10 @@ xfs_free_file_space(
|
|||
goto out;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Preallocate and zero a range of a file. This mechanism has the allocation
|
||||
* semantics of fallocate and in addition converts data in the range to zeroes.
|
||||
*/
|
||||
int
|
||||
xfs_zero_file_space(
|
||||
struct xfs_inode *ip,
|
||||
|
@ -1346,65 +1349,30 @@ xfs_zero_file_space(
|
|||
xfs_off_t len)
|
||||
{
|
||||
struct xfs_mount *mp = ip->i_mount;
|
||||
uint granularity;
|
||||
xfs_off_t start_boundary;
|
||||
xfs_off_t end_boundary;
|
||||
uint blksize;
|
||||
int error;
|
||||
|
||||
trace_xfs_zero_file_space(ip);
|
||||
|
||||
granularity = max_t(uint, 1 << mp->m_sb.sb_blocklog, PAGE_CACHE_SIZE);
|
||||
blksize = 1 << mp->m_sb.sb_blocklog;
|
||||
|
||||
/*
|
||||
* Round the range of extents we are going to convert inwards. If the
|
||||
* offset is aligned, then it doesn't get changed so we zero from the
|
||||
* start of the block offset points to.
|
||||
* Punch a hole and prealloc the range. We use hole punch rather than
|
||||
* unwritten extent conversion for two reasons:
|
||||
*
|
||||
* 1.) Hole punch handles partial block zeroing for us.
|
||||
*
|
||||
* 2.) If prealloc returns ENOSPC, the file range is still zero-valued
|
||||
* by virtue of the hole punch.
|
||||
*/
|
||||
start_boundary = round_up(offset, granularity);
|
||||
end_boundary = round_down(offset + len, granularity);
|
||||
|
||||
ASSERT(start_boundary >= offset);
|
||||
ASSERT(end_boundary <= offset + len);
|
||||
|
||||
if (start_boundary < end_boundary - 1) {
|
||||
/*
|
||||
* Writeback the range to ensure any inode size updates due to
|
||||
* appending writes make it to disk (otherwise we could just
|
||||
* punch out the delalloc blocks).
|
||||
*/
|
||||
error = filemap_write_and_wait_range(VFS_I(ip)->i_mapping,
|
||||
start_boundary, end_boundary - 1);
|
||||
if (error)
|
||||
goto out;
|
||||
truncate_pagecache_range(VFS_I(ip), start_boundary,
|
||||
end_boundary - 1);
|
||||
|
||||
/* convert the blocks */
|
||||
error = xfs_alloc_file_space(ip, start_boundary,
|
||||
end_boundary - start_boundary - 1,
|
||||
XFS_BMAPI_PREALLOC | XFS_BMAPI_CONVERT);
|
||||
if (error)
|
||||
goto out;
|
||||
|
||||
/* We've handled the interior of the range, now for the edges */
|
||||
if (start_boundary != offset) {
|
||||
error = xfs_iozero(ip, offset, start_boundary - offset);
|
||||
if (error)
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (end_boundary != offset + len)
|
||||
error = xfs_iozero(ip, end_boundary,
|
||||
offset + len - end_boundary);
|
||||
|
||||
} else {
|
||||
/*
|
||||
* It's either a sub-granularity range or the range spanned lies
|
||||
* partially across two adjacent blocks.
|
||||
*/
|
||||
error = xfs_iozero(ip, offset, len);
|
||||
}
|
||||
error = xfs_free_file_space(ip, offset, len);
|
||||
if (error)
|
||||
goto out;
|
||||
|
||||
error = xfs_alloc_file_space(ip, round_down(offset, blksize),
|
||||
round_up(offset + len, blksize) -
|
||||
round_down(offset, blksize),
|
||||
XFS_BMAPI_PREALLOC);
|
||||
out:
|
||||
return error;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче