From patchwork Tue Feb 9 01:14:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 8257141 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5D6E4BEEE5 for ; Tue, 9 Feb 2016 01:14:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1323920272 for ; Tue, 9 Feb 2016 01:14:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7329C202B8 for ; Tue, 9 Feb 2016 01:14:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964867AbcBIBOQ (ORCPT ); Mon, 8 Feb 2016 20:14:16 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:23768 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964804AbcBIBOP (ORCPT ); Mon, 8 Feb 2016 20:14:15 -0500 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u191EANs016267 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 9 Feb 2016 01:14:10 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id u191EAVi017412 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 9 Feb 2016 01:14:10 GMT Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u191E90Y028076; Tue, 9 Feb 2016 01:14:09 GMT Received: from localhost (/10.145.178.207) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 08 Feb 2016 17:14:09 -0800 Subject: [PATCH 22/23] xfs: test xfs_getbmapx behavior with shared extents From: "Darrick J. Wong" To: david@fromorbit.com, darrick.wong@oracle.com Cc: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org, xfs@oss.sgi.com Date: Mon, 08 Feb 2016 17:14:08 -0800 Message-ID: <20160209011408.23099.85443.stgit@birch.djwong.org> In-Reply-To: <20160209011145.23099.95354.stgit@birch.djwong.org> References: <20160209011145.23099.95354.stgit@birch.djwong.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Make sure that xfs_getbmapx behaves properly w.r.t. shared extents and CoW fork reporting. Signed-off-by: Darrick J. Wong --- common/xfs | 19 ++++++ tests/xfs/243 | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/243.out | 27 ++++++++ tests/xfs/245 | 99 +++++++++++++++++++++++++++++++ tests/xfs/245.out | 13 ++++ tests/xfs/group | 2 + 6 files changed, 329 insertions(+) create mode 100755 tests/xfs/243 create mode 100644 tests/xfs/243.out create mode 100755 tests/xfs/245 create mode 100644 tests/xfs/245.out -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/common/xfs b/common/xfs index 2d1a76f..91b7916 100644 --- a/common/xfs +++ b/common/xfs @@ -42,3 +42,22 @@ _require_xfs_scratch_rmapbt() fi _scratch_unmount } + +_xfs_bmapx_find() { + case "$1" in + "attr") + param="a" + ;; + "cow") + param="c" + ;; + *) + param="e" + ;; + esac + shift + file="$1" + shift + + "$XFS_IO_PROG" -c "bmap -${param}lpv" "$file" | grep -c "$@" +} diff --git a/tests/xfs/243 b/tests/xfs/243 new file mode 100755 index 0000000..a97e87e --- /dev/null +++ b/tests/xfs/243 @@ -0,0 +1,169 @@ +#! /bin/bash +# FS QA Test No. 243 +# +# Ensuring that copy on write in buffered mode works when the CoW +# range originally covers multiple extents, some unwritten, some not. +# - Set cowextsize hint. +# - Create a file with the following repeating sequence of blocks: +# 1. reflinked +# 2. unwritten +# 3. hole +# 4. regular block +# 5. delalloc +# - CoW across the halfway mark, starting with the unwritten extent. +# - Check that the files are now different where we say they're different. +# +#----------------------------------------------------------------------- +# Copyright (c) 2016, Oracle and/or its affiliates. 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 -rf "$tmp".* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/reflink +. ./common/xfs + +# real QA test starts here +_supported_os Linux +_require_scratch_reflink +_require_xfs_io_command "falloc" +_require_xfs_io_command "fpunch" +_require_cp_reflink + +rm -f "$seqres.full" + +echo "Format and mount" +_scratch_mkfs > "$seqres.full" 2>&1 +_scratch_mount >> "$seqres.full" 2>&1 + +testdir="$SCRATCH_MNT/test-$seq" +rm -rf $testdir +mkdir $testdir + +echo "Create the original files" +blksz=65536 +nr=64 +real_blksz=$(stat -f -c '%S' "$testdir") +internal_blks=$((blksz * nr / real_blksz)) +"$XFS_IO_PROG" -c "cowextsize $((blksz * 16))" "$testdir" >> "$seqres.full" +_pwrite_byte 0x61 0 $((blksz * nr)) "$testdir/file1" >> "$seqres.full" +$XFS_IO_PROG -f -c "truncate $((blksz * nr))" "$testdir/file3" >> "$seqres.full" +# 0 blocks are reflinked +seq 0 5 $nr | while read f; do + _reflink_range "$testdir/file1" $((blksz * f)) "$testdir/file3" $((blksz * f)) $blksz >> "$seqres.full" + _pwrite_byte 0x61 $((blksz * f)) $blksz "$testdir/file3.chk" >> "$seqres.full" +done +# 1 blocks are unwritten +seq 1 5 $nr | while read f; do + $XFS_IO_PROG -f -c "falloc $((blksz * f)) $blksz" "$testdir/file3" >> "$seqres.full" + _pwrite_byte 0x00 $((blksz * f)) $blksz "$testdir/file3.chk" >> "$seqres.full" +done +# 2 blocks are holes +seq 2 5 $nr | while read f; do + _pwrite_byte 0x00 $((blksz * f)) $blksz "$testdir/file3.chk" >> "$seqres.full" +done +# 3 blocks are regular +seq 3 5 $nr | while read f; do + _pwrite_byte 0x71 $((blksz * f)) $blksz "$testdir/file3" >> "$seqres.full" + _pwrite_byte 0x71 $((blksz * f)) $blksz "$testdir/file3.chk" >> "$seqres.full" +done +sync +# 4 blocks are delalloc (do later) +seq 4 5 $nr | while read f; do + _pwrite_byte 0x62 $((blksz * f)) $blksz "$testdir/file3" >> "$seqres.full" + _pwrite_byte 0x62 $((blksz * f)) $blksz "$testdir/file3.chk" >> "$seqres.full" +done + +# 10 blocks are cow'd +seq 0 10 $((nr/2)) | while read f; do + _pwrite_byte 0x61 $((blksz * f)) 1 "$testdir/file3" >> "$seqres.full" + _pwrite_byte 0x61 $((blksz * f)) 1 "$testdir/file3.chk" >> "$seqres.full" +done + +echo "Compare files" +md5sum "$testdir/file1" | _filter_scratch +md5sum "$testdir/file3" | _filter_scratch +md5sum "$testdir/file3.chk" | _filter_scratch + +echo "Dump extents" +"$XFS_IO_PROG" -c "cowextsize" "$testdir/file3" | _filter_scratch +echo "Delayed allocation CoW extents:" +test $(_xfs_bmapx_find cow "$testdir/file3" delalloc) -gt 0 || \ + echo "Expected to find a delalloc CoW extent" +echo "Shared data extents:" +test $(_xfs_bmapx_find data "$testdir/file3" '100000$') -gt 0 || \ + echo "Expected to find a shared data extent" +echo "Unwritten data extents:" +test $(_xfs_bmapx_find data "$testdir/file3" '10000$') -gt 0 || \ + echo "Expected to find an unwritten data extent" +echo "Hole data extents:" +test $(_xfs_bmapx_find data "$testdir/file3" hole) -gt 0 || \ + echo "Expected to find a hole data extent" +echo "Regular data extents:" +test $(_xfs_bmapx_find data "$testdir/file3" '000000$') -gt 0 || \ + echo "Expected to find a regular data extent" + +sync + +echo "Dump extents after sync" +"$XFS_IO_PROG" -c "cowextsize" "$testdir/file3" | _filter_scratch +echo "Delayed allocation CoW extents:" +test $(_xfs_bmapx_find cow "$testdir/file3" -v hole ) -gt 0 || \ + echo "Expected to find a regular CoW extent" +echo "Real CoW extents:" +test $(_xfs_bmapx_find cow "$testdir/file3" delalloc ) -eq 0 || \ + echo "Expected to find zero delalloc CoW extent" +echo "Shared data extents:" +test $(_xfs_bmapx_find data "$testdir/file3" '100000$') -gt 0 || \ + echo "Expected to find a shared data extent" +echo "Unwritten data extents:" +test $(_xfs_bmapx_find data "$testdir/file3" '10000$') -gt 0 || \ + echo "Expected to find an unwritten data extent" +echo "Hole data extents:" +test $(_xfs_bmapx_find data "$testdir/file3" hole) -gt 0 || \ + echo "Expected to find a hole data extent" +echo "Regular data extents:" +test $(_xfs_bmapx_find data "$testdir/file3" '000000$') -gt 0 || \ + echo "Expected to find a regular data extent" + +_scratch_remount + +echo "Compare files" +md5sum "$testdir/file1" | _filter_scratch +md5sum "$testdir/file3" | _filter_scratch +md5sum "$testdir/file3.chk" | _filter_scratch + +echo "Check for damage" +umount "$SCRATCH_MNT" + +# success, all done +status=0 +exit diff --git a/tests/xfs/243.out b/tests/xfs/243.out new file mode 100644 index 0000000..0390be7 --- /dev/null +++ b/tests/xfs/243.out @@ -0,0 +1,27 @@ +QA output created by 243 +Format and mount +Create the original files +Compare files +bdbcf02ee0aa977795a79d25fcfdccb1 SCRATCH_MNT/test-243/file1 +d0fda5bf5d4fd70904ef1c1c56db28d0 SCRATCH_MNT/test-243/file3 +d0fda5bf5d4fd70904ef1c1c56db28d0 SCRATCH_MNT/test-243/file3.chk +Dump extents +[1048576] SCRATCH_MNT/test-243/file3 +Delayed allocation CoW extents: +Shared data extents: +Unwritten data extents: +Hole data extents: +Regular data extents: +Dump extents after sync +[1048576] SCRATCH_MNT/test-243/file3 +Delayed allocation CoW extents: +Real CoW extents: +Shared data extents: +Unwritten data extents: +Hole data extents: +Regular data extents: +Compare files +bdbcf02ee0aa977795a79d25fcfdccb1 SCRATCH_MNT/test-243/file1 +d0fda5bf5d4fd70904ef1c1c56db28d0 SCRATCH_MNT/test-243/file3 +d0fda5bf5d4fd70904ef1c1c56db28d0 SCRATCH_MNT/test-243/file3.chk +Check for damage diff --git a/tests/xfs/245 b/tests/xfs/245 new file mode 100755 index 0000000..8da1abe --- /dev/null +++ b/tests/xfs/245 @@ -0,0 +1,99 @@ +#! /bin/bash +# FS QA Test No. 245 +# +# Make sure that reflink deals with extents going beyond EOF. +# - fallocate 256k in file1 +# - pwrite 252-257k to cause it to speculatively prealloc file1 +# - reflink file1 to file2 +# - compare file[12] +# +#----------------------------------------------------------------------- +# Copyright (c) 2016, Oracle and/or its affiliates. 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 -rf "$tmp".* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/reflink +. ./common/xfs + +# real QA test starts here +_supported_os Linux +_require_scratch_reflink +_require_xfs_io_command "falloc" +_require_cp_reflink + +rm -f "$seqres.full" + +echo "Format and mount" +_scratch_mkfs > "$seqres.full" 2>&1 +_scratch_mount >> "$seqres.full" 2>&1 + +testdir="$SCRATCH_MNT/test-$seq" +rm -rf $testdir +mkdir $testdir + +echo "Create the original files" +"$XFS_IO_PROG" -f -c "falloc 0 256k" -c "pwrite 252k 6k" "$testdir/file1" >> "$seqres.full" +_scratch_remount +_cp_reflink "$testdir/file1" "$testdir/file2" >> "$seqres.full" + +echo "Compare files" +md5sum "$testdir/file1" | _filter_scratch +md5sum "$testdir/file2" | _filter_scratch + +echo "Unwritten data extents" +test $(_xfs_bmapx_find data "$testdir/file1" '10000$') -gt 0 || \ + echo "Expected to find an unwritten file1 extent" +echo "Shared data extents" +test $(_xfs_bmapx_find data "$testdir/file1" '100000$') -gt 0 || \ + echo "Expected to find a shared data extent" + +echo "Hole data extents" +test $(_xfs_bmapx_find data "$testdir/file2" 'hole') -gt 0 || \ + echo "Expected to find a hole data extent" +echo "Shared data extents" +test $(_xfs_bmapx_find data "$testdir/file2" '100000$') -gt 0 || \ + echo "Expected to find a shared data extent" + +echo "Hole cow extents" +test $(_xfs_bmapx_find cow "$testdir/file1" 'hole') -gt 0 || \ + echo "Expected to find a hole cow extent" +echo "Hole cow extents" +test $(_xfs_bmapx_find cow "$testdir/file2" 'hole') -gt 0 || \ + echo "Expected to find a hole cow extent" + +echo "Check for damage" +umount "$SCRATCH_MNT" + +# success, all done +status=0 +exit diff --git a/tests/xfs/245.out b/tests/xfs/245.out new file mode 100644 index 0000000..92a2cbe --- /dev/null +++ b/tests/xfs/245.out @@ -0,0 +1,13 @@ +QA output created by 245 +Format and mount +Create the original files +Compare files +b0b91e1a18165fcd6549f2f5f3ef4823 SCRATCH_MNT/test-245/file1 +b0b91e1a18165fcd6549f2f5f3ef4823 SCRATCH_MNT/test-245/file2 +Unwritten data extents +Shared data extents +Hole data extents +Shared data extents +Hole cow extents +Hole cow extents +Check for damage diff --git a/tests/xfs/group b/tests/xfs/group index c0ce1f4..23fc180 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -240,7 +240,9 @@ 240 auto quick clone 241 auto quick clone 242 auto quick prealloc +243 auto quick clone 244 auto quota quick +245 auto quick clone 250 auto quick rw prealloc metadata 252 auto quick prealloc 253 auto quick