From patchwork Fri Feb 10 17:04:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9567117 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 8D31C601C3 for ; Fri, 10 Feb 2017 17:04:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C28028538 for ; Fri, 10 Feb 2017 17:04:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 70CC3285AA; Fri, 10 Feb 2017 17:04:28 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham 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 DA99F28538 for ; Fri, 10 Feb 2017 17:04:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752591AbdBJRE1 (ORCPT ); Fri, 10 Feb 2017 12:04:27 -0500 Received: from mail-wr0-f174.google.com ([209.85.128.174]:35067 "EHLO mail-wr0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752533AbdBJREZ (ORCPT ); Fri, 10 Feb 2017 12:04:25 -0500 Received: by mail-wr0-f174.google.com with SMTP id 89so112562516wrr.2 for ; Fri, 10 Feb 2017 09:04:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=29IQ/dNH97FaG3YL/ChwX+nWAhBxgCnYq3lNJhLRIl0=; b=aIedj8ll5pcauyhd0Ur9nuI8G+Ju/mQ8J0qLt1A2uu7L7grW/U5bQeGTQmOax0i4KL QYchWGYa6WgTD25I17t5v0bNw0pNvz0HVYgjjsCz9lN3P+jIYWk+vHCJ/IADju7zORYJ EGHozGFSQNOENROuH47jzypc4cCZw4Vz0ulOMNTLBSeFcYisyph/4g+W3qJDeKW9yeB8 oQM2IKoqujKBh4hCtB0r6fovnW6CksNYnq1WKUfSJTaJDb+xNbk6+RPtAM3GUuRYzkD6 nZo64iDuAPHUvGbAF/rMlyAXL5o6s4LvLSGF932+59VkaPl1Ftiy3TFftjMuFCu2/Y0w 4KUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=29IQ/dNH97FaG3YL/ChwX+nWAhBxgCnYq3lNJhLRIl0=; b=Rw8WtTn7TmqC1AAeWb1PR3xWEu8tMHiN0DC6zP1nwQ3pslEZXME6RLzh4YU6rJXhhb Go6ODA1hH/TN5Tt60of7v6mONW9tZfhw7S9zPeZaOojprlXkm453f0WAxqZT2Idn7WdH DSQ+10cqLQVamYro/MAQRCL2eTvhxBHBy1vfnqN9tOltvVvwcCc270KkBS09msvF/xFB w+TTPb5aYr17FiWn74jTVeMSmyPwLjshrXSf1B+9GatgL4xVi5iHccxzbTaRyNdVdrp+ YRFdnOI0jdDLE46i1bjbAuf/QKE5Fs4273E9gl4EcI4ICelFLYmWl8k5LKq1C0sIBPa3 GLiA== X-Gm-Message-State: AMke39mNmTOoENfcrHNvLY71VhjZM9vKtgKhjyAPhGmJPZKWMe31Gz+NkXr56BVAQl3goA== X-Received: by 10.223.145.227 with SMTP id 90mr9027784wri.156.1486746263954; Fri, 10 Feb 2017 09:04:23 -0800 (PST) Received: from localhost.localdomain (bzq-79-176-143-83.red.bezeqint.net. [79.176.143.83]) by smtp.gmail.com with ESMTPSA id 65sm393130wri.53.2017.02.10.09.04.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Feb 2017 09:04:23 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: fstests@vger.kernel.org Subject: [PATCH] fstests: sanity check that test partitions are not mounted elsewhere Date: Fri, 10 Feb 2017 19:04:15 +0200 Message-Id: <1486746255-5281-1-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When $TEST_DEV is mounted at a different location then $TEST_DIR, _require_test() aborts the test with an error: TEST_DEV=/dev/sda5 is mounted but not on TEST_DIR=/mnt/test There are several problems with current sanity check: 1. the output of the error is mixed into out.bad and hard to see 2. the test partition is unmounted at the end of the test regardless of the fact that it not pass the sanity that we have exclusivity 3. scratch partition has a similar sanity check in _require_scratch(), but we may not get to it, because $SCRATCH_DEV is unmounted prior to running the tests (which could unmount another mount point). To solve all these problems, introduce a helper _check_mounted_on(). It checks if a device is mounted on a given mount point and optionally checks the mounted fs type. The sanity checks in _require_scratch() and _require_test() are converted to use the helper and gain the check for correct fs type. The helper is used in init_rc() to sanity check both test and scratch partitions, before tests are run and before $SCRATCH_DEV is unmounted. Signed-off-by: Amir Goldstein --- common/rc | 85 ++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 34 deletions(-) Eryu, As result of your request to add sanity checks to overlay base fs, I ended up finding several bugs in current sanity checks (not overlay related). So sending this one out because it is useful on its own. Overlay base fs patches are going to be on top of this change and use the helper as well. Incidently, this change also fixes an overlay setup bug, but I did not want to add this info to the already overloaded commit message, as the following base fs patches will make this bug obsolete - If you configure SCRATCH_DEV to a mount point (and not to a directory therein) then you will get a false positive error in scratch tests: $SCRATCH_DEV=/mnt/base/scratch is mounted but not on $SCRATCH_MNT=/mnt/scratch Already mounted result: /dev/sda6 on /mnt/base/scratch type xfs (rw,relatime,attr2,inode64,noquota) This is due to the wrong `grep -F $SCRATCH_DEV` which matches the mount point instead of the device in that mount. I am pretty sure we already has this discussion where you changed the pattern to `grep -F ^$dev` and I advised you to go with `grep -F "$dev on "`. Anyway, this change includes this fix. Amir. diff --git a/common/rc b/common/rc index 7e2eaee..1c773cc 100644 --- a/common/rc +++ b/common/rc @@ -1319,6 +1319,45 @@ _supported_os() _notrun "not suitable for this OS: $HOSTOS" } +# check if a FS on a device is mounted +# if so, verify that it is mounted on mount point +# if fstype is given as argument, verify that it is also +# mounted with correct fs type +# +_check_mounted_on() +{ + local devname=$1 + local dev=$2 + local mntname=$3 + local mnt=$4 + local type=$5 + + # Note that we use -F here so grep doesn't try to interpret an NFS over + # IPv6 server as a regular expression. Because of that, we cannot use + # ^$dev so we use "$dev on " to avoid matching $dev to mount point field + # for overlay case, where $dev is a directory. + local mount_rec=`_mount | grep -F "$dev on "` + [ -n "$mount_rec" ] || return 1 + + # if it's mounted, make sure its on $mnt + if ! (echo $mount_rec | grep -q "$dev on $mnt") + then + echo "$devname=$dev is mounted but not on $mntname=$mnt - aborting" + echo "Already mounted result:" + echo $mount_rec + exit 1 + fi + + if [ -n "$type" -a "`_fs_type $dev`" != "$type" ] + then + echo "$devname=$dev is mounted but not a type $type filesystem" + # raw $DF_PROG cannot handle NFS/CIFS/overlay correctly + _df_device $dev + exit 1 + fi + return 0 +} + # this test needs a scratch partition - check we're ok & unmount it # No post-test check of the device is required. e.g. the test intentionally # finishes the test with the filesystem in a corrupt state @@ -1373,21 +1412,9 @@ _require_scratch_nocheck() ;; esac - # mounted? - # Note that we use -F here so grep doesn't try to interpret an NFS over - # IPv6 server as a regular expression. - mount_rec=`_mount | grep -F $SCRATCH_DEV` - if [ "$mount_rec" ] + if _check_mounted_on SCRATCH_DEV $SCRATCH_DEV SCRATCH_MNT $SCRATCH_MNT then - # if it's mounted, make sure its on $SCRATCH_MNT - if ! echo $mount_rec | grep -q $SCRATCH_MNT - then - echo "\$SCRATCH_DEV=$SCRATCH_DEV is mounted but not on \$SCRATCH_MNT=$SCRATCH_MNT - aborting" - echo "Already mounted result:" - echo $mount_rec - exit 1 - fi - # and then unmount it + # if it's mounted, unmount it if ! _scratch_unmount then echo "failed to unmount $SCRATCH_DEV" @@ -1458,21 +1485,8 @@ _require_test() ;; esac - # mounted? - # Note that we use -F here so grep doesn't try to interpret an NFS over - # IPv6 server as a regular expression. - mount_rec=`_mount | grep -F $TEST_DEV` - if [ "$mount_rec" ] + if ! _check_mounted_on TEST_DEV $TEST_DEV TEST_DIR $TEST_DIR then - # if it's mounted, make sure its on $TEST_DIR - if ! echo $mount_rec | grep -q $TEST_DIR - then - echo "\$TEST_DEV=$TEST_DEV is mounted but not on \$TEST_DIR=$TEST_DIR - aborting" - echo "Already mounted result:" - echo $mount_rec - exit 1 - fi - else out=`_mount_or_remount_rw "$MOUNT_OPTIONS" $TEST_DEV $TEST_DIR` if [ $? -ne 1 ]; then echo $out @@ -3066,13 +3080,16 @@ init_rc() fi fi - if [ "`_fs_type $TEST_DEV`" != "$FSTYP" ] - then - echo "common/rc: Error: \$TEST_DEV ($TEST_DEV) is not a MOUNTED $FSTYP filesystem" - # raw $DF_PROG cannot handle NFS/CIFS/overlay correctly - _df_device $TEST_DEV - exit 1 + # Sanity check that TEST partition is not mounted at another mount point + # or as another fs type + _check_mounted_on TEST_DEV $TEST_DEV TEST_DIR $TEST_DIR $FSTYP + if [ -n "$SCRATCH_DEV" ]; then + # Sanity check that SCRATCH partition is not mounted at another + # mount point, because it is about to be unmounted and formatted. + # Another fs type for scratch is fine (bye bye old fs type). + _check_mounted_on SCRATCH_DEV $SCRATCH_DEV SCRATCH_MNT $SCRATCH_MNT fi + # Figure out if we need to add -F ("foreign", deprecated) option to xfs_io $XFS_IO_PROG -c stat $TEST_DIR 2>&1 | grep -q "is not on an XFS filesystem" && \ export XFS_IO_PROG="$XFS_IO_PROG -F"