Index: user/pho/stress2/testcases/lockf/lockf.c =================================================================== --- user/pho/stress2/testcases/lockf/lockf.c (revision 303107) +++ user/pho/stress2/testcases/lockf/lockf.c (revision 303108) @@ -1,165 +1,173 @@ /*- * Copyright (c) 2008 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. * */ /* Test lockf(3) */ #include __FBSDID("$FreeBSD$"); -#include -#include -#include -#include -#include #include #include -#include -#include + #include +#include +#include +#include +#include +#include +#include #include -char file[128]; +pid_t pid; int fd; int freespace; -pid_t pid; +char file[128]; int get(void) { - int sem; - if (lockf(fd, F_LOCK, 0) == -1) + int r, sem; + + do { + r = lockf(fd, F_LOCK, 0); + } while (r == -1 && errno == EINTR); + if (r == -1) err(1, "lockf(%s, F_LOCK)", file); if (read(fd, &sem, sizeof(sem)) != sizeof(sem)) err(1, "get: read(%d)", fd); if (lseek(fd, 0, SEEK_SET) == -1) err(1, "lseek"); if (lockf(fd, F_ULOCK, 0) == -1) err(1, "lockf(%s, F_ULOCK)", file); return (sem); } void incr(void) { - int sem; - if (lockf(fd, F_LOCK, 0) == -1) + int r, sem; + + do { + r = lockf(fd, F_LOCK, 0); + } while (r == -1 && errno == EINTR); + if (r == -1) err(1, "lockf(%s, F_LOCK)", file); if (read(fd, &sem, sizeof(sem)) != sizeof(sem)) err(1, "incr: read(%d)", fd); if (lseek(fd, 0, SEEK_SET) == -1) err(1, "lseek"); sem++; if (write(fd, &sem, sizeof(sem)) != sizeof(sem)) err(1, "incr: read"); if (lseek(fd, 0, SEEK_SET) == -1) err(1, "lseek"); if (lockf(fd, F_ULOCK, 0) == -1) err(1, "lockf(%s, F_ULOCK)", file); } int setup(int nb) { int64_t bl; int64_t in; int64_t reserve_bl; int64_t reserve_in; if (nb == 0) { getdf(&bl, &in); /* Resource requirements: */ reserve_in = 1 * op->incarnations; reserve_bl = 4096 * op->incarnations; freespace = (reserve_bl <= bl && reserve_in <= in); if (!freespace) reserve_bl = reserve_in = 0; if (op->verbose > 1) printf("lockf(incarnations=%d). Free(%jdk, %jd), reserve(%jdk, %jd)\n", op->incarnations, bl/1024, in, reserve_bl/1024, reserve_in); reservedf(reserve_bl, reserve_in); putval(freespace); } else { freespace = getval(); } if (!freespace) exit(0); return (0); } void cleanup(void) { } int test(void) { int i; int sem = 0; sprintf(file, "lockf.0.%d", getpid()); if ((fd = open(file,O_CREAT | O_TRUNC | O_RDWR, 0600)) == -1) err(1, "creat(%s)", file); if (write(fd, &sem, sizeof(sem)) != sizeof(sem)) err(1, "write"); if (lseek(fd, 0, SEEK_SET) == -1) err(1, "lseek"); pid = fork(); if (pid == -1) { perror("fork"); exit(2); } if (pid == 0) { /* child */ for (i = 0; i < 100; i++) { while ((get() & 1) == 0) ; if (op->verbose > 3) printf("Child %d, sem = %d\n", i, get()), fflush(stdout); incr(); } exit(0); } else { /* parent */ for (i = 0; i < 100; i++) { while ((get() & 1) == 1) ; if (op->verbose > 3) printf("Parent %d, sem = %d\n", i, get()), fflush(stdout); incr(); } } close(fd); waitpid(pid, &i, 0); unlink(file); return (0); } Index: user/pho/stress2/testcases/lockf2/lockf2.c =================================================================== --- user/pho/stress2/testcases/lockf2/lockf2.c (revision 303107) +++ user/pho/stress2/testcases/lockf2/lockf2.c (revision 303108) @@ -1,130 +1,133 @@ /*- * Copyright (c) 2008 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. * */ /* Test lockf(3) with overlapping ranges */ /* Provoked: lock order reversal: 1st 0xc50057a0 vnode interlock (vnode interlock) @ kern/kern_lockf.c:190 2nd 0xc14710e8 system map (system map) @ vm/vm_kern.c:296 */ #include __FBSDID("$FreeBSD$"); +#include + +#include +#include +#include #include #include -#include -#include -#include -#include #include -#include -#include +#include #include char file[128]; int fd; int freespace; int setup(int nb) { int64_t bl; int64_t in; int64_t reserve_bl; int64_t reserve_in; int i; char buf[1024]; if (nb == 0) { getdf(&bl, &in); /* Resource requirements: */ reserve_in = 1 * op->incarnations; reserve_bl = 1081344 * op->incarnations; freespace = (reserve_bl <= bl && reserve_in <= in); if (!freespace) reserve_bl = reserve_in = 0; if (op->verbose > 1) printf("lockf2(incarnations=%d). Free(%jdk, %jd), reserve(%jdk, %jd)\n", op->incarnations, bl/1024, in, reserve_bl/1024, reserve_in); reservedf(reserve_bl, reserve_in); putval(freespace); } else { freespace = getval(); } if (!freespace) exit (0); sprintf(file, "lockf.%d", getpid()); if ((fd = open(file,O_CREAT | O_TRUNC | O_RDWR, 0600)) == -1) err(1, "creat(%s)", file); bzero(buf, sizeof(buf)); for (i = 0; i < 1024; i++) if (write(fd, &buf, sizeof(buf)) != sizeof(buf)) err(1, "write"); close(fd); return (0); } void cleanup(void) { unlink(file); } int test(void) { - int i; off_t pos; off_t size; + int i, r; if ((fd = open(file, O_RDWR, 0600)) == -1) err(1, "open(%s)", file); for (i = 0; i < 1024 && done_testing == 0; i++) { pos = random_int(0, 1024 * 1024 - 1); if (lseek(fd, pos, SEEK_SET) == -1) err(1, "lseek"); size = random_int(1, 1024 * 1024 - pos); if (size > 64) size = 64; - if (lockf(fd, F_LOCK, size) == -1) + do { + r = lockf(fd, F_LOCK, size); + } while (r == -1 && errno == EINTR); + if (r == -1) err(1, "lockf(%s, F_LOCK)", file); size = random_int(1, size); if (lockf(fd, F_ULOCK, size) == -1) err(1, "lockf(%s, F_ULOCK)", file); } close(fd); return (0); }