xfstest: ensure small symlink is removed
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 xfstest: ensure small symlink is removed
Tests that XFS symlinks that are small enough to be in the inode, but were move to a remote symlink due to an extended attribute were correctly removed.
--- new/xfstests/tests/xfs/298 | 92 +++++++++++++++++++++++++++++++++++++++++ new/xfstests/tests/xfs/298.out | 33 ++++++++++++++ new/xfstests/tests/xfs/group | 1 3 files changed, 126 insertions(+)
new/xfstests/tests/xfs/298 new file +92 -0
@@ -0,0 +1,92 @@ +#! /bin/bash +# FS QA Test No. 298 +# +# Test that inline symlinks are removed from the inode when an extended +# attributes forces it into being remote symlink. +# Warning: this test will ASSERT on unpatched DEBUG XFS. +# +#----------------------------------------------------------------------- +# Copyright (c) 2013 SGI. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs +_supported_os Linux + +_require_scratch + +rm -f $seqres.full +_scratch_mkfs_xfs >/dev/null 2>&1 + +SYMLINK_FILE="$SCRATCH_MNT/symlink" +SYMLINK="" +SYMLINK_ADD="0123456789ABCDEF01234567890ABCDEF" + +# test 32 to 512 byte symlink. This should make sure that 256 and +# 512 byte inodes version 2 and 3 are covered. +LOOP=16 +SIZE=32 +while [ $LOOP -gt 0 ];do + _scratch_mount >/dev/null 2>&1 + cd $SCRATCH_MNT + echo "Testing symlink size $SIZE" + SYMLINK="${SYMLINK}${SYMLINK_ADD}" + ln -s $SYMLINK $SYMLINK_FILE > /dev/null 2>&1 + + inode=`ls -li $SYMLINK_FILE | awk '{print $1}'` +# add the extended attributes + attr -Rs 1234567890ab $SYMLINK_FILE < /dev/null > /dev/null 2>&1 + attr -Rs 1234567890ac $SYMLINK_FILE < /dev/null > /dev/null 2>&1 + attr -Rs 1234567890ad $SYMLINK_FILE < /dev/null > /dev/null 2>&1 +# remove the extended attributes + attr -Rr 1234567890ab $SYMLINK_FILE > /dev/null 2>&1 + attr -Rr 1234567890ac $SYMLINK_FILE > /dev/null 2>&1 + attr -Rr 1234567890ad $SYMLINK_FILE > /dev/null 2>&1 +# remove the symlink - make sure ifree removes the remote symlink. + rm $SYMLINK_FILE +# umount and check the number of extents on the inode. Should be 0. + cd + _scratch_unmount >/dev/null 2>&1 + $XFS_DB_PROG -c "inode $inode" -c "p core.nextents" $SCRATCH_DEV + + let LOOP=$LOOP-1 + let SIZE=$SIZE+32 +done + +status=0 +exit
new/xfstests/tests/xfs/298.out new file +33 -0
@@ -0,0 +1,33 @@ +QA output created by 298 +Testing symlink size 32 +core.nextents = 0 +Testing symlink size 64 +core.nextents = 0 +Testing symlink size 96 +core.nextents = 0 +Testing symlink size 128 +core.nextents = 0 +Testing symlink size 160 +core.nextents = 0 +Testing symlink size 192 +core.nextents = 0 +Testing symlink size 224 +core.nextents = 0 +Testing symlink size 256 +core.nextents = 0 +Testing symlink size 288 +core.nextents = 0 +Testing symlink size 320 +core.nextents = 0 +Testing symlink size 352 +core.nextents = 0 +Testing symlink size 384 +core.nextents = 0 +Testing symlink size 416 +core.nextents = 0 +Testing symlink size 448 +core.nextents = 0 +Testing symlink size 480 +core.nextents = 0 +Testing symlink size 512 +core.nextents = 0
new/xfstests/tests/xfs/group +1 -0
@@ -177,3 +177,4 @@ 295 auto logprint quick 296 dump auto quick 297 auto freeze +298 auto attr symlink
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 9 lines · Mark Tinguely
Tests that XFS symlinks that are small enough to be in the inode, but were move to a remote symlink due to an extended attribute were correctly removed.
Signed-off-by Mark Tinguely <[email protected]>--- new/xfstests/tests/xfs/298 | 92 +++++++++++++++++++++++++++++++++++++++++ new/xfstests/tests/xfs/298.out | 33 ++++++++++++++ new/xfstests/tests/xfs/group | 1
I don't see anything that really needs to be XFS specific about this test - can you make it generic?
new/xfstests/tests/xfs/298 line 61
Quoted 5 lines
new/xfstests/tests/xfs/298 new file +5
-0+SYMLINK="" +SYMLINK_ADD="0123456789ABCDEF01234567890ABCDEF" + +# test 32 to 512 byte symlink. This should make sure that 256 and +# 512 byte inodes version 2 and 3 are covered.
Better to test all the way to MAXPATHLEN, rather than just an arbitrary sub-range of the possible symlink ranges.
new/xfstests/tests/xfs/298 line 64
Quoted 3 lines
new/xfstests/tests/xfs/298 new file +3
-0+LOOP=16 +SIZE=32 +while [ $LOOP -gt 0 ];do
while [ $SIZE -le 512 ]; do
Quoted 11 lines
new/xfstests/tests/xfs/298 new file +11
-0+ _scratch_mount >/dev/null 2>&1 + cd $SCRATCH_MNT + echo "Testing symlink size $SIZE" + SYMLINK="${SYMLINK}${SYMLINK_ADD}" + ln -s $SYMLINK $SYMLINK_FILE > /dev/null 2>&1 + + inode=`ls -li $SYMLINK_FILE | awk '{print $1}'` +# add the extended attributes + attr -Rs 1234567890ab $SYMLINK_FILE < /dev/null > /dev/null 2>&1 + attr -Rs 1234567890ac $SYMLINK_FILE < /dev/null > /dev/null 2>&1 + attr -Rs 1234567890ad $SYMLINK_FILE < /dev/null > /dev/null 2>&1
new/xfstests/tests/xfs/298 line 85
Quoted 10 lines
new/xfstests/tests/xfs/298 new file +10
-0+# remove the extended attributes + attr -Rr 1234567890ab $SYMLINK_FILE > /dev/null 2>&1 + attr -Rr 1234567890ac $SYMLINK_FILE > /dev/null 2>&1 + attr -Rr 1234567890ad $SYMLINK_FILE > /dev/null 2>&1 +# remove the symlink - make sure ifree removes the remote symlink. + rm $SYMLINK_FILE +# umount and check the number of extents on the inode. Should be 0. + cd + _scratch_unmount >/dev/null 2>&1 + $XFS_DB_PROG -c "inode $inode" -c "p core.nextents" $SCRATCH_DEV
I'm not sure that's actually a valid thing to do - the inode has been removed, so the underlying inode chunk may have been removed and hence marked stale rather than been written back. Hence you cannot rely on xfs_db being able to print the extent count after the inode has been unlinked and the filesystem unmounted.
As it is, it's not really necessary for the test to detect the problem that you found, right? i.e. that the kernel would assert fail? If you drop the xfs_db stuff here, then the test is generic...
new/xfstests/tests/xfs/group line 180
Quoted 7 lines
new/xfstests/tests/xfs/group +1
-0@@ -177,3 +177,4 @@ 295 auto logprint quick 296 dump auto quick 297 auto freeze +298 auto attr symlink
+ quick.
Cheers,
Dave.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 14 lines · Dave Chinner
Quoted 9 lines · Mark Tinguely
Tests that XFS symlinks that are small enough to be in the inode, but were move to a remote symlink due to an extended attribute were correctly removed.
Signed-off-by Mark Tinguely<[email protected]>--- new/xfstests/tests/xfs/298 | 92 +++++++++++++++++++++++++++++++++++++++++ new/xfstests/tests/xfs/298.out | 33 ++++++++++++++ new/xfstests/tests/xfs/group | 1I don't see anything that really needs to be XFS specific about this test - can you make it generic?
Quoted 8 lines
new/xfstests/tests/xfs/298 line 61
Quoted 5 lines
new/xfstests/tests/xfs/298 new file +5
-0+SYMLINK="" +SYMLINK_ADD="0123456789ABCDEF01234567890ABCDEF" + +# test 32 to 512 byte symlink. This should make sure that 256 and +# 512 byte inodes version 2 and 3 are covered.Better to test all the way to MAXPATHLEN, rather than just an arbitrary sub-range of the possible symlink ranges.
Nod. I was not covering the 1K inode.
Quoted 6 lines
new/xfstests/tests/xfs/298 line 64
Quoted 4 lines
new/xfstests/tests/xfs/298 new file +3
-0+LOOP=16 +SIZE=32 +while [ $LOOP -gt 0 ];dowhile [ $SIZE -le 512 ]; do
and eliminate one variable!
Quoted 29 lines
Quoted 12 lines
new/xfstests/tests/xfs/298 new file +11
-0+ _scratch_mount>/dev/null 2>&1 + cd $SCRATCH_MNT + echo "Testing symlink size $SIZE" + SYMLINK="${SYMLINK}${SYMLINK_ADD}" + ln -s $SYMLINK $SYMLINK_FILE> /dev/null 2>&1 + + inode=`ls -li $SYMLINK_FILE | awk '{print $1}'` +# add the extended attributes + attr -Rs 1234567890ab $SYMLINK_FILE< /dev/null> /dev/null 2>&1 + attr -Rs 1234567890ac $SYMLINK_FILE< /dev/null> /dev/null 2>&1 + attr -Rs 1234567890ad $SYMLINK_FILE< /dev/null> /dev/null 2>&1new/xfstests/tests/xfs/298 line 85
Quoted 10 lines
new/xfstests/tests/xfs/298 new file +10
-0+# remove the extended attributes + attr -Rr 1234567890ab $SYMLINK_FILE> /dev/null 2>&1 + attr -Rr 1234567890ac $SYMLINK_FILE> /dev/null 2>&1 + attr -Rr 1234567890ad $SYMLINK_FILE> /dev/null 2>&1 +# remove the symlink - make sure ifree removes the remote symlink. + rm $SYMLINK_FILE +# umount and check the number of extents on the inode. Should be 0. + cd + _scratch_unmount>/dev/null 2>&1 + $XFS_DB_PROG -c "inode $inode" -c "p core.nextents" $SCRATCH_DEVI'm not sure that's actually a valid thing to do - the inode has been removed, so the underlying inode chunk may have been removed and hence marked stale rather than been written back. Hence you cannot rely on
xfs_dbbeing able to print the extent count after the inode has been unlinked and the filesystem unmounted.
Quoted 3 lines
As it is, it's not really necessary for the test to detect the problem that you found, right? i.e. that the kernel would assert fail? If you drop the
xfs_dbstuff here, then the test is generic...
It will ASSERT on a debug kernel, but put this test so it would still fail in the debug case.
Quoted 10 lines
new/xfstests/tests/xfs/group line 180
Quoted 8 lines
new/xfstests/tests/xfs/group +1
-0@@ -177,3 +177,4 @@ 295 auto logprint quick 296 dump auto quick 297 auto freeze +298 auto attr symlink+ quick.
Okay, I had it in but removed it at the last minute.
Quoted 4 lines
Cheers,
Dave.
Thanks.
--Mark.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs