From patchwork Sun Mar 24 09:56:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 230411 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 702342C00C0 for ; Sun, 24 Mar 2013 20:41:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754088Ab3CXJlL (ORCPT ); Sun, 24 Mar 2013 05:41:11 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:34887 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754048Ab3CXJlJ (ORCPT ); Sun, 24 Mar 2013 05:41:09 -0400 Received: by mail-pa0-f45.google.com with SMTP id kl13so567451pab.4 for ; Sun, 24 Mar 2013 02:41:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=taTNYn3QAsqk/ILR1Z8KjJoEAaFSf+2mBQktZogcf30=; b=XetPAoB9Kmu7skSyFH1NfoNOmGeaKhIZaBFE0+CfDHJunNKrSAoFi+LLWwTKvKD1Pf tmwzanXudJNTCAtw+tXEbwqhiCU+GvX8aVS1+PggphQP1TE21s3C6lO+A31gIEyspu6J ts0SFrYYfJKB1r/rQW+0nMWkVqfWOG8kUOJMQdugJT2Z6djJ+ooZwi6ztsm/MD82OE9g cB9lHH2PCq7VUMPX6shQnoJr7XF3TiV27Sl1LlvRvy0xSonllmZ1FKEiuitg670LAiIe S9E7YAXi2Hv1K1SdD3ujhhF4N+hrAe0GtgA5LsjU75bCg396IUnt44h01ltGIqM+Gs+f 4k0w== X-Received: by 10.68.197.231 with SMTP id ix7mr11465580pbc.123.1364118068743; Sun, 24 Mar 2013 02:41:08 -0700 (PDT) Received: from lz-desktop.taobao.ali.com ([182.92.247.2]) by mx.google.com with ESMTPS id fc8sm10186813pad.21.2013.03.24.02.41.03 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 24 Mar 2013 02:41:07 -0700 (PDT) From: Zheng Liu To: xfs@oss.sgi.com Cc: linux-ext4@vger.kernel.org, Zheng Liu , Eric Sandeen , Dave Chinner Subject: [PATCH v3] xfstests: add a new test case for ext4 indirect-based file Date: Sun, 24 Mar 2013 17:56:42 +0800 Message-Id: <1364119002-17350-1-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Zheng Liu After applied this commit (864688d3), xfstests #255 will not test a file system that cannot support fallocate(2), such as a indirect-based file in ext4. So we need to add a new generic test case to test it. The difference between #255 and this test case is only to use pwrite to allocate blocks. Other filesystems should survive in this test case. In the mean time, a new argument '-u' is added into _test_generic_punch not to run unwritten tests. Meanwhile this commit fixes a minor problem in #255 that testfile should use $seq.$$ as testfile. Signed-off-by: Zheng Liu Cc: Eric Sandeen Cc: Dave Chinner --- v3 <- v2: * Eliminate unnecessary unwritten tests * Fix a wrong supported os bug * Use $seq.$$ as testfile 255 | 2 +- 314 | 68 ++++++++++++++++++++++++ 314.out | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ common.punch | 164 +++++++++++++++++++++++++++++++--------------------------- group | 1 + 5 files changed, 324 insertions(+), 76 deletions(-) create mode 100755 314 create mode 100644 314.out diff --git a/255 b/255 index ae1d8e0..d69d158 100755 --- a/255 +++ b/255 @@ -51,7 +51,7 @@ _require_xfs_io_falloc_punch _require_xfs_io_falloc _require_xfs_io_fiemap -testfile=$TEST_DIR/255.$$ +testfile=$TEST_DIR/$seq.$$ # Standard punch hole tests _test_generic_punch falloc fpunch fpunch fiemap _filter_hole_fiemap $testfile -F diff --git a/314 b/314 new file mode 100755 index 0000000..15b35a2 --- /dev/null +++ b/314 @@ -0,0 +1,68 @@ +#! /bin/bash +# FS QA Test No. 314 +# +# Test Generic fallocate hole punching w/o unwritten extent +# +#----------------------------------------------------------------------- +# Copyright (c) 2013 Alibaba Group. 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 +#----------------------------------------------------------------------- +# +# creator +owner=wenqing.lz@taobao.com + +seq=`basename $0` +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 +. ./common.punch + +# real QA test starts here +_supported_fs generic +_supported_os Linux + +_require_xfs_io_falloc_punch +_require_xfs_io_fiemap + +testfile=$TEST_DIR/$seq.$$ + +# Standard punch hole tests +_test_generic_punch -u pwrite fpunch fpunch fiemap _filter_hole_fiemap $testfile -F + +# Delayed allocation punch hole tests +_test_generic_punch -u -d pwrite fpunch fpunch fiemap _filter_hole_fiemap $testfile -F + +# Multi hole punch tests +_test_generic_punch -u -k pwrite fpunch fpunch fiemap _filter_hole_fiemap $testfile -F + +# Delayed allocation multi punch hole tests +_test_generic_punch -u -d -k pwrite fpunch fpunch fiemap _filter_hole_fiemap $testfile -F + +# success, all done +status=0 +exit diff --git a/314.out b/314.out new file mode 100644 index 0000000..06aa705 --- /dev/null +++ b/314.out @@ -0,0 +1,165 @@ +QA output created by 314 + 1. into a hole +daa100df6e6711906b61c9ab5aa16032 + 2. into allocated space +0: [0..7]: extent +1: [8..23]: hole +2: [24..39]: extent +cc58a7417c2d7763adc45b6fcd3fa024 + 4. hole -> data +0: [0..23]: hole +1: [24..31]: extent +2: [32..39]: hole +cc63069677939f69a6e8f68cae6a6dac + 6. data -> hole +0: [0..7]: extent +1: [8..39]: hole +1b3779878366498b28c702ef88c4a773 + 10. hole -> data -> hole +daa100df6e6711906b61c9ab5aa16032 + 11. data -> hole -> data +0: [0..7]: extent +1: [8..31]: hole +2: [32..39]: extent +f6aeca13ec49e5b266cd1c913cd726e3 + 14. data -> hole @ EOF +0: [0..23]: extent +1: [24..39]: hole +e1f024eedd27ea6b1c3e9b841c850404 + 15. data -> hole @ 0 +0: [0..15]: hole +1: [16..39]: extent +eecb7aa303d121835de05028751d301c + 16. data -> cache cold ->hole +0: [0..15]: hole +1: [16..39]: extent +eecb7aa303d121835de05028751d301c + 17. data -> hole in single block file +0: [0..7]: extent +13535fd4d496bf0b74bb2335aa4d1b31 + 1. into a hole +daa100df6e6711906b61c9ab5aa16032 + 2. into allocated space +0: [0..7]: extent +1: [8..23]: hole +2: [24..39]: extent +cc58a7417c2d7763adc45b6fcd3fa024 + 4. hole -> data +0: [0..23]: hole +1: [24..31]: extent +2: [32..39]: hole +cc63069677939f69a6e8f68cae6a6dac + 6. data -> hole +0: [0..7]: extent +1: [8..39]: hole +1b3779878366498b28c702ef88c4a773 + 10. hole -> data -> hole +daa100df6e6711906b61c9ab5aa16032 + 11. data -> hole -> data +0: [0..7]: extent +1: [8..31]: hole +2: [32..39]: extent +f6aeca13ec49e5b266cd1c913cd726e3 + 14. data -> hole @ EOF +0: [0..23]: extent +1: [24..39]: hole +e1f024eedd27ea6b1c3e9b841c850404 + 15. data -> hole @ 0 +0: [0..15]: hole +1: [16..39]: extent +eecb7aa303d121835de05028751d301c + 16. data -> cache cold ->hole +0: [0..15]: hole +1: [16..39]: extent +eecb7aa303d121835de05028751d301c + 17. data -> hole in single block file +0: [0..7]: extent +13535fd4d496bf0b74bb2335aa4d1b31 + 1. into a hole +0: [0..7]: extent +1: [8..39]: hole +5a58e46082be047d0f13bee7974015b9 + 2. into allocated space +0: [0..7]: extent +1: [8..23]: hole +2: [24..39]: extent +cc58a7417c2d7763adc45b6fcd3fa024 + 4. hole -> data +0: [0..7]: extent +1: [8..23]: hole +2: [24..39]: extent +cc58a7417c2d7763adc45b6fcd3fa024 + 6. data -> hole +0: [0..7]: extent +1: [8..23]: hole +2: [24..39]: extent +cc58a7417c2d7763adc45b6fcd3fa024 + 10. hole -> data -> hole +0: [0..7]: extent +1: [8..31]: hole +2: [32..39]: extent +f6aeca13ec49e5b266cd1c913cd726e3 + 11. data -> hole -> data +0: [0..7]: extent +1: [8..31]: hole +2: [32..39]: extent +f6aeca13ec49e5b266cd1c913cd726e3 + 14. data -> hole @ EOF +0: [0..23]: extent +1: [24..39]: hole +e1f024eedd27ea6b1c3e9b841c850404 + 15. data -> hole @ 0 +0: [0..15]: hole +1: [16..39]: extent +eecb7aa303d121835de05028751d301c + 16. data -> cache cold ->hole +0: [0..15]: hole +1: [16..39]: extent +eecb7aa303d121835de05028751d301c + 17. data -> hole in single block file +0: [0..7]: extent +13535fd4d496bf0b74bb2335aa4d1b31 + 1. into a hole +0: [0..7]: extent +1: [8..39]: hole +5a58e46082be047d0f13bee7974015b9 + 2. into allocated space +0: [0..7]: extent +1: [8..23]: hole +2: [24..39]: extent +cc58a7417c2d7763adc45b6fcd3fa024 + 4. hole -> data +0: [0..7]: extent +1: [8..23]: hole +2: [24..39]: extent +cc58a7417c2d7763adc45b6fcd3fa024 + 6. data -> hole +0: [0..7]: extent +1: [8..23]: hole +2: [24..39]: extent +cc58a7417c2d7763adc45b6fcd3fa024 + 10. hole -> data -> hole +0: [0..7]: extent +1: [8..31]: hole +2: [32..39]: extent +f6aeca13ec49e5b266cd1c913cd726e3 + 11. data -> hole -> data +0: [0..7]: extent +1: [8..31]: hole +2: [32..39]: extent +f6aeca13ec49e5b266cd1c913cd726e3 + 14. data -> hole @ EOF +0: [0..23]: extent +1: [24..39]: hole +e1f024eedd27ea6b1c3e9b841c850404 + 15. data -> hole @ 0 +0: [0..15]: hole +1: [16..39]: extent +eecb7aa303d121835de05028751d301c + 16. data -> cache cold ->hole +0: [0..15]: hole +1: [16..39]: extent +eecb7aa303d121835de05028751d301c + 17. data -> hole in single block file +0: [0..7]: extent +13535fd4d496bf0b74bb2335aa4d1b31 diff --git a/common.punch b/common.punch index 7337298..e3e09cb 100644 --- a/common.punch +++ b/common.punch @@ -292,19 +292,25 @@ die_now() # Use the -d flag to not sync the file between tests. # This will test the handling of delayed extents # +# Use the -u flag to not run unwritten tests. +# This will eliminate some unnecessary information. +# _test_generic_punch() { remove_testfile=1 sync_cmd="-c fsync" + unwritten_tests=1 OPTIND=1 - while getopts 'dk' OPTION + while getopts 'dku' OPTION do case $OPTION in k) remove_testfile= ;; d) sync_cmd= ;; + u) unwritten_tests= + ;; ?) echo Invalid flag exit 1 ;; @@ -341,16 +347,18 @@ _test_generic_punch() [ $? -ne 0 ] && die_now _md5_checksum $testfile - echo " 3. into unwritten space" - if [ "$remove_testfile" ]; then - rm -f $testfile + if [ "$unwritten_tests" ]; then + echo " 3. into unwritten space" + if [ "$remove_testfile" ]; then + rm -f $testfile + fi + $XFS_IO_PROG $xfs_io_opt -f -c "truncate 20k" \ + -c "$alloc_cmd 0 20k" \ + -c "$zero_cmd 4k 8k" \ + -c "$map_cmd -v" $testfile | $filter_cmd + [ $? -ne 0 ] && die_now + _md5_checksum $testfile fi - $XFS_IO_PROG $xfs_io_opt -f -c "truncate 20k" \ - -c "$alloc_cmd 0 20k" \ - -c "$zero_cmd 4k 8k" \ - -c "$map_cmd -v" $testfile | $filter_cmd - [ $? -ne 0 ] && die_now - _md5_checksum $testfile echo " 4. hole -> data" if [ "$remove_testfile" ]; then @@ -363,16 +371,18 @@ _test_generic_punch() [ $? -ne 0 ] && die_now _md5_checksum $testfile - echo " 5. hole -> unwritten" - if [ "$remove_testfile" ]; then - rm -f $testfile + if [ "$unwritten_tests" ]; then + echo " 5. hole -> unwritten" + if [ "$remove_testfile" ]; then + rm -f $testfile + fi + $XFS_IO_PROG $xfs_io_opt -f -c "truncate 20k" \ + -c "$alloc_cmd 8k 8k" \ + -c "$zero_cmd 4k 8k" \ + -c "$map_cmd -v" $testfile | $filter_cmd + [ $? -ne 0 ] && die_now + _md5_checksum $testfile fi - $XFS_IO_PROG $xfs_io_opt -f -c "truncate 20k" \ - -c "$alloc_cmd 8k 8k" \ - -c "$zero_cmd 4k 8k" \ - -c "$map_cmd -v" $testfile | $filter_cmd - [ $? -ne 0 ] && die_now - _md5_checksum $testfile echo " 6. data -> hole" if [ "$remove_testfile" ]; then @@ -385,40 +395,42 @@ _test_generic_punch() [ $? -ne 0 ] && die_now _md5_checksum $testfile - echo " 7. data -> unwritten" - if [ "$remove_testfile" ]; then - rm -f $testfile - fi - $XFS_IO_PROG $xfs_io_opt -f -c "truncate 20k" \ - -c "pwrite 0 8k" $sync_cmd \ - -c "$alloc_cmd 8k 8k" \ - -c "$zero_cmd 4k 8k" \ - -c "$map_cmd -v" $testfile | $filter_cmd - [ $? -ne 0 ] && die_now - _md5_checksum $testfile - - echo " 8. unwritten -> hole" - if [ "$remove_testfile" ]; then - rm -f $testfile - fi - $XFS_IO_PROG $xfs_io_opt -f -c "truncate 20k" \ - -c "$alloc_cmd 0 8k" \ - -c "$zero_cmd 4k 8k" \ - -c "$map_cmd -v" $testfile | $filter_cmd - [ $? -ne 0 ] && die_now - _md5_checksum $testfile - - echo " 9. unwritten -> data" - if [ "$remove_testfile" ]; then - rm -f $testfile + if [ "$unwritten_tests" ]; then + echo " 7. data -> unwritten" + if [ "$remove_testfile" ]; then + rm -f $testfile + fi + $XFS_IO_PROG $xfs_io_opt -f -c "truncate 20k" \ + -c "pwrite 0 8k" $sync_cmd \ + -c "$alloc_cmd 8k 8k" \ + -c "$zero_cmd 4k 8k" \ + -c "$map_cmd -v" $testfile | $filter_cmd + [ $? -ne 0 ] && die_now + _md5_checksum $testfile + + echo " 8. unwritten -> hole" + if [ "$remove_testfile" ]; then + rm -f $testfile + fi + $XFS_IO_PROG $xfs_io_opt -f -c "truncate 20k" \ + -c "$alloc_cmd 0 8k" \ + -c "$zero_cmd 4k 8k" \ + -c "$map_cmd -v" $testfile | $filter_cmd + [ $? -ne 0 ] && die_now + _md5_checksum $testfile + + echo " 9. unwritten -> data" + if [ "$remove_testfile" ]; then + rm -f $testfile + fi + $XFS_IO_PROG $xfs_io_opt -f -c "truncate 20k" \ + -c "$alloc_cmd 0 8k" \ + -c "pwrite 8k 8k" $sync_cmd \ + -c "$zero_cmd 4k 8k" \ + -c "$map_cmd -v" $testfile | $filter_cmd + [ $? -ne 0 ] && die_now + _md5_checksum $testfile fi - $XFS_IO_PROG $xfs_io_opt -f -c "truncate 20k" \ - -c "$alloc_cmd 0 8k" \ - -c "pwrite 8k 8k" $sync_cmd \ - -c "$zero_cmd 4k 8k" \ - -c "$map_cmd -v" $testfile | $filter_cmd - [ $? -ne 0 ] && die_now - _md5_checksum $testfile echo " 10. hole -> data -> hole" if [ "$remove_testfile" ]; then @@ -445,30 +457,32 @@ _test_generic_punch() [ $? -ne 0 ] && die_now _md5_checksum $testfile - echo " 12. unwritten -> data -> unwritten" - if [ "$remove_testfile" ]; then - rm -f $testfile - fi - $XFS_IO_PROG $xfs_io_opt -f -c "truncate 20k" \ - -c "$alloc_cmd 0 20k" \ - -c "pwrite 8k 4k" $sync_cmd \ - -c "$zero_cmd 4k 12k" \ - -c "$map_cmd -v" $testfile | $filter_cmd - [ $? -ne 0 ] && die_now - _md5_checksum $testfile - - echo " 13. data -> unwritten -> data" - if [ "$remove_testfile" ]; then - rm -f $testfile + if [ "$unwritten_tests" ]; then + echo " 12. unwritten -> data -> unwritten" + if [ "$remove_testfile" ]; then + rm -f $testfile + fi + $XFS_IO_PROG $xfs_io_opt -f -c "truncate 20k" \ + -c "$alloc_cmd 0 20k" \ + -c "pwrite 8k 4k" $sync_cmd \ + -c "$zero_cmd 4k 12k" \ + -c "$map_cmd -v" $testfile | $filter_cmd + [ $? -ne 0 ] && die_now + _md5_checksum $testfile + + echo " 13. data -> unwritten -> data" + if [ "$remove_testfile" ]; then + rm -f $testfile + fi + $XFS_IO_PROG $xfs_io_opt -f -c "truncate 20k" \ + -c "$alloc_cmd 0 20k" \ + -c "pwrite 0k 8k" $sync_cmd \ + -c "pwrite 12k 8k" -c "fsync" \ + -c "$zero_cmd 4k 12k" \ + -c "$map_cmd -v" $testfile | $filter_cmd + [ $? -ne 0 ] && die_now + _md5_checksum $testfile fi - $XFS_IO_PROG $xfs_io_opt -f -c "truncate 20k" \ - -c "$alloc_cmd 0 20k" \ - -c "pwrite 0k 8k" $sync_cmd \ - -c "pwrite 12k 8k" -c "fsync" \ - -c "$zero_cmd 4k 12k" \ - -c "$map_cmd -v" $testfile | $filter_cmd - [ $? -ne 0 ] && die_now - _md5_checksum $testfile echo " 14. data -> hole @ EOF" rm -f $testfile diff --git a/group b/group index a11e832..36f63ab 100644 --- a/group +++ b/group @@ -431,3 +431,4 @@ stress 305 aio dangerous enospc rw stress 306 auto quick rw 313 auto quick +314 auto quick prealloc