xfs: Fix tail rounding in xfs_alloc_file_space()
PATCH 1/1 xfs: Fix tail rounding in xfs_alloc_file_space()
To ensure that all blocks touched by the range [offset, offset + count) are allocated, we need to calculate the block count from the difference of the range end (rounded up) and the range start (rounded down).
Before this patch, we just round up the byte count, which may lead to unaligned ranges not being fully allocated:
$ touch test_file
$ block_size=$(stat -fc '%S' test_file)
$ fallocate -o $((block_size / 2)) -l $block_size test_file
$ xfs_bmap test_file
test_file:
0: [0..7]: 1396264..1396271
1: [8..15]: holeThere should not be a hole there. Instead, the first two blocks should be fully allocated.
With this patch applied, the result is something like this:
$ touch test_file
$ block_size=$(stat -fc '%S' test_file)
$ fallocate -o $((block_size / 2)) -l $block_size test_file
$ xfs_bmap test_file
test_file:
0: [0..15]: 11024..11039--- fs/xfs/xfs_bmap_util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/xfs/xfs_bmap_util.c +3 -1
@@ -864,6 +864,7 @@ xfs_alloc_file_space(xfs_filblks_t allocatesize_fsb;xfs_extlen_t extsz, temp;xfs_fileoff_t startoffset_fsb; +xfs_fileoff_t endoffset_fsb;int nimaps;int quota_flag;int rt;
@@ -891,7 +892,8 @@ xfs_alloc_file_space( imapp = &imaps[0 ]; nimaps =1 ; startoffset_fsb =XFS_B_TO_FSBT (mp, offset); - allocatesize_fsb =XFS_B_TO_FSB (mp, count); + endoffset_fsb =XFS_B_TO_FSB (mp, offset + count); + allocatesize_fsb = endoffset_fsb - startoffset_fsb;/* * Allocate file space until done or until there is an error
Signature · 1 line
2.23.0
Quoted 18 lines · Max Reitz
To ensure that all blocks touched by the range [offset, offset + count) are allocated, we need to calculate the block count from the difference of the range end (rounded up) and the range start (rounded down).
Before this patch, we just round up the byte count, which may lead to unaligned ranges not being fully allocated:
$ touch test_file $ block_size=$(stat -fc '%S' test_file) $ fallocate -o $((block_size / 2)) -l $block_size test_file $ xfs_bmap test_file test_file: 0: [0..7]: 1396264..1396271 1: [8..15]: holeThere should not be a hole there. Instead, the first two blocks should be fully allocated.
Quoted 8 lines
With this patch applied, the result is something like this:
$ touch test_file $ block_size=$(stat -fc '%S' test_file) $ fallocate -o $((block_size / 2)) -l $block_size test_file $ xfs_bmap test_file test_file: 0: [0..15]: 11024..11039
Code looks ok; by any chance do you have an xfstest we could add to the regresion test suite?
--D
Quoted 30 lines
Signed-off-by Max Reitz <[email protected]>--- fs/xfs/xfs_bmap_util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/xfs/xfs_bmap_util.c +3
-1@@ -864,6 +864,7 @@ xfs_alloc_file_space(xfs_filblks_t allocatesize_fsb;xfs_extlen_t extsz, temp;xfs_fileoff_t startoffset_fsb; +xfs_fileoff_t endoffset_fsb;int nimaps;int quota_flag;int rt;@@ -891,7 +892,8 @@ xfs_alloc_file_space( imapp = &imaps[0 ]; nimaps =1 ; startoffset_fsb =XFS_B_TO_FSBT (mp, offset); - allocatesize_fsb =XFS_B_TO_FSB (mp, count); + endoffset_fsb =XFS_B_TO_FSB (mp, offset + count); + allocatesize_fsb = endoffset_fsb - startoffset_fsb;/* * Allocate file space until done or until there is an error Signature · 1 line
2.23.0
Quoted 28 lines · Darrick J. Wong
Quoted 18 lines · Max Reitz
To ensure that all blocks touched by the range [offset, offset + count) are allocated, we need to calculate the block count from the difference of the range end (rounded up) and the range start (rounded down).
Before this patch, we just round up the byte count, which may lead to unaligned ranges not being fully allocated:
$ touch test_file $ block_size=$(stat -fc '%S' test_file) $ fallocate -o $((block_size / 2)) -l $block_size test_file $ xfs_bmap test_file test_file: 0: [0..7]: 1396264..1396271 1: [8..15]: holeThere should not be a hole there. Instead, the first two blocks should be fully allocated.
Quoted 8 lines
With this patch applied, the result is something like this:
$ touch test_file $ block_size=$(stat -fc '%S' test_file) $ fallocate -o $((block_size / 2)) -l $block_size test_file $ xfs_bmap test_file test_file: 0: [0..15]: 11024..11039
Quoted 2 lines
Code looks ok; by any chance do you have an xfstest we could add to the regresion test suite?
I’ll look into it.
Max
Quoted 20 lines · Max Reitz
To ensure that all blocks touched by the range [offset, offset + count) are allocated, we need to calculate the block count from the difference of the range end (rounded up) and the range start (rounded down).
Before this patch, we just round up the byte count, which may lead to unaligned ranges not being fully allocated:
$ touch test_file $ block_size=$(stat -fc '%S' test_file) $ fallocate -o $((block_size / 2)) -l $block_size test_file $ xfs_bmap test_file test_file: 0: [0..7]: 1396264..1396271 1: [8..15]: holeThere should not be a hole there. Instead, the first two blocks should be fully allocated.
With this patch applied, the result is something like this:
Quoted 8 lines
$ touch test_file $ block_size=$(stat -fc '%S' test_file) $ fallocate -o $((block_size / 2)) -l $block_size test_file $ xfs_bmap test_file test_file: 0: [0..15]: 11024..11039Signed-off-by Max Reitz <[email protected]>
For the patch:
+1 for a test in xfstests
P.S.
You usually don't need to Cc: LKML for xfs-only patches, linux-xfs is enough.
Quoted 29 lines
--- fs/xfs/xfs_bmap_util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/xfs/xfs_bmap_util.c +3
-1@@ -864,6 +864,7 @@ xfs_alloc_file_space(xfs_filblks_t allocatesize_fsb;xfs_extlen_t extsz, temp;xfs_fileoff_t startoffset_fsb; +xfs_fileoff_t endoffset_fsb;int nimaps;int quota_flag;int rt;@@ -891,7 +892,8 @@ xfs_alloc_file_space( imapp = &imaps[0 ]; nimaps =1 ; startoffset_fsb =XFS_B_TO_FSBT (mp, offset); - allocatesize_fsb =XFS_B_TO_FSB (mp, count); + endoffset_fsb =XFS_B_TO_FSB (mp, offset + count); + allocatesize_fsb = endoffset_fsb - startoffset_fsb;/* * Allocate file space until done or until there is an error Signature · 1 line
2.23.0
Signature · 1 line
Carlos
Quoted 35 lines · Carlos Maiolino
Quoted 20 lines · Max Reitz
To ensure that all blocks touched by the range [offset, offset + count) are allocated, we need to calculate the block count from the difference of the range end (rounded up) and the range start (rounded down).
Before this patch, we just round up the byte count, which may lead to unaligned ranges not being fully allocated:
$ touch test_file $ block_size=$(stat -fc '%S' test_file) $ fallocate -o $((block_size / 2)) -l $block_size test_file $ xfs_bmap test_file test_file: 0: [0..7]: 1396264..1396271 1: [8..15]: holeThere should not be a hole there. Instead, the first two blocks should be fully allocated.
With this patch applied, the result is something like this:
Quoted 8 lines
$ touch test_file $ block_size=$(stat -fc '%S' test_file) $ fallocate -o $((block_size / 2)) -l $block_size test_file $ xfs_bmap test_file test_file: 0: [0..15]: 11024..11039Signed-off-by Max Reitz <[email protected]>For the patch:
Reviewed-by Carlos Maiolino <[email protected]>
Quoted 6 lines
+1 for a test in xfstests
P.S.You usually don't need to Cc: LKML for xfs-only patches, linux-xfs is enough.
OK, thanks. I wasn’t sure because get_maintainer.pl just emits it by default.
Max
Quoted 6 lines · Max Reitz
To ensure that all blocks touched by the range [offset, offset + count) are allocated, we need to calculate the block count from the difference of the range end (rounded up) and the range start (rounded down).
Before this patch, we just round up the byte count, which may lead to unaligned ranges not being fully allocated:
Looks fine:
Quoted 20 lines · Max Reitz
To ensure that all blocks touched by the range [offset, offset + count) are allocated, we need to calculate the block count from the difference of the range end (rounded up) and the range start (rounded down).
Before this patch, we just round up the byte count, which may lead to unaligned ranges not being fully allocated:
$ touch test_file $ block_size=$(stat -fc '%S' test_file) $ fallocate -o $((block_size / 2)) -l $block_size test_file $ xfs_bmap test_file test_file: 0: [0..7]: 1396264..1396271 1: [8..15]: holeThere should not be a hole there. Instead, the first two blocks should be fully allocated.
With this patch applied, the result is something like this:
Quoted 8 lines
$ touch test_file $ block_size=$(stat -fc '%S' test_file) $ fallocate -o $((block_size / 2)) -l $block_size test_file $ xfs_bmap test_file test_file: 0: [0..15]: 11024..11039Signed-off-by Max Reitz <[email protected]>
Looks ok, will test...
--D
Quoted 29 lines
--- fs/xfs/xfs_bmap_util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/xfs/xfs_bmap_util.c +3
-1@@ -864,6 +864,7 @@ xfs_alloc_file_space(xfs_filblks_t allocatesize_fsb;xfs_extlen_t extsz, temp;xfs_fileoff_t startoffset_fsb; +xfs_fileoff_t endoffset_fsb;int nimaps;int quota_flag;int rt;@@ -891,7 +892,8 @@ xfs_alloc_file_space( imapp = &imaps[0 ]; nimaps =1 ; startoffset_fsb =XFS_B_TO_FSBT (mp, offset); - allocatesize_fsb =XFS_B_TO_FSB (mp, count); + endoffset_fsb =XFS_B_TO_FSB (mp, offset + count); + allocatesize_fsb = endoffset_fsb - startoffset_fsb;/* * Allocate file space until done or until there is an error Signature · 1 line
2.23.0