Skip to contentSkip to conversation

xfstests 248: add test for fallocate with hole punching V2

PATCH New Josef Bacik 1 participant 1 message Nov 19, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfstests 248: add test for fallocate with hole punching V2

As Dave Chinner requested I moved the major test meat of 242 into common.punch and made it take all the arguments for alloc/punch/zero/map and such. This way 242 and 248 can use the same base test and just pass in their specific commands they are testing. I ran both 242 and 248 on XFS and the both pass. Thanks,

---
V1->V2:
-factor out the test stuff in 242 to common.punch and add 248 to use that code

 242          |  141 +---------------------------------------------------
 248          |   57 +++++++++++++++++++++
 248.out      |   47 +++++++++++++++++
 common.punch |  157 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common.rc    |   27 ++++++++++
 group        |    1 +
 6 files changed, 291 insertions(+), 139 deletions(-)
 create mode 100755 248
 create mode 100644 248.out
242 +2 -139
index 083aa31..9a0c89e 100755
@@ -41,6 +41,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 # get standard environment, filters and checks
 . ./common.rc
 . ./common.filter
+. ./common.punch
 
 # real QA test starts here
 _supported_fs xfs
@@ -55,147 +56,9 @@ _test_io_zero()
 
 [ $(_test_io_zero) -eq 0 ] && _notrun "zero command not supported"
 
-die_now()
-{
-	status=1
-	exit
-}
-
-_filter_bmap()
-{
-    awk '$3 ~ /hole/ { print $1, $2, $3; next }
-         $7 ~ /10000/ { print $1, $2, "unwritten"; next }
-         $7 ~ /00000/ {print $1, $2, "data" }'
-}
-
-# test the different corner cases for zeroing a range:
-#
-#	1. into a hole
-#	2. into allocated space
-#	3. into unwritten space
-#	4. hole -> data
-#	5. hole -> unwritten
-#	6. data -> hole
-#	7. data -> unwritten
-#	8. unwritten -> hole
-#	9. unwritten -> data
-#	10. hole -> data -> hole
-#	11. data -> hole -> data
-#	12. unwritten -> data -> unwritten
-#	13. data -> unwritten -> data
 
 testfile=$TEST_DIR/242.$$
 
-echo "	1. into a hole"
-rm -f $testfile
-$XFS_IO_PROG -f -c "truncate 20k" \
-	-c "zero 4k 8k" \
-	-c "bmap -vp" $testfile | _filter_bmap
-[ $? -ne 0 ] && die_now
-
-echo "	2. into allocated space"
-rm -f $testfile
-$XFS_IO_PROG -f -c "truncate 20k" \
-	-c "pwrite 0 20k" -c "fsync" \
-	-c "zero 4k 8k" \
-	-c "bmap -vp" $testfile | _filter_bmap
-[ $? -ne 0 ] && die_now
-
-echo "	3. into unwritten space"
-rm -f $testfile
-$XFS_IO_PROG -f -c "truncate 20k" \
-	-c "resvsp 0 20k" \
-	-c "zero 4k 8k" \
-	-c "bmap -vp" $testfile | _filter_bmap
-[ $? -ne 0 ] && die_now
-
-echo "	4. hole -> data"
-rm -f $testfile
-$XFS_IO_PROG -f -c "truncate 20k" \
-	-c "pwrite 8k 8k" -c "fsync" \
-	-c "zero 4k 8k" \
-	-c "bmap -vp" $testfile | _filter_bmap
-[ $? -ne 0 ] && die_now
-
-echo "	5. hole -> unwritten"
-rm -f $testfile
-$XFS_IO_PROG -f -c "truncate 20k" \
-	-c "resvsp 8k 8k" \
-	-c "zero 4k 8k" \
-	-c "bmap -vp" $testfile | _filter_bmap
-[ $? -ne 0 ] && die_now
-
-echo "	6. data -> hole"
-rm -f $testfile
-$XFS_IO_PROG -f -c "truncate 20k" \
-	-c "pwrite 0 8k" -c "fsync" \
-	-c "zero 4k 8k" \
-	-c "bmap -vp" $testfile | _filter_bmap
-[ $? -ne 0 ] && die_now
-
-echo "	7. data -> unwritten"
-rm -f $testfile
-$XFS_IO_PROG -f -c "truncate 20k" \
-	-c "pwrite 0 8k" -c "fsync" \
-	-c "resvsp 8k 8k" \
-	-c "zero 4k 8k" \
-	-c "bmap -vp" $testfile | _filter_bmap
-[ $? -ne 0 ] && die_now
-
-echo "	8. unwritten -> hole"
-rm -f $testfile
-$XFS_IO_PROG -f -c "truncate 20k" \
-	-c "resvsp 0 8k" \
-	-c "zero 4k 8k" \
-	-c "bmap -vp" $testfile | _filter_bmap
-[ $? -ne 0 ] && die_now
-
-echo "	9. unwritten -> data"
-rm -f $testfile
-$XFS_IO_PROG -f -c "truncate 20k" \
-	-c "resvsp 0 8k" \
-	-c "pwrite 8k 8k" -c "fsync" \
-	-c "zero 4k 8k" \
-	-c "bmap -vp" $testfile | _filter_bmap
-[ $? -ne 0 ] && die_now
-
-echo "	10. hole -> data -> hole"
-rm -f $testfile
-$XFS_IO_PROG -f -c "truncate 20k" \
-	-c "pwrite 8k 4k" -c "fsync" \
-	-c "zero 4k 12k" \
-	-c "bmap -vp" $testfile | _filter_bmap
-[ $? -ne 0 ] && die_now
-
-echo "	11. data -> hole -> data"
-rm -f $testfile
-$XFS_IO_PROG -f -c "truncate 20k" \
-	-c "resvsp 0 20k" \
-	-c "pwrite 0 8k" \
-	-c "pwrite 12k 8k" -c "fsync" \
-	-c "unresvsp 8k 4k" \
-	-c "zero 4k 12k" \
-	-c "bmap -vp" $testfile | _filter_bmap
-[ $? -ne 0 ] && die_now
-
-echo "	12. unwritten -> data -> unwritten"
-rm -f $testfile
-$XFS_IO_PROG -f -c "truncate 20k" \
-	-c "resvsp 0 20k" \
-	-c "pwrite 8k 4k" -c "fsync" \
-	-c "zero 4k 12k" \
-	-c "bmap -vp" $testfile | _filter_bmap
-[ $? -ne 0 ] && die_now
-
-
-echo "	13. data -> unwritten -> data"
-rm -f $testfile
-$XFS_IO_PROG -f -c "truncate 20k" \
-	-c "resvsp 0 20k" \
-	-c "pwrite 0k 8k" -c "fsync" \
-	-c "pwrite 12k 8k" -c "fsync" \
-	-c "zero 4k 12k" \
-	-c "bmap -vp" $testfile | _filter_bmap
-[ $? -ne 0 ] && die_now
+_test_generic_punch resvsp unresvsp zero 'bmap -p' _filter_bmap $testfile
 
 status=0 ; exit
248 new file +57 -0

57 lines not on this page · raw message

248.out new file +47 -0

47 lines not on this page · raw message

common.punch +157 -0

160 lines not on this page · raw message

common.rc +27 -0
index a5db913..459bdf5 100644
@@ -844,6 +844,33 @@ _require_xfs_io_falloc()
 		_notrun "xfs_io fallocate command failed (old kernel/wrong fs?)"
 }
 
+# check that xfs_io, kernel and filesystem all support fallocate with hole
+# punching
+_require_xfs_io_falloc_punch()
+{
+	testfile=$TEST_DIR/$$.falloc
+	testio=`$XFS_IO_PROG -F -f -c "pwrite 0 20k" -c "fsync" \
+		-c "fpunch 4k 8k" $testfile 2>&1`
+	rm -f $testfile 2>&1 > /dev/null
+	echo $testio | grep -q "not found" && \
+		_notrun "xfs_io fallocate punch support is missing"
+	echo $testio | grep -q "Operation not supported" && \
+		_notrun "xfs_io fallocate punch command failed (no fs support?)"
+}
+
+# check that xfs_io, kernel and filesystem support fiemap
+_require_xfs_io_fiemap()
+{
+	testfile=$TEST_DIR/$$.fiemap
+	testio=`$XFS_IO_PROG -F -f -c "pwrite 0 20k" -c "fsync" \
+		-c "fiemap -v" $testfile 2>&1`
+	rm -f $testfile 2>&1 > /dev/null
+	echo $testio | grep -q "not found" && \
+		_notrun "xfs_io fiemap support is missing"
+	echo $testio | grep -q "Operation not supported" && \
+		_notrun "xfs_io fiemap command failed (no fs support?)"
+}
+
 # Check that a fs has enough free space (in 1024b blocks)
 #
 _require_fs_space()
group +1 -0
index 0f94dd9..151ddc9 100644
@@ -361,3 +361,4 @@ deprecated
 245 auto quick dir
 246 auto quick rw
 247 auto quick rw
+248 auto quick prealloc
Signature · 6 lines
1.6.6.1

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs