From patchwork Tue Aug 15 10:31:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9901559 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 5A58C60244 for ; Tue, 15 Aug 2017 10:31:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D6F528797 for ; Tue, 15 Aug 2017 10:31:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4093828833; Tue, 15 Aug 2017 10:31:48 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 9856928797 for ; Tue, 15 Aug 2017 10:31:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753585AbdHOKbC (ORCPT ); Tue, 15 Aug 2017 06:31:02 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36067 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753423AbdHOKbB (ORCPT ); Tue, 15 Aug 2017 06:31:01 -0400 Received: by mail-wm0-f65.google.com with SMTP id d40so1005664wma.3; Tue, 15 Aug 2017 03:31:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=K196v/TGpnIQ6ac9YcYoG5NBtf3FkJLSEQA5euCWseg=; b=BNRU9GlxXYdC7ywRd+fmdHy7cD9Gdgn7GKxAFBD8LZWrUe58+UXKmkAKeIj9z33fZm 0xNGSw2ySAdMYchqPJa1XUG9CsvIlTW+xFCnUR08i3LqOnctkOeitb28veX8C4Ed3VGJ 5jrPZb6dPGlgGfilF6Izrj7hKkFY+IOrDaF2UI2iRSpU0mELPkCV32c2IEHDNla9uxTl UpOZ+Yc1Kv3mMAPp8ZGdQPoUh0q44BvzQQKD2YHoglcvOHPT4Y1cTu+EYwtR1jo9OCK7 q0mqICPIhhwtf5ZOdkCFoj3WKgMMr9HREDkkcR+jaCp04SK8dqGF6rJZej1DUlFk2YRB inVA== 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=K196v/TGpnIQ6ac9YcYoG5NBtf3FkJLSEQA5euCWseg=; b=WMHJP6TeR/nc2JCYFnFs4D56ni4yXoTP5JwtDdHJsxj9WE7bTvkiBdnMz7l2BMJiqr /iNY+0rYZXXyotQ+tyyXJTlTf8TBm5g3heEY8ojePrMvN3z6aFmJFwsPvT5URtuGBRoH 2F2U7yUKt0BdLcH8LxDWiUwCthRQBxJmhWopEcw594bggXQFzlnUNXvgG/DzFeGuvL4T LFfsXTLavjrM6zccv93kPvpXLW4KBflZYxpCKoJol9lNOp9YrxFjoNCQSwNFBDl8Taaa ijz4P8q8TyMRxyUnOd2YrGnt9Z0+f+Xkje8r5lspcBMiU7c1UfdBpg29+/uGrG7tB7ra e7ig== X-Gm-Message-State: AHYfb5jOaMFV4heX5IxB+p/tkn+GMnK+3bhmNVxD+L2wLLfWLoreCLy3 CiY9jzFXCs/uDg== X-Received: by 10.28.199.207 with SMTP id x198mr1014472wmf.156.1502793059974; Tue, 15 Aug 2017 03:30:59 -0700 (PDT) Received: from localhost.localdomain (bzq-79-182-137-119.red.bezeqint.net. [79.182.137.119]) by smtp.gmail.com with ESMTPSA id g133sm2134031wmd.48.2017.08.15.03.30.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Aug 2017 03:30:59 -0700 (PDT) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v2] overlay: test mount error cases with index=on Date: Tue, 15 Aug 2017 13:31:30 +0300 Message-Id: <1502793090-19372-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 - Upper/lower mismatch - Index/upper mismatch With index=on, lowerdir and upperdir are verified using a file handle stored in trusted.overlay.origin xattr in upperdir and indexdir. Failure to verify lowerdir/upperdir on mount results in ESTALE. Signed-off-by: Amir Goldstein --- Eryu, This test depends on a kernel commit 961af647fc9e ("ovl: fix origin verification of index dir") that was merged for v4.13-rc2. v2: - Add verification that mount with original lower and upper dir still succeeds, after the mismatch attempts tests/overlay/037 | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/overlay/037.out | 3 ++ tests/overlay/group | 1 + 3 files changed, 98 insertions(+) create mode 100755 tests/overlay/037 create mode 100644 tests/overlay/037.out diff --git a/tests/overlay/037 b/tests/overlay/037 new file mode 100755 index 0000000..6be9a26 --- /dev/null +++ b/tests/overlay/037 @@ -0,0 +1,94 @@ +#! /bin/bash +# FS QA Test 037 +# +# Test mount error cases with option index=on +# +# - Upper/lower mismatch +# - Index/upper mismatch +# +# With index=on, lowerdir and upperdir are verified using a file handle +# stored in trusted.overlay.origin xattr in upperdir and indexdir. +# +# Failure to verify lowerdir/upperdir on mount results in ESTALE. +# +#----------------------------------------------------------------------- +# Copyright (C) 2017 CTERA Networks. All Rights Reserved. +# Author: Amir Goldstein +# +# 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 -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here +_supported_fs overlay +_supported_os Linux +_require_scratch +_require_scratch_feature index + +# Remove all files from previous tests +_scratch_mkfs + +# Create multiple lowerdirs, upperdirs and workdir +lowerdir=$OVL_BASE_SCRATCH_MNT/lower +lowerdir2=$OVL_BASE_SCRATCH_MNT/lower2 +upperdir=$OVL_BASE_SCRATCH_MNT/upper +upperdir2=$OVL_BASE_SCRATCH_MNT/upper2 +workdir=$OVL_BASE_SCRATCH_MNT/workdir +mkdir -p $lowerdir $lowerdir2 $upperdir $upperdir2 $workdir + +# Mount overlay with lowerdir, upperdir, workdir and index=on +# to store the file handles of lowerdir and upperdir in overlay.origin xattr +_overlay_mount_dirs $lowerdir $upperdir $workdir \ + $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT -oindex=on +$UMOUNT_PROG $SCRATCH_MNT + +# Try to mount an overlay with the same upperdir and different lowerdir - expect ESTALE +_overlay_mount_dirs $lowerdir2 $upperdir $workdir \ + $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT -oindex=on 2>&1 | _filter_scratch +$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null + +# Try to mount an overlay with the same workdir and different upperdir - expect ESTALE +_overlay_mount_dirs $lowerdir $upperdir2 $workdir \ + $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT -oindex=on 2>&1 | _filter_scratch +$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null + +# Mount overlay with original lowerdir, upperdir, workdir and index=on - expect success +_overlay_mount_dirs $lowerdir $upperdir $workdir \ + $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT -oindex=on + +# success, all done +status=0 +exit diff --git a/tests/overlay/037.out b/tests/overlay/037.out new file mode 100644 index 0000000..786ef85 --- /dev/null +++ b/tests/overlay/037.out @@ -0,0 +1,3 @@ +QA output created by 037 +mount: mount SCRATCH_DEV on SCRATCH_MNT failed: Stale file handle +mount: mount SCRATCH_DEV on SCRATCH_MNT failed: Stale file handle diff --git a/tests/overlay/group b/tests/overlay/group index 4cc1d74..28f1e63 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -39,3 +39,4 @@ 034 auto quick copyup hardlink 035 auto quick mount 036 auto quick mount +037 auto quick mount