From owner-svn-src-user@freebsd.org Mon Jan 30 11:46:08 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 067DDCC6248 for ; Mon, 30 Jan 2017 11:46:08 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B0D0A13E1; Mon, 30 Jan 2017 11:46:07 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0UBk6Js037382; Mon, 30 Jan 2017 11:46:06 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0UBk6d3037381; Mon, 30 Jan 2017 11:46:06 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201701301146.v0UBk6d3037381@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 30 Jan 2017 11:46:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r312985 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2017 11:46:08 -0000 Author: pho Date: Mon Jan 30 11:46:06 2017 New Revision: 312985 URL: https://svnweb.freebsd.org/changeset/base/312985 Log: Added a regression test. PR: 216380 Sponsored by: Dell EMC Isilon Added: user/pho/stress2/misc/rename13.sh (contents, props changed) Added: user/pho/stress2/misc/rename13.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/rename13.sh Mon Jan 30 11:46:06 2017 (r312985) @@ -0,0 +1,62 @@ +#!/bin/sh + +# +# Copyright (c) 2017 Dell EMC Isilon +# 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$ +# + +# Regression test for crossmp scenario: +# Bug 216380 - mv /[dir == mountpoint] causes kernel panic +# "panic: No vop_rename(0xfffff80033049000, 0xfffffe104d1e48a8)" seen. +# Fixed by r312645. + +# Test scenario by: fnacl@protonmail.com + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg + +mount | grep -q "on $mntpoint " && umount -f $mntpoint +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart + +mdconfig -a -t swap -s 512m -u $mdstart || exit 1 +bsdlabel -w md$mdstart auto +newfs $newfs_flags md${mdstart}$part > /dev/null +mount /dev/md${mdstart}$part $mntpoint + +s=0 +to=/tmp/rename13.dir +mkdir $to +mv $mntpoint $to 2>/dev/null && s=1 + +for i in `jot 10`; do + mount | grep -q "on $mntpoint " || break + umount $mntpoint || sleep 1 +done +mount | grep -q "on $mntpoint " && { s=2; umount -f $mntpoint; } +mdconfig -d -u $mdstart +rm -rf $to +exit $s From owner-svn-src-user@freebsd.org Fri Feb 3 08:15:25 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C6F4CCDC7E for ; Fri, 3 Feb 2017 08:15:25 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 09C141D01; Fri, 3 Feb 2017 08:15:24 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v138FOvg062648; Fri, 3 Feb 2017 08:15:24 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v138FNJr062646; Fri, 3 Feb 2017 08:15:23 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201702030815.v138FNJr062646@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Fri, 3 Feb 2017 08:15:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r313140 - in user/pho/stress2: . testcases X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2017 08:15:25 -0000 Author: pho Date: Fri Feb 3 08:15:23 2017 New Revision: 313140 URL: https://svnweb.freebsd.org/changeset/base/313140 Log: Older versions of FreeBSD does not allow the use of MK_DEBUG_FILES. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/run.sh user/pho/stress2/testcases/Makefile.inc Modified: user/pho/stress2/run.sh ============================================================================== --- user/pho/stress2/run.sh Fri Feb 3 07:54:15 2017 (r313139) +++ user/pho/stress2/run.sh Fri Feb 3 08:15:23 2017 (r313140) @@ -41,9 +41,12 @@ while getopts a name; do done shift $(($OPTIND - 1)) +[ -x ./testcases/run/run ] || + { echo "Please run \"make\" first." && exit 1; } [ `basename ${stress2origin:-X}` != misc ] && echo "Note: all.sh in stress2/misc is the preferred test to run." \ 1>&2 +find ./testcases -perm -1 \( -name "*.debug" -o -name "*.full" \) -delete if [ ! -z "$aflag" ]; then . ./default.cfg export runRUNTIME=5m @@ -76,7 +79,8 @@ else [ -z "$EXCLUDETESTS" ] && EXCLUDETESTS=DuMmY [ -z "$TESTPROGS" ] && \ - TESTPROGS=`find testcases/ -perm -1 -type f | egrep -v "/run/|$EXCLUDETESTS"` + TESTPROGS=`find testcases/ -perm -1 -type f | \ + egrep -v "/run/|$EXCLUDETESTS|\.full|\.debug"` #LD_PRELOAD=/usr/local/lib/libefence.so.0 ./testcases/run/run $TESTPROGS ./testcases/run/run $TESTPROGS fi Modified: user/pho/stress2/testcases/Makefile.inc ============================================================================== --- user/pho/stress2/testcases/Makefile.inc Fri Feb 3 07:54:15 2017 (r313139) +++ user/pho/stress2/testcases/Makefile.inc Fri Feb 3 08:15:23 2017 (r313140) @@ -3,6 +3,5 @@ NO_OBJ= LDADD+= -L../../lib -lstress -lutil DPADD+= ../../lib/libstress.a -CFLAGS =-g -Wall -Wextra -O2 -I../../include -I../include +CFLAGS =-Wall -Wextra -O2 -I../../include -I../include MAN= -MK_DEBUG_FILES=no From owner-svn-src-user@freebsd.org Fri Feb 3 12:01:30 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4E76FCCC2F2 for ; Fri, 3 Feb 2017 12:01:30 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0E6BF1CA8; Fri, 3 Feb 2017 12:01:29 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v13C1T29055986; Fri, 3 Feb 2017 12:01:29 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v13C1SJ2055982; Fri, 3 Feb 2017 12:01:28 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201702031201.v13C1SJ2055982@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Fri, 3 Feb 2017 12:01:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r313147 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2017 12:01:30 -0000 Author: pho Date: Fri Feb 3 12:01:28 2017 New Revision: 313147 URL: https://svnweb.freebsd.org/changeset/base/313147 Log: Do not loop for ever on pkill. Style fix. Trim runtime. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/umountf.sh user/pho/stress2/misc/umountf2.sh user/pho/stress2/misc/umountf3.sh user/pho/stress2/misc/umountf5.sh Modified: user/pho/stress2/misc/umountf.sh ============================================================================== --- user/pho/stress2/misc/umountf.sh Fri Feb 3 11:51:06 2017 (r313146) +++ user/pho/stress2/misc/umountf.sh Fri Feb 3 12:01:28 2017 (r313147) @@ -56,7 +56,16 @@ umount -f $mntpoint mdconfig -d -u $mdstart rm -f $D +s=0 +n=0 while pkill -f "swap|mkdir|creat"; do sleep 1 + n=$((n + 1)) + if [ $n -gt 60 ]; then + pgrep "swap|mkdir|creat" + s=1 + break + fi done wait +exit $s Modified: user/pho/stress2/misc/umountf2.sh ============================================================================== --- user/pho/stress2/misc/umountf2.sh Fri Feb 3 11:51:06 2017 (r313146) +++ user/pho/stress2/misc/umountf2.sh Fri Feb 3 12:01:28 2017 (r313147) @@ -41,13 +41,13 @@ sed '1,/^EOF/d' < $0 > /tmp/fsx.c mycc -o /tmp/fsx -O2 /tmp/fsx.c || exit 1 -rm -f fsx.c +rm -f /tmp/fsx.c D=$diskimage dede $D 1m 1k || exit 1 mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount $mntpoint -mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u $mdstart +mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart bsdlabel -w md$mdstart auto @@ -59,7 +59,7 @@ for i in `jot 100`; do done sleep 30 umount -f $mntpoint & -for i in `jot 10`; do +for i in `jot 30`; do sleep 30 pgrep -q fsx || break done Modified: user/pho/stress2/misc/umountf3.sh ============================================================================== --- user/pho/stress2/misc/umountf3.sh Fri Feb 3 11:51:06 2017 (r313146) +++ user/pho/stress2/misc/umountf3.sh Fri Feb 3 12:01:28 2017 (r313147) @@ -46,13 +46,13 @@ rm -f umountf3.c cd $odir -mount | grep "$mntpoint" | grep md${mdstart} > /dev/null && umount $mntpoint -mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart} +mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount $mntpoint +mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart -mdconfig -a -t vnode -f $D -u ${mdstart} -bsdlabel -w md${mdstart} auto -newfs md${mdstart}${part} > /dev/null 2>&1 -mount /dev/md${mdstart}${part} $mntpoint +mdconfig -a -t vnode -f $D -u $mdstart +bsdlabel -w md$mdstart auto +newfs md${mdstart}$part > /dev/null 2>&1 +mount /dev/md${mdstart}$part $mntpoint export RUNDIR=$mntpoint/stressX for i in `jot 25`; do (cd /$mntpoint; /tmp/umountf3) & @@ -60,6 +60,8 @@ done sleep $((4 * 60)) echo "umount -f $mntpoint" umount -f $mntpoint +while pkill -f umountf3; do :; done +wait mdconfig -d -u $mdstart rm -f $D /tmp/umountf3 exit Modified: user/pho/stress2/misc/umountf5.sh ============================================================================== --- user/pho/stress2/misc/umountf5.sh Fri Feb 3 11:51:06 2017 (r313146) +++ user/pho/stress2/misc/umountf5.sh Fri Feb 3 12:01:28 2017 (r313147) @@ -57,8 +57,16 @@ umount -f $mntpoint mdconfig -d -u $mdstart rm -f $D +s=0 +n=0 while pkill -f "swap|mkdir|creat"; do sleep 1 + n=$((n + 1)) + if [ $n -gt 60 ]; then + pgrep "swap|mkdir|creat" + s=1 + break + fi done wait -exit 0 +exit $s From owner-svn-src-user@freebsd.org Fri Feb 3 12:13:56 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 934D7CCC778 for ; Fri, 3 Feb 2017 12:13:56 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 60B5839F; Fri, 3 Feb 2017 12:13:56 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v13CDtId062816; Fri, 3 Feb 2017 12:13:55 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v13CDt0i062815; Fri, 3 Feb 2017 12:13:55 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201702031213.v13CDt0i062815@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Fri, 3 Feb 2017 12:13:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r313149 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2017 12:13:56 -0000 Author: pho Date: Fri Feb 3 12:13:55 2017 New Revision: 313149 URL: https://svnweb.freebsd.org/changeset/base/313149 Log: Added a "fixed by" and added a style fix while here. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/full.sh Modified: user/pho/stress2/misc/full.sh ============================================================================== --- user/pho/stress2/misc/full.sh Fri Feb 3 12:03:10 2017 (r313148) +++ user/pho/stress2/misc/full.sh Fri Feb 3 12:13:55 2017 (r313149) @@ -34,6 +34,7 @@ # "panic: SACK scoreboard must not be empty" seen: # https://people.freebsd.org/~pho/stress/log/full.txt +# Fixed by r310547. . ../default.cfg @@ -49,7 +50,8 @@ export LOAD=80 export rwLOAD=80 export runRUNTIME=10m export RUNDIR=$mntpoint/stressX -export TESTPROGS=`cd ..; find testcases/ -perm -1 -type f | egrep -v "/run/|/syscall/"` +export TESTPROGS=`cd ..; find testcases/ -perm -1 -type f | \ + egrep -v "/run/|/syscall/"` su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' From owner-svn-src-user@freebsd.org Fri Feb 3 12:21:17 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E05DCCC9DD for ; Fri, 3 Feb 2017 12:21:17 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 18BFEA6C; Fri, 3 Feb 2017 12:21:17 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v13CLG7Y064072; Fri, 3 Feb 2017 12:21:16 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v13CLFMA064066; Fri, 3 Feb 2017 12:21:15 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201702031221.v13CLFMA064066@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Fri, 3 Feb 2017 12:21:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r313151 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2017 12:21:17 -0000 Author: pho Date: Fri Feb 3 12:21:15 2017 New Revision: 313151 URL: https://svnweb.freebsd.org/changeset/base/313151 Log: Changed barrier from memory size to kernel stack size. This will allow the tests to run on i386, when configured for ZFS. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/zfs.sh user/pho/stress2/misc/zfs2.sh user/pho/stress2/misc/zfs3.sh user/pho/stress2/misc/zfs4.sh user/pho/stress2/misc/zfs5.sh user/pho/stress2/misc/zfs6.sh Modified: user/pho/stress2/misc/zfs.sh ============================================================================== --- user/pho/stress2/misc/zfs.sh Fri Feb 3 12:20:44 2017 (r313150) +++ user/pho/stress2/misc/zfs.sh Fri Feb 3 12:21:15 2017 (r313151) @@ -31,11 +31,12 @@ # Simple zfs raidz test scenario [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 -[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le 3 ] && exit 0 +[ `sysctl -n kern.kstack_pages` -lt 4 ] && exit 0 . ../default.cfg -kldstat -v | grep -q zfs.ko || { kldload zfs.ko; loaded=1; } +kldstat -v | grep -q zfs.ko || { kldload zfs.ko || + exit 0; loaded=1; } u1=$mdstart u2=$((u1 + 1)) @@ -49,6 +50,7 @@ mdconfig -s 512m -u $u1 mdconfig -s 512m -u $u2 mdconfig -s 512m -u $u3 +zpool list | egrep -q "^tank" && zpool destroy tank [ -d /tank ] && rm -rf /tank zpool create tank raidz md$u1 md$u2 md$u3 zfs create tank/test @@ -64,3 +66,4 @@ mdconfig -d -u $u1 mdconfig -d -u $u2 mdconfig -d -u $u3 [ -n "$loaded" ] && kldunload zfs.ko +exit 0 Modified: user/pho/stress2/misc/zfs2.sh ============================================================================== --- user/pho/stress2/misc/zfs2.sh Fri Feb 3 12:20:44 2017 (r313150) +++ user/pho/stress2/misc/zfs2.sh Fri Feb 3 12:21:15 2017 (r313151) @@ -31,11 +31,12 @@ # Simple zfs mirror test scenario [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 -[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le 3 ] && exit 0 +[ `sysctl -n kern.kstack_pages` -lt 4 ] && exit 0 . ../default.cfg -kldstat -v | grep -q zfs.ko || { kldload zfs.ko; loaded=1; } +kldstat -v | grep -q zfs.ko || { kldload zfs.ko || + exit 0; loaded=1; } d1=${diskimage}.1 d2=${diskimage}.2 @@ -52,6 +53,7 @@ mdconfig -l | grep -q md${u2} && mdconfi mdconfig -a -t vnode -f $d1 -u $u1 mdconfig -a -t vnode -f $d2 -u $u2 +zpool list | egrep -q "^tank" && zpool destroy tank [ -d /tank ] && rm -rf /tank zpool create tank mirror md$u1 md$u2 @@ -67,3 +69,4 @@ mdconfig -d -u $u2 rm -rf $d1 $d2 [ -n "$loaded" ] && kldunload zfs.ko +exit 0 Modified: user/pho/stress2/misc/zfs3.sh ============================================================================== --- user/pho/stress2/misc/zfs3.sh Fri Feb 3 12:20:44 2017 (r313150) +++ user/pho/stress2/misc/zfs3.sh Fri Feb 3 12:21:15 2017 (r313151) @@ -32,12 +32,17 @@ # page fault from fs/zfs/dbuf.c:1807 +# Page fault seen: +# https://people.freebsd.org/~pho/stress/log/zfs3-2.txt +# Fixed in r308887. + [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 -[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le 3 ] && exit 0 +[ `sysctl -n kern.kstack_pages` -lt 4 ] && exit 0 . ../default.cfg -kldstat -v | grep -q zfs.ko || { kldload zfs.ko; loaded=1; } +kldstat -v | grep -q zfs.ko || { kldload zfs.ko || + exit 0; loaded=1; } d1=${diskimage}.1 d2=${diskimage}.2 @@ -54,6 +59,7 @@ mdconfig -l | grep -q md${u2} && mdconfi mdconfig -a -t vnode -f $d1 -u $u1 mdconfig -a -t vnode -f $d2 -u $u2 +zpool list | egrep -q "^tank" && zpool destroy tank [ -d /tank ] && rm -rf /tank zpool create tank md$u1 md$u2 zfs create tank/test @@ -75,3 +81,4 @@ mdconfig -d -u $u2 rm -rf $d1 $d2 [ -n "$loaded" ] && kldunload zfs.ko +exit 0 Modified: user/pho/stress2/misc/zfs4.sh ============================================================================== --- user/pho/stress2/misc/zfs4.sh Fri Feb 3 12:20:44 2017 (r313150) +++ user/pho/stress2/misc/zfs4.sh Fri Feb 3 12:21:15 2017 (r313151) @@ -31,11 +31,12 @@ # Simple zfs snapshot test scenario [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 -[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le 3 ] && exit 0 +[ `sysctl -n kern.kstack_pages` -lt 4 ] && exit 0 . ../default.cfg -kldstat -v | grep -q zfs.ko || { kldload zfs.ko; loaded=1; } +kldstat -v | grep -q zfs.ko || { kldload zfs.ko || + exit 0; loaded=1; } d1=${diskimage}.1 d2=${diskimage}.2 @@ -52,6 +53,7 @@ mdconfig -l | grep -q md${u2} && mdconfi mdconfig -a -t vnode -f $d1 -u $u1 mdconfig -a -t vnode -f $d2 -u $u2 +zpool list | egrep -q "^tank" && zpool destroy tank [ -d /tank ] && rm -rf /tank zpool create tank md$u1 md$u2 zfs create tank/test @@ -78,3 +80,4 @@ mdconfig -d -u $u2 rm -rf $d1 $d2 [ -n "$loaded" ] && kldunload zfs.ko +exit 0 Modified: user/pho/stress2/misc/zfs5.sh ============================================================================== --- user/pho/stress2/misc/zfs5.sh Fri Feb 3 12:20:44 2017 (r313150) +++ user/pho/stress2/misc/zfs5.sh Fri Feb 3 12:21:15 2017 (r313151) @@ -31,11 +31,12 @@ # Simple zfs test of vdev as a file and snapshot clones [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 -[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le 3 ] && exit 0 +[ `sysctl -n kern.kstack_pages` -lt 4 ] && exit 0 . ../default.cfg -kldstat -v | grep -q zfs.ko || { kldload zfs.ko; loaded=1; } +kldstat -v | grep -q zfs.ko || { kldload zfs.ko || + exit 0; loaded=1; } d1=${diskimage}.1 d2=${diskimage}.2 @@ -43,6 +44,7 @@ d2=${diskimage}.2 dd if=/dev/zero of=$d1 bs=1m count=1k 2>&1 | egrep -v "records|transferred" dd if=/dev/zero of=$d2 bs=1m count=1k 2>&1 | egrep -v "records|transferred" +zpool list | egrep -q "^tank" && zpool destroy tank [ -d /tank ] && rm -rf /tank zpool create tank $d1 $d2 zfs create tank/test Modified: user/pho/stress2/misc/zfs6.sh ============================================================================== --- user/pho/stress2/misc/zfs6.sh Fri Feb 3 12:20:44 2017 (r313150) +++ user/pho/stress2/misc/zfs6.sh Fri Feb 3 12:21:15 2017 (r313151) @@ -32,11 +32,12 @@ # https://people.freebsd.org/~pho/stress/log/zfs6.txt [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 -[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le 3 ] && exit 0 +[ `sysctl -n kern.kstack_pages` -lt 4 ] && exit 0 . ../default.cfg -kldstat -v | grep -q zfs.ko || { kldload zfs.ko; loaded=1; } +kldstat -v | grep -q zfs.ko || { kldload zfs.ko || + exit 0; loaded=1; } u1=$mdstart u2=$((u1 + 1)) @@ -50,7 +51,7 @@ mdconfig -s 512m -u $u1 mdconfig -s 512m -u $u2 mdconfig -s 512m -u $u3 -zpool list | grep -q tank && zpool destroy tank +zpool list | egrep -q "^tank" && zpool destroy tank [ -d /tank ] && rm -rf /tank zpool create tank raidz md$u1 md$u2 md$u3 || exit 1 zfs create tank/test || exit 1