From nobody Wed Jan 12 02:36:58 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id DD4A81950F9E; Wed, 12 Jan 2022 02:36:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JYWt22l6zz4Zm3; Wed, 12 Jan 2022 02:36:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 34F3324E98; Wed, 12 Jan 2022 02:36:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20C2awj7095994; Wed, 12 Jan 2022 02:36:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20C2awg3095993; Wed, 12 Jan 2022 02:36:58 GMT (envelope-from git) Date: Wed, 12 Jan 2022 02:36:58 GMT Message-Id: <202201120236.20C2awg3095993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: a565cc81c04e - main - unionfs: add stress2 scenarios for write references List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a565cc81c04e94330115a742ee86378a91f9ee4c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641955018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7nGuqflj7a43OUBdBjI47EwEjzb3NbEA6sw47wgU4NA=; b=gpRFOIiqGgDnqtCow7+svZ/qqeBInA1S2x2Nx7TwOrZKNhY+/oLJ6SmOQO9G/6cepZXz+p XUnn4yb43EAUVeByY4nIanvBRz1/7l7UeL4PJKTajEle9j0P9cSWR4J+MO9dt1UPyLfHej U0Plpqn/wmB9fHRMuffPTnj4C9DbimcWoU/qMY9lDZm9IP4SX6sWJRGVTysVPCvryI+Y82 rD7U5wxsSFvnwJIJSxNYb+9lq5m1Db1hjxoY+OrBhDWpcR2pTGT5D47hNqBStP5nvQfs0l 8NK1f7XsAi+jiHjpLoBlUAwILqLDkFn30Dut9y4x+Q4Ynab6bDXzrqc72muyOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641955018; a=rsa-sha256; cv=none; b=RjsTBwr81tXcCVxUx2ZVZGzpolCW/c6KAWMDcBmCLzS9ROnRHHZ0IyfFfSKRiHCrv8Lo/O 5BhitZieTxr7lxu19SMSfDvNRtFyimnADTpOkueY0KIdZJd1nje3LGcOq70nzRM+PDt/Rw sLliLcghLiTdBfj2vP308GeHmF9OxjfHPFLgvfQrgetP+7XSVsHULCbGr2raloi7TFcpqG Y7ZW27ty+NwaLLJO9X0RqwIsIW6st4EUw7i2Q/WwPDxNWUg5Jb30XvcXncNZ91sisbpewx p8pp2kLfCjnPdmpsdPRmeBwWDqAtB+LcS4rgfv/Bdb+ITTYxw+/E0P1oFVoWsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=a565cc81c04e94330115a742ee86378a91f9ee4c commit a565cc81c04e94330115a742ee86378a91f9ee4c Author: Jason A. Harmening AuthorDate: 2022-01-03 15:00:55 +0000 Commit: Jason A. Harmening CommitDate: 2022-01-12 02:44:03 +0000 unionfs: add stress2 scenarios for write references Add some test cases, based on the existing nullfs10 scenario, to ensure that unionfs write references are propagated between the unionfs and underlying vnodes, including unionfs copy-on-write operations Reviewed by: kib (prior version), markj, pho Differential Revision: https://reviews.freebsd.org/D33729 --- tools/test/stress2/misc/unionfs10.sh | 87 +++++++++++++++++++++++++++++++++++ tools/test/stress2/misc/unionfs11.sh | 87 +++++++++++++++++++++++++++++++++++ tools/test/stress2/misc/unionfs12.sh | 88 ++++++++++++++++++++++++++++++++++++ 3 files changed, 262 insertions(+) diff --git a/tools/test/stress2/misc/unionfs10.sh b/tools/test/stress2/misc/unionfs10.sh new file mode 100755 index 000000000000..866de62d9ff0 --- /dev/null +++ b/tools/test/stress2/misc/unionfs10.sh @@ -0,0 +1,87 @@ +#!/bin/sh + +# +# Copyright (c) 2022 Jason Harmening +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +# Regression test: + +# There is an issue, namely, when the lower file is already +# opened r/w, but its nullfs alias is executed. This situation obviously +# shall result in ETXTBUSY, but it currently does not. + +# Based on nullfs10.sh by pho@, original test scenario by kib@ + +. ../default.cfg + +md1=$mdstart +md2=$((md1 + 1)) +mp1=/mnt$md1 +mp2=/mnt$md2 +mkdir -p $mp1 $mp2 +set -e +for i in $mp1 $mp2; do + mount | grep -q "on $i " && umount -f $i +done +for i in $md1 $md2; do + mdconfig -l | grep -q md$i && mdconfig -d -u $i +done + +mdconfig -a -t swap -s 4g -u $md1 +mdconfig -a -t swap -s 4g -u $md2 +newfs $newfs_flags -n md$md1 > /dev/null +newfs $newfs_flags -n md$md2 > /dev/null +mount /dev/md$md1 $mp1 +mount /dev/md$md2 $mp2 + +mount -t unionfs -o noatime $mp1 $mp2 +set +e + +mount | grep -E "$mp1|$mp2" + +chmod 777 $mp1 +chmod 777 $mp2 + +cp /bin/ls $mp1 +chmod +w $mp1/ls +sleep 2 >> $mp1/ls & +sleep .5 + +# This line should cause a "$mp2/ls: Text file busy" error +$mp2/ls -l /bin/ls $mp1 $mp2 && echo FAIL || echo OK +kill $! +wait + +while mount | grep -q "$mp2 "; do + umount $mp2 || sleep 1 +done + +while mount | grep -q "$mp1 "; do + umount $mp1 || sleep 1 +done +mdconfig -d -u $md2 +mdconfig -d -u $md1 diff --git a/tools/test/stress2/misc/unionfs11.sh b/tools/test/stress2/misc/unionfs11.sh new file mode 100755 index 000000000000..b86be896d8f5 --- /dev/null +++ b/tools/test/stress2/misc/unionfs11.sh @@ -0,0 +1,87 @@ +#!/bin/sh + +# +# Copyright (c) 2022 Jason Harmening +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +# Regression test: + +# There is an issue, namely, when the lower file is already +# opened r/w, but its nullfs alias is executed. This situation obviously +# shall result in ETXTBUSY, but it currently does not. + +# Based on nullfs10.sh by pho@, original test scenario by kib@ + +. ../default.cfg + +md1=$mdstart +md2=$((md1 + 1)) +mp1=/mnt$md1 +mp2=/mnt$md2 +mkdir -p $mp1 $mp2 +set -e +for i in $mp1 $mp2; do + mount | grep -q "on $i " && umount -f $i +done +for i in $md1 $md2; do + mdconfig -l | grep -q md$i && mdconfig -d -u $i +done + +mdconfig -a -t swap -s 4g -u $md1 +mdconfig -a -t swap -s 4g -u $md2 +newfs $newfs_flags -n md$md1 > /dev/null +newfs $newfs_flags -n md$md2 > /dev/null +mount /dev/md$md1 $mp1 +mount /dev/md$md2 $mp2 + +mount -t unionfs -o noatime $mp1 $mp2 +set +e + +mount | grep -E "$mp1|$mp2" + +chmod 777 $mp1 +chmod 777 $mp2 + +cp /bin/ls $mp2 +chmod +w $mp2/ls +sleep 2 >> $mp2/ls & +sleep .5 + +# This line should cause a "$mp1/ls: Text file busy" error +$mp1/ls -l /bin/ls $mp1 $mp2 && echo FAIL || echo OK +kill $! +wait + +while mount | grep -q "$mp2 "; do + umount $mp2 || sleep 1 +done + +while mount | grep -q "$mp1 "; do + umount $mp1 || sleep 1 +done +mdconfig -d -u $md2 +mdconfig -d -u $md1 diff --git a/tools/test/stress2/misc/unionfs12.sh b/tools/test/stress2/misc/unionfs12.sh new file mode 100755 index 000000000000..62d1b494cda9 --- /dev/null +++ b/tools/test/stress2/misc/unionfs12.sh @@ -0,0 +1,88 @@ +#!/bin/sh + +# +# Copyright (c) 2022 Jason Harmening +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +# Regression test: + +# There is an issue, namely, when the lower file is already +# opened r/w, but its nullfs alias is executed. This situation obviously +# shall result in ETXTBUSY, but it currently does not. + +# Based on nullfs10.sh by pho@, original test scenario by kib@ + +. ../default.cfg + +md1=$mdstart +md2=$((md1 + 1)) +mp1=/mnt$md1 +mp2=/mnt$md2 +mkdir -p $mp1 $mp2 +set -e +for i in $mp1 $mp2; do + mount | grep -q "on $i " && umount -f $i +done +for i in $md1 $md2; do + mdconfig -l | grep -q md$i && mdconfig -d -u $i +done + +mdconfig -a -t swap -s 4g -u $md1 +mdconfig -a -t swap -s 4g -u $md2 +newfs $newfs_flags -n md$md1 > /dev/null +newfs $newfs_flags -n md$md2 > /dev/null +mount /dev/md$md1 $mp1 +mount /dev/md$md2 $mp2 + +mkdir $mp2/shadow +cp /bin/ls $mp2/shadow/ +mount -t unionfs -o noatime $mp1 $mp2 +set +e + +mount | grep -E "$mp1|$mp2" + +chmod 777 $mp1 +chmod 777 $mp2 + +chmod +w $mp2/shadow/ls +sleep 2 >> $mp2/shadow/ls & +sleep .5 + +# This line should cause a "$mp1/shadow/ls: Text file busy" error +$mp1/shadow/ls -l /bin/ls $mp1 $mp2 && echo FAIL || echo OK +kill $! +wait + +while mount | grep -q "$mp2 "; do + umount $mp2 || sleep 1 +done + +while mount | grep -q "$mp1 "; do + umount $mp1 || sleep 1 +done +mdconfig -d -u $md2 +mdconfig -d -u $md1