From owner-svn-src-user@freebsd.org Wed Nov 4 12:47:29 2015 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 769FCA24130 for ; Wed, 4 Nov 2015 12:47:29 +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 2EA351270; Wed, 4 Nov 2015 12:47:29 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA4ClSVR003268; Wed, 4 Nov 2015 12:47:28 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA4ClSNA003265; Wed, 4 Nov 2015 12:47:28 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201511041247.tA4ClSNA003265@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 4 Nov 2015 12:47:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r290364 - 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.20 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, 04 Nov 2015 12:47:29 -0000 Author: pho Date: Wed Nov 4 12:47:27 2015 New Revision: 290364 URL: https://svnweb.freebsd.org/changeset/base/290364 Log: Added two more OoVM test scenarios. Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/bio.sh (contents, props changed) user/pho/stress2/misc/rw.sh (contents, props changed) Added: user/pho/stress2/misc/bio.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/bio.sh Wed Nov 4 12:47:27 2015 (r290364) @@ -0,0 +1,207 @@ +#!/bin/sh + +# +# Copyright (c) 2015 EMC Corp. +# 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$ +# + +# mmap() & read()/write() on same file. +# Test scenario suggestion by: jeff@ + +# Out of VM deadlock seen: +# https://people.freebsd.org/~pho/stress/log/jeff114.txt + +# panic: deadlkres: possible deadlock detected: +# https://people.freebsd.org/~pho/stress/log/jeff115.txt + +. ../default.cfg +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +dir=/tmp +odir=`pwd` +cd $dir +ps=`sysctl -n hw.pagesize` +sed "1,/^EOF/d;s/\$ps/$ps/" < $odir/$0 > $dir/bio.c +mycc -o bio -Wall -Wextra -O0 -g bio.c || exit 1 +rm -f bio.c +cd $odir + +mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint +[ -c md$mdstart ] && mdconfig -d -u $mdstart +mdconfig -a -t swap -s 2g -u $mdstart || exit 1 +bsdlabel -w md$mdstart auto +newfs -n md${mdstart}$part > /dev/null +mount /dev/md${mdstart}$part $mntpoint + +(cd $mntpoint; /tmp/bio) & +sleep 5 +(cd ../testcases/swap; ./swap -t 10m -i 20 -k -l 100 -h) & + +while pgrep -q bio; do + sleep 2 +done + +while pgrep -q swap; do + pkill -9 swap +done +wait + +while mount | grep "on $mntpoint " | grep -q /dev/md; do + umount $mntpoint || sleep 1 +done +mdconfig -d -u $mdstart +rm -rf /tmp/bio +exit + +EOF +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#define PS $ps /* From hw.pagesize */ +#define SYN1 0 +#define SYN2 1 +#define INDX 2 + +#define PAGES (512 * 1024 * 1024 / PS) /* 512MB file size */ +#define PARALLEL 3 +#define RUNTIME (5 * 60) + +char buf[PS]; + +void +test(int inx) +{ + size_t i, len, slen; + volatile u_int *share; + int fd, r; + u_int *ip, val; + char file[80]; + + slen = PS; + if ((share = mmap(NULL, slen, PROT_READ | PROT_WRITE, MAP_ANON | + MAP_SHARED, -1, 0)) == MAP_FAILED) + err(1, "mmap"); + + snprintf(file, sizeof(file), "file.%06d", inx); + if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0640)) < 0) + err(1, "%s", file); + + for (i = 0; i < PAGES; i++) { + if (write(fd, buf, sizeof(buf)) != sizeof(buf)) + err(1, "write error"); + } + + len = PS * PAGES * sizeof(u_int); + if ((ip = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, + fd, 0)) == MAP_FAILED) + err(1, "mmap"); + + if (fork() == 0) { + /* mmap read / write access */ + for (i = 0; i < (size_t)(PAGES * PS); i += PS) { + while (share[SYN1] == 0) + sched_yield(); + atomic_add_int(&share[SYN1], -1); + if (ip[share[INDX] / sizeof(u_int)] != share[INDX]) + warn("child expected %d, but got %d\n", + ip[share[INDX] / sizeof(u_int)], + share[INDX]); + share[INDX] += PS; + ip[share[INDX] / sizeof(u_int)] = share[INDX]; + atomic_add_int(&share[SYN2], 1); /* signal parent */ + } + _exit(0); + } + share[INDX] = 0; + atomic_add_int(&share[SYN2], 1); + for (i = 0; i < (size_t)(PAGES * PS); i += PS) { + while (share[SYN2] == 0) + sched_yield(); + atomic_add_int(&share[SYN2], -1); + if (lseek(fd, share[INDX], SEEK_SET) == -1) + err(1, "lseek error"); + if ((r = read(fd, &val, sizeof(val))) != sizeof(val)) + err(1, "parent read read %d bytes", r); + if (val != share[INDX]) + warn("parent expected %d, but got %d\n", + share[INDX], val); + val += PS; + if (lseek(fd, val, SEEK_SET) == -1) + err(1, "lseek error"); + if (write(fd, &val, sizeof(val)) != sizeof(val)) + err(1, "write"); + + atomic_add_int(&share[SYN1], 1); /* signal child */ + } + atomic_add_int(&share[SYN2], -1); + if (wait(NULL) == -1) + err(1, "wait"); + + if (munmap(ip, len) == -1) + err(1, "unmap()"); + if (munmap((void *)share, slen) == -1) + err(1, "unmap()"); + close(fd); + if (unlink(file) == -1) + err(1, "unlink(%s)", file); + + _exit(0); +} + +int +main(void) +{ + time_t start; + int i, s, status; + + start = time(NULL); + s = 0; + while ((time(NULL) - start) < RUNTIME && s == 0) { + for (i = 0; i < PARALLEL; i++) { + if (fork() == 0) + test(i); + } + for (i = 0; i < PARALLEL; i++) { + if (wait(&status) == -1) + err(1, "wait"); + s += WEXITSTATUS(status); + } + } + + return (s); +} Added: user/pho/stress2/misc/rw.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/rw.sh Wed Nov 4 12:47:27 2015 (r290364) @@ -0,0 +1,67 @@ +#!/bin/sh + +# +# Copyright (c) 2015 EMC Corp. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +# Simple read / write test scenario with VM pressure. + +# Out of VM seen: +# 100135 D vmwait 0xffffffff81d1a348 [CAM taskq] +# https://people.freebsd.org/~pho/stress/log/rw.txt + +. ../default.cfg + +mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart + +mdconfig -a -t swap -s 2g -u $mdstart || exit 1 +bsdlabel -w md$mdstart auto + +newfs $newfs_flags md${mdstart}$part > /dev/null + +mount /dev/md${mdstart}$part $mntpoint +chmod 777 $mntpoint + +export runRUNTIME=10m +export RUNDIR=$mntpoint/stressX + +export rwLOAD=100 +export swapLOAD=100 +export TESTPROGS=" +testcases/rw/rw +testcases/swap/swap +" + +su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' + +while mount | grep "on $mntpoint " | grep -q /dev/md; do + umount $mntpoint || sleep 1 +done +mdconfig -d -u $mdstart