From owner-svn-src-user@freebsd.org Tue May 16 09:06:08 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DEDA3D6D9D1 for ; Tue, 16 May 2017 09:06:08 +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 mx1.freebsd.org (Postfix) with ESMTPS id 8A211E36; Tue, 16 May 2017 09:06:08 +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 v4G967KS022641; Tue, 16 May 2017 09:06:07 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4G967Wh022640; Tue, 16 May 2017 09:06:07 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705160906.v4G967Wh022640@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 16 May 2017 09:06:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318340 - user/pho/stress2/misc X-SVN-Group: user 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.23 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, 16 May 2017 09:06:09 -0000 Author: pho Date: Tue May 16 09:06:07 2017 New Revision: 318340 URL: https://svnweb.freebsd.org/changeset/base/318340 Log: Make sure that there is enough swap to run this test and increase the journal size. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/gjournal.sh Modified: user/pho/stress2/misc/gjournal.sh ============================================================================== --- user/pho/stress2/misc/gjournal.sh Tue May 16 07:24:09 2017 (r318339) +++ user/pho/stress2/misc/gjournal.sh Tue May 16 09:06:07 2017 (r318340) @@ -35,30 +35,37 @@ . ../default.cfg size="2g" +[ `swapinfo | wc -l` -eq 1 ] && exit 0 +[ `swapinfo -k | tail -1 | awk '{print int($4/1024/1024)}'` -lt \ + ${size%g} ] && exit 0 m=$((mdstart + 1)) -mount | grep /media | grep -q /dev/md && umount -f /media +mp2=${mntpoint}2 +mount | grep $mp2 | grep -q /dev/md && umount -f $mp2 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint -mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart -mdconfig -l | grep -q md$m && mdconfig -d -u $m +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart +[ -c /dev/md$m ] && mdconfig -d -u $m +mkdir -p $mp2 mdconfig -a -t swap -s $size -u $mdstart || exit 1 gjournal load -gjournal label -s $((200 * 1024 * 1024)) md$mdstart +gjournal label -s 512m md$mdstart sleep .5 newfs -J /dev/md$mdstart.journal > /dev/null mount -o async /dev/md$mdstart.journal $mntpoint here=`pwd` cd $mntpoint -truncate -s 1g image +dd if=/dev/zero of=image bs=1m count=1k 2>&1 | \ + egrep -v 'records|transferred' mdconfig -a -t vnode -f image -u $m bsdlabel -w md$m auto newfs md${m}$part > /dev/null -mount /dev/md${m}$part /media +mount /dev/md${m}$part $mp2 # dd will suspend in wdrain -dd if=/dev/zero of=/media/zero bs=1M 2>&1 | egrep -v "records|transferred" -while mount | grep /media | grep -q /dev/md; do - umount /media || sleep 1 +echo "Expect \"$mp2: write failed, filesystem is full\"" +dd if=/dev/zero of=$mp2/zero bs=1M > /dev/null 2>&1 +while mount | grep $mp2 | grep -q /dev/md; do + umount $mp2 || sleep 1 done mdconfig -d -u $m cd $here From owner-svn-src-user@freebsd.org Tue May 16 09:08:25 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41083D6D9F0 for ; Tue, 16 May 2017 09:08:25 +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 mx1.freebsd.org (Postfix) with ESMTPS id 08ABEF63; Tue, 16 May 2017 09:08:24 +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 v4G98OuP022758; Tue, 16 May 2017 09:08:24 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4G98OZf022757; Tue, 16 May 2017 09:08:24 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705160908.v4G98OZf022757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 16 May 2017 09:08:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318341 - user/pho/stress2/misc X-SVN-Group: user 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.23 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, 16 May 2017 09:08:25 -0000 Author: pho Date: Tue May 16 09:08:23 2017 New Revision: 318341 URL: https://svnweb.freebsd.org/changeset/base/318341 Log: Tune disk and journal size to make this test run. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/gjournal2.sh Modified: user/pho/stress2/misc/gjournal2.sh ============================================================================== --- user/pho/stress2/misc/gjournal2.sh Tue May 16 09:06:07 2017 (r318340) +++ user/pho/stress2/misc/gjournal2.sh Tue May 16 09:08:23 2017 (r318341) @@ -34,22 +34,27 @@ . ../default.cfg -size="2g" +[ `swapinfo | wc -l` -eq 1 ] && exit 0 +size="5g" +jsize="3g" +[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le ${size%g} ] && exit 0 +[ `swapinfo -k | tail -1 | awk '{print int($4/1024/1024)}'` -lt \ + ${size%g} ] && exit 0 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint -mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s $size -u $mdstart || exit 1 gjournal load -gjournal label md$mdstart +gjournal label -s $jsize md$mdstart sleep .5 newfs -J /dev/md$mdstart.journal > /dev/null mount -o async /dev/md$mdstart.journal $mntpoint chmod 777 $mntpoint -export runRUNTIME=30m +export runRUNTIME=10m export RUNDIR=$mntpoint/stressX -su $testuser -c 'cd ..; ./run.sh marcus.cfg' +su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null 2>&1 gjournal sync while mount | grep $mntpoint | grep -q /dev/md; do From owner-svn-src-user@freebsd.org Tue May 16 09:12:31 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 35375D6DB84 for ; Tue, 16 May 2017 09:12: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 mx1.freebsd.org (Postfix) with ESMTPS id 027C5134A; Tue, 16 May 2017 09:12:30 +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 v4G9CTFG026480; Tue, 16 May 2017 09:12:29 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4G9CTRl026479; Tue, 16 May 2017 09:12:29 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705160912.v4G9CTRl026479@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 16 May 2017 09:12:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318342 - user/pho/stress2/misc X-SVN-Group: user 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.23 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, 16 May 2017 09:12:31 -0000 Author: pho Date: Tue May 16 09:12:29 2017 New Revision: 318342 URL: https://svnweb.freebsd.org/changeset/base/318342 Log: Add the bug report number which inspired this scenario and tune the disk size. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/gjournal3.sh Modified: user/pho/stress2/misc/gjournal3.sh ============================================================================== --- user/pho/stress2/misc/gjournal3.sh Tue May 16 09:08:23 2017 (r318341) +++ user/pho/stress2/misc/gjournal3.sh Tue May 16 09:12:29 2017 (r318342) @@ -31,6 +31,9 @@ # Deadlock seen: http://people.freebsd.org/~pho/stress/log/gjournal3.txt # Fixed in r244925 +# panic: Bio not on queue +# https://people.freebsd.org/~pho/stress/log/gjournal3-2.txt + # kib@ wrote: # gjournal is good for exposing the suspension problems. The frequency # of the suspensions called from the gjournal is not achievable by other @@ -38,17 +41,26 @@ # only establishes the suspension, without snapshotting, which also # makes it easier to see the issues. +# gjournal / ffs snapshot suspension deadlock: +# https://people.freebsd.org/~pho/stress/log/gjournal3-4.txt +# Originally reported as kern/164252. + [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg -size="2g" +[ `swapinfo | wc -l` -eq 1 ] && exit 0 +size="6g" +jsize="4g" +[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le ${size%g} ] && exit 0 +[ `swapinfo -k | tail -1 | awk '{print int($4/1024/1024)}'` -lt \ + ${size%g} ] && exit 0 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint -mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart +[ -c /dev/mdmd$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s $size -u $mdstart || exit 1 gjournal load -gjournal label md$mdstart +gjournal label -s $jsize md$mdstart sleep .5 newfs -J /dev/md$mdstart.journal > /dev/null mount -o async /dev/md$mdstart.journal $mntpoint From owner-svn-src-user@freebsd.org Tue May 16 09:20:24 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83A95D6DBEE for ; Tue, 16 May 2017 09:20:24 +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 mx1.freebsd.org (Postfix) with ESMTPS id 549831532; Tue, 16 May 2017 09:20:24 +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 v4G9KNT3026928; Tue, 16 May 2017 09:20:23 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4G9KNDO026927; Tue, 16 May 2017 09:20:23 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705160920.v4G9KNDO026927@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 16 May 2017 09:20:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318343 - user/pho/stress2/misc X-SVN-Group: user 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.23 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, 16 May 2017 09:20:24 -0000 Author: pho Date: Tue May 16 09:20:23 2017 New Revision: 318343 URL: https://svnweb.freebsd.org/changeset/base/318343 Log: Cap runtime. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/newfs.sh Modified: user/pho/stress2/misc/newfs.sh ============================================================================== --- user/pho/stress2/misc/newfs.sh Tue May 16 09:12:29 2017 (r318342) +++ user/pho/stress2/misc/newfs.sh Tue May 16 09:20:23 2017 (r318343) @@ -40,6 +40,7 @@ mdconfig -a -t swap -s 1g -u $mdstart bsdlabel -w md$mdstart auto echo "Expect warnings from SU and SU+J." +start=`date '+%s'` for opt in -O1 -O2 -U -j; do echo "Testing newfs with option $opt." blocksize=4096 @@ -61,5 +62,11 @@ for opt in -O1 -O2 -U -j; do done blocksize=$((blocksize * 2)) done + if [ $((`date '+%s'` - start)) -gt 1800 ]; then + echo "Timed out" + s=1 + break + fi done +exit $s mdconfig -d -u $mdstart From owner-svn-src-user@freebsd.org Tue May 16 09:21:42 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 396E1D6DC47 for ; Tue, 16 May 2017 09:21:42 +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 mx1.freebsd.org (Postfix) with ESMTPS id 0C0EB186A; Tue, 16 May 2017 09:21: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 v4G9LfBr030506; Tue, 16 May 2017 09:21:41 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4G9LfXB030505; Tue, 16 May 2017 09:21:41 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705160921.v4G9LfXB030505@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 16 May 2017 09:21:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318344 - user/pho/stress2/misc X-SVN-Group: user 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.23 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, 16 May 2017 09:21:42 -0000 Author: pho Date: Tue May 16 09:21:40 2017 New Revision: 318344 URL: https://svnweb.freebsd.org/changeset/base/318344 Log: Added findings, fixed style. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/nfs15.sh Modified: user/pho/stress2/misc/nfs15.sh ============================================================================== --- user/pho/stress2/misc/nfs15.sh Tue May 16 09:20:23 2017 (r318343) +++ user/pho/stress2/misc/nfs15.sh Tue May 16 09:21:40 2017 (r318344) @@ -38,6 +38,15 @@ # - advisory locking tests on NFS files, while e.g. sending SIGSTOP/SIGCONT # to the test programs. +# See also pthread9.sh + +# https://people.freebsd.org/~pho/stress/log/kostik897.txt +# Fixed in r302013. + +# "panic: mutex sleepq chain not owned at subr_sleepqueue.c:1009" seen: +# https://people.freebsd.org/~pho/stress/log/kostik914.txt +# Fixed in r302328. + [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg @@ -55,8 +64,8 @@ cd $here mount | grep "on $mntpoint " | grep nfs > /dev/null && umount $mntpoint -mount -t nfs -o tcp -o retrycnt=3 -o soft -o rw -o nolockd -o intr \ - $nfs_export $mntpoint +mount -t nfs -o tcp -o retrycnt=3 -o intr,soft -o rw -o nolockd \ + $nfs_export $mntpoint || exit 1 sleep 2 wd=$mntpoint/nfs15.dir rm -rf $wd @@ -114,7 +123,8 @@ t2(void *data __unused) for (i = 0; i < 100; i++) { atomic_add_int(&share[SYNC], 1); snprintf(file, sizeof(file), "file.%06d", i); - if ((fd = open(file, O_WRONLY | O_CREAT | O_APPEND, DEFFILEMODE)) == -1) + if ((fd = open(file, O_WRONLY | O_CREAT | O_APPEND, + DEFFILEMODE)) == -1) err(1, "open(%s)", file); do { r = lockf(fd, F_LOCK, 0); From owner-svn-src-user@freebsd.org Tue May 16 09:23:11 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97246D6DD7F for ; Tue, 16 May 2017 09:23:11 +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 mx1.freebsd.org (Postfix) with ESMTPS id 64B881A17; Tue, 16 May 2017 09:23:11 +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 v4G9NATK030633; Tue, 16 May 2017 09:23:10 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4G9NAXh030632; Tue, 16 May 2017 09:23:10 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705160923.v4G9NAXh030632@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 16 May 2017 09:23:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318345 - user/pho/stress2/misc X-SVN-Group: user 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.23 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, 16 May 2017 09:23:11 -0000 Author: pho Date: Tue May 16 09:23:10 2017 New Revision: 318345 URL: https://svnweb.freebsd.org/changeset/base/318345 Log: Collect and return error status. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/dev.sh Modified: user/pho/stress2/misc/dev.sh ============================================================================== --- user/pho/stress2/misc/dev.sh Tue May 16 09:21:40 2017 (r318344) +++ user/pho/stress2/misc/dev.sh Tue May 16 09:23:10 2017 (r318345) @@ -49,13 +49,14 @@ daemon sh -c \ /dev/null /tmp/dev # Note: this runs as root. +s=$? while pkill -9 swap; do : done rm -f /tmp/dev -exit +exit $s EOF #include #include @@ -115,14 +116,18 @@ churn(char *path) int main(void) { - int i; + int e, i, status;; + e = 0; for (i = 0; i < PARALLEL; i++) if (fork() == 0) churn("/dev"); - for (i = 0; i < PARALLEL; i++) - wait(NULL); + for (i = 0; i < PARALLEL; i++) { + wait(&status); + if (status != 0) + e++; + } - return (0); + return (e); } From owner-svn-src-user@freebsd.org Tue May 16 09:24:19 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4FB0D6DDDC for ; Tue, 16 May 2017 09:24:19 +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 mx1.freebsd.org (Postfix) with ESMTPS id 85D5F1B8B; Tue, 16 May 2017 09:24:19 +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 v4G9OIVl030719; Tue, 16 May 2017 09:24:18 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4G9OIMf030718; Tue, 16 May 2017 09:24:18 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705160924.v4G9OIMf030718@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 16 May 2017 09:24:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318346 - user/pho/stress2/misc X-SVN-Group: user 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.23 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, 16 May 2017 09:24:19 -0000 Author: pho Date: Tue May 16 09:24:18 2017 New Revision: 318346 URL: https://svnweb.freebsd.org/changeset/base/318346 Log: Added finding. Load pty.ko if needed. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/dev2.sh Modified: user/pho/stress2/misc/dev2.sh ============================================================================== --- user/pho/stress2/misc/dev2.sh Tue May 16 09:23:10 2017 (r318345) +++ user/pho/stress2/misc/dev2.sh Tue May 16 09:24:18 2017 (r318346) @@ -35,17 +35,20 @@ # Fixed by r294204. +# "panic: Assertion !tty_gone(tp) failed at ../sys/ttydevsw.h:165" seen: +# https://people.freebsd.org/~pho/stress/log/dev2-2.txt + [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg +kldstat -v | grep -q pty || { kldload pty || exit 0; } here=`pwd` cd /tmp sed '1,/^EOF/d' < $here/$0 > dev2.c mycc -o dev2 -Wall -Wextra -O2 dev2.c || exit 1 rm -f dev2.c -kldstat -v | grep -q pty || kldload pty daemon sh -c \ "(cd $here/../testcases/swap; ./swap -t 6m -i 20 -k -l 100)" > \ /dev/null @@ -73,7 +76,6 @@ EOF #include #include -#define NFLAGS #define PARALLEL 4 #define RUNTIME 300 From owner-svn-src-user@freebsd.org Tue May 16 11:24:06 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D43D2D70CBF for ; Tue, 16 May 2017 11:24:06 +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 mx1.freebsd.org (Postfix) with ESMTPS id A504026D; Tue, 16 May 2017 11:24:06 +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 v4GBO5Gh080063; Tue, 16 May 2017 11:24:05 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4GBO5u9080062; Tue, 16 May 2017 11:24:05 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705161124.v4GBO5u9080062@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 16 May 2017 11:24:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318348 - user/pho/stress2/misc X-SVN-Group: user 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.23 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, 16 May 2017 11:24:06 -0000 Author: pho Date: Tue May 16 11:24:05 2017 New Revision: 318348 URL: https://svnweb.freebsd.org/changeset/base/318348 Log: Cap runtime. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/procfs.sh Modified: user/pho/stress2/misc/procfs.sh ============================================================================== --- user/pho/stress2/misc/procfs.sh Tue May 16 09:39:20 2017 (r318347) +++ user/pho/stress2/misc/procfs.sh Tue May 16 11:24:05 2017 (r318348) @@ -58,7 +58,7 @@ else else # The test: Parallel mount and unmounts - for i in `jot 1024`; do + for i in `jot 128`; do m=$1 mount -t procfs proc ${mntpoint}$m while mount | grep -qw $mntpoint$m; do From owner-svn-src-user@freebsd.org Tue May 16 11:27:20 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20674D6F0E1 for ; Tue, 16 May 2017 11:27: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 mx1.freebsd.org (Postfix) with ESMTPS id CE0FAA56; Tue, 16 May 2017 11:27:19 +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 v4GBRIMR080223; Tue, 16 May 2017 11:27:18 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4GBRITq080222; Tue, 16 May 2017 11:27:18 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705161127.v4GBRITq080222@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 16 May 2017 11:27:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318349 - user/pho/stress2/misc X-SVN-Group: user 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.23 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, 16 May 2017 11:27:20 -0000 Author: pho Date: Tue May 16 11:27:18 2017 New Revision: 318349 URL: https://svnweb.freebsd.org/changeset/base/318349 Log: Do not hard code the working directory to /tmp. Style and runtime fixes. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/rot.sh Modified: user/pho/stress2/misc/rot.sh ============================================================================== --- user/pho/stress2/misc/rot.sh Tue May 16 11:24:05 2017 (r318348) +++ user/pho/stress2/misc/rot.sh Tue May 16 11:27:18 2017 (r318349) @@ -54,14 +54,14 @@ mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint (cd $mntpoint; /tmp/rot) -(cd /tmp; /tmp/rot) +(cd `dirname $diskimage`; /tmp/rot) while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart rm -f /tmp/rot -exit +exit 0 EOF #include #include @@ -69,17 +69,19 @@ EOF #include #include #include +#include #include #define N 10240 /* 40 Mb */ #define PARALLEL 20 +#define RUNTIME (60 * 15) int test(void) { + int fd, i, j, s; unsigned char *buf; char path[128]; - int fd, i, j, s; s = getpagesize(); @@ -94,7 +96,8 @@ test(void) err(1, "write error"); for (i = 0; i < N; i++) { - if ((buf = mmap(0, s, PROT_READ | PROT_WRITE, MAP_SHARED, fd, i * s)) == MAP_FAILED) + if ((buf = mmap(0, s, PROT_READ | PROT_WRITE, MAP_SHARED, fd, + i * s)) == MAP_FAILED) err(1, "write map"); for (j = 0; j < s; j++) buf[j] = i % 256; @@ -106,7 +109,8 @@ test(void) if ((fd = open(path, O_RDONLY)) < 0) err(1, "open(%s)", path); for (i = 0; i < N; i++) { - if ((buf = mmap(0, s, PROT_READ, MAP_SHARED, fd, i * s)) == MAP_FAILED) + if ((buf = mmap(0, s, PROT_READ, MAP_SHARED, fd, i * s)) == + MAP_FAILED) err(1, "write map"); for (j = 0; j < s; j++) if (buf[j] != i % 256) @@ -124,9 +128,11 @@ test(void) int main(void) { - int i, j; + time_t start; + int i; - for (j = 0; j < 50; j++) { + start = time(NULL); + while (time(NULL) - start < RUNTIME) { for (i = 0; i < PARALLEL; i++) if (fork() == 0) test(); From owner-svn-src-user@freebsd.org Tue May 16 11:50:14 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58E99D6F883 for ; Tue, 16 May 2017 11:50:14 +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 mx1.freebsd.org (Postfix) with ESMTPS id 297E816A1; Tue, 16 May 2017 11:50:14 +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 v4GBoDSl088396; Tue, 16 May 2017 11:50:13 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4GBoDNh088395; Tue, 16 May 2017 11:50:13 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705161150.v4GBoDNh088395@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 16 May 2017 11:50:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318350 - user/pho/stress2/misc X-SVN-Group: user 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.23 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, 16 May 2017 11:50:14 -0000 Author: pho Date: Tue May 16 11:50:12 2017 New Revision: 318350 URL: https://svnweb.freebsd.org/changeset/base/318350 Log: Updated findings. Do not hard code the newfs flags. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/pageout.sh Modified: user/pho/stress2/misc/pageout.sh ============================================================================== --- user/pho/stress2/misc/pageout.sh Tue May 16 11:27:18 2017 (r318349) +++ user/pho/stress2/misc/pageout.sh Tue May 16 11:50:12 2017 (r318350) @@ -32,6 +32,9 @@ # OOVM deadlock seen # https://people.freebsd.org/~pho/stress/log/pageout.txt +# "panic: handle_written_filepage: not started" seen: +# https://people.freebsd.org/~pho/stress/log/pageout-2.txt + . ../default.cfg dir=/tmp @@ -48,7 +51,7 @@ mdconfig -l | grep -q md$mdstart && mdc mdconfig -a -t swap -s 2g -u $mdstart || exit 1 bsdlabel -w md$mdstart auto -newfs -U md${mdstart}$part > /dev/null +newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint From owner-svn-src-user@freebsd.org Tue May 16 11:52:28 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 80210D6F9F1 for ; Tue, 16 May 2017 11:52:28 +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 mx1.freebsd.org (Postfix) with ESMTPS id 50E591A5A; Tue, 16 May 2017 11:52:28 +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 v4GBqRfk092434; Tue, 16 May 2017 11:52:27 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4GBqRU7092433; Tue, 16 May 2017 11:52:27 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705161152.v4GBqRU7092433@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 16 May 2017 11:52:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318351 - user/pho/stress2/misc X-SVN-Group: user 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.23 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, 16 May 2017 11:52:28 -0000 Author: pho Date: Tue May 16 11:52:27 2017 New Revision: 318351 URL: https://svnweb.freebsd.org/changeset/base/318351 Log: Return failure if umount(8) keeps failing. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/dangling.sh Modified: user/pho/stress2/misc/dangling.sh ============================================================================== --- user/pho/stress2/misc/dangling.sh Tue May 16 11:50:12 2017 (r318350) +++ user/pho/stress2/misc/dangling.sh Tue May 16 11:52:27 2017 (r318351) @@ -46,7 +46,7 @@ mdconfig -l | grep -q md$mdstart && mdc mdconfig -a -t swap -s 4g -u $mdstart || exit 1 bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md${mdstart}$part $mntpoint || exit 1 chmod 777 $mntpoint export runRUNTIME=4m @@ -80,7 +80,10 @@ for i in `jot 10`; do wait done -while mount | grep $mntpoint | grep -q /dev/md; do - umount $mntpoint || sleep 1 +s=0 +for i in `jot 6`; do + umount $mntpoint && break || sleep 10 done +[ $i -eq 6 ] && s=1 mdconfig -d -u $mdstart +exit $s From owner-svn-src-user@freebsd.org Thu May 18 20:15:40 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6BDFFD73699 for ; Thu, 18 May 2017 20:15:40 +0000 (UTC) (envelope-from markj@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 mx1.freebsd.org (Postfix) with ESMTPS id DA130B8A; Thu, 18 May 2017 20:15:39 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4IKFdDA008506; Thu, 18 May 2017 20:15:39 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4IKFaUg008480; Thu, 18 May 2017 20:15:36 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201705182015.v4IKFaUg008480@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 18 May 2017 20:15:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318484 - in user/markj/PQ_LAUNDRY_11: . bin/dd bin/sh bin/sh/tests/builtins cddl/contrib/opensolaris/cmd/zdb contrib/blacklist contrib/blacklist/bin contrib/blacklist/etc/rc.d contrib/... X-SVN-Group: user 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.23 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: Thu, 18 May 2017 20:15:40 -0000 Author: markj Date: Thu May 18 20:15:35 2017 New Revision: 318484 URL: https://svnweb.freebsd.org/changeset/base/318484 Log: Merge from stable/11 at r318483. Added: user/markj/PQ_LAUNDRY_11/bin/sh/tests/builtins/locale2.0 - copied unchanged from r318483, stable/11/bin/sh/tests/builtins/locale2.0 user/markj/PQ_LAUNDRY_11/contrib/dtc/Documentation/dt-object-internal.txt - copied unchanged from r318483, stable/11/contrib/dtc/Documentation/dt-object-internal.txt user/markj/PQ_LAUNDRY_11/contrib/dtc/README - copied unchanged from r318483, stable/11/contrib/dtc/README user/markj/PQ_LAUNDRY_11/contrib/dtc/libfdt/fdt_addresses.c - copied unchanged from r318483, stable/11/contrib/dtc/libfdt/fdt_addresses.c user/markj/PQ_LAUNDRY_11/contrib/dtc/libfdt/fdt_overlay.c - copied unchanged from r318483, stable/11/contrib/dtc/libfdt/fdt_overlay.c user/markj/PQ_LAUNDRY_11/contrib/dtc/scripts/kup-dtc - copied unchanged from r318483, stable/11/contrib/dtc/scripts/kup-dtc user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/ar/os.FreeBSD.mk - copied unchanged from r318483, stable/11/contrib/elftoolchain/ar/os.FreeBSD.mk user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/elfcopy/os.FreeBSD.mk - copied unchanged from r318483, stable/11/contrib/elftoolchain/elfcopy/os.FreeBSD.mk user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.c - copied unchanged from r318483, stable/11/contrib/libarchive/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.zip.uu - copied unchanged from r318483, stable/11/contrib/libarchive/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.zip.uu user/markj/PQ_LAUNDRY_11/etc/periodic/daily/410.status-mfi - copied unchanged from r318483, stable/11/etc/periodic/daily/410.status-mfi user/markj/PQ_LAUNDRY_11/lib/libc/sys/clock_nanosleep.c - copied unchanged from r318483, stable/11/lib/libc/sys/clock_nanosleep.c user/markj/PQ_LAUNDRY_11/lib/libc/tests/string/wcscoll_test.c - copied unchanged from r318483, stable/11/lib/libc/tests/string/wcscoll_test.c user/markj/PQ_LAUNDRY_11/release/doc/en_US.ISO8859-1/installation/ - copied from r318483, stable/11/release/doc/en_US.ISO8859-1/installation/ user/markj/PQ_LAUNDRY_11/release/packages/jail-debug.ucl - copied unchanged from r318483, stable/11/release/packages/jail-debug.ucl user/markj/PQ_LAUNDRY_11/release/packages/jail-development.ucl - copied unchanged from r318483, stable/11/release/packages/jail-development.ucl user/markj/PQ_LAUNDRY_11/release/packages/jail-lib32-debug.ucl - copied unchanged from r318483, stable/11/release/packages/jail-lib32-debug.ucl user/markj/PQ_LAUNDRY_11/release/packages/jail-lib32-development.ucl - copied unchanged from r318483, stable/11/release/packages/jail-lib32-development.ucl user/markj/PQ_LAUNDRY_11/release/packages/jail-lib32-profile.ucl - copied unchanged from r318483, stable/11/release/packages/jail-lib32-profile.ucl user/markj/PQ_LAUNDRY_11/release/packages/jail-lib32.ucl - copied unchanged from r318483, stable/11/release/packages/jail-lib32.ucl user/markj/PQ_LAUNDRY_11/release/packages/jail-profile.ucl - copied unchanged from r318483, stable/11/release/packages/jail-profile.ucl user/markj/PQ_LAUNDRY_11/sbin/zfsbootcfg/Makefile.depend - copied unchanged from r318483, stable/11/sbin/zfsbootcfg/Makefile.depend user/markj/PQ_LAUNDRY_11/sys/dev/acpica/acpi_container.c - copied unchanged from r318483, stable/11/sys/dev/acpica/acpi_container.c user/markj/PQ_LAUNDRY_11/sys/dev/hyperv/vmbus/vmbus_res.c - copied unchanged from r318483, stable/11/sys/dev/hyperv/vmbus/vmbus_res.c user/markj/PQ_LAUNDRY_11/sys/dev/ixl/ixl_iw.c - copied unchanged from r318483, stable/11/sys/dev/ixl/ixl_iw.c user/markj/PQ_LAUNDRY_11/sys/dev/ixl/ixl_iw.h - copied unchanged from r318483, stable/11/sys/dev/ixl/ixl_iw.h user/markj/PQ_LAUNDRY_11/sys/dev/ixl/ixl_iw_int.h - copied unchanged from r318483, stable/11/sys/dev/ixl/ixl_iw_int.h user/markj/PQ_LAUNDRY_11/sys/dev/ixl/ixl_pf_i2c.c - copied unchanged from r318483, stable/11/sys/dev/ixl/ixl_pf_i2c.c user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmc_ioctl.h - copied unchanged from r318483, stable/11/sys/dev/mmc/mmc_ioctl.h user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmc_private.h - copied unchanged from r318483, stable/11/sys/dev/mmc/mmc_private.h user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmc_subr.c - copied unchanged from r318483, stable/11/sys/dev/mmc/mmc_subr.c user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmc_subr.h - copied unchanged from r318483, stable/11/sys/dev/mmc/mmc_subr.h user/markj/PQ_LAUNDRY_11/sys/modules/geom/geom_flashmap/ - copied from r318483, stable/11/sys/modules/geom/geom_flashmap/ user/markj/PQ_LAUNDRY_11/tools/build/options/WITHOUT_LLD_BOOTSTRAP - copied unchanged from r318483, stable/11/tools/build/options/WITHOUT_LLD_BOOTSTRAP user/markj/PQ_LAUNDRY_11/tools/build/options/WITH_LLD_BOOTSTRAP - copied unchanged from r318483, stable/11/tools/build/options/WITH_LLD_BOOTSTRAP user/markj/PQ_LAUNDRY_11/usr.bin/getaddrinfo/Makefile.depend - copied unchanged from r318483, stable/11/usr.bin/getaddrinfo/Makefile.depend Replaced: user/markj/PQ_LAUNDRY_11/contrib/blacklist/port/config.h - copied unchanged from r318483, stable/11/contrib/blacklist/port/config.h Deleted: user/markj/PQ_LAUNDRY_11/sys/dev/ieee488/ user/markj/PQ_LAUNDRY_11/usr.bin/dtc/string.hh Modified: user/markj/PQ_LAUNDRY_11/Makefile.inc1 user/markj/PQ_LAUNDRY_11/ObsoleteFiles.inc user/markj/PQ_LAUNDRY_11/README user/markj/PQ_LAUNDRY_11/UPDATING user/markj/PQ_LAUNDRY_11/bin/dd/dd.1 user/markj/PQ_LAUNDRY_11/bin/sh/tests/builtins/Makefile user/markj/PQ_LAUNDRY_11/bin/sh/var.c user/markj/PQ_LAUNDRY_11/cddl/contrib/opensolaris/cmd/zdb/zdb.c user/markj/PQ_LAUNDRY_11/contrib/blacklist/README user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistctl.8 user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistctl.c user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistd.c user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistd.conf.5 user/markj/PQ_LAUNDRY_11/contrib/blacklist/etc/rc.d/blacklistd user/markj/PQ_LAUNDRY_11/contrib/blacklist/lib/bl.c user/markj/PQ_LAUNDRY_11/contrib/blacklist/lib/libblacklist.3 user/markj/PQ_LAUNDRY_11/contrib/blacklist/libexec/blacklistd-helper user/markj/PQ_LAUNDRY_11/contrib/blacklist/port/Makefile.am user/markj/PQ_LAUNDRY_11/contrib/blacklist/port/sockaddr_snprintf.c user/markj/PQ_LAUNDRY_11/contrib/dtc/Documentation/manual.txt user/markj/PQ_LAUNDRY_11/contrib/dtc/Makefile user/markj/PQ_LAUNDRY_11/contrib/dtc/checks.c user/markj/PQ_LAUNDRY_11/contrib/dtc/data.c user/markj/PQ_LAUNDRY_11/contrib/dtc/dtc-lexer.l user/markj/PQ_LAUNDRY_11/contrib/dtc/dtc-parser.y user/markj/PQ_LAUNDRY_11/contrib/dtc/dtc.c user/markj/PQ_LAUNDRY_11/contrib/dtc/dtc.h user/markj/PQ_LAUNDRY_11/contrib/dtc/fdtdump.c user/markj/PQ_LAUNDRY_11/contrib/dtc/fdtget.c user/markj/PQ_LAUNDRY_11/contrib/dtc/fdtput.c user/markj/PQ_LAUNDRY_11/contrib/dtc/flattree.c user/markj/PQ_LAUNDRY_11/contrib/dtc/fstree.c user/markj/PQ_LAUNDRY_11/contrib/dtc/libfdt/Makefile.libfdt user/markj/PQ_LAUNDRY_11/contrib/dtc/libfdt/fdt.c user/markj/PQ_LAUNDRY_11/contrib/dtc/libfdt/fdt_ro.c user/markj/PQ_LAUNDRY_11/contrib/dtc/libfdt/fdt_rw.c user/markj/PQ_LAUNDRY_11/contrib/dtc/libfdt/fdt_strerror.c user/markj/PQ_LAUNDRY_11/contrib/dtc/libfdt/fdt_wip.c user/markj/PQ_LAUNDRY_11/contrib/dtc/libfdt/libfdt.h user/markj/PQ_LAUNDRY_11/contrib/dtc/libfdt/libfdt_env.h user/markj/PQ_LAUNDRY_11/contrib/dtc/libfdt/libfdt_internal.h user/markj/PQ_LAUNDRY_11/contrib/dtc/libfdt/version.lds user/markj/PQ_LAUNDRY_11/contrib/dtc/livetree.c user/markj/PQ_LAUNDRY_11/contrib/dtc/srcpos.c user/markj/PQ_LAUNDRY_11/contrib/dtc/srcpos.h user/markj/PQ_LAUNDRY_11/contrib/dtc/treesource.c user/markj/PQ_LAUNDRY_11/contrib/dtc/util.c user/markj/PQ_LAUNDRY_11/contrib/dtc/util.h user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/addr2line/addr2line.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/common/elfdefinitions.h user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/cxxfilt/cxxfilt.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/elfcopy/main.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/elfcopy/pe.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/elfcopy/symbols.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/elfdump/elfdump.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/libdwarf/dwarf.h user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/libdwarf/dwarf_attrval.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/libdwarf/dwarf_attrval_signed.3 user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/libdwarf/dwarf_dump.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/libelf/elf_update.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/libelf/gelf_newehdr.3 user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/libelf/gelf_newphdr.3 user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/libelf/gelf_phdr.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/libelf/libelf_ehdr.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/libelftc/libelftc_dem_arm.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/libelftc/libelftc_dem_gnu2.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/nm/nm.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/readelf/readelf.c user/markj/PQ_LAUNDRY_11/contrib/elftoolchain/strings/strings.c user/markj/PQ_LAUNDRY_11/contrib/hyperv/tools/hv_kvp_daemon.c user/markj/PQ_LAUNDRY_11/contrib/ipfilter/lib/ipf_perror.c user/markj/PQ_LAUNDRY_11/contrib/ipfilter/lib/printhash_live.c user/markj/PQ_LAUNDRY_11/contrib/ipfilter/tools/ippool.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/cpio/cpio.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/cpio/test/test_option_Z_upper.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/cpio/test/test_option_a.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/cpio/test/test_option_b64encode.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/cpio/test/test_option_grzip.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/cpio/test/test_option_lrzip.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/cpio/test/test_option_lz4.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/cpio/test/test_option_lzma.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/cpio/test/test_option_lzop.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/cpio/test/test_option_uuencode.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/cpio/test/test_option_xz.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/cpio/test/test_option_y.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/cpio/test/test_option_z.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/archive_entry_sparse.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/archive_getdate.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/archive_openssl_hmac_private.h user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/archive_read.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/archive_read_support_filter_lz4.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/archive_read_support_format_cab.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/archive_read_support_format_cpio.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/archive_read_support_format_mtree.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/archive_read_support_format_rar.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/archive_string.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/archive_write_set_format_pax.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/libarchive_changes.3 user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/test/test_read_format_mtree.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/test/test_write_format_pax.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/test/test_write_format_zip_compression_store.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/test/test_write_format_zip_large.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/libarchive/xxhash.c user/markj/PQ_LAUNDRY_11/contrib/libarchive/test_utils/test_main.c user/markj/PQ_LAUNDRY_11/contrib/libc++/include/locale user/markj/PQ_LAUNDRY_11/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h user/markj/PQ_LAUNDRY_11/contrib/llvm/include/llvm/MC/MCContext.h user/markj/PQ_LAUNDRY_11/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h user/markj/PQ_LAUNDRY_11/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp user/markj/PQ_LAUNDRY_11/contrib/llvm/lib/MC/MCContext.cpp user/markj/PQ_LAUNDRY_11/contrib/llvm/lib/MC/MCParser/AsmParser.cpp user/markj/PQ_LAUNDRY_11/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp user/markj/PQ_LAUNDRY_11/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp user/markj/PQ_LAUNDRY_11/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c user/markj/PQ_LAUNDRY_11/contrib/netbsd-tests/lib/libc/sys/t_clock_nanosleep.c user/markj/PQ_LAUNDRY_11/contrib/top/display.c user/markj/PQ_LAUNDRY_11/contrib/top/display.h user/markj/PQ_LAUNDRY_11/contrib/top/layout.h user/markj/PQ_LAUNDRY_11/contrib/top/machine.h user/markj/PQ_LAUNDRY_11/contrib/top/top.c user/markj/PQ_LAUNDRY_11/crypto/openssh/auth-pam.c user/markj/PQ_LAUNDRY_11/crypto/openssh/auth.c user/markj/PQ_LAUNDRY_11/crypto/openssh/auth1.c user/markj/PQ_LAUNDRY_11/crypto/openssh/auth2.c user/markj/PQ_LAUNDRY_11/crypto/openssh/blacklist.c user/markj/PQ_LAUNDRY_11/crypto/openssh/blacklist_client.h user/markj/PQ_LAUNDRY_11/crypto/openssh/packet.c user/markj/PQ_LAUNDRY_11/crypto/openssh/sshd.c user/markj/PQ_LAUNDRY_11/etc/defaults/periodic.conf user/markj/PQ_LAUNDRY_11/etc/mtree/BSD.include.dist user/markj/PQ_LAUNDRY_11/etc/periodic/daily/Makefile user/markj/PQ_LAUNDRY_11/gnu/usr.bin/dtc/Makefile user/markj/PQ_LAUNDRY_11/include/Makefile user/markj/PQ_LAUNDRY_11/include/time.h user/markj/PQ_LAUNDRY_11/lib/libarchive/tests/Makefile user/markj/PQ_LAUNDRY_11/lib/libbsnmp/libbsnmp/Makefile user/markj/PQ_LAUNDRY_11/lib/libbsnmp/libbsnmp/Makefile.depend user/markj/PQ_LAUNDRY_11/lib/libc/gen/getpagesize.c user/markj/PQ_LAUNDRY_11/lib/libc/gen/sem_new.c user/markj/PQ_LAUNDRY_11/lib/libc/gen/telldir.c user/markj/PQ_LAUNDRY_11/lib/libc/include/libc_private.h user/markj/PQ_LAUNDRY_11/lib/libc/include/namespace.h user/markj/PQ_LAUNDRY_11/lib/libc/include/un-namespace.h user/markj/PQ_LAUNDRY_11/lib/libc/regex/cname.h user/markj/PQ_LAUNDRY_11/lib/libc/regex/regcomp.c user/markj/PQ_LAUNDRY_11/lib/libc/regex/regerror.c user/markj/PQ_LAUNDRY_11/lib/libc/regex/regex2.h user/markj/PQ_LAUNDRY_11/lib/libc/regex/regexec.c user/markj/PQ_LAUNDRY_11/lib/libc/regex/regfree.c user/markj/PQ_LAUNDRY_11/lib/libc/rpc/svc.c user/markj/PQ_LAUNDRY_11/lib/libc/string/wcscoll.c user/markj/PQ_LAUNDRY_11/lib/libc/sys/Makefile.inc user/markj/PQ_LAUNDRY_11/lib/libc/sys/Symbol.map user/markj/PQ_LAUNDRY_11/lib/libc/sys/interposing_table.c user/markj/PQ_LAUNDRY_11/lib/libc/sys/kqueue.2 user/markj/PQ_LAUNDRY_11/lib/libc/sys/nanosleep.2 user/markj/PQ_LAUNDRY_11/lib/libc/sys/sigqueue.2 user/markj/PQ_LAUNDRY_11/lib/libc/tests/string/Makefile user/markj/PQ_LAUNDRY_11/lib/libc/tests/sys/Makefile user/markj/PQ_LAUNDRY_11/lib/libelftc/elftc_version.c user/markj/PQ_LAUNDRY_11/lib/libgssapi/gss_buffer_set.c user/markj/PQ_LAUNDRY_11/lib/libiconv_modules/ISO2022/citrus_iso2022.c user/markj/PQ_LAUNDRY_11/lib/libjail/jail.c user/markj/PQ_LAUNDRY_11/lib/libmt/mtlib.c user/markj/PQ_LAUNDRY_11/lib/libthr/thread/thr_mutex.c user/markj/PQ_LAUNDRY_11/lib/libthr/thread/thr_private.h user/markj/PQ_LAUNDRY_11/lib/libthr/thread/thr_syscalls.c user/markj/PQ_LAUNDRY_11/lib/libthread_db/libpthread_db.c user/markj/PQ_LAUNDRY_11/lib/libthread_db/libpthread_db.h user/markj/PQ_LAUNDRY_11/lib/libutil/gr_util.c user/markj/PQ_LAUNDRY_11/lib/libutil/login_cap.c user/markj/PQ_LAUNDRY_11/lib/libutil/pw_util.c user/markj/PQ_LAUNDRY_11/lib/msun/src/catrig.c user/markj/PQ_LAUNDRY_11/lib/msun/src/catrigf.c user/markj/PQ_LAUNDRY_11/libexec/ftpd/blacklist.c user/markj/PQ_LAUNDRY_11/libexec/ftpd/blacklist_client.h user/markj/PQ_LAUNDRY_11/release/doc/en_US.ISO8859-1/errata/article.xml user/markj/PQ_LAUNDRY_11/release/doc/en_US.ISO8859-1/hardware/article.xml user/markj/PQ_LAUNDRY_11/release/doc/en_US.ISO8859-1/readme/article.xml user/markj/PQ_LAUNDRY_11/release/doc/en_US.ISO8859-1/relnotes/article.xml user/markj/PQ_LAUNDRY_11/release/doc/share/xml/security.xml user/markj/PQ_LAUNDRY_11/release/doc/share/xml/sponsor.ent user/markj/PQ_LAUNDRY_11/release/packages/Makefile.package user/markj/PQ_LAUNDRY_11/release/packages/generate-ucl.sh user/markj/PQ_LAUNDRY_11/release/packages/jail.ucl user/markj/PQ_LAUNDRY_11/release/packages/runtime.ucl user/markj/PQ_LAUNDRY_11/release/scripts/atlas-upload.sh user/markj/PQ_LAUNDRY_11/release/scripts/pkg-stage.sh user/markj/PQ_LAUNDRY_11/sbin/camcontrol/camcontrol.8 user/markj/PQ_LAUNDRY_11/sbin/camcontrol/camcontrol.c user/markj/PQ_LAUNDRY_11/sbin/camcontrol/modeedit.c user/markj/PQ_LAUNDRY_11/sbin/camcontrol/timestamp.c user/markj/PQ_LAUNDRY_11/sbin/fsck_ffs/fsck.h user/markj/PQ_LAUNDRY_11/sbin/fsck_ffs/globs.c user/markj/PQ_LAUNDRY_11/sbin/fsck_ffs/inode.c user/markj/PQ_LAUNDRY_11/sbin/fsck_ffs/setup.c user/markj/PQ_LAUNDRY_11/sbin/geom/class/eli/geom_eli.c user/markj/PQ_LAUNDRY_11/sbin/geom/class/label/geom_label.c user/markj/PQ_LAUNDRY_11/sbin/geom/class/label/glabel.8 user/markj/PQ_LAUNDRY_11/sbin/ifconfig/af_link.c user/markj/PQ_LAUNDRY_11/sbin/ipfw/dummynet.c user/markj/PQ_LAUNDRY_11/sbin/ipfw/ipfw.8 user/markj/PQ_LAUNDRY_11/sbin/ipfw/ipfw2.c user/markj/PQ_LAUNDRY_11/sbin/ipfw/ipv6.c user/markj/PQ_LAUNDRY_11/sbin/ipfw/tables.c user/markj/PQ_LAUNDRY_11/sbin/mksnap_ffs/mksnap_ffs.c user/markj/PQ_LAUNDRY_11/secure/usr.bin/ssh/Makefile.depend user/markj/PQ_LAUNDRY_11/share/man/man3/pthread_testcancel.3 user/markj/PQ_LAUNDRY_11/share/man/man4/bnxt.4 user/markj/PQ_LAUNDRY_11/share/man/man4/bytgpio.4 user/markj/PQ_LAUNDRY_11/share/man/man4/cxgbev.4 user/markj/PQ_LAUNDRY_11/share/man/man4/jedec_ts.4 user/markj/PQ_LAUNDRY_11/share/man/man4/pass.4 user/markj/PQ_LAUNDRY_11/share/man/man4/qlnxe.4 user/markj/PQ_LAUNDRY_11/share/man/man4/sa.4 user/markj/PQ_LAUNDRY_11/share/man/man4/usb.4 user/markj/PQ_LAUNDRY_11/share/man/man5/periodic.conf.5 user/markj/PQ_LAUNDRY_11/share/man/man5/src.conf.5 user/markj/PQ_LAUNDRY_11/share/man/man9/Makefile user/markj/PQ_LAUNDRY_11/share/mk/bsd.README user/markj/PQ_LAUNDRY_11/share/mk/bsd.progs.mk user/markj/PQ_LAUNDRY_11/share/mk/src.opts.mk user/markj/PQ_LAUNDRY_11/sys/amd64/conf/NOTES user/markj/PQ_LAUNDRY_11/sys/amd64/linux/linux_proto.h user/markj/PQ_LAUNDRY_11/sys/amd64/linux/linux_syscall.h user/markj/PQ_LAUNDRY_11/sys/amd64/linux/linux_syscalls.c user/markj/PQ_LAUNDRY_11/sys/amd64/linux/linux_sysent.c user/markj/PQ_LAUNDRY_11/sys/amd64/linux32/linux32_proto.h user/markj/PQ_LAUNDRY_11/sys/amd64/linux32/linux32_syscall.h user/markj/PQ_LAUNDRY_11/sys/amd64/linux32/linux32_syscalls.c user/markj/PQ_LAUNDRY_11/sys/amd64/linux32/linux32_sysent.c user/markj/PQ_LAUNDRY_11/sys/amd64/pci/pci_cfgreg.c user/markj/PQ_LAUNDRY_11/sys/arm/allwinner/a10_mmc.c user/markj/PQ_LAUNDRY_11/sys/arm/amlogic/aml8726/aml8726_mmc.c user/markj/PQ_LAUNDRY_11/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c user/markj/PQ_LAUNDRY_11/sys/arm/arm/debug_monitor.c user/markj/PQ_LAUNDRY_11/sys/arm/at91/at91_mci.c user/markj/PQ_LAUNDRY_11/sys/arm/broadcom/bcm2835/bcm2835_audio.c user/markj/PQ_LAUNDRY_11/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c user/markj/PQ_LAUNDRY_11/sys/arm/freescale/imx/imx6_sdma.c user/markj/PQ_LAUNDRY_11/sys/arm/freescale/imx/imx6_sdma.h user/markj/PQ_LAUNDRY_11/sys/arm/freescale/imx/imx6_ssi.c user/markj/PQ_LAUNDRY_11/sys/arm/lpc/lpc_mmc.c user/markj/PQ_LAUNDRY_11/sys/arm/nvidia/tegra_sdhci.c user/markj/PQ_LAUNDRY_11/sys/arm/ti/ti_sdhci.c user/markj/PQ_LAUNDRY_11/sys/boot/common/bootstrap.h user/markj/PQ_LAUNDRY_11/sys/boot/common/module.c user/markj/PQ_LAUNDRY_11/sys/boot/efi/loader/main.c user/markj/PQ_LAUNDRY_11/sys/boot/fdt/fdt_overlay.c user/markj/PQ_LAUNDRY_11/sys/boot/i386/libi386/multiboot.c user/markj/PQ_LAUNDRY_11/sys/cam/ctl/ctl.c user/markj/PQ_LAUNDRY_11/sys/cam/ctl/ctl_backend_block.c user/markj/PQ_LAUNDRY_11/sys/cam/ctl/ctl_backend_ramdisk.c user/markj/PQ_LAUNDRY_11/sys/cam/scsi/scsi_all.c user/markj/PQ_LAUNDRY_11/sys/cam/scsi/scsi_all.h user/markj/PQ_LAUNDRY_11/sys/cam/scsi/scsi_pass.c user/markj/PQ_LAUNDRY_11/sys/cam/scsi/scsi_sa.c user/markj/PQ_LAUNDRY_11/sys/cam/scsi/scsi_sa.h user/markj/PQ_LAUNDRY_11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/markj/PQ_LAUNDRY_11/sys/compat/cloudabi32/cloudabi32_proto.h user/markj/PQ_LAUNDRY_11/sys/compat/cloudabi32/cloudabi32_syscall.h user/markj/PQ_LAUNDRY_11/sys/compat/cloudabi32/cloudabi32_syscalls.c user/markj/PQ_LAUNDRY_11/sys/compat/cloudabi32/cloudabi32_sysent.c user/markj/PQ_LAUNDRY_11/sys/compat/cloudabi64/cloudabi64_proto.h user/markj/PQ_LAUNDRY_11/sys/compat/cloudabi64/cloudabi64_syscall.h user/markj/PQ_LAUNDRY_11/sys/compat/cloudabi64/cloudabi64_syscalls.c user/markj/PQ_LAUNDRY_11/sys/compat/cloudabi64/cloudabi64_sysent.c user/markj/PQ_LAUNDRY_11/sys/compat/freebsd32/freebsd32_misc.c user/markj/PQ_LAUNDRY_11/sys/compat/freebsd32/freebsd32_proto.h user/markj/PQ_LAUNDRY_11/sys/compat/freebsd32/freebsd32_syscall.h user/markj/PQ_LAUNDRY_11/sys/compat/freebsd32/freebsd32_syscalls.c user/markj/PQ_LAUNDRY_11/sys/compat/freebsd32/freebsd32_sysent.c user/markj/PQ_LAUNDRY_11/sys/compat/freebsd32/freebsd32_systrace_args.c user/markj/PQ_LAUNDRY_11/sys/compat/freebsd32/syscalls.master user/markj/PQ_LAUNDRY_11/sys/compat/linux/linux_futex.c user/markj/PQ_LAUNDRY_11/sys/compat/linux/linux_ioctl.c user/markj/PQ_LAUNDRY_11/sys/compat/linux/linux_ioctl.h user/markj/PQ_LAUNDRY_11/sys/compat/linux/linux_time.c user/markj/PQ_LAUNDRY_11/sys/compat/linux/linux_timer.h user/markj/PQ_LAUNDRY_11/sys/compat/linuxkpi/common/src/linux_compat.c user/markj/PQ_LAUNDRY_11/sys/compat/svr4/svr4_proto.h user/markj/PQ_LAUNDRY_11/sys/compat/svr4/svr4_syscall.h user/markj/PQ_LAUNDRY_11/sys/compat/svr4/svr4_syscallnames.c user/markj/PQ_LAUNDRY_11/sys/compat/svr4/svr4_sysent.c user/markj/PQ_LAUNDRY_11/sys/conf/files user/markj/PQ_LAUNDRY_11/sys/conf/files.amd64 user/markj/PQ_LAUNDRY_11/sys/conf/files.i386 user/markj/PQ_LAUNDRY_11/sys/conf/kern.mk user/markj/PQ_LAUNDRY_11/sys/conf/kern.post.mk user/markj/PQ_LAUNDRY_11/sys/conf/kmod.mk user/markj/PQ_LAUNDRY_11/sys/conf/options.amd64 user/markj/PQ_LAUNDRY_11/sys/contrib/vchiq/interface/vchiq_arm/vchiq_version.c user/markj/PQ_LAUNDRY_11/sys/dev/acpica/acpi_pcib_acpi.c user/markj/PQ_LAUNDRY_11/sys/dev/ahci/ahci.c user/markj/PQ_LAUNDRY_11/sys/dev/ahci/ahci.h user/markj/PQ_LAUNDRY_11/sys/dev/ahci/ahci_pci.c user/markj/PQ_LAUNDRY_11/sys/dev/bhnd/cores/chipc/chipc_slicer.c user/markj/PQ_LAUNDRY_11/sys/dev/bhnd/cores/chipc/chipc_slicer.h user/markj/PQ_LAUNDRY_11/sys/dev/drm2/radeon/radeon_drv.c user/markj/PQ_LAUNDRY_11/sys/dev/evdev/cdev.c user/markj/PQ_LAUNDRY_11/sys/dev/evdev/evdev_utils.c user/markj/PQ_LAUNDRY_11/sys/dev/evdev/uinput.c user/markj/PQ_LAUNDRY_11/sys/dev/fdt/fdt_slicer.c user/markj/PQ_LAUNDRY_11/sys/dev/hyperv/input/hv_kbd.c user/markj/PQ_LAUNDRY_11/sys/dev/hyperv/netvsc/if_hn.c user/markj/PQ_LAUNDRY_11/sys/dev/hyperv/vmbus/vmbus.c user/markj/PQ_LAUNDRY_11/sys/dev/isp/isp.c user/markj/PQ_LAUNDRY_11/sys/dev/isp/isp_freebsd.c user/markj/PQ_LAUNDRY_11/sys/dev/isp/ispmbox.h user/markj/PQ_LAUNDRY_11/sys/dev/isp/ispvar.h user/markj/PQ_LAUNDRY_11/sys/dev/ixl/i40e_adminq.c user/markj/PQ_LAUNDRY_11/sys/dev/ixl/i40e_adminq_cmd.h user/markj/PQ_LAUNDRY_11/sys/dev/ixl/i40e_common.c user/markj/PQ_LAUNDRY_11/sys/dev/ixl/i40e_devids.h user/markj/PQ_LAUNDRY_11/sys/dev/ixl/i40e_lan_hmc.c user/markj/PQ_LAUNDRY_11/sys/dev/ixl/i40e_nvm.c user/markj/PQ_LAUNDRY_11/sys/dev/ixl/i40e_osdep.c user/markj/PQ_LAUNDRY_11/sys/dev/ixl/i40e_osdep.h user/markj/PQ_LAUNDRY_11/sys/dev/ixl/i40e_prototype.h user/markj/PQ_LAUNDRY_11/sys/dev/ixl/i40e_type.h user/markj/PQ_LAUNDRY_11/sys/dev/ixl/i40e_virtchnl.h user/markj/PQ_LAUNDRY_11/sys/dev/ixl/if_ixl.c user/markj/PQ_LAUNDRY_11/sys/dev/ixl/if_ixlv.c user/markj/PQ_LAUNDRY_11/sys/dev/ixl/ixl.h user/markj/PQ_LAUNDRY_11/sys/dev/ixl/ixl_pf.h user/markj/PQ_LAUNDRY_11/sys/dev/ixl/ixl_pf_iov.c user/markj/PQ_LAUNDRY_11/sys/dev/ixl/ixl_pf_iov.h user/markj/PQ_LAUNDRY_11/sys/dev/ixl/ixl_pf_main.c user/markj/PQ_LAUNDRY_11/sys/dev/ixl/ixl_txrx.c user/markj/PQ_LAUNDRY_11/sys/dev/ixl/ixlv.h user/markj/PQ_LAUNDRY_11/sys/dev/ixl/ixlvc.c user/markj/PQ_LAUNDRY_11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c user/markj/PQ_LAUNDRY_11/sys/dev/mmc/bridge.h user/markj/PQ_LAUNDRY_11/sys/dev/mmc/host/dwmmc.c user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmc.c user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmcbr_if.m user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmcbrvar.h user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmcreg.h user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmcsd.c user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmcvar.h user/markj/PQ_LAUNDRY_11/sys/dev/nand/nfc_rb.c user/markj/PQ_LAUNDRY_11/sys/dev/ntb/if_ntb/if_ntb.c user/markj/PQ_LAUNDRY_11/sys/dev/ntb/ntb.c user/markj/PQ_LAUNDRY_11/sys/dev/ntb/ntb_if.m user/markj/PQ_LAUNDRY_11/sys/dev/ntb/ntb_transport.c user/markj/PQ_LAUNDRY_11/sys/dev/ntb/ntb_transport.h user/markj/PQ_LAUNDRY_11/sys/dev/qlnx/qlnxe/ecore_dev.c user/markj/PQ_LAUNDRY_11/sys/dev/qlxgbe/ql_hw.c user/markj/PQ_LAUNDRY_11/sys/dev/qlxgbe/ql_ioctl.c user/markj/PQ_LAUNDRY_11/sys/dev/qlxgbe/ql_isr.c user/markj/PQ_LAUNDRY_11/sys/dev/qlxgbe/ql_os.c user/markj/PQ_LAUNDRY_11/sys/dev/qlxgbe/ql_os.h user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/fsl_sdhci.c user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci.c user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci.h user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci_acpi.c user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci_fdt.c user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci_if.m user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci_pci.c user/markj/PQ_LAUNDRY_11/sys/dev/sound/pcm/feeder_matrix.c user/markj/PQ_LAUNDRY_11/sys/dev/uart/uart_dev_lpc.c user/markj/PQ_LAUNDRY_11/sys/dev/uart/uart_dev_ns8250.c user/markj/PQ_LAUNDRY_11/sys/dev/xen/evtchn/evtchn_dev.c user/markj/PQ_LAUNDRY_11/sys/fs/nfs/nfs_commonkrpc.c user/markj/PQ_LAUNDRY_11/sys/fs/nfs/nfs_commonsubs.c user/markj/PQ_LAUNDRY_11/sys/fs/nfs/nfsport.h user/markj/PQ_LAUNDRY_11/sys/fs/nfsclient/nfs_clcomsubs.c user/markj/PQ_LAUNDRY_11/sys/fs/nfsclient/nfs_clrpcops.c user/markj/PQ_LAUNDRY_11/sys/fs/nfsclient/nfs_clstate.c user/markj/PQ_LAUNDRY_11/sys/fs/nfsclient/nfs_clvfsops.c user/markj/PQ_LAUNDRY_11/sys/fs/nfsserver/nfs_nfsdport.c user/markj/PQ_LAUNDRY_11/sys/fs/nfsserver/nfs_nfsdstate.c user/markj/PQ_LAUNDRY_11/sys/geom/eli/g_eli.h user/markj/PQ_LAUNDRY_11/sys/geom/eli/g_eli_ctl.c user/markj/PQ_LAUNDRY_11/sys/geom/geom_flashmap.c user/markj/PQ_LAUNDRY_11/sys/geom/journal/g_journal.c user/markj/PQ_LAUNDRY_11/sys/geom/part/g_part.c user/markj/PQ_LAUNDRY_11/sys/i386/ibcs2/ibcs2_proto.h user/markj/PQ_LAUNDRY_11/sys/i386/ibcs2/ibcs2_syscall.h user/markj/PQ_LAUNDRY_11/sys/i386/ibcs2/ibcs2_sysent.c user/markj/PQ_LAUNDRY_11/sys/i386/linux/linux_proto.h user/markj/PQ_LAUNDRY_11/sys/i386/linux/linux_syscall.h user/markj/PQ_LAUNDRY_11/sys/i386/linux/linux_syscalls.c user/markj/PQ_LAUNDRY_11/sys/i386/linux/linux_sysent.c user/markj/PQ_LAUNDRY_11/sys/kern/imgact_binmisc.c user/markj/PQ_LAUNDRY_11/sys/kern/imgact_elf.c user/markj/PQ_LAUNDRY_11/sys/kern/init_sysent.c user/markj/PQ_LAUNDRY_11/sys/kern/kern_fork.c user/markj/PQ_LAUNDRY_11/sys/kern/kern_sig.c user/markj/PQ_LAUNDRY_11/sys/kern/kern_thread.c user/markj/PQ_LAUNDRY_11/sys/kern/kern_time.c user/markj/PQ_LAUNDRY_11/sys/kern/makesyscalls.sh user/markj/PQ_LAUNDRY_11/sys/kern/subr_kobj.c user/markj/PQ_LAUNDRY_11/sys/kern/syscalls.c user/markj/PQ_LAUNDRY_11/sys/kern/syscalls.master user/markj/PQ_LAUNDRY_11/sys/kern/systrace_args.c user/markj/PQ_LAUNDRY_11/sys/kern/uipc_socket.c user/markj/PQ_LAUNDRY_11/sys/kern/vfs_cache.c user/markj/PQ_LAUNDRY_11/sys/kern/vfs_lookup.c user/markj/PQ_LAUNDRY_11/sys/modules/geom/Makefile user/markj/PQ_LAUNDRY_11/sys/modules/hyperv/vmbus/Makefile user/markj/PQ_LAUNDRY_11/sys/modules/ixl/Makefile user/markj/PQ_LAUNDRY_11/sys/modules/ixlv/Makefile user/markj/PQ_LAUNDRY_11/sys/modules/linux/Makefile user/markj/PQ_LAUNDRY_11/sys/modules/linux64/Makefile user/markj/PQ_LAUNDRY_11/sys/modules/mmc/Makefile user/markj/PQ_LAUNDRY_11/sys/modules/svr4/Makefile user/markj/PQ_LAUNDRY_11/sys/modules/vmm/Makefile user/markj/PQ_LAUNDRY_11/sys/net/ieee8023ad_lacp.c user/markj/PQ_LAUNDRY_11/sys/net/if.c user/markj/PQ_LAUNDRY_11/sys/net/if_ethersubr.c user/markj/PQ_LAUNDRY_11/sys/net/if_lagg.c user/markj/PQ_LAUNDRY_11/sys/net/if_lagg.h user/markj/PQ_LAUNDRY_11/sys/net/if_media.h user/markj/PQ_LAUNDRY_11/sys/net/if_var.h user/markj/PQ_LAUNDRY_11/sys/net/if_vlan.c user/markj/PQ_LAUNDRY_11/sys/net/iflib.c user/markj/PQ_LAUNDRY_11/sys/netipsec/ipsec_pcb.c user/markj/PQ_LAUNDRY_11/sys/netpfil/ipfw/ip_dummynet.c user/markj/PQ_LAUNDRY_11/sys/opencrypto/cryptosoft.c user/markj/PQ_LAUNDRY_11/sys/powerpc/mikrotik/platform_rb.c user/markj/PQ_LAUNDRY_11/sys/sparc64/conf/GENERIC user/markj/PQ_LAUNDRY_11/sys/sparc64/pci/psycho.c user/markj/PQ_LAUNDRY_11/sys/sys/conf.h user/markj/PQ_LAUNDRY_11/sys/sys/kobj.h user/markj/PQ_LAUNDRY_11/sys/sys/param.h user/markj/PQ_LAUNDRY_11/sys/sys/proc.h user/markj/PQ_LAUNDRY_11/sys/sys/slicer.h user/markj/PQ_LAUNDRY_11/sys/sys/sockio.h user/markj/PQ_LAUNDRY_11/sys/sys/syscall.h user/markj/PQ_LAUNDRY_11/sys/sys/syscall.mk user/markj/PQ_LAUNDRY_11/sys/sys/syscallsubr.h user/markj/PQ_LAUNDRY_11/sys/sys/sysproto.h user/markj/PQ_LAUNDRY_11/sys/tools/fdt/make_dtb.sh user/markj/PQ_LAUNDRY_11/sys/ufs/ffs/ffs_rawread.c user/markj/PQ_LAUNDRY_11/sys/vm/uma_core.c user/markj/PQ_LAUNDRY_11/sys/x86/xen/xen_apic.c user/markj/PQ_LAUNDRY_11/sys/x86/xen/xen_intr.c user/markj/PQ_LAUNDRY_11/sys/xen/xen_intr.h user/markj/PQ_LAUNDRY_11/targets/pseudo/clang/Makefile.depend user/markj/PQ_LAUNDRY_11/targets/pseudo/userland/Makefile.depend user/markj/PQ_LAUNDRY_11/targets/pseudo/userland/misc/Makefile.depend user/markj/PQ_LAUNDRY_11/tests/sys/kern/unix_seqpacket_test.c user/markj/PQ_LAUNDRY_11/tools/build/mk/OptionalObsoleteFiles.inc user/markj/PQ_LAUNDRY_11/tools/build/options/WITH_REPRODUCIBLE_BUILD user/markj/PQ_LAUNDRY_11/tools/build/options/makeman user/markj/PQ_LAUNDRY_11/usr.bin/Makefile user/markj/PQ_LAUNDRY_11/usr.bin/csplit/csplit.c user/markj/PQ_LAUNDRY_11/usr.bin/dtc/checking.cc user/markj/PQ_LAUNDRY_11/usr.bin/dtc/checking.hh user/markj/PQ_LAUNDRY_11/usr.bin/dtc/dtb.cc user/markj/PQ_LAUNDRY_11/usr.bin/dtc/dtb.hh user/markj/PQ_LAUNDRY_11/usr.bin/dtc/dtc.1 user/markj/PQ_LAUNDRY_11/usr.bin/dtc/dtc.cc user/markj/PQ_LAUNDRY_11/usr.bin/dtc/fdt.cc user/markj/PQ_LAUNDRY_11/usr.bin/dtc/fdt.hh user/markj/PQ_LAUNDRY_11/usr.bin/dtc/input_buffer.cc user/markj/PQ_LAUNDRY_11/usr.bin/dtc/input_buffer.hh user/markj/PQ_LAUNDRY_11/usr.bin/dtc/string.cc user/markj/PQ_LAUNDRY_11/usr.bin/dtc/util.hh user/markj/PQ_LAUNDRY_11/usr.bin/gcore/elfcore.c user/markj/PQ_LAUNDRY_11/usr.bin/getaddrinfo/Makefile user/markj/PQ_LAUNDRY_11/usr.bin/mt/mt.1 user/markj/PQ_LAUNDRY_11/usr.bin/nfsstat/Makefile.depend user/markj/PQ_LAUNDRY_11/usr.bin/proccontrol/Makefile user/markj/PQ_LAUNDRY_11/usr.bin/sort/coll.c user/markj/PQ_LAUNDRY_11/usr.bin/sort/coll.h user/markj/PQ_LAUNDRY_11/usr.bin/sort/radixsort.c user/markj/PQ_LAUNDRY_11/usr.bin/top/machine.c user/markj/PQ_LAUNDRY_11/usr.bin/top/top.local.1 user/markj/PQ_LAUNDRY_11/usr.bin/unexpand/unexpand.c user/markj/PQ_LAUNDRY_11/usr.bin/xinstall/xinstall.c user/markj/PQ_LAUNDRY_11/usr.sbin/amd/amq/Makefile.depend user/markj/PQ_LAUNDRY_11/usr.sbin/amd/fixmount/Makefile.depend user/markj/PQ_LAUNDRY_11/usr.sbin/amd/fsinfo/Makefile.depend user/markj/PQ_LAUNDRY_11/usr.sbin/amd/hlfsd/Makefile.depend user/markj/PQ_LAUNDRY_11/usr.sbin/amd/libamu/Makefile.depend user/markj/PQ_LAUNDRY_11/usr.sbin/amd/mk-amd-map/Makefile.depend user/markj/PQ_LAUNDRY_11/usr.sbin/amd/pawd/Makefile.depend user/markj/PQ_LAUNDRY_11/usr.sbin/amd/wire-test/Makefile.depend user/markj/PQ_LAUNDRY_11/usr.sbin/arp/Makefile.depend user/markj/PQ_LAUNDRY_11/usr.sbin/bhyve/Makefile.depend user/markj/PQ_LAUNDRY_11/usr.sbin/bsdinstall/partedit/gpart_ops.c user/markj/PQ_LAUNDRY_11/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend user/markj/PQ_LAUNDRY_11/usr.sbin/daemon/Makefile.depend user/markj/PQ_LAUNDRY_11/usr.sbin/daemon/daemon.8 user/markj/PQ_LAUNDRY_11/usr.sbin/daemon/daemon.c user/markj/PQ_LAUNDRY_11/usr.sbin/fdread/fdread.c user/markj/PQ_LAUNDRY_11/usr.sbin/mixer/mixer.c user/markj/PQ_LAUNDRY_11/usr.sbin/nfsuserd/nfsuserd.8 user/markj/PQ_LAUNDRY_11/usr.sbin/nfsuserd/nfsuserd.c user/markj/PQ_LAUNDRY_11/usr.sbin/ntp/sntp/Makefile user/markj/PQ_LAUNDRY_11/usr.sbin/pmcstat/pmcpl_calltree.c user/markj/PQ_LAUNDRY_11/usr.sbin/pmcstat/pmcstat_log.c Directory Properties: user/markj/PQ_LAUNDRY_11/ (props changed) Modified: user/markj/PQ_LAUNDRY_11/Makefile.inc1 ============================================================================== --- user/markj/PQ_LAUNDRY_11/Makefile.inc1 Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/Makefile.inc1 Thu May 18 20:15:35 2017 (r318484) @@ -195,10 +195,11 @@ CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN .endif # If we do not have a bootstrap binutils (because the in-tree one does not # support the target architecture), provide a default cross-binutils prefix. -# This allows aarch64 builds, for example, to automatically use the -# aarch64-binutils port or package. +# This allows riscv64 builds, for example, to automatically use the +# riscv64-binutils port or package. .if !make(showconfig) .if !empty(BROKEN_OPTIONS:MBINUTILS_BOOTSTRAP) && \ + ${MK_LLD_BOOTSTRAP} == "no" && \ !defined(CROSS_BINUTILS_PREFIX) CROSS_BINUTILS_PREFIX=/usr/local/${TARGET_ARCH}-freebsd/bin/ .if !exists(${CROSS_BINUTILS_PREFIX}) @@ -1666,9 +1667,10 @@ ${_bt}-usr.bin/yacc: ${_bt}-lib/liby _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif -# We need to build tblgen when we're building clang either as -# the bootstrap compiler, or as the part of the normal build. -.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no" +# We need to build tblgen when we're building clang or lld, either as +# bootstrap tools, or as the part of the normal build. +.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no" || \ + ${MK_LLD_BOOTSTRAP} != "no" || ${MK_LLD} != "no" _clang_tblgen= \ lib/clang/libllvmminimal \ usr.bin/clang/llvm-tblgen \ @@ -1832,9 +1834,6 @@ _elftctools= lib/libelftc \ # cross-build on a FreeBSD 10 host: _elftctools+= usr.bin/addr2line .endif -.if ${MK_LLD_IS_LD} != "no" -_lld= usr.bin/clang/lld -.endif .elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no" # If cross-building with an external binutils we still need to build strip for # the target (for at least crunchide). @@ -1845,6 +1844,11 @@ _elftctools= lib/libelftc \ .if ${MK_CLANG_BOOTSTRAP} != "no" _clang= usr.bin/clang +.endif +.if ${MK_LLD_BOOTSTRAP} != "no" +_lld= usr.bin/clang/lld +.endif +.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_LLD_BOOTSTRAP} != "no" _clang_libs= lib/clang .endif .if ${MK_GCC_BOOTSTRAP} != "no" Modified: user/markj/PQ_LAUNDRY_11/ObsoleteFiles.inc ============================================================================== --- user/markj/PQ_LAUNDRY_11/ObsoleteFiles.inc Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/ObsoleteFiles.inc Thu May 18 20:15:35 2017 (r318484) @@ -1942,8 +1942,12 @@ OLD_FILES+=usr/share/info/am-utils.info. OLD_FILES+=usr/share/info/as.info.gz OLD_FILES+=usr/share/info/binutils.info.gz OLD_FILES+=usr/share/info/com_err.info.gz +OLD_FILES+=usr/share/info/cpp.info.gz +OLD_FILES+=usr/share/info/cppinternals.info.gz OLD_FILES+=usr/share/info/diff.info.gz OLD_FILES+=usr/share/info/dir +OLD_FILES+=usr/share/info/gcc.info.gz +OLD_FILES+=usr/share/info/gccint.info.gz OLD_FILES+=usr/share/info/gdb.info.gz OLD_FILES+=usr/share/info/gdbint.info.gz OLD_FILES+=usr/share/info/gperf.info.gz Modified: user/markj/PQ_LAUNDRY_11/README ============================================================================== --- user/markj/PQ_LAUNDRY_11/README Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/README Thu May 18 20:15:35 2017 (r318484) @@ -81,4 +81,4 @@ usr.sbin System administration commands. For information on synchronizing your source tree with one or more of the FreeBSD Project's development branches, please see: - http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/synching.html + https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/updating-src.html Modified: user/markj/PQ_LAUNDRY_11/UPDATING ============================================================================== --- user/markj/PQ_LAUNDRY_11/UPDATING Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/UPDATING Thu May 18 20:15:35 2017 (r318484) @@ -16,6 +16,19 @@ from older versions of FreeBSD, try WITH the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20170518: + arm64 builds now use the base system LLD 4.0.0 linker by default, + instead of requiring that the aarch64-binutils port or package be + installed. To continue using aarch64-binutils, set + CROSS_BINUTILS_PREFIX=/usr/local/aarch64-freebsd/bin . + +20170511: + The mmcsd.ko module now additionally depends on geom_flashmap.ko. + Also, mmc.ko and mmcsd.ko need to be a matching pair built from the + same source (previously, the dependency of mmcsd.ko on mmc.ko was + missing, but mmcsd.ko now will refuse to load if it is incompatible + with mmc.ko). + 20170414: Binds and sends to the loopback addresses, IPv6 and IPv4, will now use any explicitly assigned loopback address available in the jail Modified: user/markj/PQ_LAUNDRY_11/bin/dd/dd.1 ============================================================================== --- user/markj/PQ_LAUNDRY_11/bin/dd/dd.1 Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/bin/dd/dd.1 Thu May 18 20:15:35 2017 (r318484) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd October 5, 2016 +.Dd April 2, 2017 .Dt DD 1 .Os .Sh NAME @@ -54,7 +54,7 @@ displays the number of complete and part and truncated input records to the standard error output. .Pp The following operands are available: -.Bl -tag -width ".Cm of Ns = Ns Ar file" +.Bl -tag -width "of=file" .It Cm bs Ns = Ns Ar n Set both input and output block size to .Ar n @@ -164,7 +164,7 @@ bytes per second. Where .Cm value is one of the symbols from the following list. -.Bl -tag -width ".Cm noxfer" +.Bl -tag -width "noxfer" .It Cm noxfer Do not print the transfer statistics as the last line of status output. .It Cm none @@ -175,7 +175,7 @@ Error messages are shown; informational Where .Cm value is one of the symbols from the following list. -.Bl -tag -width ".Cm unblock" +.Bl -tag -width "unblock" .It Cm ascii , oldascii The same as the .Cm unblock @@ -459,4 +459,4 @@ subsystem might prevent the super-user f Instructions for temporarily disabling these protection mechanisms can be found in the .Xr geom 4 -manpage. +man page. Modified: user/markj/PQ_LAUNDRY_11/bin/sh/tests/builtins/Makefile ============================================================================== --- user/markj/PQ_LAUNDRY_11/bin/sh/tests/builtins/Makefile Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/bin/sh/tests/builtins/Makefile Thu May 18 20:15:35 2017 (r318484) @@ -117,6 +117,7 @@ ${PACKAGE}FILES+= local7.0 .if ${MK_NLS} != "no" ${PACKAGE}FILES+= locale1.0 .endif +${PACKAGE}FILES+= locale2.0 ${PACKAGE}FILES+= printf1.0 ${PACKAGE}FILES+= printf2.0 ${PACKAGE}FILES+= printf3.0 Copied: user/markj/PQ_LAUNDRY_11/bin/sh/tests/builtins/locale2.0 (from r318483, stable/11/bin/sh/tests/builtins/locale2.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/markj/PQ_LAUNDRY_11/bin/sh/tests/builtins/locale2.0 Thu May 18 20:15:35 2017 (r318484, copy of r318483, stable/11/bin/sh/tests/builtins/locale2.0) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +$SH -c 'LC_ALL=C true; kill -INT $$; echo continued' +r=$? +[ "$r" -gt 128 ] && [ "$(kill -l "$r")" = INT ] Modified: user/markj/PQ_LAUNDRY_11/bin/sh/var.c ============================================================================== --- user/markj/PQ_LAUNDRY_11/bin/sh/var.c Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/bin/sh/var.c Thu May 18 20:15:35 2017 (r318484) @@ -512,7 +512,7 @@ bltinunsetlocale(void) if (localevar(cmdenviron->args[i])) { setlocale(LC_ALL, ""); updatecharset(); - return; + break; } } INTON; Modified: user/markj/PQ_LAUNDRY_11/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- user/markj/PQ_LAUNDRY_11/cddl/contrib/opensolaris/cmd/zdb/zdb.c Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/cddl/contrib/opensolaris/cmd/zdb/zdb.c Thu May 18 20:15:35 2017 (r318484) @@ -1718,23 +1718,19 @@ dump_znode(objset_t *os, uint64_t object return; } - error = zfs_obj_to_path(os, object, path, sizeof (path)); - if (error != 0) { - (void) snprintf(path, sizeof (path), "\?\?\?", - (u_longlong_t)object); - } - if (dump_opt['d'] < 3) { - (void) printf("\t%s\n", path); - (void) sa_handle_destroy(hdl); - return; - } - z_crtime = (time_t)crtm[0]; z_atime = (time_t)acctm[0]; z_mtime = (time_t)modtm[0]; z_ctime = (time_t)chgtm[0]; - (void) printf("\tpath %s\n", path); + if (dump_opt['d'] > 4) { + error = zfs_obj_to_path(os, object, path, sizeof (path)); + if (error != 0) { + (void) snprintf(path, sizeof (path), + "\?\?\?", (u_longlong_t)object); + } + (void) printf("\tpath %s\n", path); + } dump_uidgid(os, uid, gid); (void) printf("\tatime %s", ctime(&z_atime)); (void) printf("\tmtime %s", ctime(&z_mtime)); Modified: user/markj/PQ_LAUNDRY_11/contrib/blacklist/README ============================================================================== --- user/markj/PQ_LAUNDRY_11/contrib/blacklist/README Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/contrib/blacklist/README Thu May 18 20:15:35 2017 (r318484) @@ -1,4 +1,4 @@ -# $NetBSD: README,v 1.7 2015/01/26 00:34:50 christos Exp $ +# $NetBSD: README,v 1.8 2017/04/13 17:59:34 christos Exp $ This package contains library that can be used by network daemons to communicate with a packet filter via a daemon to enforce opening and @@ -98,6 +98,16 @@ group "internal" on $int_if { ... } +You can use 'blacklistctl dump -a' to list all the current entries +in the database; the ones that have nfail / where urrent +>= otal, should have an id assosiated with them; this means that +there is a packet filter rule added for that entry. For npf, you +can examine the packet filter dynamic rule entries using 'npfctl +rule list'. The number of current entries can exceed +the total. This happens because entering packet filter rules is +asynchronous; there could be other connection before the rule +becomes activated. + Enjoy, christos Modified: user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistctl.8 ============================================================================== --- user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistctl.8 Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistctl.8 Thu May 18 20:15:35 2017 (r318484) @@ -1,4 +1,4 @@ -.\" $NetBSD: blacklistctl.8,v 1.7 2015/04/30 06:20:43 riz Exp $ +.\" $NetBSD: blacklistctl.8,v 1.9 2016/06/08 12:48:37 wiz Exp $ .\" .\" Copyright (c) 2015 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -77,7 +77,8 @@ it to make sure that there is only one r .Nm first appeared in .Nx 7 . -.Fx support for +.Fx +support for .Nm was implemented in .Fx 11 . Modified: user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistctl.c ============================================================================== --- user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistctl.c Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistctl.c Thu May 18 20:15:35 2017 (r318484) @@ -1,4 +1,4 @@ -/* $NetBSD: blacklistctl.c,v 1.20 2016/04/04 15:52:56 christos Exp $ */ +/* $NetBSD: blacklistctl.c,v 1.21 2016/11/02 03:15:07 jnemeth Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #endif #include -__RCSID("$NetBSD: blacklistctl.c,v 1.20 2016/04/04 15:52:56 christos Exp $"); +__RCSID("$NetBSD: blacklistctl.c,v 1.21 2016/11/02 03:15:07 jnemeth Exp $"); #include #include Modified: user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistd.c ============================================================================== --- user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistd.c Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistd.c Thu May 18 20:15:35 2017 (r318484) @@ -1,4 +1,4 @@ -/* $NetBSD: blacklistd.c,v 1.35 2016/09/26 19:43:43 christos Exp $ */ +/* $NetBSD: blacklistd.c,v 1.37 2017/02/18 00:26:16 christos Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include "config.h" #endif #include -__RCSID("$NetBSD: blacklistd.c,v 1.35 2016/09/26 19:43:43 christos Exp $"); +__RCSID("$NetBSD: blacklistd.c,v 1.37 2017/02/18 00:26:16 christos Exp $"); #include #include @@ -403,12 +403,14 @@ int main(int argc, char *argv[]) { int c, tout, flags, flush, restore, ret; - const char *spath, *blsock; + const char *spath, **blsock; + size_t nblsock, maxblsock; setprogname(argv[0]); spath = NULL; - blsock = _PATH_BLSOCK; + blsock = NULL; + maxblsock = nblsock = 0; flush = 0; restore = 0; tout = 0; @@ -440,7 +442,17 @@ main(int argc, char *argv[]) restore++; break; case 's': - blsock = optarg; + if (nblsock >= maxblsock) { + maxblsock += 10; + void *p = realloc(blsock, + sizeof(*blsock) * maxblsock); + if (p == NULL) + err(EXIT_FAILURE, + "Can't allocate memory for %zu sockets", + maxblsock); + blsock = p; + } + blsock[nblsock++] = optarg; break; case 't': tout = atoi(optarg) * 1000; @@ -487,9 +499,11 @@ main(int argc, char *argv[]) size_t nfd = 0; size_t maxfd = 0; - if (spath == NULL) - addfd(&pfd, &bl, &nfd, &maxfd, blsock); - else { + for (size_t i = 0; i < nblsock; i++) + addfd(&pfd, &bl, &nfd, &maxfd, blsock[i]); + free(blsock); + + if (spath) { FILE *fp = fopen(spath, "r"); char *line; if (fp == NULL) @@ -499,6 +513,8 @@ main(int argc, char *argv[]) addfd(&pfd, &bl, &nfd, &maxfd, line); fclose(fp); } + if (nfd == 0) + addfd(&pfd, &bl, &nfd, &maxfd, _PATH_BLSOCK); state = state_open(dbfile, flags, 0600); if (state == NULL) Modified: user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistd.conf.5 ============================================================================== --- user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistd.conf.5 Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/contrib/blacklist/bin/blacklistd.conf.5 Thu May 18 20:15:35 2017 (r318484) @@ -1,4 +1,4 @@ -.\" $NetBSD: blacklistd.conf.5,v 1.3 2015/04/30 06:20:43 riz Exp $ +.\" $NetBSD: blacklistd.conf.5,v 1.5 2016/06/08 12:48:37 wiz Exp $ .\" .\" Copyright (c) 2015 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -218,7 +218,8 @@ bnx0:ssh * * * * 3 6h .Nm first appeared in .Nx 7 . -.Fx support for +.Fx +support for .Nm was implemented in .Fx 11 . Modified: user/markj/PQ_LAUNDRY_11/contrib/blacklist/etc/rc.d/blacklistd ============================================================================== --- user/markj/PQ_LAUNDRY_11/contrib/blacklist/etc/rc.d/blacklistd Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/contrib/blacklist/etc/rc.d/blacklistd Thu May 18 20:15:35 2017 (r318484) @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: blacklistd,v 1.1 2015/01/22 17:49:41 christos Exp $ +# $NetBSD: blacklistd,v 1.2 2016/10/17 22:47:16 christos Exp $ # # PROVIDE: blacklistd @@ -18,7 +18,7 @@ start_precmd="${name}_precmd" extra_commands="reload" _sockfile="/var/run/${name}.sockets" -_sockname="blsock" +_sockname="blacklistd.sock" blacklistd_precmd() { Modified: user/markj/PQ_LAUNDRY_11/contrib/blacklist/lib/bl.c ============================================================================== --- user/markj/PQ_LAUNDRY_11/contrib/blacklist/lib/bl.c Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/contrib/blacklist/lib/bl.c Thu May 18 20:15:35 2017 (r318484) @@ -1,4 +1,4 @@ -/* $NetBSD: bl.c,v 1.27 2015/12/30 16:42:48 christos Exp $ */ +/* $NetBSD: bl.c,v 1.28 2016/07/29 17:13:09 christos Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #endif #include -__RCSID("$NetBSD: bl.c,v 1.27 2015/12/30 16:42:48 christos Exp $"); +__RCSID("$NetBSD: bl.c,v 1.28 2016/07/29 17:13:09 christos Exp $"); #include #include Modified: user/markj/PQ_LAUNDRY_11/contrib/blacklist/lib/libblacklist.3 ============================================================================== --- user/markj/PQ_LAUNDRY_11/contrib/blacklist/lib/libblacklist.3 Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/contrib/blacklist/lib/libblacklist.3 Thu May 18 20:15:35 2017 (r318484) @@ -1,4 +1,4 @@ -.\" $NetBSD: libblacklist.3,v 1.3 2015/01/25 23:09:28 wiz Exp $ +.\" $NetBSD: libblacklist.3,v 1.7 2017/02/04 23:33:56 wiz Exp $ .\" .\" Copyright (c) 2015 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -36,7 +36,7 @@ .Nm blacklist_r , .Nm blacklist , .Nm blacklist_sa -.Nm blacklist_sa_r , +.Nm blacklist_sa_r .Nd Blacklistd notification library .Sh LIBRARY .Lb libblacklist @@ -62,7 +62,7 @@ block or release port access to prevent .Pp The function .Fn blacklist_open -creates a the necessary state to communicate with +creates the necessary state to communicate with .Xr blacklistd 8 and returns a pointer to it, or .Dv NULL @@ -106,18 +106,25 @@ All functions log errors to .Xr syslogd 8 . .Sh RETURN VALUES The function -.Fn bl_open +.Fn blacklist_open returns a cookie on success and .Dv NULL -on failure setting errno to an appropriate value. -.Pp -The -.Fn bl_send -function returns +on failure setting +.Dv errno +to an appropriate value. +.Pp +The functions +.Fn blacklist , +.Fn blacklist_sa , +and +.Fn blacklist_sa_r +return .Dv 0 on success and -.Dv -1 -on failure setting errno to an appropriate value. +.Dv \-1 +on failure setting +.Dv errno +to an appropriate value. .Sh SEE ALSO .Xr blacklistd.conf 5 , .Xr blacklistd 8 Modified: user/markj/PQ_LAUNDRY_11/contrib/blacklist/libexec/blacklistd-helper ============================================================================== --- user/markj/PQ_LAUNDRY_11/contrib/blacklist/libexec/blacklistd-helper Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/contrib/blacklist/libexec/blacklistd-helper Thu May 18 20:15:35 2017 (r318484) @@ -19,8 +19,8 @@ fi if [ -z "$pf" ]; then for f in npf pf ipf; do if [ -f "/etc/$f.conf" ]; then - pf="$f" - break + pf="$f" + break fi done fi Modified: user/markj/PQ_LAUNDRY_11/contrib/blacklist/port/Makefile.am ============================================================================== --- user/markj/PQ_LAUNDRY_11/contrib/blacklist/port/Makefile.am Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/contrib/blacklist/port/Makefile.am Thu May 18 20:15:35 2017 (r318484) @@ -1,11 +1,11 @@ # ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES = libblacklist.la -include_HEADERS = blacklist.h +include_HEADERS = ../include/blacklist.h bin_PROGRAMS = blacklistd blacklistctl srvtest cltest -VPATH = ../bin:../lib:../test +VPATH = ../bin:../lib:../test:../include AM_CPPFLAGS = -I../include -DDOT="." AM_CFLAGS = @WARNINGS@ Copied: user/markj/PQ_LAUNDRY_11/contrib/blacklist/port/config.h (from r318483, stable/11/contrib/blacklist/port/config.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/markj/PQ_LAUNDRY_11/contrib/blacklist/port/config.h Thu May 18 20:15:35 2017 (r318484, copy of r318483, stable/11/contrib/blacklist/port/config.h) @@ -0,0 +1,3 @@ +#if defined(__FreeBSD__) +#include "port.h" +#endif Modified: user/markj/PQ_LAUNDRY_11/contrib/blacklist/port/sockaddr_snprintf.c ============================================================================== --- user/markj/PQ_LAUNDRY_11/contrib/blacklist/port/sockaddr_snprintf.c Thu May 18 19:50:15 2017 (r318483) +++ user/markj/PQ_LAUNDRY_11/contrib/blacklist/port/sockaddr_snprintf.c Thu May 18 20:15:35 2017 (r318484) @@ -1,4 +1,4 @@ -/* $NetBSD: sockaddr_snprintf.c,v 1.10 2016/04/05 12:28:57 christos Exp $ */ +/* $NetBSD: sockaddr_snprintf.c,v 1.11 2016/06/01 22:57:51 christos Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.10 2016/04/05 12:28:57 christos Exp $"); +__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.11 2016/06/01 22:57:51 christos Exp $"); #endif /* LIBC_SCCS and not lint */ #include @@ -219,7 +219,7 @@ sockaddr_snprintf(char * const sbuf, con case AF_LINK: sdl = ((const struct sockaddr_dl *)(const void *)sa); (void)strlcpy(addr = abuf, link_ntoa(sdl), sizeof(abuf)); - if ((w = strchr(addr, ':')) != 0) { + if ((w = strchr(addr, ':')) != NULL) { *w++ = '\0'; addr = w; } Copied: user/markj/PQ_LAUNDRY_11/contrib/dtc/Documentation/dt-object-internal.txt (from r318483, stable/11/contrib/dtc/Documentation/dt-object-internal.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/markj/PQ_LAUNDRY_11/contrib/dtc/Documentation/dt-object-internal.txt Thu May 18 20:15:35 2017 (r318484, copy of r318483, stable/11/contrib/dtc/Documentation/dt-object-internal.txt) @@ -0,0 +1,310 @@ +Device Tree Dynamic Object format internals +------------------------------------------- + +The Device Tree for most platforms is a static representation of +the hardware capabilities. This is insufficient for platforms +that need to dynamically insert Device Tree fragments into the +live tree. + +This document explains the the Device Tree object format and +modifications made to the Device Tree compiler, which make it possible. + +1. Simplified Problem Definition +-------------------------------- + +Assume we have a platform which boots using following simplified Device Tree. + +---- foo.dts ----------------------------------------------------------------- + /* FOO platform */ + / { + compatible = "corp,foo"; + + /* shared resources */ + res: res { + }; + + /* On chip peripherals */ + ocp: ocp { + /* peripherals that are always instantiated */ + peripheral1 { ... }; + }; + }; +---- foo.dts ----------------------------------------------------------------- + +We have a number of peripherals that after probing (using some undefined method) +should result in different Device Tree configuration. + +We cannot boot with this static tree because due to the configuration of the +foo platform there exist multiple conficting peripherals DT fragments. + +So for the bar peripheral we would have this: + +---- foo+bar.dts ------------------------------------------------------------- + /* FOO platform + bar peripheral */ + / { + compatible = "corp,foo"; + + /* shared resources */ + res: res { + }; + + /* On chip peripherals */ + ocp: ocp { + /* peripherals that are always instantiated */ + peripheral1 { ... }; + + /* bar peripheral */ + bar { + compatible = "corp,bar"; + ... /* various properties and child nodes */ + }; + }; + }; +---- foo+bar.dts ------------------------------------------------------------- + +While for the baz peripheral we would have this: + +---- foo+baz.dts ------------------------------------------------------------- + /* FOO platform + baz peripheral */ + / { + compatible = "corp,foo"; + + /* shared resources */ + res: res { + /* baz resources */ + baz_res: res_baz { ... }; + }; + + /* On chip peripherals */ + ocp: ocp { + /* peripherals that are always instantiated */ + peripheral1 { ... }; + + /* baz peripheral */ + baz { + compatible = "corp,baz"; + /* reference to another point in the tree */ + ref-to-res = <&baz_res>; + ... /* various properties and child nodes */ + }; + }; + }; +---- foo+baz.dts ------------------------------------------------------------- + +We note that the baz case is more complicated, since the baz peripheral needs to +reference another node in the DT tree. + +2. Device Tree Object Format Requirements +----------------------------------------- + +Since the Device Tree is used for booting a number of very different hardware +platforms it is imperative that we tread very carefully. + +2.a) No changes to the Device Tree binary format for the base tree. We cannot +modify the tree format at all and all the information we require should be +encoded using Device Tree itself. We can add nodes that can be safely ignored +by both bootloaders and the kernel. The plugin dtbs are optionally tagged +with a different magic number in the header but otherwise they're simple +blobs. + +2.b) Changes to the DTS source format should be absolutely minimal, and should +only be needed for the DT fragment definitions, and not the base boot DT. + +2.c) An explicit option should be used to instruct DTC to generate the required +information needed for object resolution. Platforms that don't use the +dynamic object format can safely ignore it. + +2.d) Finally, DT syntax changes should be kept to a minimum. It should be +possible to express everything using the existing DT syntax. + +3. Implementation +----------------- + +The basic unit of addressing in Device Tree is the phandle. Turns out it's +relatively simple to extend the way phandles are generated and referenced +so that it's possible to dynamically convert symbolic references (labels) +to phandle values. This is a valid assumption as long as the author uses +reference syntax and does not assign phandle values manually (which might +be a problem with decompiled source files). + +We can roughly divide the operation into two steps. + +3.a) Compilation of the base board DTS file using the '-@' option +generates a valid DT blob with an added __symbols__ node at the root node, +containing a list of all nodes that are marked with a label. + +Using the foo.dts file above the following node will be generated; + +$ dtc -@ -O dtb -o foo.dtb -b 0 foo.dts +$ fdtdump foo.dtb +... +/ { + ... + res { + ... + phandle = <0x00000001>; + ... + }; + ocp { + ... + phandle = <0x00000002>; + ... + }; + __symbols__ { + res="/res"; + ocp="/ocp"; + }; +}; + +Notice that all the nodes that had a label have been recorded, and that +phandles have been generated for them. + +This blob can be used to boot the board normally, the __symbols__ node will +be safely ignored both by the bootloader and the kernel (the only loss will +be a few bytes of memory and disk space). + +We generate a __symbols__ node to record nodes that had labels in the base +tree (or subsequent loaded overlays) so that they can be matched up with +references made to them in Device Tree objects. + +3.b) The Device Tree fragments must be compiled with the same option but they +must also have a tag (/plugin/) that allows undefined references to nodes +that are not present at compilation time to be recorded so that the runtime +loader can fix them. + +So the bar peripheral's DTS format would be of the form: + +/dts-v1/; +/plugin/; /* allow undefined references and record them */ +/ { + .... /* various properties for loader use; i.e. part id etc. */ + fragment@0 { + target = <&ocp>; + __overlay__ { + /* bar peripheral */ + bar { + compatible = "corp,bar"; + ... /* various properties and child nodes */ + } + }; + }; +}; + +Note that there's a target property that specifies the location where the +contents of the overlay node will be placed, and it references the node +in the foo.dts file. + +$ dtc -@ -O dtb -o bar.dtbo -b 0 bar.dts +$ fdtdump bar.dtbo +... +/ { + ... /* properties */ + fragment@0 { + target = <0xffffffff>; + __overlay__ { + bar { + compatible = "corp,bar"; + ... /* various properties and child nodes */ + } + }; + }; + __fixups__ { + ocp = "/fragment@0:target:0"; + }; +}; + +No __symbols__ node has been generated (no label in bar.dts). +Note that the target's ocp label is undefined, so the phandle +value is filled with the illegal value '0xffffffff', while a __fixups__ +node has been generated, which marks the location in the tree where +the label lookup should store the runtime phandle value of the ocp node. + +The format of the __fixups__ node entry is + +