From patchwork Mon Nov 13 14:45:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chandan Rajendra X-Patchwork-Id: 10056157 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 D5C7460586 for ; Mon, 13 Nov 2017 14:44:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C85D128DEE for ; Mon, 13 Nov 2017 14:44:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA5C6290CE; Mon, 13 Nov 2017 14:44:45 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 88E1A28DEE for ; Mon, 13 Nov 2017 14:44:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751705AbdKMOoo (ORCPT ); Mon, 13 Nov 2017 09:44:44 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:57108 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751303AbdKMOon (ORCPT ); Mon, 13 Nov 2017 09:44:43 -0500 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vADEiWG4114104 for ; Mon, 13 Nov 2017 09:44:43 -0500 Received: from e38.co.us.ibm.com (e38.co.us.ibm.com [32.97.110.159]) by mx0a-001b2d01.pphosted.com with ESMTP id 2e7afchdaa-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 13 Nov 2017 09:44:42 -0500 Received: from localhost by e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 13 Nov 2017 07:44:40 -0700 Received: from b03cxnp08026.gho.boulder.ibm.com (9.17.130.18) by e38.co.us.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 13 Nov 2017 07:44:37 -0700 Received: from b03ledav002.gho.boulder.ibm.com (b03ledav002.gho.boulder.ibm.com [9.17.130.233]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id vADEibwp000328; Mon, 13 Nov 2017 07:44:37 -0700 Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1230F13603C; Mon, 13 Nov 2017 07:44:37 -0700 (MST) Received: from localhost.localdomain.com (unknown [9.102.2.91]) by b03ledav002.gho.boulder.ibm.com (Postfix) with ESMTP id E20DA136046; Mon, 13 Nov 2017 07:44:34 -0700 (MST) From: Chandan Rajendra To: fstests@vger.kernel.org, amir73il@gmail.com Cc: Chandan Rajendra , linux-unionfs@vger.kernel.org, eguan@redhat.com Subject: [PATCH 2/2] overlay: Test consistent st_ino numbers for non-samefs scenario Date: Mon, 13 Nov 2017 20:15:27 +0530 X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171113144527.1034-1-chandan@linux.vnet.ibm.com> References: <20171113144527.1034-1-chandan@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17111314-0028-0000-0000-000008A461EC X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008064; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000239; SDB=6.00945292; UDB=6.00477052; IPR=6.00725589; BA=6.00005689; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017991; XFM=3.00000015; UTC=2017-11-13 14:44:39 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17111314-0029-0000-0000-000038501689 Message-Id: <20171113144527.1034-2-chandan@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-11-13_08:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1711130208 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This commit adds a test to verify consistent st_ino feature when the overlayfs instance is composed of two different underlying filesystem instances. For example, $ mount -t xfs /dev/loop0 /mnt/test $ mount -t xfs /dev/loop1 /mnt/scratch $ mkdir /mnt/scratch/upper $ mkdir /mnt/scratch/work $ mount -t overlay overlay -o lowerdir=/mnt/test \ -o upperdir=/mnt/scratch/upper \ -o workdir=/mnt/scratch/work /mnt/merge The goal of this test is to verify that overlayfs returns consistent st_ino for the following scenarios, - Copy-up of lowerdir files - Rename files and drop dentry/inode cache - Remount the overlayfs instance Signed-off-by: Chandan Rajendra --- Eryu, To pass, This test requires Amir's "Overlayfs: constant st_ino/d_ino for non-samefs" patchset. But this patch can be merged as it indicates an incorrect behaviour by overlayfs code as presently available on upstream kernel. tests/overlay/043 | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/overlay/043.out | 2 + tests/overlay/group | 1 + 3 files changed, 200 insertions(+) create mode 100755 tests/overlay/043 create mode 100644 tests/overlay/043.out diff --git a/tests/overlay/043 b/tests/overlay/043 new file mode 100755 index 0000000..2b3c1c2 --- /dev/null +++ b/tests/overlay/043 @@ -0,0 +1,197 @@ +#! /bin/bash +# FSQA Test No. 043 +# +# Test constant inode numbers on non-samefs setup +# This is a variant of overlay/017 to test constant st_ino numbers for +# non-samefs setup. +# +# This simple test demonstrates a known issue with overlayfs: +# - stat file A shows inode number X +# - modify A to trigger copy up +# - stat file A shows inode number Y != X +# +# Test if inode numbers of all file types persist after copy-up. For +# non-dirs, test if inode numbers persist after rename, drop caches +# and mount cycle. +# +# With 'xino' mount option enabled, test if d_ino of readdir entries changes +# after copy up and if inode numbers persist after rename, drop caches and +# mount cycle. +# +#----------------------------------------------------------------------- +# +# Copyright (C) 2017 IBM Corporation. All Rights Reserved. +# Author: Chandan Rajendra +# +# 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 "af_unix" +_require_test_program "t_dir_type" + +rm -f $seqres.full + +lowerdir=$OVL_BASE_TEST_DIR/$seq-ovl-lower +rm -rf $lowerdir +mkdir $lowerdir + +# Create our test files. +mkdir $lowerdir/dir +touch $lowerdir/file +ln -s $lowerdir/file $lowerdir/symlink +mknod $lowerdir/chrdev c 1 1 +mknod $lowerdir/blkdev b 1 1 +mknod $lowerdir/fifo p +$here/src/af_unix $lowerdir/socket +touch $lowerdir/hardlink1 +ln $lowerdir/hardlink1 $lowerdir/hardlink2 + +_scratch_mkfs >>$seqres.full 2>&1 + +upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER +workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK + +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir + +FILES="dir file symlink chrdev blkdev fifo socket hardlink1 hardlink2" + +# Record inode numbers in format +function record_inode_numbers() +{ + local dir=$1 + local outfile=$2 + + for f in $FILES; do + ls -id $dir/$f + done | \ + while read ino file; do + echo $ino `basename $file` `stat -c '%F' $file` >> $outfile + done +} + +# Check inode numbers match recorder inode numbers +function check_inode_numbers() +{ + local dir=$1 + local before=$2 + local after=$3 + local xino=$4 + local ignore_dir=$5 + + record_inode_numbers $dir $after + + if [[ $ignore_dir && $xino == 0 ]]; then + cat $before | $AWK_PROG ' + /directory/ { + sub(/^[[:digit:]]+/, "XXXX", $0) + print + next + } + { + print + next + }' > $tmp.mod_before + cat $after | $AWK_PROG ' + /directory/ { + sub(/^[[:digit:]]+/, "XXXX", $0) + print + next + } + { + print + next + }' > $tmp.mod_after + + before=$tmp.mod_before + after=$tmp.mod_after + fi + + # Test constant stat(2) st_ino - + # Compare before..after - expect silence + # We use diff -u so out.bad will tell us which stage failed + diff -u $before $after + + [[ $xino == 0 ]] && return + + # Test constant readdir(3)/getdents(2) d_ino - + # Expect to find file by inode number + cat $before | while read ino f ftype; do + $here/src/t_dir_type $dir $ino | grep -q $f || \ + echo "$f not found by ino $ino (from $before)" + done +} + +rm -f $tmp.* +testdir=$SCRATCH_MNT/test +mkdir -p $testdir + +xino=0 +echo $MOUNT_OPTIONS | grep -q xino +[[ $? == 0 ]] && xino=1 + +# Record inode numbers before copy up +record_inode_numbers $SCRATCH_MNT $tmp.before + +for f in $FILES; do + # chown -h modifies all those file types + chown -h 100 $SCRATCH_MNT/$f +done + +# Compare inode numbers before/after copy up +check_inode_numbers $SCRATCH_MNT $tmp.before $tmp.after_copyup $xino 0 + +for f in $FILES; do + # move to another dir + mv $SCRATCH_MNT/$f $testdir/ +done + +echo 3 > /proc/sys/vm/drop_caches + +# Compare inode numbers before/after rename and drop caches +check_inode_numbers $testdir $tmp.after_copyup $tmp.after_move $xino 1 + +# Verify that the inode numbers survive a mount cycle +$UMOUNT_PROG $SCRATCH_MNT +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir + +# Compare inode numbers before/after mount cycle +check_inode_numbers $testdir $tmp.after_move $tmp.after_cycle $xino 1 + +echo "Silence is golden" +status=0 +exit diff --git a/tests/overlay/043.out b/tests/overlay/043.out new file mode 100644 index 0000000..f90f0a5 --- /dev/null +++ b/tests/overlay/043.out @@ -0,0 +1,2 @@ +QA output created by 043 +Silence is golden diff --git a/tests/overlay/group b/tests/overlay/group index 782c39f..a99ff07 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -45,3 +45,4 @@ 040 auto quick 041 auto quick copyup nonsamefs 042 auto quick copyup hardlink +043 auto quick copyup nonsamefs