From patchwork Tue Jul 4 11:40:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9824647 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 3699160237 for ; Tue, 4 Jul 2017 11:40:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26BC82811E for ; Tue, 4 Jul 2017 11:40:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B6F3283B4; Tue, 4 Jul 2017 11:40:34 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 7D5602811E for ; Tue, 4 Jul 2017 11:40:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752067AbdGDLkd (ORCPT ); Tue, 4 Jul 2017 07:40:33 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:32783 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752040AbdGDLkc (ORCPT ); Tue, 4 Jul 2017 07:40:32 -0400 Received: by mail-wr0-f196.google.com with SMTP id x23so47115856wrb.0; Tue, 04 Jul 2017 04:40:31 -0700 (PDT) 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=lS1QYF2OfH3lW2SbMaDSHbpkW+B2sAFQ4GANrY3VBMc=; b=OkkxXVaM09Walt3ZW9KkXK0tgr6qnilsxXzTjEYS0jxvqv/gUXuHJO3peCAdAJ8CEB bnIVELBi2t18b6pgolfUrqkj+eF5YLgVByV7IKxNGVggofOm638xkvhXDRdhCOkbuwRK OwESvWSsjRyR8sfHUhyD2bMAv+1MwUcOASRh5rjHFcIGDxeh+yUNCIWWz430dJr+LsW4 x+Z7Qgjz4otepV6+5cLcTmO7KXhEc2N3yyiwP8sYdeD79a4lzL3XjbYZhc7EMxUj85ea OVW8zeHS943Aj21ng7ZVPgWCnqjINxY2yAp9KI7pMkNULqEfKYt9MRoT5ItfuB4k9tmz 6AEQ== 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=lS1QYF2OfH3lW2SbMaDSHbpkW+B2sAFQ4GANrY3VBMc=; b=IMTV/TSjFo6S/0YReM1mJyj7gUlrTOIWXqX0i0OKVJ+HJ5dyLCD48i5UrV4qMJ0s0P C//TNa39AGWgyUmash3DDhL5+u7RXqb/iT3PzEx2NGut5NY5Eo0TnDilRle/lPo/wJ8F vB80+lbkyitmLJsmnt9UtnXlMBJRGkSiNIGUrNv9zu7NCpgoatfjQ6KvB/v2h5Bian3O 24ZAmN8HilVBRqNQw24K6WRPVo5cRfWwtGNaoukV3E5nUCPk0j6cWsHXp/vyqFNqF5Ni SFBtLTC8i7EK9bfgRDjueDWEkuSi8HKiPwP2HSF1AI8Oz13/vNSfYSVuMcoyOhd8TTSc +ukQ== X-Gm-Message-State: AKS2vOzy4ubOmFX+N7ssxKtE80OcJyOSx/x1NV0JmVEJFUZhX/OfMUAg syDxhktz8fVxgg== X-Received: by 10.223.163.15 with SMTP id c15mr33392220wrb.71.1499168430641; Tue, 04 Jul 2017 04:40:30 -0700 (PDT) Received: from amir-VirtualBox.ctera.local (bzq-166-168-31-246.red.bezeqint.net. [31.168.166.246]) by smtp.gmail.com with ESMTPSA id 90sm18842912wrk.38.2017.07.04.04.40.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Jul 2017 04:40:24 -0700 (PDT) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v2 6/7] overlay: test nlink accounting of overlay hardlinks Date: Tue, 4 Jul 2017 14:40:33 +0300 Message-Id: <1499168434-23859-7-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499168434-23859-1-git-send-email-amir73il@gmail.com> References: <1499168434-23859-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 nlink of overlay inode should account for the union of lower and upper hardlinks. persistent overlay union nlink is stored in an extended attribute on the upper inode. In order to test persistent overlay nlink accounting, the test is repeated with both warm and cold dentry/inode cache. Signed-off-by: Amir Goldstein --- tests/overlay/033 | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/overlay/033.out | 69 +++++++++++++++++++++++ tests/overlay/group | 1 + 3 files changed, 219 insertions(+) create mode 100755 tests/overlay/033 create mode 100644 tests/overlay/033.out diff --git a/tests/overlay/033 b/tests/overlay/033 new file mode 100755 index 0000000..743edc8 --- /dev/null +++ b/tests/overlay/033 @@ -0,0 +1,149 @@ +#! /bin/bash +# FS QA Test 033 +# +# Test nlink accounting of overlay hardlinks. +# +# nlink of overlay inode should account for the union of lower and upper +# hardlinks. +# +#----------------------------------------------------------------------- +# Copyright (C) 2017 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" + +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 + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here +_supported_fs overlay +_supported_os Linux +_require_scratch + +report_nlink() +{ + when=$1 + + [ $DCACHETEMP != cold ] || echo 2 > /proc/sys/vm/drop_caches + + # check nlink with warm dcache after overlay modification + echo "== $when - $DCACHETEMP dcache ==" + for f in $HARDLINKS; do + _ls_l $SCRATCH_MNT/$f | awk '{ print $2, $9 }' | _filter_scratch + done +} + +# Create lower hardlinks +create_hardlinks() +{ + lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER + mkdir -p $lowerdir + touch $lowerdir/0 + ln $lowerdir/0 $lowerdir/1 + ln $lowerdir/0 $lowerdir/2 + ln $lowerdir/0 $lowerdir/3 +} + +test_hardlinks() +{ + HARDLINKS=`seq 0 3` + report_nlink "all lower" + + # Unlink lower hardlink + rm $SCRATCH_MNT/0 + HARDLINKS=`seq 1 3` + report_nlink "unlink lower" + + # Link to lower hardlink + ln $SCRATCH_MNT/3 $SCRATCH_MNT/4 + HARDLINKS=`seq 1 4` + report_nlink "link lower" + + # Link to upper hardlink + ln $SCRATCH_MNT/4 $SCRATCH_MNT/5 + HARDLINKS=`seq 1 5` + report_nlink "link upper" + + # Rename over lower hardlink + touch $SCRATCH_MNT/new + mv $SCRATCH_MNT/new $SCRATCH_MNT/1 + HARDLINKS=`seq 2 5` + report_nlink "cover lower" + + # Unlink upper hardlink + rm $SCRATCH_MNT/5 + HARDLINKS=`seq 2 4` + report_nlink "unlink upper" + + # Rename over upper hardlink + touch $SCRATCH_MNT/new + mv $SCRATCH_MNT/new $SCRATCH_MNT/4 + HARDLINKS=`seq 2 3` + report_nlink "cover upper" + + # Unlink last upper (union still has one lower) + rm $SCRATCH_MNT/3 + HARDLINKS=2 + report_nlink "unlink last upper" + + # Unlink last lower and drop union nlink to zero (and hopefully not below) + rm $SCRATCH_MNT/2 + + # Verify that orphan index is cleaned when dropping nlink to zero + ls $OVL_BASE_SCRATCH_MNT/$OVL_WORK/index 2>/dev/null +} + +# Remove all files from previous tests +_scratch_mkfs + +# Create lower hardlinks +create_hardlinks + +_scratch_mount +# Test hardlinks with warm dcache +DCACHETEMP=warm +test_hardlinks + +# Reset to lower hardlinks +_scratch_unmount +_scratch_mkfs +create_hardlinks +_scratch_mount + +# Test hardlinks with cold dcache +DCACHETEMP=cold +test_hardlinks + +status=0 +exit diff --git a/tests/overlay/033.out b/tests/overlay/033.out new file mode 100644 index 0000000..506ccc1 --- /dev/null +++ b/tests/overlay/033.out @@ -0,0 +1,69 @@ +QA output created by 033 +== all lower - warm dcache == +4 SCRATCH_MNT/0 +4 SCRATCH_MNT/1 +4 SCRATCH_MNT/2 +4 SCRATCH_MNT/3 +== unlink lower - warm dcache == +3 SCRATCH_MNT/1 +3 SCRATCH_MNT/2 +3 SCRATCH_MNT/3 +== link lower - warm dcache == +4 SCRATCH_MNT/1 +4 SCRATCH_MNT/2 +4 SCRATCH_MNT/3 +4 SCRATCH_MNT/4 +== link upper - warm dcache == +5 SCRATCH_MNT/1 +5 SCRATCH_MNT/2 +5 SCRATCH_MNT/3 +5 SCRATCH_MNT/4 +5 SCRATCH_MNT/5 +== cover lower - warm dcache == +4 SCRATCH_MNT/2 +4 SCRATCH_MNT/3 +4 SCRATCH_MNT/4 +4 SCRATCH_MNT/5 +== unlink upper - warm dcache == +3 SCRATCH_MNT/2 +3 SCRATCH_MNT/3 +3 SCRATCH_MNT/4 +== cover upper - warm dcache == +2 SCRATCH_MNT/2 +2 SCRATCH_MNT/3 +== unlink last upper - warm dcache == +1 SCRATCH_MNT/2 +== all lower - cold dcache == +4 SCRATCH_MNT/0 +4 SCRATCH_MNT/1 +4 SCRATCH_MNT/2 +4 SCRATCH_MNT/3 +== unlink lower - cold dcache == +3 SCRATCH_MNT/1 +3 SCRATCH_MNT/2 +3 SCRATCH_MNT/3 +== link lower - cold dcache == +4 SCRATCH_MNT/1 +4 SCRATCH_MNT/2 +4 SCRATCH_MNT/3 +4 SCRATCH_MNT/4 +== link upper - cold dcache == +5 SCRATCH_MNT/1 +5 SCRATCH_MNT/2 +5 SCRATCH_MNT/3 +5 SCRATCH_MNT/4 +5 SCRATCH_MNT/5 +== cover lower - cold dcache == +4 SCRATCH_MNT/2 +4 SCRATCH_MNT/3 +4 SCRATCH_MNT/4 +4 SCRATCH_MNT/5 +== unlink upper - cold dcache == +3 SCRATCH_MNT/2 +3 SCRATCH_MNT/3 +3 SCRATCH_MNT/4 +== cover upper - cold dcache == +2 SCRATCH_MNT/2 +2 SCRATCH_MNT/3 +== unlink last upper - cold dcache == +1 SCRATCH_MNT/2 diff --git a/tests/overlay/group b/tests/overlay/group index 2baba3a..35cd5a5 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -35,3 +35,4 @@ 030 auto quick perms 031 auto quick whiteout 032 auto quick copyup hardlink +033 auto quick copyup hardlink