From patchwork Fri Sep 4 06:15:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 7120071 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B31789FBA9 for ; Fri, 4 Sep 2015 06:17:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B14D4207F1 for ; Fri, 4 Sep 2015 06:17:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7330A2085F for ; Fri, 4 Sep 2015 06:17:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932515AbbIDGRn (ORCPT ); Fri, 4 Sep 2015 02:17:43 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:38299 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757650AbbIDGRj (ORCPT ); Fri, 4 Sep 2015 02:17:39 -0400 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t846HW8N003730 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 4 Sep 2015 06:17:32 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t846HWow012944 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Fri, 4 Sep 2015 06:17:32 GMT Received: from abhmp0011.oracle.com (abhmp0011.oracle.com [141.146.116.17]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id t846HWg0000810; Fri, 4 Sep 2015 06:17:32 GMT Received: from arch2.sg.oracle.com (/10.186.101.93) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 03 Sep 2015 23:17:31 -0700 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, david@fromorbit.com, eguan@redhat.com Subject: [PATCH v9 1/3] xfstests: btrfs: add functions to create dm-error device Date: Fri, 4 Sep 2015 14:15:21 +0800 Message-Id: <1441347323-4682-2-git-send-email-anand.jain@oracle.com> X-Mailer: git-send-email 2.4.1 In-Reply-To: <1441347323-4682-1-git-send-email-anand.jain@oracle.com> References: <1441347323-4682-1-git-send-email-anand.jain@oracle.com> X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.9 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 From: Anand Jain Controlled EIO from the device is achieved using the dm device. Helper functions are at common/dmerror. Broadly steps will include calling _dmerror_init(). _dmerror_init() will use SCRATCH_DEV to create dm linear device and assign DMERROR_DEV to /dev/mapper/error-test. When test script is ready to get EIO, the test cases can call _dmerror_load_table() which then it will load the dm error. so that reading DMERROR_DEV will cause EIO. After the test case is complete, cleanup must be done by calling _dmerror_cleanup(). Signed-off-by: Anand Jain Reviewed-by: Filipe Manana --- v8->v9: Accepts Eryu's review comments viz.. . check for modloaded as in dm-flakey . add _require_block_device and _require_sane_bdev_flush to dmerror_required() v7->v8: . Mainly avoid duplicate lines of code, create reusable functions _common_dev_mount_options(), dmerror_mount_options(), _dmerror_mount() . Update _scratch_mount_option() to use _common_dev_mount_options() v6->v7: rename _init_dmerror() to _dmerror_init() remove _scratch_mkfs_dmerror() rename _mount_dmerror() to _dmerror_mount() rename _cleaup_dmerror() to _dmerror_cleanup() rename _load_dmerror_table() to _dmerror_load_table() rename BLK_DEV_SIZE to blk_dev_size remove _unmount_dmerror there were no consumer of it use _fail instead of _fatal in rc/dmerror update error log to make crisp sense move _require_dmerror() from common/rc to common/dmerror and rename it to dmerror_required() so that its consistent with other function names with in the file v5->v6: accepts Eryu's comments, thanks . added missing $MKFS_OPTIONS at _scratch_mkfs_dmerror() . used $MOUNT_PROG instead of mount at _mount_dmerror() . correct typo $UMOUNT_PROG, no S at the end in _unmount_dmerror() v4->v5: No Change. keep up with the patch set v3->v4: rebase on latest xfstests code v2.1->v3: accepts Filipe Manana's review comments, thanks . correct if else statement in _require_dm_error() . fix indent (a missed Dave comment in v1. looks like I goofed with git cli) v2->v2.1: fixed missed typo error fixup in the commit. v1->v2: accepts Dave Chinner's review comments, thanks . use SCRATCH_DEV for dmerror backing device . remove duplicate check of DM_BLK_DEV in _init_dm_error_dev() . remove a wrong check when reading block size in _init_dm_error_dev() . remove a wrong check with blockdev --setra in _init_dm_error_dev() . remove unnecessary check in _load_dm_error_table() . remove unnecessary dmerror device test by using dd common/dmerror | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ common/rc | 13 +++++++++-- 2 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 common/dmerror diff --git a/common/dmerror b/common/dmerror new file mode 100644 index 0000000..8ba2262 --- /dev/null +++ b/common/dmerror @@ -0,0 +1,74 @@ +##/bin/bash +# +# Copyright (c) 2015 Oracle. 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 +# +# +# common functions for setting up and tearing down a dmerror device + +# this test requires the device mapper error target +# +_dmerror_required() +{ + _require_command "$DMSETUP_PROG" dmsetup + $DMSETUP_PROG targets | grep error >/dev/null 2>&1 + [ $? -ne 0 ] && _notrun "This test requires dm error support" +} + +_dmerror_init() +{ + local dm_backing_dev=$SCRATCH_DEV + + $DMSETUP_PROG remove error-test > /dev/null 2>&1 + + local blk_dev_size=`blockdev --getsz $dm_backing_dev` + + DMERROR_DEV='/dev/mapper/error-test' + + DMLINEAR_TABLE="0 $blk_dev_size linear $dm_backing_dev 0" + + $DMSETUP_PROG create error-test --table "$DMLINEAR_TABLE" || \ + _fatal "failed to create dm linear device" + + DMERROR_TABLE="0 $blk_dev_size error $dm_backing_dev 0" +} + +_dmerror_mount_options() +{ + echo `_common_dev_mount_options $*` $DMERROR_DEV $SCRATCH_MNT +} + +_dmerror_mount() +{ + _mount -t $FSTYP `_dmerror_mount_options $*` +} + +_dmerror_cleanup() +{ + $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1 + $DMSETUP_PROG remove error-test > /dev/null 2>&1 +} + +_dmerror_load_table() +{ + $DMSETUP_PROG suspend error-test + [ $? -ne 0 ] && _fail "dmsetup suspend failed" + + $DMSETUP_PROG load error-test --table "$DMERROR_TABLE" + [ $? -ne 0 ] && _fail "dmsetup failed to load error table" + + $DMSETUP_PROG resume error-test + [ $? -ne 0 ] && _fail "dmsetup resume failed" +} diff --git a/common/rc b/common/rc index 70d2fa8..7befa09 100644 --- a/common/rc +++ b/common/rc @@ -211,11 +211,20 @@ _mount_ops_filter() } +# Used for mounting non-scratch devices (e.g. loop, dm constructs) +# with the safe set of scratch mount options (e.g. loop image may be +# hosted on $SCRATCH_DEV, so can't use external scratch devices). +_common_dev_mount_options() +{ + echo $MOUNT_OPTIONS $SELINUX_MOUNT_OPTIONS $* +} + _scratch_mount_options() { - _scratch_options mount + _scratch_options mount - echo $SCRATCH_OPTIONS $MOUNT_OPTIONS $SELINUX_MOUNT_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT + echo `_common_dev_mount_options $*` $SCRATCH_OPTIONS \ + $SCRATCH_DEV $SCRATCH_MNT } _scratch_mount()