From patchwork Thu Jul 13 14:10:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 9838539 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 88AE460392 for ; Thu, 13 Jul 2017 14:11:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7934C286BC for ; Thu, 13 Jul 2017 14:11:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6DFD72870B; Thu, 13 Jul 2017 14:11:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09E98286BF for ; Thu, 13 Jul 2017 14:11:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752151AbdGMOLJ (ORCPT ); Thu, 13 Jul 2017 10:11:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:46004 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751200AbdGMOLI (ORCPT ); Thu, 13 Jul 2017 10:11:08 -0400 Received: from debian3.lan (bl12-226-64.dsl.telepac.pt [85.245.226.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 414AD22B55; Thu, 13 Jul 2017 14:11:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 414AD22B55 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=fdmanana@kernel.org From: fdmanana@kernel.org To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Filipe Manana Subject: [PATCH] btrfs: test direct IO write against raid5/6 filesystems Date: Thu, 13 Jul 2017 15:10:40 +0100 Message-Id: <20170713141040.2341-1-fdmanana@kernel.org> X-Mailer: git-send-email 2.11.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Filipe Manana Test that a direct IO write works against raid5/6 filesystems and that after the write operation we are able to read back the correct data and scrub operations don't find any errors. This test is motivated by a regression introduced in the merge window for the 4.13 linux kernel, which was undetected by the current set of test cases. The issue is fixed by the following patch: "Btrfs: fix write corruption due to bio cloning on raid5/6" Signed-off-by: Filipe Manana Reviewed-by: Liu Bo --- tests/btrfs/148 | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/148.out | 23 +++++++++++++++ tests/btrfs/group | 1 + 3 files changed, 109 insertions(+) create mode 100755 tests/btrfs/148 create mode 100644 tests/btrfs/148.out diff --git a/tests/btrfs/148 b/tests/btrfs/148 new file mode 100755 index 00000000..45aa577a --- /dev/null +++ b/tests/btrfs/148 @@ -0,0 +1,85 @@ +#! /bin/bash +# FS QA Test No. btrfs/148 +# +# Test that direct IO writes work on RAID5 and RAID6 filesystems. +# +#----------------------------------------------------------------------- +# +# Copyright (C) 2017 SUSE Linux Products GmbH. All Rights Reserved. +# Author: Filipe Manana +# +# 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" + +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 +_supported_fs btrfs +_supported_os Linux +_require_scratch +_require_scratch_dev_pool 4 + +_scratch_dev_pool_get 4 + +rm -f $seqres.full + +test_direct_io_write() +{ + local mkfs_options=$1 + + _scratch_pool_mkfs $mkfs_options >>$seqres.full 2>&1 + _scratch_mount + + $XFS_IO_PROG -f -d -c "pwrite -S 0xab 0 1M" $SCRATCH_MNT/foo \ + | _filter_xfs_io + + # Now read back the same data, we expect to get what we wrote before. + echo "File data after direct IO write:" + od -t x1 $SCRATCH_MNT/foo | _filter_scratch + _scratch_cycle_mount + echo "File data after umounting and mounting again the filesystem:" + od -t x1 $SCRATCH_MNT/foo | _filter_scratch + + $BTRFS_UTIL_PROG scrub start -B $SCRATCH_MNT >>$seqres.full 2>&1 + if [ $? -ne 0 ]; then + echo "Scrub found errors" | tee -a $seqres.full + fi + + _scratch_unmount +} + +echo "Testing RAID5..." +test_direct_io_write "-m raid5 -d raid5" +echo "Testing RAID6..." +test_direct_io_write "-m raid6 -d raid6" + +status=0 +exit diff --git a/tests/btrfs/148.out b/tests/btrfs/148.out new file mode 100644 index 00000000..c4178f66 --- /dev/null +++ b/tests/btrfs/148.out @@ -0,0 +1,23 @@ +QA output created by 148 +Testing RAID5... +wrote 1048576/1048576 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +File data after direct IO write: +0000000 ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab +* +4000000 +File data after umounting and mounting again the filesystem: +0000000 ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab +* +4000000 +Testing RAID6... +wrote 1048576/1048576 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +File data after direct IO write: +0000000 ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab +* +4000000 +File data after umounting and mounting again the filesystem: +0000000 ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab +* +4000000 diff --git a/tests/btrfs/group b/tests/btrfs/group index 2eb540e7..eb4cb653 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -150,3 +150,4 @@ 145 auto quick send 146 auto quick 147 auto quick send +148 auto quick