From patchwork Wed Jan 31 11:44:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10193931 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 EFB8F60383 for ; Wed, 31 Jan 2018 11:44:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C26F528666 for ; Wed, 31 Jan 2018 11:44:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B712528671; Wed, 31 Jan 2018 11:44:03 +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 002B32866D for ; Wed, 31 Jan 2018 11:44:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753298AbeAaLoC (ORCPT ); Wed, 31 Jan 2018 06:44:02 -0500 Received: from mail-wr0-f178.google.com ([209.85.128.178]:43843 "EHLO mail-wr0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753234AbeAaLn4 (ORCPT ); Wed, 31 Jan 2018 06:43:56 -0500 Received: by mail-wr0-f178.google.com with SMTP id 39so5922885wrb.10; Wed, 31 Jan 2018 03:43:55 -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=hiIEsDxR9x9/PS6oM3y4sB88UonumnJGPgK60qrZZqA=; b=gNok2gpgUNtUZ1CrsZzfd3mifNRrNp85wFwBUoywhADSdem4+M1CclPNYDEoV5jJGA uQi8NKsLa7Uzz6/yVbHFoxpfN7a71aZsquK7u28m+5CgYs89mb/i6J+0p/ImlysrjxrJ 83f38ffyr2+N1xCvKnWAeo3uYVxqqhix51ShDXNbsq/TcRt7rbxUGT0/Lw2WVMiZe1wm OvOhGOfz0WHKTuHOMwjfwNDwR62iXIfhhNnfZm8KfRW1o99cWdUjtgjITAaht/NPI/el sv4ZVCKQPYA2un/UI67uBlrK0CDelbmpjS0VGKESzyi9OkJ6A8CbPVBRyDqiPo5PSRB7 6VKQ== 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=hiIEsDxR9x9/PS6oM3y4sB88UonumnJGPgK60qrZZqA=; b=KbC2dBT5JgYHzAqDTa+R7g/YhnKeEc5s4BhiKLpz0S0yo3lLjbJarmoYj5Hkz7LG04 +WQG0Qfp85IIK08Ua/WhJQa8RVAHgz82NudoTRHfC0CcWDy7+O6eXZUo3MwjgQl7mC2Y vtgHVie7/L4u8uFsliWbSA+hH2gsZAhLXrBV8GekCYNqi+efV2dQshiMlDj6faklAPLG Xm4o9l71gD9yLEFX1Dhc+KFP79OA69lo/33HIba5Q6vkLy13ue0UGQ3u8LoTXp0R4DzO eynsV878O7RROYMfmQZWm2tOwld1rlX0T72CTNQEtYJdKFgEh9FgA5dJODbjZsUUR5TF YMuw== X-Gm-Message-State: AKwxyteBAHxoWknI6zxoDh9pow7fhbkUKXPl8mdy4XIkfIB+G9Aa/YOc /2AZp3tLPEcHqxWAlsnCYKE= X-Google-Smtp-Source: AH8x2279l2VNtIDtr69IDxUP3CbH4wKTmAWhwuxnpZ9tlwavicPe9V6l210xFmGtbDmhz8kgq6WZRQ== X-Received: by 10.223.150.14 with SMTP id b14mr15894595wra.168.1517399034569; Wed, 31 Jan 2018 03:43:54 -0800 (PST) Received: from localhost.localdomain ([141.226.172.80]) by smtp.gmail.com with ESMTPSA id e67sm34211908wmf.7.2018.01.31.03.43.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Jan 2018 03:43:54 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 1/2] overlay: test overlay file handles of lower dir with non-indexed ancestor Date: Wed, 31 Jan 2018 13:44:54 +0200 Message-Id: <1517399095-28512-2-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517399095-28512-1-git-send-email-amir73il@gmail.com> References: <1517399095-28512-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 Overlayfs with nfs_export enabled, indexes all directories on copy up. Directory index is requires for decoding lower directory file handles in case ancestors have been renamed. When enabling nfs_export on an overlay that already has non-indexed merge dirs, the possibility of non-indexed ancestor rename requires special handling when encoding lower directory file handles. - Check encode/decode/read file handles of non-indexed merge dir - Check encode/decode/read file handles of dir with non-indexed parent - Check encode/decode/read file handles of dir with non-indexed grandparent - Check decode/read of file handles after rename of non-indexed merge dir - Check decode/read of file handles after rename of non-indexed parent - Check decode/read of file handles after rename of non-indexed grandparent This test requires and enables overlayfs NFS export support and merge dir rename support (redirect_dir). NFS export support depends on and requires overlayfs index feature. Signed-off-by: Amir Goldstein --- tests/overlay/054 | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/overlay/054.out | 11 ++++ tests/overlay/group | 1 + 3 files changed, 174 insertions(+) create mode 100755 tests/overlay/054 create mode 100644 tests/overlay/054.out diff --git a/tests/overlay/054 b/tests/overlay/054 new file mode 100755 index 0000000..c788460 --- /dev/null +++ b/tests/overlay/054 @@ -0,0 +1,162 @@ +#! /bin/bash +# FS QA Test No. 054 +# +# Test encode/decode overlay file handle of dir with non-indexed ancestor +# +# Overlayfs with nfs_export enabled, indexes all directories on copy up. +# Directory index is requires for decoding lower directory file handles +# in case ancestors have been renamed. +# +# When enabling nfs_export on an overlay that already has non-indexed +# merge dirs, the possibility of non-indexed ancestor rename requires +# special handling when encoding lower directory file handles. +# +# - Check encode/decode/read file handles of non-indexed merge dir +# - Check encode/decode/read file handles of dir with non-indexed parent +# - Check encode/decode/read file handles of dir with non-indexed grandparent +# - Check decode/read of file handles after rename of non-indexed merge dir +# - Check decode/read of file handles after rename of non-indexed parent +# - Check decode/read of file handles after rename of non-indexed grandparent +# +# This test requires and enables overlayfs NFS export support and merge +# dir rename support (redirect_dir). +# NFS export support depends on and requires 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.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here + +_supported_fs overlay +_supported_os Linux +_require_scratch +_require_test_program "open_by_handle" +# We need to require all features together, because nfs_export cannot +# be enabled when index is disabled +_require_scratch_overlay_features index nfs_export redirect_dir + +# All overlay dirs are on scratch partition +lower=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER +middle=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER.2 +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() +{ + _scratch_mkfs + mkdir -p $middle +} + +# Mount an overlay on $SCRATCH_MNT with all layers on scratch partition +mount_dirs() +{ + _scratch_mount -o "index=on,nfs_export=on,redirect_dir=on" +} + +# Unmount the overlay without unmounting base fs +unmount_dirs() +{ + $UMOUNT_PROG $SCRATCH_MNT +} + +# Check encode/decode/read file handles of dir with non-indexed ancestor +create_dirs +create_test_files $lower/merged -w +create_test_files $lower/merged/dir -w +create_test_files $lower/merged/dir/subdir -w +create_test_files $lower/merged/parent/child -w +# Create non-indexed merge dir +mkdir $upper/merged +mount_dirs +# Check encode/decode/read file handles of non-indexed merge dir +# This is expected to encode an upper file handle +test_file_handles $SCRATCH_MNT/merged -p -o $tmp.merged_file_handles +# Check encode/decode/read file handles of dir with non-indexed parent +# This is expected to copy up merged/dir and encode an upper file handle +test_file_handles $SCRATCH_MNT/merged/dir -p -o $tmp.dir_file_handles +test -d $upper/merged/dir || echo "merged/dir not copied up" +# Check encode/decode/read file handles of dir with non-indexed grandparent +# This is expected to encode a lower file handle +test_file_handles $SCRATCH_MNT/merged/dir/subdir -p -o $tmp.subdir_file_handles +test -d $upper/merged/dir/subdir && echo "merged/dir/subdir unexpected copy up" +# This is expected to copy up parent and encode a lower file handle +test_file_handles $SCRATCH_MNT/merged/parent/child -p -o $tmp.child_file_handles +test -d $upper/merged/parent || echo "merged/parent not copied up" +test -d $upper/merged/parent/child && echo "merged/parent/child unexpected copy up" + +# Rename non-indexed merge dir +mv $SCRATCH_MNT/merged $SCRATCH_MNT/merged.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.merged_file_handles +test_file_handles $SCRATCH_MNT -rp -i $tmp.dir_file_handles +test_file_handles $SCRATCH_MNT -rp -i $tmp.subdir_file_handles +test_file_handles $SCRATCH_MNT -rp -i $tmp.child_file_handles +# Retry decoding lower subdir file handles when indexed ancestor is in dcache +# (providing the ancestor dir argument pins the ancestor to dcache) +test_file_handles $SCRATCH_MNT/merged.new/dir -rp -i $tmp.subdir_file_handles +test_file_handles $SCRATCH_MNT/merged.new/parent -rp -i $tmp.child_file_handles +unmount_dirs + +status=0 +exit diff --git a/tests/overlay/054.out b/tests/overlay/054.out new file mode 100644 index 0000000..dd8fddf --- /dev/null +++ b/tests/overlay/054.out @@ -0,0 +1,11 @@ +QA output created by 054 +test_file_handles SCRATCH_MNT/merged -p -o merged_file_handles +test_file_handles SCRATCH_MNT/merged/dir -p -o dir_file_handles +test_file_handles SCRATCH_MNT/merged/dir/subdir -p -o subdir_file_handles +test_file_handles SCRATCH_MNT/merged/parent/child -p -o child_file_handles +test_file_handles SCRATCH_MNT -rp -i merged_file_handles +test_file_handles SCRATCH_MNT -rp -i dir_file_handles +test_file_handles SCRATCH_MNT -rp -i subdir_file_handles +test_file_handles SCRATCH_MNT -rp -i child_file_handles +test_file_handles SCRATCH_MNT/merged.new/dir -rp -i subdir_file_handles +test_file_handles SCRATCH_MNT/merged.new/parent -rp -i child_file_handles diff --git a/tests/overlay/group b/tests/overlay/group index ec0b711..4326a27 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -54,3 +54,4 @@ 051 auto quick copyup hardlink exportfs nonsamefs 052 auto quick copyup redirect exportfs 053 auto quick copyup redirect exportfs nonsamefs +054 auto quick copyup redirect exportfs