From owner-svn-src-user@freebsd.org Mon Apr 27 05:23:44 2020 Return-Path: Delivered-To: svn-src-user@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 49A732A801D for ; Mon, 27 Apr 2020 05:23:44 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 499Y8w1bkXz4Q5v; Mon, 27 Apr 2020 05:23:44 +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 320B855A2; Mon, 27 Apr 2020 05:23:44 +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 03R5Nio0084995; Mon, 27 Apr 2020 05:23:44 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03R5NhfR084992; Mon, 27 Apr 2020 05:23:43 GMT (envelope-from pho@FreeBSD.org) Message-Id: <202004270523.03R5NhfR084992@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 27 Apr 2020 05:23:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r360364 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 360364 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.29 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: Mon, 27 Apr 2020 05:23:44 -0000 Author: pho Date: Mon Apr 27 05:23:43 2020 New Revision: 360364 URL: https://svnweb.freebsd.org/changeset/base/360364 Log: Added more sendfile(2) tests. Added: user/pho/stress2/misc/sendfile21.sh (contents, props changed) user/pho/stress2/misc/sendfile22.sh (contents, props changed) user/pho/stress2/misc/sendfile23.sh (contents, props changed) Added: user/pho/stress2/misc/sendfile21.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/sendfile21.sh Mon Apr 27 05:23:43 2020 (r360364) @@ -0,0 +1,245 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2020 Peter Holm +# +# 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$ +# + +# Konstantin Belousov wrote: +# 1. create a suffuciently large new file, e.g. of size 100 * PAGE_SIZE +# 2. fill the file with some data, so no holes exist +# 3. fsync it +# 4. mmap the file +# 5. for each odd-numbered page in the file, do msync(MS_INVALIDATE), +# but keep even-numbered pages intact +# 6. unmap the file +# 7. sendfile the file to a receiver (similar to existing tests in stress2) +# 8. compare received data with the content of file +# +# Without the fixes from r359767 and r359818, the kernel should panic or +# supply incorrect data to the sendfile peer. + +# "Fatal trap 9: general protection fault while in kernel mode +# (unp_dispose+0x99)" seen. +# https://people.freebsd.org/~pho/stress/log/sendfile21.txt +# Not seen on r359843 + +. ../default.cfg +[ `id -u` -ne 0 ] && echo "Must be root!" && exit 1 + +dir=/tmp +odir=`pwd` +cd $dir +sed '1,/^EOF/d' < $odir/$0 > $dir/sendfile21.c +mycc -o sendfile21 -Wall -Wextra -O0 -g sendfile21.c || exit 1 +rm -f sendfile21.c +cd $odir + +set -e +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 +bsdlabel -w md$mdstart auto +newfs $newfs_flags -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint +set +e + +cd $mntpoint +dd if=/dev/random of=input bs=4k count=100 status=none + +(cd $odir/../testcases/swap; ./swap -t 5m -i 20 -l 100 > /dev/null) & +sleep 30 +n=1 +start=` date +%s` +while [ $((` date +%s` - start)) -lt 180 ]; do + rm -f output +# The umount is needed to trigger the short read error + umount $mntpoint 2>/dev/null # busy umount + $dir/sendfile21 + s=$? + cmp -s input output || break + [ `stat -f '%z' input` -ne ` stat -f '%z' output` ] && break + n=$((n + 1)) +done +while pgrep -q swap; do + pkill swap +done +cmp -s input output || { echo "Loop #$n"; ls -l; s=1; } +wait +[ -f sendfile21.core -a $s -eq 0 ] && + { ls -l sendfile21.core; mv sendfile21.core $dir; s=1; } +cd $odir + +for i in `jot 6`; do + mount | grep -q "on $mntpoint " || break + umount $mntpoint && break || sleep 10 + [ $i -eq 6 ] && + { echo FATAL; fstat -mf $mntpoint; exit 1; } +done +mdconfig -d -u $mdstart +rm -rf $dir/sendfile21 +exit $s + +EOF +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#define DEBUG 1 + +static void +test(void) +{ + struct stat st; + off_t i, j, k, rd, written, pos; + pid_t pid; + int error, from, n, status, sv[2], to; + char buf[4086], *cp; + const char *from_name, *to_name; + + from_name = "input"; + to_name = "output"; + + if ((error = socketpair(AF_UNIX, SOCK_STREAM, 0, sv)) == -1) + err(1, "socketpair"); + + if ((from = open(from_name, O_RDONLY)) == -1) + err(1, "open read %s", from_name); + + if ((error = fstat(from, &st)) == -1) + err(1, "stat %s", from_name); + + pid = fork(); + if (pid == -1) + err(1, "fork"); + else if (pid != 0) { + setproctitle("parent"); + close(sv[1]); + + if ((cp = mmap(NULL, st.st_size, PROT_READ, + MAP_PRIVATE, from, 0)) == MAP_FAILED) + err(1, "mmap"); + if (fsync(from) == -1) + err(1, "fsync()"); + + for (i = 0; i < st.st_size; i += PAGE_SIZE) + k = cp[i]; /* touch all pages */ + + for (i = 0, j = 0; i < st.st_size; i += PAGE_SIZE, j++) { + if (j % 2 == 1) { + if (msync(cp + i, PAGE_SIZE, MS_INVALIDATE) + == -1) + err(1, "msync(), j = %d", (int)j); + } + } + if (munmap(cp, st.st_size) == -1) + err(1, "munmap()"); + + pos = 0; + for (;;) { + error = sendfile(from, sv[0], pos, st.st_size - pos, + NULL, &written, 0); + if (error == -1) + err(1, "sendfile"); + if (written != st.st_size) + fprintf(stderr, "sendfile sent %d bytes\n", + (int)written); + pos += written; + if (pos == st.st_size) + break; + } + close(sv[0]); + if (pos != st.st_size) + fprintf(stderr, "%d written, expected %d\n", + (int) pos, (int)st.st_size); + if (waitpid(pid, &status, 0) != pid) + err(1, "waitpid(%d)", pid); + _exit(WEXITSTATUS(status)); + } else { + setproctitle("child"); + close(from); + close(sv[0]); + + if ((to = open(to_name, O_RDWR | O_CREAT, DEFFILEMODE)) == + -1) + err(1, "open write %s", to_name); + + rd = 0; + for (;;) { + n = read(sv[1], buf, sizeof(buf)); + if (n == -1) + err(1, "read"); + else if (n == 0) + break; + rd += n; + if (write(to, buf, n) != n) + err(1, "write()"); + } + close(to); + close(sv[1]); + if (rd != st.st_size) + fprintf(stderr, "Short read %d, expected %d\n", + (int)rd, (int)st.st_size); + _exit(0); + } + _exit(0); +} + +int +main(void) +{ + pid_t pid; + int e, status; + + e = 0; + if ((pid = fork()) == 0) + test(); + if (pid == -1) + err(1, "fork()"); + if (waitpid(pid, &status, 0) == -1) + err(1, "waitpid(%d)", pid); + if (status != 0) { + if (WIFSIGNALED(status)) + fprintf(stderr, + "pid %d exit signal %d\n", + pid, WTERMSIG(status)); + } + e += status == 0 ? 0 : 1; + + return (e); +} Added: user/pho/stress2/misc/sendfile22.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/sendfile22.sh Mon Apr 27 05:23:43 2020 (r360364) @@ -0,0 +1,287 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2020 Peter Holm +# +# 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 sendfile21.sh: without the use of socketpair(). +# No problems seen. + +. ../default.cfg +[ `id -u` -ne 0 ] && echo "Must be root!" && exit 1 + +dir=/tmp +odir=`pwd` +cd $dir +sed '1,/^EOF/d' < $odir/$0 > $dir/sendfile22.c +mycc -o sendfile22 -Wall -Wextra -O0 -g sendfile22.c || exit 1 +rm -f sendfile22.c +cd $odir + +set -e +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 +bsdlabel -w md$mdstart auto +newfs_flags="" +newfs $newfs_flags -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint +set +e + +cd $mntpoint +dd if=/dev/random of=input bs=4k count=100 status=none + +(cd $odir/../testcases/swap; ./swap -t 5m -i 20 -l 100 > /dev/null) & +sleep 30 +n=1 +start=` date +%s` +while [ $((` date +%s` - start)) -lt 180 ]; do + rm -f output + umount $mntpoint 2>/dev/null # busy umount + $dir/sendfile22 + s=$? + cmp -s input output || break + [ `stat -f '%z' input` -ne ` stat -f '%z' output` ] && break + n=$((n + 1)) +done +while pgrep -q swap; do + pkill swap +done +cmp -s input output || { echo "Loop #$n"; ls -l; s=1; } +wait +[ -f sendfile22.core -a $s -eq 0 ] && + { ls -l sendfile22.core; mv sendfile22.core $dir; s=1; } +cd $odir + +for i in `jot 6`; do + mount | grep -q "on $mntpoint " || break + umount $mntpoint && break || sleep 10 + [ $i -eq 6 ] && + { echo FATAL; fstat -mf $mntpoint; exit 1; } +done +mdconfig -d -u $mdstart +rm -rf $dir/sendfile22 +exit $s + +EOF +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void +test(void) +{ + struct stat st; + struct sockaddr_in inetaddr, inetpeer; + struct hostent *hostent; + socklen_t len; + off_t i, j, rd, written, pos; + pid_t pid; + int error, from, i1, msgsock, n, on, port, r, status, tcpsock, to; + char buf[4086], *cp; + const char *from_name, *to_name; + + from_name = "input"; + to_name = "output"; + port = 12345; + + if ((from = open(from_name, O_RDONLY)) == -1) + err(1, "open read %s", from_name); + + if ((error = fstat(from, &st)) == -1) + err(1, "stat %s", from_name); + + pid = fork(); + if (pid == -1) + err(1, "fork"); + else if (pid != 0) { + setproctitle("parent"); + + alarm(300); + on = 1; + for (i1 = 1; i1 < 5; i1++) { + if ((tcpsock = socket(AF_INET, SOCK_STREAM, 0)) < 0) + err(1, "socket(), %s:%d", __FILE__, __LINE__); + + if (setsockopt(tcpsock, + SOL_SOCKET, SO_REUSEADDR, (char *)&on, + sizeof(on)) < 0) + err(1, "setsockopt(), %s:%d", __FILE__, + __LINE__); + + hostent = gethostbyname ("localhost"); + bzero((char *) &inetaddr, sizeof(inetaddr)); + memcpy (&inetaddr.sin_addr.s_addr, hostent->h_addr, + sizeof (struct in_addr)); + + inetaddr.sin_family = AF_INET; + inetaddr.sin_addr.s_addr = INADDR_ANY; + inetaddr.sin_port = htons(port); + inetaddr.sin_len = sizeof(inetaddr); + + r = connect(tcpsock, (struct sockaddr *) &inetaddr, + sizeof(inetaddr)); + if (r == 0) + break; + sleep(1); + close(tcpsock); + } + if (r < 0) + err(1, "connect(), %s:%d", __FILE__, __LINE__); + + + if ((cp = mmap(NULL, st.st_size, PROT_READ, + MAP_PRIVATE, from, 0)) == MAP_FAILED) + err(1, "mmap"); + if (fsync(from) == -1) + err(1, "fsync()"); + + for (i = 0, j = 0; i < st.st_size; i += PAGE_SIZE, j++) { + (void)cp[i]; + if (j % 2 == 1) { + if (msync(cp + i, PAGE_SIZE, MS_INVALIDATE) + == -1) + err(1, "msync(), j = %d", (int)j); + } + } + if (munmap(cp, st.st_size) == -1) + err(1, "munmap()"); + + pos = 0; + for (;;) { + error = sendfile(from, tcpsock, pos, st.st_size - + pos, NULL, &written, 0); + if (error == -1) + err(1, "sendfile"); + if (written != st.st_size) + fprintf(stderr, "sendfile sent %d bytes\n", + (int)written); + pos += written; + if (pos == st.st_size) + break; + } + if (pos != st.st_size) + fprintf(stderr, "%d written, expected %d\n", + (int)pos, (int)st.st_size); + close(tcpsock); + if (waitpid(pid, &status, 0) != pid) + err(1, "waitpid(%d)", pid); + } else { + setproctitle("child"); + close(from); + alarm(300); + on = 1; + if ((tcpsock = socket(AF_INET, SOCK_STREAM, 0)) < 0) + err(1, "socket(), %s:%d", __FILE__, __LINE__); + + if (setsockopt(tcpsock, + SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on)) < 0) + err(1, "setsockopt(), %s:%d", __FILE__, __LINE__); + + inetaddr.sin_family = AF_INET; + inetaddr.sin_addr.s_addr = INADDR_ANY; + inetaddr.sin_port = htons(port); + inetaddr.sin_len = sizeof(inetaddr); + + if (bind(tcpsock, + (struct sockaddr *)&inetaddr, sizeof (inetaddr)) < 0) + err(1, "bind(), %s:%d", __FILE__, __LINE__); + + if (listen(tcpsock, 5) < 0) + err(1, "listen(), %s:%d", __FILE__, __LINE__); + + len = sizeof(inetpeer); + if ((msgsock = accept(tcpsock, + (struct sockaddr *)&inetpeer, &len)) < 0) + err(1, "accept(), %s:%d", __FILE__, __LINE__); + + + if ((to = open(to_name, O_RDWR | O_CREAT, DEFFILEMODE)) == + -1) + err(1, "open write %s", to_name); + + rd = 0; + for (;;) { + n = read(msgsock, buf, sizeof(buf)); + if (n == -1) + err(1, "read"); + else if (n == 0) + break; + rd += n; + if (write(to, buf, n) != n) + err(1, "write()"); + } + close(to); + if (rd != st.st_size) + fprintf(stderr, "Short read %d, expected %d\n", + (int)rd, (int)st.st_size); + _exit(0); + } + + _exit(0); +} + +int +main(void) +{ + pid_t pid; + int e, status; + + e = 0; + if ((pid = fork()) == 0) + test(); + if (pid == -1) + err(1, "fork()"); + if (waitpid(pid, &status, 0) == -1) + err(1, "waitpid(%d)", pid); + if (status != 0) { + if (WIFSIGNALED(status)) + fprintf(stderr, + "pid %d exit signal %d\n", + pid, WTERMSIG(status)); + } + e += status == 0 ? 0 : 1; + + return (e); +} Added: user/pho/stress2/misc/sendfile23.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/sendfile23.sh Mon Apr 27 05:23:43 2020 (r360364) @@ -0,0 +1,209 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2020 Peter Holm +# +# 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 sendfile21.sh. Short read seen. + +. ../default.cfg +[ `id -u` -ne 0 ] && echo "Must be root!" && exit 1 + +dir=/tmp +odir=`pwd` +cd $dir +sed '1,/^EOF/d' < $odir/$0 > $dir/sendfile23.c +mycc -o sendfile23 -Wall -Wextra -O0 -g sendfile23.c || exit 1 +rm -f sendfile23.c +cd $odir + +set -e +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 +bsdlabel -w md$mdstart auto +newfs $newfs_flags -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint +set +e + +cd $mntpoint +dd if=/dev/random of=input bs=4k count=100 status=none + +(cd $odir/../testcases/swap; ./swap -t 5m -i 20 -l 100 > /dev/null) & +sleep 30 +n=1 +start=` date +%s` +while [ $((` date +%s` - start)) -lt 180 ]; do + rm -f output +# The umount is needed to trigger the short read error + umount $mntpoint 2>/dev/null # busy umount + $dir/sendfile23 + s=$? + cmp -s input output || break + [ `stat -f '%z' input` -ne ` stat -f '%z' output` ] && break + n=$((n + 1)) +done +while pgrep -q swap; do + pkill swap +done +cmp -s input output || { echo "Loop #$n"; ls -l; s=1; } +wait +[ -f sendfile23.core -a $s -eq 0 ] && + { ls -l sendfile23.core; mv sendfile23.core $dir; s=1; } +cd $odir + +for i in `jot 6`; do + mount | grep -q "on $mntpoint " || break + umount $mntpoint && break || sleep 10 + [ $i -eq 6 ] && + { echo FATAL; fstat -mf $mntpoint; exit 1; } +done +mdconfig -d -u $mdstart +rm -rf $dir/sendfile23 +exit $s + +EOF +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#define DEBUG 1 + +static void +test(void) +{ + struct stat st; + off_t rd, written, pos; + pid_t pid; + int error, from, n, status, sv[2], to; + char buf[4086]; + const char *from_name, *to_name; + + from_name = "input"; + to_name = "output"; + + if ((error = socketpair(AF_UNIX, SOCK_STREAM, 0, sv)) == -1) + err(1, "socketpair"); + + if ((from = open(from_name, O_RDONLY)) == -1) + err(1, "open read %s", from_name); + + if ((error = fstat(from, &st)) == -1) + err(1, "stat %s", from_name); + + pid = fork(); + if (pid == -1) + err(1, "fork"); + else if (pid != 0) { + setproctitle("parent"); + close(sv[1]); + + pos = 0; + for (;;) { + error = sendfile(from, sv[0], pos, st.st_size - pos, + NULL, &written, 0); + if (error == -1) + err(1, "sendfile"); + if (written != st.st_size) + fprintf(stderr, "sendfile sent %d bytes\n", + (int)written); + pos += written; + if (pos == st.st_size) + break; + } + close(sv[0]); + if (pos != st.st_size) + fprintf(stderr, "%d written, expected %d\n", + (int) pos, (int)st.st_size); + if (waitpid(pid, &status, 0) != pid) + err(1, "waitpid(%d)", pid); + _exit(WEXITSTATUS(status)); + } else { + setproctitle("child"); + close(from); + close(sv[0]); + + if ((to = open(to_name, O_RDWR | O_CREAT, DEFFILEMODE)) == + -1) + err(1, "open write %s", to_name); + + rd = 0; + for (;;) { + n = read(sv[1], buf, sizeof(buf)); + if (n == -1) + err(1, "read"); + else if (n == 0) + break; + rd += n; + if (write(to, buf, n) != n) + err(1, "write()"); + } + close(to); + close(sv[1]); + if (rd != st.st_size) + fprintf(stderr, "Short read %d, expected %d\n", + (int)rd, (int)st.st_size); + _exit(0); + } + _exit(0); +} + +int +main(void) +{ + pid_t pid; + int e, status; + + e = 0; + if ((pid = fork()) == 0) + test(); + if (pid == -1) + err(1, "fork()"); + if (waitpid(pid, &status, 0) == -1) + err(1, "waitpid(%d)", pid); + if (status != 0) { + if (WIFSIGNALED(status)) + fprintf(stderr, + "pid %d exit signal %d\n", + pid, WTERMSIG(status)); + } + e += status == 0 ? 0 : 1; + + return (e); +} From owner-svn-src-user@freebsd.org Mon Apr 27 05:24:41 2020 Return-Path: Delivered-To: svn-src-user@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 66C632A804D for ; Mon, 27 Apr 2020 05:24:41 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 499YB124zJz4QB7; Mon, 27 Apr 2020 05:24:41 +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 2925D55A3; Mon, 27 Apr 2020 05:24:41 +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 03R5OfmB085085; Mon, 27 Apr 2020 05:24:41 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03R5OfnT085084; Mon, 27 Apr 2020 05:24:41 GMT (envelope-from pho@FreeBSD.org) Message-Id: <202004270524.03R5OfnT085084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 27 Apr 2020 05:24:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r360365 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 360365 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.29 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: Mon, 27 Apr 2020 05:24:41 -0000 Author: pho Date: Mon Apr 27 05:24:40 2020 New Revision: 360365 URL: https://svnweb.freebsd.org/changeset/base/360365 Log: Added a socketpair(2) test scenario. Added: user/pho/stress2/misc/socketpair4.sh (contents, props changed) Added: user/pho/stress2/misc/socketpair4.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/socketpair4.sh Mon Apr 27 05:24:40 2020 (r360365) @@ -0,0 +1,208 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2020 Peter Holm +# +# 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$ +# + +# A socketpair() test scenario illustrating issues with a missing EOF + +. ../default.cfg +[ `id -u` -ne 0 ] && echo "Must be root!" && exit 1 + +dir=/tmp +odir=`pwd` +cd $dir +sed '1,/^EOF/d' < $odir/$0 > $dir/socketpair4.c +mycc -o socketpair4 -Wall -Wextra -O0 -g socketpair4.c || exit 1 +rm -f socketpair4.c +cd $odir + +set -e +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 +bsdlabel -w md$mdstart auto +newfs_flags="" +newfs $newfs_flags -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint +set +e + +cd $mntpoint +dd if=/dev/random of=input bs=4k count=100 status=none + +n=1 +start=` date +%s` +while [ $((` date +%s` - start)) -lt 180 ]; do + rm -f output + umount $mntpoint 2>/dev/null # busy umount + $dir/socketpair4 + s=$? + [ $s -ne 0 ] && { echo "Loop #$n"; ls -l; s=1; break; } + cmp -s input output || break + [ `stat -f '%z' input` -ne ` stat -f '%z' output` ] && break + n=$((n + 1)) +done +while pgrep -q swap; do + pkill swap +done +cmp -s input output || { echo "Loop #$n"; ls -l; s=1; } +[ -f socketpair4.core -a $s -eq 0 ] && + { ls -l socketpair4.core; mv socketpair4.core $dir; s=1; } +cd $odir + +for i in `jot 6`; do + mount | grep -q "on $mntpoint " || break + umount $mntpoint && break || sleep 10 + [ $i -eq 6 ] && + { echo FATAL; fstat -mf $mntpoint; exit 1; } +done +mdconfig -d -u $mdstart +rm -rf $dir/socketpair4 +exit $s + +EOF +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +static void +test(void) +{ + struct stat st; + off_t rd, written; + pid_t pid; + int error, from, n, status, sv[2], to; + char buf[4086]; + const char *from_name, *to_name; + + from_name = "input"; + to_name = "output"; + + if ((error = socketpair(AF_UNIX, SOCK_STREAM, 0, sv)) == -1) + err(1, "socketpair"); + + if ((from = open(from_name, O_RDONLY)) == -1) + err(1, "open read %s", from_name); + + if ((error = fstat(from, &st)) == -1) + err(1, "stat %s", from_name); + + pid = fork(); + if (pid == -1) + err(1, "fork"); + else if (pid != 0) { + setproctitle("parent"); + close(sv[1]); + + written = 0; + for (;;) { + n = read(from, buf, sizeof(buf)); + if (n == -1) + err(1, "read(from)"); + else if (n == 0) + break; + written += n; + if (write(sv[0], buf, n) != n) + err(1, "write()"); + if (error == -1) + err(1, "write"); + } + if (written != st.st_size) + fprintf(stderr, "%d written, expected %d\n", + (int)written, (int)st.st_size); + close(from); + close(sv[0]); + if (waitpid(pid, &status, 0) != pid) + err(1, "waitpid(%d)", pid); + _exit(WEXITSTATUS(status)); + } else { + setproctitle("child"); + sleep(1); + close(from); + close(sv[0]); + + if ((to = open(to_name, O_RDWR | O_CREAT, DEFFILEMODE)) == -1) + err(1, "open write %s", to_name); + + rd = 0; + for (;;) { + n = read(sv[1], buf, sizeof(buf)); + if (n == -1) { + if (rd == st.st_size) { + err(1, "Expected EOF on read(socket)"); + break; + } + err(1, "read(socket), n=%d, rd=%d", n, + (int)rd); + } + if (n == 0) + break; + rd += n; + if (write(to, buf, n) != n) + err(1, "write()"); + } + close(to); + close(sv[1]); + if (rd != st.st_size) + fprintf(stderr, "Short read %d, expected %d\n", + (int)rd, (int)st.st_size); + _exit(0); + } +} + +int +main(void) +{ + pid_t pid; + int status; + + if ((pid = fork()) == 0) + test(); + if (pid == -1) + err(1, "fork()"); + if (waitpid(pid, &status, 0) == -1) + err(1, "waitpid(%d)", pid); + if (status != 0) { + if (WIFSIGNALED(status)) + fprintf(stderr, + "pid %d exit signal %d\n", + pid, WTERMSIG(status)); + } + + return (WEXITSTATUS(status)); +} From owner-svn-src-user@freebsd.org Mon Apr 27 05:25:31 2020 Return-Path: Delivered-To: svn-src-user@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6CD862A80BF for ; Mon, 27 Apr 2020 05:25:31 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 499YBz2DqMz4QLd; Mon, 27 Apr 2020 05:25:31 +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 47ECC55A4; Mon, 27 Apr 2020 05:25:31 +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 03R5PVnV085190; Mon, 27 Apr 2020 05:25:31 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03R5PVlm085189; Mon, 27 Apr 2020 05:25:31 GMT (envelope-from pho@FreeBSD.org) Message-Id: <202004270525.03R5PVlm085189@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 27 Apr 2020 05:25:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r360366 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 360366 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.29 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: Mon, 27 Apr 2020 05:25:31 -0000 Author: pho Date: Mon Apr 27 05:25:30 2020 New Revision: 360366 URL: https://svnweb.freebsd.org/changeset/base/360366 Log: Tune test a bit to avoid false positives. Modified: user/pho/stress2/misc/swap6.sh Modified: user/pho/stress2/misc/swap6.sh ============================================================================== --- user/pho/stress2/misc/swap6.sh Mon Apr 27 05:24:40 2020 (r360365) +++ user/pho/stress2/misc/swap6.sh Mon Apr 27 05:25:30 2020 (r360366) @@ -35,7 +35,7 @@ [ `sysctl -n vm.swap_total` -eq 0 ] && exit 0 min=5 # percent swap usage -(cd ../testcases/swap; ./swap -t 10m -i 40 -l 100 -h > /dev/null) & +(cd ../testcases/swap; ./swap -t 10m -i 100 -l 100 -h > /dev/null) & mx=0 while pgrep -q swap; do n=`swapinfo | tail -1 | sed 's/.* //; s/%//'` From owner-svn-src-user@freebsd.org Mon Apr 27 05:27:40 2020 Return-Path: Delivered-To: svn-src-user@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4353D2A811E for ; Mon, 27 Apr 2020 05:27:40 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 499YFS0vD3z4QS1; Mon, 27 Apr 2020 05:27:40 +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 1553B55A5; Mon, 27 Apr 2020 05:27:40 +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 03R5Rd8N085322; Mon, 27 Apr 2020 05:27:39 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03R5RdpH085321; Mon, 27 Apr 2020 05:27:39 GMT (envelope-from pho@FreeBSD.org) Message-Id: <202004270527.03R5RdpH085321@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 27 Apr 2020 05:27:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r360367 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 360367 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.29 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: Mon, 27 Apr 2020 05:27:40 -0000 Author: pho Date: Mon Apr 27 05:27:39 2020 New Revision: 360367 URL: https://svnweb.freebsd.org/changeset/base/360367 Log: Added cleanup after test. Modified: user/pho/stress2/misc/sendfile15.sh Modified: user/pho/stress2/misc/sendfile15.sh ============================================================================== --- user/pho/stress2/misc/sendfile15.sh Mon Apr 27 05:25:30 2020 (r360366) +++ user/pho/stress2/misc/sendfile15.sh Mon Apr 27 05:27:39 2020 (r360367) @@ -39,6 +39,7 @@ # "panic: vm_page_free_prep 0xfffff817e0efac10 PG_ZERO 87 ...": # https://people.freebsd.org/~pho/stress/log/sendfile15-2.txt +# Note that r334783 seems to alleviate the problem. . ../default.cfg [ `id -u` -ne 0 ] && echo "Must be root!" && exit 1 From owner-svn-src-user@freebsd.org Mon Apr 27 18:07:39 2020 Return-Path: Delivered-To: svn-src-user@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 85EAC2C161A for ; Mon, 27 Apr 2020 18:07:39 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 499t6M2zFFz4QQq; Mon, 27 Apr 2020 18:07:39 +0000 (UTC) (envelope-from allanjude@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 613B1EA98; Mon, 27 Apr 2020 18:07:39 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03RI7dnS058894; Mon, 27 Apr 2020 18:07:39 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03RI7cDA058892; Mon, 27 Apr 2020 18:07:38 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <202004271807.03RI7cDA058892@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Mon, 27 Apr 2020 18:07:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r360389 - in user/des/fbce: . misc X-SVN-Group: user X-SVN-Commit-Author: allanjude X-SVN-Commit-Paths: in user/des/fbce: . misc X-SVN-Commit-Revision: 360389 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.29 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: Mon, 27 Apr 2020 18:07:39 -0000 Author: allanjude Date: Mon Apr 27 18:07:38 2020 New Revision: 360389 URL: https://svnweb.freebsd.org/changeset/base/360389 Log: Update for 2020 Modified: user/des/fbce/fbce.conf user/des/fbce/misc/apache.conf Modified: user/des/fbce/fbce.conf ============================================================================== --- user/des/fbce/fbce.conf Mon Apr 27 18:04:42 2020 (r360388) +++ user/des/fbce/fbce.conf Mon Apr 27 18:07:38 2020 (r360389) @@ -1,7 +1,7 @@ # $FreeBSD$ -title = 2018 FreeBSD Core Team Election -descr = 2018 FreeBSD core team election +title = 2020 FreeBSD Core Team Election +descr = 2020 FreeBSD core team election @@ -12,12 +12,12 @@ descr = 2018 FreeBSD core team election - nominating_starts = 2018-05-16 18:00:00 UTC - nominating_ends = 2018-05-23 18:00:00 UTC - voting_starts = 2018-05-23 18:00:00 UTC - voting_ends = 2018-06-20 18:00:00 UTC - announcement = 2018-06-27 18:00:00 UTC - investiture = 2018-07-04 18:00:00 UTC + nominating_starts = 2020-05-13 18:00:00 UTC + nominating_ends = 2020-05-20 18:00:00 UTC + voting_starts = 2020-05-20 18:00:00 UTC + voting_ends = 2020-06-17 18:00:00 UTC + announcement = 2020-06-24 18:00:00 UTC + investiture = 2020-07-01 18:00:00 UTC Modified: user/des/fbce/misc/apache.conf ============================================================================== --- user/des/fbce/misc/apache.conf Mon Apr 27 18:04:42 2020 (r360388) +++ user/des/fbce/misc/apache.conf Mon Apr 27 18:07:38 2020 (r360389) @@ -4,12 +4,12 @@ FastCgiServer /home/des/fbce/script/fbce_fastcgi.pl -processes 3 -Alias /2018/static /home/des/fbce/root/static -Alias /2018/ /home/des/fbce/script/fbce_fastcgi.pl/ +Alias /2020/static /home/des/fbce/root/static +Alias /2020/ /home/des/fbce/script/fbce_fastcgi.pl/ RewriteEngine on -RewriteRule ^/2018$ /2018/ [R] +RewriteRule ^/2020$ /2020/ [R] - + Require all granted