From owner-svn-src-projects@freebsd.org Mon Sep 11 15:33:42 2017 Return-Path: Delivered-To: svn-src-projects@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 18FC3E122F4 for ; Mon, 11 Sep 2017 15:33:42 +0000 (UTC) (envelope-from asomers@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 E911F65753; Mon, 11 Sep 2017 15:33:41 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8BFXfGI097408; Mon, 11 Sep 2017 15:33:41 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8BFXf2p097406; Mon, 11 Sep 2017 15:33:41 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709111533.v8BFXf2p097406@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 11 Sep 2017 15:33:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323441 - projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare X-SVN-Commit-Revision: 323441 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Sep 2017 15:33:42 -0000 Author: asomers Date: Mon Sep 11 15:33:40 2017 New Revision: 323441 URL: https://svnweb.freebsd.org/changeset/base/323441 Log: Fix hotspare_onoffline_003_neg from the ZFS test suite tests/sys/cddl/zfs/tests/hotspare/hotspare_onoffline_003_neg.ksh tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh Fix hotspare_onoffline_003_neg by simplifying it. It originally tested that "zpool (on|off)line" wouldn't work on spares, but failed because those commands _do_ work on active spares. AFAICT they always have on both Illumos and FreeBSD. The documentation isn't 100% clear, but the justification for preventing them from working on inactive spares seems to be that those devices don't have any I/O to stop. That justification doesn't make sense for active spares. So it's reasonable to allow active spares to be offlined or onlined. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_onoffline_003_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_onoffline_003_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_onoffline_003_neg.ksh Mon Sep 11 15:31:29 2017 (r323440) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_onoffline_003_neg.ksh Mon Sep 11 15:33:40 2017 (r323441) @@ -78,24 +78,9 @@ function verify_assertion # dev log_mustnot $ZPOOL online $TESTPOOL $dev log_must check_hotspare_state $TESTPOOL $dev "AVAIL" - - log_must $ZPOOL replace $TESTPOOL $odev $dev - while check_state "$TESTPOOL" "replacing" \ - "online" || \ - ! is_pool_resilvered $TESTPOOL ; do - $SLEEP 2 - done - - log_mustnot $ZPOOL offline $TESTPOOL $dev - log_must check_state $TESTPOOL $dev "online" - - log_mustnot $ZPOOL online $TESTPOOL $dev - log_must check_state $TESTPOOL $dev "online" - - log_must $ZPOOL detach $TESTPOOL $dev } -log_assert "'zpool offline/online ' against a hot spare works as expect." +log_assert "'zpool offline/online ' should fail on inactive spares" log_onexit cleanup Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh Mon Sep 11 15:31:29 2017 (r323440) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh Mon Sep 11 15:33:40 2017 (r323441) @@ -392,13 +392,12 @@ hotspare_import_001_pos_cleanup() atf_test_case hotspare_onoffline_003_neg cleanup hotspare_onoffline_003_neg_head() { - atf_set "descr" "'zpool offline/online ' against a hot spare works as expect." + atf_set "descr" "'zpool offline/online ' should fail on inactive spares" atf_set "require.progs" zpool zdb atf_set "timeout" 3600 } hotspare_onoffline_003_neg_body() { - atf_expect_fail "This testcase has always failed on FreeBSD" . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/hotspare.kshlib . $(atf_get_srcdir)/hotspare.cfg From owner-svn-src-projects@freebsd.org Mon Sep 11 15:38:52 2017 Return-Path: Delivered-To: svn-src-projects@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 C0D1CE1263A for ; Mon, 11 Sep 2017 15:38:52 +0000 (UTC) (envelope-from asomers@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 6445E65995; Mon, 11 Sep 2017 15:38:52 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8BFcpxq097611; Mon, 11 Sep 2017 15:38:51 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8BFcpP6097607; Mon, 11 Sep 2017 15:38:51 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709111538.v8BFcpP6097607@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 11 Sep 2017 15:38:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323442 - projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse X-SVN-Commit-Revision: 323442 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Sep 2017 15:38:52 -0000 Author: asomers Date: Mon Sep 11 15:38:51 2017 New Revision: 323442 URL: https://svnweb.freebsd.org/changeset/base/323442 Log: Fix the inuse tests from the ZFS test suite. Formerly there were 9 separate tests, all of which involved making sure that ZFS, newfs, dumpadm, and svm wouldn't step on each others' toes. There was also a lot of code dealing with Solaris's complicated partitioning scheme. But in FreeBSD, this can all be much simpler. Everything goes through GEOM, so we only need to test two assertions: 1) ZFS can't use a disk that's already in use, and 2) Something else can't use a disk that's in use by ZFS tests/sys/cddl/zfs/tests/inuse/inuse_010_neg.ksh Add a new testcase for assertion 1. The existing test cases were all so complicated that it was easier to start from scratch. tests/sys/cddl/zfs/tests/inuse/inuse_005_pos.ksh Simplify this test case by eliminating partitions and only testing a single pool topology. tests/sys/cddl/zfs/tests/inuse/inuse_001_pos.ksh tests/sys/cddl/zfs/tests/inuse/inuse_002_pos.ksh tests/sys/cddl/zfs/tests/inuse/inuse_003_pos.ksh tests/sys/cddl/zfs/tests/inuse/inuse_004_pos.ksh tests/sys/cddl/zfs/tests/inuse/inuse_006_pos.ksh tests/sys/cddl/zfs/tests/inuse/inuse_007_pos.ksh tests/sys/cddl/zfs/tests/inuse/inuse_008_pos.ksh tests/sys/cddl/zfs/tests/inuse/inuse_009_pos.ksh Eliminate all other test cases tests/sys/cddl/zfs/tests/inuse/inuse_test.sh tests/sys/cddl/zfs/tests/inuse/Makefile Update boilerplate Sponsored by: Spectra Logic Corp Added: projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_010_neg.ksh Deleted: projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_002_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_003_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_004_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_006_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_007_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_008_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_009_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_005_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile Mon Sep 11 15:33:40 2017 (r323441) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile Mon Sep 11 15:38:51 2017 (r323442) @@ -8,16 +8,9 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= inuse_test -${PACKAGE}FILES+= inuse_002_pos.ksh -${PACKAGE}FILES+= inuse_006_pos.ksh -${PACKAGE}FILES+= inuse_003_pos.ksh -${PACKAGE}FILES+= inuse_007_pos.ksh -${PACKAGE}FILES+= inuse_009_pos.ksh -${PACKAGE}FILES+= inuse_001_pos.ksh -${PACKAGE}FILES+= inuse_005_pos.ksh ${PACKAGE}FILES+= inuse.cfg +${PACKAGE}FILES+= inuse_005_pos.ksh +${PACKAGE}FILES+= inuse_010_neg.ksh ${PACKAGE}FILES+= setup.ksh -${PACKAGE}FILES+= inuse_004_pos.ksh -${PACKAGE}FILES+= inuse_008_pos.ksh .include Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_005_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_005_pos.ksh Mon Sep 11 15:33:40 2017 (r323441) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_005_pos.ksh Mon Sep 11 15:38:51 2017 (r323442) @@ -40,7 +40,7 @@ # by active pool. # # STRATEGY: -# 1. Create a regular|mirror|raidz|raidz2 pool with the given disk +# 1. Create a with the given disk # 2. Try to newfs against the disk, verify it fails as expect. # # TESTABILITY: explicit @@ -54,80 +54,19 @@ ################################################################################ verify_runnable "global" +set_disks function cleanup { poolexists $TESTPOOL1 && destroy_pool $TESTPOOL1 - - # - # Tidy up the disks we used. - # - cleanup_devices $vdisks $sdisks } -function verify_assertion #slices -{ - typeset targets=$1 - - for t in $targets; do - log_mustnot eval "$ECHO y | $NEWFS $t" - done - - return 0 -} - log_assert "Verify newfs over active pool fails." log_onexit cleanup -set -A vdevs "" "mirror" "raidz" "raidz1" "raidz2" - -typeset -i i=0 - -while (( i < ${#vdevs[*]} )); do - - for num in 0 1 2 3 ; do - eval typeset partition=\${FS_SIDE$num} - disk=${partition%p*} - partition=${partition##*p} - if [[ $WRAPPER == *"smi"* && \ - $disk == ${saved_disk} ]]; then - cyl=$(get_endslice $disk ${saved_slice}) - log_must set_partition $partition "$cyl" $FS_SIZE $disk - else - log_must set_partition $partition "" $FS_SIZE $disk - fi - saved_disk=$disk - saved_slice=$partition - done - - if [[ -n $SINGLE_DISK && -n ${vdevs[i]} ]]; then - (( i = i + 1 )) - continue - fi - - create_pool $TESTPOOL1 ${vdevs[i]} $vslices spare $sslices - $ZPOOL status $TESTPOOL1 - log_note "Running newfs on $rawtargets ..." - verify_assertion "$rawtargets" - destroy_pool $TESTPOOL1 - wipe_partition_table $vdisks $sdisks - - if [[ ( $FS_DISK0 == $FS_DISK2 ) && -n ${vdevs[i]} ]]; then - (( i = i + 1 )) - continue - fi - - if [[ ( $FS_DISK0 == $FS_DISK3 ) && ( ${vdevs[i]} == "raidz2" ) ]]; then - (( i = i + 1 )) - continue - fi - - create_pool $TESTPOOL1 ${vdevs[i]} $vdisks spare $sdisks - verify_assertion "$rawtargets" - destroy_pool $TESTPOOL1 - - (( i = i + 1 )) -done +create_pool $TESTPOOL1 $DISK0 +log_mustnot $NEWFS -s 1024 "$DISK0" +destroy_pool $TESTPOOL1 log_pass "Newfs over active pool fails." Added: projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_010_neg.ksh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_010_neg.ksh Mon Sep 11 15:38:51 2017 (r323442) @@ -0,0 +1,52 @@ +#!/usr/local/bin/ksh93 -p +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2017 Spectra Logic Corp. All rights reserved. +# Use is subject to license terms. +# +# $FreeBSD$ + +. $STF_SUITE/include/libtest.kshlib +set_disks + +FSSIZE=1024 #reduce filesystem size, just to speed up newfs +MOUNTPOINT=$TMPDIR/inuse_010_neg_mp + +function cleanup +{ + poolexists $TESTPOOL && destroy_pool $TESTPOOL + $UMOUNT $MOUNTPOINT + cleanup_devices $DISK0 + $RMDIR $MOUNTPOINT +} + +log_onexit cleanup + +log_assert "ZFS shouldn't be able to use a disk with a mounted filesystem" + +log_must $NEWFS -s $FSSIZE $DISK0 +log_must $MKDIR $MOUNTPOINT +log_must $MOUNT $DISK0 $MOUNTPOINT +log_mustnot $ZPOOL create $TESTPOOL $DISK0 + +log_pass "ZFS cannot use a disk with a mounted filesystem" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_test.sh Mon Sep 11 15:33:40 2017 (r323441) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_test.sh Mon Sep 11 15:38:51 2017 (r323442) @@ -24,178 +24,41 @@ # -atf_test_case inuse_001_pos -inuse_001_pos_head() -{ - atf_set "descr" "Ensure ZFS cannot use a device designated as a dump device" - atf_set "require.progs" dumpadm zpool - atf_set "timeout" 1200 -} -inuse_001_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/inuse.cfg - - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/inuse_001_pos.ksh || atf_fail "Testcase failed" -} - - - -atf_test_case inuse_002_pos -inuse_002_pos_head() -{ - atf_set "descr" "Ensure ZFS does not interfere with devices in use by SVM" - atf_set "require.progs" metainit metadb metastat zpool metaclear - atf_set "timeout" 1200 -} -inuse_002_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/inuse.cfg - - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/inuse_002_pos.ksh || atf_fail "Testcase failed" -} - - - -atf_test_case inuse_003_pos -inuse_003_pos_head() -{ - atf_set "descr" "Ensure ZFS does not interfere with devices that are in use byufsdump or ufsrestore" - atf_set "require.progs" zpool ufsrestore ufsdump - atf_set "timeout" 1200 -} -inuse_003_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/inuse.cfg - - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/inuse_003_pos.ksh || atf_fail "Testcase failed" -} - - - -atf_test_case inuse_004_pos -inuse_004_pos_head() -{ - atf_set "descr" "format will disallow modification of a mounted zfs disk partition or a spare device" - atf_set "require.progs" zfs zpool format - atf_set "timeout" 1200 -} -inuse_004_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/inuse.cfg - - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/inuse_004_pos.ksh || atf_fail "Testcase failed" -} - - - atf_test_case inuse_005_pos inuse_005_pos_head() { atf_set "descr" "Verify newfs over active pool fails." - atf_set "timeout" 1200 + atf_set "require.progs" newfs zpool + atf_set "require.user" root } inuse_005_pos_body() { - atf_expect_fail "REQ25571 ZFS does not open geoms in exclusive mode" . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/inuse.cfg - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/inuse_005_pos.ksh || atf_fail "Testcase failed" } - -atf_test_case inuse_006_pos -inuse_006_pos_head() +atf_test_case inuse_010_neg +inuse_010_neg_head() { - atf_set "descr" "Verify dumpadm over active pool fails." - atf_set "require.progs" dumpadm - atf_set "timeout" 1200 + atf_set "descr" "ZFS shouldn't be able to use a disk with a mounted filesystem" + atf_set "require.progs" newfs zpool + atf_set "require.user" root } -inuse_006_pos_body() +inuse_010_neg_body() { . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/inuse.cfg - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/inuse_006_pos.ksh || atf_fail "Testcase failed" + verify_disk_count "$DISKS" 1 + ksh93 $(atf_get_srcdir)/inuse_010_neg.ksh || atf_fail "Testcase failed" } - -atf_test_case inuse_007_pos -inuse_007_pos_head() -{ - atf_set "descr" "Verify dumpadm over exported pool succeed." - atf_set "require.progs" dumpadm zpool - atf_set "timeout" 1200 -} -inuse_007_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/inuse.cfg - - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/inuse_007_pos.ksh || atf_fail "Testcase failed" -} - - - -atf_test_case inuse_008_pos -inuse_008_pos_head() -{ - atf_set "descr" "Verify newfs over exported pool succeed." - atf_set "require.progs" zpool - atf_set "timeout" 1200 -} -inuse_008_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/inuse.cfg - - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/inuse_008_pos.ksh || atf_fail "Testcase failed" -} - - - -atf_test_case inuse_009_pos -inuse_009_pos_head() -{ - atf_set "descr" "Verify format over exported pool succeed." - atf_set "require.progs" zpool - atf_set "timeout" 1200 -} -inuse_009_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/inuse.cfg - - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/inuse_009_pos.ksh || atf_fail "Testcase failed" -} - - - atf_init_test_cases() { - - atf_add_test_case inuse_001_pos - atf_add_test_case inuse_002_pos - atf_add_test_case inuse_003_pos - atf_add_test_case inuse_004_pos atf_add_test_case inuse_005_pos - atf_add_test_case inuse_006_pos - atf_add_test_case inuse_007_pos - atf_add_test_case inuse_008_pos - atf_add_test_case inuse_009_pos + atf_add_test_case inuse_010_neg } From owner-svn-src-projects@freebsd.org Mon Sep 11 15:56:08 2017 Return-Path: Delivered-To: svn-src-projects@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 B8CA5E136F4 for ; Mon, 11 Sep 2017 15:56:08 +0000 (UTC) (envelope-from asomers@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 87AC366474; Mon, 11 Sep 2017 15:56:08 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8BFu74Q005809; Mon, 11 Sep 2017 15:56:07 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8BFu7rq005808; Mon, 11 Sep 2017 15:56:07 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709111556.v8BFu7rq005808@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 11 Sep 2017 15:56:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323444 - projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot X-SVN-Commit-Revision: 323444 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Sep 2017 15:56:08 -0000 Author: asomers Date: Mon Sep 11 15:56:07 2017 New Revision: 323444 URL: https://svnweb.freebsd.org/changeset/base/323444 Log: Speed up snapshot_017_pos from the ZFS test suite tests/sys/cddl/zfs/tests/snapshot/snapshot_017_pos.ksh Use touch instead of mkfile. Nothing cares about the file size. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_017_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_017_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_017_pos.ksh Mon Sep 11 15:52:24 2017 (r323443) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_017_pos.ksh Mon Sep 11 15:56:07 2017 (r323444) @@ -155,16 +155,16 @@ SAVED_DIR=$PWD # ./dir1/dir2/file6 cd $TESTDIR -$MKFILE 10m file1 -$MKFILE 20m file2 +$TOUCH file1 +$TOUCH file2 $MKDIR dir1 cd dir1 -$MKFILE 10m file3 -$MKFILE 20m file4 +$TOUCH file3 +$TOUCH file4 $MKDIR dir2 cd dir2 -$MKFILE 10m file5 -$MKFILE 20m file6 +$TOUCH file5 +$TOUCH file6 # Now walk the directory structure verifying it cd $TESTDIR From owner-svn-src-projects@freebsd.org Mon Sep 11 15:59:22 2017 Return-Path: Delivered-To: svn-src-projects@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 0D108E1399B for ; Mon, 11 Sep 2017 15:59:22 +0000 (UTC) (envelope-from asomers@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 CEA5C668AE; Mon, 11 Sep 2017 15:59:21 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8BFxL4s006321; Mon, 11 Sep 2017 15:59:21 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8BFxLdM006320; Mon, 11 Sep 2017 15:59:21 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709111559.v8BFxLdM006320@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 11 Sep 2017 15:59:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323445 - projects/zfsd/head/tests/sys/cddl/zfs/bin X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/bin X-SVN-Commit-Revision: 323445 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Sep 2017 15:59:22 -0000 Author: asomers Date: Mon Sep 11 15:59:20 2017 New Revision: 323445 URL: https://svnweb.freebsd.org/changeset/base/323445 Log: Fix intermittency in refquota_002_pos from the ZFS test suite tests/sys/cddl/zfs/bin/mkfile.c Don't unlink a file when unable to write the entire thing. Nothing in the ZFS test suite depends on that behavior. However, a few tests (like refquota_002_pos) depend on the opposite. Right now refquota_002_pos only passes sometimes because unlink(2) loses a race against "zfs get used". Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/bin/mkfile.c Modified: projects/zfsd/head/tests/sys/cddl/zfs/bin/mkfile.c ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/bin/mkfile.c Mon Sep 11 15:56:07 2017 (r323444) +++ projects/zfsd/head/tests/sys/cddl/zfs/bin/mkfile.c Mon Sep 11 15:59:20 2017 (r323445) @@ -204,7 +204,6 @@ main(int argc, char *argv[]) while (++argv, --argc) { if (create_file(*argv, fsize) == -1) { perror(*argv); - unlink(*argv); return EXIT_FAILURE; } } From owner-svn-src-projects@freebsd.org Mon Sep 11 19:57:05 2017 Return-Path: Delivered-To: svn-src-projects@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 D9C1BE20F0B for ; Mon, 11 Sep 2017 19:57:05 +0000 (UTC) (envelope-from ngie@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 A6552701D3; Mon, 11 Sep 2017 19:57:05 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8BJv43E004445; Mon, 11 Sep 2017 19:57:04 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8BJv46Z004444; Mon, 11 Sep 2017 19:57:04 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201709111957.v8BJv46Z004444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Mon, 11 Sep 2017 19:57:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323460 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 323460 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Sep 2017 19:57:06 -0000 Author: ngie Date: Mon Sep 11 19:57:04 2017 New Revision: 323460 URL: https://svnweb.freebsd.org/changeset/base/323460 Log: Chase recent changes to ^/head/share/mk/bsd.lib.mk Doesn't compile with libexec/rtld-elf when WITH_LIB32 == yes for some reason.. but it's a WiP. Modified: projects/runtime-coverage/share/mk/bsd.lib.mk Modified: projects/runtime-coverage/share/mk/bsd.lib.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.lib.mk Mon Sep 11 19:07:53 2017 (r323459) +++ projects/runtime-coverage/share/mk/bsd.lib.mk Mon Sep 11 19:57:04 2017 (r323460) @@ -52,6 +52,7 @@ CFLAGS+= ${DEBUG_FLAGS} .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" CTFFLAGS+= -g .endif +_WANTS_DEBUG= .else STRIP?= -s .endif @@ -72,10 +73,9 @@ TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} CFLAGS+= ${DEBUG_FILES_CFLAGS} CXXFLAGS+= ${DEBUG_FILES_CFLAGS} CTFFLAGS+= -g +_WANTS_DEBUG= .endif -.if defined(SHLIB_NAME) && ${MK_COVERAGE} != "no" && \ - (!empty(DEBUG_FLAGS:M-g*) || !empty(SHARED_CFLAGS:M-g*) || \ - !empty(SHARED_CXXFLAGS:M-g*)) +.if ${MK_COVERAGE} != "no" && defined(_WANTS_DEBUG) _COV_FLAG= --coverage SHARED_CFLAGS+= ${_COV_FLAG} SHARED_CXXFLAGS+= ${_COV_FLAG} @@ -251,7 +251,7 @@ CLEANFILES+= ${SPOBJS} .if defined(SHLIB_NAME) _LIBS+= ${SHLIB_NAME} -.if !empty(_COV_FLAG) +.if defined(_COV_FLAG) SOLINKOPTS+= ${_COV_FLAG} .endif SOLINKOPTS+= -shared -Wl,-x From owner-svn-src-projects@freebsd.org Wed Sep 13 19:12:34 2017 Return-Path: Delivered-To: svn-src-projects@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 205ACE0B23E for ; Wed, 13 Sep 2017 19:12:34 +0000 (UTC) (envelope-from np@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 8CC2D7316C; Wed, 13 Sep 2017 19:12:33 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8DJCWpM076451; Wed, 13 Sep 2017 19:12:32 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8DJCU7A076424; Wed, 13 Sep 2017 19:12:30 GMT (envelope-from np@FreeBSD.org) Message-Id: <201709131912.v8DJCU7A076424@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Wed, 13 Sep 2017 19:12:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323560 - in projects/bsd_rdma_4_9: . bin/chflags bin/chflags/tests bin/dd bin/mkdir bin/mkdir/tests bin/pkill bin/ps bin/rcp bin/rcp/tests bin/rmdir bin/rmdir/tests cddl/compat/opensol... X-SVN-Group: projects X-SVN-Commit-Author: np X-SVN-Commit-Paths: in projects/bsd_rdma_4_9: . bin/chflags bin/chflags/tests bin/dd bin/mkdir bin/mkdir/tests bin/pkill bin/ps bin/rcp bin/rcp/tests bin/rmdir bin/rmdir/tests cddl/compat/opensolaris/misc cddl/contrib/op... X-SVN-Commit-Revision: 323560 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Sep 2017 19:12:34 -0000 Author: np Date: Wed Sep 13 19:12:28 2017 New Revision: 323560 URL: https://svnweb.freebsd.org/changeset/base/323560 Log: MFH @ r323558. Added: projects/bsd_rdma_4_9/bin/chflags/tests/ - copied from r323558, head/bin/chflags/tests/ projects/bsd_rdma_4_9/bin/mkdir/tests/ - copied from r323558, head/bin/mkdir/tests/ projects/bsd_rdma_4_9/bin/rcp/tests/ - copied from r323558, head/bin/rcp/tests/ projects/bsd_rdma_4_9/bin/rmdir/tests/ - copied from r323558, head/bin/rmdir/tests/ projects/bsd_rdma_4_9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d - copied unchanged from r323558, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d projects/bsd_rdma_4_9/cddl/lib/libdtrace/socket.d - copied unchanged from r323558, head/cddl/lib/libdtrace/socket.d projects/bsd_rdma_4_9/contrib/zstd/lib/common/compiler.h - copied unchanged from r323558, head/contrib/zstd/lib/common/compiler.h projects/bsd_rdma_4_9/contrib/zstd/tests/files/ - copied from r323558, head/contrib/zstd/tests/files/ projects/bsd_rdma_4_9/contrib/zstd/tests/fuzz/ - copied from r323558, head/contrib/zstd/tests/fuzz/ projects/bsd_rdma_4_9/contrib/zstd/tests/poolTests.c - copied unchanged from r323558, head/contrib/zstd/tests/poolTests.c projects/bsd_rdma_4_9/lib/clang/Makefile.inc - copied unchanged from r323558, head/lib/clang/Makefile.inc projects/bsd_rdma_4_9/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.c - copied unchanged from r323558, head/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.c projects/bsd_rdma_4_9/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.h - copied unchanged from r323558, head/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.h projects/bsd_rdma_4_9/lib/libc/tests/gen/getmntinfo_test.c - copied unchanged from r323558, head/lib/libc/tests/gen/getmntinfo_test.c projects/bsd_rdma_4_9/share/man/man4/amdsmn.4 - copied unchanged from r323558, head/share/man/man4/amdsmn.4 projects/bsd_rdma_4_9/share/man/man4/liquidio.4 - copied unchanged from r323558, head/share/man/man4/liquidio.4 projects/bsd_rdma_4_9/share/man/man4/mlx5ib.4 - copied unchanged from r323558, head/share/man/man4/mlx5ib.4 projects/bsd_rdma_4_9/share/man/man4/ntb.4 - copied unchanged from r323558, head/share/man/man4/ntb.4 projects/bsd_rdma_4_9/share/man/man4/ntb_hw_intel.4 - copied unchanged from r323558, head/share/man/man4/ntb_hw_intel.4 projects/bsd_rdma_4_9/share/man/man4/ntb_hw_plx.4 - copied unchanged from r323558, head/share/man/man4/ntb_hw_plx.4 projects/bsd_rdma_4_9/sys/amd64/conf/GENERIC-MMCCAM - copied unchanged from r323558, head/sys/amd64/conf/GENERIC-MMCCAM projects/bsd_rdma_4_9/sys/arm/conf/IMX6-MMCCAM - copied unchanged from r323558, head/sys/arm/conf/IMX6-MMCCAM projects/bsd_rdma_4_9/sys/arm/mv/armada38x/armada38x_rtc.c - copied unchanged from r323558, head/sys/arm/mv/armada38x/armada38x_rtc.c projects/bsd_rdma_4_9/sys/arm64/conf/GENERIC-MMCCAM - copied unchanged from r323558, head/sys/arm64/conf/GENERIC-MMCCAM projects/bsd_rdma_4_9/sys/boot/efi/boot1/fat-amd64.tmpl.xz - copied unchanged from r323558, head/sys/boot/efi/boot1/fat-amd64.tmpl.xz projects/bsd_rdma_4_9/sys/boot/efi/boot1/fat-arm.tmpl.xz - copied unchanged from r323558, head/sys/boot/efi/boot1/fat-arm.tmpl.xz projects/bsd_rdma_4_9/sys/boot/efi/boot1/fat-arm64.tmpl.xz - copied unchanged from r323558, head/sys/boot/efi/boot1/fat-arm64.tmpl.xz projects/bsd_rdma_4_9/sys/boot/efi/boot1/fat-i386.tmpl.xz - copied unchanged from r323558, head/sys/boot/efi/boot1/fat-i386.tmpl.xz projects/bsd_rdma_4_9/sys/boot/efi/loader/efi_main.c - copied unchanged from r323558, head/sys/boot/efi/loader/efi_main.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/utilities/utstrsuppt.c - copied unchanged from r323558, head/sys/contrib/dev/acpica/components/utilities/utstrsuppt.c projects/bsd_rdma_4_9/sys/contrib/dev/liquidio/ - copied from r323558, head/sys/contrib/dev/liquidio/ projects/bsd_rdma_4_9/sys/dev/amdsmn/ - copied from r323558, head/sys/dev/amdsmn/ projects/bsd_rdma_4_9/sys/dev/cxgbe/firmware/t4fw-1.16.59.0.bin.uu - copied unchanged from r323558, head/sys/dev/cxgbe/firmware/t4fw-1.16.59.0.bin.uu projects/bsd_rdma_4_9/sys/dev/cxgbe/firmware/t5fw-1.16.59.0.bin.uu - copied unchanged from r323558, head/sys/dev/cxgbe/firmware/t5fw-1.16.59.0.bin.uu projects/bsd_rdma_4_9/sys/dev/cxgbe/firmware/t6fw-1.16.59.0.bin.uu - copied unchanged from r323558, head/sys/dev/cxgbe/firmware/t6fw-1.16.59.0.bin.uu projects/bsd_rdma_4_9/sys/dev/liquidio/ - copied from r323558, head/sys/dev/liquidio/ projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_ib/ - copied from r323558, head/sys/dev/mlx5/mlx5_ib/ projects/bsd_rdma_4_9/sys/dev/ntb/ntb_hw/ntb_hw_intel.c - copied unchanged from r323558, head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c projects/bsd_rdma_4_9/sys/dev/ntb/ntb_hw/ntb_hw_intel.h - copied unchanged from r323558, head/sys/dev/ntb/ntb_hw/ntb_hw_intel.h projects/bsd_rdma_4_9/sys/dev/ntb/ntb_hw/ntb_hw_plx.c - copied unchanged from r323558, head/sys/dev/ntb/ntb_hw/ntb_hw_plx.c projects/bsd_rdma_4_9/sys/dev/uart/uart_dev_mvebu.c - copied unchanged from r323558, head/sys/dev/uart/uart_dev_mvebu.c projects/bsd_rdma_4_9/sys/modules/amdsmn/ - copied from r323558, head/sys/modules/amdsmn/ projects/bsd_rdma_4_9/sys/modules/lio/ - copied from r323558, head/sys/modules/lio/ projects/bsd_rdma_4_9/sys/modules/mlx5ib/ - copied from r323558, head/sys/modules/mlx5ib/ projects/bsd_rdma_4_9/sys/modules/ntb/ntb_hw_intel/ - copied from r323558, head/sys/modules/ntb/ntb_hw_intel/ projects/bsd_rdma_4_9/sys/modules/ntb/ntb_hw_plx/ - copied from r323558, head/sys/modules/ntb/ntb_hw_plx/ projects/bsd_rdma_4_9/usr.sbin/efivar/efiutil.c - copied unchanged from r323558, head/usr.sbin/efivar/efiutil.c projects/bsd_rdma_4_9/usr.sbin/efivar/efiutil.h - copied unchanged from r323558, head/usr.sbin/efivar/efiutil.h Deleted: projects/bsd_rdma_4_9/contrib/zstd/PATENTS projects/bsd_rdma_4_9/contrib/zstd/tests/pool.c projects/bsd_rdma_4_9/etc/periodic/weekly/330.catman projects/bsd_rdma_4_9/share/man/man4/ntb_hw.4 projects/bsd_rdma_4_9/sys/amd64/conf/MMCCAM projects/bsd_rdma_4_9/sys/arm/mv/armada38x/rtc.c projects/bsd_rdma_4_9/sys/boot/efi/boot1/fat-amd64.tmpl.bz2.uu projects/bsd_rdma_4_9/sys/boot/efi/boot1/fat-arm.tmpl.bz2.uu projects/bsd_rdma_4_9/sys/boot/efi/boot1/fat-arm64.tmpl.bz2.uu projects/bsd_rdma_4_9/sys/boot/efi/boot1/fat-i386.tmpl.bz2.uu projects/bsd_rdma_4_9/sys/dev/cxgb/ulp/ projects/bsd_rdma_4_9/sys/dev/cxgbe/firmware/t4fw-1.16.45.0.bin.uu projects/bsd_rdma_4_9/sys/dev/cxgbe/firmware/t5fw-1.16.45.0.bin.uu projects/bsd_rdma_4_9/sys/dev/cxgbe/firmware/t6fw-1.16.45.0.bin.uu projects/bsd_rdma_4_9/sys/dev/ntb/ntb_hw/ntb_hw.c projects/bsd_rdma_4_9/sys/dev/ntb/ntb_hw/ntb_regs.h projects/bsd_rdma_4_9/sys/modules/cxgb/iw_cxgb/ projects/bsd_rdma_4_9/sys/modules/cxgb/tom/ projects/bsd_rdma_4_9/sys/modules/ntb/ntb_hw/ projects/bsd_rdma_4_9/usr.bin/catman/ Modified: projects/bsd_rdma_4_9/Makefile.inc1 projects/bsd_rdma_4_9/ObsoleteFiles.inc projects/bsd_rdma_4_9/UPDATING projects/bsd_rdma_4_9/bin/chflags/Makefile projects/bsd_rdma_4_9/bin/dd/args.c projects/bsd_rdma_4_9/bin/dd/conv.c projects/bsd_rdma_4_9/bin/dd/dd.c projects/bsd_rdma_4_9/bin/dd/dd.h projects/bsd_rdma_4_9/bin/dd/position.c projects/bsd_rdma_4_9/bin/mkdir/Makefile projects/bsd_rdma_4_9/bin/pkill/pkill.c projects/bsd_rdma_4_9/bin/ps/print.c projects/bsd_rdma_4_9/bin/ps/ps.1 projects/bsd_rdma_4_9/bin/rcp/Makefile projects/bsd_rdma_4_9/bin/rmdir/Makefile projects/bsd_rdma_4_9/cddl/compat/opensolaris/misc/zmount.c projects/bsd_rdma_4_9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d projects/bsd_rdma_4_9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 projects/bsd_rdma_4_9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c projects/bsd_rdma_4_9/cddl/lib/libdtrace/Makefile projects/bsd_rdma_4_9/cddl/lib/libzpool/Makefile projects/bsd_rdma_4_9/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile projects/bsd_rdma_4_9/cddl/usr.sbin/zfsd/zfsd_event.cc projects/bsd_rdma_4_9/contrib/binutils/opcodes/i386-dis.c projects/bsd_rdma_4_9/contrib/binutils/opcodes/i386-opc.h projects/bsd_rdma_4_9/contrib/binutils/opcodes/i386-opc.tbl projects/bsd_rdma_4_9/contrib/binutils/opcodes/i386-tbl.h projects/bsd_rdma_4_9/contrib/compiler-rt/lib/builtins/arm/aeabi_dcmp.S projects/bsd_rdma_4_9/contrib/compiler-rt/lib/builtins/arm/aeabi_fcmp.S projects/bsd_rdma_4_9/contrib/compiler-rt/lib/builtins/int_lib.h projects/bsd_rdma_4_9/contrib/compiler-rt/lib/esan/esan_sideline_linux.cpp projects/bsd_rdma_4_9/contrib/compiler-rt/lib/profile/InstrProfilingNameVar.c projects/bsd_rdma_4_9/contrib/cortex-strings/src/aarch64/memcpy.S projects/bsd_rdma_4_9/contrib/file/src/readelf.c projects/bsd_rdma_4_9/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h projects/bsd_rdma_4_9/contrib/llvm/lib/Analysis/PostDominators.cpp projects/bsd_rdma_4_9/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp projects/bsd_rdma_4_9/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h projects/bsd_rdma_4_9/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp projects/bsd_rdma_4_9/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp projects/bsd_rdma_4_9/contrib/llvm/lib/IR/AutoUpgrade.cpp projects/bsd_rdma_4_9/contrib/llvm/lib/Object/COFFModuleDefinition.cpp projects/bsd_rdma_4_9/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp projects/bsd_rdma_4_9/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/bsd_rdma_4_9/contrib/llvm/lib/Target/X86/X86InstrAVX512.td projects/bsd_rdma_4_9/contrib/llvm/lib/Target/X86/X86SchedSandyBridge.td projects/bsd_rdma_4_9/contrib/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp projects/bsd_rdma_4_9/contrib/llvm/lib/ToolDrivers/llvm-dlltool/Options.td projects/bsd_rdma_4_9/contrib/llvm/lib/Transforms/Scalar/LowerAtomic.cpp projects/bsd_rdma_4_9/contrib/llvm/lib/Transforms/Scalar/Reassociate.cpp projects/bsd_rdma_4_9/contrib/llvm/lib/Transforms/Utils/CloneFunction.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h projects/bsd_rdma_4_9/contrib/llvm/tools/clang/include/clang/Driver/Options.td projects/bsd_rdma_4_9/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.def projects/bsd_rdma_4_9/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h projects/bsd_rdma_4_9/contrib/llvm/tools/clang/include/clang/Lex/Preprocessor.h projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/AST/ASTImporter.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Basic/Version.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.h projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/CodeGen/MicrosoftCXXABI.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Driver/ToolChains/Clang.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Driver/ToolChains/Darwin.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Driver/ToolChains/MSVC.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Driver/ToolChains/MSVC.h projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.h projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Headers/unwind.h projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Lex/PPLexerChange.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Lex/Preprocessor.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Parse/Parser.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Sema/SemaObjCProperty.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/RegionStore.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/lldb/source/Host/common/TCPSocket.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp projects/bsd_rdma_4_9/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContext_x86.h projects/bsd_rdma_4_9/contrib/netbsd-tests/usr.bin/grep/t_grep.sh projects/bsd_rdma_4_9/contrib/top/loadavg.h projects/bsd_rdma_4_9/contrib/unbound/validator/autotrust.c projects/bsd_rdma_4_9/contrib/zlib/deflate.c projects/bsd_rdma_4_9/contrib/zlib/zlib.h projects/bsd_rdma_4_9/contrib/zstd/CONTRIBUTING.md projects/bsd_rdma_4_9/contrib/zstd/Makefile projects/bsd_rdma_4_9/contrib/zstd/NEWS projects/bsd_rdma_4_9/contrib/zstd/README.md projects/bsd_rdma_4_9/contrib/zstd/circle.yml projects/bsd_rdma_4_9/contrib/zstd/doc/educational_decoder/harness.c projects/bsd_rdma_4_9/contrib/zstd/doc/educational_decoder/zstd_decompress.c projects/bsd_rdma_4_9/contrib/zstd/doc/educational_decoder/zstd_decompress.h projects/bsd_rdma_4_9/contrib/zstd/doc/zstd_compression_format.md projects/bsd_rdma_4_9/contrib/zstd/doc/zstd_manual.html projects/bsd_rdma_4_9/contrib/zstd/lib/common/bitstream.h projects/bsd_rdma_4_9/contrib/zstd/lib/common/error_private.c projects/bsd_rdma_4_9/contrib/zstd/lib/common/error_private.h projects/bsd_rdma_4_9/contrib/zstd/lib/common/fse.h projects/bsd_rdma_4_9/contrib/zstd/lib/common/fse_decompress.c projects/bsd_rdma_4_9/contrib/zstd/lib/common/huf.h projects/bsd_rdma_4_9/contrib/zstd/lib/common/mem.h projects/bsd_rdma_4_9/contrib/zstd/lib/common/pool.c projects/bsd_rdma_4_9/contrib/zstd/lib/common/pool.h projects/bsd_rdma_4_9/contrib/zstd/lib/common/threading.h projects/bsd_rdma_4_9/contrib/zstd/lib/common/xxhash.c projects/bsd_rdma_4_9/contrib/zstd/lib/common/zstd_common.c projects/bsd_rdma_4_9/contrib/zstd/lib/common/zstd_errors.h projects/bsd_rdma_4_9/contrib/zstd/lib/common/zstd_internal.h projects/bsd_rdma_4_9/contrib/zstd/lib/compress/fse_compress.c projects/bsd_rdma_4_9/contrib/zstd/lib/compress/huf_compress.c projects/bsd_rdma_4_9/contrib/zstd/lib/compress/zstd_compress.c projects/bsd_rdma_4_9/contrib/zstd/lib/compress/zstd_opt.h projects/bsd_rdma_4_9/contrib/zstd/lib/compress/zstdmt_compress.c projects/bsd_rdma_4_9/contrib/zstd/lib/compress/zstdmt_compress.h projects/bsd_rdma_4_9/contrib/zstd/lib/decompress/huf_decompress.c projects/bsd_rdma_4_9/contrib/zstd/lib/decompress/zstd_decompress.c projects/bsd_rdma_4_9/contrib/zstd/lib/deprecated/zbuff.h projects/bsd_rdma_4_9/contrib/zstd/lib/deprecated/zbuff_common.c projects/bsd_rdma_4_9/contrib/zstd/lib/deprecated/zbuff_compress.c projects/bsd_rdma_4_9/contrib/zstd/lib/deprecated/zbuff_decompress.c projects/bsd_rdma_4_9/contrib/zstd/lib/dictBuilder/cover.c projects/bsd_rdma_4_9/contrib/zstd/lib/dictBuilder/zdict.c projects/bsd_rdma_4_9/contrib/zstd/lib/dictBuilder/zdict.h projects/bsd_rdma_4_9/contrib/zstd/lib/legacy/zstd_legacy.h projects/bsd_rdma_4_9/contrib/zstd/lib/legacy/zstd_v01.c projects/bsd_rdma_4_9/contrib/zstd/lib/legacy/zstd_v01.h projects/bsd_rdma_4_9/contrib/zstd/lib/legacy/zstd_v02.c projects/bsd_rdma_4_9/contrib/zstd/lib/legacy/zstd_v02.h projects/bsd_rdma_4_9/contrib/zstd/lib/legacy/zstd_v03.c projects/bsd_rdma_4_9/contrib/zstd/lib/legacy/zstd_v03.h projects/bsd_rdma_4_9/contrib/zstd/lib/legacy/zstd_v04.c projects/bsd_rdma_4_9/contrib/zstd/lib/legacy/zstd_v04.h projects/bsd_rdma_4_9/contrib/zstd/lib/legacy/zstd_v05.c projects/bsd_rdma_4_9/contrib/zstd/lib/legacy/zstd_v05.h projects/bsd_rdma_4_9/contrib/zstd/lib/legacy/zstd_v06.c projects/bsd_rdma_4_9/contrib/zstd/lib/legacy/zstd_v06.h projects/bsd_rdma_4_9/contrib/zstd/lib/legacy/zstd_v07.c projects/bsd_rdma_4_9/contrib/zstd/lib/legacy/zstd_v07.h projects/bsd_rdma_4_9/contrib/zstd/lib/zstd.h projects/bsd_rdma_4_9/contrib/zstd/programs/.gitignore projects/bsd_rdma_4_9/contrib/zstd/programs/Makefile projects/bsd_rdma_4_9/contrib/zstd/programs/README.md projects/bsd_rdma_4_9/contrib/zstd/programs/bench.c projects/bsd_rdma_4_9/contrib/zstd/programs/bench.h projects/bsd_rdma_4_9/contrib/zstd/programs/datagen.c projects/bsd_rdma_4_9/contrib/zstd/programs/datagen.h projects/bsd_rdma_4_9/contrib/zstd/programs/dibio.c projects/bsd_rdma_4_9/contrib/zstd/programs/dibio.h projects/bsd_rdma_4_9/contrib/zstd/programs/fileio.c projects/bsd_rdma_4_9/contrib/zstd/programs/fileio.h projects/bsd_rdma_4_9/contrib/zstd/programs/platform.h projects/bsd_rdma_4_9/contrib/zstd/programs/util.h projects/bsd_rdma_4_9/contrib/zstd/programs/zstd.1 projects/bsd_rdma_4_9/contrib/zstd/programs/zstd.1.md projects/bsd_rdma_4_9/contrib/zstd/programs/zstdcli.c projects/bsd_rdma_4_9/contrib/zstd/tests/Makefile projects/bsd_rdma_4_9/contrib/zstd/tests/datagencli.c projects/bsd_rdma_4_9/contrib/zstd/tests/decodecorpus.c projects/bsd_rdma_4_9/contrib/zstd/tests/fullbench.c projects/bsd_rdma_4_9/contrib/zstd/tests/fuzzer.c projects/bsd_rdma_4_9/contrib/zstd/tests/invalidDictionaries.c projects/bsd_rdma_4_9/contrib/zstd/tests/legacy.c projects/bsd_rdma_4_9/contrib/zstd/tests/longmatch.c projects/bsd_rdma_4_9/contrib/zstd/tests/namespaceTest.c projects/bsd_rdma_4_9/contrib/zstd/tests/paramgrill.c projects/bsd_rdma_4_9/contrib/zstd/tests/playTests.sh projects/bsd_rdma_4_9/contrib/zstd/tests/roundTripCrash.c projects/bsd_rdma_4_9/contrib/zstd/tests/symbols.c projects/bsd_rdma_4_9/contrib/zstd/tests/zbufftest.c projects/bsd_rdma_4_9/contrib/zstd/tests/zstreamtest.c projects/bsd_rdma_4_9/contrib/zstd/zlibWrapper/examples/zwrapbench.c projects/bsd_rdma_4_9/contrib/zstd/zlibWrapper/gzcompatibility.h projects/bsd_rdma_4_9/contrib/zstd/zlibWrapper/gzlib.c projects/bsd_rdma_4_9/contrib/zstd/zlibWrapper/gzread.c projects/bsd_rdma_4_9/contrib/zstd/zlibWrapper/gzwrite.c projects/bsd_rdma_4_9/contrib/zstd/zlibWrapper/zstd_zlibwrapper.c projects/bsd_rdma_4_9/contrib/zstd/zlibWrapper/zstd_zlibwrapper.h projects/bsd_rdma_4_9/etc/defaults/periodic.conf projects/bsd_rdma_4_9/etc/mtree/BSD.tests.dist projects/bsd_rdma_4_9/etc/periodic/security/100.chksetuid projects/bsd_rdma_4_9/etc/periodic/security/110.neggrpperm projects/bsd_rdma_4_9/etc/periodic/security/security.functions projects/bsd_rdma_4_9/etc/periodic/weekly/Makefile projects/bsd_rdma_4_9/gnu/usr.bin/binutils/libbfd/Makefile.amd64 projects/bsd_rdma_4_9/kerberos5/libexec/kpasswdd/Makefile projects/bsd_rdma_4_9/lib/clang/include/clang/Basic/Version.inc projects/bsd_rdma_4_9/lib/clang/include/lld/Config/Version.inc projects/bsd_rdma_4_9/lib/clang/include/llvm/Support/VCSRevision.h projects/bsd_rdma_4_9/lib/csu/mips/crti.S projects/bsd_rdma_4_9/lib/csu/mips/crtn.S projects/bsd_rdma_4_9/lib/libc/amd64/sys/Makefile.inc projects/bsd_rdma_4_9/lib/libc/amd64/sys/amd64_get_fsbase.c projects/bsd_rdma_4_9/lib/libc/amd64/sys/amd64_get_gsbase.c projects/bsd_rdma_4_9/lib/libc/amd64/sys/amd64_set_fsbase.c projects/bsd_rdma_4_9/lib/libc/amd64/sys/amd64_set_gsbase.c projects/bsd_rdma_4_9/lib/libc/gen/fnmatch.c projects/bsd_rdma_4_9/lib/libc/gen/getmntinfo.c projects/bsd_rdma_4_9/lib/libc/locale/setlocale.c projects/bsd_rdma_4_9/lib/libc/locale/setrunelocale.c projects/bsd_rdma_4_9/lib/libc/locale/xlocale_private.h projects/bsd_rdma_4_9/lib/libc/mips/Symbol.map projects/bsd_rdma_4_9/lib/libc/tests/gen/Makefile projects/bsd_rdma_4_9/lib/libcompiler_rt/Makefile.inc projects/bsd_rdma_4_9/lib/libedit/chartype.c projects/bsd_rdma_4_9/lib/libefivar/Makefile projects/bsd_rdma_4_9/lib/libefivar/efivar-dp-format.c projects/bsd_rdma_4_9/lib/libefivar/efivar-dp-parse.c projects/bsd_rdma_4_9/lib/libefivar/efivar-dp.h projects/bsd_rdma_4_9/lib/libefivar/efivar.c projects/bsd_rdma_4_9/lib/libgeom/geom_util.c projects/bsd_rdma_4_9/lib/libpmc/libpmc.c projects/bsd_rdma_4_9/lib/libproc/_libproc.h projects/bsd_rdma_4_9/lib/libproc/proc_rtld.c projects/bsd_rdma_4_9/lib/libproc/proc_sym.c projects/bsd_rdma_4_9/lib/libstand/nfs.c projects/bsd_rdma_4_9/lib/libstand/tftp.c projects/bsd_rdma_4_9/lib/libsysdecode/Makefile projects/bsd_rdma_4_9/lib/libsysdecode/flags.c projects/bsd_rdma_4_9/lib/libsysdecode/mktables projects/bsd_rdma_4_9/lib/libsysdecode/sysdecode.h projects/bsd_rdma_4_9/lib/libsysdecode/sysdecode_enum.3 projects/bsd_rdma_4_9/lib/libsysdecode/sysdecode_mask.3 projects/bsd_rdma_4_9/lib/msun/src/catrig.c projects/bsd_rdma_4_9/lib/msun/src/catrigl.c projects/bsd_rdma_4_9/lib/msun/src/s_csqrtl.c projects/bsd_rdma_4_9/lib/msun/tests/csqrt_test.c projects/bsd_rdma_4_9/lib/msun/tests/trig_test.c projects/bsd_rdma_4_9/libexec/getty/gettytab.5 projects/bsd_rdma_4_9/libexec/getty/gettytab.h projects/bsd_rdma_4_9/libexec/getty/init.c projects/bsd_rdma_4_9/libexec/getty/main.c projects/bsd_rdma_4_9/libexec/makewhatis.local/Makefile projects/bsd_rdma_4_9/libexec/makewhatis.local/makewhatis.local.8 projects/bsd_rdma_4_9/libexec/makewhatis.local/makewhatis.local.sh projects/bsd_rdma_4_9/libexec/rtld-elf/Makefile projects/bsd_rdma_4_9/libexec/rtld-elf/arm/reloc.c projects/bsd_rdma_4_9/libexec/rtld-elf/arm/rtld_machdep.h projects/bsd_rdma_4_9/libexec/rtld-elf/mips/reloc.c projects/bsd_rdma_4_9/libexec/rtld-elf/mips/rtld_start.S projects/bsd_rdma_4_9/libexec/rtld-elf/rtld.1 projects/bsd_rdma_4_9/libexec/rtld-elf/rtld.c projects/bsd_rdma_4_9/libexec/rtld-elf/rtld.h projects/bsd_rdma_4_9/release/amd64/make-memstick.sh projects/bsd_rdma_4_9/release/amd64/mkisoimages.sh projects/bsd_rdma_4_9/release/arm/BEAGLEBONE.conf projects/bsd_rdma_4_9/release/arm/CUBIEBOARD.conf projects/bsd_rdma_4_9/release/arm/GUMSTIX.conf projects/bsd_rdma_4_9/release/arm/PANDABOARD.conf projects/bsd_rdma_4_9/release/arm/RPI-B.conf projects/bsd_rdma_4_9/release/arm64/RPI3.conf projects/bsd_rdma_4_9/release/arm64/make-memstick.sh projects/bsd_rdma_4_9/release/i386/make-memstick.sh projects/bsd_rdma_4_9/release/i386/mkisoimages.sh projects/bsd_rdma_4_9/release/powerpc/make-memstick.sh projects/bsd_rdma_4_9/release/powerpc/mkisoimages.sh projects/bsd_rdma_4_9/release/sparc64/mkisoimages.sh projects/bsd_rdma_4_9/release/tools/ec2.conf projects/bsd_rdma_4_9/release/tools/gce.conf projects/bsd_rdma_4_9/sbin/fsck_ffs/setup.c projects/bsd_rdma_4_9/sbin/geom/class/eli/geli.8 projects/bsd_rdma_4_9/sbin/geom/class/eli/geom_eli.c projects/bsd_rdma_4_9/sbin/geom/class/virstor/geom_virstor.c projects/bsd_rdma_4_9/sbin/geom/misc/subr.c projects/bsd_rdma_4_9/sbin/mdconfig/mdconfig.8 projects/bsd_rdma_4_9/sbin/mdconfig/mdconfig.c projects/bsd_rdma_4_9/sbin/newfs/mkfs.c projects/bsd_rdma_4_9/sbin/nvmecontrol/identify.c projects/bsd_rdma_4_9/share/man/man4/Makefile projects/bsd_rdma_4_9/share/man/man4/altq.4 projects/bsd_rdma_4_9/share/man/man4/amdtemp.4 projects/bsd_rdma_4_9/share/man/man4/ddb.4 projects/bsd_rdma_4_9/share/man/man4/hv_vss.4 projects/bsd_rdma_4_9/share/man/man4/if_ntb.4 projects/bsd_rdma_4_9/share/man/man4/ntb_transport.4 projects/bsd_rdma_4_9/share/man/man4/siba.4 projects/bsd_rdma_4_9/share/man/man4/tty.4 projects/bsd_rdma_4_9/share/man/man4/vlan.4 projects/bsd_rdma_4_9/share/man/man5/periodic.conf.5 projects/bsd_rdma_4_9/share/man/man5/rc.conf.5 projects/bsd_rdma_4_9/share/man/man5/src.conf.5 projects/bsd_rdma_4_9/share/man/man5/tmpfs.5 projects/bsd_rdma_4_9/share/man/man7/tests.7 projects/bsd_rdma_4_9/share/misc/committers-ports.dot projects/bsd_rdma_4_9/share/misc/committers-src.dot projects/bsd_rdma_4_9/share/misc/pci_vendors projects/bsd_rdma_4_9/share/mk/bsd.lib.mk projects/bsd_rdma_4_9/share/mk/bsd.prog.mk projects/bsd_rdma_4_9/share/mk/bsd.sys.mk projects/bsd_rdma_4_9/sys/amd64/amd64/cpu_switch.S projects/bsd_rdma_4_9/sys/amd64/amd64/exception.S projects/bsd_rdma_4_9/sys/amd64/amd64/machdep.c projects/bsd_rdma_4_9/sys/amd64/amd64/ptrace_machdep.c projects/bsd_rdma_4_9/sys/amd64/amd64/sys_machdep.c projects/bsd_rdma_4_9/sys/amd64/amd64/vm_machdep.c projects/bsd_rdma_4_9/sys/amd64/conf/GENERIC projects/bsd_rdma_4_9/sys/amd64/conf/NOTES projects/bsd_rdma_4_9/sys/amd64/include/asmacros.h projects/bsd_rdma_4_9/sys/amd64/include/param.h projects/bsd_rdma_4_9/sys/amd64/include/pcb.h projects/bsd_rdma_4_9/sys/amd64/vmm/intel/vmx_msr.c projects/bsd_rdma_4_9/sys/arm/allwinner/a10_gpio.c projects/bsd_rdma_4_9/sys/arm/arm/generic_timer.c projects/bsd_rdma_4_9/sys/arm/at91/at91_twi.c projects/bsd_rdma_4_9/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/bsd_rdma_4_9/sys/arm/broadcom/bcm2835/bcm2836_mp.c projects/bsd_rdma_4_9/sys/arm/conf/ARMADA38X projects/bsd_rdma_4_9/sys/arm/conf/BEAGLEBONE-MMCCAM projects/bsd_rdma_4_9/sys/arm/freescale/imx/imx_gpio.c projects/bsd_rdma_4_9/sys/arm/freescale/imx/imx_i2c.c projects/bsd_rdma_4_9/sys/arm/mv/armada38x/files.armada38x projects/bsd_rdma_4_9/sys/arm/ti/ti_cpuid.c projects/bsd_rdma_4_9/sys/arm/ti/ti_cpuid.h projects/bsd_rdma_4_9/sys/arm/ti/ti_i2c.c projects/bsd_rdma_4_9/sys/arm/ti/ti_scm.c projects/bsd_rdma_4_9/sys/arm64/arm64/genassym.c projects/bsd_rdma_4_9/sys/arm64/arm64/identcpu.c projects/bsd_rdma_4_9/sys/arm64/arm64/mp_machdep.c projects/bsd_rdma_4_9/sys/arm64/arm64/pmap.c projects/bsd_rdma_4_9/sys/arm64/arm64/swtch.S projects/bsd_rdma_4_9/sys/arm64/arm64/vm_machdep.c projects/bsd_rdma_4_9/sys/arm64/conf/GENERIC projects/bsd_rdma_4_9/sys/arm64/include/armreg.h projects/bsd_rdma_4_9/sys/arm64/include/cpu.h projects/bsd_rdma_4_9/sys/arm64/include/pcb.h projects/bsd_rdma_4_9/sys/arm64/include/proc.h projects/bsd_rdma_4_9/sys/boot/common/loader.8 projects/bsd_rdma_4_9/sys/boot/efi/boot1/Makefile projects/bsd_rdma_4_9/sys/boot/efi/boot1/Makefile.fat projects/bsd_rdma_4_9/sys/boot/efi/boot1/boot1.c projects/bsd_rdma_4_9/sys/boot/efi/boot1/boot_module.h projects/bsd_rdma_4_9/sys/boot/efi/boot1/generate-fat.sh projects/bsd_rdma_4_9/sys/boot/efi/boot1/ufs_module.c projects/bsd_rdma_4_9/sys/boot/efi/boot1/zfs_module.c projects/bsd_rdma_4_9/sys/boot/efi/include/efiapi.h projects/bsd_rdma_4_9/sys/boot/efi/include/efichar.h projects/bsd_rdma_4_9/sys/boot/efi/include/efidevp.h projects/bsd_rdma_4_9/sys/boot/efi/include/efilib.h projects/bsd_rdma_4_9/sys/boot/efi/include/efizfs.h projects/bsd_rdma_4_9/sys/boot/efi/libefi/Makefile projects/bsd_rdma_4_9/sys/boot/efi/libefi/efichar.c projects/bsd_rdma_4_9/sys/boot/efi/libefi/efipart.c projects/bsd_rdma_4_9/sys/boot/efi/libefi/efizfs.c projects/bsd_rdma_4_9/sys/boot/efi/libefi/libefi.c projects/bsd_rdma_4_9/sys/boot/efi/loader/Makefile projects/bsd_rdma_4_9/sys/boot/efi/loader/arch/amd64/Makefile.inc projects/bsd_rdma_4_9/sys/boot/efi/loader/arch/i386/Makefile.inc projects/bsd_rdma_4_9/sys/boot/efi/loader/bootinfo.c projects/bsd_rdma_4_9/sys/boot/efi/loader/conf.c projects/bsd_rdma_4_9/sys/boot/efi/loader/main.c projects/bsd_rdma_4_9/sys/boot/fdt/dts/arm/zedboard.dts projects/bsd_rdma_4_9/sys/boot/fdt/dts/arm/zybo.dts projects/bsd_rdma_4_9/sys/boot/forth/loader.conf projects/bsd_rdma_4_9/sys/boot/geli/geliboot.c projects/bsd_rdma_4_9/sys/boot/geli/geliboot.h projects/bsd_rdma_4_9/sys/boot/geli/geliboot_crypto.c projects/bsd_rdma_4_9/sys/boot/geli/geliboot_internal.h projects/bsd_rdma_4_9/sys/boot/geli/pwgets.c projects/bsd_rdma_4_9/sys/boot/i386/libi386/biosdisk.c projects/bsd_rdma_4_9/sys/boot/i386/libi386/spinconsole.c projects/bsd_rdma_4_9/sys/boot/zfs/zfsimpl.c projects/bsd_rdma_4_9/sys/cam/ata/ata_da.c projects/bsd_rdma_4_9/sys/cam/cam_ccb.h projects/bsd_rdma_4_9/sys/cam/cam_iosched.c projects/bsd_rdma_4_9/sys/cam/cam_iosched.h projects/bsd_rdma_4_9/sys/cam/cam_xpt.c projects/bsd_rdma_4_9/sys/cam/ctl/ctl_backend_block.c projects/bsd_rdma_4_9/sys/cam/ctl/ctl_backend_ramdisk.c projects/bsd_rdma_4_9/sys/cam/nvme/nvme_all.c projects/bsd_rdma_4_9/sys/cam/nvme/nvme_all.h projects/bsd_rdma_4_9/sys/cam/nvme/nvme_da.c projects/bsd_rdma_4_9/sys/cam/nvme/nvme_xpt.c projects/bsd_rdma_4_9/sys/cam/scsi/scsi_all.c projects/bsd_rdma_4_9/sys/cam/scsi/scsi_da.c projects/bsd_rdma_4_9/sys/cam/scsi/scsi_pass.c projects/bsd_rdma_4_9/sys/cddl/boot/zfs/zfsimpl.h projects/bsd_rdma_4_9/sys/cddl/compat/opensolaris/sys/mntent.h projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/abd.c projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/abd.h projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h projects/bsd_rdma_4_9/sys/cddl/dev/dtrace/mips/dtrace_asm.S projects/bsd_rdma_4_9/sys/cddl/dev/dtrace/mips/dtrace_subr.c projects/bsd_rdma_4_9/sys/cddl/dev/fbt/mips/fbt_isa.c projects/bsd_rdma_4_9/sys/compat/cloudabi/cloudabi_fd.c projects/bsd_rdma_4_9/sys/compat/cloudabi/cloudabi_file.c projects/bsd_rdma_4_9/sys/compat/cloudabi/cloudabi_sock.c projects/bsd_rdma_4_9/sys/compat/cloudabi32/cloudabi32_proto.h projects/bsd_rdma_4_9/sys/compat/cloudabi32/cloudabi32_syscall.h projects/bsd_rdma_4_9/sys/compat/cloudabi32/cloudabi32_syscalls.c projects/bsd_rdma_4_9/sys/compat/cloudabi32/cloudabi32_sysent.c projects/bsd_rdma_4_9/sys/compat/cloudabi32/cloudabi32_systrace_args.c projects/bsd_rdma_4_9/sys/compat/cloudabi64/cloudabi64_proto.h projects/bsd_rdma_4_9/sys/compat/cloudabi64/cloudabi64_syscall.h projects/bsd_rdma_4_9/sys/compat/cloudabi64/cloudabi64_syscalls.c projects/bsd_rdma_4_9/sys/compat/cloudabi64/cloudabi64_sysent.c projects/bsd_rdma_4_9/sys/compat/cloudabi64/cloudabi64_systrace_args.c projects/bsd_rdma_4_9/sys/compat/freebsd32/freebsd32.h projects/bsd_rdma_4_9/sys/compat/freebsd32/freebsd32_ioctl.c projects/bsd_rdma_4_9/sys/compat/freebsd32/freebsd32_ioctl.h projects/bsd_rdma_4_9/sys/compat/freebsd32/freebsd32_misc.c projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/include/linux/device.h projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/include/linux/file.h projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/include/linux/fs.h projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/include/linux/inetdevice.h projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/include/linux/kobject.h projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/include/linux/lockdep.h projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/include/linux/module.h projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/include/linux/poll.h projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/src/linux_compat.c projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/src/linux_pci.c projects/bsd_rdma_4_9/sys/conf/NOTES projects/bsd_rdma_4_9/sys/conf/files projects/bsd_rdma_4_9/sys/conf/files.amd64 projects/bsd_rdma_4_9/sys/conf/files.arm64 projects/bsd_rdma_4_9/sys/conf/files.i386 projects/bsd_rdma_4_9/sys/conf/ldscript.amd64 projects/bsd_rdma_4_9/sys/conf/newvers.sh projects/bsd_rdma_4_9/sys/conf/options projects/bsd_rdma_4_9/sys/contrib/cloudabi/cloudabi_types_common.h projects/bsd_rdma_4_9/sys/contrib/cloudabi/cloudabi_vdso_aarch64.S projects/bsd_rdma_4_9/sys/contrib/cloudabi/cloudabi_vdso_armv6.S projects/bsd_rdma_4_9/sys/contrib/cloudabi/cloudabi_vdso_i686.S projects/bsd_rdma_4_9/sys/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S projects/bsd_rdma_4_9/sys/contrib/cloudabi/cloudabi_vdso_x86_64.S projects/bsd_rdma_4_9/sys/contrib/cloudabi/syscalls32.master projects/bsd_rdma_4_9/sys/contrib/cloudabi/syscalls64.master projects/bsd_rdma_4_9/sys/contrib/dev/acpica/changes.txt projects/bsd_rdma_4_9/sys/contrib/dev/acpica/common/dmtbinfo.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/asldebug.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/aslerror.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/aslhelp.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/aslmain.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/aslmessages.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/aslmessages.h projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/aslresource.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/aslrules.y projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/asltree.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/aslutils.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/dtcompile.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/dtfield.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/dtparser.y projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/dtutils.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/prparser.y projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/debugger/dbconvert.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/disassembler/dmresrc.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/dispatcher/dswexec.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/events/evgpe.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/executer/exconcat.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/executer/exconvrt.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/executer/exmisc.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/executer/exresop.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/hardware/hwgpe.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/hardware/hwregs.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/hardware/hwtimer.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/hardware/hwxface.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/namespace/nsconvert.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/tables/tbxface.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/utilities/utstrtoul64.c projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/acexcep.h projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/achware.h projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/acinterp.h projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/acpixf.h projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/actbl1.h projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/actbl2.h projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/acutils.h projects/bsd_rdma_4_9/sys/contrib/ipfilter/netinet/ip_state.c projects/bsd_rdma_4_9/sys/dev/aac/aac.c projects/bsd_rdma_4_9/sys/dev/acpica/acpi_cpu.c projects/bsd_rdma_4_9/sys/dev/ahci/ahci_generic.c projects/bsd_rdma_4_9/sys/dev/amdtemp/amdtemp.c projects/bsd_rdma_4_9/sys/dev/amr/amr.c projects/bsd_rdma_4_9/sys/dev/bhnd/cores/usb/bhnd_usb.c projects/bsd_rdma_4_9/sys/dev/bnxt/bnxt.h projects/bsd_rdma_4_9/sys/dev/bnxt/bnxt_hwrm.c projects/bsd_rdma_4_9/sys/dev/bnxt/bnxt_hwrm.h projects/bsd_rdma_4_9/sys/dev/bnxt/bnxt_sysctl.c projects/bsd_rdma_4_9/sys/dev/bnxt/bnxt_sysctl.h projects/bsd_rdma_4_9/sys/dev/bnxt/hsi_struct_def.h projects/bsd_rdma_4_9/sys/dev/bnxt/if_bnxt.c projects/bsd_rdma_4_9/sys/dev/cxgbe/adapter.h projects/bsd_rdma_4_9/sys/dev/cxgbe/common/t4_hw.c projects/bsd_rdma_4_9/sys/dev/cxgbe/firmware/t4fw_interface.h projects/bsd_rdma_4_9/sys/dev/cxgbe/firmware/t6fw_cfg.txt projects/bsd_rdma_4_9/sys/dev/cxgbe/iw_cxgbe/cm.c projects/bsd_rdma_4_9/sys/dev/cxgbe/iw_cxgbe/qp.c projects/bsd_rdma_4_9/sys/dev/cxgbe/offload.h projects/bsd_rdma_4_9/sys/dev/cxgbe/t4_main.c projects/bsd_rdma_4_9/sys/dev/cxgbe/t4_sge.c projects/bsd_rdma_4_9/sys/dev/cxgbe/tom/t4_connect.c projects/bsd_rdma_4_9/sys/dev/cxgbe/tom/t4_listen.c projects/bsd_rdma_4_9/sys/dev/cxgbe/tom/t4_tom.c projects/bsd_rdma_4_9/sys/dev/e1000/e1000_80003es2lan.c projects/bsd_rdma_4_9/sys/dev/e1000/e1000_82571.c projects/bsd_rdma_4_9/sys/dev/e1000/e1000_82575.c projects/bsd_rdma_4_9/sys/dev/e1000/e1000_hw.h projects/bsd_rdma_4_9/sys/dev/e1000/e1000_i210.c projects/bsd_rdma_4_9/sys/dev/e1000/e1000_i210.h projects/bsd_rdma_4_9/sys/dev/e1000/e1000_ich8lan.c projects/bsd_rdma_4_9/sys/dev/e1000/e1000_mac.c projects/bsd_rdma_4_9/sys/dev/e1000/e1000_mac.h projects/bsd_rdma_4_9/sys/dev/e1000/e1000_osdep.h projects/bsd_rdma_4_9/sys/dev/e1000/em_txrx.c projects/bsd_rdma_4_9/sys/dev/e1000/if_em.c projects/bsd_rdma_4_9/sys/dev/e1000/if_em.h projects/bsd_rdma_4_9/sys/dev/glxiic/glxiic.c projects/bsd_rdma_4_9/sys/dev/gpio/gpio_if.m projects/bsd_rdma_4_9/sys/dev/gpio/gpioc.c projects/bsd_rdma_4_9/sys/dev/hwpmc/hwpmc_core.c projects/bsd_rdma_4_9/sys/dev/hwpmc/hwpmc_intel.c projects/bsd_rdma_4_9/sys/dev/hwpmc/pmc_events.h projects/bsd_rdma_4_9/sys/dev/hyperv/netvsc/hn_rndis.c projects/bsd_rdma_4_9/sys/dev/hyperv/netvsc/if_hn.c projects/bsd_rdma_4_9/sys/dev/ichwd/ichwd.h projects/bsd_rdma_4_9/sys/dev/iicbus/iicbus_if.m projects/bsd_rdma_4_9/sys/dev/intpm/intpm.c projects/bsd_rdma_4_9/sys/dev/isp/isp_freebsd.c projects/bsd_rdma_4_9/sys/dev/ixgbe/if_ix.c projects/bsd_rdma_4_9/sys/dev/ixgbe/if_ixv.c projects/bsd_rdma_4_9/sys/dev/jedec_ts/jedec_ts.c projects/bsd_rdma_4_9/sys/dev/md/md.c projects/bsd_rdma_4_9/sys/dev/mfi/mfi.c projects/bsd_rdma_4_9/sys/dev/mpr/mpr.c projects/bsd_rdma_4_9/sys/dev/mpr/mpr_mapping.c projects/bsd_rdma_4_9/sys/dev/mpr/mpr_pci.c projects/bsd_rdma_4_9/sys/dev/mpr/mpr_sas.c projects/bsd_rdma_4_9/sys/dev/mpr/mpr_sas_lsi.c projects/bsd_rdma_4_9/sys/dev/mpr/mpr_table.c projects/bsd_rdma_4_9/sys/dev/mpr/mpr_table.h projects/bsd_rdma_4_9/sys/dev/mpr/mpr_user.c projects/bsd_rdma_4_9/sys/dev/mpr/mprvar.h projects/bsd_rdma_4_9/sys/dev/mps/mps.c projects/bsd_rdma_4_9/sys/dev/mps/mps_mapping.c projects/bsd_rdma_4_9/sys/dev/mps/mps_pci.c projects/bsd_rdma_4_9/sys/dev/mps/mps_sas.c projects/bsd_rdma_4_9/sys/dev/mps/mps_sas_lsi.c projects/bsd_rdma_4_9/sys/dev/mps/mps_table.c projects/bsd_rdma_4_9/sys/dev/mps/mps_table.h projects/bsd_rdma_4_9/sys/dev/mps/mps_user.c projects/bsd_rdma_4_9/sys/dev/mps/mpsvar.h projects/bsd_rdma_4_9/sys/dev/neta/if_mvneta.c projects/bsd_rdma_4_9/sys/dev/neta/if_mvneta_fdt.c projects/bsd_rdma_4_9/sys/dev/neta/if_mvnetavar.h projects/bsd_rdma_4_9/sys/dev/ntb/ntb.c projects/bsd_rdma_4_9/sys/dev/ntb/ntb.h projects/bsd_rdma_4_9/sys/dev/ntb/ntb_transport.c projects/bsd_rdma_4_9/sys/dev/nvme/nvme.c projects/bsd_rdma_4_9/sys/dev/nvme/nvme.h projects/bsd_rdma_4_9/sys/dev/nvme/nvme_ctrlr.c projects/bsd_rdma_4_9/sys/dev/nvme/nvme_ctrlr_cmd.c projects/bsd_rdma_4_9/sys/dev/nvme/nvme_ns.c projects/bsd_rdma_4_9/sys/dev/nvme/nvme_private.h projects/bsd_rdma_4_9/sys/dev/nvme/nvme_qpair.c projects/bsd_rdma_4_9/sys/dev/nvme/nvme_sim.c projects/bsd_rdma_4_9/sys/dev/nvme/nvme_sysctl.c projects/bsd_rdma_4_9/sys/dev/ppc/ppc_pci.c projects/bsd_rdma_4_9/sys/dev/qlnx/qlnxe/qlnx_os.c projects/bsd_rdma_4_9/sys/dev/qlxgbe/README.txt projects/bsd_rdma_4_9/sys/dev/qlxgbe/ql_boot.c projects/bsd_rdma_4_9/sys/dev/qlxgbe/ql_def.h projects/bsd_rdma_4_9/sys/dev/qlxgbe/ql_fw.c projects/bsd_rdma_4_9/sys/dev/qlxgbe/ql_glbl.h projects/bsd_rdma_4_9/sys/dev/qlxgbe/ql_hw.c projects/bsd_rdma_4_9/sys/dev/qlxgbe/ql_hw.h projects/bsd_rdma_4_9/sys/dev/qlxgbe/ql_inline.h projects/bsd_rdma_4_9/sys/dev/qlxgbe/ql_ioctl.c projects/bsd_rdma_4_9/sys/dev/qlxgbe/ql_isr.c projects/bsd_rdma_4_9/sys/dev/qlxgbe/ql_minidump.c projects/bsd_rdma_4_9/sys/dev/qlxgbe/ql_os.c projects/bsd_rdma_4_9/sys/dev/qlxgbe/ql_os.h projects/bsd_rdma_4_9/sys/dev/qlxgbe/ql_reset.c projects/bsd_rdma_4_9/sys/dev/qlxgbe/ql_ver.h projects/bsd_rdma_4_9/sys/dev/rtwn/if_rtwn_ridx.h projects/bsd_rdma_4_9/sys/dev/rtwn/if_rtwn_rx.c projects/bsd_rdma_4_9/sys/dev/rtwn/rtl8188e/r88e.h projects/bsd_rdma_4_9/sys/dev/rtwn/rtl8188e/r88e_chan.c projects/bsd_rdma_4_9/sys/dev/rtwn/rtl8192c/r92c.h projects/bsd_rdma_4_9/sys/dev/rtwn/rtl8192c/r92c_chan.c projects/bsd_rdma_4_9/sys/dev/rtwn/rtl8192c/r92c_fw.c projects/bsd_rdma_4_9/sys/dev/rtwn/rtl8192c/r92c_priv.h projects/bsd_rdma_4_9/sys/dev/rtwn/rtl8192c/r92c_rx.c projects/bsd_rdma_4_9/sys/dev/rtwn/rtl8192c/r92c_tx.c projects/bsd_rdma_4_9/sys/dev/rtwn/rtl8192c/r92c_var.h projects/bsd_rdma_4_9/sys/dev/rtwn/rtl8192e/r92e_chan.c projects/bsd_rdma_4_9/sys/dev/rtwn/rtl8812a/r12a_chan.c projects/bsd_rdma_4_9/sys/dev/rtwn/rtl8812a/r12a_rx.c projects/bsd_rdma_4_9/sys/dev/rtwn/rtl8812a/r12a_tx.c projects/bsd_rdma_4_9/sys/dev/syscons/scvgarndr.c projects/bsd_rdma_4_9/sys/dev/syscons/syscons.c projects/bsd_rdma_4_9/sys/dev/syscons/syscons.h projects/bsd_rdma_4_9/sys/dev/usb/controller/ehci_mv.c projects/bsd_rdma_4_9/sys/dev/usb/controller/xhci_mv.c projects/bsd_rdma_4_9/sys/dev/usb/quirk/usb_quirk.c projects/bsd_rdma_4_9/sys/dev/usb/usbdevs projects/bsd_rdma_4_9/sys/dev/vxge/vxgehal/vxgehal-mrpcim.c projects/bsd_rdma_4_9/sys/fs/msdosfs/msdosfs_fat.c projects/bsd_rdma_4_9/sys/geom/eli/g_eli.c projects/bsd_rdma_4_9/sys/geom/eli/g_eli.h projects/bsd_rdma_4_9/sys/geom/eli/g_eli_ctl.c projects/bsd_rdma_4_9/sys/geom/eli/g_eli_integrity.c projects/bsd_rdma_4_9/sys/geom/geom_subr.c projects/bsd_rdma_4_9/sys/geom/part/g_part_gpt.c projects/bsd_rdma_4_9/sys/i386/conf/GENERIC projects/bsd_rdma_4_9/sys/i386/conf/NOTES projects/bsd_rdma_4_9/sys/i386/i386/trap.c projects/bsd_rdma_4_9/sys/i386/include/param.h projects/bsd_rdma_4_9/sys/kern/kern_cpuset.c projects/bsd_rdma_4_9/sys/kern/kern_dtrace.c projects/bsd_rdma_4_9/sys/kern/kern_fork.c projects/bsd_rdma_4_9/sys/kern/kern_lockstat.c projects/bsd_rdma_4_9/sys/kern/kern_mutex.c projects/bsd_rdma_4_9/sys/kern/kern_proc.c projects/bsd_rdma_4_9/sys/kern/kern_rwlock.c projects/bsd_rdma_4_9/sys/kern/kern_sx.c projects/bsd_rdma_4_9/sys/kern/kern_sysctl.c projects/bsd_rdma_4_9/sys/kern/subr_blist.c projects/bsd_rdma_4_9/sys/kern/subr_bus_dma.c projects/bsd_rdma_4_9/sys/kern/subr_gtaskqueue.c projects/bsd_rdma_4_9/sys/kern/subr_smp.c projects/bsd_rdma_4_9/sys/kern/subr_turnstile.c projects/bsd_rdma_4_9/sys/kern/subr_vmem.c projects/bsd_rdma_4_9/sys/kern/sys_socket.c projects/bsd_rdma_4_9/sys/kern/uipc_sockbuf.c projects/bsd_rdma_4_9/sys/kern/uipc_socket.c projects/bsd_rdma_4_9/sys/kern/uipc_usrreq.c projects/bsd_rdma_4_9/sys/kern/vfs_bio.c projects/bsd_rdma_4_9/sys/kern/vfs_cache.c projects/bsd_rdma_4_9/sys/kern/vfs_mountroot.c projects/bsd_rdma_4_9/sys/kern/vfs_subr.c projects/bsd_rdma_4_9/sys/mips/atheros/if_arge.c projects/bsd_rdma_4_9/sys/mips/cavium/octeon_ebt3000_cf.c projects/bsd_rdma_4_9/sys/mips/conf/ERL projects/bsd_rdma_4_9/sys/mips/include/_limits.h projects/bsd_rdma_4_9/sys/mips/mips/elf_machdep.c projects/bsd_rdma_4_9/sys/mips/mips/exception.S projects/bsd_rdma_4_9/sys/mips/mips/freebsd32_machdep.c projects/bsd_rdma_4_9/sys/mips/mips/pm_machdep.c projects/bsd_rdma_4_9/sys/mips/rmi/rootfs_list.txt projects/bsd_rdma_4_9/sys/mips/rmi/xls_ehci.c projects/bsd_rdma_4_9/sys/modules/Makefile projects/bsd_rdma_4_9/sys/modules/cxgb/Makefile projects/bsd_rdma_4_9/sys/modules/cxgbe/t4_firmware/Makefile projects/bsd_rdma_4_9/sys/modules/cxgbe/t5_firmware/Makefile projects/bsd_rdma_4_9/sys/modules/cxgbe/t6_firmware/Makefile projects/bsd_rdma_4_9/sys/modules/dtrace/Makefile projects/bsd_rdma_4_9/sys/modules/dtrace/dtraceall/Makefile projects/bsd_rdma_4_9/sys/modules/dtrace/dtraceall/dtraceall.c projects/bsd_rdma_4_9/sys/modules/ntb/Makefile projects/bsd_rdma_4_9/sys/modules/nvme/Makefile projects/bsd_rdma_4_9/sys/modules/qlxgbe/Makefile projects/bsd_rdma_4_9/sys/modules/uart/Makefile projects/bsd_rdma_4_9/sys/net/ieee8023ad_lacp.c projects/bsd_rdma_4_9/sys/net/if.c projects/bsd_rdma_4_9/sys/net/if.h projects/bsd_rdma_4_9/sys/net/if_var.h projects/bsd_rdma_4_9/sys/net/if_vlan.c projects/bsd_rdma_4_9/sys/net/iflib.c projects/bsd_rdma_4_9/sys/net/iflib.h projects/bsd_rdma_4_9/sys/net/mp_ring.c projects/bsd_rdma_4_9/sys/net/route.h projects/bsd_rdma_4_9/sys/net80211/ieee80211_output.c projects/bsd_rdma_4_9/sys/netinet/in_pcb.c projects/bsd_rdma_4_9/sys/netinet/in_pcb.h projects/bsd_rdma_4_9/sys/netinet/sctp_input.c projects/bsd_rdma_4_9/sys/netinet/sctp_output.c projects/bsd_rdma_4_9/sys/netinet/sctp_pcb.c projects/bsd_rdma_4_9/sys/netinet/sctp_sysctl.c projects/bsd_rdma_4_9/sys/netinet/sctp_uio.h projects/bsd_rdma_4_9/sys/netinet/sctp_usrreq.c projects/bsd_rdma_4_9/sys/netinet/tcp_input.c projects/bsd_rdma_4_9/sys/netinet/tcp_stacks/fastpath.c projects/bsd_rdma_4_9/sys/netinet/tcp_timer.c projects/bsd_rdma_4_9/sys/netinet/tcp_var.h projects/bsd_rdma_4_9/sys/netinet6/sctp6_usrreq.c projects/bsd_rdma_4_9/sys/netipsec/ipsec.c projects/bsd_rdma_4_9/sys/netipsec/ipsec.h projects/bsd_rdma_4_9/sys/netipsec/ipsec6.h projects/bsd_rdma_4_9/sys/netipsec/ipsec_output.c projects/bsd_rdma_4_9/sys/netipsec/udpencap.c projects/bsd_rdma_4_9/sys/powerpc/conf/GENERIC projects/bsd_rdma_4_9/sys/powerpc/include/spr.h projects/bsd_rdma_4_9/sys/powerpc/mpc85xx/mpc85xx.c projects/bsd_rdma_4_9/sys/powerpc/powerpc/machdep.c projects/bsd_rdma_4_9/sys/riscv/conf/GENERIC projects/bsd_rdma_4_9/sys/riscv/riscv/machdep.c projects/bsd_rdma_4_9/sys/security/audit/audit.c projects/bsd_rdma_4_9/sys/sparc64/conf/GENERIC projects/bsd_rdma_4_9/sys/sys/blist.h projects/bsd_rdma_4_9/sys/sys/cdefs.h projects/bsd_rdma_4_9/sys/sys/consio.h projects/bsd_rdma_4_9/sys/sys/elf_common.h projects/bsd_rdma_4_9/sys/sys/gpio.h projects/bsd_rdma_4_9/sys/sys/gtaskqueue.h projects/bsd_rdma_4_9/sys/sys/mdioctl.h projects/bsd_rdma_4_9/sys/sys/param.h projects/bsd_rdma_4_9/sys/sys/smp.h projects/bsd_rdma_4_9/sys/sys/sockio.h projects/bsd_rdma_4_9/sys/sys/systm.h projects/bsd_rdma_4_9/sys/sys/vmmeter.h projects/bsd_rdma_4_9/sys/ufs/ffs/ffs_softdep.c projects/bsd_rdma_4_9/sys/ufs/ffs/fs.h projects/bsd_rdma_4_9/sys/vm/swap_pager.c projects/bsd_rdma_4_9/sys/vm/swap_pager.h projects/bsd_rdma_4_9/sys/vm/uma_core.c projects/bsd_rdma_4_9/sys/vm/vm_fault.c projects/bsd_rdma_4_9/sys/vm/vm_meter.c projects/bsd_rdma_4_9/sys/vm/vm_object.c projects/bsd_rdma_4_9/sys/vm/vm_object.h projects/bsd_rdma_4_9/sys/vm/vm_page.c projects/bsd_rdma_4_9/sys/vm/vm_page.h projects/bsd_rdma_4_9/sys/vm/vm_pageout.c projects/bsd_rdma_4_9/sys/vm/vm_pager.c projects/bsd_rdma_4_9/sys/vm/vm_phys.c projects/bsd_rdma_4_9/sys/vm/vm_phys.h projects/bsd_rdma_4_9/sys/x86/acpica/srat.c projects/bsd_rdma_4_9/sys/x86/cpufreq/hwpstate.c projects/bsd_rdma_4_9/sys/x86/include/apicreg.h projects/bsd_rdma_4_9/sys/x86/include/apicvar.h projects/bsd_rdma_4_9/sys/x86/include/specialreg.h projects/bsd_rdma_4_9/sys/x86/include/x86_var.h projects/bsd_rdma_4_9/sys/x86/iommu/intel_drv.c projects/bsd_rdma_4_9/sys/x86/pci/qpi.c projects/bsd_rdma_4_9/sys/x86/x86/identcpu.c projects/bsd_rdma_4_9/sys/x86/x86/io_apic.c projects/bsd_rdma_4_9/sys/x86/x86/mca.c projects/bsd_rdma_4_9/sys/x86/x86/mp_x86.c projects/bsd_rdma_4_9/targets/pseudo/userland/Makefile.depend projects/bsd_rdma_4_9/tools/build/mk/OptionalObsoleteFiles.inc projects/bsd_rdma_4_9/tools/build/options/WITHOUT_MAN_UTILS projects/bsd_rdma_4_9/tools/regression/sockets/accf_data_attach/accf_data_attach.c projects/bsd_rdma_4_9/tools/tools/nanobsd/embedded/common projects/bsd_rdma_4_9/usr.bin/Makefile projects/bsd_rdma_4_9/usr.bin/calendar/calendars/calendar.freebsd projects/bsd_rdma_4_9/usr.bin/calendar/calendars/calendar.holiday projects/bsd_rdma_4_9/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte projects/bsd_rdma_4_9/usr.bin/clang/Makefile.inc projects/bsd_rdma_4_9/usr.bin/grep/grep.c projects/bsd_rdma_4_9/usr.bin/grep/grep.h projects/bsd_rdma_4_9/usr.bin/grep/util.c projects/bsd_rdma_4_9/usr.bin/kdump/kdump.c projects/bsd_rdma_4_9/usr.bin/ktrdump/ktrdump.c projects/bsd_rdma_4_9/usr.bin/netstat/inet.c projects/bsd_rdma_4_9/usr.bin/netstat/main.c projects/bsd_rdma_4_9/usr.bin/netstat/netstat.1 projects/bsd_rdma_4_9/usr.bin/sockstat/sockstat.1 projects/bsd_rdma_4_9/usr.bin/sockstat/sockstat.c projects/bsd_rdma_4_9/usr.bin/su/su.1 projects/bsd_rdma_4_9/usr.bin/svn/lib/libsvn_client/Makefile projects/bsd_rdma_4_9/usr.bin/tail/extern.h projects/bsd_rdma_4_9/usr.bin/tail/tests/tail_test.sh projects/bsd_rdma_4_9/usr.bin/truss/extern.h projects/bsd_rdma_4_9/usr.bin/truss/setup.c projects/bsd_rdma_4_9/usr.bin/truss/syscall.h projects/bsd_rdma_4_9/usr.bin/truss/syscalls.c projects/bsd_rdma_4_9/usr.sbin/acpi/acpidb/Makefile projects/bsd_rdma_4_9/usr.sbin/acpi/acpidump/acpi.c projects/bsd_rdma_4_9/usr.sbin/acpi/iasl/Makefile projects/bsd_rdma_4_9/usr.sbin/autofs/auto_master.5 projects/bsd_rdma_4_9/usr.sbin/binmiscctl/binmiscctl.8 projects/bsd_rdma_4_9/usr.sbin/bsdinstall/partedit/gpart_ops.c projects/bsd_rdma_4_9/usr.sbin/bsdinstall/scripts/config projects/bsd_rdma_4_9/usr.sbin/camdd/camdd.c projects/bsd_rdma_4_9/usr.sbin/chown/tests/chown_test.sh projects/bsd_rdma_4_9/usr.sbin/crunch/crunchgen/crunched_main.c projects/bsd_rdma_4_9/usr.sbin/crunch/crunchgen/crunchgen.c projects/bsd_rdma_4_9/usr.sbin/crunch/examples/really-big.conf projects/bsd_rdma_4_9/usr.sbin/ctladm/ctladm.c projects/bsd_rdma_4_9/usr.sbin/cxgbetool/cxgbetool.c projects/bsd_rdma_4_9/usr.sbin/efivar/Makefile projects/bsd_rdma_4_9/usr.sbin/efivar/efivar.8 projects/bsd_rdma_4_9/usr.sbin/efivar/efivar.c projects/bsd_rdma_4_9/usr.sbin/i2c/i2c.c projects/bsd_rdma_4_9/usr.sbin/iovctl/iovctl.c projects/bsd_rdma_4_9/usr.sbin/makefs/mtree.c projects/bsd_rdma_4_9/usr.sbin/manctl/manctl.8 projects/bsd_rdma_4_9/usr.sbin/manctl/manctl.sh projects/bsd_rdma_4_9/usr.sbin/tcpdrop/tcpdrop.8 projects/bsd_rdma_4_9/usr.sbin/tcpdrop/tcpdrop.c projects/bsd_rdma_4_9/usr.sbin/vidcontrol/vidcontrol.1 projects/bsd_rdma_4_9/usr.sbin/vidcontrol/vidcontrol.c Directory Properties: projects/bsd_rdma_4_9/ (props changed) projects/bsd_rdma_4_9/cddl/ (props changed) projects/bsd_rdma_4_9/cddl/contrib/opensolaris/ (props changed) projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/bsd_rdma_4_9/contrib/binutils/ (props changed) projects/bsd_rdma_4_9/contrib/compiler-rt/ (props changed) projects/bsd_rdma_4_9/contrib/file/ (props changed) projects/bsd_rdma_4_9/contrib/libc++/ (props changed) projects/bsd_rdma_4_9/contrib/llvm/ (props changed) projects/bsd_rdma_4_9/contrib/llvm/tools/clang/ (props changed) projects/bsd_rdma_4_9/contrib/llvm/tools/lld/ (props changed) projects/bsd_rdma_4_9/contrib/llvm/tools/lldb/ (props changed) projects/bsd_rdma_4_9/contrib/netbsd-tests/ (props changed) projects/bsd_rdma_4_9/contrib/top/ (props changed) projects/bsd_rdma_4_9/contrib/unbound/ (props changed) projects/bsd_rdma_4_9/contrib/zlib/ (props changed) projects/bsd_rdma_4_9/contrib/zstd/ (props changed) projects/bsd_rdma_4_9/gnu/usr.bin/binutils/ (props changed) projects/bsd_rdma_4_9/lib/libedit/ (props changed) projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/ (props changed) projects/bsd_rdma_4_9/sys/contrib/dev/acpica/ (props changed) projects/bsd_rdma_4_9/sys/contrib/ipfilter/ (props changed) Modified: projects/bsd_rdma_4_9/Makefile.inc1 ============================================================================== --- projects/bsd_rdma_4_9/Makefile.inc1 Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/Makefile.inc1 Wed Sep 13 19:12:28 2017 (r323560) @@ -557,7 +557,7 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - MK_GDB=no MK_TESTS=no + MK_GDB=no MK_LLD_IS_LD=${MK_LLD_BOOTSTRAP} MK_TESTS=no # kernel-tools stage KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -1786,7 +1786,8 @@ update: .PHONY # ELF Tool Chain libraries are needed for ELF tools and dtrace tools. # r296685 fix cross-endian objcopy -.if ${BOOTSTRAPPING} < 1100102 +# r310724 fixed PR 215350, a crash in libdwarf with objects built by GCC 6.2. +.if ${BOOTSTRAPPING} < 1200020 _elftoolchain_libs= lib/libelf lib/libdwarf .endif @@ -1984,8 +1985,12 @@ _gcc_tools= gnu/usr.bin/cc/cc_tools _rescue=rescue/rescue .endif +.if ${MK_TCSH} != "no" +_tcsh=bin/csh +.endif + .for _tool in \ - bin/csh \ + ${_tcsh} \ bin/sh \ ${LOCAL_TOOL_DIRS} \ lib/ncurses/ncurses \ @@ -2143,7 +2148,7 @@ native-xtools: .PHONY bin/cat \ bin/chmod \ bin/cp \ - bin/csh \ + ${_tcsh} \ bin/echo \ bin/expr \ bin/hostname \ Modified: projects/bsd_rdma_4_9/ObsoleteFiles.inc ============================================================================== --- projects/bsd_rdma_4_9/ObsoleteFiles.inc Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/ObsoleteFiles.inc Wed Sep 13 19:12:28 2017 (r323560) @@ -38,6 +38,13 @@ # xargs -n1 | sort | uniq -d; # done +# 20170913: remove unneeded catman utility +OLD_FILES+=etc/periodic/weekly/330.catman +OLD_FILES+=usr/bin/catman +OLD_FILES+=usr/libexec/catman.local +OLD_FILES+=usr/share/man/man1/catman.1.gz +OLD_FILES+=usr/share/man/man8/catman.local.8.gz + # 20170802: ksyms(4) ioctl interface was removed OLD_FILES+=usr/include/sys/ksyms.h Modified: projects/bsd_rdma_4_9/UPDATING ============================================================================== --- projects/bsd_rdma_4_9/UPDATING Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/UPDATING Wed Sep 13 19:12:28 2017 (r323560) @@ -51,6 +51,29 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: ****************************** SPECIAL WARNING: ****************************** +20170912: + The default serial number format for CTL LUNs has changed. This will + affect users who use /dev/diskid/* device nodes, or whose FibreChannel + or iSCSI clients care about their LUNs' serial numbers. Users who + require serial number stability should hardcode serial numbers in + /etc/ctl.conf . + +20170912: + For 32-bit arm compiled for hard-float support, soft-floating point + binaries now always get their shared libraries from + LD_SOFT_LIBRARY_PATH (in the past, this was only used if + /usr/libsoft also existed). Only users with a hard-float ld.so, but + soft-float everything else should be affected. + +20170826: + During boot the geli passphrase will be hidden. To restore previous + behavior see geli(8) configuration options. + +20170825: + Move PMTUD blackhole counters to TCPSTATS and remove them from bare + sysctl values. Minor nit, but requires a rebuild of both world/kernel + to complete. + 20170814: "make check" behavior (made in ^/head@r295380) has been changed to execute from a limited sandbox, as opposed to executing from Modified: projects/bsd_rdma_4_9/bin/chflags/Makefile ============================================================================== --- projects/bsd_rdma_4_9/bin/chflags/Makefile Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/bin/chflags/Makefile Wed Sep 13 19:12:28 2017 (r323560) @@ -4,4 +4,7 @@ PACKAGE=runtime PROG= chflags +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include Modified: projects/bsd_rdma_4_9/bin/dd/args.c ============================================================================== --- projects/bsd_rdma_4_9/bin/dd/args.c Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/bin/dd/args.c Wed Sep 13 19:12:28 2017 (r323560) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include @@ -184,7 +185,7 @@ f_bs(char *arg) res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "bs must be between 1 and %jd", (intmax_t)SSIZE_MAX); + errx(1, "bs must be between 1 and %zd", (ssize_t)SSIZE_MAX); in.dbsz = out.dbsz = (size_t)res; } @@ -195,22 +196,22 @@ f_cbs(char *arg) res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "cbs must be between 1 and %jd", (intmax_t)SSIZE_MAX); + errx(1, "cbs must be between 1 and %zd", (ssize_t)SSIZE_MAX); cbsz = (size_t)res; } static void f_count(char *arg) { - intmax_t res; + uintmax_t res; - res = (intmax_t)get_num(arg); - if (res < 0) - errx(1, "count cannot be negative"); + res = get_num(arg); + if (res == UINTMAX_MAX) + errc(1, ERANGE, "%s", oper); if (res == 0) - cpy_cnt = (uintmax_t)-1; + cpy_cnt = UINTMAX_MAX; else - cpy_cnt = (uintmax_t)res; + cpy_cnt = res; } static void @@ -219,7 +220,7 @@ f_files(char *arg) files_cnt = get_num(arg); if (files_cnt < 1) - errx(1, "files must be between 1 and %jd", (uintmax_t)-1); + errx(1, "files must be between 1 and %zu", SIZE_MAX); } static void @@ -240,8 +241,8 @@ f_ibs(char *arg) if (!(ddflags & C_BS)) { res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "ibs must be between 1 and %jd", - (intmax_t)SSIZE_MAX); + errx(1, "ibs must be between 1 and %zd", + (ssize_t)SSIZE_MAX); in.dbsz = (size_t)res; } } @@ -261,8 +262,8 @@ f_obs(char *arg) if (!(ddflags & C_BS)) { res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "obs must be between 1 and %jd", - (intmax_t)SSIZE_MAX); + errx(1, "obs must be between 1 and %zd", + (ssize_t)SSIZE_MAX); out.dbsz = (size_t)res; } } Modified: projects/bsd_rdma_4_9/bin/dd/conv.c ============================================================================== --- projects/bsd_rdma_4_9/bin/dd/conv.c Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/bin/dd/conv.c Wed Sep 13 19:12:28 2017 (r323560) @@ -133,7 +133,7 @@ block(void) */ ch = 0; for (inp = in.dbp - in.dbcnt, outp = out.dbp; in.dbcnt;) { - maxlen = MIN(cbsz, in.dbcnt); + maxlen = MIN(cbsz, (size_t)in.dbcnt); if ((t = ctab) != NULL) for (cnt = 0; cnt < maxlen && (ch = *inp++) != '\n'; ++cnt) @@ -146,7 +146,7 @@ block(void) * Check for short record without a newline. Reassemble the * input block. */ - if (ch != '\n' && in.dbcnt < cbsz) { + if (ch != '\n' && (size_t)in.dbcnt < cbsz) { (void)memmove(in.db, in.dbp - in.dbcnt, in.dbcnt); break; } @@ -228,7 +228,7 @@ unblock(void) * translation has to already be done or we might not recognize the * spaces. */ - for (inp = in.db; in.dbcnt >= cbsz; inp += cbsz, in.dbcnt -= cbsz) { + for (inp = in.db; (size_t)in.dbcnt >= cbsz; inp += cbsz, in.dbcnt -= cbsz) { for (t = inp + cbsz - 1; t >= inp && *t == ' '; --t) ; if (t >= inp) { Modified: projects/bsd_rdma_4_9/bin/dd/dd.c ============================================================================== --- projects/bsd_rdma_4_9/bin/dd/dd.c Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/bin/dd/dd.c Wed Sep 13 19:12:28 2017 (r323560) @@ -204,10 +204,10 @@ setup(void) * record oriented I/O, only need a single buffer. */ if (!(ddflags & (C_BLOCK | C_UNBLOCK))) { - if ((in.db = malloc(out.dbsz + in.dbsz - 1)) == NULL) + if ((in.db = malloc((size_t)out.dbsz + in.dbsz - 1)) == NULL) err(1, "input buffer"); out.db = in.db; - } else if ((in.db = malloc(MAX(in.dbsz, cbsz) + cbsz)) == NULL || + } else if ((in.db = malloc(MAX((size_t)in.dbsz, cbsz) + cbsz)) == NULL || (out.db = malloc(out.dbsz + cbsz)) == NULL) err(1, "output buffer"); @@ -405,7 +405,7 @@ dd_in(void) ++st.in_full; /* Handle full input blocks. */ - } else if ((size_t)n == in.dbsz) { + } else if ((size_t)n == (size_t)in.dbsz) { in.dbcnt += in.dbrcnt = n; ++st.in_full; @@ -562,7 +562,7 @@ dd_out(int force) outp += nw; st.bytes += nw; - if ((size_t)nw == n && n == out.dbsz) + if ((size_t)nw == n && n == (size_t)out.dbsz) ++st.out_full; else ++st.out_part; Modified: projects/bsd_rdma_4_9/bin/dd/dd.h ============================================================================== --- projects/bsd_rdma_4_9/bin/dd/dd.h Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/bin/dd/dd.h Wed Sep 13 19:12:28 2017 (r323560) @@ -38,10 +38,9 @@ typedef struct { u_char *db; /* buffer address */ u_char *dbp; /* current buffer I/O address */ - /* XXX ssize_t? */ - size_t dbcnt; /* current buffer byte count */ - size_t dbrcnt; /* last read byte count */ - size_t dbsz; /* block size */ + ssize_t dbcnt; /* current buffer byte count */ + ssize_t dbrcnt; /* last read byte count */ + ssize_t dbsz; /* block size */ #define ISCHR 0x01 /* character device (warn on short) */ #define ISPIPE 0x02 /* pipe-like (see position.c) */ Modified: projects/bsd_rdma_4_9/bin/dd/position.c ============================================================================== --- projects/bsd_rdma_4_9/bin/dd/position.c Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/bin/dd/position.c Wed Sep 13 19:12:28 2017 (r323560) @@ -207,7 +207,7 @@ pos_out(void) n = write(out.fd, out.db, out.dbsz); if (n == -1) err(1, "%s", out.name); - if ((size_t)n != out.dbsz) + if (n != out.dbsz) errx(1, "%s: write failure", out.name); } break; Modified: projects/bsd_rdma_4_9/bin/mkdir/Makefile ============================================================================== --- projects/bsd_rdma_4_9/bin/mkdir/Makefile Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/bin/mkdir/Makefile Wed Sep 13 19:12:28 2017 (r323560) @@ -4,4 +4,7 @@ PACKAGE=runtime PROG= mkdir +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include Modified: projects/bsd_rdma_4_9/bin/pkill/pkill.c ============================================================================== --- projects/bsd_rdma_4_9/bin/pkill/pkill.c Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/bin/pkill/pkill.c Wed Sep 13 19:12:28 2017 (r323560) @@ -568,7 +568,7 @@ main(int argc, char **argv) continue; rv |= (*action)(kp); } - if (rv && pgrep) + if (rv && pgrep && !quiet) putchar('\n'); if (!did_action && !pgrep && longfmt) fprintf(stderr, Modified: projects/bsd_rdma_4_9/bin/ps/print.c ============================================================================== --- projects/bsd_rdma_4_9/bin/ps/print.c Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/bin/ps/print.c Wed Sep 13 19:12:28 2017 (r323560) @@ -262,9 +262,9 @@ state(KINFO *k, VARENT *ve __unused) cp++; if (!(flag & P_INMEM)) *cp++ = 'W'; - if (k->ki_p->ki_nice < NZERO) + if (k->ki_p->ki_nice < NZERO || k->ki_p->ki_pri.pri_class == PRI_REALTIME) *cp++ = '<'; - else if (k->ki_p->ki_nice > NZERO) + else if (k->ki_p->ki_nice > NZERO || k->ki_p->ki_pri.pri_class == PRI_IDLE) *cp++ = 'N'; if (flag & P_TRACED) *cp++ = 'X'; @@ -274,6 +274,8 @@ state(KINFO *k, VARENT *ve __unused) *cp++ = 'V'; if ((flag & P_SYSTEM) || k->ki_p->ki_lock > 0) *cp++ = 'L'; + if ((k->ki_p->ki_cr_flags & CRED_FLAG_CAPMODE) != 0) + *cp++ = 'C'; if (k->ki_p->ki_kiflag & KI_SLEADER) *cp++ = 's'; if ((flag & P_CONTROLT) && k->ki_p->ki_pgid == k->ki_p->ki_tpgid) Modified: projects/bsd_rdma_4_9/bin/ps/ps.1 ============================================================================== --- projects/bsd_rdma_4_9/bin/ps/ps.1 Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/bin/ps/ps.1 Wed Sep 13 19:12:28 2017 (r323560) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd July 25, 2017 +.Dd September 7, 2017 .Dt PS 1 .Os .Sh NAME @@ -436,6 +436,10 @@ information: The process is in the foreground process group of its control terminal. .It Li < The process has raised CPU scheduling priority. +.It Li C +The process is in +.Xr capsicum 4 +capability mode. .It Li E The process is trying to exit. .It Li J @@ -541,7 +545,7 @@ short-term CPU usage factor (for scheduling) .It Cm dsiz data size (in Kbytes) .It Cm emul -system-call emulation environment +system-call emulation environment (ABI) .It Cm etime elapsed running time, format .Op days- Ns Modified: projects/bsd_rdma_4_9/bin/rcp/Makefile ============================================================================== --- projects/bsd_rdma_4_9/bin/rcp/Makefile Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/bin/rcp/Makefile Wed Sep 13 19:12:28 2017 (r323560) @@ -11,4 +11,7 @@ PACKAGE=rcmds BINOWN= root BINMODE=4555 +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include Modified: projects/bsd_rdma_4_9/bin/rmdir/Makefile ============================================================================== --- projects/bsd_rdma_4_9/bin/rmdir/Makefile Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/bin/rmdir/Makefile Wed Sep 13 19:12:28 2017 (r323560) @@ -4,4 +4,7 @@ PACKAGE=runtime PROG= rmdir +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include Modified: projects/bsd_rdma_4_9/cddl/compat/opensolaris/misc/zmount.c ============================================================================== --- projects/bsd_rdma_4_9/cddl/compat/opensolaris/misc/zmount.c Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/cddl/compat/opensolaris/misc/zmount.c Wed Sep 13 19:12:28 2017 (r323560) @@ -74,7 +74,7 @@ zmount(const char *spec, const char *dir, int mflag, c char *dataptr, int datalen, char *optptr, int optlen) { struct iovec *iov; - char *optstr, *os, *p; + char *optstr, *os, *p, *tofree; int iovlen, rv; assert(spec != NULL); @@ -87,7 +87,7 @@ zmount(const char *spec, const char *dir, int mflag, c assert(optptr != NULL); assert(optlen > 0); - optstr = strdup(optptr); + tofree = optstr = strdup(optptr); assert(optstr != NULL); iov = NULL; @@ -98,11 +98,9 @@ zmount(const char *spec, const char *dir, int mflag, c build_iovec(&iov, &iovlen, "fspath", __DECONST(char *, dir), (size_t)-1); build_iovec(&iov, &iovlen, "from", __DECONST(char *, spec), (size_t)-1); - for (p = optstr; p != NULL; strsep(&p, ",/ ")) { - if (*p != '\0') - build_iovec(&iov, &iovlen, p, NULL, (size_t)-1); - } + while ((p = strsep(&optstr, ",/")) != NULL) + build_iovec(&iov, &iovlen, p, NULL, (size_t)-1); rv = nmount(iov, iovlen, 0); - free(optstr); + free(tofree); return (rv); } Modified: projects/bsd_rdma_4_9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d ============================================================================== --- projects/bsd_rdma_4_9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d Wed Sep 13 19:12:28 2017 (r323560) @@ -28,9 +28,6 @@ #pragma D option quiet -inline int AF_INET = 2; -inline int AF_INET6 = 28; - in_addr_t *ip4a; in_addr_t *ip4b; in_addr_t *ip4c; Copied: projects/bsd_rdma_4_9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d (from r323558, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d Wed Sep 13 19:12:28 2017 (r323560, copy of r323558, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d) @@ -0,0 +1,25 @@ +/* + * This file and its contents are supplied under the terms of the + * Common Development and Distribution License ("CDDL"), version 1.0. + * You may only use this file in accordance with the terms version + * 1.0 of the CDDL. + * + * A full copy of the text of the CDDL should have accompanied this + * source. A copy of the CDDL is also available via the Internet at + * http://www.illumos.org/license/CDDL. + */ + +/* + * Copyright 2017 Mark Johnston + */ + +/* + * A regression test for FreeBSD r322773. 100^9 fits in 64 bits, but + * llquantize() will create buckets up to 100^{10}, which does not fit. + */ + +BEGIN +{ + @ = llquantize(0, 100, 0, 9, 100); + exit(0); +} Modified: projects/bsd_rdma_4_9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 ============================================================================== --- projects/bsd_rdma_4_9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Wed Sep 13 19:12:28 2017 (r323560) @@ -19,14 +19,15 @@ .\" information: Portions Copyright [yyyy] [name of copyright owner] .\" .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved. -.\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved. .\" Copyright (c) 2011, Justin T. Gibbs -.\" Copyright (c) 2013 by Delphix. All Rights Reserved. .\" Copyright (c) 2012, Glen Barber +.\" Copyright (c) 2013 by Delphix. All Rights Reserved. +.\" Copyright 2017 Nexenta Systems, Inc. +.\" Copyright (c) 2017 Datto Inc. .\" .\" $FreeBSD$ .\" -.Dd July 26, 2014 +.Dd September 08, 2017 .Dt ZPOOL 8 .Os .Sh NAME @@ -153,7 +154,7 @@ .Op Ar new_device .Nm .Cm scrub -.Op Fl s +.Op Fl s | Fl p .Ar pool ... .Nm .Cm set @@ -1543,42 +1544,53 @@ manner. .It Xo .Nm .Cm scrub -.Op Fl s +.Op Fl s | Fl p .Ar pool ... .Xc .Pp -Begins a scrub. The scrub examines all data in the specified pools to verify -that it checksums correctly. For replicated (mirror or -.No raidz ) -devices, -.Tn ZFS -automatically repairs any damage discovered during the scrub. The -.Qq Nm Cm status +Begins a scrub or resumes a paused scrub. +The scrub examines all data in the specified pools to verify that it checksums +correctly. +For replicated +.Pq mirror or raidz +devices, ZFS automatically repairs any damage discovered during the scrub. +The +.Nm zpool Cm status command reports the progress of the scrub and summarizes the results of the scrub upon completion. .Pp -Scrubbing and resilvering are very similar operations. The difference is that -resilvering only examines data that -.Tn ZFS -knows to be out of date (for example, when attaching a new device to a mirror -or replacing an existing device), whereas scrubbing examines all data to -discover silent errors due to hardware faults or disk failure. +Scrubbing and resilvering are very similar operations. +The difference is that resilvering only examines data that ZFS knows to be out +of date +.Po +for example, when attaching a new device to a mirror or replacing an existing +device +.Pc , +whereas scrubbing examines all data to discover silent errors due to hardware +faults or disk failure. .Pp -Because scrubbing and resilvering are -.Tn I/O Ns -intensive -operations, -.Tn ZFS -only allows one at a time. If a scrub is already in progress, the -.Qq Nm Cm scrub -command returns an error. To start a new scrub, you have to stop the old scrub -with the -.Qq Nm Cm scrub Fl s -command first. If a resilver is in progress, -.Tn ZFS -does not allow a scrub to be started until the resilver completes. -.Bl -tag -width indent +Because scrubbing and resilvering are I/O-intensive operations, ZFS only allows +one at a time. +If a scrub is paused, the +.Nm zpool Cm scrub +resumes it. +If a resilver is in progress, ZFS does not allow a scrub to be started until the +resilver completes. +.Bl -tag -width Ds .It Fl s Stop scrubbing. +.El +.Bl -tag -width Ds +.It Fl p +Pause scrubbing. +Scrub pause state and progress are periodically synced to disk. +If the system is restarted or pool is exported during a paused scrub, +even after import, scrub will remain paused until it is resumed. +Once resumed the scrub will pick up from the place where it was last +checkpointed to disk. +To resume a paused scrub issue +.Nm zpool Cm scrub +again. .El .It Xo .Nm Modified: projects/bsd_rdma_4_9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/bsd_rdma_4_9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Wed Sep 13 19:12:28 2017 (r323560) @@ -27,6 +27,7 @@ * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved. * Copyright 2016 Igor Kozhukhov . * Copyright 2016 Nexenta Systems, Inc. + * Copyright (c) 2017 Datto Inc. */ #include @@ -252,7 +253,7 @@ get_usage(zpool_help_t idx) case HELP_REOPEN: return (gettext("\treopen \n")); case HELP_SCRUB: - return (gettext("\tscrub [-s] ...\n")); + return (gettext("\tscrub [-s | -p] ...\n")); case HELP_STATUS: return (gettext("\tstatus [-vx] [-T d|u] [pool] ... [interval " "[count]]\n")); @@ -3825,6 +3826,7 @@ typedef struct scrub_cbdata { int cb_type; int cb_argc; char **cb_argv; + pool_scrub_cmd_t cb_scrub_cmd; } scrub_cbdata_t; int @@ -3842,15 +3844,16 @@ scrub_callback(zpool_handle_t *zhp, void *data) return (1); } - err = zpool_scan(zhp, cb->cb_type); + err = zpool_scan(zhp, cb->cb_type, cb->cb_scrub_cmd); return (err != 0); } /* - * zpool scrub [-s] ... + * zpool scrub [-s | -p] ... * * -s Stop. Stops any in-progress scrub. + * -p Pause. Pause in-progress scrub. */ int zpool_do_scrub(int argc, char **argv) @@ -3859,13 +3862,17 @@ zpool_do_scrub(int argc, char **argv) scrub_cbdata_t cb; cb.cb_type = POOL_SCAN_SCRUB; + cb.cb_scrub_cmd = POOL_SCRUB_NORMAL; /* check options */ - while ((c = getopt(argc, argv, "s")) != -1) { + while ((c = getopt(argc, argv, "sp")) != -1) { switch (c) { case 's': cb.cb_type = POOL_SCAN_NONE; break; + case 'p': + cb.cb_scrub_cmd = POOL_SCRUB_PAUSE; + break; case '?': (void) fprintf(stderr, gettext("invalid option '%c'\n"), optopt); @@ -3873,6 +3880,13 @@ zpool_do_scrub(int argc, char **argv) } } + if (cb.cb_type == POOL_SCAN_NONE && + cb.cb_scrub_cmd == POOL_SCRUB_PAUSE) { + (void) fprintf(stderr, gettext("invalid option combination: " + "-s and -p are mutually exclusive\n")); + usage(B_FALSE); + } + cb.cb_argc = argc; cb.cb_argv = argv; argc -= optind; @@ -3901,7 +3915,7 @@ typedef struct status_cbdata { void print_scan_status(pool_scan_stat_t *ps) { - time_t start, end; + time_t start, end, pause; uint64_t elapsed, mins_left, hours_left; uint64_t pass_exam, examined, total; uint_t rate; @@ -3919,6 +3933,7 @@ print_scan_status(pool_scan_stat_t *ps) start = ps->pss_start_time; end = ps->pss_end_time; + pause = ps->pss_pass_scrub_pause; zfs_nicenum(ps->pss_processed, processed_buf, sizeof (processed_buf)); assert(ps->pss_func == POOL_SCAN_SCRUB || @@ -3961,8 +3976,17 @@ print_scan_status(pool_scan_stat_t *ps) * Scan is in progress. */ if (ps->pss_func == POOL_SCAN_SCRUB) { - (void) printf(gettext("scrub in progress since %s"), - ctime(&start)); + if (pause == 0) { + (void) printf(gettext("scrub in progress since %s"), + ctime(&start)); + } else { + char buf[32]; + struct tm *p = localtime(&pause); + (void) strftime(buf, sizeof (buf), "%a %b %e %T %Y", p); + (void) printf(gettext("scrub paused since %s\n"), buf); + (void) printf(gettext("\tscrub started on %s"), + ctime(&start)); + } } else if (ps->pss_func == POOL_SCAN_RESILVER) { (void) printf(gettext("resilver in progress since %s"), ctime(&start)); @@ -3974,6 +3998,7 @@ print_scan_status(pool_scan_stat_t *ps) /* elapsed time for this pass */ elapsed = time(NULL) - ps->pss_pass_start; + elapsed -= ps->pss_pass_scrub_spent_paused; elapsed = elapsed ? elapsed : 1; pass_exam = ps->pss_pass_exam ? ps->pss_pass_exam : 1; rate = pass_exam / elapsed; @@ -3983,19 +4008,25 @@ print_scan_status(pool_scan_stat_t *ps) zfs_nicenum(examined, examined_buf, sizeof (examined_buf)); zfs_nicenum(total, total_buf, sizeof (total_buf)); - zfs_nicenum(rate, rate_buf, sizeof (rate_buf)); /* * do not print estimated time if hours_left is more than 30 days + * or we have a paused scrub */ - (void) printf(gettext(" %s scanned out of %s at %s/s"), - examined_buf, total_buf, rate_buf); - if (hours_left < (30 * 24)) { - (void) printf(gettext(", %lluh%um to go\n"), - (u_longlong_t)hours_left, (uint_t)(mins_left % 60)); + if (pause == 0) { + zfs_nicenum(rate, rate_buf, sizeof (rate_buf)); + (void) printf(gettext("\t%s scanned out of %s at %s/s"), + examined_buf, total_buf, rate_buf); + if (hours_left < (30 * 24)) { + (void) printf(gettext(", %lluh%um to go\n"), + (u_longlong_t)hours_left, (uint_t)(mins_left % 60)); + } else { + (void) printf(gettext( + ", (scan is slow, no estimated time)\n")); + } } else { - (void) printf(gettext( - ", (scan is slow, no estimated time)\n")); + (void) printf(gettext("\t%s scanned out of %s\n"), + examined_buf, total_buf); } if (ps->pss_func == POOL_SCAN_RESILVER) { Modified: projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c ============================================================================== --- projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c Wed Sep 13 19:12:28 2017 (r323560) @@ -1503,7 +1503,7 @@ dt_compile_agg(dtrace_hdl_t *dtp, dt_node_t *dnp, dtra "divide a power of the factor\n"); } - for (i = 0, order = 1; i < args[2].value; i++) { + for (i = 0, order = 1; i <= args[2].value + 1; i++) { if (order * args[0].value > order) { order *= args[0].value; continue; @@ -1511,7 +1511,7 @@ dt_compile_agg(dtrace_hdl_t *dtp, dt_node_t *dnp, dtra dnerror(dnp, D_LLQUANT_MAGTOOBIG, "llquantize( ) " "factor (%d) raised to power of high magnitude " - "(%d) overflows 64-bits\n", args[0].value, + "(%d) plus 1 overflows 64-bits\n", args[0].value, args[2].value); } Modified: projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Wed Sep 13 19:12:28 2017 (r323560) @@ -963,7 +963,7 @@ dt_provmod_open(dt_provmod_t **provmod, dt_fdlist_t *d (void) snprintf(path, sizeof (path), "/dev/dtrace/%s", p1); - if ((fd = open(path, O_RDONLY)) == -1) + if ((fd = open(path, O_RDONLY | O_CLOEXEC)) == -1) continue; /* failed to open driver; just skip it */ if (((prov = malloc(sizeof (dt_provmod_t))) == NULL) || @@ -1100,7 +1100,7 @@ dt_vopen(int version, int flags, int *errp, */ dt_provmod_open(&provmod, &df); - dtfd = open("/dev/dtrace/dtrace", O_RDWR); + dtfd = open("/dev/dtrace/dtrace", O_RDWR | O_CLOEXEC); err = errno; /* save errno from opening dtfd */ #if defined(__FreeBSD__) /* @@ -1109,14 +1109,14 @@ dt_vopen(int version, int flags, int *errp, */ if (err == ENOENT && modfind("dtraceall") < 0) { kldload("dtraceall"); /* ignore the error */ - dtfd = open("/dev/dtrace/dtrace", O_RDWR); + dtfd = open("/dev/dtrace/dtrace", O_RDWR | O_CLOEXEC); err = errno; } #endif #ifdef illumos ftfd = open("/dev/dtrace/provider/fasttrap", O_RDWR); #else - ftfd = open("/dev/dtrace/fasttrap", O_RDWR); + ftfd = open("/dev/dtrace/fasttrap", O_RDWR | O_CLOEXEC); #endif fterr = ftfd == -1 ? errno : 0; /* save errno from open ftfd */ @@ -1145,9 +1145,6 @@ dt_vopen(int version, int flags, int *errp, } return (set_open_errno(dtp, errp, err)); } - - (void) fcntl(dtfd, F_SETFD, FD_CLOEXEC); - (void) fcntl(ftfd, F_SETFD, FD_CLOEXEC); alloc: if ((dtp = malloc(sizeof (dtrace_hdl_t))) == NULL) { Modified: projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Wed Sep 13 19:12:28 2017 (r323560) @@ -28,6 +28,7 @@ * Copyright (c) 2013 Steven Hartland. All rights reserved. * Copyright (c) 2014 Integros [integros.com] * Copyright 2016 Nexenta Systems, Inc. + * Copyright (c) 2017 Datto Inc. */ #ifndef _LIBZFS_H @@ -129,6 +130,7 @@ typedef enum zfs_error { EZFS_DIFF, /* general failure of zfs diff */ EZFS_DIFFDATA, /* bad zfs diff data */ EZFS_POOLREADONLY, /* pool is in read-only mode */ + EZFS_SCRUB_PAUSED, /* scrub currently paused */ EZFS_UNKNOWN } zfs_error_t; @@ -241,7 +243,7 @@ typedef struct splitflags { /* * Functions to manipulate pool and vdev state */ -extern int zpool_scan(zpool_handle_t *, pool_scan_func_t); +extern int zpool_scan(zpool_handle_t *, pool_scan_func_t, pool_scrub_cmd_t); extern int zpool_clear(zpool_handle_t *, const char *, nvlist_t *); extern int zpool_reguid(zpool_handle_t *); extern int zpool_reopen(zpool_handle_t *); @@ -772,6 +774,7 @@ extern int zpool_in_use(libzfs_handle_t *, int, pool_s * Label manipulation. */ extern int zpool_read_label(int, nvlist_t **); +extern int zpool_read_all_labels(int, nvlist_t **); extern int zpool_clear_label(int); /* is this zvol valid for use as a dump device? */ Modified: projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c ============================================================================== --- projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Wed Sep 13 19:12:28 2017 (r323560) @@ -914,6 +914,65 @@ zpool_read_label(int fd, nvlist_t **config) return (0); } +/* + * Given a file descriptor, read the label information and return an nvlist + * describing the configuration, if there is one. + * returns the number of valid labels found + */ +int +zpool_read_all_labels(int fd, nvlist_t **config) +{ + struct stat64 statbuf; + int l; + vdev_label_t *label; + uint64_t state, txg, size; + int nlabels = 0; + + *config = NULL; + + if (fstat64(fd, &statbuf) == -1) + return (0); + size = P2ALIGN_TYPED(statbuf.st_size, sizeof (vdev_label_t), uint64_t); + + if ((label = malloc(sizeof (vdev_label_t))) == NULL) + return (0); + + for (l = 0; l < VDEV_LABELS; l++) { + nvlist_t *temp = NULL; + + /* TODO: use aio_read so we can read al 4 labels in parallel */ + if (pread64(fd, label, sizeof (vdev_label_t), + label_offset(size, l)) != sizeof (vdev_label_t)) + continue; + + if (nvlist_unpack(label->vl_vdev_phys.vp_nvlist, + sizeof (label->vl_vdev_phys.vp_nvlist), &temp, 0) != 0) + continue; + + if (nvlist_lookup_uint64(temp, ZPOOL_CONFIG_POOL_STATE, + &state) != 0 || state > POOL_STATE_L2CACHE) { + nvlist_free(temp); + temp = NULL; + continue; + } + + if (state != POOL_STATE_SPARE && state != POOL_STATE_L2CACHE && + (nvlist_lookup_uint64(temp, ZPOOL_CONFIG_POOL_TXG, + &txg) != 0 || txg == 0)) { + nvlist_free(temp); + temp = NULL; + continue; + } + if (temp) + *config = temp; + + nlabels++; + } + + free(label); + return (nlabels); +} + typedef struct rdsk_node { char *rn_name; int rn_dfd; Modified: projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c ============================================================================== --- projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Wed Sep 13 19:12:28 2017 (r323560) @@ -20,9 +20,11 @@ */ /* + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014 by Delphix. All rights reserved. * Copyright 2016 Igor Kozhukhov + * Copyright 2017 RackTop Systems. */ /* @@ -87,7 +89,7 @@ zfs_share_type_t zfs_is_shared_proto(zfs_handle_t *, c zfs_share_proto_t); /* - * The share protocols table must be in the same order as the zfs_share_prot_t + * The share protocols table must be in the same order as the zfs_share_proto_t * enum in libzfs_impl.h */ typedef struct { @@ -872,7 +874,7 @@ unshare_one(libzfs_handle_t *hdl, const char *name, co /* make sure libshare initialized */ if ((err = zfs_init_libshare(hdl, SA_INIT_SHARE_API)) != SA_OK) { free(mntpt); /* don't need the copy anymore */ - return (zfs_error_fmt(hdl, EZFS_SHARENFSFAILED, + return (zfs_error_fmt(hdl, proto_table[proto].p_unshare_err, dgettext(TEXT_DOMAIN, "cannot unshare '%s': %s"), name, _sa_errorstr(err))); } @@ -883,12 +885,13 @@ unshare_one(libzfs_handle_t *hdl, const char *name, co if (share != NULL) { err = zfs_sa_disable_share(share, proto_table[proto].p_name); if (err != SA_OK) { - return (zfs_error_fmt(hdl, EZFS_UNSHARENFSFAILED, + return (zfs_error_fmt(hdl, + proto_table[proto].p_unshare_err, dgettext(TEXT_DOMAIN, "cannot unshare '%s': %s"), name, _sa_errorstr(err))); } } else { - return (zfs_error_fmt(hdl, EZFS_UNSHARENFSFAILED, + return (zfs_error_fmt(hdl, proto_table[proto].p_unshare_err, dgettext(TEXT_DOMAIN, "cannot unshare '%s': not found"), name)); } Modified: projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c ============================================================================== --- projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Wed Sep 13 19:11:52 2017 (r323559) +++ projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Wed Sep 13 19:12:28 2017 (r323560) @@ -25,6 +25,7 @@ * Copyright (c) 2013, Joyent, Inc. All rights reserved. * Copyright 2016 Nexenta Systems, Inc. * Copyright 2016 Igor Kozhukhov + * Copyright (c) 2017 Datto Inc. */ #include @@ -1841,22 +1842,39 @@ zpool_import_props(libzfs_handle_t *hdl, nvlist_t *con * Scan the pool. */ int -zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func) +zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func, pool_scrub_cmd_t cmd) { zfs_cmd_t zc = { 0 }; char msg[1024]; + int err; libzfs_handle_t *hdl = zhp->zpool_hdl; (void) strlcpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name)); zc.zc_cookie = func; + zc.zc_flags = cmd; - if (zfs_ioctl(hdl, ZFS_IOC_POOL_SCAN, &zc) == 0 || - (errno == ENOENT && func != POOL_SCAN_NONE)) + if (zfs_ioctl(hdl, ZFS_IOC_POOL_SCAN, &zc) == 0) return (0); + err = errno; + + /* ECANCELED on a scrub means we resumed a paused scrub */ + if (err == ECANCELED && func == POOL_SCAN_SCRUB && + cmd == POOL_SCRUB_NORMAL) + return (0); + + if (err == ENOENT && func != POOL_SCAN_NONE && cmd == POOL_SCRUB_NORMAL) + return (0); + if (func == POOL_SCAN_SCRUB) { - (void) snprintf(msg, sizeof (msg), - dgettext(TEXT_DOMAIN, "cannot scrub %s"), zc.zc_name); + if (cmd == POOL_SCRUB_PAUSE) { + (void) snprintf(msg, sizeof (msg), dgettext(TEXT_DOMAIN, + "cannot pause scrubbing %s"), zc.zc_name); + } else { + assert(cmd == POOL_SCRUB_NORMAL); + (void) snprintf(msg, sizeof (msg), dgettext(TEXT_DOMAIN, + "cannot scrub %s"), zc.zc_name); + } } else if (func == POOL_SCAN_NONE) { (void) snprintf(msg, sizeof (msg), dgettext(TEXT_DOMAIN, "cannot cancel scrubbing %s"), @@ -1865,7 +1883,7 @@ zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func) assert(!"unexpected result"); } - if (errno == EBUSY) { + if (err == EBUSY) { nvlist_t *nvroot; pool_scan_stat_t *ps = NULL; uint_t psc; @@ -1874,14 +1892,18 @@ zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func) ZPOOL_CONFIG_VDEV_TREE, &nvroot) == 0); (void) nvlist_lookup_uint64_array(nvroot, ZPOOL_CONFIG_SCAN_STATS, (uint64_t **)&ps, &psc); - if (ps && ps->pss_func == POOL_SCAN_SCRUB) - return (zfs_error(hdl, EZFS_SCRUBBING, msg)); - else + if (ps && ps->pss_func == POOL_SCAN_SCRUB) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sat Sep 16 03:54:25 2017 Return-Path: Delivered-To: svn-src-projects@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 D09DAE22F12 for ; Sat, 16 Sep 2017 03:54:25 +0000 (UTC) (envelope-from ngie@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 4AE9465991; Sat, 16 Sep 2017 03:54:25 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8G3sO9r039699; Sat, 16 Sep 2017 03:54:24 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8G3sLPU039667; Sat, 16 Sep 2017 03:54:21 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201709160354.v8G3sLPU039667@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 16 Sep 2017 03:54:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323636 - in projects/runtime-coverage: . cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise cddl/contrib/opensolaris/cm... X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/runtime-coverage: . cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise cddl/contrib/opensolaris/cmd/zpool cddl/contrib/open... X-SVN-Commit-Revision: 323636 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Sep 2017 03:54:25 -0000 Author: ngie Date: Sat Sep 16 03:54:20 2017 New Revision: 323636 URL: https://svnweb.freebsd.org/changeset/base/323636 Log: MFhead@r323635 Added: projects/runtime-coverage/share/man/man4/liquidio.4 - copied unchanged from r323635, head/share/man/man4/liquidio.4 projects/runtime-coverage/sys/amd64/conf/GENERIC-MMCCAM - copied unchanged from r323635, head/sys/amd64/conf/GENERIC-MMCCAM projects/runtime-coverage/sys/arm/arm/ptrace_machdep.c - copied unchanged from r323635, head/sys/arm/arm/ptrace_machdep.c projects/runtime-coverage/sys/arm/conf/IMX6-MMCCAM - copied unchanged from r323635, head/sys/arm/conf/IMX6-MMCCAM projects/runtime-coverage/sys/arm64/arm64/undefined.c - copied unchanged from r323635, head/sys/arm64/arm64/undefined.c projects/runtime-coverage/sys/arm64/conf/GENERIC-MMCCAM - copied unchanged from r323635, head/sys/arm64/conf/GENERIC-MMCCAM projects/runtime-coverage/sys/arm64/include/undefined.h - copied unchanged from r323635, head/sys/arm64/include/undefined.h projects/runtime-coverage/sys/boot/efi/boot1/fat-amd64.tmpl.xz - copied unchanged from r323635, head/sys/boot/efi/boot1/fat-amd64.tmpl.xz projects/runtime-coverage/sys/boot/efi/boot1/fat-arm.tmpl.xz - copied unchanged from r323635, head/sys/boot/efi/boot1/fat-arm.tmpl.xz projects/runtime-coverage/sys/boot/efi/boot1/fat-arm64.tmpl.xz - copied unchanged from r323635, head/sys/boot/efi/boot1/fat-arm64.tmpl.xz projects/runtime-coverage/sys/boot/efi/boot1/fat-i386.tmpl.xz - copied unchanged from r323635, head/sys/boot/efi/boot1/fat-i386.tmpl.xz projects/runtime-coverage/sys/contrib/dev/liquidio/ - copied from r323635, head/sys/contrib/dev/liquidio/ projects/runtime-coverage/sys/dev/liquidio/ - copied from r323635, head/sys/dev/liquidio/ projects/runtime-coverage/sys/dev/uart/uart_dev_mvebu.c - copied unchanged from r323635, head/sys/dev/uart/uart_dev_mvebu.c projects/runtime-coverage/sys/modules/lio/ - copied from r323635, head/sys/modules/lio/ Deleted: projects/runtime-coverage/etc/periodic/weekly/330.catman projects/runtime-coverage/sys/amd64/conf/MMCCAM projects/runtime-coverage/sys/boot/efi/boot1/fat-amd64.tmpl.bz2.uu projects/runtime-coverage/sys/boot/efi/boot1/fat-arm.tmpl.bz2.uu projects/runtime-coverage/sys/boot/efi/boot1/fat-arm64.tmpl.bz2.uu projects/runtime-coverage/sys/boot/efi/boot1/fat-i386.tmpl.bz2.uu projects/runtime-coverage/sys/cam/mmc/mmc_sdio.c projects/runtime-coverage/sys/cam/mmc/mmc_sdio.h projects/runtime-coverage/sys/dev/cxgb/ulp/ projects/runtime-coverage/sys/modules/cxgb/iw_cxgb/ projects/runtime-coverage/sys/modules/cxgb/tom/ projects/runtime-coverage/usr.bin/catman/ Modified: projects/runtime-coverage/ObsoleteFiles.inc projects/runtime-coverage/UPDATING projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool.8 projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c projects/runtime-coverage/cddl/lib/libzpool/Makefile projects/runtime-coverage/contrib/elftoolchain/readelf/readelf.c projects/runtime-coverage/contrib/one-true-awk/awk.h projects/runtime-coverage/contrib/one-true-awk/lex.c projects/runtime-coverage/contrib/one-true-awk/run.c projects/runtime-coverage/contrib/zlib/deflate.c projects/runtime-coverage/contrib/zlib/zlib.h projects/runtime-coverage/etc/defaults/periodic.conf projects/runtime-coverage/etc/periodic/weekly/Makefile projects/runtime-coverage/gnu/usr.bin/binutils/libbfd/Makefile.amd64 projects/runtime-coverage/lib/libc/net/getaddrinfo.3 projects/runtime-coverage/lib/libc/net/getaddrinfo.c projects/runtime-coverage/lib/libc/sys/open.2 projects/runtime-coverage/lib/libc/sys/ptrace.2 projects/runtime-coverage/lib/libc/sys/rename.2 projects/runtime-coverage/lib/libedit/Makefile projects/runtime-coverage/lib/libedit/chartype.c projects/runtime-coverage/lib/libefivar/efivar.c projects/runtime-coverage/lib/libstand/tftp.c projects/runtime-coverage/libexec/makewhatis.local/Makefile projects/runtime-coverage/libexec/makewhatis.local/makewhatis.local.8 projects/runtime-coverage/libexec/makewhatis.local/makewhatis.local.sh projects/runtime-coverage/libexec/rtld-elf/arm/reloc.c projects/runtime-coverage/libexec/rtld-elf/arm/rtld_machdep.h projects/runtime-coverage/libexec/rtld-elf/mips/reloc.c projects/runtime-coverage/libexec/rtld-elf/mips/rtld_start.S projects/runtime-coverage/libexec/rtld-elf/rtld.c projects/runtime-coverage/libexec/rtld-elf/rtld.h projects/runtime-coverage/release/amd64/make-memstick.sh projects/runtime-coverage/release/arm/BEAGLEBONE.conf projects/runtime-coverage/release/arm/CUBIEBOARD.conf projects/runtime-coverage/release/arm/GUMSTIX.conf projects/runtime-coverage/release/arm/PANDABOARD.conf projects/runtime-coverage/release/arm/RPI-B.conf projects/runtime-coverage/release/arm64/RPI3.conf projects/runtime-coverage/release/arm64/make-memstick.sh projects/runtime-coverage/release/i386/make-memstick.sh projects/runtime-coverage/release/powerpc/make-memstick.sh projects/runtime-coverage/share/man/man4/Makefile projects/runtime-coverage/share/man/man4/altq.4 projects/runtime-coverage/share/man/man4/siba.4 projects/runtime-coverage/share/man/man4/vlan.4 projects/runtime-coverage/share/man/man5/periodic.conf.5 projects/runtime-coverage/share/man/man5/rc.conf.5 projects/runtime-coverage/share/man/man5/src.conf.5 projects/runtime-coverage/share/misc/committers-ports.dot projects/runtime-coverage/share/misc/committers-src.dot projects/runtime-coverage/share/mk/bsd.sys.mk projects/runtime-coverage/share/mk/src.opts.mk projects/runtime-coverage/sys/arm/allwinner/a10_gpio.c projects/runtime-coverage/sys/arm/arm/elf_machdep.c projects/runtime-coverage/sys/arm/arm/machdep.c projects/runtime-coverage/sys/arm/arm/vfp.c projects/runtime-coverage/sys/arm/at91/at91_twi.c projects/runtime-coverage/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/runtime-coverage/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/runtime-coverage/sys/arm/conf/BEAGLEBONE-MMCCAM projects/runtime-coverage/sys/arm/freescale/imx/imx_gpio.c projects/runtime-coverage/sys/arm/freescale/imx/imx_i2c.c projects/runtime-coverage/sys/arm/include/elf.h projects/runtime-coverage/sys/arm/include/md_var.h projects/runtime-coverage/sys/arm/include/ptrace.h projects/runtime-coverage/sys/arm/include/vfp.h projects/runtime-coverage/sys/arm/ti/ti_cpuid.c projects/runtime-coverage/sys/arm/ti/ti_cpuid.h projects/runtime-coverage/sys/arm/ti/ti_i2c.c projects/runtime-coverage/sys/arm/ti/ti_scm.c projects/runtime-coverage/sys/arm64/arm64/identcpu.c projects/runtime-coverage/sys/arm64/arm64/machdep.c projects/runtime-coverage/sys/arm64/arm64/trap.c projects/runtime-coverage/sys/arm64/conf/GENERIC projects/runtime-coverage/sys/arm64/include/armreg.h projects/runtime-coverage/sys/arm64/include/elf.h projects/runtime-coverage/sys/boot/common/loader.8 projects/runtime-coverage/sys/boot/efi/boot1/Makefile projects/runtime-coverage/sys/boot/efi/boot1/Makefile.fat projects/runtime-coverage/sys/boot/efi/boot1/generate-fat.sh projects/runtime-coverage/sys/boot/efi/include/efilib.h projects/runtime-coverage/sys/boot/efi/include/efizfs.h projects/runtime-coverage/sys/boot/efi/libefi/efipart.c projects/runtime-coverage/sys/boot/efi/libefi/efizfs.c projects/runtime-coverage/sys/boot/efi/loader/main.c projects/runtime-coverage/sys/boot/i386/libi386/biosmem.c projects/runtime-coverage/sys/boot/zfs/zfsimpl.c projects/runtime-coverage/sys/cam/cam_iosched.c projects/runtime-coverage/sys/cam/ctl/ctl_backend_block.c projects/runtime-coverage/sys/cam/ctl/ctl_backend_ramdisk.c projects/runtime-coverage/sys/cam/mmc/mmc.h projects/runtime-coverage/sys/cam/mmc/mmc_da.c projects/runtime-coverage/sys/cam/mmc/mmc_xpt.c projects/runtime-coverage/sys/cam/nvme/nvme_da.c projects/runtime-coverage/sys/cddl/boot/zfs/zfsimpl.h projects/runtime-coverage/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/abd.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/abd.h projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/file.h projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/fs.h projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/inetdevice.h projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/poll.h projects/runtime-coverage/sys/compat/linuxkpi/common/src/linux_compat.c projects/runtime-coverage/sys/conf/NOTES projects/runtime-coverage/sys/conf/files projects/runtime-coverage/sys/conf/files.arm projects/runtime-coverage/sys/conf/files.arm64 projects/runtime-coverage/sys/conf/kern.mk projects/runtime-coverage/sys/conf/newvers.sh projects/runtime-coverage/sys/contrib/ipfilter/netinet/ip_state.c projects/runtime-coverage/sys/contrib/octeon-sdk/cvmx-l2c.c projects/runtime-coverage/sys/dev/ahci/ahci_generic.c projects/runtime-coverage/sys/dev/amdsmn/amdsmn.c projects/runtime-coverage/sys/dev/amdtemp/amdtemp.c projects/runtime-coverage/sys/dev/cxgbe/crypto/t4_crypto.c projects/runtime-coverage/sys/dev/cxgbe/t4_main.c projects/runtime-coverage/sys/dev/cxgbe/tom/t4_ddp.c projects/runtime-coverage/sys/dev/cxgbe/tom/t4_tom.h projects/runtime-coverage/sys/dev/glxiic/glxiic.c projects/runtime-coverage/sys/dev/gpio/gpio_if.m projects/runtime-coverage/sys/dev/gpio/gpioc.c projects/runtime-coverage/sys/dev/ichwd/ichwd.h projects/runtime-coverage/sys/dev/iicbus/iicbus_if.m projects/runtime-coverage/sys/dev/intpm/intpm.c projects/runtime-coverage/sys/dev/ioat/ioat.c projects/runtime-coverage/sys/dev/jedec_ts/jedec_ts.c projects/runtime-coverage/sys/dev/mmc/host/dwmmc.c projects/runtime-coverage/sys/dev/mpr/mpr.c projects/runtime-coverage/sys/dev/mpr/mpr_pci.c projects/runtime-coverage/sys/dev/mpr/mpr_sas.c projects/runtime-coverage/sys/dev/mpr/mpr_table.c projects/runtime-coverage/sys/dev/mpr/mpr_table.h projects/runtime-coverage/sys/dev/mpr/mprvar.h projects/runtime-coverage/sys/dev/mps/mps.c projects/runtime-coverage/sys/dev/mps/mps_pci.c projects/runtime-coverage/sys/dev/mps/mps_sas.c projects/runtime-coverage/sys/dev/mps/mps_table.c projects/runtime-coverage/sys/dev/mps/mps_table.h projects/runtime-coverage/sys/dev/mps/mpsvar.h projects/runtime-coverage/sys/dev/neta/if_mvneta.c projects/runtime-coverage/sys/dev/neta/if_mvneta_fdt.c projects/runtime-coverage/sys/dev/neta/if_mvnetavar.h projects/runtime-coverage/sys/dev/ntb/ntb_hw/ntb_hw_intel.c projects/runtime-coverage/sys/dev/ntb/ntb_hw/ntb_hw_plx.c projects/runtime-coverage/sys/dev/usb/controller/ehci_mv.c projects/runtime-coverage/sys/dev/usb/controller/xhci_mv.c projects/runtime-coverage/sys/geom/mirror/g_mirror.c projects/runtime-coverage/sys/geom/mirror/g_mirror.h projects/runtime-coverage/sys/kern/imgact_elf.c projects/runtime-coverage/sys/kern/kern_fork.c projects/runtime-coverage/sys/kern/kern_sendfile.c projects/runtime-coverage/sys/kern/subr_blist.c projects/runtime-coverage/sys/kern/uipc_socket.c projects/runtime-coverage/sys/kern/uipc_usrreq.c projects/runtime-coverage/sys/kern/vfs_cache.c projects/runtime-coverage/sys/kern/vfs_mount.c projects/runtime-coverage/sys/mips/include/cpufunc.h projects/runtime-coverage/sys/mips/include/cpuregs.h projects/runtime-coverage/sys/mips/include/elf.h projects/runtime-coverage/sys/mips/rmi/rootfs_list.txt projects/runtime-coverage/sys/modules/Makefile projects/runtime-coverage/sys/modules/cxgb/Makefile projects/runtime-coverage/sys/modules/uart/Makefile projects/runtime-coverage/sys/net/if_vlan.c projects/runtime-coverage/sys/netinet/sctp_input.c projects/runtime-coverage/sys/netinet/sctp_output.c projects/runtime-coverage/sys/netinet/sctp_pcb.c projects/runtime-coverage/sys/netinet/sctp_sysctl.c projects/runtime-coverage/sys/netinet/sctp_uio.h projects/runtime-coverage/sys/netinet/sctp_usrreq.c projects/runtime-coverage/sys/netinet/tcp_var.h projects/runtime-coverage/sys/netinet6/sctp6_usrreq.c projects/runtime-coverage/sys/ofed/drivers/infiniband/core/ucm.c projects/runtime-coverage/sys/ofed/drivers/infiniband/core/ucma.c projects/runtime-coverage/sys/ofed/drivers/infiniband/core/user_mad.c projects/runtime-coverage/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/runtime-coverage/sys/powerpc/include/elf.h projects/runtime-coverage/sys/powerpc/powerpc/machdep.c projects/runtime-coverage/sys/riscv/include/elf.h projects/runtime-coverage/sys/riscv/riscv/machdep.c projects/runtime-coverage/sys/sparc64/include/elf.h projects/runtime-coverage/sys/sys/blist.h projects/runtime-coverage/sys/sys/elf_common.h projects/runtime-coverage/sys/sys/gpio.h projects/runtime-coverage/sys/sys/param.h projects/runtime-coverage/sys/sys/sysent.h projects/runtime-coverage/sys/sys/vmmeter.h projects/runtime-coverage/sys/vm/swap_pager.c projects/runtime-coverage/sys/vm/uma_core.c projects/runtime-coverage/sys/vm/uma_int.h projects/runtime-coverage/sys/vm/vm_meter.c projects/runtime-coverage/sys/vm/vm_object.c projects/runtime-coverage/sys/vm/vm_object.h projects/runtime-coverage/sys/vm/vm_page.c projects/runtime-coverage/sys/vm/vm_page.h projects/runtime-coverage/sys/x86/include/elf.h projects/runtime-coverage/sys/x86/include/specialreg.h projects/runtime-coverage/sys/x86/x86/identcpu.c projects/runtime-coverage/sys/x86/x86/io_apic.c projects/runtime-coverage/sys/x86/x86/mca.c projects/runtime-coverage/targets/pseudo/userland/Makefile.depend projects/runtime-coverage/tools/build/mk/OptionalObsoleteFiles.inc projects/runtime-coverage/tools/build/options/WITHOUT_MAN_UTILS projects/runtime-coverage/usr.bin/Makefile projects/runtime-coverage/usr.bin/awk/awk.1 projects/runtime-coverage/usr.bin/calendar/calendars/calendar.freebsd projects/runtime-coverage/usr.bin/gcore/elfcore.c projects/runtime-coverage/usr.bin/getconf/confstr.gperf projects/runtime-coverage/usr.bin/getconf/getconf.1 projects/runtime-coverage/usr.bin/getconf/getconf.c projects/runtime-coverage/usr.bin/getconf/getconf.h projects/runtime-coverage/usr.bin/getconf/pathconf.gperf projects/runtime-coverage/usr.bin/getconf/sysconf.gperf projects/runtime-coverage/usr.bin/grep/regex/fastmatch.h projects/runtime-coverage/usr.bin/ktrdump/ktrdump.c projects/runtime-coverage/usr.bin/netstat/netstat.1 projects/runtime-coverage/usr.bin/sockstat/sockstat.1 projects/runtime-coverage/usr.bin/sockstat/sockstat.c projects/runtime-coverage/usr.bin/su/su.1 projects/runtime-coverage/usr.bin/svn/lib/libsvn_client/Makefile projects/runtime-coverage/usr.bin/tail/tests/tail_test.sh projects/runtime-coverage/usr.sbin/acpi/acpidump/acpi.c projects/runtime-coverage/usr.sbin/acpi/acpidump/acpidump.8 projects/runtime-coverage/usr.sbin/bsdinstall/partedit/gpart_ops.c projects/runtime-coverage/usr.sbin/bsdinstall/scripts/config projects/runtime-coverage/usr.sbin/crunch/examples/really-big.conf projects/runtime-coverage/usr.sbin/cxgbetool/cxgbetool.c projects/runtime-coverage/usr.sbin/i2c/i2c.c projects/runtime-coverage/usr.sbin/iovctl/iovctl.c projects/runtime-coverage/usr.sbin/tcpdrop/tcpdrop.8 projects/runtime-coverage/usr.sbin/tcpdrop/tcpdrop.c projects/runtime-coverage/usr.sbin/zic/zic/Makefile Directory Properties: projects/runtime-coverage/ (props changed) projects/runtime-coverage/cddl/ (props changed) projects/runtime-coverage/cddl/contrib/opensolaris/ (props changed) projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/runtime-coverage/contrib/elftoolchain/ (props changed) projects/runtime-coverage/contrib/one-true-awk/ (props changed) projects/runtime-coverage/contrib/zlib/ (props changed) projects/runtime-coverage/gnu/usr.bin/binutils/ (props changed) projects/runtime-coverage/lib/libedit/ (props changed) projects/runtime-coverage/sys/cddl/contrib/opensolaris/ (props changed) projects/runtime-coverage/sys/contrib/ipfilter/ (props changed) projects/runtime-coverage/sys/contrib/octeon-sdk/ (props changed) Modified: projects/runtime-coverage/ObsoleteFiles.inc ============================================================================== --- projects/runtime-coverage/ObsoleteFiles.inc Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/ObsoleteFiles.inc Sat Sep 16 03:54:20 2017 (r323636) @@ -38,6 +38,13 @@ # xargs -n1 | sort | uniq -d; # done +# 20170913: remove unneeded catman utility +OLD_FILES+=etc/periodic/weekly/330.catman +OLD_FILES+=usr/bin/catman +OLD_FILES+=usr/libexec/catman.local +OLD_FILES+=usr/share/man/man1/catman.1.gz +OLD_FILES+=usr/share/man/man8/catman.local.8.gz + # 20170802: ksyms(4) ioctl interface was removed OLD_FILES+=usr/include/sys/ksyms.h Modified: projects/runtime-coverage/UPDATING ============================================================================== --- projects/runtime-coverage/UPDATING Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/UPDATING Sat Sep 16 03:54:20 2017 (r323636) @@ -51,6 +51,20 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: ****************************** SPECIAL WARNING: ****************************** +20170912: + The default serial number format for CTL LUNs has changed. This will + affect users who use /dev/diskid/* device nodes, or whose FibreChannel + or iSCSI clients care about their LUNs' serial numbers. Users who + require serial number stability should hardcode serial numbers in + /etc/ctl.conf . + +20170912: + For 32-bit arm compiled for hard-float support, soft-floating point + binaries now always get their shared libraries from + LD_SOFT_LIBRARY_PATH (in the past, this was only used if + /usr/libsoft also existed). Only users with a hard-float ld.so, but + soft-float everything else should be affected. + 20170826: During boot the geli passphrase will be hidden. To restore previous behavior see geli(8) configuration options. Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d Sat Sep 16 03:54:20 2017 (r323636) @@ -28,9 +28,6 @@ #pragma D option quiet -inline int AF_INET = 2; -inline int AF_INET6 = 28; - in_addr_t *ip4a; in_addr_t *ip4b; in_addr_t *ip4c; Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c Sat Sep 16 03:54:20 2017 (r323636) @@ -35,13 +35,13 @@ main(int argc, char **argv) sigset_t ss; (void) sigemptyset(&ss); - (void) sigaddset(&ss, SIGINT); + (void) sigaddset(&ss, SIGUSR1); (void) sigprocmask(SIG_BLOCK, &ss, NULL); do { (void) getpid(); (void) sigpending(&ss); - } while (!sigismember(&ss, SIGINT)); + } while (!sigismember(&ss, SIGUSR1)); return (0); } Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d Sat Sep 16 03:54:20 2017 (r323636) @@ -47,7 +47,7 @@ syscall::getpid:entry /pid == $1/ { trace("raised"); - raise(SIGINT); + raise(SIGUSR1); /* * Wait no more than half a second for the process to die. */ @@ -55,6 +55,7 @@ syscall::getpid:entry } syscall::exit:entry +/pid == $1/ { exit(0); } Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c Sat Sep 16 03:54:20 2017 (r323636) @@ -45,7 +45,7 @@ main(int argc, char **argv) sigemptyset(&sa.sa_mask); sa.sa_flags = 0; - (void) sigaction(SIGINT, &sa, NULL); + (void) sigaction(SIGUSR1, &sa, NULL); for (;;) { (void) getpid(); Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d Sat Sep 16 03:54:20 2017 (r323636) @@ -47,7 +47,7 @@ syscall::getpid:return /pid == $1/ { trace("raised"); - raise(SIGINT); + raise(SIGUSR1); /* * Wait no more than half a second for the process to die. */ @@ -55,6 +55,7 @@ syscall::getpid:return } syscall::exit:entry +/pid == $1/ { exit(0); } Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c Sat Sep 16 03:54:20 2017 (r323636) @@ -45,7 +45,7 @@ main(int argc, char **argv) sigemptyset(&sa.sa_mask); sa.sa_flags = 0; - (void) sigaction(SIGINT, &sa, NULL); + (void) sigaction(SIGUSR1, &sa, NULL); for (;;) { (void) getpid(); Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d Sat Sep 16 03:54:20 2017 (r323636) @@ -47,7 +47,7 @@ syscall::getpid:entry /pid == $1/ { trace("raised"); - raise(SIGINT); + raise(SIGUSR1); /* * Wait no more than half a second for the process to die. */ @@ -55,6 +55,7 @@ syscall::getpid:entry } syscall::exit:entry +/pid == $1/ { exit(0); } Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool.8 ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Sat Sep 16 03:54:20 2017 (r323636) @@ -19,14 +19,15 @@ .\" information: Portions Copyright [yyyy] [name of copyright owner] .\" .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved. -.\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved. .\" Copyright (c) 2011, Justin T. Gibbs -.\" Copyright (c) 2013 by Delphix. All Rights Reserved. .\" Copyright (c) 2012, Glen Barber +.\" Copyright (c) 2013 by Delphix. All Rights Reserved. +.\" Copyright 2017 Nexenta Systems, Inc. +.\" Copyright (c) 2017 Datto Inc. .\" .\" $FreeBSD$ .\" -.Dd July 26, 2014 +.Dd September 08, 2017 .Dt ZPOOL 8 .Os .Sh NAME @@ -153,7 +154,7 @@ .Op Ar new_device .Nm .Cm scrub -.Op Fl s +.Op Fl s | Fl p .Ar pool ... .Nm .Cm set @@ -1543,42 +1544,53 @@ manner. .It Xo .Nm .Cm scrub -.Op Fl s +.Op Fl s | Fl p .Ar pool ... .Xc .Pp -Begins a scrub. The scrub examines all data in the specified pools to verify -that it checksums correctly. For replicated (mirror or -.No raidz ) -devices, -.Tn ZFS -automatically repairs any damage discovered during the scrub. The -.Qq Nm Cm status +Begins a scrub or resumes a paused scrub. +The scrub examines all data in the specified pools to verify that it checksums +correctly. +For replicated +.Pq mirror or raidz +devices, ZFS automatically repairs any damage discovered during the scrub. +The +.Nm zpool Cm status command reports the progress of the scrub and summarizes the results of the scrub upon completion. .Pp -Scrubbing and resilvering are very similar operations. The difference is that -resilvering only examines data that -.Tn ZFS -knows to be out of date (for example, when attaching a new device to a mirror -or replacing an existing device), whereas scrubbing examines all data to -discover silent errors due to hardware faults or disk failure. +Scrubbing and resilvering are very similar operations. +The difference is that resilvering only examines data that ZFS knows to be out +of date +.Po +for example, when attaching a new device to a mirror or replacing an existing +device +.Pc , +whereas scrubbing examines all data to discover silent errors due to hardware +faults or disk failure. .Pp -Because scrubbing and resilvering are -.Tn I/O Ns -intensive -operations, -.Tn ZFS -only allows one at a time. If a scrub is already in progress, the -.Qq Nm Cm scrub -command returns an error. To start a new scrub, you have to stop the old scrub -with the -.Qq Nm Cm scrub Fl s -command first. If a resilver is in progress, -.Tn ZFS -does not allow a scrub to be started until the resilver completes. -.Bl -tag -width indent +Because scrubbing and resilvering are I/O-intensive operations, ZFS only allows +one at a time. +If a scrub is paused, the +.Nm zpool Cm scrub +resumes it. +If a resilver is in progress, ZFS does not allow a scrub to be started until the +resilver completes. +.Bl -tag -width Ds .It Fl s Stop scrubbing. +.El +.Bl -tag -width Ds +.It Fl p +Pause scrubbing. +Scrub pause state and progress are periodically synced to disk. +If the system is restarted or pool is exported during a paused scrub, +even after import, scrub will remain paused until it is resumed. +Once resumed the scrub will pick up from the place where it was last +checkpointed to disk. +To resume a paused scrub issue +.Nm zpool Cm scrub +again. .El .It Xo .Nm Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Sep 16 03:54:20 2017 (r323636) @@ -27,6 +27,7 @@ * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved. * Copyright 2016 Igor Kozhukhov . * Copyright 2016 Nexenta Systems, Inc. + * Copyright (c) 2017 Datto Inc. */ #include @@ -252,7 +253,7 @@ get_usage(zpool_help_t idx) case HELP_REOPEN: return (gettext("\treopen \n")); case HELP_SCRUB: - return (gettext("\tscrub [-s] ...\n")); + return (gettext("\tscrub [-s | -p] ...\n")); case HELP_STATUS: return (gettext("\tstatus [-vx] [-T d|u] [pool] ... [interval " "[count]]\n")); @@ -3825,6 +3826,7 @@ typedef struct scrub_cbdata { int cb_type; int cb_argc; char **cb_argv; + pool_scrub_cmd_t cb_scrub_cmd; } scrub_cbdata_t; int @@ -3842,15 +3844,16 @@ scrub_callback(zpool_handle_t *zhp, void *data) return (1); } - err = zpool_scan(zhp, cb->cb_type); + err = zpool_scan(zhp, cb->cb_type, cb->cb_scrub_cmd); return (err != 0); } /* - * zpool scrub [-s] ... + * zpool scrub [-s | -p] ... * * -s Stop. Stops any in-progress scrub. + * -p Pause. Pause in-progress scrub. */ int zpool_do_scrub(int argc, char **argv) @@ -3859,13 +3862,17 @@ zpool_do_scrub(int argc, char **argv) scrub_cbdata_t cb; cb.cb_type = POOL_SCAN_SCRUB; + cb.cb_scrub_cmd = POOL_SCRUB_NORMAL; /* check options */ - while ((c = getopt(argc, argv, "s")) != -1) { + while ((c = getopt(argc, argv, "sp")) != -1) { switch (c) { case 's': cb.cb_type = POOL_SCAN_NONE; break; + case 'p': + cb.cb_scrub_cmd = POOL_SCRUB_PAUSE; + break; case '?': (void) fprintf(stderr, gettext("invalid option '%c'\n"), optopt); @@ -3873,6 +3880,13 @@ zpool_do_scrub(int argc, char **argv) } } + if (cb.cb_type == POOL_SCAN_NONE && + cb.cb_scrub_cmd == POOL_SCRUB_PAUSE) { + (void) fprintf(stderr, gettext("invalid option combination: " + "-s and -p are mutually exclusive\n")); + usage(B_FALSE); + } + cb.cb_argc = argc; cb.cb_argv = argv; argc -= optind; @@ -3901,7 +3915,7 @@ typedef struct status_cbdata { void print_scan_status(pool_scan_stat_t *ps) { - time_t start, end; + time_t start, end, pause; uint64_t elapsed, mins_left, hours_left; uint64_t pass_exam, examined, total; uint_t rate; @@ -3919,6 +3933,7 @@ print_scan_status(pool_scan_stat_t *ps) start = ps->pss_start_time; end = ps->pss_end_time; + pause = ps->pss_pass_scrub_pause; zfs_nicenum(ps->pss_processed, processed_buf, sizeof (processed_buf)); assert(ps->pss_func == POOL_SCAN_SCRUB || @@ -3961,8 +3976,17 @@ print_scan_status(pool_scan_stat_t *ps) * Scan is in progress. */ if (ps->pss_func == POOL_SCAN_SCRUB) { - (void) printf(gettext("scrub in progress since %s"), - ctime(&start)); + if (pause == 0) { + (void) printf(gettext("scrub in progress since %s"), + ctime(&start)); + } else { + char buf[32]; + struct tm *p = localtime(&pause); + (void) strftime(buf, sizeof (buf), "%a %b %e %T %Y", p); + (void) printf(gettext("scrub paused since %s\n"), buf); + (void) printf(gettext("\tscrub started on %s"), + ctime(&start)); + } } else if (ps->pss_func == POOL_SCAN_RESILVER) { (void) printf(gettext("resilver in progress since %s"), ctime(&start)); @@ -3974,6 +3998,7 @@ print_scan_status(pool_scan_stat_t *ps) /* elapsed time for this pass */ elapsed = time(NULL) - ps->pss_pass_start; + elapsed -= ps->pss_pass_scrub_spent_paused; elapsed = elapsed ? elapsed : 1; pass_exam = ps->pss_pass_exam ? ps->pss_pass_exam : 1; rate = pass_exam / elapsed; @@ -3983,19 +4008,25 @@ print_scan_status(pool_scan_stat_t *ps) zfs_nicenum(examined, examined_buf, sizeof (examined_buf)); zfs_nicenum(total, total_buf, sizeof (total_buf)); - zfs_nicenum(rate, rate_buf, sizeof (rate_buf)); /* * do not print estimated time if hours_left is more than 30 days + * or we have a paused scrub */ - (void) printf(gettext(" %s scanned out of %s at %s/s"), - examined_buf, total_buf, rate_buf); - if (hours_left < (30 * 24)) { - (void) printf(gettext(", %lluh%um to go\n"), - (u_longlong_t)hours_left, (uint_t)(mins_left % 60)); + if (pause == 0) { + zfs_nicenum(rate, rate_buf, sizeof (rate_buf)); + (void) printf(gettext("\t%s scanned out of %s at %s/s"), + examined_buf, total_buf, rate_buf); + if (hours_left < (30 * 24)) { + (void) printf(gettext(", %lluh%um to go\n"), + (u_longlong_t)hours_left, (uint_t)(mins_left % 60)); + } else { + (void) printf(gettext( + ", (scan is slow, no estimated time)\n")); + } } else { - (void) printf(gettext( - ", (scan is slow, no estimated time)\n")); + (void) printf(gettext("\t%s scanned out of %s\n"), + examined_buf, total_buf); } if (ps->pss_func == POOL_SCAN_RESILVER) { Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Sat Sep 16 03:54:20 2017 (r323636) @@ -1109,7 +1109,7 @@ dt_vopen(int version, int flags, int *errp, */ if (err == ENOENT && modfind("dtraceall") < 0) { kldload("dtraceall"); /* ignore the error */ - dtfd = open("/dev/dtrace/dtrace", O_RDWR); + dtfd = open("/dev/dtrace/dtrace", O_RDWR | O_CLOEXEC); err = errno; } #endif Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Sat Sep 16 03:54:20 2017 (r323636) @@ -28,6 +28,7 @@ * Copyright (c) 2013 Steven Hartland. All rights reserved. * Copyright (c) 2014 Integros [integros.com] * Copyright 2016 Nexenta Systems, Inc. + * Copyright (c) 2017 Datto Inc. */ #ifndef _LIBZFS_H @@ -129,6 +130,7 @@ typedef enum zfs_error { EZFS_DIFF, /* general failure of zfs diff */ EZFS_DIFFDATA, /* bad zfs diff data */ EZFS_POOLREADONLY, /* pool is in read-only mode */ + EZFS_SCRUB_PAUSED, /* scrub currently paused */ EZFS_UNKNOWN } zfs_error_t; @@ -241,7 +243,7 @@ typedef struct splitflags { /* * Functions to manipulate pool and vdev state */ -extern int zpool_scan(zpool_handle_t *, pool_scan_func_t); +extern int zpool_scan(zpool_handle_t *, pool_scan_func_t, pool_scrub_cmd_t); extern int zpool_clear(zpool_handle_t *, const char *, nvlist_t *); extern int zpool_reguid(zpool_handle_t *); extern int zpool_reopen(zpool_handle_t *); Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Sat Sep 16 03:54:20 2017 (r323636) @@ -20,9 +20,11 @@ */ /* + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014 by Delphix. All rights reserved. * Copyright 2016 Igor Kozhukhov + * Copyright 2017 RackTop Systems. */ /* @@ -87,7 +89,7 @@ zfs_share_type_t zfs_is_shared_proto(zfs_handle_t *, c zfs_share_proto_t); /* - * The share protocols table must be in the same order as the zfs_share_prot_t + * The share protocols table must be in the same order as the zfs_share_proto_t * enum in libzfs_impl.h */ typedef struct { @@ -872,7 +874,7 @@ unshare_one(libzfs_handle_t *hdl, const char *name, co /* make sure libshare initialized */ if ((err = zfs_init_libshare(hdl, SA_INIT_SHARE_API)) != SA_OK) { free(mntpt); /* don't need the copy anymore */ - return (zfs_error_fmt(hdl, EZFS_SHARENFSFAILED, + return (zfs_error_fmt(hdl, proto_table[proto].p_unshare_err, dgettext(TEXT_DOMAIN, "cannot unshare '%s': %s"), name, _sa_errorstr(err))); } @@ -883,12 +885,13 @@ unshare_one(libzfs_handle_t *hdl, const char *name, co if (share != NULL) { err = zfs_sa_disable_share(share, proto_table[proto].p_name); if (err != SA_OK) { - return (zfs_error_fmt(hdl, EZFS_UNSHARENFSFAILED, + return (zfs_error_fmt(hdl, + proto_table[proto].p_unshare_err, dgettext(TEXT_DOMAIN, "cannot unshare '%s': %s"), name, _sa_errorstr(err))); } } else { - return (zfs_error_fmt(hdl, EZFS_UNSHARENFSFAILED, + return (zfs_error_fmt(hdl, proto_table[proto].p_unshare_err, dgettext(TEXT_DOMAIN, "cannot unshare '%s': not found"), name)); } Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Sat Sep 16 03:54:20 2017 (r323636) @@ -25,6 +25,7 @@ * Copyright (c) 2013, Joyent, Inc. All rights reserved. * Copyright 2016 Nexenta Systems, Inc. * Copyright 2016 Igor Kozhukhov + * Copyright (c) 2017 Datto Inc. */ #include @@ -1841,22 +1842,39 @@ zpool_import_props(libzfs_handle_t *hdl, nvlist_t *con * Scan the pool. */ int -zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func) +zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func, pool_scrub_cmd_t cmd) { zfs_cmd_t zc = { 0 }; char msg[1024]; + int err; libzfs_handle_t *hdl = zhp->zpool_hdl; (void) strlcpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name)); zc.zc_cookie = func; + zc.zc_flags = cmd; - if (zfs_ioctl(hdl, ZFS_IOC_POOL_SCAN, &zc) == 0 || - (errno == ENOENT && func != POOL_SCAN_NONE)) + if (zfs_ioctl(hdl, ZFS_IOC_POOL_SCAN, &zc) == 0) return (0); + err = errno; + + /* ECANCELED on a scrub means we resumed a paused scrub */ + if (err == ECANCELED && func == POOL_SCAN_SCRUB && + cmd == POOL_SCRUB_NORMAL) + return (0); + + if (err == ENOENT && func != POOL_SCAN_NONE && cmd == POOL_SCRUB_NORMAL) + return (0); + if (func == POOL_SCAN_SCRUB) { - (void) snprintf(msg, sizeof (msg), - dgettext(TEXT_DOMAIN, "cannot scrub %s"), zc.zc_name); + if (cmd == POOL_SCRUB_PAUSE) { + (void) snprintf(msg, sizeof (msg), dgettext(TEXT_DOMAIN, + "cannot pause scrubbing %s"), zc.zc_name); + } else { + assert(cmd == POOL_SCRUB_NORMAL); + (void) snprintf(msg, sizeof (msg), dgettext(TEXT_DOMAIN, + "cannot scrub %s"), zc.zc_name); + } } else if (func == POOL_SCAN_NONE) { (void) snprintf(msg, sizeof (msg), dgettext(TEXT_DOMAIN, "cannot cancel scrubbing %s"), @@ -1865,7 +1883,7 @@ zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func) assert(!"unexpected result"); } - if (errno == EBUSY) { + if (err == EBUSY) { nvlist_t *nvroot; pool_scan_stat_t *ps = NULL; uint_t psc; @@ -1874,14 +1892,18 @@ zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func) ZPOOL_CONFIG_VDEV_TREE, &nvroot) == 0); (void) nvlist_lookup_uint64_array(nvroot, ZPOOL_CONFIG_SCAN_STATS, (uint64_t **)&ps, &psc); - if (ps && ps->pss_func == POOL_SCAN_SCRUB) - return (zfs_error(hdl, EZFS_SCRUBBING, msg)); - else + if (ps && ps->pss_func == POOL_SCAN_SCRUB) { + if (cmd == POOL_SCRUB_PAUSE) + return (zfs_error(hdl, EZFS_SCRUB_PAUSED, msg)); + else + return (zfs_error(hdl, EZFS_SCRUBBING, msg)); + } else { return (zfs_error(hdl, EZFS_RESILVERING, msg)); - } else if (errno == ENOENT) { + } + } else if (err == ENOENT) { return (zfs_error(hdl, EZFS_NO_SCRUB, msg)); } else { - return (zpool_standard_error(hdl, errno, msg)); + return (zpool_standard_error(hdl, err, msg)); } } Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c Sat Sep 16 03:54:20 2017 (r323636) @@ -24,6 +24,7 @@ * Copyright (c) 2013, Joyent, Inc. All rights reserved. * Copyright (c) 2011, 2015 by Delphix. All rights reserved. * Copyright 2016 Igor Kozhukhov + * Copyright (c) 2017 Datto Inc. */ /* @@ -224,6 +225,9 @@ libzfs_error_description(libzfs_handle_t *hdl) case EZFS_POSTSPLIT_ONLINE: return (dgettext(TEXT_DOMAIN, "disk was split from this pool " "into a new one")); + case EZFS_SCRUB_PAUSED: + return (dgettext(TEXT_DOMAIN, "scrub is paused; " + "use 'zpool scrub' to resume")); case EZFS_SCRUBBING: return (dgettext(TEXT_DOMAIN, "currently scrubbing; " "use 'zpool scrub -s' to cancel current scrub")); Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Sat Sep 16 03:54:20 2017 (r323636) @@ -735,11 +735,9 @@ static char ce_suffix[CE_IGNORE][2] = { "", "\n", "\n" void vpanic(const char *fmt, va_list adx) { - (void) fprintf(stderr, "error: "); - (void) vfprintf(stderr, fmt, adx); - (void) fprintf(stderr, "\n"); - - abort(); /* think of it as a "user-level crash dump" */ + char buf[512]; + (void) vsnprintf(buf, 512, fmt, adx); + assfail(buf, NULL, 0); } void Modified: projects/runtime-coverage/cddl/lib/libzpool/Makefile ============================================================================== --- projects/runtime-coverage/cddl/lib/libzpool/Makefile Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/cddl/lib/libzpool/Makefile Sat Sep 16 03:54:20 2017 (r323636) @@ -26,7 +26,7 @@ ATOMIC_SRCS= opensolaris_atomic.c LIB= zpool -ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c trim_map.c +ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} trim_map.c ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} KERNEL_SRCS= kernel.c taskq.c util.c LIST_SRCS= list.c Modified: projects/runtime-coverage/contrib/elftoolchain/readelf/readelf.c ============================================================================== --- projects/runtime-coverage/contrib/elftoolchain/readelf/readelf.c Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/contrib/elftoolchain/readelf/readelf.c Sat Sep 16 03:54:20 2017 (r323636) @@ -1141,7 +1141,9 @@ note_type_freebsd_core(unsigned int nt) case 14: return "NT_PROCSTAT_OSREL"; case 15: return "NT_PROCSTAT_PSSTRINGS"; case 16: return "NT_PROCSTAT_AUXV"; + case 17: return "NT_PTLWPINFO"; case 0x202: return "NT_X86_XSTATE (x86 XSAVE extended state)"; + case 0x400: return "NT_ARM_VFP (arm VFP registers)"; default: return (note_type_unknown(nt)); } } @@ -2692,6 +2694,9 @@ dump_arch_dyn_val(struct readelf *re, GElf_Dyn *dyn) case DT_MIPS_PERF_SUFFIX: case DT_MIPS_TIME_STAMP: printf(" %s\n", timestamp(dyn->d_un.d_val)); + break; + default: + printf("\n"); break; } break; Modified: projects/runtime-coverage/contrib/one-true-awk/awk.h ============================================================================== --- projects/runtime-coverage/contrib/one-true-awk/awk.h Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/contrib/one-true-awk/awk.h Sat Sep 16 03:54:20 2017 (r323636) @@ -126,6 +126,12 @@ extern Cell *rlengthloc; /* RLENGTH */ #define FTOUPPER 12 #define FTOLOWER 13 #define FFLUSH 14 +#define FAND 15 +#define FFOR 16 +#define FXOR 17 +#define FCOMPL 18 +#define FLSHIFT 19 +#define FRSHIFT 20 /* Node: parse tree is made of nodes, with Cell's at bottom */ Modified: projects/runtime-coverage/contrib/one-true-awk/lex.c ============================================================================== --- projects/runtime-coverage/contrib/one-true-awk/lex.c Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/contrib/one-true-awk/lex.c Sat Sep 16 03:54:20 2017 (r323636) @@ -47,9 +47,11 @@ Keyword keywords[] ={ /* keep sorted: binary searched { "BEGIN", XBEGIN, XBEGIN }, { "END", XEND, XEND }, { "NF", VARNF, VARNF }, + { "and", FAND, BLTIN }, { "atan2", FATAN, BLTIN }, { "break", BREAK, BREAK }, { "close", CLOSE, CLOSE }, + { "compl", FCOMPL, BLTIN }, { "continue", CONTINUE, CONTINUE }, { "cos", FCOS, BLTIN }, { "delete", DELETE, DELETE }, @@ -69,13 +71,16 @@ Keyword keywords[] ={ /* keep sorted: binary searched { "int", FINT, BLTIN }, { "length", FLENGTH, BLTIN }, { "log", FLOG, BLTIN }, + { "lshift", FLSHIFT, BLTIN }, { "match", MATCHFCN, MATCHFCN }, { "next", NEXT, NEXT }, { "nextfile", NEXTFILE, NEXTFILE }, + { "or", FFOR, BLTIN }, { "print", PRINT, PRINT }, { "printf", PRINTF, PRINTF }, { "rand", FRAND, BLTIN }, { "return", RETURN, RETURN }, + { "rshift", FRSHIFT, BLTIN }, { "sin", FSIN, BLTIN }, { "split", SPLIT, SPLIT }, { "sprintf", SPRINTF, SPRINTF }, @@ -87,6 +92,7 @@ Keyword keywords[] ={ /* keep sorted: binary searched { "tolower", FTOLOWER, BLTIN }, { "toupper", FTOUPPER, BLTIN }, { "while", WHILE, WHILE }, + { "xor", FXOR, BLTIN }, }; #define RET(x) { if(dbg)printf("lex %s\n", tokname(x)); return(x); } Modified: projects/runtime-coverage/contrib/one-true-awk/run.c ============================================================================== --- projects/runtime-coverage/contrib/one-true-awk/run.c Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/contrib/one-true-awk/run.c Sat Sep 16 03:54:20 2017 (r323636) @@ -1476,7 +1476,7 @@ Cell *bltin(Node **a, int n) /* builtin functions. a[0 { Cell *x, *y; Awkfloat u; - int t; + int t, i; Awkfloat tmp; char *p, *buf; Node *nextarg; @@ -1515,6 +1515,76 @@ Cell *bltin(Node **a, int n) /* builtin functions. a[0 tempfree(y); nextarg = nextarg->nnext; } + break; + case FCOMPL: + u = ~((int)getfval(x)); + break; + case FAND: + if (nextarg == NULL) { + WARNING("and requires two arguments; returning 0"); + u = 0; + break; + } + i = ((int)getfval(x)); + while (nextarg != NULL) { + y = execute(nextarg); + i &= (int)getfval(y); + tempfree(y); + nextarg = nextarg->nnext; + } + u = i; + break; + case FFOR: + if (nextarg == NULL) { + WARNING("or requires two arguments; returning 0"); + u = 0; + break; + } + i = ((int)getfval(x)); + while (nextarg != NULL) { + y = execute(nextarg); + i |= (int)getfval(y); + tempfree(y); + nextarg = nextarg->nnext; + } + u = i; + break; + case FXOR: + if (nextarg == NULL) { + WARNING("xor requires two arguments; returning 0"); + u = 0; + break; + } + i = ((int)getfval(x)); + while (nextarg != NULL) { + y = execute(nextarg); + i ^= (int)getfval(y); + tempfree(y); + nextarg = nextarg->nnext; + } + u = i; + break; + case FLSHIFT: + if (nextarg == NULL) { + WARNING("lshift requires two arguments; returning 0"); + u = 0; + break; + } + y = execute(a[1]->nnext); + u = ((int)getfval(x)) << ((int)getfval(y)); + tempfree(y); + nextarg = nextarg->nnext; + break; + case FRSHIFT: + if (nextarg == NULL) { + WARNING("rshift requires two arguments; returning 0"); + u = 0; + break; + } + y = execute(a[1]->nnext); + u = ((int)getfval(x)) >> ((int)getfval(y)); + tempfree(y); + nextarg = nextarg->nnext; break; case FSYSTEM: fflush(stdout); /* in case something is buffered already */ Modified: projects/runtime-coverage/contrib/zlib/deflate.c ============================================================================== --- projects/runtime-coverage/contrib/zlib/deflate.c Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/contrib/zlib/deflate.c Sat Sep 16 03:54:20 2017 (r323636) @@ -494,7 +494,7 @@ int ZEXPORT deflateResetKeep (strm) s->wrap == 2 ? crc32(0L, Z_NULL, 0) : #endif adler32(0L, Z_NULL, 0); - s->last_flush = Z_NO_FLUSH; + s->last_flush = -2; _tr_init(s); @@ -587,12 +587,12 @@ int ZEXPORT deflateParams(strm, level, strategy) func = configuration_table[s->level].func; if ((strategy != s->strategy || func != configuration_table[level].func) && - s->high_water) { + s->last_flush != -2) { /* Flush the last buffer: */ int err = deflate(strm, Z_BLOCK); if (err == Z_STREAM_ERROR) return err; - if (strm->avail_out == 0) + if (strm->avail_in || (s->strstart - s->block_start) + s->lookahead) return Z_BUF_ERROR; } if (s->level != level) { Modified: projects/runtime-coverage/contrib/zlib/zlib.h ============================================================================== --- projects/runtime-coverage/contrib/zlib/zlib.h Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/contrib/zlib/zlib.h Sat Sep 16 03:54:20 2017 (r323636) @@ -712,11 +712,12 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, used to switch between compression and straight copy of the input data, or to switch to a different kind of input data requiring a different strategy. If the compression approach (which is a function of the level) or the - strategy is changed, and if any input has been consumed in a previous - deflate() call, then the input available so far is compressed with the old - level and strategy using deflate(strm, Z_BLOCK). There are three approaches - for the compression levels 0, 1..3, and 4..9 respectively. The new level - and strategy will take effect at the next call of deflate(). + strategy is changed, and if there have been any deflate() calls since the + state was initialized or reset, then the input available so far is + compressed with the old level and strategy using deflate(strm, Z_BLOCK). + There are three approaches for the compression levels 0, 1..3, and 4..9 + respectively. The new level and strategy will take effect at the next call + of deflate(). If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does not have enough output space to complete, then the parameter change will not Modified: projects/runtime-coverage/etc/defaults/periodic.conf ============================================================================== --- projects/runtime-coverage/etc/defaults/periodic.conf Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/etc/defaults/periodic.conf Sat Sep 16 03:54:20 2017 (r323636) @@ -181,9 +181,6 @@ weekly_locate_enable="YES" # Update locate weekly # 320.whatis weekly_whatis_enable="YES" # Update whatis weekly -# 330.catman -weekly_catman_enable="NO" # Preformat man pages - # 340.noid weekly_noid_enable="NO" # Find unowned files weekly_noid_dirs="/" # Look here Modified: projects/runtime-coverage/etc/periodic/weekly/Makefile ============================================================================== --- projects/runtime-coverage/etc/periodic/weekly/Makefile Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/etc/periodic/weekly/Makefile Sat Sep 16 03:54:20 2017 (r323636) @@ -13,7 +13,7 @@ FILES+= 310.locate .endif .if ${MK_MAN_UTILS} != "no" -FILES+= 320.whatis 330.catman +FILES+= 320.whatis .endif .include Modified: projects/runtime-coverage/gnu/usr.bin/binutils/libbfd/Makefile.amd64 ============================================================================== --- projects/runtime-coverage/gnu/usr.bin/binutils/libbfd/Makefile.amd64 Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/gnu/usr.bin/binutils/libbfd/Makefile.amd64 Sat Sep 16 03:54:20 2017 (r323636) @@ -9,7 +9,6 @@ DEFAULT_VECTOR= bfd_elf64_x86_64_freebsd_vec SRCS+= elf64-x86-64.c \ efi-app-x86_64.c \ - efi-app-ia32.c \ elf64.c \ elf64-gen.c \ elf64-target.h \ Modified: projects/runtime-coverage/lib/libc/net/getaddrinfo.3 ============================================================================== --- projects/runtime-coverage/lib/libc/net/getaddrinfo.3 Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/lib/libc/net/getaddrinfo.3 Sat Sep 16 03:54:20 2017 (r323636) @@ -18,7 +18,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 21, 2015 +.Dd September 13, 2017 .Dt GETADDRINFO 3 .Os .Sh NAME @@ -351,6 +351,17 @@ pointer should be a .Li addrinfo structure created by a call to .Fn getaddrinfo . +.Sh IMPLEMENTATION NOTES +The behavior of +.Li freeadrinfo(NULL) +is left unspecified by both +.St -susv4 +and +.Dv "RFC 3493" . +The current implementation ignores a +.Dv NULL +argument for compatibility with programs that rely on the implementation +details of other operating systems. .Sh RETURN VALUES .Fn getaddrinfo returns zero on success or one of the error codes listed in Modified: projects/runtime-coverage/lib/libc/net/getaddrinfo.c ============================================================================== --- projects/runtime-coverage/lib/libc/net/getaddrinfo.c Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/lib/libc/net/getaddrinfo.c Sat Sep 16 03:54:20 2017 (r323636) @@ -35,7 +35,7 @@ * in the source code. This is because RFC2553 is silent about which error * code must be returned for which situation. * - freeaddrinfo(NULL). RFC2553 is silent about it. XNET 5.2 says it is - * invalid. current code - SEGV on freeaddrinfo(NULL) + * invalid. Current code accepts NULL to be compatible with other OSes. * * Note: * - The code filters out AFs that are not supported by the kernel, @@ -359,14 +359,13 @@ freeaddrinfo(struct addrinfo *ai) { struct addrinfo *next; - do { + while (ai != NULL) { next = ai->ai_next; - if (ai->ai_canonname) - free(ai->ai_canonname); + free(ai->ai_canonname); /* no need to free(ai->ai_addr) */ free(ai); ai = next; - } while (ai); + } } static int Modified: projects/runtime-coverage/lib/libc/sys/open.2 ============================================================================== --- projects/runtime-coverage/lib/libc/sys/open.2 Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/lib/libc/sys/open.2 Sat Sep 16 03:54:20 2017 (r323636) @@ -28,7 +28,7 @@ .\" @(#)open.2 8.2 (Berkeley) 11/16/93 .\" $FreeBSD$ .\" -.Dd November 22, 2016 +.Dd September 15, 2017 .Dt OPEN 2 .Os .Sh NAME @@ -487,7 +487,9 @@ is specified and the process is in capability mode. was called and the process is in capability mode. .It Bq Er ENOTCAPABLE .Fa path -is an absolute path or contained "..". +is an absolute path or contained a ".." component leading to a +directory outside of the directory hierarchy specified by +.Fa fd . .El .Sh SEE ALSO .Xr chmod 2 , Modified: projects/runtime-coverage/lib/libc/sys/ptrace.2 ============================================================================== --- projects/runtime-coverage/lib/libc/sys/ptrace.2 Sat Sep 16 02:41:38 2017 (r323635) +++ projects/runtime-coverage/lib/libc/sys/ptrace.2 Sat Sep 16 03:54:20 2017 (r323636) @@ -2,7 +2,7 @@ .\" $NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $ .\" .\" This file is in the public domain. -.Dd June 11, 2017 +.Dd September 14, 2017 .Dt PTRACE 2 .Os .Sh NAME @@ -762,6 +762,28 @@ The .Fa data argument is ignored. .El +.Sh ARM MACHINE-SPECIFIC REQUESTS +.Bl -tag -width "Dv PT_SETVFPREGS" +.It Dv PT_GETVFPREGS +Return the thread's +.Dv VFP +machine state in the buffer pointed to by +.Fa addr . +.Pp +The +.Fa data +argument is ignored. +.It Dv PT_SETVFPREGS +Set the thread's +.Dv VFP +machine state from the buffer pointed to by +.Fa addr . +.Pp +The +.Fa data +argument is ignored. +.El +.Pp .Sh x86 MACHINE-SPECIFIC REQUESTS *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sat Sep 16 16:16:02 2017 Return-Path: Delivered-To: svn-src-projects@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 84783E1F7F2 for ; Sat, 16 Sep 2017 16:16:02 +0000 (UTC) (envelope-from hselasky@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 604C77EF80; Sat, 16 Sep 2017 16:16:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8GGG1VN042858; Sat, 16 Sep 2017 16:16:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8GGG1bs042851; Sat, 16 Sep 2017 16:16:01 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201709161616.v8GGG1bs042851@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sat, 16 Sep 2017 16:16:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323643 - projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp X-SVN-Commit-Revision: 323643 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Sep 2017 16:16:02 -0000 Author: hselasky Date: Sat Sep 16 16:16:00 2017 New Revision: 323643 URL: https://svnweb.freebsd.org/changeset/base/323643 Log: Adapt the existing SDP ULP code to the new ibcore APIs. Requested by: Sobczak, Bartosz Sponsored by: Mellanox Technologies Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_cma.c projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_proc.c projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h Sat Sep 16 16:09:05 2017 (r323642) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h Sat Sep 16 16:16:00 2017 (r323643) @@ -52,7 +52,6 @@ #include #include #include -#include #include #ifdef SDP_DEBUG @@ -338,7 +337,6 @@ struct sdp_rx_ring { struct sdp_device { struct ib_pd *pd; - struct ib_mr *mr; struct ib_fmr_pool *fmr_pool; }; Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_cma.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_cma.c Sat Sep 16 16:09:05 2017 (r323642) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_cma.c Sat Sep 16 16:16:00 2017 (r323643) @@ -51,15 +51,14 @@ sdp_qp_event_handler(struct ib_event *event, void *dat static int sdp_get_max_dev_sge(struct ib_device *dev) { - struct ib_device_attr attr; + struct ib_device_attr *device_attr; static int max_sges = -1; if (max_sges > 0) goto out; - ib_query_device(dev, &attr); - - max_sges = attr.max_sge; + device_attr = &dev->attrs; + max_sges = device_attr->max_sge; out: return max_sges; Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Sat Sep 16 16:09:05 2017 (r323642) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Sat Sep 16 16:16:00 2017 (r323643) @@ -133,7 +133,7 @@ sdp_pcbbind(struct sdp_sock *ssk, struct sockaddr *nam /* rdma_bind_addr handles bind races. */ SDP_WUNLOCK(ssk); if (ssk->id == NULL) - ssk->id = rdma_create_id(sdp_cma_handler, ssk, RDMA_PS_SDP, IB_QPT_RC); + ssk->id = rdma_create_id(&init_net, sdp_cma_handler, ssk, RDMA_PS_SDP, IB_QPT_RC); if (ssk->id == NULL) { SDP_WLOCK(ssk); return (ENOMEM); @@ -1709,14 +1709,9 @@ int sdp_mod_usec = 0; void sdp_set_default_moderation(struct sdp_sock *ssk) { - struct ib_cq_attr attr; if (sdp_mod_count <= 0 || sdp_mod_usec <= 0) return; - memset(&attr, 0, sizeof(attr)); - attr.moderation.cq_count = sdp_mod_count; - attr.moderation.cq_period = sdp_mod_usec; - - ib_modify_cq(ssk->rx_ring.cq, &attr, IB_CQ_MODERATION); + ib_modify_cq(ssk->rx_ring.cq, sdp_mod_count, sdp_mod_usec); } static void @@ -1726,12 +1721,9 @@ sdp_dev_add(struct ib_device *device) struct sdp_device *sdp_dev; sdp_dev = malloc(sizeof(*sdp_dev), M_SDP, M_WAITOK | M_ZERO); - sdp_dev->pd = ib_alloc_pd(device); + sdp_dev->pd = ib_alloc_pd(device, 0); if (IS_ERR(sdp_dev->pd)) goto out_pd; - sdp_dev->mr = ib_get_dma_mr(sdp_dev->pd, IB_ACCESS_LOCAL_WRITE); - if (IS_ERR(sdp_dev->mr)) - goto out_mr; memset(¶m, 0, sizeof param); param.max_pages_per_fmr = SDP_FMR_SIZE; param.page_shift = PAGE_SHIFT; @@ -1746,15 +1738,13 @@ sdp_dev_add(struct ib_device *device) return; out_fmr: - ib_dereg_mr(sdp_dev->mr); -out_mr: ib_dealloc_pd(sdp_dev->pd); out_pd: free(sdp_dev, M_SDP); } static void -sdp_dev_rem(struct ib_device *device) +sdp_dev_rem(struct ib_device *device, void *client_data) { struct sdp_device *sdp_dev; struct sdp_sock *ssk; @@ -1778,7 +1768,6 @@ sdp_dev_rem(struct ib_device *device) return; ib_flush_fmr_pool(sdp_dev->fmr_pool); ib_destroy_fmr_pool(sdp_dev->fmr_pool); - ib_dereg_mr(sdp_dev->mr); ib_dealloc_pd(sdp_dev->pd); free(sdp_dev, M_SDP); } Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_proc.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_proc.c Sat Sep 16 16:09:05 2017 (r323642) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_proc.c Sat Sep 16 16:16:00 2017 (r323643) @@ -31,7 +31,6 @@ */ #include -#include #include "sdp.h" #ifdef CONFIG_PROC_FS Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c Sat Sep 16 16:09:05 2017 (r323642) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c Sat Sep 16 16:16:00 2017 (r323643) @@ -132,7 +132,7 @@ sdp_post_recv(struct sdp_sock *ssk) rx_req->mapping[i] = addr; sge->addr = addr; sge->length = mb->m_len; - sge->lkey = ssk->sdp_dev->mr->lkey; + sge->lkey = ssk->sdp_dev->pd->local_dma_lkey; } rx_wr.next = NULL; @@ -698,6 +698,11 @@ sdp_rx_cq_event_handler(struct ib_event *event, void * int sdp_rx_ring_create(struct sdp_sock *ssk, struct ib_device *device) { + struct ib_cq_init_attr rx_cq_attr = { + .cqe = SDP_RX_SIZE, + .comp_vector = 0, + .flags = 0, + }; struct ib_cq *rx_cq; int rc = 0; @@ -710,7 +715,7 @@ sdp_rx_ring_create(struct sdp_sock *ssk, struct ib_dev M_SDP, M_WAITOK); rx_cq = ib_create_cq(device, sdp_rx_irq, sdp_rx_cq_event_handler, - ssk, SDP_RX_SIZE, 0); + ssk, &rx_cq_attr); if (IS_ERR(rx_cq)) { rc = PTR_ERR(rx_cq); sdp_warn(ssk->socket, "Unable to allocate RX CQ: %d.\n", rc); Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c Sat Sep 16 16:09:05 2017 (r323642) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c Sat Sep 16 16:16:00 2017 (r323643) @@ -131,7 +131,7 @@ sdp_post_send(struct sdp_sock *ssk, struct mbuf *mb) tx_req->mapping[i] = addr; sge->addr = addr; sge->length = mb->m_len; - sge->lkey = ssk->sdp_dev->mr->lkey; + sge->lkey = ssk->sdp_dev->pd->local_dma_lkey; } tx_wr.next = NULL; tx_wr.wr_id = mseq | SDP_OP_SEND; @@ -418,6 +418,11 @@ sdp_tx_cq_event_handler(struct ib_event *event, void * int sdp_tx_ring_create(struct sdp_sock *ssk, struct ib_device *device) { + struct ib_cq_init_attr tx_cq_attr = { + .cqe = SDP_TX_SIZE, + .comp_vector = 0, + .flags = 0, + }; struct ib_cq *tx_cq; int rc = 0; @@ -431,7 +436,7 @@ sdp_tx_ring_create(struct sdp_sock *ssk, struct ib_dev M_SDP, M_WAITOK); tx_cq = ib_create_cq(device, sdp_tx_irq, sdp_tx_cq_event_handler, - ssk, SDP_TX_SIZE, 0); + ssk, &tx_cq_attr); if (IS_ERR(tx_cq)) { rc = PTR_ERR(tx_cq); sdp_warn(ssk->socket, "Unable to allocate TX CQ: %d.\n", rc); From owner-svn-src-projects@freebsd.org Sat Sep 16 16:17:09 2017 Return-Path: Delivered-To: svn-src-projects@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 D566BE1F88A for ; Sat, 16 Sep 2017 16:17:09 +0000 (UTC) (envelope-from hselasky@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 B1D7E7F06E; Sat, 16 Sep 2017 16:17:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8GGH82s042936; Sat, 16 Sep 2017 16:17:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8GGH8kQ042934; Sat, 16 Sep 2017 16:17:08 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201709161617.v8GGH8kQ042934@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sat, 16 Sep 2017 16:17:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323644 - projects/bsd_rdma_4_9/sys/conf X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9/sys/conf X-SVN-Commit-Revision: 323644 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Sep 2017 16:17:09 -0000 Author: hselasky Date: Sat Sep 16 16:17:08 2017 New Revision: 323644 URL: https://svnweb.freebsd.org/changeset/base/323644 Log: Fix in-kernel build of ibcore module. Requested by: Sobczak, Bartosz Sponsored by: Mellanox Technologies Modified: projects/bsd_rdma_4_9/sys/conf/files projects/bsd_rdma_4_9/sys/conf/kern.pre.mk Modified: projects/bsd_rdma_4_9/sys/conf/files ============================================================================== --- projects/bsd_rdma_4_9/sys/conf/files Sat Sep 16 16:16:00 2017 (r323643) +++ projects/bsd_rdma_4_9/sys/conf/files Sat Sep 16 16:17:08 2017 (r323644) @@ -4402,58 +4402,62 @@ compat/linuxkpi/common/src/linux_work.c optional comp compile-with "${LINUXKPI_C}" # OpenFabrics Enterprise Distribution (Infiniband) -ofed/drivers/infiniband/core/addr.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/agent.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/cache.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -# XXX Mad.c must be ordered before cm.c for sysinit sets to occur in -# the correct order. -ofed/drivers/infiniband/core/mad.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/cm.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/ -Wno-unused-function" -ofed/drivers/infiniband/core/cma.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/device.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/fmr_pool.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/iwcm.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/mad_rmpp.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/multicast.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/packer.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/peer_mem.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/sa_query.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/smi.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/sysfs.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/ucm.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/ucma.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/ud_header.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/umem.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/user_mad.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/uverbs_cmd.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/uverbs_main.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/uverbs_marshall.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" -ofed/drivers/infiniband/core/verbs.c optional ofed \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" +ofed/drivers/infiniband/core/ib_addr.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_agent.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_cache.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_cm.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_cma.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_cq.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_device.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_fmr_pool.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_iwcm.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_iwpm_msg.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_iwpm_util.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_mad.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_mad_rmpp.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_multicast.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_packer.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_sa_query.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_smi.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_sysfs.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_ucm.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_ucma.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_ud_header.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_umem.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_user_mad.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_uverbs_cmd.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_uverbs_main.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_uverbs_marshall.c optional ofed \ + compile-with "${OFED_C}" +ofed/drivers/infiniband/core/ib_verbs.c optional ofed \ + compile-with "${OFED_C}" ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c optional ipoib \ compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/" Modified: projects/bsd_rdma_4_9/sys/conf/kern.pre.mk ============================================================================== --- projects/bsd_rdma_4_9/sys/conf/kern.pre.mk Sat Sep 16 16:16:00 2017 (r323643) +++ projects/bsd_rdma_4_9/sys/conf/kern.pre.mk Sat Sep 16 16:17:08 2017 (r323644) @@ -177,9 +177,10 @@ LINUXKPI_C= ${NORMAL_C} ${LINUXKPI_INCLUDES} # Infiniband C flags. Correct include paths and omit errors that linux # does not honor. -OFEDINCLUDES= -I$S/ofed/include ${LINUXKPI_INCLUDES} +OFEDINCLUDES= -I$S/ofed/include -I$S/ofed/include/uapi ${LINUXKPI_INCLUDES} OFEDNOERR= -Wno-cast-qual -Wno-pointer-arith -OFEDCFLAGS= ${CFLAGS:N-I*} ${OFEDINCLUDES} ${CFLAGS:M-I*} ${OFEDNOERR} +OFEDCFLAGS= ${CFLAGS:N-I*} -DCONFIG_INFINIBAND_USER_MEM \ + ${OFEDINCLUDES} ${CFLAGS:M-I*} ${OFEDNOERR} OFED_C_NOIMP= ${CC} -c -o ${.TARGET} ${OFEDCFLAGS} ${WERROR} ${PROF} OFED_C= ${OFED_C_NOIMP} ${.IMPSRC} From owner-svn-src-projects@freebsd.org Sat Sep 16 16:24:40 2017 Return-Path: Delivered-To: svn-src-projects@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 3BEDBE200F1 for ; Sat, 16 Sep 2017 16:24:40 +0000 (UTC) (envelope-from hselasky@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 F191D7F79F; Sat, 16 Sep 2017 16:24:39 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8GGOdJJ047119; Sat, 16 Sep 2017 16:24:39 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8GGOdS8047118; Sat, 16 Sep 2017 16:24:39 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201709161624.v8GGOdS8047118@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sat, 16 Sep 2017 16:24:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323646 - projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Commit-Revision: 323646 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Sep 2017 16:24:40 -0000 Author: hselasky Date: Sat Sep 16 16:24:38 2017 New Revision: 323646 URL: https://svnweb.freebsd.org/changeset/base/323646 Log: Improve ibcore address resolving: - Add more sanity checks. - Preserve source port number when resolving address. - Remove no longer needed scope ID hacks for IPv6. Sponsored by: Mellanox Technologies Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_addr.c Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_addr.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_addr.c Sat Sep 16 16:23:00 2017 (r323645) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_addr.c Sat Sep 16 16:24:38 2017 (r323646) @@ -162,15 +162,10 @@ int rdma_translate_ip(const struct sockaddr *addr, break; #endif #ifdef INET6 - case AF_INET6: { - struct in6_addr in6_addr = ((const struct sockaddr_in6 *)addr)->sin6_addr; - - /* embed scope ID */ - in6_addr.s6_addr[3] = ((const struct sockaddr_in6 *)addr)->sin6_scope_id; - - dev = ip6_dev_find(dev_addr->net, in6_addr); + case AF_INET6: + dev = ip6_dev_find(dev_addr->net, + ((const struct sockaddr_in6 *)addr)->sin6_addr); break; - } #endif default: break; @@ -245,67 +240,90 @@ static int addr4_resolve(struct sockaddr_in *src_in, { struct sockaddr_in dst_tmp = *dst_in; u8 edst[MAX_ADDR_LEN]; + in_port_t src_port; + struct sockaddr *saddr; struct rtentry *rte; struct ifnet *ifp; int error; + int type; - /* - * Make sure the socket address length field - * is set, else rtalloc1() will fail. - */ - dst_tmp.sin_len = sizeof(dst_tmp); - + /* set VNET, if any */ CURVNET_SET(addr->net); + /* set default TTL limit */ addr->hoplimit = V_ip_defttl; - /* lookup route for destination */ - rte = rtalloc1((struct sockaddr *)&dst_tmp, 1, 0); - CURVNET_RESTORE(); + type = 0; + if (src_in->sin_addr.s_addr == INADDR_ANY) + type |= 1; + if (dst_tmp.sin_addr.s_addr == INADDR_ANY) + type |= 2; /* - * Make sure the route exists and has a valid link. + * Make sure the socket address length field + * is set, else rtalloc1() will fail. */ - if (rte == NULL) { - error = EHOSTUNREACH; - goto done; - } else if (rte->rt_ifp == NULL || RT_LINK_IS_UP(rte->rt_ifp) == 0) { - RTFREE_LOCKED(rte); - error = EHOSTUNREACH; - goto done; - } else if (src_in->sin_addr.s_addr != INADDR_ANY) { + dst_tmp.sin_len = sizeof(dst_tmp); + + /* Step 1 - lookup destination route if any */ + switch (type) { + case 0: + case 1: + /* regular destination route lookup */ + rte = rtalloc1((struct sockaddr *)&dst_tmp, 1, 0); + if (rte == NULL) { + error = EHOSTUNREACH; + goto done; + } else if (rte->rt_ifp == NULL || rte->rt_ifp == V_loif || + RT_LINK_IS_UP(rte->rt_ifp) == 0) { + RTFREE_LOCKED(rte); + error = EHOSTUNREACH; + goto done; + } RT_UNLOCK(rte); + break; + default: + error = ENETUNREACH; + goto done; + } + /* Step 2 - find outgoing network interface */ + switch (type) { + case 0: + /* source check */ ifp = ip_dev_find(addr->net, src_in->sin_addr.s_addr); if (ifp == NULL) { - RTFREE(rte); error = ENETUNREACH; - goto done; + goto error_rt_free; } else if (ifp != rte->rt_ifp) { error = ENETUNREACH; - goto failure; + goto error_put_ifp; } - } else { - struct sockaddr *saddr; - + break; + case 1: + /* get destination network interface from route */ ifp = rte->rt_ifp; dev_hold(ifp); - saddr = rte->rt_ifa->ifa_addr; + + src_port = src_in->sin_port; memcpy(src_in, saddr, rdma_addr_size(saddr)); - RT_UNLOCK(rte); + src_in->sin_port = src_port; /* preserve port number */ + break; + default: + break; } /* - * Resolve destination MAC address + * Step 3 - resolve destination MAC address */ if (dst_tmp.sin_addr.s_addr == INADDR_BROADCAST) { rdma_copy_addr_sub(edst, ifp->if_broadcastaddr, - ifp->if_addrlen, MAX_ADDR_LEN); + ifp->if_addrlen, MAX_ADDR_LEN); } else if (IN_MULTICAST(ntohl(dst_tmp.sin_addr.s_addr))) { error = addr_resolve_multi(edst, ifp, (struct sockaddr *)&dst_tmp); if (error != 0) - goto failure; + goto error_put_ifp; } else { bool is_gw = (rte->rt_flags & RTF_GATEWAY) != 0; memset(edst, 0, sizeof(edst)); @@ -313,26 +331,34 @@ static int addr4_resolve(struct sockaddr_in *src_in, rte->rt_gateway : (const struct sockaddr *)&dst_tmp, edst, NULL, NULL); if (error != 0) - goto failure; + goto error_put_ifp; else if (is_gw != 0) addr->network = RDMA_NETWORK_IPV4; } /* - * Copy destination and source MAC addresses + * Step 4 - copy destination and source MAC addresses */ error = -rdma_copy_addr(addr, ifp, edst); - if (error != 0) { -failure: - dev_put(ifp); + if (error != 0) + goto error_put_ifp; - if (error == EWOULDBLOCK || error == EAGAIN) - error = ENODATA; - } else { - *ifpp = ifp; - } + if (rte != NULL) + RTFREE(rte); + + *ifpp = ifp; + + goto done; + +error_put_ifp: + dev_put(ifp); +error_rt_free: RTFREE(rte); done: + CURVNET_RESTORE(); + + if (error == EWOULDBLOCK || error == EAGAIN) + error = ENODATA; return (-error); } #else @@ -353,67 +379,95 @@ static int addr6_resolve(struct sockaddr_in6 *src_in, { struct sockaddr_in6 dst_tmp = *dst_in; u8 edst[MAX_ADDR_LEN]; + in_port_t src_port; + struct sockaddr *saddr; struct rtentry *rte; struct ifnet *ifp; int error; + int type; - sa6_embedscope(&dst_tmp, 0); - sa6_embedscope(src_in, 0); - - /* - * Make sure the socket address length field - * is set, else rtalloc1() will fail. - */ - dst_tmp.sin6_len = sizeof(dst_tmp); - + /* set VNET, if any */ CURVNET_SET(addr->net); + /* set default TTL limit */ addr->hoplimit = V_ip_defttl; - /* lookup route for destination */ - rte = rtalloc1((struct sockaddr *)&dst_tmp, 1, 0); - CURVNET_RESTORE(); + type = 0; + if (ipv6_addr_any(&src_in->sin6_addr)) + type |= 1; + if (ipv6_addr_any(&dst_tmp.sin6_addr)) + type |= 2; /* - * Make sure the route exists and has a valid link. + * Make sure the socket address length field + * is set, else rtalloc1() will fail. */ - if (rte == NULL) { - error = EHOSTUNREACH; - goto done; - } else if (rte->rt_ifp == NULL || RT_LINK_IS_UP(rte->rt_ifp) == 0) { - RTFREE_LOCKED(rte); - error = EHOSTUNREACH; - goto done; - } else if (!IN6_IS_ADDR_UNSPECIFIED(&src_in->sin6_addr)) { + dst_tmp.sin6_len = sizeof(dst_tmp); + + /* Step 1 - lookup destination route if any */ + switch (type) { + case 0: + /* sanity check for IPv4 addresses */ + if (ipv6_addr_v4mapped(&src_in->sin6_addr) != + ipv6_addr_v4mapped(&dst_tmp.sin6_addr)) { + error = EAFNOSUPPORT; + goto done; + } + /* FALLTHROUGH */ + case 1: + /* regular destination route lookup */ + rte = rtalloc1((struct sockaddr *)&dst_tmp, 1, 0); + if (rte == NULL) { + error = EHOSTUNREACH; + goto done; + } else if (rte->rt_ifp == NULL || rte->rt_ifp == V_loif || + RT_LINK_IS_UP(rte->rt_ifp) == 0) { + RTFREE_LOCKED(rte); + error = EHOSTUNREACH; + goto done; + } RT_UNLOCK(rte); + break; + default: + error = ENETUNREACH; + goto done; + } + /* Step 2 - find outgoing network interface */ + switch (type) { + case 0: + /* source check */ ifp = ip6_dev_find(addr->net, src_in->sin6_addr); if (ifp == NULL) { - RTFREE(rte); error = ENETUNREACH; - goto done; + goto error_rt_free; } else if (ifp != rte->rt_ifp) { error = ENETUNREACH; - goto failure; + goto error_put_ifp; } - } else { - struct sockaddr *saddr; - + break; + case 1: + /* get destination network interface from route */ ifp = rte->rt_ifp; dev_hold(ifp); - saddr = rte->rt_ifa->ifa_addr; + + src_port = src_in->sin6_port; memcpy(src_in, saddr, rdma_addr_size(saddr)); - RT_UNLOCK(rte); + src_in->sin6_port = src_port; /* preserve port number */ + break; + default: + break; } /* - * Resolve destination MAC address + * Step 3 - resolve destination MAC address */ if (IN6_IS_ADDR_MULTICAST(&dst_tmp.sin6_addr)) { - error = addr_resolve_multi(edst, ifp, (struct sockaddr *)&dst_tmp); + error = addr_resolve_multi(edst, ifp, + (struct sockaddr *)&dst_tmp); if (error != 0) - goto failure; + goto error_put_ifp; } else { bool is_gw = (rte->rt_flags & RTF_GATEWAY) != 0; memset(edst, 0, sizeof(edst)); @@ -421,29 +475,34 @@ static int addr6_resolve(struct sockaddr_in6 *src_in, rte->rt_gateway : (const struct sockaddr *)&dst_tmp, edst, NULL, NULL); if (error != 0) - goto failure; + goto error_put_ifp; else if (is_gw != 0) addr->network = RDMA_NETWORK_IPV6; } /* - * Copy destination and source MAC addresses + * Step 4 - copy destination and source MAC addresses */ error = -rdma_copy_addr(addr, ifp, edst); - if (error != 0) { -failure: - dev_put(ifp); + if (error != 0) + goto error_put_ifp; - if (error == EWOULDBLOCK || error == EAGAIN) - error = ENODATA; - } else { - *ifpp = ifp; - } + if (rte != NULL) + RTFREE(rte); + + *ifpp = ifp; + + goto done; + +error_put_ifp: + dev_put(ifp); +error_rt_free: RTFREE(rte); done: - sa6_recoverscope(&dst_tmp); - sa6_recoverscope(src_in); + CURVNET_RESTORE(); + if (error == EWOULDBLOCK || error == EAGAIN) + error = ENODATA; return (-error); } #else From owner-svn-src-projects@freebsd.org Sat Sep 16 16:26:48 2017 Return-Path: Delivered-To: svn-src-projects@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 06445E202E7 for ; Sat, 16 Sep 2017 16:26:48 +0000 (UTC) (envelope-from hselasky@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 C809A7F970; Sat, 16 Sep 2017 16:26:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8GGQkfW047254; Sat, 16 Sep 2017 16:26:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8GGQkkh047253; Sat, 16 Sep 2017 16:26:46 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201709161626.v8GGQkkh047253@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sat, 16 Sep 2017 16:26:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323647 - projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Commit-Revision: 323647 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Sep 2017 16:26:48 -0000 Author: hselasky Date: Sat Sep 16 16:26:46 2017 New Revision: 323647 URL: https://svnweb.freebsd.org/changeset/base/323647 Log: Make sure the socket address length field gets set. Sponsored by: Mellanox Technologies Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c Sat Sep 16 16:24:38 2017 (r323646) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c Sat Sep 16 16:26:46 2017 (r323647) @@ -1094,6 +1094,7 @@ static void cma_save_ip4_info(struct sockaddr_in *src_ { if (src_addr) { *src_addr = (struct sockaddr_in) { + .sin_len = sizeof(struct sockaddr_in), .sin_family = AF_INET, .sin_addr.s_addr = hdr->dst_addr.ip4.addr, .sin_port = local_port, @@ -1102,6 +1103,7 @@ static void cma_save_ip4_info(struct sockaddr_in *src_ if (dst_addr) { *dst_addr = (struct sockaddr_in) { + .sin_len = sizeof(struct sockaddr_in), .sin_family = AF_INET, .sin_addr.s_addr = hdr->src_addr.ip4.addr, .sin_port = hdr->port, @@ -1124,6 +1126,7 @@ static void cma_save_ip6_info(struct sockaddr_in6 *src if (dst_addr) { *dst_addr = (struct sockaddr_in6) { + .sin6_len = sizeof(struct sockaddr_in6), .sin6_family = AF_INET6, .sin6_addr = hdr->src_addr.ip6, .sin6_port = hdr->port, From owner-svn-src-projects@freebsd.org Sat Sep 16 16:27:25 2017 Return-Path: Delivered-To: svn-src-projects@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 BA38CE2037D for ; Sat, 16 Sep 2017 16:27:25 +0000 (UTC) (envelope-from hselasky@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 840017FA55; Sat, 16 Sep 2017 16:27:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8GGROgh047319; Sat, 16 Sep 2017 16:27:24 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8GGROaF047318; Sat, 16 Sep 2017 16:27:24 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201709161627.v8GGROaF047318@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sat, 16 Sep 2017 16:27:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323648 - projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Commit-Revision: 323648 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Sep 2017 16:27:25 -0000 Author: hselasky Date: Sat Sep 16 16:27:24 2017 New Revision: 323648 URL: https://svnweb.freebsd.org/changeset/base/323648 Log: Fix for refcount leak. Sponsored by: Mellanox Technologies Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c Sat Sep 16 16:26:46 2017 (r323647) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c Sat Sep 16 16:27:24 2017 (r323648) @@ -1246,8 +1246,12 @@ static bool validate_ipv4_net_dev(struct net_device *n return false; src_dev = ip_dev_find(net_dev->if_vnet, saddr); - if (src_dev != net_dev) + if (src_dev != net_dev) { + if (src_dev != NULL) + dev_put(src_dev); return false; + } + dev_put(src_dev); /* * Make sure the socket address length field From owner-svn-src-projects@freebsd.org Sat Sep 16 16:28:21 2017 Return-Path: Delivered-To: svn-src-projects@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 30CC7E203FD for ; Sat, 16 Sep 2017 16:28:21 +0000 (UTC) (envelope-from hselasky@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 F20A07FB42; Sat, 16 Sep 2017 16:28:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8GGSKN4047402; Sat, 16 Sep 2017 16:28:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8GGSKFt047401; Sat, 16 Sep 2017 16:28:20 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201709161628.v8GGSKFt047401@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sat, 16 Sep 2017 16:28:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323649 - projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Commit-Revision: 323649 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Sep 2017 16:28:21 -0000 Author: hselasky Date: Sat Sep 16 16:28:19 2017 New Revision: 323649 URL: https://svnweb.freebsd.org/changeset/base/323649 Log: Set length field of socket address. Sponsored by: Mellanox Technologies Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c Sat Sep 16 16:27:24 2017 (r323648) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c Sat Sep 16 16:28:19 2017 (r323649) @@ -1118,6 +1118,7 @@ static void cma_save_ip6_info(struct sockaddr_in6 *src { if (src_addr) { *src_addr = (struct sockaddr_in6) { + .sin6_len = sizeof(struct sockaddr_in6), .sin6_family = AF_INET6, .sin6_addr = hdr->dst_addr.ip6, .sin6_port = local_port, From owner-svn-src-projects@freebsd.org Sat Sep 16 16:28:49 2017 Return-Path: Delivered-To: svn-src-projects@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 3EC44E20457 for ; Sat, 16 Sep 2017 16:28:49 +0000 (UTC) (envelope-from hselasky@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 0E4697FC4C; Sat, 16 Sep 2017 16:28:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8GGSmgb047458; Sat, 16 Sep 2017 16:28:48 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8GGSmtf047457; Sat, 16 Sep 2017 16:28:48 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201709161628.v8GGSmtf047457@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sat, 16 Sep 2017 16:28:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323650 - projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Commit-Revision: 323650 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Sep 2017 16:28:49 -0000 Author: hselasky Date: Sat Sep 16 16:28:48 2017 New Revision: 323650 URL: https://svnweb.freebsd.org/changeset/base/323650 Log: Embedding the scope ID is no longer needed for IPv6. Sponsored by: Mellanox Technologies Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c Sat Sep 16 16:28:19 2017 (r323649) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cma.c Sat Sep 16 16:28:48 2017 (r323650) @@ -1286,9 +1286,6 @@ static bool validate_ipv6_net_dev(struct net_device *n struct rtentry *rte; bool ret; - /* embed scope ID */ - in6_addr.s6_addr[3] = src_addr->sin6_scope_id; - src_dev = ip6_dev_find(net_dev->if_vnet, in6_addr); if (src_dev != net_dev) return false; From owner-svn-src-projects@freebsd.org Sat Sep 16 16:31:32 2017 Return-Path: Delivered-To: svn-src-projects@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 83829E209BB for ; Sat, 16 Sep 2017 16:31:32 +0000 (UTC) (envelope-from hselasky@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 431AA80200; Sat, 16 Sep 2017 16:31:32 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8GGVVuU049137; Sat, 16 Sep 2017 16:31:31 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8GGVUbk049132; Sat, 16 Sep 2017 16:31:30 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201709161631.v8GGVUbk049132@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sat, 16 Sep 2017 16:31:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323651 - projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Commit-Revision: 323651 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Sep 2017 16:31:32 -0000 Author: hselasky Date: Sat Sep 16 16:31:30 2017 New Revision: 323651 URL: https://svnweb.freebsd.org/changeset/base/323651 Log: Remove no longer needed linux_poll_wakeup() calls. This is now handled by "wake_up()" in the LinuxKPI. Accessing the file pointer directly might cause use after free issues. Sponsored by: Mellanox Technologies Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_ucm.c projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_ucma.c projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_user_mad.c projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/uverbs.h Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_ucm.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_ucm.c Sat Sep 16 16:28:48 2017 (r323650) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_ucm.c Sat Sep 16 16:31:30 2017 (r323651) @@ -370,7 +370,6 @@ static int ib_ucm_event_handler(struct ib_cm_id *cm_id list_add_tail(&uevent->file_list, &ctx->file->events); list_add_tail(&uevent->ctx_list, &ctx->events); wake_up_interruptible(&ctx->file->poll_wait); - linux_poll_wakeup(ctx->file->filp); mutex_unlock(&ctx->file->file_mutex); return 0; Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_ucma.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_ucma.c Sat Sep 16 16:28:48 2017 (r323650) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_ucma.c Sat Sep 16 16:31:30 2017 (r323651) @@ -353,7 +353,6 @@ static int ucma_event_handler(struct rdma_cm_id *cm_id list_add_tail(&uevent->list, &ctx->file->event_list); wake_up_interruptible(&ctx->file->poll_wait); - linux_poll_wakeup(ctx->file->filp); if (event->event == RDMA_CM_EVENT_DEVICE_REMOVAL) ucma_removal_event_handler(cm_id); out: Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_user_mad.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_user_mad.c Sat Sep 16 16:28:48 2017 (r323650) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_user_mad.c Sat Sep 16 16:31:30 2017 (r323651) @@ -105,7 +105,6 @@ struct ib_umad_device { struct ib_umad_file { struct mutex mutex; struct ib_umad_port *port; - struct file *filp; struct list_head recv_list; struct list_head send_list; struct list_head port_list; @@ -173,7 +172,6 @@ static int queue_packet(struct ib_umad_file *file, if (agent == __get_agent(file, packet->mad.hdr.id)) { list_add_tail(&packet->list, &file->recv_list); wake_up_interruptible(&file->recv_wait); - linux_poll_wakeup(file->filp); ret = 0; break; } @@ -952,7 +950,6 @@ static int ib_umad_open(struct inode *inode, struct fi init_waitqueue_head(&file->recv_wait); file->port = port; - file->filp = filp; filp->private_data = file; list_add_tail(&file->port_list, &port->file_list); Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c Sat Sep 16 16:28:48 2017 (r323650) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c Sat Sep 16 16:31:30 2017 (r323651) @@ -529,7 +529,6 @@ void ib_uverbs_comp_handler(struct ib_cq *cq, void *cq spin_unlock_irqrestore(&file->lock, flags); wake_up_interruptible(&file->poll_wait); - linux_poll_wakeup(file->filp); kill_fasync(&file->async_queue, SIGIO, POLL_IN); } @@ -564,7 +563,6 @@ static void ib_uverbs_async_handler(struct ib_uverbs_f spin_unlock_irqrestore(&file->async_file->lock, flags); wake_up_interruptible(&file->async_file->poll_wait); - linux_poll_wakeup(file->async_file->filp); kill_fasync(&file->async_file->async_queue, SIGIO, POLL_IN); } @@ -662,7 +660,6 @@ struct file *ib_uverbs_alloc_event_file(struct ib_uver if (IS_ERR(filp)) goto err_put_refs; filp->private_data = ev_file; - ev_file->filp = filp; mutex_lock(&uverbs_file->device->lists_mutex); list_add_tail(&ev_file->list, @@ -1315,7 +1312,6 @@ static void ib_uverbs_free_hw_resources(struct ib_uver } wake_up_interruptible(&event_file->poll_wait); - linux_poll_wakeup(event_file->filp); kill_fasync(&event_file->async_queue, SIGIO, POLL_IN); } mutex_unlock(&uverbs_dev->lists_mutex); Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/uverbs.h ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/uverbs.h Sat Sep 16 16:28:48 2017 (r323650) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/uverbs.h Sat Sep 16 16:31:30 2017 (r323651) @@ -106,7 +106,6 @@ struct ib_uverbs_device { struct ib_uverbs_event_file { struct kref ref; - struct file *filp; int is_async; struct ib_uverbs_file *uverbs_file; spinlock_t lock; From owner-svn-src-projects@freebsd.org Sat Sep 16 16:32:38 2017 Return-Path: Delivered-To: svn-src-projects@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 023A9E20A76 for ; Sat, 16 Sep 2017 16:32:38 +0000 (UTC) (envelope-from hselasky@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 C026B8039A; Sat, 16 Sep 2017 16:32:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8GGWaOA051342; Sat, 16 Sep 2017 16:32:36 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8GGWa2W051341; Sat, 16 Sep 2017 16:32:36 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201709161632.v8GGWa2W051341@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sat, 16 Sep 2017 16:32:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323652 - projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Commit-Revision: 323652 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Sep 2017 16:32:38 -0000 Author: hselasky Date: Sat Sep 16 16:32:36 2017 New Revision: 323652 URL: https://svnweb.freebsd.org/changeset/base/323652 Log: Temporary fix to avoid hitting kernel assert. Don't dirty VM pages at this point. Sponsored by: Mellanox Technologies Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_umem.c Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_umem.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_umem.c Sat Sep 16 16:31:30 2017 (r323651) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_umem.c Sat Sep 16 16:32:36 2017 (r323652) @@ -59,8 +59,6 @@ static void __ib_umem_release(struct ib_device *dev, s for_each_sg(umem->sg_head.sgl, sg, umem->npages, i) { page = sg_page(sg); - if (umem->writable && dirty) - set_page_dirty_lock(page); put_page(page); } From owner-svn-src-projects@freebsd.org Sat Sep 16 16:37:21 2017 Return-Path: Delivered-To: svn-src-projects@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 95CDAE20DA9 for ; Sat, 16 Sep 2017 16:37:21 +0000 (UTC) (envelope-from ngie@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 6167180655; Sat, 16 Sep 2017 16:37:21 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8GGbKeP051703; Sat, 16 Sep 2017 16:37:20 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8GGbJVf051689; Sat, 16 Sep 2017 16:37:19 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201709161637.v8GGbJVf051689@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 16 Sep 2017 16:37:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323653 - in projects/runtime-coverage: sbin/sysctl share/mk sys/arm/allwinner sys/arm/allwinner/clkng sys/modules/i2c/ds1307 sys/modules/i2c/ds13rtc sys/modules/i2c/ds3231 sys/modules/... X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/runtime-coverage: sbin/sysctl share/mk sys/arm/allwinner sys/arm/allwinner/clkng sys/modules/i2c/ds1307 sys/modules/i2c/ds13rtc sys/modules/i2c/ds3231 sys/modules/i2c/isl12xx sys/modules/i... X-SVN-Commit-Revision: 323653 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Sep 2017 16:37:21 -0000 Author: ngie Date: Sat Sep 16 16:37:18 2017 New Revision: 323653 URL: https://svnweb.freebsd.org/changeset/base/323653 Log: MFhead@r323646 Modified: projects/runtime-coverage/sbin/sysctl/sysctl.8 projects/runtime-coverage/share/mk/bsd.dep.mk projects/runtime-coverage/share/mk/bsd.init.mk projects/runtime-coverage/share/mk/bsd.lib.mk projects/runtime-coverage/share/mk/bsd.prog.mk projects/runtime-coverage/sys/arm/allwinner/a10_gpio.c projects/runtime-coverage/sys/arm/allwinner/aw_usbphy.c projects/runtime-coverage/sys/arm/allwinner/clkng/ccu_a64.c projects/runtime-coverage/sys/modules/i2c/ds1307/Makefile projects/runtime-coverage/sys/modules/i2c/ds13rtc/Makefile projects/runtime-coverage/sys/modules/i2c/ds3231/Makefile projects/runtime-coverage/sys/modules/i2c/isl12xx/Makefile projects/runtime-coverage/sys/modules/i2c/nxprtc/Makefile projects/runtime-coverage/sys/modules/i2c/s35390a/Makefile Directory Properties: projects/runtime-coverage/ (props changed) Modified: projects/runtime-coverage/sbin/sysctl/sysctl.8 ============================================================================== --- projects/runtime-coverage/sbin/sysctl/sysctl.8 Sat Sep 16 16:32:36 2017 (r323652) +++ projects/runtime-coverage/sbin/sysctl/sysctl.8 Sat Sep 16 16:37:18 2017 (r323653) @@ -214,7 +214,7 @@ String and integer values can be set using .It "kern.filedelay integer yes" .It "kern.dirdelay integer yes" .It "kern.metadelay integer yes" -.It "kern.osreldate string no" +.It "kern.osreldate integer no" .It "kern.bootfile string yes" .It "kern.corefile string yes" .It "kern.logsigexit integer yes" Modified: projects/runtime-coverage/share/mk/bsd.dep.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.dep.mk Sat Sep 16 16:32:36 2017 (r323652) +++ projects/runtime-coverage/share/mk/bsd.dep.mk Sat Sep 16 16:37:18 2017 (r323653) @@ -101,7 +101,7 @@ _SKIP_DEPEND= 1 CLEANFILES?= .for _S in ${SRCS:N*.[dhly]} -OBJS_DEPEND_GUESS.${_S:R}.o+= ${_S} +OBJS_DEPEND_GUESS.${_S:${OBJS_SRCS_FILTER:ts:}}.o+= ${_S} .endfor # Lexical analyzers @@ -180,7 +180,7 @@ DEPEND_MP?= -MP DEPEND_FILTER= C,/,_,g DEPENDSRCS= ${SRCS:M*.[cSC]} ${SRCS:M*.cxx} ${SRCS:M*.cpp} ${SRCS:M*.cc} .if !empty(DEPENDSRCS) -DEPENDOBJS+= ${DEPENDSRCS:R:S,$,.o,} +DEPENDOBJS+= ${DEPENDSRCS:${OBJS_SRCS_FILTER:ts:}:S,$,.o,} .endif DEPENDFILES_OBJS= ${DEPENDOBJS:O:u:${DEPEND_FILTER}:C/^/${DEPENDFILE}./} .if defined(_SKIP_DEPEND) Modified: projects/runtime-coverage/share/mk/bsd.init.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.init.mk Sat Sep 16 16:32:36 2017 (r323652) +++ projects/runtime-coverage/share/mk/bsd.init.mk Sat Sep 16 16:37:18 2017 (r323653) @@ -16,6 +16,10 @@ ____: .include .MAIN: all +# This is used in bsd.{dep,lib,prog}.mk as ${OBJS_SRCS_FILTER:ts:} +# Some makefiles may want T as well to avoid nested objdirs. +OBJS_SRCS_FILTER+= R + # Handle INSTALL_AS_USER here to maximize the chance that # it has final authority over fooOWN and fooGRP. .if ${MK_INSTALL_AS_USER} != "no" Modified: projects/runtime-coverage/share/mk/bsd.lib.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.lib.mk Sat Sep 16 16:32:36 2017 (r323652) +++ projects/runtime-coverage/share/mk/bsd.lib.mk Sat Sep 16 16:37:18 2017 (r323653) @@ -193,7 +193,7 @@ LDFLAGS+= -Wl,--version-script=${VERSION_MAP} .endif .if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME) -OBJS+= ${SRCS:N*.h:R:S/$/.o/} +OBJS+= ${SRCS:N*.h:${OBJS_SRCS_FILTER:ts:}:S/$/.o/} CLEANFILES+= ${OBJS} ${STATICOBJS} .endif @@ -483,13 +483,13 @@ lint: ${SRCS:M*.c} .if defined(LIB) && !empty(LIB) OBJS_DEPEND_GUESS+= ${SRCS:M*.h} .for _S in ${SRCS:N*.[hly]} -OBJS_DEPEND_GUESS.${_S:R}.po+= ${_S} +OBJS_DEPEND_GUESS.${_S:${OBJS_SRCS_FILTER:ts:}}.po+= ${_S} .endfor .endif .if defined(SHLIB_NAME) || \ defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) .for _S in ${SRCS:N*.[hly]} -OBJS_DEPEND_GUESS.${_S:R}.pico+= ${_S} +OBJS_DEPEND_GUESS.${_S:${OBJS_SRCS_FILTER:ts:}}.pico+= ${_S} OBJS_DEPEND_GUESS.${_S:R}.ppico+= ${_S} .endfor .endif Modified: projects/runtime-coverage/share/mk/bsd.prog.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.prog.mk Sat Sep 16 16:32:36 2017 (r323652) +++ projects/runtime-coverage/share/mk/bsd.prog.mk Sat Sep 16 16:37:18 2017 (r323653) @@ -100,7 +100,7 @@ PROGNAME?= ${PROG} .if defined(SRCS) -OBJS+= ${SRCS:N*.h:R:S/$/.o/g} +OBJS+= ${SRCS:N*.h:${OBJS_SRCS_FILTER:ts:}:S/$/.o/g} .if target(beforelinking) beforelinking: ${OBJS} Modified: projects/runtime-coverage/sys/arm/allwinner/a10_gpio.c ============================================================================== --- projects/runtime-coverage/sys/arm/allwinner/a10_gpio.c Sat Sep 16 16:32:36 2017 (r323652) +++ projects/runtime-coverage/sys/arm/allwinner/a10_gpio.c Sat Sep 16 16:37:18 2017 (r323653) @@ -197,6 +197,8 @@ struct a10_gpio_softc { static int a10_gpio_pin_get(device_t dev, uint32_t pin, unsigned int *value); static int a10_gpio_pin_set(device_t dev, uint32_t pin, unsigned int value); +static int a10_gpio_pin_get_locked(struct a10_gpio_softc *sc, uint32_t pin, unsigned int *value); +static int a10_gpio_pin_set_locked(struct a10_gpio_softc *sc, uint32_t pin, unsigned int value); #define A10_GPIO_WRITE(_sc, _off, _val) \ bus_space_write_4(_sc->sc_bst, _sc->sc_bsh, _off, _val) @@ -333,15 +335,15 @@ a10_gpio_pin_configure(struct a10_gpio_softc *sc, uint err = a10_gpio_set_function(sc, pin, A10_GPIO_INPUT); } else if (flags & GPIO_PIN_OUTPUT) { if (flags & GPIO_PIN_PRESET_LOW) { - a10_gpio_pin_set(sc->sc_dev, pin, 0); + a10_gpio_pin_set_locked(sc, pin, 0); } else if (flags & GPIO_PIN_PRESET_HIGH) { - a10_gpio_pin_set(sc->sc_dev, pin, 1); + a10_gpio_pin_set_locked(sc, pin, 1); } else { /* Read the pin and preset output to current state. */ err = a10_gpio_set_function(sc, pin, A10_GPIO_INPUT); if (err == 0) { - a10_gpio_pin_get(sc->sc_dev, pin, &val); - a10_gpio_pin_set(sc->sc_dev, pin, val); + a10_gpio_pin_get_locked(sc, pin, &val); + a10_gpio_pin_set_locked(sc, pin, val); } } if (err == 0) @@ -473,49 +475,77 @@ a10_gpio_pin_setflags(device_t dev, uint32_t pin, uint } static int -a10_gpio_pin_set(device_t dev, uint32_t pin, unsigned int value) +a10_gpio_pin_set_locked(struct a10_gpio_softc *sc, uint32_t pin, + unsigned int value) { - struct a10_gpio_softc *sc; uint32_t bank, data; - sc = device_get_softc(dev); + A10_GPIO_LOCK_ASSERT(sc); + if (pin > sc->padconf->npins) return (EINVAL); bank = sc->padconf->pins[pin].port; pin = sc->padconf->pins[pin].pin; - A10_GPIO_LOCK(sc); data = A10_GPIO_READ(sc, A10_GPIO_GP_DAT(bank)); if (value) data |= (1 << pin); else data &= ~(1 << pin); A10_GPIO_WRITE(sc, A10_GPIO_GP_DAT(bank), data); - A10_GPIO_UNLOCK(sc); return (0); } static int -a10_gpio_pin_get(device_t dev, uint32_t pin, unsigned int *val) +a10_gpio_pin_set(device_t dev, uint32_t pin, unsigned int value) { struct a10_gpio_softc *sc; - uint32_t bank, reg_data; + int ret; sc = device_get_softc(dev); + + A10_GPIO_LOCK(sc); + ret = a10_gpio_pin_set_locked(sc, pin, value); + A10_GPIO_UNLOCK(sc); + + return (ret); +} + +static int +a10_gpio_pin_get_locked(struct a10_gpio_softc *sc,uint32_t pin, + unsigned int *val) +{ + uint32_t bank, reg_data; + + A10_GPIO_LOCK_ASSERT(sc); + if (pin > sc->padconf->npins) return (EINVAL); bank = sc->padconf->pins[pin].port; pin = sc->padconf->pins[pin].pin; - A10_GPIO_LOCK(sc); reg_data = A10_GPIO_READ(sc, A10_GPIO_GP_DAT(bank)); - A10_GPIO_UNLOCK(sc); *val = (reg_data & (1 << pin)) ? 1 : 0; return (0); +} + +static int +a10_gpio_pin_get(device_t dev, uint32_t pin, unsigned int *val) +{ + struct a10_gpio_softc *sc; + int ret; + + sc = device_get_softc(dev); + + A10_GPIO_LOCK(sc); + ret = a10_gpio_pin_get_locked(sc, pin, val); + A10_GPIO_UNLOCK(sc); + + return (ret); } static int Modified: projects/runtime-coverage/sys/arm/allwinner/aw_usbphy.c ============================================================================== --- projects/runtime-coverage/sys/arm/allwinner/aw_usbphy.c Sat Sep 16 16:32:36 2017 (r323652) +++ projects/runtime-coverage/sys/arm/allwinner/aw_usbphy.c Sat Sep 16 16:37:18 2017 (r323653) @@ -53,53 +53,90 @@ __FBSDID("$FreeBSD$"); #include "phy_if.h" -#define USBPHY_NPHYS 4 -#define USBPHY_NRES USBPHY_NPHYS - enum awusbphy_type { AWUSBPHY_TYPE_A10 = 1, AWUSBPHY_TYPE_A13, AWUSBPHY_TYPE_A20, AWUSBPHY_TYPE_A31, - AWUSBPHY_TYPE_A83T, AWUSBPHY_TYPE_H3, AWUSBPHY_TYPE_A64 }; +struct aw_usbphy_conf { + int num_phys; + enum awusbphy_type phy_type; + bool pmu_unk1; + bool phy0_route; +}; + +static const struct aw_usbphy_conf a10_usbphy_conf = { + .num_phys = 3, + .phy_type = AWUSBPHY_TYPE_A10, + .pmu_unk1 = false, + .phy0_route = false, +}; + +static const struct aw_usbphy_conf a13_usbphy_conf = { + .num_phys = 2, + .phy_type = AWUSBPHY_TYPE_A13, + .pmu_unk1 = false, + .phy0_route = false, +}; + +static const struct aw_usbphy_conf a20_usbphy_conf = { + .num_phys = 3, + .phy_type = AWUSBPHY_TYPE_A20, + .pmu_unk1 = false, + .phy0_route = false, +}; + +static const struct aw_usbphy_conf a31_usbphy_conf = { + .num_phys = 3, + .phy_type = AWUSBPHY_TYPE_A31, + .pmu_unk1 = false, + .phy0_route = false, +}; + +static const struct aw_usbphy_conf h3_usbphy_conf = { + .num_phys = 4, + .phy_type = AWUSBPHY_TYPE_H3, + .pmu_unk1 = true, + .phy0_route = false, +}; + +static const struct aw_usbphy_conf a64_usbphy_conf = { + .num_phys = 2, + .phy_type = AWUSBPHY_TYPE_A64, + .pmu_unk1 = true, + .phy0_route = true, +}; + static struct ofw_compat_data compat_data[] = { - { "allwinner,sun4i-a10-usb-phy", AWUSBPHY_TYPE_A10 }, - { "allwinner,sun5i-a13-usb-phy", AWUSBPHY_TYPE_A13 }, - { "allwinner,sun6i-a31-usb-phy", AWUSBPHY_TYPE_A31 }, - { "allwinner,sun7i-a20-usb-phy", AWUSBPHY_TYPE_A20 }, - { "allwinner,sun8i-a83t-usb-phy", AWUSBPHY_TYPE_A83T }, - { "allwinner,sun8i-h3-usb-phy", AWUSBPHY_TYPE_H3 }, - { "allwinner,sun50i-a64-usb-phy", AWUSBPHY_TYPE_A64 }, + { "allwinner,sun4i-a10-usb-phy", (uintptr_t)&a10_usbphy_conf }, + { "allwinner,sun5i-a13-usb-phy", (uintptr_t)&a13_usbphy_conf }, + { "allwinner,sun6i-a31-usb-phy", (uintptr_t)&a31_usbphy_conf }, + { "allwinner,sun7i-a20-usb-phy", (uintptr_t)&a20_usbphy_conf }, + { "allwinner,sun8i-h3-usb-phy", (uintptr_t)&h3_usbphy_conf }, + { "allwinner,sun50i-a64-usb-phy", (uintptr_t)&a64_usbphy_conf }, { NULL, 0 } }; struct awusbphy_softc { - struct resource * res[USBPHY_NRES]; - regulator_t reg[USBPHY_NPHYS]; + struct resource * phy_ctrl; + struct resource ** pmu; + regulator_t * reg; gpio_pin_t id_det_pin; int id_det_valid; gpio_pin_t vbus_det_pin; int vbus_det_valid; - enum awusbphy_type phy_type; + struct aw_usbphy_conf *phy_conf; }; -static struct resource_spec awusbphy_spec[] = { - { SYS_RES_MEMORY, 0, RF_ACTIVE }, - { SYS_RES_MEMORY, 1, RF_ACTIVE }, - { SYS_RES_MEMORY, 2, RF_ACTIVE | RF_OPTIONAL }, - { SYS_RES_MEMORY, 3, RF_ACTIVE | RF_OPTIONAL }, - { -1, 0 } -}; +#define RD4(res, o) bus_read_4(res, (o)) +#define WR4(res, o, v) bus_write_4(res, (o), (v)) +#define CLR4(res, o, m) WR4(res, o, RD4(res, o) & ~(m)) +#define SET4(res, o, m) WR4(res, o, RD4(res, o) | (m)) -#define RD4(sc, i, o) bus_read_4((sc)->res[(i)], (o)) -#define WR4(sc, i, o, v) bus_write_4((sc)->res[(i)], (o), (v)) -#define CLR4(sc, i, o, m) WR4(sc, i, o, RD4(sc, i, o) & ~(m)) -#define SET4(sc, i, o, m) WR4(sc, i, o, RD4(sc, i, o) | (m)) - #define OTG_PHY_CFG 0x20 #define OTG_PHY_ROUTE_OTG (1 << 0) #define PMU_IRQ_ENABLE 0x00 @@ -117,24 +154,21 @@ awusbphy_configure(device_t dev, int phyno) sc = device_get_softc(dev); - if (sc->res[phyno] == NULL) + if (sc->pmu[phyno] == NULL) return; - if (sc->phy_type == AWUSBPHY_TYPE_A64) { - CLR4(sc, phyno, PMU_UNK_H3, PMU_UNK_H3_CLR); + if (sc->phy_conf->pmu_unk1 == true) + CLR4(sc->phy_ctrl, PMU_UNK_H3, PMU_UNK_H3_CLR); - /* EHCI0 and OTG share a PHY */ + if (sc->phy_conf->phy0_route == true) { if (phyno == 0) - SET4(sc, 0, OTG_PHY_CFG, OTG_PHY_ROUTE_OTG); - else if (phyno == 1) - CLR4(sc, 0, OTG_PHY_CFG, OTG_PHY_ROUTE_OTG); + SET4(sc->phy_ctrl, OTG_PHY_CFG, OTG_PHY_ROUTE_OTG); + else + CLR4(sc->phy_ctrl, OTG_PHY_CFG, OTG_PHY_ROUTE_OTG); } - if (phyno > 0) { - /* Enable passby */ - SET4(sc, phyno, PMU_IRQ_ENABLE, PMU_ULPI_BYPASS | - PMU_AHB_INCR8 | PMU_AHB_INCR4 | PMU_AHB_INCRX_ALIGN); - } + SET4(sc->pmu[phyno], PMU_IRQ_ENABLE, PMU_ULPI_BYPASS | + PMU_AHB_INCR8 | PMU_AHB_INCR4 | PMU_AHB_INCRX_ALIGN); } static int @@ -143,7 +177,7 @@ awusbphy_init(device_t dev) struct awusbphy_softc *sc; phandle_t node; char pname[20]; - int error, off; + int error, off, rid; regulator_t reg; hwreset_t rst; clk_t clk; @@ -151,8 +185,20 @@ awusbphy_init(device_t dev) sc = device_get_softc(dev); node = ofw_bus_get_node(dev); - sc->phy_type = ofw_bus_search_compatible(dev, compat_data)->ocd_data; + sc->phy_conf = (struct aw_usbphy_conf *)ofw_bus_search_compatible(dev, compat_data)->ocd_data; + /* Get phy_ctrl region */ + if (ofw_bus_find_string_index(node, "reg-names", "phy_ctrl", &rid) != 0) { + device_printf(dev, "Cannot locate phy control resource\n"); + return (ENXIO); + } + sc->phy_ctrl = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (sc->phy_ctrl == NULL) { + device_printf(dev, "Cannot allocate resource\n"); + return (ENXIO); + } + /* Enable clocks */ for (off = 0; clk_get_by_ofw_index(dev, 0, off, &clk) == 0; off++) { error = clk_enable(clk); @@ -173,13 +219,6 @@ awusbphy_init(device_t dev) } } - /* Get regulators */ - for (off = 0; off < USBPHY_NPHYS; off++) { - snprintf(pname, sizeof(pname), "usb%d_vbus-supply", off); - if (regulator_get_by_ofw_property(dev, 0, pname, ®) == 0) - sc->reg[off] = reg; - } - /* Get GPIOs */ error = gpio_pin_get_by_ofw_property(dev, node, "usb0_id_det-gpios", &sc->id_det_pin); @@ -190,10 +229,29 @@ awusbphy_init(device_t dev) if (error == 0) sc->vbus_det_valid = 1; - /* Allocate resources */ - if (bus_alloc_resources(dev, awusbphy_spec, sc->res) != 0) - device_printf(dev, "couldn't allocate resources\n"); + sc->reg = malloc(sizeof(*(sc->reg)) * sc->phy_conf->num_phys, M_DEVBUF, + M_WAITOK | M_ZERO); + sc->pmu = malloc(sizeof(*(sc->pmu)) * sc->phy_conf->num_phys, M_DEVBUF, + M_WAITOK | M_ZERO); + /* Get regulators */ + for (off = 0; off < sc->phy_conf->num_phys; off++) { + snprintf(pname, sizeof(pname), "usb%d_vbus-supply", off); + if (regulator_get_by_ofw_property(dev, 0, pname, ®) == 0) + sc->reg[off] = reg; + snprintf(pname, sizeof(pname), "pmu%d", off); + if (ofw_bus_find_string_index(node, "reg-names", + pname, &rid) != 0) + continue; + + sc->pmu[off] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (sc->pmu[off] == NULL) { + device_printf(dev, "Cannot allocate resource\n"); + return (ENXIO); + } + } + return (0); } @@ -225,10 +283,10 @@ awusbphy_phy_enable(device_t dev, intptr_t phy, bool e regulator_t reg; int error, vbus_det; - if (phy < 0 || phy >= USBPHY_NPHYS) - return (ERANGE); - sc = device_get_softc(dev); + + if (phy < 0 || phy >= sc->phy_conf->num_phys) + return (ERANGE); /* Configure PHY */ awusbphy_configure(dev, phy); Modified: projects/runtime-coverage/sys/arm/allwinner/clkng/ccu_a64.c ============================================================================== --- projects/runtime-coverage/sys/arm/allwinner/clkng/ccu_a64.c Sat Sep 16 16:32:36 2017 (r323652) +++ projects/runtime-coverage/sys/arm/allwinner/clkng/ccu_a64.c Sat Sep 16 16:37:18 2017 (r323653) @@ -66,8 +66,8 @@ static struct aw_ccung_reset a64_ccu_resets[] = { CCU_RESET(A64_RST_BUS_OTG, 0x2c0, 23) CCU_RESET(A64_RST_BUS_EHCI0, 0x2c0, 24) CCU_RESET(A64_RST_BUS_EHCI1, 0x2c0, 25) - CCU_RESET(A64_RST_BUS_OHCI0, 0x2c0, 26) - CCU_RESET(A64_RST_BUS_OHCI1, 0x2c0, 27) + CCU_RESET(A64_RST_BUS_OHCI0, 0x2c0, 28) + CCU_RESET(A64_RST_BUS_OHCI1, 0x2c0, 29) CCU_RESET(A64_RST_BUS_VE, 0x2c4, 0) CCU_RESET(A64_RST_BUS_TCON0, 0x2c4, 3) @@ -119,8 +119,8 @@ static struct aw_ccung_gate a64_ccu_gates[] = { CCU_GATE(A64_CLK_BUS_OTG, "bus-otg", "ahb1", 0x60, 23) CCU_GATE(A64_CLK_BUS_EHCI0, "bus-ehci0", "ahb1", 0x60, 24) CCU_GATE(A64_CLK_BUS_EHCI1, "bus-ehci1", "ahb2", 0x60, 25) - CCU_GATE(A64_CLK_BUS_OHCI0, "bus-ohci0", "ahb1", 0x60, 26) - CCU_GATE(A64_CLK_BUS_OHCI1, "bus-ohci1", "ahb2", 0x60, 27) + CCU_GATE(A64_CLK_BUS_OHCI0, "bus-ohci0", "ahb1", 0x60, 28) + CCU_GATE(A64_CLK_BUS_OHCI1, "bus-ohci1", "ahb2", 0x60, 29) CCU_GATE(A64_CLK_BUS_VE, "bus-ve", "ahb1", 0x64, 0) CCU_GATE(A64_CLK_BUS_TCON0, "bus-tcon0", "ahb1", 0x64, 3) Modified: projects/runtime-coverage/sys/modules/i2c/ds1307/Makefile ============================================================================== --- projects/runtime-coverage/sys/modules/i2c/ds1307/Makefile Sat Sep 16 16:32:36 2017 (r323652) +++ projects/runtime-coverage/sys/modules/i2c/ds1307/Makefile Sat Sep 16 16:37:18 2017 (r323653) @@ -2,6 +2,6 @@ .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = ds1307 -SRCS = ds1307.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h +SRCS = ds1307.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h .include Modified: projects/runtime-coverage/sys/modules/i2c/ds13rtc/Makefile ============================================================================== --- projects/runtime-coverage/sys/modules/i2c/ds13rtc/Makefile Sat Sep 16 16:32:36 2017 (r323652) +++ projects/runtime-coverage/sys/modules/i2c/ds13rtc/Makefile Sat Sep 16 16:37:18 2017 (r323653) @@ -2,6 +2,6 @@ .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = ds13rtc -SRCS = ds13rtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h +SRCS = ds13rtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h .include Modified: projects/runtime-coverage/sys/modules/i2c/ds3231/Makefile ============================================================================== --- projects/runtime-coverage/sys/modules/i2c/ds3231/Makefile Sat Sep 16 16:32:36 2017 (r323652) +++ projects/runtime-coverage/sys/modules/i2c/ds3231/Makefile Sat Sep 16 16:37:18 2017 (r323653) @@ -2,6 +2,6 @@ .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = ds3231 -SRCS = ds3231.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h +SRCS = ds3231.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h .include Modified: projects/runtime-coverage/sys/modules/i2c/isl12xx/Makefile ============================================================================== --- projects/runtime-coverage/sys/modules/i2c/isl12xx/Makefile Sat Sep 16 16:32:36 2017 (r323652) +++ projects/runtime-coverage/sys/modules/i2c/isl12xx/Makefile Sat Sep 16 16:37:18 2017 (r323653) @@ -2,6 +2,6 @@ .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = isl12xx -SRCS = isl12xx.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h +SRCS = isl12xx.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h .include Modified: projects/runtime-coverage/sys/modules/i2c/nxprtc/Makefile ============================================================================== --- projects/runtime-coverage/sys/modules/i2c/nxprtc/Makefile Sat Sep 16 16:32:36 2017 (r323652) +++ projects/runtime-coverage/sys/modules/i2c/nxprtc/Makefile Sat Sep 16 16:37:18 2017 (r323653) @@ -2,6 +2,6 @@ .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = nxprtc -SRCS = nxprtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h +SRCS = nxprtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h .include Modified: projects/runtime-coverage/sys/modules/i2c/s35390a/Makefile ============================================================================== --- projects/runtime-coverage/sys/modules/i2c/s35390a/Makefile Sat Sep 16 16:32:36 2017 (r323652) +++ projects/runtime-coverage/sys/modules/i2c/s35390a/Makefile Sat Sep 16 16:37:18 2017 (r323653) @@ -2,6 +2,6 @@ .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = s35390a -SRCS = s35390a.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h +SRCS = s35390a.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h .include