| Message ID | 20180912062626.14349-2-chandan@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix tests to work on non-4k block sized fs instances | expand |
On Wed, Sep 12, 2018 at 11:56:08AM +0530, Chandan Rajendra wrote: > xfs_alloc_file_space() rounds up allocation requests by the filesystem > block size. Hence this commit changes the test to work with block size > units rather than with a multiple of 4096 bytes. > > Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com> > --- > tests/xfs/009 | 92 ++++++++++++++++++++++++++++++++++++++++++++++--------- > tests/xfs/009.out | 66 +++++++++++++++++++-------------------- > 2 files changed, 110 insertions(+), 48 deletions(-) > > diff --git a/tests/xfs/009 b/tests/xfs/009 > index 68f6379..70717eb 100755 > --- a/tests/xfs/009 > +++ b/tests/xfs/009 > @@ -14,9 +14,6 @@ here=`pwd` > tmp=/tmp/$$ > status=1 # failure is the default! > trap "_cleanup; exit \$status" 0 1 2 3 15 > -# This isn't really related to fs block size, it's just what > -# alloc uses for the "block" unit in it's input parameters... > -bsize=4096 > > _cleanup() > { > @@ -24,13 +21,6 @@ _cleanup() > _scratch_unmount > } > > -_block_filter() > -{ > - sed \ > - -e 's/[0-9][0-9]*\.\.[0-9][0-9]*/BLOCKRANGE/g' \ > - -e "s/blocksize $bsize/blocksize BSIZE/g" > -} > - > _init() > { > echo "*** mkfs" > @@ -49,11 +39,6 @@ _init() > fi > } > > -_filesize() > -{ > - ls -l $1 | $AWK_PROG '{print "filesize = " $5}' > -} > - > # get standard environment, filters and checks > . ./common/rc > . ./common/filter > @@ -64,9 +49,86 @@ _supported_os Linux > > _require_scratch > > +_filesize() > +{ > + ls -l $1 | $AWK_PROG -v bsize="$bsize" '{print "filesize = " $5 / bsize}' > +} > + > +_block_filter() > +{ > + $AWK_PROG -v bsize="$bsize" ' > + /blocksize/ { > + printf(" blocksize BSIZE\n") > + > + next > + } > + > + /CMD/ { > + split($3, off, "=") > + offset = strtonum(off[2]) > + if (offset != -1) > + offset = offset / bsize > + > + split($4, len, "=") > + nr_blocks = strtonum(len[2]) > + if (nr_blocks != -1) > + nr_blocks = nr_blocks / bsize > + > + printf(" %s %s off=%s, len=%d\n", $1, $2, offset, nr_blocks) > + > + next > + } > + > + /MAP/ { > + split($2, off, "=") > + offset = strtonum(off[2]) > + if (offset != -1) > + offset = offset / bsize > + > + split($3, len, "=") > + > + nr_blocks = strtonum(len[2]) > + > + if (nr_blocks != -1) > + nr_blocks = nr_blocks / bsize > + > + printf(" %s off=%s, len=%d %s\n", $1, offset, nr_blocks, $4) > + > + next > + } > + > + /TRUNCATE/ { > + split($2, off, "=") > + offset = strtonum(off[2]) / bsize > + > + printf(" %s off=%s\n", $1, offset) > + > + next > + } > + > + /\[[0-9]+,[0-9]+\]:/ { > + printf(" %s BLOCKRANGE\n", $1) > + > + next > + } > + > + { > + print > + > + next > + } > + ' > +} > + > _init > out=$SCRATCH_MNT/$$.tmp > > +# This isn't really related to fs block size, it's just what > +# alloc uses for the "block" unit in it's input parameters... > +# However, xfs_alloc_file_space() rounds up allocation > +# request by the filesystem's block size. > +bsize=$(_get_block_size $SCRATCH_MNT) [Sorry for the extremely long delay, I've been on leave...] Hm. Certain filesystems draw a distinction between the fundamental block size and the minimum file block mapping size. ocfs2 supports having a file cluster size (mkfs.ocfs2 -C) that is greater than the fs block size, and (I think) xfs can achieve something similar for files on a realtime device via the mkfs.xfs -r extsize= option. If you're dealing with writing things into a file for a test, I think you have to use _get_file_block_size to make sure that you don't fall afoul of the cluster/block difference. I don't know if you've checked that for this patch series...? (Granted, I suspect that many tests have been sloppy about this...) --D > + > # since we're using a clean FS here, we make some assumptions > # about availability of contiguous blocks > > diff --git a/tests/xfs/009.out b/tests/xfs/009.out > index 7132aca..02b5d82 100644 > --- a/tests/xfs/009.out > +++ b/tests/xfs/009.out > @@ -3,8 +3,8 @@ QA output created by 009 > *** mount > *** test 1 - reservations cleared on O_TRUNC > blocksize BSIZE > - CMD resvsp, off=0, len=4096000 > - MAP off=0, len=4096000 [0,1000] > + CMD resvsp, off=0, len=1000 > + MAP off=0, len=1000 [0,1000] > [ofs,count]: start..end > [0,1000]: BLOCKRANGE > MAP off=0, len=-1 [0-] > @@ -17,53 +17,53 @@ filesize = 0 > filesize = 0 > *** test 2 - reserve & filesize > blocksize BSIZE > - CMD resvsp, off=0, len=4096000 > - MAP off=0, len=4096000 [0,1000] > + CMD resvsp, off=0, len=1000 > + MAP off=0, len=1000 [0,1000] > [ofs,count]: start..end > [0,1000]: BLOCKRANGE > filesize = 0 > *** test 3 - alloc & filesize > blocksize BSIZE > - CMD allocsp, off=4096000, len=-1 > - MAP off=4096000, len=-1 [1000-] > + CMD allocsp, off=1000, len=-1 > + MAP off=1000, len=-1 [1000-] > [ofs,count]: start..end > -filesize = 4096000 > +filesize = 1000 > *** test 4 - allocations cleared on O_TRUNC > blocksize BSIZE > - CMD allocsp, off=4096000, len=-1 > - MAP off=4096000, len=-1 [1000-] > + CMD allocsp, off=1000, len=-1 > + MAP off=1000, len=-1 [1000-] > [ofs,count]: start..end > -filesize = 4096000 > +filesize = 1000 > blocksize BSIZE > MAP off=0, len=-1 [0-] > [ofs,count]: start..end > filesize = 0 > *** test 5 - reserve / unreserve > blocksize BSIZE > - CMD resvsp, off=0, len=409600 > - MAP off=0, len=409600 [0,100] > + CMD resvsp, off=0, len=100 > + MAP off=0, len=100 [0,100] > [ofs,count]: start..end > [0,100]: BLOCKRANGE > - CMD unresvsp, off=409600, len=2048000 > - MAP off=409600, len=2048000 [100,500] > + CMD unresvsp, off=100, len=500 > + MAP off=100, len=500 [100,500] > [ofs,count]: start..end > MAP off=0, len=-1 [0-] > [ofs,count]: start..end > [0,100]: BLOCKRANGE > - CMD unresvsp, off=3686400, len=819200 > - MAP off=3686400, len=819200 [900,200] > + CMD unresvsp, off=900, len=200 > + MAP off=900, len=200 [900,200] > [ofs,count]: start..end > MAP off=0, len=-1 [0-] > [ofs,count]: start..end > [0,100]: BLOCKRANGE > *** test 6 - reserve adjacent > blocksize BSIZE > - CMD resvsp, off=0, len=409600 > - MAP off=0, len=409600 [0,100] > + CMD resvsp, off=0, len=100 > + MAP off=0, len=100 [0,100] > [ofs,count]: start..end > [0,100]: BLOCKRANGE > - CMD resvsp, off=409600, len=409600 > - MAP off=409600, len=409600 [100,100] > + CMD resvsp, off=100, len=100 > + MAP off=100, len=100 [100,100] > [ofs,count]: start..end > [100,100]: BLOCKRANGE > MAP off=0, len=-1 [0-] > @@ -71,44 +71,44 @@ filesize = 0 > [0,200]: BLOCKRANGE > *** test 7 - alloc > blocksize BSIZE > - CMD allocsp, off=4096000, len=-1 > - MAP off=4096000, len=-1 [1000-] > + CMD allocsp, off=1000, len=-1 > + MAP off=1000, len=-1 [1000-] > [ofs,count]: start..end > MAP off=0, len=-1 [0-] > [ofs,count]: start..end > [0,1000]: BLOCKRANGE > - CMD allocsp, off=8192000, len=-1 > - MAP off=8192000, len=-1 [2000-] > + CMD allocsp, off=2000, len=-1 > + MAP off=2000, len=-1 [2000-] > [ofs,count]: start..end > MAP off=0, len=-1 [0-] > [ofs,count]: start..end > [0,2000]: BLOCKRANGE > -filesize = 8192000 > +filesize = 2000 > *** test 8 - alloc & truncate > blocksize BSIZE > - CMD allocsp, off=4096000, len=-1 > - MAP off=4096000, len=-1 [1000-] > + CMD allocsp, off=1000, len=-1 > + MAP off=1000, len=-1 [1000-] > [ofs,count]: start..end > MAP off=0, len=-1 [0-] > [ofs,count]: start..end > [0,1000]: BLOCKRANGE > - TRUNCATE off=2048000 > + TRUNCATE off=500 > MAP off=0, len=-1 [0-] > [ofs,count]: start..end > [0,500]: BLOCKRANGE > -filesize = 2048000 > +filesize = 500 > *** test 9 - reserve & truncate > blocksize BSIZE > - CMD resvsp, off=0, len=4096000 > - MAP off=0, len=4096000 [0,1000] > + CMD resvsp, off=0, len=1000 > + MAP off=0, len=1000 [0,1000] > [ofs,count]: start..end > [0,1000]: BLOCKRANGE > MAP off=0, len=-1 [0-] > [ofs,count]: start..end > [0,1000]: BLOCKRANGE > - TRUNCATE off=2048000 > + TRUNCATE off=500 > MAP off=0, len=-1 [0-] > [ofs,count]: start..end > [0,1000]: BLOCKRANGE > -filesize = 2048000 > +filesize = 500 > *** unmount > -- > 2.9.5 >
On Mon, Sep 17, 2018 at 03:59:25PM -0700, Darrick J. Wong wrote: > > Hm. Certain filesystems draw a distinction between the fundamental > block size and the minimum file block mapping size. ocfs2 supports > having a file cluster size (mkfs.ocfs2 -C) that is greater than the fs > block size, and (I think) xfs can achieve something similar for files on > a realtime device via the mkfs.xfs -r extsize= option. > > If you're dealing with writing things into a file for a test, I think > you have to use _get_file_block_size to make sure that you don't fall > afoul of the cluster/block difference. I don't know if you've checked > that for this patch series...? > > (Granted, I suspect that many tests have been sloppy about this...) Indeed, we have a number of failures in ext4 bigalloc which are because of this block size vs. cluster size difference. IIRC, a while back Eric Whitney had tried to start a discussion about how to best deal with this issue, but it wasn't clear what was the right way to add the necessary infrastructure to xfstests. I had assumed it was an ext4-only problem, and no one had time to try to come up with a solution. As far as I know, we still don't have any general infrastructure to support this in xfstests. Is this correct, or am I missing something? - Ted
On Mon, Sep 17, 2018 at 11:18:30PM -0400, Theodore Y. Ts'o wrote: > On Mon, Sep 17, 2018 at 03:59:25PM -0700, Darrick J. Wong wrote: > > > > Hm. Certain filesystems draw a distinction between the fundamental > > block size and the minimum file block mapping size. ocfs2 supports > > having a file cluster size (mkfs.ocfs2 -C) that is greater than the fs > > block size, and (I think) xfs can achieve something similar for files on > > a realtime device via the mkfs.xfs -r extsize= option. > > > > If you're dealing with writing things into a file for a test, I think > > you have to use _get_file_block_size to make sure that you don't fall > > afoul of the cluster/block difference. I don't know if you've checked > > that for this patch series...? > > > > (Granted, I suspect that many tests have been sloppy about this...) > > Indeed, we have a number of failures in ext4 bigalloc which are > because of this block size vs. cluster size difference. IIRC, a while > back Eric Whitney had tried to start a discussion about how to best > deal with this issue, but it wasn't clear what was the right way to > add the necessary infrastructure to xfstests. I had assumed it was an > ext4-only problem, and no one had time to try to come up with a > solution. > > As far as I know, we still don't have any general infrastructure to > support this in xfstests. Is this correct, or am I missing something? As far as I know we don't have any general infrastructure -- ocfs2 has only recently been subjected to xfstests, and I don't think there are many people running xfstests on a xfs filesystem where realtime has been forced on for all files *and* the rt extent size is larger than a block. IOWs: we don't test hardly ever, it's probably broken, and sigh. :( --D > - Ted
On Tuesday, September 18, 2018 4:29:25 AM IST Darrick J. Wong wrote: > On Wed, Sep 12, 2018 at 11:56:08AM +0530, Chandan Rajendra wrote: > > xfs_alloc_file_space() rounds up allocation requests by the filesystem > > block size. Hence this commit changes the test to work with block size > > units rather than with a multiple of 4096 bytes. > > > > Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com> > > --- > > tests/xfs/009 | 92 ++++++++++++++++++++++++++++++++++++++++++++++--------- > > tests/xfs/009.out | 66 +++++++++++++++++++-------------------- > > 2 files changed, 110 insertions(+), 48 deletions(-) > > > > diff --git a/tests/xfs/009 b/tests/xfs/009 > > index 68f6379..70717eb 100755 > > --- a/tests/xfs/009 > > +++ b/tests/xfs/009 > > @@ -14,9 +14,6 @@ here=`pwd` > > tmp=/tmp/$$ > > status=1 # failure is the default! > > trap "_cleanup; exit \$status" 0 1 2 3 15 > > -# This isn't really related to fs block size, it's just what > > -# alloc uses for the "block" unit in it's input parameters... > > -bsize=4096 > > > > _cleanup() > > { > > @@ -24,13 +21,6 @@ _cleanup() > > _scratch_unmount > > } > > > > -_block_filter() > > -{ > > - sed \ > > - -e 's/[0-9][0-9]*\.\.[0-9][0-9]*/BLOCKRANGE/g' \ > > - -e "s/blocksize $bsize/blocksize BSIZE/g" > > -} > > - > > _init() > > { > > echo "*** mkfs" > > @@ -49,11 +39,6 @@ _init() > > fi > > } > > > > -_filesize() > > -{ > > - ls -l $1 | $AWK_PROG '{print "filesize = " $5}' > > -} > > - > > # get standard environment, filters and checks > > . ./common/rc > > . ./common/filter > > @@ -64,9 +49,86 @@ _supported_os Linux > > > > _require_scratch > > > > +_filesize() > > +{ > > + ls -l $1 | $AWK_PROG -v bsize="$bsize" '{print "filesize = " $5 / bsize}' > > +} > > + > > +_block_filter() > > +{ > > + $AWK_PROG -v bsize="$bsize" ' > > + /blocksize/ { > > + printf(" blocksize BSIZE\n") > > + > > + next > > + } > > + > > + /CMD/ { > > + split($3, off, "=") > > + offset = strtonum(off[2]) > > + if (offset != -1) > > + offset = offset / bsize > > + > > + split($4, len, "=") > > + nr_blocks = strtonum(len[2]) > > + if (nr_blocks != -1) > > + nr_blocks = nr_blocks / bsize > > + > > + printf(" %s %s off=%s, len=%d\n", $1, $2, offset, nr_blocks) > > + > > + next > > + } > > + > > + /MAP/ { > > + split($2, off, "=") > > + offset = strtonum(off[2]) > > + if (offset != -1) > > + offset = offset / bsize > > + > > + split($3, len, "=") > > + > > + nr_blocks = strtonum(len[2]) > > + > > + if (nr_blocks != -1) > > + nr_blocks = nr_blocks / bsize > > + > > + printf(" %s off=%s, len=%d %s\n", $1, offset, nr_blocks, $4) > > + > > + next > > + } > > + > > + /TRUNCATE/ { > > + split($2, off, "=") > > + offset = strtonum(off[2]) / bsize > > + > > + printf(" %s off=%s\n", $1, offset) > > + > > + next > > + } > > + > > + /\[[0-9]+,[0-9]+\]:/ { > > + printf(" %s BLOCKRANGE\n", $1) > > + > > + next > > + } > > + > > + { > > + print > > + > > + next > > + } > > + ' > > +} > > + > > _init > > out=$SCRATCH_MNT/$$.tmp > > > > +# This isn't really related to fs block size, it's just what > > +# alloc uses for the "block" unit in it's input parameters... > > +# However, xfs_alloc_file_space() rounds up allocation > > +# request by the filesystem's block size. > > +bsize=$(_get_block_size $SCRATCH_MNT) > > [Sorry for the extremely long delay, I've been on leave...] > > Hm. Certain filesystems draw a distinction between the fundamental > block size and the minimum file block mapping size. ocfs2 supports > having a file cluster size (mkfs.ocfs2 -C) that is greater than the fs > block size, and (I think) xfs can achieve something similar for files on > a realtime device via the mkfs.xfs -r extsize= option. > > If you're dealing with writing things into a file for a test, I think > you have to use _get_file_block_size to make sure that you don't fall > afoul of the cluster/block difference. I don't know if you've checked > that for this patch series...? Thanks for pointing that out. I didn't know about the existance of _get_file_block_size. I will go through the patchset once again and figure out which one of _get_block_size v/s _get_file_block_size to use?
On Tue, Sep 18, 2018 at 11:32:12AM +0530, Chandan Rajendra wrote: > On Tuesday, September 18, 2018 4:29:25 AM IST Darrick J. Wong wrote: > > On Wed, Sep 12, 2018 at 11:56:08AM +0530, Chandan Rajendra wrote: > > > xfs_alloc_file_space() rounds up allocation requests by the filesystem > > > block size. Hence this commit changes the test to work with block size > > > units rather than with a multiple of 4096 bytes. > > > > > > Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com> > > > --- > > > tests/xfs/009 | 92 ++++++++++++++++++++++++++++++++++++++++++++++--------- > > > tests/xfs/009.out | 66 +++++++++++++++++++-------------------- > > > 2 files changed, 110 insertions(+), 48 deletions(-) > > > > > > diff --git a/tests/xfs/009 b/tests/xfs/009 > > > index 68f6379..70717eb 100755 > > > --- a/tests/xfs/009 > > > +++ b/tests/xfs/009 > > > @@ -14,9 +14,6 @@ here=`pwd` > > > tmp=/tmp/$$ > > > status=1 # failure is the default! > > > trap "_cleanup; exit \$status" 0 1 2 3 15 > > > -# This isn't really related to fs block size, it's just what > > > -# alloc uses for the "block" unit in it's input parameters... > > > -bsize=4096 > > > > > > _cleanup() > > > { > > > @@ -24,13 +21,6 @@ _cleanup() > > > _scratch_unmount > > > } > > > > > > -_block_filter() > > > -{ > > > - sed \ > > > - -e 's/[0-9][0-9]*\.\.[0-9][0-9]*/BLOCKRANGE/g' \ > > > - -e "s/blocksize $bsize/blocksize BSIZE/g" > > > -} > > > - > > > _init() > > > { > > > echo "*** mkfs" > > > @@ -49,11 +39,6 @@ _init() > > > fi > > > } > > > > > > -_filesize() > > > -{ > > > - ls -l $1 | $AWK_PROG '{print "filesize = " $5}' > > > -} > > > - > > > # get standard environment, filters and checks > > > . ./common/rc > > > . ./common/filter > > > @@ -64,9 +49,86 @@ _supported_os Linux > > > > > > _require_scratch > > > > > > +_filesize() > > > +{ > > > + ls -l $1 | $AWK_PROG -v bsize="$bsize" '{print "filesize = " $5 / bsize}' > > > +} > > > + > > > +_block_filter() > > > +{ > > > + $AWK_PROG -v bsize="$bsize" ' > > > + /blocksize/ { > > > + printf(" blocksize BSIZE\n") > > > + > > > + next > > > + } > > > + > > > + /CMD/ { > > > + split($3, off, "=") > > > + offset = strtonum(off[2]) > > > + if (offset != -1) > > > + offset = offset / bsize > > > + > > > + split($4, len, "=") > > > + nr_blocks = strtonum(len[2]) > > > + if (nr_blocks != -1) > > > + nr_blocks = nr_blocks / bsize > > > + > > > + printf(" %s %s off=%s, len=%d\n", $1, $2, offset, nr_blocks) > > > + > > > + next > > > + } > > > + > > > + /MAP/ { > > > + split($2, off, "=") > > > + offset = strtonum(off[2]) > > > + if (offset != -1) > > > + offset = offset / bsize > > > + > > > + split($3, len, "=") > > > + > > > + nr_blocks = strtonum(len[2]) > > > + > > > + if (nr_blocks != -1) > > > + nr_blocks = nr_blocks / bsize > > > + > > > + printf(" %s off=%s, len=%d %s\n", $1, offset, nr_blocks, $4) > > > + > > > + next > > > + } > > > + > > > + /TRUNCATE/ { > > > + split($2, off, "=") > > > + offset = strtonum(off[2]) / bsize > > > + > > > + printf(" %s off=%s\n", $1, offset) > > > + > > > + next > > > + } > > > + > > > + /\[[0-9]+,[0-9]+\]:/ { > > > + printf(" %s BLOCKRANGE\n", $1) > > > + > > > + next > > > + } > > > + > > > + { > > > + print > > > + > > > + next > > > + } > > > + ' > > > +} > > > + > > > _init > > > out=$SCRATCH_MNT/$$.tmp > > > > > > +# This isn't really related to fs block size, it's just what > > > +# alloc uses for the "block" unit in it's input parameters... > > > +# However, xfs_alloc_file_space() rounds up allocation > > > +# request by the filesystem's block size. > > > +bsize=$(_get_block_size $SCRATCH_MNT) > > > > [Sorry for the extremely long delay, I've been on leave...] > > > > Hm. Certain filesystems draw a distinction between the fundamental > > block size and the minimum file block mapping size. ocfs2 supports > > having a file cluster size (mkfs.ocfs2 -C) that is greater than the fs > > block size, and (I think) xfs can achieve something similar for files on > > a realtime device via the mkfs.xfs -r extsize= option. > > > > If you're dealing with writing things into a file for a test, I think > > you have to use _get_file_block_size to make sure that you don't fall > > afoul of the cluster/block difference. I don't know if you've checked > > that for this patch series...? > > Thanks for pointing that out. I didn't know about the existance of > _get_file_block_size. I will go through the patchset once again > and figure out which one of _get_block_size v/s _get_file_block_size to use? <nod> _get_block_size is usually the appropriate tool when you're trying to massage a filesystem into creating a particular metadata block (e.g. fragmenting the free space just enough to force it to store free space records in N separate metadata blocks). _get_file_block_size is more appropriate for massaging a file into a particular format (e.g. fragmenting a file just enough to force it to store the file's extent records in N separate metadata blocks). And mea culpa, the vast majority of tests (including the ones I wrote) use _g_b_s when they probably mean _g_f_b_s... --D > > -- > chandan >
diff --git a/tests/xfs/009 b/tests/xfs/009 index 68f6379..70717eb 100755 --- a/tests/xfs/009 +++ b/tests/xfs/009 @@ -14,9 +14,6 @@ here=`pwd` tmp=/tmp/$$ status=1 # failure is the default! trap "_cleanup; exit \$status" 0 1 2 3 15 -# This isn't really related to fs block size, it's just what -# alloc uses for the "block" unit in it's input parameters... -bsize=4096 _cleanup() { @@ -24,13 +21,6 @@ _cleanup() _scratch_unmount } -_block_filter() -{ - sed \ - -e 's/[0-9][0-9]*\.\.[0-9][0-9]*/BLOCKRANGE/g' \ - -e "s/blocksize $bsize/blocksize BSIZE/g" -} - _init() { echo "*** mkfs" @@ -49,11 +39,6 @@ _init() fi } -_filesize() -{ - ls -l $1 | $AWK_PROG '{print "filesize = " $5}' -} - # get standard environment, filters and checks . ./common/rc . ./common/filter @@ -64,9 +49,86 @@ _supported_os Linux _require_scratch +_filesize() +{ + ls -l $1 | $AWK_PROG -v bsize="$bsize" '{print "filesize = " $5 / bsize}' +} + +_block_filter() +{ + $AWK_PROG -v bsize="$bsize" ' + /blocksize/ { + printf(" blocksize BSIZE\n") + + next + } + + /CMD/ { + split($3, off, "=") + offset = strtonum(off[2]) + if (offset != -1) + offset = offset / bsize + + split($4, len, "=") + nr_blocks = strtonum(len[2]) + if (nr_blocks != -1) + nr_blocks = nr_blocks / bsize + + printf(" %s %s off=%s, len=%d\n", $1, $2, offset, nr_blocks) + + next + } + + /MAP/ { + split($2, off, "=") + offset = strtonum(off[2]) + if (offset != -1) + offset = offset / bsize + + split($3, len, "=") + + nr_blocks = strtonum(len[2]) + + if (nr_blocks != -1) + nr_blocks = nr_blocks / bsize + + printf(" %s off=%s, len=%d %s\n", $1, offset, nr_blocks, $4) + + next + } + + /TRUNCATE/ { + split($2, off, "=") + offset = strtonum(off[2]) / bsize + + printf(" %s off=%s\n", $1, offset) + + next + } + + /\[[0-9]+,[0-9]+\]:/ { + printf(" %s BLOCKRANGE\n", $1) + + next + } + + { + print + + next + } + ' +} + _init out=$SCRATCH_MNT/$$.tmp +# This isn't really related to fs block size, it's just what +# alloc uses for the "block" unit in it's input parameters... +# However, xfs_alloc_file_space() rounds up allocation +# request by the filesystem's block size. +bsize=$(_get_block_size $SCRATCH_MNT) + # since we're using a clean FS here, we make some assumptions # about availability of contiguous blocks diff --git a/tests/xfs/009.out b/tests/xfs/009.out index 7132aca..02b5d82 100644 --- a/tests/xfs/009.out +++ b/tests/xfs/009.out @@ -3,8 +3,8 @@ QA output created by 009 *** mount *** test 1 - reservations cleared on O_TRUNC blocksize BSIZE - CMD resvsp, off=0, len=4096000 - MAP off=0, len=4096000 [0,1000] + CMD resvsp, off=0, len=1000 + MAP off=0, len=1000 [0,1000] [ofs,count]: start..end [0,1000]: BLOCKRANGE MAP off=0, len=-1 [0-] @@ -17,53 +17,53 @@ filesize = 0 filesize = 0 *** test 2 - reserve & filesize blocksize BSIZE - CMD resvsp, off=0, len=4096000 - MAP off=0, len=4096000 [0,1000] + CMD resvsp, off=0, len=1000 + MAP off=0, len=1000 [0,1000] [ofs,count]: start..end [0,1000]: BLOCKRANGE filesize = 0 *** test 3 - alloc & filesize blocksize BSIZE - CMD allocsp, off=4096000, len=-1 - MAP off=4096000, len=-1 [1000-] + CMD allocsp, off=1000, len=-1 + MAP off=1000, len=-1 [1000-] [ofs,count]: start..end -filesize = 4096000 +filesize = 1000 *** test 4 - allocations cleared on O_TRUNC blocksize BSIZE - CMD allocsp, off=4096000, len=-1 - MAP off=4096000, len=-1 [1000-] + CMD allocsp, off=1000, len=-1 + MAP off=1000, len=-1 [1000-] [ofs,count]: start..end -filesize = 4096000 +filesize = 1000 blocksize BSIZE MAP off=0, len=-1 [0-] [ofs,count]: start..end filesize = 0 *** test 5 - reserve / unreserve blocksize BSIZE - CMD resvsp, off=0, len=409600 - MAP off=0, len=409600 [0,100] + CMD resvsp, off=0, len=100 + MAP off=0, len=100 [0,100] [ofs,count]: start..end [0,100]: BLOCKRANGE - CMD unresvsp, off=409600, len=2048000 - MAP off=409600, len=2048000 [100,500] + CMD unresvsp, off=100, len=500 + MAP off=100, len=500 [100,500] [ofs,count]: start..end MAP off=0, len=-1 [0-] [ofs,count]: start..end [0,100]: BLOCKRANGE - CMD unresvsp, off=3686400, len=819200 - MAP off=3686400, len=819200 [900,200] + CMD unresvsp, off=900, len=200 + MAP off=900, len=200 [900,200] [ofs,count]: start..end MAP off=0, len=-1 [0-] [ofs,count]: start..end [0,100]: BLOCKRANGE *** test 6 - reserve adjacent blocksize BSIZE - CMD resvsp, off=0, len=409600 - MAP off=0, len=409600 [0,100] + CMD resvsp, off=0, len=100 + MAP off=0, len=100 [0,100] [ofs,count]: start..end [0,100]: BLOCKRANGE - CMD resvsp, off=409600, len=409600 - MAP off=409600, len=409600 [100,100] + CMD resvsp, off=100, len=100 + MAP off=100, len=100 [100,100] [ofs,count]: start..end [100,100]: BLOCKRANGE MAP off=0, len=-1 [0-] @@ -71,44 +71,44 @@ filesize = 0 [0,200]: BLOCKRANGE *** test 7 - alloc blocksize BSIZE - CMD allocsp, off=4096000, len=-1 - MAP off=4096000, len=-1 [1000-] + CMD allocsp, off=1000, len=-1 + MAP off=1000, len=-1 [1000-] [ofs,count]: start..end MAP off=0, len=-1 [0-] [ofs,count]: start..end [0,1000]: BLOCKRANGE - CMD allocsp, off=8192000, len=-1 - MAP off=8192000, len=-1 [2000-] + CMD allocsp, off=2000, len=-1 + MAP off=2000, len=-1 [2000-] [ofs,count]: start..end MAP off=0, len=-1 [0-] [ofs,count]: start..end [0,2000]: BLOCKRANGE -filesize = 8192000 +filesize = 2000 *** test 8 - alloc & truncate blocksize BSIZE - CMD allocsp, off=4096000, len=-1 - MAP off=4096000, len=-1 [1000-] + CMD allocsp, off=1000, len=-1 + MAP off=1000, len=-1 [1000-] [ofs,count]: start..end MAP off=0, len=-1 [0-] [ofs,count]: start..end [0,1000]: BLOCKRANGE - TRUNCATE off=2048000 + TRUNCATE off=500 MAP off=0, len=-1 [0-] [ofs,count]: start..end [0,500]: BLOCKRANGE -filesize = 2048000 +filesize = 500 *** test 9 - reserve & truncate blocksize BSIZE - CMD resvsp, off=0, len=4096000 - MAP off=0, len=4096000 [0,1000] + CMD resvsp, off=0, len=1000 + MAP off=0, len=1000 [0,1000] [ofs,count]: start..end [0,1000]: BLOCKRANGE MAP off=0, len=-1 [0-] [ofs,count]: start..end [0,1000]: BLOCKRANGE - TRUNCATE off=2048000 + TRUNCATE off=500 MAP off=0, len=-1 [0-] [ofs,count]: start..end [0,1000]: BLOCKRANGE -filesize = 2048000 +filesize = 500 *** unmount
xfs_alloc_file_space() rounds up allocation requests by the filesystem block size. Hence this commit changes the test to work with block size units rather than with a multiple of 4096 bytes. Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com> --- tests/xfs/009 | 92 ++++++++++++++++++++++++++++++++++++++++++++++--------- tests/xfs/009.out | 66 +++++++++++++++++++-------------------- 2 files changed, 110 insertions(+), 48 deletions(-)