From owner-svn-src-user@freebsd.org Mon May 29 08:37:28 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 BAEEDCF442D for ; Mon, 29 May 2017 08:37:28 +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 7C1DF70697; Mon, 29 May 2017 08:37:28 +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 v4T8bRqM083094; Mon, 29 May 2017 08:37:27 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4T8bRYF083093; Mon, 29 May 2017 08:37:27 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705290837.v4T8bRYF083093@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 08:37:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319103 - 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, 29 May 2017 08:37:28 -0000 Author: pho Date: Mon May 29 08:37:27 2017 New Revision: 319103 URL: https://svnweb.freebsd.org/changeset/base/319103 Log: Cleanup after test. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/maxvnodes.sh Modified: user/pho/stress2/misc/maxvnodes.sh ============================================================================== --- user/pho/stress2/misc/maxvnodes.sh Mon May 29 07:57:01 2017 (r319102) +++ user/pho/stress2/misc/maxvnodes.sh Mon May 29 08:37:27 2017 (r319103) @@ -34,6 +34,7 @@ . ../default.cfg +kldstat | grep -q tmpfs.ko || notloaded=1 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint mount -o size=2g -t tmpfs tmpfs $mntpoint || exit 1 chmod 777 $mntpoint @@ -64,3 +65,5 @@ wait while mount | grep $mntpoint | grep -q tmpfs; do umount $mntpoint || sleep 1 done +[ $notloaded ] && kldunload tmpfs.ko +exit 0 From owner-svn-src-user@freebsd.org Mon May 29 08:41:27 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 4B111CF4589 for ; Mon, 29 May 2017 08:41:27 +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 1C5A370875; Mon, 29 May 2017 08:41:27 +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 v4T8fQ9U086168; Mon, 29 May 2017 08:41:26 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4T8fQx5086167; Mon, 29 May 2017 08:41:26 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705290841.v4T8fQx5086167@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 08:41:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319104 - 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, 29 May 2017 08:41:27 -0000 Author: pho Date: Mon May 29 08:41:25 2017 New Revision: 319104 URL: https://svnweb.freebsd.org/changeset/base/319104 Log: Ignore any build errors in this stress test. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/buildworld.sh Modified: user/pho/stress2/misc/buildworld.sh ============================================================================== --- user/pho/stress2/misc/buildworld.sh Mon May 29 08:37:27 2017 (r319103) +++ user/pho/stress2/misc/buildworld.sh Mon May 29 08:41:25 2017 (r319104) @@ -59,7 +59,7 @@ mkdir $TMPDIR chmod 0777 $TMPDIR p=$((`sysctl -n hw.ncpu`+ 1)) -make -j $p buildworld DESTDIR=$mntpoint TARGET=amd64 TARGET_ARCH=amd64 \ +make -i -j $p buildworld DESTDIR=$mntpoint TARGET=amd64 TARGET_ARCH=amd64 \ > /dev/null & sleep $((20 * 60)) kill $! @@ -69,3 +69,4 @@ while mount | grep -q "on $mntpoint "; d umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart +exit 0 From owner-svn-src-user@freebsd.org Mon May 29 08:43:16 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 5B27CCF4707 for ; Mon, 29 May 2017 08:43:16 +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 2C5BB70B2E; Mon, 29 May 2017 08:43:16 +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 v4T8hFbI087157; Mon, 29 May 2017 08:43:15 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4T8hFNp087156; Mon, 29 May 2017 08:43:15 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705290843.v4T8hFNp087156@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 08:43:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319105 - 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, 29 May 2017 08:43:16 -0000 Author: pho Date: Mon May 29 08:43:15 2017 New Revision: 319105 URL: https://svnweb.freebsd.org/changeset/base/319105 Log: Only enable SUJ if the default FS is SU. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/mkfifo.sh Modified: user/pho/stress2/misc/mkfifo.sh ============================================================================== --- user/pho/stress2/misc/mkfifo.sh Mon May 29 08:41:25 2017 (r319104) +++ user/pho/stress2/misc/mkfifo.sh Mon May 29 08:43:15 2017 (r319105) @@ -45,7 +45,8 @@ mdconfig -l | grep -q md$mdstart && mdc mdconfig -a -t swap -s 2g -u $mdstart || exit 1 bsdlabel -w md$mdstart auto -newfs -j md${mdstart}$part > /dev/null +[ "$newfs_flags" = "-U" ] && opt="-j" +newfs $opt md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint @@ -82,3 +83,4 @@ while mount | grep $mntpoint | grep -q / umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart +exit 0 From owner-svn-src-user@freebsd.org Mon May 29 08:47:37 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 D82BDCF4A52 for ; Mon, 29 May 2017 08:47:37 +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 A7F3370EE5; Mon, 29 May 2017 08:47:37 +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 v4T8lab6088766; Mon, 29 May 2017 08:47:36 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4T8laXN088764; Mon, 29 May 2017 08:47:36 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705290847.v4T8laXN088764@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 08:47:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319106 - 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, 29 May 2017 08:47:37 -0000 Author: pho Date: Mon May 29 08:47:36 2017 New Revision: 319106 URL: https://svnweb.freebsd.org/changeset/base/319106 Log: Use a larger disk for tests. Added cleanup after test run. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/cmp.sh Modified: user/pho/stress2/misc/cmp.sh ============================================================================== --- user/pho/stress2/misc/cmp.sh Mon May 29 08:43:15 2017 (r319105) +++ user/pho/stress2/misc/cmp.sh Mon May 29 08:47:36 2017 (r319106) @@ -46,7 +46,7 @@ rm -f cmp.c mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart -mdconfig -a -t swap -s 1g -u $mdstart || exit 1 +mdconfig -a -t swap -s 2g -u $mdstart || exit 1 bsdlabel -w md$mdstart auto # Don't use SU due to bogus "out of inodes" messages. newfs md${mdstart}$part > /dev/null @@ -70,6 +70,7 @@ while mount | grep $mntpoint | grep -q / umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart +[ -d "$mntpoint" ] && (cd $mntpoint && find . -delete) # tmpfs mount -t tmpfs tmpfs $mntpoint @@ -92,6 +93,7 @@ done > /dev/null 2>&1 while mount | grep $mntpoint | grep -q tmpfs; do umount $mntpoint || sleep 1 done +[ -d "$mntpoint" ] && (cd $mntpoint && find . -delete) rm -f /tmp/cmp exit 0 EOF @@ -168,8 +170,10 @@ main(int argc, char **argv) { int i, j; - if (argc != 2) - errx(1, "Usage: %s ", argv[0]); + if (argc != 2) { + fprintf(stderr, "Usage: %s ", argv[0]); + exit(1); + } dir = argv[1]; for (j = 0; j < LOOPS; j++) { From owner-svn-src-user@freebsd.org Mon May 29 08:49:05 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 52F64CF4A85 for ; Mon, 29 May 2017 08:49:05 +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 9C0A97102E; Mon, 29 May 2017 08:49:04 +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 v4T8n3q2088884; Mon, 29 May 2017 08:49:03 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4T8n3OC088882; Mon, 29 May 2017 08:49:03 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705290849.v4T8n3OC088882@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 08:49:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319107 - 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, 29 May 2017 08:49:05 -0000 Author: pho Date: Mon May 29 08:49:03 2017 New Revision: 319107 URL: https://svnweb.freebsd.org/changeset/base/319107 Log: Check that the source is available. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/contigmalloc.sh user/pho/stress2/misc/contigmalloc2.sh Modified: user/pho/stress2/misc/contigmalloc.sh ============================================================================== --- user/pho/stress2/misc/contigmalloc.sh Mon May 29 08:47:36 2017 (r319106) +++ user/pho/stress2/misc/contigmalloc.sh Mon May 29 08:49:03 2017 (r319107) @@ -44,6 +44,7 @@ # Fixed by r271351. [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ -d /usr/src/sys ] || exit 0 . ../default.cfg Modified: user/pho/stress2/misc/contigmalloc2.sh ============================================================================== --- user/pho/stress2/misc/contigmalloc2.sh Mon May 29 08:47:36 2017 (r319106) +++ user/pho/stress2/misc/contigmalloc2.sh Mon May 29 08:49:03 2017 (r319107) @@ -34,6 +34,7 @@ # Fixed by r284207. [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ -d /usr/src/sys ] || exit 0 . ../default.cfg From owner-svn-src-user@freebsd.org Mon May 29 08:51: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 D0753CF4AE9 for ; Mon, 29 May 2017 08:51: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 9FF03711CD; Mon, 29 May 2017 08:51:25 +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 v4T8pOuM092005; Mon, 29 May 2017 08:51:24 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4T8pOEi092004; Mon, 29 May 2017 08:51:24 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705290851.v4T8pOEi092004@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 08:51:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319108 - 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, 29 May 2017 08:51:25 -0000 Author: pho Date: Mon May 29 08:51:24 2017 New Revision: 319108 URL: https://svnweb.freebsd.org/changeset/base/319108 Log: Do not flag a missing libmicro-bench as an error. Added cleanup. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/libMicro.sh Modified: user/pho/stress2/misc/libMicro.sh ============================================================================== --- user/pho/stress2/misc/libMicro.sh Mon May 29 08:49:03 2017 (r319107) +++ user/pho/stress2/misc/libMicro.sh Mon May 29 08:51:24 2017 (r319108) @@ -37,12 +37,13 @@ if [ $# -eq 0 ]; then [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 [ -x /usr/local/bin/libmicro-bench ] || - { echo "ports/benchmarks/libmicro is not installed"; exit 1; } + { echo "ports/benchmarks/libmicro is not installed"; exit 0; } [ `id -un` = $testuser ] && { echo "\$testuser is identical to current id"; exit 1; } rm -f /tmp/libmicro.log + trap "rm -rf /var/tmp/libmicro.[0-9]*" 0 su $testuser -c "$0 x" echo "" else @@ -50,4 +51,5 @@ else # Temp. work-around for hanging "c_lockf_10" test. sleep 60 kill 0 + wait fi From owner-svn-src-user@freebsd.org Mon May 29 08:54:22 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 9DE19CF4C85 for ; Mon, 29 May 2017 08:54:22 +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 6D11B714AC; Mon, 29 May 2017 08:54:22 +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 v4T8sLCT093115; Mon, 29 May 2017 08:54:21 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4T8sLg9093114; Mon, 29 May 2017 08:54:21 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705290854.v4T8sLg9093114@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 08:54:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319109 - 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, 29 May 2017 08:54:22 -0000 Author: pho Date: Mon May 29 08:54:21 2017 New Revision: 319109 URL: https://svnweb.freebsd.org/changeset/base/319109 Log: Only show dd output on failure. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/md5.sh Modified: user/pho/stress2/misc/md5.sh ============================================================================== --- user/pho/stress2/misc/md5.sh Mon May 29 08:51:24 2017 (r319108) +++ user/pho/stress2/misc/md5.sh Mon May 29 08:54:21 2017 (r319109) @@ -39,12 +39,13 @@ . ../default.cfg +log=/tmp/md5.log dd if=/dev/zero of=$diskimage bs=1k count=5k 2>&1 | egrep -v "records|transferred" -mdconfig -f $diskimage -u md$mdstart +mdconfig -f $diskimage -u md$mdstart || exit 1 newfs $newfs_flags /dev/md$mdstart > /dev/null -( - dd if=/dev/md$mdstart of=/dev/null 2>&1 || echo FAIL -) | egrep -v "records|transferred" +dd if=/dev/md$mdstart of=/dev/null > $log 2>&1 && s=0 || s=1 +[ $s -eq 1 ] && cat $log mdconfig -d -u $mdstart -rm -f $diskimage +rm -f $diskimage $log +exit $s From owner-svn-src-user@freebsd.org Mon May 29 08:57:51 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 9188DCF4D2D for ; Mon, 29 May 2017 08:57:51 +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 62DD3715B4; Mon, 29 May 2017 08:57:51 +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 v4T8voGT093317; Mon, 29 May 2017 08:57:50 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4T8votD093316; Mon, 29 May 2017 08:57:50 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705290857.v4T8votD093316@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 08:57:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319110 - 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, 29 May 2017 08:57:51 -0000 Author: pho Date: Mon May 29 08:57:50 2017 New Revision: 319110 URL: https://svnweb.freebsd.org/changeset/base/319110 Log: Fix error return status. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/mkfifo3.sh Modified: user/pho/stress2/misc/mkfifo3.sh ============================================================================== --- user/pho/stress2/misc/mkfifo3.sh Mon May 29 08:54:21 2017 (r319109) +++ user/pho/stress2/misc/mkfifo3.sh Mon May 29 08:57:50 2017 (r319110) @@ -56,9 +56,10 @@ for i in `jot 12`; do pgrep -q mkfifo3 || break sleep 10 done +s=0 if pgrep -q mkfifo3; then - echo FAIL - ps -l | grep -v grep | grep mkfifo3 + s=1 + pgrep mkfifo3 | xargs ps -lp pkill mkfifo3 fi wait From owner-svn-src-user@freebsd.org Mon May 29 09:01:00 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 213E1CF60E0 for ; Mon, 29 May 2017 09:01:00 +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 E328171842; Mon, 29 May 2017 09:00:59 +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 v4T90w2H093550; Mon, 29 May 2017 09:00:58 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4T90wKV093548; Mon, 29 May 2017 09:00:58 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705290900.v4T90wKV093548@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 09:00:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319111 - 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, 29 May 2017 09:01:00 -0000 Author: pho Date: Mon May 29 09:00:58 2017 New Revision: 319111 URL: https://svnweb.freebsd.org/changeset/base/319111 Log: Exclude test from regular runs as it's quite disruptive. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/audit.sh Modified: user/pho/stress2/misc/audit.sh ============================================================================== --- user/pho/stress2/misc/audit.sh Mon May 29 08:57:50 2017 (r319110) +++ user/pho/stress2/misc/audit.sh Mon May 29 09:00:58 2017 (r319111) @@ -36,7 +36,9 @@ . ../default.cfg [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ -z "$footshoot" ] && exit 0 +[ -f /usr/sbin/auditd -a -f /etc/rc.d/auditd ] || exit 0 pgrep -q auditd && exit 0 mount | grep -q /var || exit 0 @@ -54,3 +56,4 @@ service auditd onestop # Some services react badly to /var being unmounted. service -R +exit 0 From owner-svn-src-user@freebsd.org Mon May 29 09:03:14 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 AD573CF6298 for ; Mon, 29 May 2017 09:03:14 +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 776C571B5E; Mon, 29 May 2017 09:03:14 +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 v4T93DJK097176; Mon, 29 May 2017 09:03:13 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4T93DDE097175; Mon, 29 May 2017 09:03:13 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705290903.v4T93DDE097175@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 09:03:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319112 - 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, 29 May 2017 09:03:14 -0000 Author: pho Date: Mon May 29 09:03:13 2017 New Revision: 319112 URL: https://svnweb.freebsd.org/changeset/base/319112 Log: Added finding. Verify kernel stack size. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/crossmp7.sh Modified: user/pho/stress2/misc/crossmp7.sh ============================================================================== --- user/pho/stress2/misc/crossmp7.sh Mon May 29 09:00:58 2017 (r319111) +++ user/pho/stress2/misc/crossmp7.sh Mon May 29 09:03:13 2017 (r319112) @@ -30,16 +30,21 @@ # Parallel mount and umount of zfs file systems. +# Page fault seen: +# https://people.freebsd.org/~pho/stress/log/avg002.txt +# Fixed by r309090. + [ `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 mounts=15 # Number of parallel scripts if [ $# -eq 0 ]; then - kldstat -v | grep -q zfs.ko || { kldload zfs.ko; loaded=1; } - zpool list | grep -q tank && zpool destroy tank + kldstat -v | grep -q zfs.ko || { kldload zfs.ko || + exit 0; loaded=1; } + zpool list | egrep -q "^tank" && zpool destroy tank u1=$mdstart u2=$((u1 + 1)) From owner-svn-src-user@freebsd.org Mon May 29 09:04:37 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 AD539CF62DB for ; Mon, 29 May 2017 09:04:37 +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 7BF5B71C41; Mon, 29 May 2017 09:04:37 +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 v4T94aWX097288; Mon, 29 May 2017 09:04:36 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4T94aGY097287; Mon, 29 May 2017 09:04:36 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705290904.v4T94aGY097287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 09:04:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319113 - 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, 29 May 2017 09:04:37 -0000 Author: pho Date: Mon May 29 09:04:36 2017 New Revision: 319113 URL: https://svnweb.freebsd.org/changeset/base/319113 Log: Added finding. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/md2.sh Modified: user/pho/stress2/misc/md2.sh ============================================================================== --- user/pho/stress2/misc/md2.sh Mon May 29 09:03:13 2017 (r319112) +++ user/pho/stress2/misc/md2.sh Mon May 29 09:04:36 2017 (r319113) @@ -30,6 +30,9 @@ # panic: ufs_dirbad: /mnt: bad dir ino 32899 at offset 16896: mangled entry +# "panic: ffs_read: type 0" seen: +# https://people.freebsd.org/~pho/stress/log/kostik969.txt + [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg From owner-svn-src-user@freebsd.org Mon May 29 09:08:04 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 58D2ECF6328 for ; Mon, 29 May 2017 09:08:04 +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 2502571D62; Mon, 29 May 2017 09:08:04 +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 v4T983KV097485; Mon, 29 May 2017 09:08:03 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4T983Kc097484; Mon, 29 May 2017 09:08:03 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705290908.v4T983Kc097484@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 09:08:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319114 - 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, 29 May 2017 09:08:04 -0000 Author: pho Date: Mon May 29 09:08:02 2017 New Revision: 319114 URL: https://svnweb.freebsd.org/changeset/base/319114 Log: Use a larger disk for tests. Cleanup script and code while here. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/fifo2.sh Modified: user/pho/stress2/misc/fifo2.sh ============================================================================== --- user/pho/stress2/misc/fifo2.sh Mon May 29 09:04:36 2017 (r319113) +++ user/pho/stress2/misc/fifo2.sh Mon May 29 09:08:02 2017 (r319114) @@ -36,7 +36,6 @@ . ../default.cfg -killall 2>&1 | grep -q q && q="-q" odir=`pwd` cd /tmp sed '1,/^EOF/d' < $odir/$0 > fifo2.c @@ -47,7 +46,7 @@ rm -f fifo2.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 2g -u $mdstart || exit 1 +mdconfig -a -t swap -s 1g -u $mdstart || exit 1 bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint @@ -61,19 +60,12 @@ while [ $((`date '+%s'` - st)) -lt $((10 (cd $mntpoint; /tmp/fifo2) & start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt $sleeptime ]; do - ps aux | grep -v grep | egrep -q "fifo2$" || break + pgrep -q fifo2 || break sleep .5 done - if ps aux | grep -v grep | egrep -q "fifo2$"; then - killall $q fifo2 - ps aux | grep -v grep | egrep -q "fifo2 " && - killall $q -9 fifo2 - fi + while pkill -9 fifo2; do :; done wait done -killall $q -9 fifo2 -ps aux | grep -v grep | egrep -v "\.sh" | grep -q fifo2 && - killall $q -9 fifo2 for i in `jot 10`; do mount | grep -q md${mdstart}$part && \ @@ -81,11 +73,18 @@ for i in `jot 10`; do mdconfig -d -u $mdstart && break sleep 10 done -mount | grep -q md${mdstart}$part && echo "umount $mntpoint failed" +s=0 +mount | grep -q md${mdstart}$part && + { echo "umount $mntpoint failed"; s=1; } rm -f /tmp/fifo2 -exit +exit $s EOF #include +#include +#include +#include +#include + #include #include #include @@ -97,11 +96,6 @@ EOF #include #include #include -#include -#include -#include -#include -#include #include #define N (128 * 1024 / (int)sizeof(u_int32_t)) @@ -112,7 +106,7 @@ hand(int i __unused) { /* handler */ _exit(1); } -unsigned long +static unsigned long makearg(void) { unsigned int i; @@ -137,11 +131,11 @@ makearg(void) return(val); } -void * +static void * calls(void *arg __unused) { - int i, num; unsigned long arg1, arg2, arg3, arg4, arg5, arg6, arg7; + int i, num; for (i = 0;; i++) { arg1 = (unsigned long)(void *)"f"; From owner-svn-src-user@freebsd.org Mon May 29 11:10:24 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 4AD8ECFBEA6 for ; Mon, 29 May 2017 11:10:24 +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 1A12F74EBB; Mon, 29 May 2017 11:10: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 v4TBANVZ047703; Mon, 29 May 2017 11:10:23 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4TBANpv047702; Mon, 29 May 2017 11:10:23 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705291110.v4TBANpv047702@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 11:10:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319120 - 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, 29 May 2017 11:10:24 -0000 Author: pho Date: Mon May 29 11:10:22 2017 New Revision: 319120 URL: https://svnweb.freebsd.org/changeset/base/319120 Log: Implement end syscall number to test. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/syscall5.sh Modified: user/pho/stress2/misc/syscall5.sh ============================================================================== --- user/pho/stress2/misc/syscall5.sh Mon May 29 10:15:41 2017 (r319119) +++ user/pho/stress2/misc/syscall5.sh Mon May 29 11:10:22 2017 (r319120) @@ -37,16 +37,15 @@ syscall=`grep SYS_MAXSYSCALL /usr/include/sys/syscall.h | awk '{print $NF}'` syscall=$((syscall - 1)) -uname -a | grep -q OneFS && - syscall=`sysctl kern.syscalls | grep -v nosys | grep : | tail -1 | \ - sed 's/:.*//'` +esyscall=0 last=/tmp/syscall5.last log=/tmp/syscall5.log -while getopts ars:t:u flag; do +while getopts ae:rs:t:u flag; do case "$flag" in a) all=1 ;; + e) esyscall="$OPTARG" ;; r) [ -h $last ] && syscall=`ls -l $last | awk '{print $NF}'` syscall=$((syscall - 1)) @@ -55,10 +54,12 @@ while getopts ars:t:u flag; do t) sleeptime="$OPTARG" export sleeptime=$((sleeptime / 10)) ;; # used in syscall4.sh u) unnamed=1 ;; - *) echo "Usage $0 [-a] [-r] [-s number] [-t seconds] [-u]" + *) echo "Usage $0 [-a] [-r] [-s number] [-e number] [-t seconds] [-u]" return 1 ;; esac done +[ $syscall -gt $esyscall ] || + { echo "$syscall must be greater than $esyscall"; exit 1; } # syscalls with known issues: broken=" @@ -76,8 +77,6 @@ while [ $n -gt 0 ]; do ln -fs $n $last name=`grep -w "$n$" /usr/include/sys/syscall.h | awk '{print $2}' | sed 's/SYS_//'` - [ -z "$name" -a -n "$unnamed" ] && - { n=$((n - 1)); continue; } [ -z "$name" ] && name="unknown" rm -f /tmp/syscall5.name [ -x ../tools/exclude_syscall.sh ] && @@ -85,12 +84,15 @@ while [ $n -gt 0 ]; do { n=$((n - 1)); continue; } [ "$name" = "unknown" ] && [ -f /tmp/syscall5.name ] && name=`cat /tmp/syscall5.name` + [ -z "$name" -a -n "$unnamed" ] && + { n=$((n - 1)); continue; } echo "`date '+%T'` syscall $n ($name)" echo "`date '+%T'` syscall $n ($name)" >> $log printf "`date '+%T'` syscall $n ($name)\r\n" > /dev/console sync; sleep 1 echo "$broken" | grep -qw "$name" || ./syscall4.sh $n || break + [ $n -le $esyscall ] && break n=$((n - 1)) [ -z "$all" -a `date '+%s'` -gt $((start + 1800)) ] && break done From owner-svn-src-user@freebsd.org Mon May 29 11:11:20 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 DEE5DCFBEFB for ; Mon, 29 May 2017 11:11:20 +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 AFD597511F; Mon, 29 May 2017 11:11:20 +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 v4TBBJfI047818; Mon, 29 May 2017 11:11:19 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4TBBJbZ047817; Mon, 29 May 2017 11:11:19 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705291111.v4TBBJbZ047817@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 11:11:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319121 - 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, 29 May 2017 11:11:21 -0000 Author: pho Date: Mon May 29 11:11:19 2017 New Revision: 319121 URL: https://svnweb.freebsd.org/changeset/base/319121 Log: Check if src is available. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/fpclone2.sh Modified: user/pho/stress2/misc/fpclone2.sh ============================================================================== --- user/pho/stress2/misc/fpclone2.sh Mon May 29 11:10:22 2017 (r319120) +++ user/pho/stress2/misc/fpclone2.sh Mon May 29 11:11:19 2017 (r319121) @@ -33,6 +33,7 @@ # Test of patch for Giant trick in cdevsw [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ -d /usr/src/sys ] || exit 0 . ../default.cfg From owner-svn-src-user@freebsd.org Mon May 29 11:14:09 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 A6EC7CFC1DC for ; Mon, 29 May 2017 11:14:09 +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 765F67530F; Mon, 29 May 2017 11:14:09 +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 v4TBE8ga051705; Mon, 29 May 2017 11:14:08 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4TBE8hG051704; Mon, 29 May 2017 11:14:08 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705291114.v4TBE8hG051704@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 11:14:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319122 - 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, 29 May 2017 11:14:09 -0000 Author: pho Date: Mon May 29 11:14:08 2017 New Revision: 319122 URL: https://svnweb.freebsd.org/changeset/base/319122 Log: Return test program status. Cleanup code while here. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/flock_open_close.sh Modified: user/pho/stress2/misc/flock_open_close.sh ============================================================================== --- user/pho/stress2/misc/flock_open_close.sh Mon May 29 11:11:19 2017 (r319121) +++ user/pho/stress2/misc/flock_open_close.sh Mon May 29 11:14:08 2017 (r319122) @@ -57,13 +57,15 @@ chown $testuser $mntpoint/test chmod +w $mntpoint/test su $testuser -c "/tmp/flock_open_close $mntpoint/test" & +pid=$! while kill -0 $! 2>/dev/null; do mksnap_ffs $mntpoint $mntpoint/.snap/snap sleep 2 rm -f $mntpoint/.snap/snap sleep 1 done -wait +wait $pid +s=$? for i in `jot 10`; do mount | grep -q md${mdstart}$part && \ @@ -76,7 +78,7 @@ if mount | grep -q md${mdstart}$part; th exit 1 fi rm -f /tmp/flock_open_close -exit +exit $s EOF #include @@ -113,7 +115,7 @@ child(const char *binary) */ if (errno == ETXTBSY) continue; - err(1, "can't open %s", binary); + err(2, "can't open %s", binary); } close(fd); } @@ -136,7 +138,7 @@ main(int ac, char **av) { struct stat sb; pid_t pid; - int i, status; + int e, i, status; if (ac < 2) usage(); @@ -150,6 +152,7 @@ main(int ac, char **av) err(1, "fork"); if (pid == 0) child(av[1]); + e = 0; for (i = 0; i < 200000; i++) { pid = fork(); if (pid < 0) @@ -159,8 +162,14 @@ main(int ac, char **av) wait(&status); if (WIFEXITED(status) && WEXITSTATUS(status) == 127) { fprintf(stderr, "FAIL\n"); + e = 1; + break; + } + if (WIFEXITED(status) && WEXITSTATUS(status) != 1) { + /* /bin/test returns 1 */ + e = 1; break; } } - return (0); + return (e); } From owner-svn-src-user@freebsd.org Mon May 29 11:17:00 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 A62AECFC255 for ; Mon, 29 May 2017 11:17:00 +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 75C3C75407; Mon, 29 May 2017 11:17:00 +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 v4TBGxbe051905; Mon, 29 May 2017 11:16:59 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4TBGxYd051904; Mon, 29 May 2017 11:16:59 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705291116.v4TBGxYd051904@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 May 2017 11:16:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319123 - 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, 29 May 2017 11:17:00 -0000 Author: pho Date: Mon May 29 11:16:59 2017 New Revision: 319123 URL: https://svnweb.freebsd.org/changeset/base/319123 Log: Return exit status. Cleanup code while here. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/nfsrename.sh Modified: user/pho/stress2/misc/nfsrename.sh ============================================================================== --- user/pho/stress2/misc/nfsrename.sh Mon May 29 11:14:08 2017 (r319122) +++ user/pho/stress2/misc/nfsrename.sh Mon May 29 11:16:59 2017 (r319123) @@ -47,15 +47,18 @@ rm -f nfsrename.c cd $odir mount | grep "$mntpoint" | grep nfs > /dev/null && umount $mntpoint -mount -t nfs -o tcp -o retrycnt=3 -o intr -o soft -o rw $nfs_export $mntpoint +mount -t nfs -o tcp -o retrycnt=3 -o intr,soft -o rw $nfs_export $mntpoint for i in `jot 10`; do - /tmp/nfsrename $mntpoint/nfsrename.$i & + /tmp/nfsrename $mntpoint/nfsrename.$i > /dev/null 2>&1 & + pids="$pids $!" done -for i in `jot 10`; do - wait +s=0 +for i in $pids; do + wait $i + [ $? -ne 0 ] && s=1 done -killall nfsrename +pkill nfsrename rm -f $mntpoint/nfsrename.* umount $mntpoint > /dev/null 2>&1 @@ -64,7 +67,7 @@ while mount | grep "$mntpoint" | grep -q done rm -f /tmp/nfsrename -exit +exit $s EOF /* @@ -81,10 +84,13 @@ EOF #include #include #include +#include #include -const char *filename; -const char *dir; +static char *filename; +static char *dir; + +#define RUNTIME 720 static void usage(void) @@ -102,7 +108,6 @@ read_file(void) fp = fopen(filename, "r"); if (fp == NULL) { - warn("fopen"); return; } while (!feof(fp)) { @@ -130,7 +135,7 @@ write_file(void) fp = fdopen(fd, "w"); if (fp == NULL) { - warn("fopen:writer"); + warn("fdopen:writer"); close(fd); unlink(path); } @@ -155,10 +160,14 @@ random_sleep(int base, int slop) static void child(void) { + time_t start; + start = time(NULL); for (;;) { random_sleep(500, 50); read_file(); + if (time(NULL) - start > RUNTIME) + errx(1, "Timed out"); } exit(0); } @@ -166,6 +175,7 @@ child(void) int main(int ac, char **av) { + time_t start; long i, nchild; char *cp; int ch; @@ -205,9 +215,12 @@ main(int ac, char **av) } } + start = time(NULL); for (i = 0; i < 10000; i++) { random_sleep(1500, 1000); write_file(); + if (time(NULL) - start > RUNTIME) + errx(1, "Timed out"); } return (0); From owner-svn-src-user@freebsd.org Tue May 30 13:30:28 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 07299B7CFB2 for ; Tue, 30 May 2017 13:30:28 +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 C764D171D; Tue, 30 May 2017 13:30:27 +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 v4UDUQ9a013152; Tue, 30 May 2017 13:30:26 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4UDUQms013147; Tue, 30 May 2017 13:30:26 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705301330.v4UDUQms013147@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 30 May 2017 13:30:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319208 - in user/pho/stress2: misc testcases/swap 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: Tue, 30 May 2017 13:30:28 -0000 Author: pho Date: Tue May 30 13:30:26 2017 New Revision: 319208 URL: https://svnweb.freebsd.org/changeset/base/319208 Log: Stop the optimizer from removing code. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/mmap4.sh user/pho/stress2/misc/stealer.sh user/pho/stress2/misc/swap.sh user/pho/stress2/misc/swap2.sh user/pho/stress2/testcases/swap/swap.c Modified: user/pho/stress2/misc/mmap4.sh ============================================================================== --- user/pho/stress2/misc/mmap4.sh Tue May 30 13:26:37 2017 (r319207) +++ user/pho/stress2/misc/mmap4.sh Tue May 30 13:30:26 2017 (r319208) @@ -88,7 +88,8 @@ main(int argc, char **argv) int fd, ps; void *p; size_t len; - char *c, *path; + volatile char *c; + char *path; p = (void *)STARTADDR; len = ADRSPACE; Modified: user/pho/stress2/misc/stealer.sh ============================================================================== --- user/pho/stress2/misc/stealer.sh Tue May 30 13:26:37 2017 (r319207) +++ user/pho/stress2/misc/stealer.sh Tue May 30 13:30:26 2017 (r319208) @@ -88,7 +88,7 @@ handler(int i __unused) void stealer(int pages) { - char *c; + volatile char *c; int i, page, size; page = getpagesize(); Modified: user/pho/stress2/misc/swap.sh ============================================================================== --- user/pho/stress2/misc/swap.sh Tue May 30 13:26:37 2017 (r319207) +++ user/pho/stress2/misc/swap.sh Tue May 30 13:30:26 2017 (r319208) @@ -99,7 +99,7 @@ setup(void) int test(void) { - char *c; + volatile char *c; int page; unsigned long i, j; time_t start; @@ -127,7 +127,7 @@ test(void) } } } - free(c); + free((void *)c); _exit(0); } Modified: user/pho/stress2/misc/swap2.sh ============================================================================== --- user/pho/stress2/misc/swap2.sh Tue May 30 13:26:37 2017 (r319207) +++ user/pho/stress2/misc/swap2.sh Tue May 30 13:30:26 2017 (r319208) @@ -124,7 +124,7 @@ setup(void) int test(void) { - char *c; + volatile char *c; int page; unsigned long i, j; time_t start; @@ -152,7 +152,7 @@ test(void) } } } - free(c); + free((void *)c); _exit(0); } Modified: user/pho/stress2/testcases/swap/swap.c ============================================================================== --- user/pho/stress2/testcases/swap/swap.c Tue May 30 13:26:37 2017 (r319207) +++ user/pho/stress2/testcases/swap/swap.c Tue May 30 13:30:26 2017 (r319208) @@ -117,7 +117,7 @@ test(void) time_t start; unsigned long i, oldsize; int page; - char *c; + volatile char *c; oldsize = size; c = malloc(size); @@ -142,7 +142,7 @@ test(void) usleep(1000); #endif } - free(c); + free((void *)c); return (0); } From owner-svn-src-user@freebsd.org Tue May 30 13:31:20 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 18EBFB7D10C for ; Tue, 30 May 2017 13:31:20 +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 D914B19E8; Tue, 30 May 2017 13:31:19 +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 v4UDVICe013881; Tue, 30 May 2017 13:31:18 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4UDVIdJ013880; Tue, 30 May 2017 13:31:18 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705301331.v4UDVIdJ013880@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 30 May 2017 13:31:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319209 - user/pho/stress2/tools 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: Tue, 30 May 2017 13:31:20 -0000 Author: pho Date: Tue May 30 13:31:18 2017 New Revision: 319209 URL: https://svnweb.freebsd.org/changeset/base/319209 Log: Improved error handling. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/tools/killall.sh Modified: user/pho/stress2/tools/killall.sh ============================================================================== --- user/pho/stress2/tools/killall.sh Tue May 30 13:30:26 2017 (r319208) +++ user/pho/stress2/tools/killall.sh Tue May 30 13:31:18 2017 (r319209) @@ -30,11 +30,24 @@ # Kill all running test programs from stress2/testcases -for i in `find ../testcases -type f -perm -1`; do - list=`echo $list $(basename $i)` -done +list="`find ../testcases -type f -perm -1 | xargs basename`" +[ -z "$list" ] && exit 1 -for i in `jot 20`; do - killall -q -9 $list 2>/dev/null || break - sleep $i +i=0 +while pkill -9 $list; do + [ $((i += 1)) -lt 3 ] && continue + if [ -z "$(ps `pgrep $list` | sed 1d)" ]; then # + for j in "`pgrep $list`"; do + ps auxwwl | awk "\$2 == $j" + done + echo "$0 FAIL"; exit 2 + fi + if [ $i -eq 30 ]; then + pgrep $list | xargs ps -lp + echo "$0 FAIL @ $i" + exit 3 + fi + sleep 5 done +[ $i -gt 2 ] && echo "Note: $0 exit @ $i" +exit 0 From owner-svn-src-user@freebsd.org Tue May 30 13:46:23 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 E3E0AB7D455 for ; Tue, 30 May 2017 13:46:23 +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 B5C0623F7; Tue, 30 May 2017 13:46:23 +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 v4UDkMlH021131; Tue, 30 May 2017 13:46:22 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4UDkM2n021130; Tue, 30 May 2017 13:46:22 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705301346.v4UDkM2n021130@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 30 May 2017 13:46:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319211 - 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: Tue, 30 May 2017 13:46:24 -0000 Author: pho Date: Tue May 30 13:46:22 2017 New Revision: 319211 URL: https://svnweb.freebsd.org/changeset/base/319211 Log: Improve cleanup and error handling. Style fixes. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/mlockall2.sh Modified: user/pho/stress2/misc/mlockall2.sh ============================================================================== --- user/pho/stress2/misc/mlockall2.sh Tue May 30 13:35:54 2017 (r319210) +++ user/pho/stress2/misc/mlockall2.sh Tue May 30 13:46:22 2017 (r319211) @@ -36,12 +36,12 @@ # This scenario demonstrates the problem. Fixed in r242012. mem=`sysctl -n hw.usermem` -[ `swapinfo | wc -l` -eq 1 ] && mem=$((mem/100*60)) +[ `sysctl -n vm.swap_total` -eq 0 ] && mem=$((mem / 100 * 60)) here=`pwd` cd /tmp sed '1,/^EOF/d' < $here/$0 > mlockall2.c -mycc -o mlockall2 -Wall -Wextra -O2 -g mlockall2.c +mycc -o mlockall2 -Wall -Wextra -O2 -g mlockall2.c || exit 1 rm -f mlockall2.c cd $here @@ -51,31 +51,36 @@ while kill -0 $! 2>/dev/null; do [ -r mlockall2.core ] && kill $! && break sleep 10 done -[ -r mlockall2.core ] && echo "FAIL" -killall mlockall2 -rm -f /tmp/mlockall2 -exit 0 +[ -r mlockall2.core ] && s=1 || s=0 +pkill mlockall2 +wait +rm -f /tmp/mlockall2 mlockall2.core +exit $s EOF #include -#include -#include -#include #include +#include #include + +#include +#include +#include +#include #include #define LOAD 40 #define N 90000 #define PARALLEL 5 +#define RUNTIME 600 -long size; +static long size; -void +static void swap(void) { - char *c; - int page; long i; + int page; + volatile char *c; setproctitle("swap"); c = malloc(size); @@ -93,7 +98,7 @@ swap(void) } } -void +static void test(void) { pid_t p; @@ -105,7 +110,7 @@ test(void) _exit(0); } if (p > 0) - wait(&status); + waitpid(p, &status, 0); if (status != 0) break; } @@ -115,12 +120,14 @@ test(void) int main(int argc __unused, char **argv) { + time_t start; struct rtprio rtp; - int i, j; + pid_t pids[LOAD], pids2[PARALLEL]; + int i; size = atol(argv[1]) / LOAD * 1.5; for (i = 0; i < LOAD; i++) - if (fork() == 0) + if ((pids[i] = fork()) == 0) swap(); sleep(10); @@ -134,18 +141,24 @@ main(int argc __unused, char **argv) if (mlockall(MCL_CURRENT | MCL_FUTURE) != 0) err(1, "mlockall failed"); - alarm(600); - for (j = 0; j < 10; j++) { + start = time(NULL); + while (time(NULL) - start < RUNTIME) { for (i = 0; i < PARALLEL; i++) { - if (fork() == 0) + if ((pids2[i] = fork()) == 0) test(); } for (i = 0; i < PARALLEL; i++) - wait(NULL); + if (waitpid(pids2[i], NULL, 0) != pids2[i]) + err(1, "waitpid(%d) (2)", pids2[i]); if (access("mlockall2.core", R_OK) == 0) break; } + for (i = 0; i < LOAD; i++) + kill(pids[i], SIGHUP); + for (i = 0; i < LOAD; i++) + if (waitpid(pids[i], NULL, 0) != pids[i]) + err(1, "waitpid(%d)", pids[i]); return (0); } From owner-svn-src-user@freebsd.org Wed May 31 10:27:15 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 7781BAFC690 for ; Wed, 31 May 2017 10:27:15 +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 48AD2726B1; Wed, 31 May 2017 10:27:15 +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 v4VAREHq065800; Wed, 31 May 2017 10:27:14 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4VAREYq065799; Wed, 31 May 2017 10:27:14 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705311027.v4VAREYq065799@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 31 May 2017 10:27:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319313 - 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: Wed, 31 May 2017 10:27:15 -0000 Author: pho Date: Wed May 31 10:27:14 2017 New Revision: 319313 URL: https://svnweb.freebsd.org/changeset/base/319313 Log: Added timeout. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/callout_reset_on.sh Modified: user/pho/stress2/misc/callout_reset_on.sh ============================================================================== --- user/pho/stress2/misc/callout_reset_on.sh Wed May 31 10:01:15 2017 (r319312) +++ user/pho/stress2/misc/callout_reset_on.sh Wed May 31 10:27:14 2017 (r319313) @@ -319,6 +319,7 @@ rm -f /tmp/crlogger.c N=200 cd /tmp +start=`date '+%s'` for i in `jot 40`; do for j in `jot $N`; do /tmp/crwriter | /tmp/crlogger 1236$j 2>/dev/null & @@ -327,5 +328,7 @@ for i in `jot 40`; do for j in `jot $N`; do wait done + [ $((`date '+%s'` - start)) -gt 1800 ] && break done rm -f /tmp/crwriter /tmp/crlogger ./barrier.* +exit 0 From owner-svn-src-user@freebsd.org Wed May 31 10:29:47 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 056F7AFC6E9 for ; Wed, 31 May 2017 10:29:47 +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 C81D372849; Wed, 31 May 2017 10:29:46 +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 v4VATjbZ065928; Wed, 31 May 2017 10:29:45 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4VATjUI065927; Wed, 31 May 2017 10:29:45 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705311029.v4VATjUI065927@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 31 May 2017 10:29:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319314 - 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: Wed, 31 May 2017 10:29:47 -0000 Author: pho Date: Wed May 31 10:29:45 2017 New Revision: 319314 URL: https://svnweb.freebsd.org/changeset/base/319314 Log: Do not hard code the working directory and check available disk space. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/nbufkv.sh Modified: user/pho/stress2/misc/nbufkv.sh ============================================================================== --- user/pho/stress2/misc/nbufkv.sh Wed May 31 10:27:14 2017 (r319313) +++ user/pho/stress2/misc/nbufkv.sh Wed May 31 10:29:45 2017 (r319314) @@ -37,6 +37,11 @@ . ../default.cfg +dir=`dirname $diskimage` +[ `df -k $dir | tail -1 | awk '{print $4'}` -lt \ + $((40 * 1024 * 1024)) ] && + echo "Not enough disk space on $dir." && exit 0 + odir=`pwd` cd /tmp @@ -47,25 +52,28 @@ cd $odir u1=$mdstart u2=$((u1 + 1)) -d1=/tmp/diskimage1 -d2=/tmp/diskimage2 +d1=$dir/diskimage1 +d2=$dir/diskimage2 mp1=$mntpoint mp2=${mntpoint}2 [ -d $mp1 ] || mkdir $mp1 [ -d $mp2 ] || mkdir $mp2 -truncate -s 20g $d1 -truncate -s 20g $d2 +rm -f $d1 $d2 +( + dd if=/dev/zero of=$d1 bs=1m count=20k || exit 1 +) 2>&1 | egrep -v 'records|transferred' +cp $d1 $d2 || exit 1 mount | grep -q /dev/md${u2}$part && umount -f /dev/md${u2}$part mount | grep -q /dev/md${u1}$part && umount -f /dev/md${u1}$part -mdconfig -l | grep -q md$u2 && mdconfig -d -u $u2 -mdconfig -l | grep -q md$u1 && mdconfig -d -u $u1 +[ -c /dev/md$u2 ] && mdconfig -d -u $u2 +[ -c /dev/md$u1 ] && mdconfig -d -u $u1 -mdconfig -a -t vnode -f $d1 -u $u1 +mdconfig -a -t vnode -f $d1 -u $u1 || exit 1 bsdlabel -w md$u1 auto newfs -b 65536 -f 65536 -O2 md${u1}$part > /dev/null -mdconfig -a -t vnode -f $d2 -u $u2 +mdconfig -a -t vnode -f $d2 -u $u2 || exit 1 bsdlabel -w md$u2 auto newfs -b 65536 -f 65536 -O2 md${u2}$part > /dev/null From owner-svn-src-user@freebsd.org Wed May 31 10:32:14 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 C0BDFAFC815 for ; Wed, 31 May 2017 10:32:14 +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 91C1372B66; Wed, 31 May 2017 10:32:14 +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 v4VAWDjD068918; Wed, 31 May 2017 10:32:13 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4VAWDcb068917; Wed, 31 May 2017 10:32:13 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705311032.v4VAWDcb068917@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 31 May 2017 10:32:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319315 - 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: Wed, 31 May 2017 10:32:14 -0000 Author: pho Date: Wed May 31 10:32:13 2017 New Revision: 319315 URL: https://svnweb.freebsd.org/changeset/base/319315 Log: pkill must only match the process name. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/umountf3.sh Modified: user/pho/stress2/misc/umountf3.sh ============================================================================== --- user/pho/stress2/misc/umountf3.sh Wed May 31 10:29:45 2017 (r319314) +++ user/pho/stress2/misc/umountf3.sh Wed May 31 10:32:13 2017 (r319315) @@ -60,7 +60,7 @@ done sleep $((4 * 60)) echo "umount -f $mntpoint" umount -f $mntpoint -while pkill -f umountf3; do :; done +while pkill umountf3; do :; done wait mdconfig -d -u $mdstart rm -f $D /tmp/umountf3