From owner-svn-src-user@freebsd.org Mon Oct 29 09:06:21 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 2D4C010CFEF3 for ; Mon, 29 Oct 2018 09:06:21 +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 D3B1E85D95; Mon, 29 Oct 2018 09:06:20 +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 9E1874565; Mon, 29 Oct 2018 09:06:20 +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 w9T96Kjw072698; Mon, 29 Oct 2018 09:06:20 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9T96KbV072697; Mon, 29 Oct 2018 09:06:20 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201810290906.w9T96KbV072697@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 29 Oct 2018 09:06:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r339850 - 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: 339850 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, 29 Oct 2018 09:06:21 -0000 Author: pho Date: Mon Oct 29 09:06:20 2018 New Revision: 339850 URL: https://svnweb.freebsd.org/changeset/base/339850 Log: Added a new unmount test scenario. Sponsored by: Dell EMC Isilon Added: user/pho/stress2/misc/umount3.sh (contents, props changed) Added: user/pho/stress2/misc/umount3.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/umount3.sh Mon Oct 29 09:06:20 2018 (r339850) @@ -0,0 +1,68 @@ +#!/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$ +# + +# Parallel unmount of the same mount point with one mounter thread and 4 +# threads doing unmount. + +# "panic: dounmount: invalid lock refcount in the drain path @ +# ../../../kern/vfs_mount.c:1409" seen in WiP code. + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg + +parallel=4 +continue=/tmp/umount3.cont +touch $continue + +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart +mdconfig -a -t swap -s 10m -u $mdstart || exit 1 +bsdlabel -w md$mdstart auto +newfs $newfs_flags md${mdstart}$part > /dev/null +mount /dev/md${mdstart}$part $mntpoint + +for i in `jot $parallel`; do + while [ -f $continue ]; do umount $mntpoint; done 2>/dev/null & +done + +start=`date '+%s'` +while [ $((`date '+%s'` - start)) -lt 300 ]; do + mount | grep -q "on $mntpoint " || + mount /dev/md${mdstart}$part $mntpoint +done > /dev/null 2>&1 +rm $continue +wait + +while mount | grep $mntpoint | grep -q /dev/md; do + umount $mntpoint || sleep 1 +done +mdconfig -d -u $mdstart +exit 0 From owner-svn-src-user@freebsd.org Tue Oct 30 01:39:23 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 8C1F410F357A for ; Tue, 30 Oct 2018 01:39:23 +0000 (UTC) (envelope-from cperciva@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 40DE76A173; Tue, 30 Oct 2018 01:39:23 +0000 (UTC) (envelope-from cperciva@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 2273516ABF; Tue, 30 Oct 2018 01:39:23 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9U1dNRX084637; Tue, 30 Oct 2018 01:39:23 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9U1dMnA084635; Tue, 30 Oct 2018 01:39:22 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201810300139.w9U1dMnA084635@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Tue, 30 Oct 2018 01:39:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r339903 - user/cperciva/freebsd-update-mirror X-SVN-Group: user X-SVN-Commit-Author: cperciva X-SVN-Commit-Paths: user/cperciva/freebsd-update-mirror X-SVN-Commit-Revision: 339903 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: Tue, 30 Oct 2018 01:39:23 -0000 Author: cperciva Date: Tue Oct 30 01:39:22 2018 New Revision: 339903 URL: https://svnweb.freebsd.org/changeset/base/339903 Log: Unbreak FreeBSD Update mirroring code for OpenSSL 1.1 The default key derivation algorithm for "openssl enc" changed. Force it back to the pre-1.1 default to regain backwards compatibility; we use strong keys so this is safe. Modified: user/cperciva/freebsd-update-mirror/umirror-package.sh user/cperciva/freebsd-update-mirror/umirror.sh Modified: user/cperciva/freebsd-update-mirror/umirror-package.sh ============================================================================== --- user/cperciva/freebsd-update-mirror/umirror-package.sh Tue Oct 30 00:47:40 2018 (r339902) +++ user/cperciva/freebsd-update-mirror/umirror-package.sh Tue Oct 30 01:39:22 2018 (r339903) @@ -43,7 +43,7 @@ dd if=/dev/urandom bs=1k count=1 2>/dev/null | echo >> "${PRIVDIR}/key-${ID}" # Create an encrypted tarball -openssl enc -aes-256-cbc -pass "file:${PRIVDIR}/key-${ID}" \ +openssl enc -aes-256-cbc -pass "file:${PRIVDIR}/key-${ID}" -md md5 \ < "${PRIVDIR}/dec-${ID}" > "${PRIVDIR}/tar-${ID}" # Add line to flist Modified: user/cperciva/freebsd-update-mirror/umirror.sh ============================================================================== --- user/cperciva/freebsd-update-mirror/umirror.sh Tue Oct 30 00:47:40 2018 (r339902) +++ user/cperciva/freebsd-update-mirror/umirror.sh Tue Oct 30 01:39:22 2018 (r339903) @@ -131,7 +131,7 @@ while read ID FHASH FDECHASH; do # Attempt to decrypt the file if ! [ -r "${PRIVDIR}/dec-${ID}" ]; then if ! openssl enc -aes-256-cbc -d \ - -pass "file:${PRIVDIR}/key-${ID}" \ + -pass "file:${PRIVDIR}/key-${ID}" -md md5 \ < "${PRIVDIR}/tar-${ID}" > "${PRIVDIR}/dec-${ID}"; then echo "Decrypting tar-${ID} failed" exit 1