From patchwork Wed Jan 31 11:44:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10193933 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 925DA60383 for ; Wed, 31 Jan 2018 11:44:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6268D28666 for ; Wed, 31 Jan 2018 11:44:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 56F572866D; Wed, 31 Jan 2018 11:44:04 +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 9F0382866F for ; Wed, 31 Jan 2018 11:44:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753297AbeAaLoB (ORCPT ); Wed, 31 Jan 2018 06:44:01 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:40060 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753236AbeAaLn5 (ORCPT ); Wed, 31 Jan 2018 06:43:57 -0500 Received: by mail-wm0-f45.google.com with SMTP id v123so7370278wmd.5; Wed, 31 Jan 2018 03:43:56 -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=LGk3Q9SXU+daNBoVO0JZKUhkmL+9+sIcRCMFdGxMGek=; b=Qdz0xXNXZh/LMPE8Sh8gO9oszX9DxVGZJhAiMhe1EiXwrUg3Vt0GU8jptLIemauD+k 2ugKuCd3JCxlSmiyucyfYvNOUYdD1nVWLuBXW8d/u1XLN3BYwcBN9cbeWt2npi1ngYMI NbIF3HSDL2IuMg0lsB+d5AXnZX+xwa4Vpq5M9vz3P5ZnjXjluCarbqj/WkuGCthq+H0l DqdXtpQWNyD9sN4Ss+Nq6Abhc5/5AsyLvK0DGAL9YDioq4ku18kM2gZfJH8HutQhRudX lUqfOYzi4M0EXBpeewHYuxyWofEVle8IFIUjqGgWJ4r9l6/HEQVdhCS6cPORMWD91GAY JvUg== 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=LGk3Q9SXU+daNBoVO0JZKUhkmL+9+sIcRCMFdGxMGek=; b=eWmDtgKjjjFjtaNla6lkXoQ69fbe2qHctTdRTSZyiV6SIHgD4FQ1wuo1RJQLbKq6+h ozTBEHA92NKEtiXjoAX1/pBAJryB+PD4m4Wz6hQclyUNFkKfsHw2/Mc0sn2vq59rcFQ5 pSZSoaCrPaDR5XinN+sXN3xlOU2KO1WAVrS93BXxoJPq+oOaVWlKcevCDGXxPA+Qo/Lz eiovqWuqBhICxthulyGPtZ2Tax07z/taZoFvCvse1qjIhcMPD5qwOf6WZTLRwpAZhE64 MB4xONAcRuDKVK6jNamsTCZI6tYn9Vf9BxhKwK61S/1fgkzG/K9WqprEIFVjijbdfkOS HsEQ== X-Gm-Message-State: AKwxytc0GqvB4KmvVNXK0CIbjDqrQkLwjPJnDT0s0S34ZMO7xAxKSCMj P7FlsnFROmXOOf8s/q0NG4sZJw== X-Google-Smtp-Source: AH8x227aXCUcG1xrdB6p+/MY2QJ2fOv9tC3QDiWwen8A9+ahdCVU2japHL+F7BmRqGwAY4rUtDY3OQ== X-Received: by 10.28.234.200 with SMTP id g69mr21803440wmi.137.1517399035810; Wed, 31 Jan 2018 03:43:55 -0800 (PST) Received: from localhost.localdomain ([141.226.172.80]) by smtp.gmail.com with ESMTPSA id e67sm34211908wmf.7.2018.01.31.03.43.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Jan 2018 03:43:55 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 2/2] overlay: test overlay file handle of dir with ancestor under lower redirect Date: Wed, 31 Jan 2018 13:44:55 +0200 Message-Id: <1517399095-28512-3-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 has merge dirs with lower layer redirects, the possibility of ancestor rename requires special handling when encoding lower directory file handles from layer > 1. - Check decode of lower dir with parent under lower redirect - Check decode of lower dir with grandparent under lower redirect - Check decode of lower dir after rename of lower redirected parent - Check decode of lower dir after rename of lower redirected 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/055 | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/overlay/055.out | 10 +++ tests/overlay/group | 1 + 3 files changed, 181 insertions(+) create mode 100755 tests/overlay/055 create mode 100644 tests/overlay/055.out diff --git a/tests/overlay/055 b/tests/overlay/055 new file mode 100755 index 0000000..70fe6ac --- /dev/null +++ b/tests/overlay/055 @@ -0,0 +1,170 @@ +#! /bin/bash +# FS QA Test No. 055 +# +# Test overlay file handle of dir with ancestor under lower redirect +# +# 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 has merge dirs with lower +# layer redirects, the possibility of ancestor rename requires special +# handling when encoding lower directory file handles from layer > 1. +# +# - Check decode of lower dir with parent under lower redirect +# - Check decode of lower dir with grandparent under lower redirect +# - Check decode of lower dir after rename of lower redirected parent +# - Check decode of lower dir after rename of lower redirected 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.* + # 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" +# 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 + +# 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_scratch_mount_dirs $middle:$lower $upper $work \ + -o "index=on,nfs_export=on,redirect_dir=on" +} + +# Unmount the overlay without unmounting base fs +unmount_dirs() +{ + $UMOUNT_PROG $SCRATCH_MNT +} + +# Check file handles of dir with ancestor under lower redirect +create_dirs +create_test_files $lower/origin -w +create_test_files $lower/origin/dir -w +create_test_files $lower/origin/dir/subdir -w +create_test_files $lower/origin/parent/child -w +# Create lower redirected merge dir +mkdir $middle/merged +setfattr -n "trusted.overlay.redirect" -v "origin" $middle/merged +mount_dirs +# Check encode/decode/read of lower dir with parent under lower redirect +# 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 of lower dir with grandparent under lower redirect +# 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 lower redirected 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.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.dir_file_handles +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/055.out b/tests/overlay/055.out new file mode 100644 index 0000000..59acd29 --- /dev/null +++ b/tests/overlay/055.out @@ -0,0 +1,10 @@ +QA output created by 055 +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 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 dir_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 4326a27..40c1a05 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -55,3 +55,4 @@ 052 auto quick copyup redirect exportfs 053 auto quick copyup redirect exportfs nonsamefs 054 auto quick copyup redirect exportfs +055 auto quick copyup redirect exportfs nonsamefs