From patchwork Fri Apr 10 01:20:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 11482665 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 15598112C for ; Fri, 10 Apr 2020 01:37:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1B8520A8B for ; Fri, 10 Apr 2020 01:37:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mykernel.net header.i=cgxu519@mykernel.net header.b="axZyRF1y" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726477AbgDJBhM (ORCPT ); Thu, 9 Apr 2020 21:37:12 -0400 Received: from sender2-of-o52.zoho.com.cn ([163.53.93.247]:21186 "EHLO sender2-of-o52.zoho.com.cn" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725987AbgDJBhL (ORCPT ); Thu, 9 Apr 2020 21:37:11 -0400 X-Greylist: delayed 908 seconds by postgrey-1.27 at vger.kernel.org; Thu, 09 Apr 2020 21:37:10 EDT ARC-Seal: i=1; a=rsa-sha256; t=1586481708; cv=none; d=zoho.com.cn; s=zohoarc; b=dGAfQxIlFykBXH2oL4JzxDbym4JQTvUQycqeNJaKGO3g7x5GejR+tr1L59OINct+WwoqeqLe10UXEZ3Y4Lk84VNwpjvNoyVap2JqpByPVMQ0Ry8uoF8RQZHAVSbmCkDU+gaJ1s5Ljc/uS++cPyI5mLXSgzYqXZBbpEwS8L3D8Aw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com.cn; s=zohoarc; t=1586481708; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=JTACoukFeV8GJSGPxB3UNCum4AgaukuTvb8ICxNxzGw=; b=CgF/7DM2kgCaRGa57N7LtRLIvpN/J7YzeRcGJrKIEHFsM34zWSBDwyRrnscZNpHPfOtI9r8Hx0Re/wd/YbGO3MAgNpwNO2y3O/vfXS05EIUDc9jhUS93G55mIl+bFri69cA5SUZVQWd8bHuTfDWi2LanfG0NY0wkT806o0byNeI= ARC-Authentication-Results: i=1; mx.zoho.com.cn; dkim=pass header.i=mykernel.net; spf=pass smtp.mailfrom=cgxu519@mykernel.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1586481708; s=zohomail; d=mykernel.net; i=cgxu519@mykernel.net; h=From:To:Cc:Message-ID:Subject:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type; bh=JTACoukFeV8GJSGPxB3UNCum4AgaukuTvb8ICxNxzGw=; b=axZyRF1yJCFmif3Q089m7WiXcNaRDzOPe0a5p7J3XBNiO9NY0pI/FVjtXrZJjavZ kbLNbaMn41+iVkap8HB0/fMpUMRNV8twNxZymp3Uy0Xk8fsXyGtGlEKdTMC8Ytx6O5j OH58P567y/Rexa16JR2GWYjg2UY+WaGFPoMbRZos= Received: from localhost.localdomain (218.18.229.179 [218.18.229.179]) by mx.zoho.com.cn with SMTPS id 1586481706402339.1360331165083; Fri, 10 Apr 2020 09:21:46 +0800 (CST) From: Chengguang Xu To: guaneryu@gmail.com Cc: fstests@vger.kernel.org, linux-unionfs@vger.kernel.org, miklos@szeredi.hu, amir73il@gmail.com, Chengguang Xu Message-ID: <20200410012059.27210-2-cgxu519@mykernel.net> Subject: [PATCH 2/2] overlay/072: test for sharing inode with whiteout files Date: Fri, 10 Apr 2020 09:20:59 +0800 X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200410012059.27210-1-cgxu519@mykernel.net> References: <20200410012059.27210-1-cgxu519@mykernel.net> MIME-Version: 1.0 X-ZohoCNMailClient: External Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org This is a test for whiteout inode sharing feature. Signed-off-by: Chengguang Xu --- Hi Eryu, Kernel patch of this feature is still in review but I hope to merge test case first, so that we can check the correctness in a convenient way. The test case will carefully check new module param and skip the test if the param does not exist. tests/overlay/072 | 148 ++++++++++++++++++++++++++++++++++++++++++ tests/overlay/072.out | 2 + tests/overlay/group | 1 + 3 files changed, 151 insertions(+) create mode 100755 tests/overlay/072 create mode 100644 tests/overlay/072.out diff --git a/tests/overlay/072 b/tests/overlay/072 new file mode 100755 index 00000000..1cff386d --- /dev/null +++ b/tests/overlay/072 @@ -0,0 +1,148 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2020 Chengguang Xu . +# All Rights Reserved. +# +# FS QA Test 072 +# +# This is a test for inode sharing with whiteout files. +# +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 + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here +_supported_fs overlay +_supported_os Linux +_require_test +_require_scratch + +param_name="whiteout_link_max" +check_whiteout_link_max() +{ + local param_value=`_get_fs_module_param ${param_name}` + if [ -z ${param_value} ]; then + _notrun "${FSTYP} module param ${param_name} does not exist" + fi +} + +lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER +upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER +merged=$OVL_BASE_SCRATCH_MNT/$OVL_MNT + +#Make some files in lowerdir. +make_lower_files() +{ + seq 1 $file_count | while read line; do + `touch $lowerdir/test${line} 1>&2 2>/dev/null` + done +} + +#Delete all copy-uped files in upperdir. +make_whiteout_files() +{ + rm -f $merged/* 1>&2 2>/dev/null +} + +#Check link count of whiteout files. +check_whiteout_files() +{ + seq 1 $file_count | while read line; do + local real_count=`stat -c %h $upperdir/test${line} 2>/dev/null` + if [[ $link_count != $real_count ]]; then + echo "Expected whiteout link count is $link_count but real count is $real_count" + fi + done +} + +check_whiteout_link_max + +# Case1: +# Setting whiteout_link_max=0 will not share inode +# with whiteout files, it means each whiteout file +# will has it's own inode. + +file_count=10 +link_max=0 +link_count=1 +_scratch_mkfs +_set_fs_module_param $param_name $link_max +make_lower_files +_scratch_mount +make_whiteout_files +check_whiteout_files +$UMOUNT_PROG $OVL_BASE_SCRATCH_MNT/$OVL_MNT + +# Case2: +# Setting whiteout_link_max=1 will not share inode +# with whiteout files, it means each whiteout file +# will has it's own inode. + +file_count=10 +link_max=1 +link_count=1 +_scratch_mkfs +_set_fs_module_param $param_name $link_max +make_lower_files +_scratch_mount +make_whiteout_files +check_whiteout_files $link_count +$UMOUNT_PROG $OVL_BASE_SCRATCH_MNT/$OVL_MNT + +# Case3: +# Setting whiteout_link_max=2 will not share inode +# with whiteout files, it means each whiteout file +# will has it's own inode. However, the inode will +# be shared with tmpfile(in workdir) which is used +# for creating whiteout file. + +file_count=10 +link_max=2 +link_count=2 +_scratch_mkfs +_set_fs_module_param $param_name $link_max +make_lower_files +_scratch_mount +make_whiteout_files +check_whiteout_files +$UMOUNT_PROG $OVL_BASE_SCRATCH_MNT/$OVL_MNT + +# Case4: +# Setting whiteout_link_max=10 will share inode +# with 9 whiteout files and meanwhile the inode +# will also share with tmpfile(in workdir) which +# is used for creating whiteout file. + +file_count=18 +link_max=10 +link_count=10 +_scratch_mkfs +_set_fs_module_param $param_name $link_max +make_lower_files +_scratch_mount +make_whiteout_files +check_whiteout_files +$UMOUNT_PROG $OVL_BASE_SCRATCH_MNT/$OVL_MNT + +# success, all done +echo "Silence is golden" +status=0 +exit diff --git a/tests/overlay/072.out b/tests/overlay/072.out new file mode 100644 index 00000000..590bbc6c --- /dev/null +++ b/tests/overlay/072.out @@ -0,0 +1,2 @@ +QA output created by 072 +Silence is golden diff --git a/tests/overlay/group b/tests/overlay/group index 43ad8a52..8b2276f1 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -74,3 +74,4 @@ 069 auto quick copyup hardlink exportfs nested nonsamefs 070 auto quick copyup redirect nested 071 auto quick copyup redirect nested nonsamefs +072 auto quick whiteout