From patchwork Tue Jan 23 20:59:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10181057 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 0C3CD6019D for ; Tue, 23 Jan 2018 20:58:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F34BF287C9 for ; Tue, 23 Jan 2018 20:58:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7AA7287ED; Tue, 23 Jan 2018 20:58:26 +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 1B2D4287C9 for ; Tue, 23 Jan 2018 20:58:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752614AbeAWU6Z (ORCPT ); Tue, 23 Jan 2018 15:58:25 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:44888 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932067AbeAWU6Y (ORCPT ); Tue, 23 Jan 2018 15:58:24 -0500 Received: by mail-wm0-f52.google.com with SMTP id t74so4442234wme.3; Tue, 23 Jan 2018 12:58:24 -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:in-reply-to:references; bh=7JBG6Tnx7nlqyDr08WVuz6lqHbC7mVnNGuUPtKQuykc=; b=HsT6LuPY7OcrL3IOtTbwSP2/sxkirfn389lmb7u1vyxQl4aLcPWFwDokCnEtIibgaw GpWCjt10P8vhzEt4GtbZnltCLp+hJhu+S1g+fOCA4tHjzVVJODhnYcHmfYFVjWBidBFQ tczzCRUcqh6b3ul7fraH/2MKElttEQrtuKeY33a+Yedxr5LeR1oIu4mLhOgkevHS5XhN d2Lb+5+DJZ9n99DnKlGYovPhNIkaxFuba+Kxdewh87f2u2ie1mAdXMdbhYO7/uhXiBTA u/4uWfQfGoMLGlbp4rVqEZFSewtudhwIferZDOC974xnqstmoU4pnmq+e8njQB0Swtzp HNtA== 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:in-reply-to :references; bh=7JBG6Tnx7nlqyDr08WVuz6lqHbC7mVnNGuUPtKQuykc=; b=ai5Y/QDOT/Y6A+EZOQDuMSTftWtFUssDc1pcMW3kHQBKcW05XEUOTXQcM1QBxKsG3t O8Nfwd1/j4WTJbGTKYjDcPy5OtMLk0WtkFMTj0VhyIyXxr+++Eq9wt7iMlnqokKCyavG sYfxpdy9LHl1jlAX/lOVmetePFnEPJVGEL4+wX+HJCpUXWw7emslCXoncCrm8DJA7Utm H0VBYBIo2Yy7+2RxuskY1QW0G23jcj5bMrUvGbybOzrJc9wojCSaO6lWd7UpIeVMRu9O l8UcsWOJg+XWQO+nucYgbneq0I/j+WK7Hd9FRcuEVr8qdfzVg78adF1VpSM+yejg8zW9 ScAA== X-Gm-Message-State: AKwxytdgdIqeZf5KY+QQSn5YvUK7aTBokSG0zeyYaVP0E5KgJNOarGpo 3wYVkWUyyPjKUSsYL+LW0k33Hg== X-Google-Smtp-Source: AH8x2242LQlqTFF/tGYX5WsDXbpugvrKQdn/xJQtw465OaEglTQ/vfQ7WaWk/Ea070irc8wb6kq/PQ== X-Received: by 10.28.193.196 with SMTP id r187mr3234953wmf.111.1516741103236; Tue, 23 Jan 2018 12:58:23 -0800 (PST) Received: from localhost.localdomain ([141.226.181.178]) by smtp.gmail.com with ESMTPSA id k125sm30308195wmd.48.2018.01.23.12.58.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Jan 2018 12:58:22 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v2 7/7] overlay: test encode/decode of non-samefs overlay file handles with renames Date: Tue, 23 Jan 2018 22:59:12 +0200 Message-Id: <1516741152-20345-8-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516741152-20345-1-git-send-email-amir73il@gmail.com> References: <1516741152-20345-1-git-send-email-amir73il@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is a variant of overlay file handles with renames test for an overlayfs that is composed of multiple lower layers not on the same underlying fs. Signed-off-by: Amir Goldstein --- tests/overlay/053 | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/overlay/053.out | 22 ++++++ tests/overlay/group | 1 + 3 files changed, 222 insertions(+) create mode 100755 tests/overlay/053 create mode 100644 tests/overlay/053.out diff --git a/tests/overlay/053 b/tests/overlay/053 new file mode 100755 index 0000000..c22fc9f --- /dev/null +++ b/tests/overlay/053 @@ -0,0 +1,199 @@ +#! /bin/bash +# FS QA Test No. 053 +# +# Test encode/decode of non-samefs overlay file handles with renames +# +# This is a variant of overlay file handles with renames test for an +# overlayfs that is composed of multiple lower layers not on the same +# underlying fs. +# +# - Check decode/read of file handles after rename of parent +# - Check decode/read of file handles after rename of grandparent +# - Check decode/read of file handles after move to new parent +# - Check encode/decode/read of file handles in non-upper overlay +# +# This test requires and enables overlayfs NFS export support and merge +# dir rename support (redirect_dir). +# NFS export support depends on and enables overlayfs index feature. +# +#----------------------------------------------------------------------- +# Copyright (C) 2018 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.* + # Cleanup overlay scratch mount that is holding base test mount + # to prevent _check_test_fs and _test_umount from failing before + # _check_scratch_fs _scratch_umount + $UMOUNT_PROG $SCRATCH_MNT 2>/dev/null +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here + +_supported_fs overlay +_supported_os Linux +_require_test +_require_scratch +_require_test_program "open_by_handle" +_require_scratch_feature nfs_export +_require_scratch_feature redirect_dir + +# Lower is on test partition +lower=$OVL_BASE_TEST_DIR/$OVL_LOWER-$seq +# Upper/work are on scratch partition +middle=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER +upper=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER +work=$OVL_BASE_SCRATCH_MNT/$OVL_WORK + +NUMFILES=1 + +# Create test dir and empty test files +create_test_files() +{ + local dir=$1 + local opt=$2 + + mkdir -p $dir + $here/src/open_by_handle -cp $opt $dir $NUMFILES +} + +# Test encode/decode file handles on overlay mount +test_file_handles() +{ + local dir=$1 + shift + + echo test_file_handles $dir $* | _filter_scratch | \ + sed -e "s,$tmp\.,,g" + $here/src/open_by_handle $* $dir $NUMFILES +} + +# Re-create lower/middle/upper/work dirs +create_dirs() +{ + # Create lower dir on test partition + rm -rf $lower + mkdir $lower + + # Create middle/upper/work dirs on scratch partition + _scratch_mkfs +} + +# Mount an overlay on $SCRATCH_MNT with lower layer on test partition +# and middle and upper layer on scratch partition +mount_dirs() +{ + _overlay_mount_dirs $middle:$lower $upper $work \ + $OVERLAY_MOUNT_OPTIONS $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT +} + +# Unmount the overlay without unmounting base fs +unmount_dirs() +{ + $UMOUNT_PROG $SCRATCH_MNT +} + +# Check non-stale file handles of lower/upper moved files +create_dirs +create_test_files $upper/uppertestdir -w +create_test_files $lower/lowertestdir -w +mkdir -p $lower/lowertestdir.lo $lower/lowertestdir.up $upper/uppertestdir.lo $upper/uppertestdir.up +mount_dirs +# Check encode/decode/read of lower/upper file handles after move to new upper testdir +test_file_handles $SCRATCH_MNT/uppertestdir -o $tmp.upper_file_handles +test_file_handles $SCRATCH_MNT/lowertestdir -o $tmp.lower_file_handles +mv $SCRATCH_MNT/uppertestdir/* $SCRATCH_MNT/uppertestdir.up/ +mv $SCRATCH_MNT/lowertestdir/* $SCRATCH_MNT/uppertestdir.lo/ +# Check open and read from stored file handles +test_file_handles $SCRATCH_MNT -r -i $tmp.upper_file_handles +test_file_handles $SCRATCH_MNT -r -i $tmp.lower_file_handles +# Check encode/decode/read of lower/upper file handles after move to new merge testdir +test_file_handles $SCRATCH_MNT/uppertestdir.up -o $tmp.upper_file_handles +test_file_handles $SCRATCH_MNT/uppertestdir.lo -o $tmp.lower_file_handles +mv $SCRATCH_MNT/uppertestdir.up/* $SCRATCH_MNT/lowertestdir.up/ +mv $SCRATCH_MNT/uppertestdir.lo/* $SCRATCH_MNT/lowertestdir.lo/ +# Check open and read from stored file handles +test_file_handles $SCRATCH_MNT -r -i $tmp.upper_file_handles +test_file_handles $SCRATCH_MNT -r -i $tmp.lower_file_handles +unmount_dirs + +# Check non-stale file handles of lower/upper renamed dirs +create_dirs +create_test_files $upper/uppertestdir -w +create_test_files $lower/lowertestdir -w +create_test_files $upper/uppertestdir/subdir -w +create_test_files $lower/lowertestdir/subdir -w +mount_dirs +# Check encode/decode/read of lower/upper file handles after rename of testdir +test_file_handles $SCRATCH_MNT/uppertestdir -p -o $tmp.upper_file_handles +test_file_handles $SCRATCH_MNT/lowertestdir -p -o $tmp.lower_file_handles +# Check encode/decode/read of lower/upper file handles after rename of testdir's parent +test_file_handles $SCRATCH_MNT/uppertestdir/subdir -p -o $tmp.upper_subdir_file_handles +test_file_handles $SCRATCH_MNT/lowertestdir/subdir -p -o $tmp.lower_subdir_file_handles +# Rename pure upper dir +mv $SCRATCH_MNT/uppertestdir $SCRATCH_MNT/uppertestdir.new/ +# Copy up lower dir, index and rename +mv $SCRATCH_MNT/lowertestdir $SCRATCH_MNT/lowertestdir.new/ +# Check open, read and readdir from stored file handles +# (testdir argument is the mount point and NOT the dir +# we are trying to open by stored file handle) +test_file_handles $SCRATCH_MNT -rp -i $tmp.upper_file_handles +test_file_handles $SCRATCH_MNT -rp -i $tmp.lower_file_handles +test_file_handles $SCRATCH_MNT -rp -i $tmp.upper_subdir_file_handles +test_file_handles $SCRATCH_MNT -rp -i $tmp.lower_subdir_file_handles +# Retry decoding lower subdir file handle when indexed testdir is in dcache +# (providing renamed testdir argument pins the indexed testdir to dcache) +test_file_handles $SCRATCH_MNT/lowertestdir.new -rp -i $tmp.lower_subdir_file_handles +unmount_dirs + +# Check encode/decode/read of lower file handles on lower layers only r/o overlay. +# For non-upper overlay mount, nfs_export requires disabling redirect_dir. +$MOUNT_PROG -t overlay $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ + -o ro,redirect_dir=nofollow,lowerdir=$middle:$lower +test_file_handles $SCRATCH_MNT/lowertestdir -rp +test_file_handles $SCRATCH_MNT/lowertestdir/subdir -rp +unmount_dirs + +# Check encode/decode/read of lower file handles on lower layers only r/o overlay +# with non-indexed redirects from top lower layer to bottom lower layer. +# Overlay lookup cannot follow the redirect from $upper/lowertestdir.new to +# $lower/lowertestdir. Instead, we mount an overlay subtree rooted at these +# directories. +$MOUNT_PROG -t overlay $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ + -o ro,redirect_dir=nofollow,lowerdir=$upper/lowertestdir.new:$lower/lowertestdir +test_file_handles $SCRATCH_MNT -r +test_file_handles $SCRATCH_MNT/subdir -rp +unmount_dirs + +status=0 +exit diff --git a/tests/overlay/053.out b/tests/overlay/053.out new file mode 100644 index 0000000..c6f9de0 --- /dev/null +++ b/tests/overlay/053.out @@ -0,0 +1,22 @@ +QA output created by 053 +test_file_handles SCRATCH_MNT/uppertestdir -o upper_file_handles +test_file_handles SCRATCH_MNT/lowertestdir -o lower_file_handles +test_file_handles SCRATCH_MNT -r -i upper_file_handles +test_file_handles SCRATCH_MNT -r -i lower_file_handles +test_file_handles SCRATCH_MNT/uppertestdir.up -o upper_file_handles +test_file_handles SCRATCH_MNT/uppertestdir.lo -o lower_file_handles +test_file_handles SCRATCH_MNT -r -i upper_file_handles +test_file_handles SCRATCH_MNT -r -i lower_file_handles +test_file_handles SCRATCH_MNT/uppertestdir -p -o upper_file_handles +test_file_handles SCRATCH_MNT/lowertestdir -p -o lower_file_handles +test_file_handles SCRATCH_MNT/uppertestdir/subdir -p -o upper_subdir_file_handles +test_file_handles SCRATCH_MNT/lowertestdir/subdir -p -o lower_subdir_file_handles +test_file_handles SCRATCH_MNT -rp -i upper_file_handles +test_file_handles SCRATCH_MNT -rp -i lower_file_handles +test_file_handles SCRATCH_MNT -rp -i upper_subdir_file_handles +test_file_handles SCRATCH_MNT -rp -i lower_subdir_file_handles +test_file_handles SCRATCH_MNT/lowertestdir.new -rp -i lower_subdir_file_handles +test_file_handles SCRATCH_MNT/lowertestdir -rp +test_file_handles SCRATCH_MNT/lowertestdir/subdir -rp +test_file_handles SCRATCH_MNT -r +test_file_handles SCRATCH_MNT/subdir -rp diff --git a/tests/overlay/group b/tests/overlay/group index 2f06a6b..060f367 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -52,3 +52,4 @@ 050 auto quick copyup hardlink exportfs 051 auto quick copyup hardlink exportfs nonsamefs 052 auto quick copyup redirect exportfs +053 auto quick copyup redirect exportfs nonsamefs