From owner-svn-src-user@freebsd.org Wed Oct 10 09:26:01 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E330210CDF73 for ; Wed, 10 Oct 2018 09:26:00 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 99C2A763D7; Wed, 10 Oct 2018 09:26: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 760311F040; Wed, 10 Oct 2018 09:26: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 w9A9Q0m1012179; Wed, 10 Oct 2018 09:26:00 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9A9PxPv012172; Wed, 10 Oct 2018 09:25:59 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201810100925.w9A9PxPv012172@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 10 Oct 2018 09:25:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r339279 - in user/pho/stress2: misc tools X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: in user/pho/stress2: misc tools X-SVN-Commit-Revision: 339279 X-SVN-Commit-Repository: base 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.27 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, 10 Oct 2018 09:26:01 -0000 Author: pho Date: Wed Oct 10 09:25:59 2018 New Revision: 339279 URL: https://svnweb.freebsd.org/changeset/base/339279 Log: Added a NUMA test scenario. Sponsored by: Dell EMC Isilon Added: user/pho/stress2/misc/cpuset.sh (contents, props changed) user/pho/stress2/misc/ufsbench.sh (contents, props changed) user/pho/stress2/tools/bench.c Added: user/pho/stress2/misc/cpuset.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/cpuset.sh Wed Oct 10 09:25:59 2018 (r339279) @@ -0,0 +1,51 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2018 Dell EMC Isilon +# +# 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$ +# + +# Deadlock with one really small domain: +# https://people.freebsd.org/~pho/stress/log/mark074.txt + +[ `sysctl -n vm.ndomains` -eq 1 ] && exit 0 + +#set -e +# * round-robin:0-4 explicit +# * round-robin:all explicit root domains +# * 0-4 implicit root policy +# * round-robin implicit root domains +# * all explicit root domains and implicit policy + +for p in "round-robin:0" "round-robin:1" "round-robin:0-1" \ + "round-robin:all" "0-1" round-robin all first-touch prefer:1 \ + interleave; do + echo "`date +%T` cpuset -n $p" + cpuset -n $p ../misc/ufsbench.sh +done + +exit 0 Added: user/pho/stress2/misc/ufsbench.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/ufsbench.sh Wed Oct 10 09:25:59 2018 (r339279) @@ -0,0 +1,60 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2018 Dell EMC Isilon +# +# 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$ +# + +# Simple non random fs test + +. ../default.cfg +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +mycc -o /tmp/ufsbench -Wall -Wextra -O0 -g ../tools/bench.c || exit 1 + +mount | grep "on $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 +bsdlabel -w md$mdstart auto + +s=0 +for j in `jot 5`; do + newfs -n -b 4096 -f 512 -i 1024 md${mdstart}$part > \ + /dev/null + mount -o async /dev/md${mdstart}$part $mntpoint + (cd $mntpoint; /tmp/ufsbench) + [ $? -ne 0 ] && s=1 + for i in `jot 6`; do + umount $mntpoint && break || sleep 10 + mount | grep -q "on $mntpoint " || break + done + [ $i -eq 6 ] && exit 1 +done + +mdconfig -d -u $mdstart +rm -rf /tmp/ufsbench +exit $s Added: user/pho/stress2/tools/bench.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/tools/bench.c Wed Oct 10 09:25:59 2018 (r339279) @@ -0,0 +1,357 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2018 Dell EMC Isilon + * + * 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$ + */ + +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#define PARALLEL 3 +#define SYNC 0 + +static void cr1(void); +static void cr2(void); +static void cr3(void); +static void rn1(void); +static void rw1(void); +static void rw2(void); +static void (*functions[])(void) = {&cr1, &cr2, &cr3, &rn1, &rw1, &rw2}; + +static volatile u_int *share; +static int tests; + +static void +cr1(void) +{ + int fd, i, j; + int loops = 9000; + char file[128]; + + setproctitle("%s sync", __func__); + atomic_add_int(&share[SYNC], 1); + while (share[SYNC] != (volatile u_int)tests * PARALLEL) + usleep(100); + setproctitle("%s", __func__); + for (j = 0; j < 10; j++) { + for (i = 0; i < loops; i++) { + snprintf(file, sizeof(file), "%s.%06d.%03d", + __func__, getpid(), i); + if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, + DEFFILEMODE)) == -1) + err(1, "open(%s)", file); + close(fd); + if (i % 1000 == 0) + usleep(100); + } + for (i = 0; i < loops; i++) { + snprintf(file, sizeof(file), "%s.%06d.%03d", + __func__, getpid(), i); + if (unlink(file) == -1) + err(1, "unlink(%s)", file); + } + } +} + +static void +cr2(void) +{ + int fd, i, j; + char file[1024]; + + setproctitle("%s sync", __func__); + atomic_add_int(&share[SYNC], 1); + while (share[SYNC] != (volatile u_int)tests * PARALLEL) + usleep(100); + setproctitle("%s", __func__); + for (j = 0; j < 3; j++) { + for (i = 0; i < 40000; i++) { + snprintf(file, sizeof(file), "%s.%06d.%03d", + __func__, getpid(), i); + if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, + DEFFILEMODE)) == -1) + err(1, "open(%s)", file); + close(fd); + if (unlink(file) == -1) + err(1, "unlink(%s)", file); + if (i % 1000 == 0) + usleep(100); + } + } +} + +static void +cr3(void) +{ + int fd, i, j; + int loops = 10000; + char file[1024], path[1024]; + + setproctitle("%s sync", __func__); + atomic_add_int(&share[SYNC], 1); + while (share[SYNC] != (volatile u_int)tests * PARALLEL) + usleep(100); + setproctitle("%s", __func__); + getcwd(path, sizeof(path)); + for (j = 0; j < 7; j++) { + for (i = 0; i < loops; i++) { + snprintf(file, sizeof(file), "%s/%s.%06d.%03d", + path, __func__, getpid(), i); + if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, + DEFFILEMODE)) == -1) + err(1, "open(%s)", file); + close(fd); + if (i % 1000 == 0) + usleep(100); + } + for (i = 0; i < loops; i++) { + snprintf(file, sizeof(file), "%s/%s.%06d.%03d", + path, __func__, getpid(), i); + if (unlink(file) == -1) + err(1, "unlink(%s)", file); + } + } +} + +static void +rn1(void) +{ + int fd, i, j; + int loops = 10000; + char file[128], new[128]; + + setproctitle("%s sync", __func__); + atomic_add_int(&share[SYNC], 1); + while (share[SYNC] != (volatile u_int)tests * PARALLEL) + usleep(100); + setproctitle("%s", __func__); + + for (j = 0; j < 8; j++) { + for (i = 0; i < loops; i++) { + snprintf(file, sizeof(file), "%s.%06d.%03d", + __func__, getpid(), i); + if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, + DEFFILEMODE)) == -1) + err(1, "open(%s)", file); + close(fd); + snprintf(new, sizeof(new), "%s.%06d.%03d.new", + __func__, getpid(), i); + if (rename(file, new) == -1) + err(1, "rename(%s, %s)", file, new); + if (unlink(new) == -1) + err(1, "unlink(%s)", new); + if (i % 1000 == 0) + usleep(100); + } + } +} + +static void +rw1(void) +{ + int fd, i; + int loops = 10000; + char buf[512], file[128]; + + setproctitle("%s sync", __func__); + atomic_add_int(&share[SYNC], 1); + while (share[SYNC] != (volatile u_int)tests * PARALLEL) + usleep(100); + + setproctitle("%s", __func__); + memset(buf, 0, sizeof(buf)); + for (i = 0; i < loops; i++) { + snprintf(file, sizeof(file), "rw1.%06d.%03d", getpid(), i); + if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, + DEFFILEMODE)) == -1) + err(1, "open(%s)", file); + if (write(fd, buf, sizeof(buf)) != sizeof(buf)) + err(1, "write(%s)", file); + close(fd); + } + for (i = 0; i < loops; i++) { + snprintf(file, sizeof(file), "rw1.%06d.%03d", getpid(), i); + if ((fd = open(file, O_RDONLY)) == -1) + err(1, "open(%s)", file); + if (read(fd, buf, sizeof(buf)) != sizeof(buf)) + err(1, "write(%s)", file); + close(fd); + usleep(100); + } + for (i = 0; i < loops; i++) { + snprintf(file, sizeof(file), "rw1.%06d.%03d", getpid(), i); + if (unlink(file) == -1) + err(1, "unlink(%s)", file); + } +} + +static void +rw2(void) +{ + int fd, i; + int loops = 8000; + int siz = 4096; + char *buf, file[128]; + + setproctitle("%s sync", __func__); + atomic_add_int(&share[SYNC], 1); + while (share[SYNC] != (volatile u_int)tests * PARALLEL) + usleep(100); + + setproctitle("%s", __func__); + buf = calloc(1, siz); + for (i = 0; i < loops; i++) { + snprintf(file, sizeof(file), "rw1.%06d.%03d", getpid(), i); + if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, + DEFFILEMODE)) == -1) + err(1, "open(%s)", file); + if (write(fd, buf, siz) != siz) + err(1, "write(%s)", file); + close(fd); + } + for (i = 0; i < loops; i++) { + snprintf(file, sizeof(file), "rw1.%06d.%03d", getpid(), i); + if ((fd = open(file, O_RDONLY)) == -1) + err(1, "open(%s)", file); + if (read(fd, buf, siz) != siz) + err(1, "write(%s)", file); + close(fd); + usleep(100); + } + for (i = 0; i < loops; i++) { + snprintf(file, sizeof(file), "rw1.%06d.%03d", getpid(), i); + if (unlink(file) == -1) + err(1, "unlink(%s)", file); + } +} + +static void +spawn(void f(), int idx) +{ + pid_t pids[PARALLEL]; + int i, status; + char dir[128]; + + snprintf(dir, sizeof(dir), "f%d.%d.d",getpid(), idx); + rmdir(dir); + if (mkdir(dir, 0770) == -1) + err(1, "mkdir(%s)", dir); + if (chdir(dir) == -1) + err(1, "chdir(%s)", dir); + for (i = 0; i < PARALLEL; i++) { + if ((pids[i] = fork()) == 0) { + f(); + _exit(0); + } + if (pids[i] == -1) + err(1, "fork(). %s:%d", __func__, __LINE__); + } + for (i = 0; i < PARALLEL; i++) { + if (waitpid(pids[i], &status, 0) != pids[i]) + err(1, "waitpid(). %s:%d", __func__, __LINE__); + } + if (chdir("..") == -1) + err(1, "chdir(..)"); + if (rmdir(dir) == -1) + err(1, "rmdir(%s)", dir); + +} + +void +usage(void) +{ + fprintf(stderr, "Usage: %s [-t]\n", getprogname()); + exit(1); +} + +int +main(int argc, char *argv[]) +{ + pid_t *pids; + struct timeval t1, t2, diff; + size_t len; + time_t start; + int ch, i, status, timing; + + timing = 0; + while ((ch = getopt(argc, argv, "t")) != -1) + switch(ch) { + case 't': + timing = 1; + break; + default: + usage(); + } + argc -= optind; + argv += optind; + + setproctitle("%s", __func__); + tests = (int)(sizeof(functions) / sizeof(functions[0])); + pids = malloc(tests * sizeof(pid_t)); + len = PAGE_SIZE; + if ((share = mmap(NULL, len, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_SHARED, -1, 0)) == MAP_FAILED) + err(1, "mmap"); + + gettimeofday(&t1, NULL); + for (i = 0; i < tests; i++) { + if ((pids[i] = fork()) == 0) { + start = time(NULL); + spawn(functions[i], i); +#if defined(DEBUG) + fprintf(stderr, "%d: %d elapsed\n", i , + time(NULL) - start); +#endif + _exit(0); + } + if (pids[i] == -1) + err(1, "fork(). %s:%d", __func__, __LINE__); + } + for (i = 0; i < tests; i++) { + if (waitpid(pids[i], &status, 0) != pids[i]) + err(1, "waitpid(%d). i=%d %s:%d", pids[i], i, + __func__, __LINE__); + } + gettimeofday(&t2, NULL); + timersub(&t2, &t1, &diff); + if (timing == 1) + printf("%jd.%06ld\n",(intmax_t)diff.tv_sec, diff.tv_usec); + + return (0); +}