Date: Tue, 5 Oct 2010 09:19:59 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r213449 - projects/stress2/misc Message-ID: <201010050919.o959Jxl1048141@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Tue Oct 5 09:19:59 2010 New Revision: 213449 URL: http://svn.freebsd.org/changeset/base/213449 Log: Added new SUJ test scenarios. Added: projects/stress2/misc/suj2.sh (contents, props changed) projects/stress2/misc/suj3.sh (contents, props changed) projects/stress2/misc/suj4.sh (contents, props changed) projects/stress2/misc/suj5.sh (contents, props changed) Added: projects/stress2/misc/suj2.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/misc/suj2.sh Tue Oct 5 09:19:59 2010 (r213449) @@ -0,0 +1,81 @@ +#!/bin/sh + +# +# Copyright (c) 2010 Peter Holm <pho@FreeBSD.org> +# 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: projects/stress2/misc/rename4.sh 199143 2009-11-10 16:51:15Z pho $ +# + +# Page fault on SUJ enabled FS +# Fix: http://docs.freebsd.org/cgi/mid.cgi?20100823211257.GI2396 + +# Tets scenario by Mateusz Guzik mjguzik gmail com + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg + +odir=`pwd` + +cd /tmp +sed '1,/^EOF/d' < $odir/$0 > rename5.c +cc -o rename5 -Wall -Wextra -O2 rename5.c +rm -f rename5.c + +mount | grep "$mntpoint" | grep -q /dev/md && umount -f $mntpoint +mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart +mdconfig -a -t swap -s 1g -u $mdstart +bsdlabel -w md$mdstart auto +newfs -U md${mdstart}$part > /dev/null +tunefs -j enable /dev/md${mdstart}$part +mount /dev/md${mdstart}$part $mntpoint +cd $mntpoint + +rm -rf foo bar + +/tmp/rename5 + +cd / +while mount | grep "$mntpoint" | grep -q /dev/md; do + umount $mntpoint || sleep 1 +done +mdconfig -d -u $mdstart +rm -rf foo bar /tmp/rename5 +exit +EOF +#include <sys/stat.h> +#include <stdio.h> + +int +main(void) +{ + + mkdir("foo", 00700); + mkdir("bar", 00700); + + rename("foo", "bar"); + + return (0); +} Added: projects/stress2/misc/suj3.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/misc/suj3.sh Tue Oct 5 09:19:59 2010 (r213449) @@ -0,0 +1,57 @@ +#!/bin/sh + +# +# Copyright (c) 2010 Peter Holm <pho@FreeBSD.org> +# 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: projects/stress2/misc/suj.sh 210724 2010-08-01 10:33:03Z pho $ +# + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +# Sectorsize != 512 test + +. ../default.cfg + +mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint +mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart +mdconfig -a -t swap -s 1g -u $mdstart +bsdlabel -w md$mdstart auto +newfs -U -S 1024 md${mdstart}$part > /dev/null +tunefs -j enable /dev/md${mdstart}$part +mount /dev/md${mdstart}$part $mntpoint +chmod 777 $mntpoint + +export RUNDIR=$mntpoint/stressX +export runRUNTIME=20m +set `df -ik /mnt | tail -1 | awk '{print $4,$7}'` +export KBLOCKS=$(($1 / 2)) +export INODES=$(($2 / 2)) + +su $testuser -c "cd ..; ./run.sh rw.cfg" + +while mount | grep $mntpoint | grep -q /dev/md; do + umount $mntpoint || sleep 1 +done +mdconfig -d -u $mdstart Added: projects/stress2/misc/suj4.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/misc/suj4.sh Tue Oct 5 09:19:59 2010 (r213449) @@ -0,0 +1,59 @@ +#!/bin/sh + +# +# Copyright (c) 2010 Peter Holm <pho@FreeBSD.org> +# 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: projects/stress2/misc/suj.sh 210724 2010-08-01 10:33:03Z pho $ +# + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +# "panic: worklist_remove: 0xca821840 jnewblk(0x109) not on list" seen + +. ../default.cfg + +mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint +mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart +mdconfig -a -t swap -s 1g -u $mdstart +bsdlabel -w md$mdstart auto +newfs -U md${mdstart}$part > /dev/null +tunefs -j enable /dev/md${mdstart}$part +mount /dev/md${mdstart}$part $mntpoint +chmod 777 $mntpoint + +export RUNDIR=$mntpoint/stressX +export runRUNTIME=1h +set `df -ik /mnt | tail -1 | awk '{print $4,$7}'` +export KBLOCKS=$(($1 / 2)) +export INODES=$(($2 / 2)) +export rwINCARNATIONS=10 +export rwHOG=1 + +su $testuser -c "cd ..; ./run.sh rw.cfg" + +while mount | grep $mntpoint | grep -q /dev/md; do + umount $mntpoint || sleep 1 +done +mdconfig -d -u $mdstart Added: projects/stress2/misc/suj5.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/misc/suj5.sh Tue Oct 5 09:19:59 2010 (r213449) @@ -0,0 +1,186 @@ +#!/bin/sh + +# +# Copyright (c) 2010 Peter Holm <pho@FreeBSD.org> +# 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: projects/stress2/misc/suj.sh 210724 2010-08-01 10:33:03Z pho $ +# + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +# Deadlock seen + +. ../default.cfg + +here=`pwd` +cd /tmp +sed '1,/^EOF/d' < $here/$0 > suj5.c +cc -o suj5 -Wall -O2 suj5.c +rm -f suj5.c +cd $here + +mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint +mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart +mdconfig -a -t swap -s 1g -u $mdstart +bsdlabel -w md$mdstart auto +newfs -U md${mdstart}$part > /dev/null +tunefs -j enable /dev/md${mdstart}$part +mount /dev/md${mdstart}$part $mntpoint +chmod 777 $mntpoint + +su $testuser -c "cd $mntpoint; /tmp/suj5" + +while mount | grep $mntpoint | grep -q /dev/md; do + umount $mntpoint || sleep 1 +done +mdconfig -d -u $mdstart +rm -f /tmp/suj5 +exit +EOF +#include <err.h> +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <sys/mount.h> +#include <sys/param.h> +#include <sys/stat.h> +#include <unistd.h> +#include <sys/wait.h> + +#define PARALLEL 10 + +static int +random_int(int mi, int ma) +{ + return (arc4random() % (ma - mi + 1) + mi); +} + +static int64_t +df(void) +{ + char path[MAXPATHLEN+1]; + struct statfs buf; + + if (getcwd(path, sizeof(path)) == NULL) + err(1, "getcwd()"); + + if (statfs(path, &buf) < 0) + err(1, "statfs(%s)", path); + printf("Free space on %s: %jd Mb\n", path, buf.f_bavail * buf.f_bsize / 1024 / 1024); + return (buf.f_bavail * buf.f_bsize); +} + +static void +test(int size) +{ + int buf[1024], index, to; +#ifdef TEST + int i; +#endif + int fd; + char file[128]; + + + sprintf(file,"p%05d", getpid()); + if ((fd = creat(file, 0660)) == -1) + err(1, "creat(%s)", file); + + to = sizeof(buf); + index = 0; + while (index < size) { + if (index + to > size) + to = size - index; +#ifdef TEST + for (i = 0; i < to; i++) + buf[i] = index + i; +#endif + index += to; + if (write(fd, buf, to) != to) + err(1, "write(%s), %s:%d", file, __FILE__, __LINE__); + } + if (close(fd) == -1) + err(1, "close(%s), %s:%d", file, __FILE__, __LINE__); + + if ((fd = open(file, O_RDONLY)) == -1) + err(1, "open(%s), %s:%d", file, __FILE__, __LINE__); + + index = 0; + while (index < size) { + if (index + to > size) + to = size - index; + if (read(fd, buf, to) != to) + err(1, "rw read. %s.%d", __FILE__, __LINE__); +#ifdef TEST + for (i = 0; i < to; i++) { + if (buf[i] != index + i) { + fprintf(stderr, + "%s, pid %d: expected %d @ %d, got %d\n", + getprogname(), getpid(), index+i, index+i, + buf[i]); + exit(EXIT_FAILURE); + } + } +#endif + index += to; + } + if (close(fd) == -1) + err(1, "close(%s), %s:%d", file, __FILE__, __LINE__); + if (unlink(file) == -1) + err(1, "unlink(%s), %s:%d", file, __FILE__, __LINE__); + exit(0); +} + +int +main() +{ + int i, j, pct; + int size; /* in k */ + int64_t bl; + + bl = df(); + if (bl > (int64_t)INT_MAX * PARALLEL) + bl = (int64_t)INT_MAX * PARALLEL; + size = bl / PARALLEL / 1024; + + pct = random_int(1, 50); + size = size / 100 * pct + 1; + if (random_int(1, 100) <= 50) + size = 34 * 1024; /* Known good deadlock value */ + printf("Max file size: %d Mb\n", size / 1024); + + for (i = 0; i < 100; i++) { + for (j = 0; j < PARALLEL; j++) { + if (fork() == 0) { + arc4random_stir(); + test(random_int(1, size) * 1024); + } + } + for (j = 0; j < PARALLEL; j++) + wait(NULL); + } + + + return (0); +}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010050919.o959Jxl1048141>