xfs: add FALLOC_FL_WRITE_ZEROES to XFS code base
PATCH RESEND v6 1/1 xfs: add FALLOC_FL_WRITE_ZEROES to XFS code base
Add support for FALLOC_FL_WRITE_ZEROES if the underlying device enable the unmap write zeroes operation.
Signed-off-by Lukas Herbolt <[email protected]>
Reviewed-by Christoph Hellwig <[email protected]>
--- fs/xfs/xfs_bmap_util.c | 10 ++++++++-- fs/xfs/xfs_bmap_util.h | 2 +- fs/xfs/xfs_file.c | 25 +++++++++++++++++++------ 3 files changed, 28 insertions(+), 9 deletions(-)
fs/xfs/xfs_bmap_util.c +8 -2
@@ -642,11 +642,17 @@ xfs_free_eofblocks(return error; } +/* +* Callers can specify bmapi_flags, if XFS_BMAPI_ZERO is used there are no +* further checks whether the hard ware supports and it can fallback to +* software zeroing. +*/ int xfs_alloc_file_space (struct xfs_inode *ip,xfs_off_t offset, -xfs_off_t len) +xfs_off_t len, +uint32_t bmapi_flags) {xfs_mount_t *mp = ip->i_mount;xfs_off_t count;
@@ -748,7 +754,7 @@ xfs_alloc_file_space(* will eventually reach the requested range. */ error =xfs_bmapi_write (tp, ip, startoffset_fsb, - allocatesize_fsb,XFS_BMAPI_PREALLOC ,0 , imapp, + allocatesize_fsb, bmapi_flags,0 , imapp, &nimaps);if (error) {if (error != -ENOSR )
fs/xfs/xfs_bmap_util.h +1 -1
@@ -56,7 +56,7 @@ int xfs_bmap_last_extent(struct xfs_trans *tp, struct xfs_inode *ip,/* preallocation and hole punch interface */ int xfs_alloc_file_space (struct xfs_inode *ip,xfs_off_t offset, -xfs_off_t len); +xfs_off_t len,uint32_t bmapi_flags);int xfs_free_file_space (struct xfs_inode *ip,xfs_off_t offset,xfs_off_t len,struct xfs_zone_alloc_ctx *ac); int xfs_collapse_file_space(struct xfs_inode *, xfs_off_t offset,
fs/xfs/xfs_file.c +19 -6
@@ -1261,23 +1261,33 @@ xfs_falloc_zero_range( struct xfs_zone_alloc_ctx *ac) {struct inode *inode =file_inode (file); +struct xfs_inode *ip =XFS_I (inode);unsigned int blksize =i_blocksize (inode);loff_t new_size =0 ;int error; -trace_xfs_zero_file_space (XFS_I (inode)); +trace_xfs_zero_file_space (ip); error =xfs_falloc_newsize (file, mode, offset, len, &new_size);if (error)return error; - error =xfs_free_file_space (XFS_I (inode), offset, len, ac); + error =xfs_free_file_space (ip, offset, len, ac);if (error)return error; len =round_up (offset + len, blksize) -round_down (offset, blksize); offset =round_down (offset, blksize); - error =xfs_alloc_file_space (XFS_I (inode), offset, len); +if (mode &FALLOC_FL_WRITE_ZEROES ) { +if (xfs_is_always_cow_inode (ip) || + !bdev_write_zeroes_unmap_sectors ( +xfs_inode_buftarg (ip)->bt_bdev)) +return -EOPNOTSUPP ; + error =xfs_alloc_file_space (ip, offset, len,XFS_BMAPI_ZERO ); + }else { + error =xfs_alloc_file_space (ip, offset, len, +XFS_BMAPI_PREALLOC ); + }if (error)return error;return xfs_falloc_setsize (file, new_size);
@@ -1302,7 +1312,8 @@ xfs_falloc_unshare_range(if (error)return error; - error =xfs_alloc_file_space (XFS_I (inode), offset, len); + error =xfs_alloc_file_space (XFS_I (inode), offset, len, +XFS_BMAPI_PREALLOC );if (error)return error;return xfs_falloc_setsize (file, new_size);
@@ -1330,7 +1341,8 @@ xfs_falloc_allocate_range(if (error)return error; - error =xfs_alloc_file_space (XFS_I (inode), offset, len); + error =xfs_alloc_file_space (XFS_I (inode), offset, len, +XFS_BMAPI_PREALLOC );if (error)return error;return xfs_falloc_setsize (file, new_size);
@@ -1340,7 +1352,7 @@ xfs_falloc_allocate_range( (FALLOC_FL_ALLOCATE_RANGE |FALLOC_FL_KEEP_SIZE | \FALLOC_FL_PUNCH_HOLE |FALLOC_FL_COLLAPSE_RANGE | \FALLOC_FL_ZERO_RANGE |FALLOC_FL_INSERT_RANGE | \ - FALLOC_FL_UNSHARE_RANGE) + FALLOC_FL_UNSHARE_RANGE | FALLOC_FL_WRITE_ZEROES)STATIC long __xfs_file_fallocate(
@@ -1383,6 +1395,7 @@ __xfs_file_fallocate(case FALLOC_FL_INSERT_RANGE : error =xfs_falloc_insert_range (file, offset, len);break ; +case FALLOC_FL_WRITE_ZEROES :case FALLOC_FL_ZERO_RANGE : error =xfs_falloc_zero_range (file, mode, offset, len, ac);break ;
Signature · 1 line
2.51.1
Quoted 5 lines · Lukas Herbolt
Add support for
FALLOC_FL_WRITE_ZEROESif the underlying device enable the unmap write zeroes operation.Signed-off-by Lukas Herbolt <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>
Looks good to me now, thanks for taking this on!
Reviewed-by "Darrick J. Wong" <[email protected]>
--D
Quoted 133 lines
--- fs/xfs/xfs_bmap_util.c | 10 ++++++++-- fs/xfs/xfs_bmap_util.h | 2 +- fs/xfs/xfs_file.c | 25 +++++++++++++++++++------ 3 files changed, 28 insertions(+), 9 deletions(-)fs/xfs/xfs_bmap_util.c +8
-2@@ -642,11 +642,17 @@ xfs_free_eofblocks(return error; } +/* +* Callers can specify bmapi_flags, if XFS_BMAPI_ZERO is used there are no +* further checks whether the hard ware supports and it can fallback to +* software zeroing. +*/ int xfs_alloc_file_space (struct xfs_inode *ip,xfs_off_t offset, -xfs_off_t len) +xfs_off_t len, +uint32_t bmapi_flags) {xfs_mount_t *mp = ip->i_mount;xfs_off_t count;@@ -748,7 +754,7 @@ xfs_alloc_file_space(* will eventually reach the requested range. */ error =xfs_bmapi_write (tp, ip, startoffset_fsb, - allocatesize_fsb,XFS_BMAPI_PREALLOC ,0 , imapp, + allocatesize_fsb, bmapi_flags,0 , imapp, &nimaps);if (error) {if (error != -ENOSR )fs/xfs/xfs_bmap_util.h +1
-1@@ -56,7 +56,7 @@ int xfs_bmap_last_extent(struct xfs_trans *tp, struct xfs_inode *ip,/* preallocation and hole punch interface */ int xfs_alloc_file_space (struct xfs_inode *ip,xfs_off_t offset, -xfs_off_t len); +xfs_off_t len,uint32_t bmapi_flags);int xfs_free_file_space (struct xfs_inode *ip,xfs_off_t offset,xfs_off_t len,struct xfs_zone_alloc_ctx *ac); int xfs_collapse_file_space(struct xfs_inode *, xfs_off_t offset,fs/xfs/xfs_file.c +19
-6@@ -1261,23 +1261,33 @@ xfs_falloc_zero_range( struct xfs_zone_alloc_ctx *ac) {struct inode *inode =file_inode (file); +struct xfs_inode *ip =XFS_I (inode);unsigned int blksize =i_blocksize (inode);loff_t new_size =0 ;int error; -trace_xfs_zero_file_space (XFS_I (inode)); +trace_xfs_zero_file_space (ip); error =xfs_falloc_newsize (file, mode, offset, len, &new_size);if (error)return error; - error =xfs_free_file_space (XFS_I (inode), offset, len, ac); + error =xfs_free_file_space (ip, offset, len, ac);if (error)return error; len =round_up (offset + len, blksize) -round_down (offset, blksize); offset =round_down (offset, blksize); - error =xfs_alloc_file_space (XFS_I (inode), offset, len); +if (mode &FALLOC_FL_WRITE_ZEROES ) { +if (xfs_is_always_cow_inode (ip) || + !bdev_write_zeroes_unmap_sectors ( +xfs_inode_buftarg (ip)->bt_bdev)) +return -EOPNOTSUPP ; + error =xfs_alloc_file_space (ip, offset, len,XFS_BMAPI_ZERO ); + }else { + error =xfs_alloc_file_space (ip, offset, len, +XFS_BMAPI_PREALLOC ); + }if (error)return error;return xfs_falloc_setsize (file, new_size);@@ -1302,7 +1312,8 @@ xfs_falloc_unshare_range(if (error)return error; - error =xfs_alloc_file_space (XFS_I (inode), offset, len); + error =xfs_alloc_file_space (XFS_I (inode), offset, len, +XFS_BMAPI_PREALLOC );if (error)return error;return xfs_falloc_setsize (file, new_size);@@ -1330,7 +1341,8 @@ xfs_falloc_allocate_range(if (error)return error; - error =xfs_alloc_file_space (XFS_I (inode), offset, len); + error =xfs_alloc_file_space (XFS_I (inode), offset, len, +XFS_BMAPI_PREALLOC );if (error)return error;return xfs_falloc_setsize (file, new_size);@@ -1340,7 +1352,7 @@ xfs_falloc_allocate_range( (FALLOC_FL_ALLOCATE_RANGE |FALLOC_FL_KEEP_SIZE | \FALLOC_FL_PUNCH_HOLE |FALLOC_FL_COLLAPSE_RANGE | \FALLOC_FL_ZERO_RANGE |FALLOC_FL_INSERT_RANGE | \ - FALLOC_FL_UNSHARE_RANGE) + FALLOC_FL_UNSHARE_RANGE | FALLOC_FL_WRITE_ZEROES)STATIC long __xfs_file_fallocate(@@ -1383,6 +1395,7 @@ __xfs_file_fallocate(case FALLOC_FL_INSERT_RANGE : error =xfs_falloc_insert_range (file, offset, len);break ; +case FALLOC_FL_WRITE_ZEROES :case FALLOC_FL_ZERO_RANGE : error =xfs_falloc_zero_range (file, mode, offset, len, ac);break ;Signature · 1 line
2.51.1