From patchwork Tue Jan 23 20:59:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10181053 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 A53366019D for ; Tue, 23 Jan 2018 20:58:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97030287C9 for ; Tue, 23 Jan 2018 20:58:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B1A8287ED; Tue, 23 Jan 2018 20:58:24 +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 B94E1287C9 for ; Tue, 23 Jan 2018 20:58:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752670AbeAWU6X (ORCPT ); Tue, 23 Jan 2018 15:58:23 -0500 Received: from mail-wr0-f175.google.com ([209.85.128.175]:36659 "EHLO mail-wr0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752656AbeAWU6W (ORCPT ); Tue, 23 Jan 2018 15:58:22 -0500 Received: by mail-wr0-f175.google.com with SMTP id d9so2045331wre.3; Tue, 23 Jan 2018 12:58:21 -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=ycSS0LjR9W1Fc9/CgvTZ6d9MIZPFIt7QyHZ7DpIwp7w=; b=Igsvy72woHSp2TOgEnCHaoGJHjYVBKAH/SLSH21uuMKpLKAkYdku+qOFJ2pq1IJU7s dohrYZJZWoXjpPAD3YsaJxL0lRIrNVh6IH+9f4+8ffXzufKncmW8OGvosrA5Fj0f86gk BS4XvRSMSQMHYeGny7YduOrBt9ehVVCtr2PtdMtrKq/sR7hQzCrUpLu7bd/fEgkiUmhB /SAxIEZ8oIXb0xJrJa/FT+/jAXHbe6+f04fTsW/SIQqHslS0h9JfhkGL4DfhmPeSdwGz tdTSoQjnhyDg0MUoUzLUkZth7NSXUkiVvTP5FgRoEzFxv4RQ5ESWpNXIuahkkRwmDG35 4q2A== 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=ycSS0LjR9W1Fc9/CgvTZ6d9MIZPFIt7QyHZ7DpIwp7w=; b=mKAHyD83LGo9i3wbfNsYmZ3/q5PmtV4F6e4ABaLlCWk3dRU4MyuQvZVyRnuvPPWySV guCuDPNleE0RDKMbddoao7TKrtO/an06TkZMCdvuCc1z2OjFkM/as02UZkLmFs05RSQf kCA+byiP1hWUptKcgsymEyzmpNET30q1Dr043KGAlTK8OLiq9p2ksbSdDUyOiD3HvtaM LwXfyDfcF0yzHeK8Iay1/RpOGRTLhqvirLLYT4xQEJbjfP0W+ZLsIwfFdlbpAHCP/Tky xPFMNo/yWLPdK2xO9LBbQ/XSbIx3ta6YxtPDL9+3oUgxsX9wISoVSgWpXpWj4VCJExcI SkFg== X-Gm-Message-State: AKwxytfHQMOy8Zvi11SQTXa/ZQbMRmWM4C3BbuYyB3MT/zrQHsm1vT4G 81U6CJqfwXE5tUP2coVoUOE= X-Google-Smtp-Source: AH8x2272FbUnB9go1Ry4+oVx5UpqyhVSDZCFp2CHGAk0jJZHgUPFqN7EqeW1jh2fsPpLQctSRmcrjw== X-Received: by 10.223.152.150 with SMTP id w22mr3197497wrb.74.1516741100577; Tue, 23 Jan 2018 12:58:20 -0800 (PST) Received: from localhost.localdomain ([141.226.181.178]) by smtp.gmail.com with ESMTPSA id k125sm30308195wmd.48.2018.01.23.12.58.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Jan 2018 12:58:19 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v2 5/7] overlay: test encode/decode of non-samefs overlay file handles Date: Tue, 23 Jan 2018 22:59:10 +0200 Message-Id: <1516741152-20345-6-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 test for an overlayfs that is composed of multiple lower layers not on the same underlying fs. Signed-off-by: Amir Goldstein --- tests/overlay/051 | 254 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/overlay/051.out | 31 ++++++ tests/overlay/group | 1 + 3 files changed, 286 insertions(+) create mode 100755 tests/overlay/051 create mode 100644 tests/overlay/051.out diff --git a/tests/overlay/051 b/tests/overlay/051 new file mode 100755 index 0000000..2be9857 --- /dev/null +++ b/tests/overlay/051 @@ -0,0 +1,254 @@ +#! /bin/bash +# FS QA Test No. 051 +# +# Test encode/decode overlay file handles for non-samefs. +# +# This is a variant of overlay file handles test for an overlayfs that is +# composed of multiple lower layers not on the same underlying fs. +# +# - Check encode/write/decode/read content of lower/upper file handles +# - Check encode/decode/write/read content of lower/upper file handles +# - Check decode/read of unlinked lower/upper files and directories +# - Check decode/read of lower file handles after copy up, link and unlink +# +# This test requires and enables overlayfs NFS export support. +# 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 + +# 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 + + mkdir -p $dir + $here/src/open_by_handle -cp $dir $NUMFILES +} + +# Create hard links to test files +link_test_files() +{ + local dir=$1 + + $here/src/open_by_handle -l $dir $NUMFILES +} + +# Test encode/decode file handles on overlay mount +test_file_handles() +{ + local dir=$1 + local opt=$2 + + echo test_file_handles $dir $opt | _filter_scratch + $here/src/open_by_handle $opt $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 files and verify +# that handle encoded before copy up is decoded to upper after +# copy up. Verify reading data from file open by file handle +# and verify access_at() with dirfd open by file handle. +create_dirs +create_test_files $upper/uppertestdir +create_test_files $lower/lowertestdir +mount_dirs +# Check encode/decode of upper regular file handles +test_file_handles $SCRATCH_MNT/uppertestdir +# Check encode/decode of upper dir file handle +test_file_handles $SCRATCH_MNT/uppertestdir -p +# Check encode/write/decode/read/write of upper file handles +test_file_handles $SCRATCH_MNT/uppertestdir -wrap +# Check encode/decode of lower regular file handles before copy up +test_file_handles $SCRATCH_MNT/lowertestdir +# Check encode/decode of lower dir file handles before copy up +test_file_handles $SCRATCH_MNT/lowertestdir -p +# Check encode/write/decode/read/write of lower file handles across copy up +test_file_handles $SCRATCH_MNT/lowertestdir -wrap +unmount_dirs + +# Check copy up after encode/decode of lower/upper files +# (copy up of disconnected dentry to index dir) +create_dirs +create_test_files $upper/uppertestdir +create_test_files $lower/lowertestdir +mount_dirs +# Check encode/decode/write/read of upper regular file handles +test_file_handles $SCRATCH_MNT/uppertestdir -a +test_file_handles $SCRATCH_MNT/uppertestdir -r +# Check encode/decode/write/read of lower regular file handles +test_file_handles $SCRATCH_MNT/lowertestdir -a +test_file_handles $SCRATCH_MNT/lowertestdir -r +unmount_dirs + +# Check non-stale handles to unlinked but open lower/upper files +create_dirs +create_test_files $upper/uppertestdir +create_test_files $upper/uppertestdir.rw +create_test_files $lower/lowertestdir +create_test_files $lower/lowertestdir.rw +mount_dirs +test_file_handles $SCRATCH_MNT/uppertestdir -dk +# Check encode/write/unlink/decode/read of upper regular file handles +test_file_handles $SCRATCH_MNT/uppertestdir.rw -rwdk +test_file_handles $SCRATCH_MNT/lowertestdir -dk +# Check encode/write/unlink/decode/read of lower file handles across copy up +test_file_handles $SCRATCH_MNT/lowertestdir.rw -rwdk +unmount_dirs + +# Check stale handles of unlinked lower/upper files (nlink = 1,0) +create_dirs +create_test_files $upper/uppertestdir +create_test_files $lower/lowertestdir +mount_dirs +# Check decode of upper file handles after unlink/rmdir (nlink == 0) +test_file_handles $SCRATCH_MNT/uppertestdir -dp +# Check decode of lower file handles after unlink/rmdir (nlink == 0) +test_file_handles $SCRATCH_MNT/lowertestdir -dp +unmount_dirs + +# Check non-stale file handles of linked lower/upper files (nlink = 1,2,1) +create_dirs +create_test_files $upper/uppertestdir +create_test_files $lower/lowertestdir +mount_dirs +# Check decode/read of upper file handles after link (nlink == 2) +test_file_handles $SCRATCH_MNT/uppertestdir -wlr +# Check decode/read of upper file handles after link + unlink (nlink == 1) +test_file_handles $SCRATCH_MNT/uppertestdir -ur +# Check decode/read of lower file handles after copy up + link (nlink == 2) +test_file_handles $SCRATCH_MNT/lowertestdir -wlr +# Check decode/read of lower file handles after copy up + link + unlink (nlink == 1) +test_file_handles $SCRATCH_MNT/lowertestdir -ur +unmount_dirs + +# Check non-stale file handles of linked lower/upper hardlinks (nlink = 2,1) +create_dirs +create_test_files $upper/uppertestdir +create_test_files $lower/lowertestdir +# Create lower/upper hardlinks +link_test_files $lower/lowertestdir +link_test_files $upper/uppertestdir +mount_dirs +# Check encode/decode of upper hardlink file handles (nlink == 2) +test_file_handles $SCRATCH_MNT/uppertestdir +# Check decode/read of upper hardlink file handles after unlink (nlink == 1) +test_file_handles $SCRATCH_MNT/uppertestdir -wur +# Check encode/decode of lower hardlink file handles before copy up (nlink == 2) +test_file_handles $SCRATCH_MNT/lowertestdir +# Check decode/read of lower hardlink file handles after copy up + unlink (nlink == 1) +test_file_handles $SCRATCH_MNT/lowertestdir -wur +unmount_dirs + +# Check stale file handles of unlinked lower/upper hardlinks (nlink = 2,0) +create_dirs +create_test_files $upper/uppertestdir +create_test_files $lower/lowertestdir +# Create lower/upper hardlinks +link_test_files $lower/lowertestdir +link_test_files $upper/uppertestdir +mount_dirs +# Check encode/decode of upper hardlink file handles (nlink == 2) +test_file_handles $SCRATCH_MNT/uppertestdir +# Check decode of upper hardlink file handles after 2*unlink (nlink == 0) +test_file_handles $SCRATCH_MNT/uppertestdir -d +# Check encode/decode of lower hardlink file handles before copy up (nlink == 2) +test_file_handles $SCRATCH_MNT/lowertestdir +# Check decode of lower hardlink file handles after copy up + 2*unlink (nlink == 0) +test_file_handles $SCRATCH_MNT/lowertestdir -d +unmount_dirs + +# Check non-stale file handles of lower/upper renamed files +create_dirs +create_test_files $upper/uppertestdir +create_test_files $lower/lowertestdir +mount_dirs +# Check decode/read of upper file handles after rename in same upper parent +test_file_handles $SCRATCH_MNT/uppertestdir -wmr +# Check decode/read of lower file handles after copy up + rename in same merge parent +test_file_handles $SCRATCH_MNT/lowertestdir -wmr +unmount_dirs + +status=0 +exit diff --git a/tests/overlay/051.out b/tests/overlay/051.out new file mode 100644 index 0000000..f9255de --- /dev/null +++ b/tests/overlay/051.out @@ -0,0 +1,31 @@ +QA output created by 051 +test_file_handles SCRATCH_MNT/uppertestdir +test_file_handles SCRATCH_MNT/uppertestdir -p +test_file_handles SCRATCH_MNT/uppertestdir -wrap +test_file_handles SCRATCH_MNT/lowertestdir +test_file_handles SCRATCH_MNT/lowertestdir -p +test_file_handles SCRATCH_MNT/lowertestdir -wrap +test_file_handles SCRATCH_MNT/uppertestdir -a +test_file_handles SCRATCH_MNT/uppertestdir -r +test_file_handles SCRATCH_MNT/lowertestdir -a +test_file_handles SCRATCH_MNT/lowertestdir -r +test_file_handles SCRATCH_MNT/uppertestdir -dk +test_file_handles SCRATCH_MNT/uppertestdir.rw -rwdk +test_file_handles SCRATCH_MNT/lowertestdir -dk +test_file_handles SCRATCH_MNT/lowertestdir.rw -rwdk +test_file_handles SCRATCH_MNT/uppertestdir -dp +test_file_handles SCRATCH_MNT/lowertestdir -dp +test_file_handles SCRATCH_MNT/uppertestdir -wlr +test_file_handles SCRATCH_MNT/uppertestdir -ur +test_file_handles SCRATCH_MNT/lowertestdir -wlr +test_file_handles SCRATCH_MNT/lowertestdir -ur +test_file_handles SCRATCH_MNT/uppertestdir +test_file_handles SCRATCH_MNT/uppertestdir -wur +test_file_handles SCRATCH_MNT/lowertestdir +test_file_handles SCRATCH_MNT/lowertestdir -wur +test_file_handles SCRATCH_MNT/uppertestdir +test_file_handles SCRATCH_MNT/uppertestdir -d +test_file_handles SCRATCH_MNT/lowertestdir +test_file_handles SCRATCH_MNT/lowertestdir -d +test_file_handles SCRATCH_MNT/uppertestdir -wmr +test_file_handles SCRATCH_MNT/lowertestdir -wmr diff --git a/tests/overlay/group b/tests/overlay/group index 6cb3763..380a382 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -50,3 +50,4 @@ 047 auto quick copyup hardlink 048 auto quick copyup hardlink 050 auto quick copyup hardlink exportfs +051 auto quick copyup hardlink exportfs nonsamefs