From owner-svn-src-user@freebsd.org Mon Jun 5 06:23:49 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 736ECBF7CA7 for ; Mon, 5 Jun 2017 06:23:49 +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 42C2F72DB3; Mon, 5 Jun 2017 06:23:49 +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 v556Nml9042519; Mon, 5 Jun 2017 06:23:48 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v556NmgL042518; Mon, 5 Jun 2017 06:23:48 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201706050623.v556NmgL042518@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 5 Jun 2017 06:23:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319596 - 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, 05 Jun 2017 06:23:49 -0000 Author: pho Date: Mon Jun 5 06:23:48 2017 New Revision: 319596 URL: https://svnweb.freebsd.org/changeset/base/319596 Log: Added a regression test. Sponsored by: Dell EMC Isilon Added: user/pho/stress2/misc/crossmp11.sh (contents, props changed) Added: user/pho/stress2/misc/crossmp11.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/crossmp11.sh Mon Jun 5 06:23:48 2017 (r319596) @@ -0,0 +1,119 @@ +#!/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$ +# + +# Copy of crossmp3.sh + elements from dfull.sh + +# Live lock seen: +# https://people.freebsd.org/~pho/stress/log/crossmp11.txt + +# umount stuck in mnt_ref seen: +# https://people.freebsd.org/~pho/stress/log/kostik1002.txt + +# Fixed by r319518, r319519 and r319539. + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg + +g3=$((3 * 1024 * 1024 * 1024)) +CONT=/tmp/crossmp11.continue +N=`sysctl -n hw.ncpu` +[ $N -gt 4 ] && N=4 +usermem=`sysctl -n hw.usermem` +[ $usermem -gt $g3 ] && usermem=$g3 +[ `sysctl -n vm.swap_total` -eq 0 ] && usermem=$((usermem/100*80)) +size=$((usermem / 1024 / 1024 / N)) + +mounts=$N # Number of parallel scripts + +if [ $# -eq 0 ]; then + echo "Expect: + /mnt6: write failed, filesystem is full + /mnt6: create/symlink failed, no inodes free" + + for i in `jot $mounts`; do + m=$(( i + mdstart - 1 )) + [ ! -d ${mntpoint}$m ] && + { mkdir ${mntpoint}$m; chmod 755 ${mntpoint}$m; } + mount | grep "${mntpoint}$m" | grep -q md$m && umount ${mntpoint}$m + mdconfig -l | grep -q md$m && mdconfig -d -u $m + + mdconfig -a -t swap -s ${size}m -u $m + bsdlabel -w md$m auto + newfs $newfs_flags md${m}$part > /dev/null 2>&1 + done + + # start the parallel tests + touch $CONT + for i in `jot $mounts`; do + m=$(( i + mdstart - 1 )) + ./$0 $m & + ./$0 find & + done + + wait + + for i in `jot $mounts`; do + m=$(( i + mdstart - 1 )) + mdconfig -d -u $m + done + +else + if [ $1 = find ]; then + while [ -f $CONT ]; do + find ${mntpoint}* -type f > /dev/null 2>&1 + done + else + m=$1 + export runRUNTIME=20s + # The test: Parallel mount and unmounts + for i in `jot 3`; do + mount /dev/md${m}$part ${mntpoint}$m && + chmod 777 ${mntpoint}$m + export RUNDIR=${mntpoint}$m/stressX + export CTRLDIR=${mntpoint}$m/stressX.control + (cd ${mntpoint}$m && find . -delete) + if [ -z "$KBLOCKS" ]; then + r=`df -ik ${mntpoint}$m | tail -1 | awk '{print $4,$7}'` + export KBLOCKS=`echo $r | awk '{print $1 * 10}'` + export INODES=`echo $r | awk '{print $2 * 10}'` + fi + su $testuser -c 'cd ..; ./run.sh disk.cfg' > \ + /dev/null 2>&1 + + while mount | grep -q "on ${mntpoint}$m "; do + opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f") + umount $opt ${mntpoint}$m > /dev/null 2>&1 + [ -f $CONT ] || break 2 + done + done + rm -f $CONT + fi +fi From owner-svn-src-user@freebsd.org Wed Jun 7 07:25: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 33C60BFD564 for ; Wed, 7 Jun 2017 07:25: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 04A6D64DBE; Wed, 7 Jun 2017 07:25:13 +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 v577PDe8055021; Wed, 7 Jun 2017 07:25:13 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v577PDIp055020; Wed, 7 Jun 2017 07:25:13 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201706070725.v577PDIp055020@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 7 Jun 2017 07:25:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319643 - 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, 07 Jun 2017 07:25:14 -0000 Author: pho Date: Wed Jun 7 07:25:13 2017 New Revision: 319643 URL: https://svnweb.freebsd.org/changeset/base/319643 Log: pty.ko is not needed for this test. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/posix_openpt.sh Modified: user/pho/stress2/misc/posix_openpt.sh ============================================================================== --- user/pho/stress2/misc/posix_openpt.sh Wed Jun 7 05:33:56 2017 (r319642) +++ user/pho/stress2/misc/posix_openpt.sh Wed Jun 7 07:25:13 2017 (r319643) @@ -42,8 +42,6 @@ sed '1,/^EOF/d' < $here/$0 > posix_openpt.c mycc -o posix_openpt -Wall -Wextra -O2 posix_openpt.c || exit 1 rm -f posix_openpt.c -kldstat -v | grep -q pty || { kldload pty || exit 1; } - for i in `jot 10`; do /tmp/posix_openpt & done From owner-svn-src-user@freebsd.org Wed Jun 7 07:32:26 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 CE913BFD83F for ; Wed, 7 Jun 2017 07:32:26 +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 A9C346532A; Wed, 7 Jun 2017 07:32:26 +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 v577WPbY058996; Wed, 7 Jun 2017 07:32:25 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v577WPat058995; Wed, 7 Jun 2017 07:32:25 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201706070732.v577WPat058995@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 7 Jun 2017 07:32:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319644 - 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, 07 Jun 2017 07:32:26 -0000 Author: pho Date: Wed Jun 7 07:32:25 2017 New Revision: 319644 URL: https://svnweb.freebsd.org/changeset/base/319644 Log: Do not stop and start the VM pressure programs "swap". Improve error handling slightly. Add a kqueue(2) open file descriptor. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/syscall4.sh Modified: user/pho/stress2/misc/syscall4.sh ============================================================================== --- user/pho/stress2/misc/syscall4.sh Wed Jun 7 07:25:13 2017 (r319643) +++ user/pho/stress2/misc/syscall4.sh Wed Jun 7 07:32:25 2017 (r319644) @@ -55,11 +55,11 @@ rm -f /tmp/syscall4 mycc -o syscall4 -Wall -Wextra -O2 -g syscall4.c -lpthread || exit 1 rm -f syscall4.c -kldstat -v | grep -q sysvmsg || $odir/../tools/kldload.sh sysvmsg -kldstat -v | grep -q sysvsem || $odir/../tools/kldload.sh sysvsem -kldstat -v | grep -q sysvshm || $odir/../tools/kldload.sh sysvshm -kldstat -v | grep -q aio || $odir/../tools/kldload.sh aio -kldstat -v | grep -q mqueuefs || $odir/../tools/kldload.sh mqueuefs +kldstat -v | grep -q sysvmsg || $stress2tools/kldload.sh sysvmsg +kldstat -v | grep -q sysvsem || $stress2tools/kldload.sh sysvsem +kldstat -v | grep -q sysvshm || $stress2tools/kldload.sh sysvshm +kldstat -v | grep -q aio || $stress2tools/kldload.sh aio +kldstat -v | grep -q mqueuefs || $stress2tools/kldload.sh mqueuefs mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart @@ -70,10 +70,11 @@ newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint +daemon sh -c "(cd $odir/../testcases/swap; ./swap -t 10m -i 20 -k)" > \ + /dev/null sleeptime=${sleeptime:-12} st=`date '+%s'` while [ $((`date '+%s'` - st)) -lt $((10 * sleeptime)) ]; do - daemon sh -c "(cd $odir/../testcases/swap; ./swap -t 5m -i 20 -k -h)" > /dev/null (cd $mntpoint; /tmp/syscall4 $* ) & start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt $sleeptime ]; do @@ -84,12 +85,12 @@ while [ $((`date '+%s'` - st)) -lt $((10 * sleeptime)) : done wait - while pkill -9 swap; do - : - done ipcs | grep nobody | awk '/^(q|m|s)/ {print " -" $1, $2}' | xargs -L 1 ipcrm done +while pkill -9 swap; do + : +done while pkill -9 syscall4; do : done @@ -108,6 +109,7 @@ rm -f /tmp/syscall4 exit EOF #include +#include #include #include #include @@ -146,16 +148,9 @@ static int ignore[] = { SYS_mac_syscall, SYS_sigtimedwait, SYS_sigwaitinfo, -#if __FreeBSD_version < 804500 - SYS_thr_create, - SYS_thr_new, -#endif -#if __FreeBSD_version >= 900041 - SYS_pdfork, -#endif }; -int fd[900], fds[2], socketpr[2]; +int fd[900], fds[2], kq, socketpr[2]; #ifndef nitems #define nitems(x) (sizeof((x)) / sizeof((x)[0])) #endif @@ -209,17 +204,17 @@ test(void *arg __unused) FTS *fts; FTSENT *p; - int ftsoptions; - char *args[6]; - int i; + int ftsoptions, i; + char *args[] = { + "/dev", + "/proc", + "/compat/linux/proc", + "/media", + ".", + NULL, + }; ftsoptions = FTS_PHYSICAL; - args[0] = "/dev"; - args[1] = "/proc"; - args[2] = "/usr/compat/linux/proc"; - args[3] = "/ifs"; - args[4] = "."; - args[5] = 0; for (;;) { for (i = 0; i < N; i++) @@ -245,11 +240,13 @@ test(void *arg __unused) err(1, "pipe()"); if (socketpair(PF_UNIX, SOCK_SEQPACKET, 0, socketpr) == -1) err(1, "socketpair()"); + kq = kqueue(); sleep(1); close(socketpr[0]); close(socketpr[1]); close(fds[0]); close(fds[1]); + close(kq); } return(0); } @@ -307,7 +304,7 @@ main(int argc, char **argv) magic1 = magic2 = MAGIC; if ((pw = getpwnam("nobody")) == NULL) - err(1, "no such user: nobody"); + err(1, "failed to resolve nobody"); if (getenv("USE_ROOT") && argc == 2) fprintf(stderr, "Running syscall4 as root for %s.\n", @@ -335,8 +332,10 @@ main(int argc, char **argv) signal(SIGSYS, hand); signal(SIGTRAP, hand); - if (argc > 2) - errx(1, "Usage: %s {}", argv[0]); + if (argc > 2) { + fprintf(stderr, "usage: %s [syscall-num]\n", argv[0]); + exit(1); + } if (argc == 2) { syscallno = atoi(argv[1]); for (j = 0; j < (int)nitems(ignore); j++) From owner-svn-src-user@freebsd.org Wed Jun 7 07:37: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 90708BFD8C2 for ; Wed, 7 Jun 2017 07:37: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 5F70D65479; Wed, 7 Jun 2017 07:37: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 v577axf0059199; Wed, 7 Jun 2017 07:36:59 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v577axfw059198; Wed, 7 Jun 2017 07:36:59 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201706070736.v577axfw059198@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 7 Jun 2017 07:36:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319645 - 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, 07 Jun 2017 07:37:00 -0000 Author: pho Date: Wed Jun 7 07:36:59 2017 New Revision: 319645 URL: https://svnweb.freebsd.org/changeset/base/319645 Log: Load pty.ko if needed. Style fixes while here. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/fpclone.sh Modified: user/pho/stress2/misc/fpclone.sh ============================================================================== --- user/pho/stress2/misc/fpclone.sh Wed Jun 7 07:32:25 2017 (r319644) +++ user/pho/stress2/misc/fpclone.sh Wed Jun 7 07:36:59 2017 (r319645) @@ -33,6 +33,8 @@ # Test of patch for Giant trick in cdevsw [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ -d /usr/src/sys ] || exit 0 +kldstat -v | grep -q pty || { kldload pty || exit 0; } . ../default.cfg @@ -58,7 +60,7 @@ for i in `jot 10`; do done export runRUNTIME=2m -cd ..; ./run.sh pty.cfg +cd ..; ./run.sh pty.cfg for i in `jot 10`; do wait @@ -87,7 +89,7 @@ static d_read_t fpclone_read; static struct cdevsw fpclone_cdevsw = { .d_open = fpclone_open, .d_close = fpclone_close, - .d_read = fpclone_read, + .d_read = fpclone_read, .d_name = "fpclone", .d_version = D_VERSION, .d_flags = D_TRACKCLOSE @@ -110,7 +112,7 @@ fpclone_cdevpriv_dtr(void *data) } static int -fpclone_open(struct cdev *dev, int oflags, int devtype, d_thread_t *td) +fpclone_open(struct cdev *dev, int oflags, int devtype, struct thread *td) { struct fpclone_sc *sc; int error; @@ -124,7 +126,7 @@ fpclone_open(struct cdev *dev, int oflags, int devtype } static int -fpclone_close(struct cdev *dev, int fflag, int devtype, d_thread_t *td) +fpclone_close(struct cdev *dev, int fflag, int devtype, struct thread *td) { devfs_clear_cdevpriv(); @@ -138,7 +140,7 @@ fpclone_read(struct cdev *dev, struct uio *uio, int io { struct fpclone_sc *sc; int rv, amnt, svpos, error; - + error = devfs_get_cdevpriv((void **)&sc); if (error) return (error); From owner-svn-src-user@freebsd.org Wed Jun 7 07:38:06 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 1D18ABFD8E4 for ; Wed, 7 Jun 2017 07:38:06 +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 E25676556D; Wed, 7 Jun 2017 07:38:05 +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 v577c5Ut059278; Wed, 7 Jun 2017 07:38:05 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v577c5iR059277; Wed, 7 Jun 2017 07:38:05 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201706070738.v577c5iR059277@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 7 Jun 2017 07:38:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319646 - 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, 07 Jun 2017 07:38:06 -0000 Author: pho Date: Wed Jun 7 07:38:04 2017 New Revision: 319646 URL: https://svnweb.freebsd.org/changeset/base/319646 Log: Added cleanup. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/pthread9.sh Modified: user/pho/stress2/misc/pthread9.sh ============================================================================== --- user/pho/stress2/misc/pthread9.sh Wed Jun 7 07:36:59 2017 (r319645) +++ user/pho/stress2/misc/pthread9.sh Wed Jun 7 07:38:04 2017 (r319646) @@ -57,6 +57,7 @@ if ping -c 2 `echo $nfs_export | sed 's/:.*//'` > /dev procstat -k `pgrep pthread9 | grep -v $!` status=1 fi + rm -f $mntpoint/pthread9.core umount -f $mntpoint wait fi From owner-svn-src-user@freebsd.org Wed Jun 7 07:39: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 9F1BABFD901 for ; Wed, 7 Jun 2017 07:39: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 6D7FA65675; Wed, 7 Jun 2017 07:39:47 +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 v577dkDi059370; Wed, 7 Jun 2017 07:39:46 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v577dk7C059369; Wed, 7 Jun 2017 07:39:46 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201706070739.v577dk7C059369@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 7 Jun 2017 07:39:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319647 - 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, 07 Jun 2017 07:39:47 -0000 Author: pho Date: Wed Jun 7 07:39:46 2017 New Revision: 319647 URL: https://svnweb.freebsd.org/changeset/base/319647 Log: Synchronize process termination. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/crossmp.sh Modified: user/pho/stress2/misc/crossmp.sh ============================================================================== --- user/pho/stress2/misc/crossmp.sh Wed Jun 7 07:38:04 2017 (r319646) +++ user/pho/stress2/misc/crossmp.sh Wed Jun 7 07:39:46 2017 (r319647) @@ -35,10 +35,12 @@ . ../default.cfg mounts=15 # Number of parallel scripts +cont=/tmp/crossmp.continue mdstart=$mdstart # Use md unit numbers from this point D=$diskimage if [ $# -eq 0 ]; then + touch $cont for i in `jot $mounts`; do m=$(( i + mdstart - 1 )) [ ! -d ${mntpoint}$m ] && mkdir ${mntpoint}$m @@ -68,7 +70,7 @@ if [ $# -eq 0 ]; then else if [ $1 = find ]; then - for i in `jot 1024`; do + while [ -r $cont ]; do find ${mntpoint}* -type f > /dev/null 2>&1 done else @@ -76,11 +78,12 @@ else # The test: Parallel mount and unmounts for i in `jot 1024`; do m=$1 - mount /dev/md${m}${part} ${mntpoint}$m + mount /dev/md${m}$part ${mntpoint}$m while mount | grep -qw $mntpoint$m; do opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f") umount $opt ${mntpoint}$m > /dev/null 2>&1 done done + rm -f $cont fi fi From owner-svn-src-user@freebsd.org Wed Jun 7 07:41:45 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 7C858BFDAF1 for ; Wed, 7 Jun 2017 07:41:45 +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 48CAD65A84; Wed, 7 Jun 2017 07:41:45 +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 v577fiJh060155; Wed, 7 Jun 2017 07:41:44 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v577fi0r060154; Wed, 7 Jun 2017 07:41:44 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201706070741.v577fi0r060154@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 7 Jun 2017 07:41:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319648 - 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, 07 Jun 2017 07:41:45 -0000 Author: pho Date: Wed Jun 7 07:41:44 2017 New Revision: 319648 URL: https://svnweb.freebsd.org/changeset/base/319648 Log: Added tmpfs(5) testing. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/kevent6.sh Modified: user/pho/stress2/misc/kevent6.sh ============================================================================== --- user/pho/stress2/misc/kevent6.sh Wed Jun 7 07:39:46 2017 (r319647) +++ user/pho/stress2/misc/kevent6.sh Wed Jun 7 07:41:44 2017 (r319648) @@ -49,7 +49,7 @@ cd $odir mount | grep "on $mntpoint " | grep -q md$mdstart && umount -f $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart -mdconfig -a -t swap -s 2g -u ${mdstart} +mdconfig -a -t swap -s 2g -u $mdstart bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint @@ -61,6 +61,13 @@ while mount | grep -q $mntpoint; do umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart + +mount -o size=1g -t tmpfs tmpfs $mntpoint +chmod 777 $mntpoint +su $testuser -c "(cd $mntpoint; /tmp/kevent6)" +while mount | grep -q $mntpoint; do + umount $mntpoint || sleep 1 +done rm -f /tmp/kevent6 exit From owner-svn-src-user@freebsd.org Sat Jun 10 06:28:42 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 E111DD86225 for ; Sat, 10 Jun 2017 06:28:42 +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 ACF3868AF4; Sat, 10 Jun 2017 06:28:42 +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 v5A6SfZK014788; Sat, 10 Jun 2017 06:28:41 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5A6SfZI014787; Sat, 10 Jun 2017 06:28:41 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201706100628.v5A6SfZI014787@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sat, 10 Jun 2017 06:28:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319770 - 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: Sat, 10 Jun 2017 06:28:43 -0000 Author: pho Date: Sat Jun 10 06:28:41 2017 New Revision: 319770 URL: https://svnweb.freebsd.org/changeset/base/319770 Log: Added timeout and fixed style while here. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/linger.sh Modified: user/pho/stress2/misc/linger.sh ============================================================================== --- user/pho/stress2/misc/linger.sh Sat Jun 10 06:13:52 2017 (r319769) +++ user/pho/stress2/misc/linger.sh Sat Jun 10 06:28:41 2017 (r319770) @@ -52,7 +52,7 @@ newfs $opt md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint -if ! su ${testuser} -c "cd $mntpoint; /tmp/linger $size"; then +if ! su $testuser -c "cd $mntpoint; /tmp/linger $size"; then min=2 [ -r $mntpoint/.sujournal ] && min=3 r=`df -hi $mntpoint | head -1` @@ -73,22 +73,25 @@ mdconfig -d -u $mdstart rm -f /tmp/linger exit EOF +#include +#include +#include +#include + #include #include #include #include #include #include -#include -#include -#include -#include +#include #include #define PARALLEL 10 +#define TIMEOUT 1200 static int size = 6552; /* 10 free inodes */ -int +static int test(void) { int fd, i, j; @@ -128,12 +131,14 @@ test(void) int main(void) { + time_t start; int error = 0, fd, i, j, status; umask(0); if ((fd = open("continue", O_CREAT, 0644)) == -1) err(1, "open()"); close(fd); + start = time(NULL); for (i = 0; i < 100; i++) { for (j = 0; j < PARALLEL; j++) { if (fork() == 0) { @@ -152,8 +157,10 @@ main(void) } unlink("rendezvous"); - if (access("continue", R_OK) == -1) { - fprintf(stderr, "Loop #%d\n", i + 1); + if (access("continue", R_OK) == -1) + break; + if (time(NULL) - start > TIMEOUT) { + fprintf(stderr, "FAIL Timeout\n"); break; } } From owner-svn-src-user@freebsd.org Sat Jun 10 06:32:46 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 282F6D86369 for ; Sat, 10 Jun 2017 06:32:46 +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 C3CBC68E23; Sat, 10 Jun 2017 06:32:45 +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 v5A6WiVD018781; Sat, 10 Jun 2017 06:32:44 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5A6WibN018780; Sat, 10 Jun 2017 06:32:44 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201706100632.v5A6WibN018780@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sat, 10 Jun 2017 06:32:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319771 - 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: Sat, 10 Jun 2017 06:32:46 -0000 Author: pho Date: Sat Jun 10 06:32:44 2017 New Revision: 319771 URL: https://svnweb.freebsd.org/changeset/base/319771 Log: Added a timeout. Style fixes. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/pcatch.sh Modified: user/pho/stress2/misc/pcatch.sh ============================================================================== --- user/pho/stress2/misc/pcatch.sh Sat Jun 10 06:28:41 2017 (r319770) +++ user/pho/stress2/misc/pcatch.sh Sat Jun 10 06:32:44 2017 (r319771) @@ -33,10 +33,13 @@ # when fs is suspended, and process is signaled. # Test scenario mostly by kib. - # Fixed in r275744. +# Deadlock seen: +# https://people.freebsd.org/~pho/stress/log/pcatch.txt + [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ -z "$DEBUG" ] && exit 0 # Waiting for fix . ../default.cfg @@ -50,12 +53,15 @@ cd $here mount | grep -q "$mntpoint" && umount $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md${mdstart} auto +bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint -/tmp/pcatch $mntpoint +start=`date '+%s'` +while [ $((`date '+%s'` - start)) -lt 120 ]; do + /tmp/pcatch $mntpoint +done while mount | grep -q "on $mntpoint "; do umount $mntpoint || sleep 1 @@ -80,12 +86,12 @@ EOF #include #include -void +static void hand_sigaction(int signo __unused, siginfo_t *si __unused, void *c __unused) { } -void +static void suspend(char *path) { struct statfs s; @@ -104,7 +110,7 @@ suspend(char *path) } } -void +static void test(char *mp) { pid_t pid; From owner-svn-src-user@freebsd.org Sat Jun 10 10:40: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 BC45DD8AADA for ; Sat, 10 Jun 2017 10:40: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 8BE18739EE; Sat, 10 Jun 2017 10:40: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 v5AAeFNF017544; Sat, 10 Jun 2017 10:40:15 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5AAeFQm017543; Sat, 10 Jun 2017 10:40:15 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201706101040.v5AAeFQm017543@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sat, 10 Jun 2017 10:40:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r319777 - 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: Sat, 10 Jun 2017 10:40:16 -0000 Author: pho Date: Sat Jun 10 10:40:15 2017 New Revision: 319777 URL: https://svnweb.freebsd.org/changeset/base/319777 Log: Do not hard code newfs(8) flags. Style. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/trim5.sh Modified: user/pho/stress2/misc/trim5.sh ============================================================================== --- user/pho/stress2/misc/trim5.sh Sat Jun 10 08:25:46 2017 (r319776) +++ user/pho/stress2/misc/trim5.sh Sat Jun 10 10:40:15 2017 (r319777) @@ -36,11 +36,11 @@ . ../default.cfg mount | grep "$mntpoint " | grep -q md$mdstart && umount $mntpoint -mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t malloc -s 128m -u $mdstart bsdlabel -w md$mdstart auto -newfs -U -t md${mdstart}$part > /dev/null +newfs $newfs_flags -t md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint mksnap_ffs $mntpoint $mntpoint/.snap/snap