Index: user/pho/stress2/misc/datamove3.sh =================================================================== --- user/pho/stress2/misc/datamove3.sh (revision 297412) +++ user/pho/stress2/misc/datamove3.sh (revision 297413) @@ -1,247 +1,247 @@ #!/bin/sh # # Copyright (c) 2009 Peter Holm # 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$ # # Threaded variation of datamove.sh # Based on a test scenario by ups and suggestions by kib [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg here=`pwd` cd /tmp sed '1,/^EOF/d' < $here/$0 > datamove3.c mycc -o datamove3 -Wall datamove3.c -lpthread rm -f datamove3.c n=5 old=`sysctl vm.old_msync | awk '{print $NF}'` sysctl vm.old_msync=1 for i in `jot $n`; do mkdir -p /tmp/datamove3.dir.$i cd /tmp/datamove3.dir.$i /tmp/datamove3 & done cd /tmp for i in `jot $n`; do wait done for i in `jot $n`; do rm -rf /tmp/datamove3.dir.$i done sysctl vm.old_msync=$old rm -rf /tmp/datamove3 exit 0 EOF /*- * Copyright (c) 2006, Stephan Uphoff * 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 unmodified, 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 ``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 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. */ #include #include #include #include #include #include #include #include #include #include #include struct args { char *bp; int fd1; int fd2; } a[2]; int prepareFile(char *, int *); void * mapBuffer(void *); int startIO(int, char *); int pagesize; #define FILESIZE (32*1024) char wbuffer [FILESIZE]; /* Create a FILESIZE sized file - then remove file data from the cache */ int prepareFile(char *filename, int *fdp) { int fd; int len; int status; void *addr; fd = open(filename, O_CREAT | O_TRUNC | O_RDWR, S_IRWXU); if (fd == -1) { perror("Creating file"); return fd; } len = write(fd, wbuffer, FILESIZE); if (len < 0) { perror("Write failed"); return 1; } status = fsync(fd); if (status != 0) { perror("fsync failed"); return 1; } addr = mmap(NULL, FILESIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); if (addr == MAP_FAILED) { perror("Mmap failed"); return 1; } status = msync(addr, FILESIZE, MS_INVALIDATE | MS_SYNC); if (status != 0) { perror("Msync failed"); return 1; } munmap(addr, FILESIZE); *fdp = fd; return 0; } /* mmap a 2 page buffer - first page is from fd1, second page from fd2 */ void * mapBuffer(void *ar) { void *addr; char *buffer; int i; i = (int )ar; addr = mmap(NULL, pagesize * 2, PROT_READ | PROT_WRITE, MAP_SHARED, a[i].fd1, 0); if (addr == MAP_FAILED) { err(1, "Mmap failed"); } buffer = addr; addr = mmap(buffer + pagesize, pagesize, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, a[i].fd2, 0); if (addr == MAP_FAILED) { err(1, "Mmap2 failed"); } a[i].bp = buffer; sleep(1); return (NULL); } int startIO(int fd, char *buffer) { ssize_t len; len = write(fd, buffer, 2 * pagesize); if (len == -1) { warn("startIO(%d, %p): write failed", fd, buffer); return 1; } return 0; } int main(int argc, char *argv[], char *envp[]) { int fdA, fdB, fdDelayA, fdDelayB; int r, status; char *bufferA, *bufferB; pid_t pid; pthread_t threads[2]; pagesize = getpagesize(); if ((prepareFile("A", &fdA)) || (prepareFile("B", &fdB)) || (prepareFile("DelayA", &fdDelayA)) || (prepareFile("DelayB", &fdDelayB))) exit(1); a[0].fd1 = fdDelayA; a[0].fd2 = fdB; a[1].fd1 = fdDelayB; a[1].fd2 = fdA; if ((r = pthread_create(&threads[0], NULL, mapBuffer, (void *)0)) != 0) - err(1, "pthread_create(): %s\n", strerror(r)); + errc(1, r, "pthread_create()"); if ((r = pthread_create(&threads[1], NULL, mapBuffer, (void *)1)) != 0) - err(1, "pthread_create(): %s\n", strerror(r)); + errc(1, r, "pthread_create()"); while (a[0].bp == NULL || a[1].bp == NULL) pthread_yield(); bufferA = a[0].bp; bufferB = a[1].bp; pid = fork(); if (pid == 0) { status = startIO(fdA, bufferA); exit(status); } if (pid == -1) { exit(1); } status = startIO(fdB, bufferB); exit(status); } Index: user/pho/stress2/misc/datamove4.sh =================================================================== --- user/pho/stress2/misc/datamove4.sh (revision 297412) +++ user/pho/stress2/misc/datamove4.sh (revision 297413) @@ -1,253 +1,256 @@ #!/bin/sh # # Copyright (c) 2012 Peter Holm # 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$ # # Variation of the datamove2.sh, using TMPFS # Deadlock seen # https://people.freebsd.org/~pho/stress/log/datamove4.txt # panic: elf32_putnote: Note type 10 changed as we read it (2236 > 2220)... # https://people.freebsd.org/~pho/stress/log/datamove4-2.txt # Fixed by r288944. [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg here=`pwd` cd /tmp sed '1,/^EOF/d' < $here/$0 > datamove4.c mycc -o datamove4 -Wall -Wextra -O2 -g datamove4.c rm -f datamove4.c mount | grep -q "$mntpoint " && umount $mntpoint mount -t tmpfs tmpfs $mntpoint chmod 777 $mntpoint for i in `jot 5`; do su $testuser -c "cd $mntpoint; /tmp/datamove4" done while mount | grep -q $mntpoint; do umount -f $mntpoint > /dev/null 2>&1 done rm -rf /tmp/datamove4 exit 0 EOF /*- * Copyright (c) 2006, Stephan Uphoff * 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 unmodified, 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 ``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 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. */ #include #include #include #include #include #include #include #include #include int prepareFile(char *filename, int *fdp); int mapBuffer (char **bufferp, int fd1, int fd2); int startIO (int fd, char *buffer); int pagesize; #define FILESIZE (32*1024) char wbuffer [FILESIZE]; /* Create a FILESIZE sized file - then remove file data from the cache */ int prepareFile(char *filename, int *fdp) { int fd; int len; int status; void *addr; fd = open(filename, O_CREAT | O_TRUNC | O_RDWR, S_IRWXU); if (fd == -1) { perror(filename); return fd; } len = write(fd, wbuffer, FILESIZE); if (len < 0) { perror("Write failed"); return 1; } status = fsync(fd); if (status != 0) { perror("fsync failed"); return 1; } addr = mmap(NULL, FILESIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); if (addr == MAP_FAILED) { perror("Mmap failed"); return 1; } status = msync(addr, FILESIZE, MS_INVALIDATE | MS_SYNC); if (status != 0) { perror("Msync failed"); return 1; } if (munmap(addr, FILESIZE) == -1) { perror("munmap failed"); return 1; } *fdp = fd; return 0; } /* mmap a 2 page buffer - first page is from fd1, second page from fd2 */ int mapBuffer(char **bufferp, int fd1, int fd2) { void *addr; char *buffer; addr = mmap(NULL, pagesize * 2, PROT_READ | PROT_WRITE, MAP_SHARED, fd1, 0); if (addr == MAP_FAILED) { perror("Mmap failed"); return 1; } buffer = addr; addr = mmap(buffer + pagesize, pagesize, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd2, 0); if (addr == MAP_FAILED) { perror("Mmap2 failed"); return 1; } *bufferp = buffer; return 0; } void unmapBuffer(char *bufferp) { if (munmap(bufferp, pagesize * 2) == -1) err(1, "unmap 1. buffer"); /* The following unmaps something random, which could trigger: Program received signal SIGSEGV, Segmentation fault. free (cp=0x28070000) at /usr/src/libexec/rtld-elf/malloc.c:311 */ + +#if 0 if (munmap(bufferp + pagesize * 2, pagesize * 2) == -1) err(1, "unmap 2. buffer"); +#endif } int startIO(int fd, char *buffer) { ssize_t len; len = write(fd, buffer, 2 * pagesize); if (len == -1) { perror("write failed"); return 1; } return 0; } int main() { int fdA, fdB, fdDelayA, fdDelayB; int status; int i; char *bufferA, *bufferB; pid_t pid; pagesize = getpagesize(); for (i = 0; i < 1000; i++) { if ((prepareFile("A", &fdA)) || (prepareFile("B", &fdB)) || (prepareFile("DelayA", &fdDelayA)) || (prepareFile("DelayB", &fdDelayB)) || (mapBuffer(&bufferA, fdDelayA, fdB)) || (mapBuffer(&bufferB, fdDelayB, fdA))) exit(1); pid = fork(); if (pid == 0) { status = startIO(fdA, bufferA); exit(status); } if (pid == -1) { perror("fork"); exit(1); } status = startIO(fdB, bufferB); if (wait(&status) == -1) err(1, "wait"); close(fdA); close(fdB); close(fdDelayA); close(fdDelayB); unmapBuffer(bufferA); unmapBuffer(bufferB); unlink("A"); unlink("B"); unlink("DelayA"); unlink("DelayB"); } exit(status); }