Index: user/pho/stress2/misc/nullfs10.sh =================================================================== --- user/pho/stress2/misc/nullfs10.sh (revision 317547) +++ user/pho/stress2/misc/nullfs10.sh (revision 317548) @@ -1,72 +1,73 @@ #!/bin/sh # # Copyright (c) 2012 Peter Holm # 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. # # $FreeBSD$ # [ `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. # Test scenario by kib@ . ../default.cfg -mnt2=/mnt2 +mnt2=${mntpoint}2 mount | grep -q $mnt2 && umount $mnt2 [ -d $mnt2 ] || mkdir $mnt2 mount | grep $mnt2 | grep -q /dev/md && umount -f $mnt2 mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint mount -t nullfs $mntpoint $mnt2 cp /bin/ls $mntpoint chmod +w $mntpoint/ls sleep 2 >> $mntpoint/ls & sleep .5 # This line should cause a "/mnt2/ls: Text file busy" $mnt2/ls -l /bin/ls $mntpoint $mnt2 && echo FAIL || echo OK kill $! +wait while mount | grep -q "$mnt2 "; do umount $mnt2 || sleep 1 done while mount | grep -q "$mntpoint "; do umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart Index: user/pho/stress2/misc/nullfs11.sh =================================================================== --- user/pho/stress2/misc/nullfs11.sh (revision 317547) +++ user/pho/stress2/misc/nullfs11.sh (revision 317548) @@ -1,97 +1,97 @@ #!/bin/sh # # Copyright (c) 2013 Peter Holm # 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. # # $FreeBSD$ # # nullfs cache / nocache benchmark [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 if [ -r ../default.cfg ]; then . ../default.cfg else mntpoint=/mnt mdstart=5 part=a fi export LANG=C CACHE=nullfs11-cache.log NOCACHE=nullfs11-nocache.log -mp1=/mnt -mp2=/mnt2 +mp1=$mntpoint +mp2=${mntpoint}2 [ -d $mp2 ] || mkdir $mp2 rm -f $CACHE $NOCACHE mycc -o /tmp/fstool ../tools/fstool.c test() { opt=$1 mount | grep -wq $mp2 && umount $mp2 mount | grep -wq $mp1 && umount $mp1 mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart || exit 1 bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}${part} > /dev/null mount /dev/md${mdstart}$part $mp1 mount -t nullfs $opt $mp1 $mp2 i=1 (mkdir $mp2/test$i; cd $mp2/test$i; /tmp/fstool -l -f 50 -n 500 -s 4k) rm -rf $mp2/test$i sync sleep 5 parallel=4 for j in `jot 5`; do s=`date '+%s'` for i in `jot $parallel`; do (mkdir $mp2/test$i; cd $mp2/test$i; \ /tmp/fstool -l -f 50 -n 500 -s $((i * 4))k) & done for i in `jot $parallel`; do wait done rm -rf $mp2/* echo $((`date '+%s'` - $s)) done while mount | grep -wq $mp2; do umount $mp2 || sleep 1 done while mount | grep $mp1 | grep -q /dev/md; do umount $mp1 || sleep 1 done mdconfig -d -u $mdstart } test "-o nocache" > $NOCACHE test "-o cache" > $CACHE ministat -s -w 60 $NOCACHE $CACHE rm -f /tmp/fstool $CACHE $NOCACHE Index: user/pho/stress2/misc/nullfs9.sh =================================================================== --- user/pho/stress2/misc/nullfs9.sh (revision 317547) +++ user/pho/stress2/misc/nullfs9.sh (revision 317548) @@ -1,84 +1,84 @@ #!/bin/sh # # Copyright (c) 2012 Peter Holm # 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. # # $FreeBSD$ # [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 # nullfs + tmpfs regression test: # ETXTBSY problem of executable # Fails with "./nullfs9.sh: cannot create /mnt2/mp/true: Text file busy" . ../default.cfg -mnt2=/mnt2 +mnt2=${mntpoint}2 mount | grep -q $mnt2/mp && umount $mnt2/mp [ -d $mnt2 ] || mkdir $mnt2 mount | grep $mnt2 | grep -q /dev/md && umount -f $mnt2 mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mnt2 chmod 777 $mnt2 mount | grep $mntpoint | grep -q tmpfs && umount -f $mntpoint mount -t tmpfs tmpfs $mntpoint chmod 777 $mntpoint mkdir $mnt2/mp mount -t nullfs $mntpoint $mnt2/mp # OK cp /usr/bin/true $mnt2/mp/true $mntpoint/true if ! > $mntpoint/true ; then echo FAIL 1 mount | egrep "tmpfs|nullfs|$mntpoint |$mnt2 " fi rm -f $mntpoint/true # Fails cp /usr/bin/true $mnt2/mp/true $mnt2/mp/true if ! > $mnt2/mp/true; then echo FAIL 2 mount | egrep "tmpfs|nullfs|$mntpoint |$mnt2 " fi rm -f $mnt2/mp/true umount $mnt2/mp while mount | grep -q "$mnt2 "; do umount $mnt2 || sleep 1 done mdconfig -d -u $mdstart while mount | grep -q "$mntpoint "; do umount $mntpoint || sleep 1 done