Index: user/pho/stress2/misc/kinfo2.sh
===================================================================
--- user/pho/stress2/misc/kinfo2.sh	(revision 295588)
+++ user/pho/stress2/misc/kinfo2.sh	(revision 295589)
@@ -1,176 +1,176 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2008 Peter Holm <pho@FreeBSD.org>
 # 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$
 #
 
 # Test scenario by marcus@freebsd.org
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 odir=`pwd`
 cd /tmp
 sed '1,/^EOF/d' < $odir/$0 > kinfo2.c
 mycc -o kinfo2 -Wall kinfo2.c -lutil
 rm -f kinfo2.c
 
-mount | grep -q procfs || mount -t procfs procfs /procfs
+mount | grep -q procfs || mount -t procfs procfs /proc
 for i in `jot 30`; do
 	for j in `jot 5`; do
 		/tmp/kinfo2 &
 	done
 
 	for j in `jot 5`; do
 		wait
 	done
 done
 
 rm -f /tmp/kinfo2
 exit
 EOF
 
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/signal.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <err.h>
 #include <strings.h>
 #include <sys/wait.h>
 #include <libutil.h>
 
 char buf[8096];
 
 void
 handler(int i) {
 	exit(0);
 }
 
 /* Stir /dev/proc */
 int
 churning(void) {
 	pid_t r;
 	int fd, status;
 
 	for (;;) {
 		r = fork();
 		if (r == 0) {
 			if ((fd = open("/proc/curproc/mem", O_RDONLY)) == -1)
 				err(1, "open(/proc/curproc/mem)");
 			bzero(buf, sizeof(buf));
 			exit(0);
 		}
 		if (r < 0) {
 			perror("fork");
 			exit(2);
 		}
 		wait(&status);
 	}
 }
 
 /* Get files for each proc */
 void
 list(void)
 {
 	int cnt, fd, n;
 	int space = sizeof(buf);
 	long base;
 	struct dirent *dp;
         struct kinfo_file *freep;
 	struct kinfo_vmentry *freep_vm;
 	char *bp = buf;
 	pid_t pid;
 	long l;
 	char *dummy;
 
 	if ((fd = open("/proc", O_RDONLY)) == -1)
 		err(1, "open(%s)", "/proc");
 
 	do {
 		if ((n = getdirentries(fd, bp, space, &base)) == -1)
 			err(1, "getdirentries");
 		space = space - n;
 		bp   = bp + n;
 	} while (n != 0);
 	close(fd);
 
 	bp = buf;
 	dp = (struct dirent *)bp;
 	for (;;) {
 #if 0
 		printf("name: %-10s, inode %7d, type %2d, namelen %d, d_reclen %d\n",
 				dp->d_name, dp->d_fileno, dp->d_type, dp->d_namlen,
 				dp->d_reclen); fflush(stdout);
 #endif
 
 		if (dp->d_type == DT_DIR &&
 				(dp->d_name[0] >= '0' && dp->d_name[0] <= '9')) {
 			l = strtol(dp->d_name, &dummy, 10);
 			pid = l;
 
 			/* The tests start here */
 			freep = kinfo_getfile(pid, &cnt);
 			free(freep);
 
 			freep_vm = kinfo_getvmmap(pid, &cnt);
 			free(freep_vm);
 			/* End test */
 		}
 
 		bp = bp + dp->d_reclen;
 		dp = (struct dirent *)bp;
 		if (dp->d_reclen <= 0)
 			break;
 	}
 }
 
 int
 main(int argc, char **argv)
 {
 	pid_t r;
 	signal(SIGALRM, handler);
 	alarm(60);
 
 	if ((r = fork()) == 0) {
 		alarm(60);
 		for (;;)
 			churning();
 	}
 	if (r < 0) {
 		perror("fork");
 		exit(2);
 	}
 
 	for (;;)
 		list();
 
 	return (0);
 }
Index: user/pho/stress2/misc/kinfo3.sh
===================================================================
--- user/pho/stress2/misc/kinfo3.sh	(revision 295588)
+++ user/pho/stress2/misc/kinfo3.sh	(revision 295589)
@@ -1,194 +1,194 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2008 Peter Holm <pho@FreeBSD.org>
 # 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$
 #
 
 # Test scenario by marcus@freebsd.org and kib@freebsd.org
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 odir=`pwd`
 cd /tmp
 sed '1,/^EOF/d' < $odir/$0 > kinfo3.c
 mycc -o kinfo3 -Wall kinfo3.c -lutil -pthread
 rm -f kinfo3.c
 
-mount | grep -q procfs || mount -t procfs procfs /procfs
+mount | grep -q procfs || mount -t procfs procfs /proc
 for i in `jot 30`; do
 	for j in `jot 5`; do
 		/tmp/kinfo3 &
 	done
 
 	for j in `jot 5`; do
 		wait
 	done
 done
 
 rm -f /tmp/kinfo3
 exit
 EOF
 
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/sysctl.h>
 #include <sys/param.h>
 #include <sys/user.h>
 #include <sys/signal.h>
 #include <fcntl.h>
 #include <err.h>
 #include <strings.h>
 #include <string.h>
 #include <sys/wait.h>
 #include <libutil.h>
 #include <pthread.h>
 
 char buf[8096];
 static volatile sig_atomic_t more;
 
 void
 handler(int i) {
 	more = 0;
 }
 
 void *
 thr(void *arg)
 {
 	int fd;
 	if ((fd = open("/proc/curproc/mem", O_RDONLY)) == -1)
 		err(1, "open(/proc/curproc/mem)");
 	close(fd);
 	return (0);
 }
 
 
 /* Stir /dev/proc */
 int
 churning(void) {
 	int i;
 	pid_t r;
 	int status;
 	pthread_t threads[5];
 
 
 	while(more) {
 		r = fork();
 		if (r == 0) {
 			for (i = 0; i < 5; i++) {
 				if ((r = pthread_create(&threads[i], NULL, thr, 0)) != 0)
 					errc(1, r, "pthread_create()");
 			}
 			for (i = 0; i < 5; i++) {
 				if ((r = pthread_join(threads[i], NULL)) != 0)
 						errc(1, r, "pthread_join(%d)", i);
 			}
 
 			bzero(buf, sizeof(buf));
 			exit(0);
 		}
 		if (r < 0) {
 			perror("fork");
 			exit(2);
 		}
 		wait(&status);
 	}
 	exit(0);
 }
 
 /* Get files for each proc */
 void
 list(void)
 {
         struct kinfo_file *freep, *kif;
 	struct kinfo_vmentry *freep_vm;
 	long i, j;
 	int cnt, name[4];
 	struct kinfo_proc *kipp;
 	size_t len;
 
 	name[0] = CTL_KERN;
 	name[1] = KERN_PROC;
 	name[2] = KERN_PROC_PROC;
 
 	len = 0;
 	if (sysctl(name, 3, NULL, &len, NULL, 0) < 0)
 		err(-1, "sysctl: kern.proc.all");
 
 	kipp = malloc(len);
 	if (kipp == NULL)
 		err(1, "malloc");
 
 	if (sysctl(name, 3, kipp, &len, NULL, 0) < 0) {
 		free(kipp);
 //		warn("sysctl: kern.proc.all");
 		return;
 	}
 
 	for (i = 0; i < len / sizeof(*kipp); i++) {
 
 		/* The test starts here */
 		freep = kinfo_getfile(kipp[i].ki_pid, &cnt);
 		for (j = 0; j < cnt && freep; j++) {
 			kif = &freep[j];
 //			printf("%d : %s\n", kif->kf_fd, kif->kf_path);
 		}
 		free(freep);
 
 		freep_vm = kinfo_getvmmap(kipp[i].ki_pid, &cnt);
 		free(freep_vm);
 		/* End test */
 	}
 	free(kipp);
 }
 
 int
 main(int argc, char **argv)
 {
 	pid_t r;
 	signal(SIGALRM, handler);
 	alarm(30);
 
 	more = 1;
 	if ((r = fork()) == 0) {
 		alarm(30);
 		while(more)
 			churning();
 	}
 	if (r < 0) {
 		perror("fork");
 		exit(2);
 	}
 
 	while(more)
 		list();
 
 	return (0);
 }
Index: user/pho/stress2/misc/nullfs5.sh
===================================================================
--- user/pho/stress2/misc/nullfs5.sh	(revision 295588)
+++ user/pho/stress2/misc/nullfs5.sh	(revision 295589)
@@ -1,77 +1,77 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2009 Peter Holm <pho@FreeBSD.org>
 # 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$
 #
 
 # Composite test: nullfs2.sh + kinfo.sh
 
 # Kernel page fault with the following non-sleepable locks held from
 # nullfs/null_vnops.c:531
 
 # Fatal trap 12: page fault while in kernel mode
 # https://people.freebsd.org/~pho/stress/log/jeff106.txt
 
 # panic: vholdl: inactive held vnode:
 # https://people.freebsd.org/~pho/stress/log/kostik815.txt
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 # NULLFS(5) and SUJ has known issues.
 mount | grep "on `df $RUNDIR | sed  '1d;s/.* //'` " | \
     grep -q  "journaled soft-updates" &&
     { echo "Skipping test due to SUJ."; exit 0; }
 
 odir=`pwd`
 cd /tmp
 sed '1,/^EOF/d;s/60/600/' < $odir/kinfo.sh > kinfo.c
 mycc -o kinfo -Wall -g kinfo.c -lutil
 rm -f kinfo.c
 cd $odir
 
-mount | grep -q procfs || mount -t procfs procfs /procfs
+mount | grep -q procfs || mount -t procfs procfs /proc
 
 for j in `jot 5`; do
 	/tmp/kinfo &
 done
 
 mount | grep -q $mntpoint && umount -f $mntpoint
 
 mount -t nullfs `dirname $RUNDIR` $mntpoint
 
 export RUNDIR=$mntpoint/stressX
 export runRUNTIME=10m
 (cd ..; ./run.sh marcus.cfg)
 
 umount $mntpoint 2>&1 | grep -v busy
 
 mount | grep -q $mntpoint && umount -f $mntpoint
 
 wait
 rm -f /tmp/kinfo