From owner-svn-src-projects@freebsd.org Sun Jul 28 04:02:32 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D2FFFA1A27 for ; Sun, 28 Jul 2019 04:02:32 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DDF784876; Sun, 28 Jul 2019 04:02:32 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AFE2AA010; Sun, 28 Jul 2019 04:02:31 +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 x6S42Vsn057446; Sun, 28 Jul 2019 04:02:31 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6S42OrI056470; Sun, 28 Jul 2019 04:02:24 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201907280402.x6S42OrI056470@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 28 Jul 2019 04:02:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r350387 - in projects/fuse2: . bin/ls cddl/contrib/opensolaris/lib/libctf/common cddl/contrib/opensolaris/lib/libzfs/common contrib/amd/amd contrib/bzip2 contrib/elftoolchain/common con... X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/fuse2: . bin/ls cddl/contrib/opensolaris/lib/libctf/common cddl/contrib/opensolaris/lib/libzfs/common contrib/amd/amd contrib/bzip2 contrib/elftoolchain/common contrib/elftoolchain/elfcopy... X-SVN-Commit-Revision: 350387 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4DDF784876 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_SHORT(-0.94)[-0.945,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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: Sun, 28 Jul 2019 04:02:33 -0000 Author: asomers Date: Sun Jul 28 04:02:22 2019 New Revision: 350387 URL: https://svnweb.freebsd.org/changeset/base/350387 Log: MFHead @r350386 Sponsored by: The FreeBSD Foundation Added: projects/fuse2/RELNOTES - copied unchanged from r350386, head/RELNOTES projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_rar5_arm_filter_on_window_boundary.rar.uu - copied unchanged from r350386, head/contrib/libarchive/libarchive/test/test_read_format_rar5_arm_filter_on_window_boundary.rar.uu projects/fuse2/contrib/unbound/.travis.yml - copied unchanged from r350386, head/contrib/unbound/.travis.yml projects/fuse2/contrib/unbound/README.md - copied unchanged from r350386, head/contrib/unbound/README.md projects/fuse2/contrib/unbound/contrib/unbound-fuzzme.patch - copied unchanged from r350386, head/contrib/unbound/contrib/unbound-fuzzme.patch projects/fuse2/lib/libc/arm/gen/arm_drain_writebuf.2 - copied unchanged from r350386, head/lib/libc/arm/gen/arm_drain_writebuf.2 projects/fuse2/lib/libc/arm/gen/arm_drain_writebuf.c - copied unchanged from r350386, head/lib/libc/arm/gen/arm_drain_writebuf.c projects/fuse2/lib/libc/arm/gen/arm_sync_icache.2 - copied unchanged from r350386, head/lib/libc/arm/gen/arm_sync_icache.2 projects/fuse2/lib/libc/arm/gen/arm_sync_icache.c - copied unchanged from r350386, head/lib/libc/arm/gen/arm_sync_icache.c projects/fuse2/lib/libc/sys/copy_file_range.2 - copied unchanged from r350386, head/lib/libc/sys/copy_file_range.2 projects/fuse2/libexec/rtld-elf/rtld-libc/ - copied from r350386, head/libexec/rtld-elf/rtld-libc/ projects/fuse2/release/packages/bluetooth.ucl - copied unchanged from r350386, head/release/packages/bluetooth.ucl projects/fuse2/release/packages/hostapd.ucl - copied unchanged from r350386, head/release/packages/hostapd.ucl projects/fuse2/release/packages/wpa.ucl - copied unchanged from r350386, head/release/packages/wpa.ucl projects/fuse2/sbin/nvmecontrol/comnd.c - copied unchanged from r350386, head/sbin/nvmecontrol/comnd.c projects/fuse2/sbin/nvmecontrol/comnd.h - copied unchanged from r350386, head/sbin/nvmecontrol/comnd.h projects/fuse2/sbin/nvmecontrol/passthru.c - copied unchanged from r350386, head/sbin/nvmecontrol/passthru.c projects/fuse2/share/man/man9/VOP_COPY_FILE_RANGE.9 - copied unchanged from r350386, head/share/man/man9/VOP_COPY_FILE_RANGE.9 projects/fuse2/sys/arm/ti/ti_sysc.c - copied unchanged from r350386, head/sys/arm/ti/ti_sysc.c projects/fuse2/sys/arm64/rockchip/rk3399_emmcphy.c - copied unchanged from r350386, head/sys/arm64/rockchip/rk3399_emmcphy.c projects/fuse2/sys/dev/fdt/simple_mfd.h - copied unchanged from r350386, head/sys/dev/fdt/simple_mfd.h projects/fuse2/sys/dev/ntb/ntb_hw/ntb_hw_amd.c - copied unchanged from r350386, head/sys/dev/ntb/ntb_hw/ntb_hw_amd.c projects/fuse2/sys/dev/ntb/ntb_hw/ntb_hw_amd.h - copied unchanged from r350386, head/sys/dev/ntb/ntb_hw/ntb_hw_amd.h projects/fuse2/sys/dev/superio/ - copied from r350386, head/sys/dev/superio/ projects/fuse2/sys/dev/xdma/xdma_iommu.c - copied unchanged from r350386, head/sys/dev/xdma/xdma_iommu.c projects/fuse2/sys/dts/arm/overlays/sun8i-h3-i2c0.dtso - copied unchanged from r350386, head/sys/dts/arm/overlays/sun8i-h3-i2c0.dtso projects/fuse2/sys/mips/beri/beri_iommu.c - copied unchanged from r350386, head/sys/mips/beri/beri_iommu.c projects/fuse2/sys/modules/ntb/ntb_hw_amd/ - copied from r350386, head/sys/modules/ntb/ntb_hw_amd/ projects/fuse2/sys/modules/superio/ - copied from r350386, head/sys/modules/superio/ projects/fuse2/sys/modules/usb/uacpi/ - copied from r350386, head/sys/modules/usb/uacpi/ projects/fuse2/sys/netinet/tcp_stacks/rack_bbr_common.c - copied unchanged from r350386, head/sys/netinet/tcp_stacks/rack_bbr_common.c projects/fuse2/tools/test/callout_free/ - copied from r350386, head/tools/test/callout_free/ projects/fuse2/usr.bin/login/motd.template - copied unchanged from r350386, head/usr.bin/login/motd.template projects/fuse2/usr.sbin/bhyve/net_backends.c - copied unchanged from r350386, head/usr.sbin/bhyve/net_backends.c projects/fuse2/usr.sbin/bhyve/net_backends.h - copied unchanged from r350386, head/usr.sbin/bhyve/net_backends.h Deleted: projects/fuse2/contrib/mandoc/libroff.h projects/fuse2/lib/libcasper/services/cap_random/ projects/fuse2/share/man/man9/vm_page_hold.9 projects/fuse2/sys/arm/arm/inckern.S projects/fuse2/usr.bin/login/motd projects/fuse2/usr.bin/truss/aarch64-cloudabi32.c projects/fuse2/usr.bin/truss/aarch64-cloudabi64.c projects/fuse2/usr.bin/truss/aarch64-freebsd.c projects/fuse2/usr.bin/truss/amd64-cloudabi32.c projects/fuse2/usr.bin/truss/amd64-cloudabi64.c projects/fuse2/usr.bin/truss/amd64-freebsd.c projects/fuse2/usr.bin/truss/amd64-freebsd32.c projects/fuse2/usr.bin/truss/amd64-linux.c projects/fuse2/usr.bin/truss/amd64-linux32.c projects/fuse2/usr.bin/truss/arm-freebsd.c projects/fuse2/usr.bin/truss/i386-cloudabi32.c projects/fuse2/usr.bin/truss/i386-freebsd.c projects/fuse2/usr.bin/truss/i386-linux.c projects/fuse2/usr.bin/truss/mips-freebsd.c projects/fuse2/usr.bin/truss/powerpc-freebsd.c projects/fuse2/usr.bin/truss/powerpc64-freebsd.c projects/fuse2/usr.bin/truss/powerpc64-freebsd32.c projects/fuse2/usr.bin/truss/riscv-freebsd.c projects/fuse2/usr.bin/truss/sparc64-freebsd.c Modified: projects/fuse2/.cirrus.yml projects/fuse2/Makefile projects/fuse2/Makefile.libcompat projects/fuse2/ObsoleteFiles.inc projects/fuse2/UPDATING projects/fuse2/bin/ls/Makefile projects/fuse2/cddl/contrib/opensolaris/lib/libctf/common/ctf.5 projects/fuse2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c projects/fuse2/contrib/amd/amd/amd.h projects/fuse2/contrib/amd/amd/rpc_fwd.c projects/fuse2/contrib/bzip2/CHANGES projects/fuse2/contrib/bzip2/LICENSE projects/fuse2/contrib/bzip2/README projects/fuse2/contrib/bzip2/README.COMPILATION.PROBLEMS projects/fuse2/contrib/bzip2/blocksort.c projects/fuse2/contrib/bzip2/bzip2.1 projects/fuse2/contrib/bzip2/bzip2.c projects/fuse2/contrib/bzip2/bzip2recover.c projects/fuse2/contrib/bzip2/bzlib.c projects/fuse2/contrib/bzip2/bzlib.h projects/fuse2/contrib/bzip2/bzlib_private.h projects/fuse2/contrib/bzip2/compress.c projects/fuse2/contrib/bzip2/crctable.c projects/fuse2/contrib/bzip2/decompress.c projects/fuse2/contrib/bzip2/huffman.c projects/fuse2/contrib/bzip2/randtable.c projects/fuse2/contrib/bzip2/spewG.c projects/fuse2/contrib/bzip2/unzcrash.c projects/fuse2/contrib/bzip2/words2 projects/fuse2/contrib/elftoolchain/common/_elftc.h projects/fuse2/contrib/elftoolchain/common/elfdefinitions.h projects/fuse2/contrib/elftoolchain/elfcopy/sections.c projects/fuse2/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 projects/fuse2/contrib/elftoolchain/libelftc/elftc_set_timestamps.c projects/fuse2/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c projects/fuse2/contrib/elftoolchain/readelf/readelf.c projects/fuse2/contrib/elftoolchain/strings/strings.c projects/fuse2/contrib/file/magic/Magdir/elf projects/fuse2/contrib/ipfilter/man/ipmon.8 projects/fuse2/contrib/less/LICENSE projects/fuse2/contrib/less/NEWS projects/fuse2/contrib/less/README projects/fuse2/contrib/less/brac.c projects/fuse2/contrib/less/ch.c projects/fuse2/contrib/less/charset.c projects/fuse2/contrib/less/charset.h projects/fuse2/contrib/less/cmd.h projects/fuse2/contrib/less/cmdbuf.c projects/fuse2/contrib/less/command.c projects/fuse2/contrib/less/compose.uni projects/fuse2/contrib/less/cvt.c projects/fuse2/contrib/less/decode.c projects/fuse2/contrib/less/edit.c projects/fuse2/contrib/less/filename.c projects/fuse2/contrib/less/fmt.uni projects/fuse2/contrib/less/forwback.c projects/fuse2/contrib/less/funcs.h projects/fuse2/contrib/less/help.c projects/fuse2/contrib/less/ifile.c projects/fuse2/contrib/less/input.c projects/fuse2/contrib/less/jump.c projects/fuse2/contrib/less/less.h projects/fuse2/contrib/less/less.hlp projects/fuse2/contrib/less/less.nro projects/fuse2/contrib/less/lessecho.c projects/fuse2/contrib/less/lessecho.nro projects/fuse2/contrib/less/lesskey.c projects/fuse2/contrib/less/lesskey.h projects/fuse2/contrib/less/lesskey.nro projects/fuse2/contrib/less/lglob.h projects/fuse2/contrib/less/line.c projects/fuse2/contrib/less/linenum.c projects/fuse2/contrib/less/lsystem.c projects/fuse2/contrib/less/main.c projects/fuse2/contrib/less/mark.c projects/fuse2/contrib/less/mkutable projects/fuse2/contrib/less/optfunc.c projects/fuse2/contrib/less/option.c projects/fuse2/contrib/less/option.h projects/fuse2/contrib/less/opttbl.c projects/fuse2/contrib/less/os.c projects/fuse2/contrib/less/output.c projects/fuse2/contrib/less/pattern.c projects/fuse2/contrib/less/pattern.h projects/fuse2/contrib/less/pckeys.h projects/fuse2/contrib/less/position.c projects/fuse2/contrib/less/position.h projects/fuse2/contrib/less/prompt.c projects/fuse2/contrib/less/screen.c projects/fuse2/contrib/less/scrsize.c projects/fuse2/contrib/less/search.c projects/fuse2/contrib/less/signal.c projects/fuse2/contrib/less/tags.c projects/fuse2/contrib/less/ttyin.c projects/fuse2/contrib/less/ubin.uni projects/fuse2/contrib/less/version.c projects/fuse2/contrib/less/wide.uni projects/fuse2/contrib/libarchive/libarchive/archive_read.c projects/fuse2/contrib/libarchive/libarchive/archive_read_disk_posix.c projects/fuse2/contrib/libarchive/libarchive/archive_read_support_format_rar5.c projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_rar5.c projects/fuse2/contrib/libcxxrt/exception.cc (contents, props changed) projects/fuse2/contrib/libcxxrt/memory.cc (contents, props changed) projects/fuse2/contrib/libunwind/src/DwarfInstructions.hpp projects/fuse2/contrib/libunwind/src/assembly.h projects/fuse2/contrib/llvm/include/llvm/Analysis/ValueTracking.h projects/fuse2/contrib/llvm/lib/Analysis/ValueTracking.cpp projects/fuse2/contrib/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp projects/fuse2/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp projects/fuse2/contrib/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp projects/fuse2/contrib/llvm/tools/clang/include/clang/AST/DeclBase.h projects/fuse2/contrib/llvm/tools/clang/include/clang/AST/Type.h projects/fuse2/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp projects/fuse2/contrib/llvm/tools/clang/lib/Basic/Version.cpp projects/fuse2/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp projects/fuse2/contrib/llvm/tools/clang/lib/Driver/ToolChains/Arch/PPC.cpp projects/fuse2/contrib/llvm/tools/lld/ELF/Arch/PPC64.cpp projects/fuse2/contrib/llvm/tools/lld/ELF/SymbolTable.cpp projects/fuse2/contrib/llvm/tools/lld/ELF/SymbolTable.h projects/fuse2/contrib/mandoc/Makefile.depend projects/fuse2/contrib/mandoc/TODO projects/fuse2/contrib/mandoc/arch.c projects/fuse2/contrib/mandoc/cgi.c projects/fuse2/contrib/mandoc/configure projects/fuse2/contrib/mandoc/dbm.c projects/fuse2/contrib/mandoc/dbm_map.h projects/fuse2/contrib/mandoc/eqn.7 projects/fuse2/contrib/mandoc/eqn_html.c projects/fuse2/contrib/mandoc/html.c projects/fuse2/contrib/mandoc/html.h projects/fuse2/contrib/mandoc/lib.in projects/fuse2/contrib/mandoc/main.c projects/fuse2/contrib/mandoc/man.7 projects/fuse2/contrib/mandoc/man_html.c projects/fuse2/contrib/mandoc/man_term.c projects/fuse2/contrib/mandoc/man_validate.c projects/fuse2/contrib/mandoc/mandoc.1 projects/fuse2/contrib/mandoc/mandoc.c projects/fuse2/contrib/mandoc/mandoc.css projects/fuse2/contrib/mandoc/mandoc.h projects/fuse2/contrib/mandoc/mandoc_char.7 projects/fuse2/contrib/mandoc/mandoc_headers.3 projects/fuse2/contrib/mandoc/mandoc_msg.c projects/fuse2/contrib/mandoc/mandocdb.c projects/fuse2/contrib/mandoc/manpath.c projects/fuse2/contrib/mandoc/mansearch.c projects/fuse2/contrib/mandoc/mansearch.h projects/fuse2/contrib/mandoc/mdoc.7 projects/fuse2/contrib/mandoc/mdoc_argv.c projects/fuse2/contrib/mandoc/mdoc_markdown.c projects/fuse2/contrib/mandoc/mdoc_term.c projects/fuse2/contrib/mandoc/mdoc_validate.c projects/fuse2/contrib/mandoc/out.c projects/fuse2/contrib/mandoc/read.c projects/fuse2/contrib/mandoc/roff.7 projects/fuse2/contrib/mandoc/roff.c projects/fuse2/contrib/mandoc/roff_html.c projects/fuse2/contrib/mandoc/tag.c projects/fuse2/contrib/mandoc/tbl_html.c projects/fuse2/contrib/mandoc/tbl_term.c projects/fuse2/contrib/mandoc/term.c projects/fuse2/contrib/netbsd-tests/lib/libc/gen/t_ftok.c projects/fuse2/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c projects/fuse2/contrib/netbsd-tests/lib/libc/stdio/t_fopen.c projects/fuse2/contrib/netbsd-tests/lib/libc/sys/t_access.c projects/fuse2/contrib/netbsd-tests/lib/libc/sys/t_mprotect.c projects/fuse2/contrib/netbsd-tests/lib/libc/sys/t_stat.c projects/fuse2/contrib/netbsd-tests/lib/libc/sys/t_write.c projects/fuse2/contrib/openmp/runtime/src/kmp_atomic.h projects/fuse2/contrib/openmp/runtime/src/kmp_csupport.cpp projects/fuse2/contrib/openmp/runtime/src/ompt-specific.cpp projects/fuse2/contrib/sqlite3/configure projects/fuse2/contrib/sqlite3/configure.ac projects/fuse2/contrib/sqlite3/shell.c projects/fuse2/contrib/sqlite3/sqlite3.c projects/fuse2/contrib/sqlite3/sqlite3.h projects/fuse2/contrib/sqlite3/tea/configure projects/fuse2/contrib/sqlite3/tea/configure.ac projects/fuse2/contrib/tcp_wrappers/hosts_access.c projects/fuse2/contrib/tcp_wrappers/inetcf.c projects/fuse2/contrib/tcp_wrappers/inetcf.h projects/fuse2/contrib/tcp_wrappers/mystdarg.h projects/fuse2/contrib/tcp_wrappers/options.c projects/fuse2/contrib/tcp_wrappers/rfc931.c projects/fuse2/contrib/tcp_wrappers/scaffold.c projects/fuse2/contrib/tcp_wrappers/scaffold.h projects/fuse2/contrib/tcp_wrappers/shell_cmd.c projects/fuse2/contrib/tcp_wrappers/socket.c projects/fuse2/contrib/tcp_wrappers/tcpd.c projects/fuse2/contrib/tcp_wrappers/tcpdchk.c projects/fuse2/contrib/tcp_wrappers/tcpdmatch.c projects/fuse2/contrib/telnet/telnet/commands.c projects/fuse2/contrib/telnet/telnet/telnet.c projects/fuse2/contrib/telnet/telnet/utilities.c projects/fuse2/contrib/tzdata/Makefile projects/fuse2/contrib/tzdata/NEWS projects/fuse2/contrib/tzdata/africa projects/fuse2/contrib/tzdata/antarctica projects/fuse2/contrib/tzdata/asia projects/fuse2/contrib/tzdata/australasia projects/fuse2/contrib/tzdata/backzone projects/fuse2/contrib/tzdata/checktab.awk projects/fuse2/contrib/tzdata/europe projects/fuse2/contrib/tzdata/factory projects/fuse2/contrib/tzdata/northamerica projects/fuse2/contrib/tzdata/pacificnew projects/fuse2/contrib/tzdata/southamerica projects/fuse2/contrib/tzdata/systemv projects/fuse2/contrib/tzdata/theory.html projects/fuse2/contrib/tzdata/version projects/fuse2/contrib/tzdata/zishrink.awk projects/fuse2/contrib/tzdata/zone.tab projects/fuse2/contrib/tzdata/zone1970.tab projects/fuse2/contrib/tzdata/zoneinfo2tdf.pl projects/fuse2/contrib/unbound/Makefile.in projects/fuse2/contrib/unbound/aclocal.m4 projects/fuse2/contrib/unbound/cachedb/cachedb.c projects/fuse2/contrib/unbound/compat/arc4random.c projects/fuse2/contrib/unbound/config.guess projects/fuse2/contrib/unbound/config.h projects/fuse2/contrib/unbound/config.h.in projects/fuse2/contrib/unbound/config.sub projects/fuse2/contrib/unbound/configure projects/fuse2/contrib/unbound/configure.ac projects/fuse2/contrib/unbound/contrib/README projects/fuse2/contrib/unbound/contrib/fastrpz.patch projects/fuse2/contrib/unbound/contrib/libunbound.so.conf projects/fuse2/contrib/unbound/contrib/unbound.init projects/fuse2/contrib/unbound/daemon/daemon.c projects/fuse2/contrib/unbound/daemon/remote.c projects/fuse2/contrib/unbound/daemon/stats.c projects/fuse2/contrib/unbound/daemon/unbound.c projects/fuse2/contrib/unbound/daemon/worker.c projects/fuse2/contrib/unbound/dns64/dns64.c projects/fuse2/contrib/unbound/dnscrypt/dnscrypt.c projects/fuse2/contrib/unbound/dnstap/dnstap.c projects/fuse2/contrib/unbound/doc/Changelog projects/fuse2/contrib/unbound/doc/README projects/fuse2/contrib/unbound/doc/example.conf projects/fuse2/contrib/unbound/doc/example.conf.in projects/fuse2/contrib/unbound/doc/libunbound.3 projects/fuse2/contrib/unbound/doc/libunbound.3.in projects/fuse2/contrib/unbound/doc/unbound-anchor.8 projects/fuse2/contrib/unbound/doc/unbound-anchor.8.in projects/fuse2/contrib/unbound/doc/unbound-checkconf.8 projects/fuse2/contrib/unbound/doc/unbound-checkconf.8.in projects/fuse2/contrib/unbound/doc/unbound-control.8 projects/fuse2/contrib/unbound/doc/unbound-control.8.in projects/fuse2/contrib/unbound/doc/unbound-host.1 projects/fuse2/contrib/unbound/doc/unbound-host.1.in projects/fuse2/contrib/unbound/doc/unbound.8 projects/fuse2/contrib/unbound/doc/unbound.8.in projects/fuse2/contrib/unbound/doc/unbound.conf.5 projects/fuse2/contrib/unbound/doc/unbound.conf.5.in projects/fuse2/contrib/unbound/doc/unbound.doxygen projects/fuse2/contrib/unbound/edns-subnet/addrtree.c projects/fuse2/contrib/unbound/edns-subnet/addrtree.h projects/fuse2/contrib/unbound/edns-subnet/subnetmod.c projects/fuse2/contrib/unbound/edns-subnet/subnetmod.h projects/fuse2/contrib/unbound/install-sh projects/fuse2/contrib/unbound/iterator/iter_fwd.c projects/fuse2/contrib/unbound/iterator/iter_hints.c projects/fuse2/contrib/unbound/iterator/iter_scrub.c projects/fuse2/contrib/unbound/iterator/iter_utils.c projects/fuse2/contrib/unbound/iterator/iter_utils.h projects/fuse2/contrib/unbound/iterator/iterator.c projects/fuse2/contrib/unbound/iterator/iterator.h projects/fuse2/contrib/unbound/libunbound/libunbound.c projects/fuse2/contrib/unbound/libunbound/libworker.c projects/fuse2/contrib/unbound/libunbound/ubsyms.def projects/fuse2/contrib/unbound/libunbound/unbound.h projects/fuse2/contrib/unbound/ltmain.sh projects/fuse2/contrib/unbound/respip/respip.c projects/fuse2/contrib/unbound/services/authzone.c projects/fuse2/contrib/unbound/services/authzone.h projects/fuse2/contrib/unbound/services/cache/dns.c projects/fuse2/contrib/unbound/services/cache/infra.c projects/fuse2/contrib/unbound/services/cache/infra.h projects/fuse2/contrib/unbound/services/listen_dnsport.c projects/fuse2/contrib/unbound/services/listen_dnsport.h projects/fuse2/contrib/unbound/services/localzone.c projects/fuse2/contrib/unbound/services/localzone.h projects/fuse2/contrib/unbound/services/mesh.c projects/fuse2/contrib/unbound/services/mesh.h projects/fuse2/contrib/unbound/services/modstack.c projects/fuse2/contrib/unbound/services/outside_network.c projects/fuse2/contrib/unbound/services/outside_network.h projects/fuse2/contrib/unbound/sldns/wire2str.c projects/fuse2/contrib/unbound/smallapp/unbound-checkconf.c projects/fuse2/contrib/unbound/smallapp/unbound-control-setup.sh projects/fuse2/contrib/unbound/smallapp/unbound-control-setup.sh.in projects/fuse2/contrib/unbound/smallapp/unbound-control.c projects/fuse2/contrib/unbound/util/alloc.c projects/fuse2/contrib/unbound/util/config_file.c projects/fuse2/contrib/unbound/util/config_file.h projects/fuse2/contrib/unbound/util/configlexer.lex projects/fuse2/contrib/unbound/util/configparser.y projects/fuse2/contrib/unbound/util/data/msgencode.c projects/fuse2/contrib/unbound/util/data/msgreply.c projects/fuse2/contrib/unbound/util/data/msgreply.h projects/fuse2/contrib/unbound/util/edns.c projects/fuse2/contrib/unbound/util/fptr_wlist.c projects/fuse2/contrib/unbound/util/iana_ports.inc projects/fuse2/contrib/unbound/util/log.c projects/fuse2/contrib/unbound/util/log.h projects/fuse2/contrib/unbound/util/mini_event.c projects/fuse2/contrib/unbound/util/net_help.c projects/fuse2/contrib/unbound/util/net_help.h projects/fuse2/contrib/unbound/util/netevent.c projects/fuse2/contrib/unbound/util/netevent.h projects/fuse2/contrib/unbound/util/storage/lookup3.c projects/fuse2/contrib/unbound/util/ub_event.c projects/fuse2/contrib/unbound/validator/val_neg.c projects/fuse2/include/unistd.h projects/fuse2/kerberos5/usr.bin/krb5-config/Makefile projects/fuse2/lib/clang/include/clang/Basic/Version.inc projects/fuse2/lib/clang/include/lld/Common/Version.inc projects/fuse2/lib/clang/include/llvm/Support/VCSRevision.h projects/fuse2/lib/libarchive/tests/Makefile projects/fuse2/lib/libc/arm/Symbol.map projects/fuse2/lib/libc/arm/gen/Makefile.inc projects/fuse2/lib/libc/gen/elf_utils.c projects/fuse2/lib/libc/gen/gen-private.h projects/fuse2/lib/libc/gen/setmode.3 projects/fuse2/lib/libc/iconv/citrus_none.c projects/fuse2/lib/libc/stdlib/bsearch.3 projects/fuse2/lib/libc/sys/Makefile.inc projects/fuse2/lib/libc/sys/Symbol.map projects/fuse2/lib/libc/sys/procctl.2 projects/fuse2/lib/libc/sys/ptrace.2 projects/fuse2/lib/libc/sys/read.2 projects/fuse2/lib/libc/tests/gen/dir2_test.c projects/fuse2/lib/libc/tests/net/Makefile projects/fuse2/lib/libc/tests/string/wcsnlen_test.c projects/fuse2/lib/libcasper/libcasper/libcasper.3 projects/fuse2/lib/libcasper/services/Makefile projects/fuse2/lib/libcasper/services/cap_fileargs/Makefile projects/fuse2/lib/libcxxrt/Makefile projects/fuse2/lib/libcxxrt/Version.map projects/fuse2/lib/libdpv/Makefile projects/fuse2/lib/libelf/Makefile projects/fuse2/lib/libfigpar/Makefile projects/fuse2/lib/libgssapi/gss_accept_sec_context.c projects/fuse2/lib/libgssapi/gss_names.c projects/fuse2/lib/libkvm/kvm_aarch64.h projects/fuse2/lib/libnv/msgio.c projects/fuse2/lib/libnv/tests/Makefile projects/fuse2/lib/libnv/tests/nvlist_send_recv_test.c projects/fuse2/lib/libpam/modules/pam_exec/pam_exec.8 projects/fuse2/lib/libpam/modules/pam_exec/pam_exec.c projects/fuse2/lib/libproc/proc_bkpt.c projects/fuse2/lib/libproc/proc_sym.c projects/fuse2/lib/libsecureboot/openpgp/opgp_sig.c projects/fuse2/lib/libsecureboot/vets.c projects/fuse2/lib/libsysdecode/Makefile projects/fuse2/lib/libthr/thread/thr_info.c projects/fuse2/lib/libutil/expand_number.3 projects/fuse2/libexec/bootpd/Makefile.inc projects/fuse2/libexec/bootpd/tools/Makefile.inc projects/fuse2/libexec/rc/rc.d/Makefile projects/fuse2/libexec/rc/rc.d/accounting projects/fuse2/libexec/rc/rc.d/motd projects/fuse2/libexec/rtld-elf/Makefile projects/fuse2/libexec/rtld-elf/libmap.c projects/fuse2/libexec/rtld-elf/rtld.c projects/fuse2/libexec/rtld-elf/rtld_lock.c projects/fuse2/libexec/rtld-elf/rtld_printf.c projects/fuse2/libexec/rtld-elf/xmalloc.c projects/fuse2/release/packages/Makefile.package projects/fuse2/release/picobsd/bridge/crunch.conf projects/fuse2/release/picobsd/qemu/crunch.conf projects/fuse2/release/picobsd/tinyware/login/pathnames.h projects/fuse2/rescue/rescue/Makefile projects/fuse2/sbin/camcontrol/Makefile projects/fuse2/sbin/camcontrol/camcontrol.8 projects/fuse2/sbin/camcontrol/camcontrol.c projects/fuse2/sbin/camcontrol/camcontrol.h projects/fuse2/sbin/camcontrol/epc.c projects/fuse2/sbin/camcontrol/fwdownload.c projects/fuse2/sbin/camcontrol/zone.c projects/fuse2/sbin/etherswitchcfg/etherswitchcfg.8 projects/fuse2/sbin/etherswitchcfg/etherswitchcfg.c projects/fuse2/sbin/fsck_ffs/pass1.c projects/fuse2/sbin/fsck_ffs/suj.c projects/fuse2/sbin/ifconfig/Makefile projects/fuse2/sbin/ifconfig/ifconfig.8 projects/fuse2/sbin/ifconfig/ifconfig.c projects/fuse2/sbin/mount/mntopts.h projects/fuse2/sbin/mount/mount.8 projects/fuse2/sbin/mount/mount.c projects/fuse2/sbin/nvmecontrol/Makefile projects/fuse2/sbin/nvmecontrol/devlist.c projects/fuse2/sbin/nvmecontrol/firmware.c projects/fuse2/sbin/nvmecontrol/format.c projects/fuse2/sbin/nvmecontrol/identify.c projects/fuse2/sbin/nvmecontrol/logpage.c projects/fuse2/sbin/nvmecontrol/modules/wdc/wdc.c projects/fuse2/sbin/nvmecontrol/ns.c projects/fuse2/sbin/nvmecontrol/nvmecontrol.c projects/fuse2/sbin/nvmecontrol/nvmecontrol.h projects/fuse2/sbin/nvmecontrol/perftest.c projects/fuse2/sbin/nvmecontrol/power.c projects/fuse2/sbin/nvmecontrol/reset.c projects/fuse2/sbin/ping/Makefile projects/fuse2/sbin/ping6/Makefile projects/fuse2/sbin/ping6/ping6.c projects/fuse2/sbin/swapon/swapon.c projects/fuse2/share/man/man1/Makefile projects/fuse2/share/man/man3/Makefile projects/fuse2/share/man/man4/Makefile projects/fuse2/share/man/man4/cdce.4 projects/fuse2/share/man/man4/cue.4 projects/fuse2/share/man/man4/ixgbe.4 projects/fuse2/share/man/man4/ixl.4 projects/fuse2/share/man/man4/kue.4 projects/fuse2/share/man/man4/man4.aarch64/Makefile projects/fuse2/share/man/man4/man4.arm/Makefile projects/fuse2/share/man/man4/man4.i386/Makefile projects/fuse2/share/man/man4/man4.powerpc/Makefile projects/fuse2/share/man/man4/man4.sparc64/Makefile projects/fuse2/share/man/man4/nvme.4 projects/fuse2/share/man/man4/pci.4 projects/fuse2/share/man/man4/rgephy.4 projects/fuse2/share/man/man4/snd_hda.4 projects/fuse2/share/man/man4/tcp.4 projects/fuse2/share/man/man4/vmx.4 projects/fuse2/share/man/man5/Makefile projects/fuse2/share/man/man5/core.5 projects/fuse2/share/man/man5/fstab.5 projects/fuse2/share/man/man5/motd.5 projects/fuse2/share/man/man6/Makefile projects/fuse2/share/man/man7/Makefile projects/fuse2/share/man/man8/Makefile projects/fuse2/share/man/man8/picobsd.8 projects/fuse2/share/man/man9/Makefile projects/fuse2/share/man/man9/VOP_BMAP.9 projects/fuse2/share/man/man9/VOP_GETPAGES.9 projects/fuse2/share/man/man9/VOP_PATHCONF.9 projects/fuse2/share/man/man9/casuword.9 projects/fuse2/share/man/man9/epoch.9 projects/fuse2/share/man/man9/mbuf.9 projects/fuse2/share/man/man9/refcount.9 projects/fuse2/share/man/man9/sglist.9 projects/fuse2/share/misc/organization.dot projects/fuse2/share/mk/bsd.compiler.mk projects/fuse2/share/mk/bsd.confs.mk projects/fuse2/share/mk/bsd.cpu.mk projects/fuse2/share/mk/bsd.dep.mk projects/fuse2/share/mk/bsd.init.mk projects/fuse2/share/mk/bsd.snmpmod.mk projects/fuse2/share/mk/bsd.sys.mk projects/fuse2/share/mk/src.libnames.mk projects/fuse2/share/mk/src.opts.mk projects/fuse2/share/mk/sys.mk projects/fuse2/share/zoneinfo/Makefile projects/fuse2/stand/common/commands.c projects/fuse2/stand/efi/libefi/efihttp.c projects/fuse2/stand/efi/libefi/efinet.c projects/fuse2/stand/libsa/net.h projects/fuse2/sys/amd64/amd64/minidump_machdep.c projects/fuse2/sys/amd64/amd64/pmap.c projects/fuse2/sys/amd64/amd64/support.S projects/fuse2/sys/amd64/amd64/trap.c projects/fuse2/sys/amd64/conf/NOTES projects/fuse2/sys/amd64/ia32/ia32_syscall.c projects/fuse2/sys/amd64/include/vmm.h projects/fuse2/sys/amd64/include/vmm_dev.h projects/fuse2/sys/amd64/linux/linux_ptrace.c projects/fuse2/sys/amd64/vmm/io/vatpit.c projects/fuse2/sys/amd64/vmm/vmm.c projects/fuse2/sys/amd64/vmm/vmm_dev.c projects/fuse2/sys/arm/amlogic/aml8726/aml8726_mmc.c projects/fuse2/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c projects/fuse2/sys/arm/arm/fusu.S projects/fuse2/sys/arm/arm/gic_acpi.c projects/fuse2/sys/arm/arm/minidump_machdep.c projects/fuse2/sys/arm/arm/pmap-v4.c projects/fuse2/sys/arm/arm/pmap-v6.c projects/fuse2/sys/arm/arm/syscall.c projects/fuse2/sys/arm/conf/GENERIC projects/fuse2/sys/arm/conf/NOTES.armv5 projects/fuse2/sys/arm/conf/TEGRA124 projects/fuse2/sys/arm/include/sysarch.h projects/fuse2/sys/arm/mv/discovery/std.db78xxx projects/fuse2/sys/arm/mv/orion/std.db88f5xxx projects/fuse2/sys/arm/mv/orion/std.ts7800 projects/fuse2/sys/arm/ralink/std.ralink projects/fuse2/sys/arm/ti/files.ti projects/fuse2/sys/arm/ti/ti_hwmods.c projects/fuse2/sys/arm64/arm64/cpufunc_asm.S projects/fuse2/sys/arm64/arm64/efirt_machdep.c projects/fuse2/sys/arm64/arm64/elf_machdep.c projects/fuse2/sys/arm64/arm64/identcpu.c projects/fuse2/sys/arm64/arm64/minidump_machdep.c projects/fuse2/sys/arm64/arm64/pmap.c projects/fuse2/sys/arm64/arm64/support.S projects/fuse2/sys/arm64/arm64/trap.c projects/fuse2/sys/arm64/conf/GENERIC projects/fuse2/sys/arm64/include/armreg.h projects/fuse2/sys/arm64/include/cpu.h projects/fuse2/sys/arm64/include/elf.h projects/fuse2/sys/arm64/include/pte.h projects/fuse2/sys/arm64/rockchip/rk_grf.c projects/fuse2/sys/cam/ata/ata_all.c projects/fuse2/sys/cam/ata/ata_da.c projects/fuse2/sys/cam/ata/ata_xpt.c projects/fuse2/sys/cam/ctl/ctl.c projects/fuse2/sys/cam/ctl/ctl.h projects/fuse2/sys/cam/ctl/ctl_backend_ramdisk.c projects/fuse2/sys/cam/ctl/ctl_private.h projects/fuse2/sys/cam/scsi/scsi_all.c projects/fuse2/sys/cam/scsi/scsi_all.h projects/fuse2/sys/cam/scsi/scsi_cd.c projects/fuse2/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/fuse2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/fuse2/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h projects/fuse2/sys/compat/freebsd32/freebsd32_misc.c projects/fuse2/sys/compat/linux/linux_common.c projects/fuse2/sys/compat/linux/linux_ioctl.c projects/fuse2/sys/compat/linux/linux_ioctl.h projects/fuse2/sys/compat/linux/linux_mib.h projects/fuse2/sys/compat/linux/linux_misc.c projects/fuse2/sys/compat/linux/linux_mmap.c projects/fuse2/sys/compat/linux/linux_mmap.h projects/fuse2/sys/compat/linuxkpi/common/include/linux/gfp.h projects/fuse2/sys/compat/linuxkpi/common/src/linux_page.c projects/fuse2/sys/conf/Makefile.arm projects/fuse2/sys/conf/config.mk projects/fuse2/sys/conf/files projects/fuse2/sys/conf/files.amd64 projects/fuse2/sys/conf/files.arm64 projects/fuse2/sys/conf/files.i386 projects/fuse2/sys/conf/kern.mk projects/fuse2/sys/conf/options.powerpc projects/fuse2/sys/contrib/dev/acpica/changes.txt projects/fuse2/sys/contrib/dev/acpica/compiler/asldefine.h projects/fuse2/sys/contrib/dev/acpica/compiler/aslglobal.h projects/fuse2/sys/contrib/dev/acpica/compiler/aslload.c projects/fuse2/sys/contrib/dev/acpica/compiler/aslmessages.c projects/fuse2/sys/contrib/dev/acpica/compiler/aslmessages.h projects/fuse2/sys/contrib/dev/acpica/compiler/aslstubs.c projects/fuse2/sys/contrib/dev/acpica/compiler/aslsupport.l projects/fuse2/sys/contrib/dev/acpica/components/dispatcher/dsinit.c projects/fuse2/sys/contrib/dev/acpica/components/events/evgpe.c projects/fuse2/sys/contrib/dev/acpica/components/events/evgpeblk.c projects/fuse2/sys/contrib/dev/acpica/components/events/evxface.c projects/fuse2/sys/contrib/dev/acpica/components/events/evxfgpe.c projects/fuse2/sys/contrib/dev/acpica/components/executer/exconfig.c projects/fuse2/sys/contrib/dev/acpica/components/namespace/nsaccess.c projects/fuse2/sys/contrib/dev/acpica/components/namespace/nseval.c projects/fuse2/sys/contrib/dev/acpica/components/namespace/nsinit.c projects/fuse2/sys/contrib/dev/acpica/components/namespace/nsload.c projects/fuse2/sys/contrib/dev/acpica/components/namespace/nsutils.c projects/fuse2/sys/contrib/dev/acpica/components/tables/tbdata.c projects/fuse2/sys/contrib/dev/acpica/components/tables/tbxfload.c projects/fuse2/sys/contrib/dev/acpica/components/utilities/utinit.c projects/fuse2/sys/contrib/dev/acpica/components/utilities/utxfinit.c projects/fuse2/sys/contrib/dev/acpica/include/acevents.h projects/fuse2/sys/contrib/dev/acpica/include/acglobal.h projects/fuse2/sys/contrib/dev/acpica/include/acnamesp.h projects/fuse2/sys/contrib/dev/acpica/include/acpixf.h projects/fuse2/sys/contrib/ipfilter/netinet/fil.c projects/fuse2/sys/contrib/ipfilter/netinet/ip_fil.h projects/fuse2/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c projects/fuse2/sys/contrib/ipfilter/netinet/ip_state.c projects/fuse2/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c projects/fuse2/sys/dev/altera/msgdma/msgdma.c projects/fuse2/sys/dev/altera/softdma/softdma.c projects/fuse2/sys/dev/bge/if_bge.c projects/fuse2/sys/dev/bwn/if_bwn.c projects/fuse2/sys/dev/cxgbe/common/t4_hw.c projects/fuse2/sys/dev/cxgbe/iw_cxgbe/cm.c projects/fuse2/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h projects/fuse2/sys/dev/cxgbe/t4_main.c projects/fuse2/sys/dev/cxgbe/t4_sge.c projects/fuse2/sys/dev/cxgbe/tom/t4_cpl_io.c projects/fuse2/sys/dev/cxgbe/tom/t4_ddp.c projects/fuse2/sys/dev/cxgbe/tom/t4_tls.c projects/fuse2/sys/dev/cxgbe/tom/t4_tom.c projects/fuse2/sys/dev/cxgbe/tom/t4_tom.h projects/fuse2/sys/dev/etherswitch/e6000sw/e6000sw.c projects/fuse2/sys/dev/etherswitch/e6000sw/e6000swreg.h projects/fuse2/sys/dev/etherswitch/etherswitch.h projects/fuse2/sys/dev/fdt/simple_mfd.c projects/fuse2/sys/dev/hyperv/include/hyperv.h projects/fuse2/sys/dev/hyperv/include/vmbus.h projects/fuse2/sys/dev/hyperv/netvsc/hn_nvs.c projects/fuse2/sys/dev/hyperv/netvsc/if_hn.c projects/fuse2/sys/dev/hyperv/netvsc/ndis.h projects/fuse2/sys/dev/hyperv/vmbus/vmbus.c projects/fuse2/sys/dev/iicbus/iicbus.h projects/fuse2/sys/dev/iicbus/iiconf.c projects/fuse2/sys/dev/iicbus/nxprtc.c projects/fuse2/sys/dev/isci/isci.c projects/fuse2/sys/dev/isci/isci.h projects/fuse2/sys/dev/isci/isci_controller.c projects/fuse2/sys/dev/iwm/if_iwm.c projects/fuse2/sys/dev/ixgbe/if_ix.c projects/fuse2/sys/dev/ixgbe/if_ixv.c projects/fuse2/sys/dev/ixgbe/ixgbe.h projects/fuse2/sys/dev/mlx5/mlx5_en/mlx5_en_main.c projects/fuse2/sys/dev/mmc/host/dwmmc.c projects/fuse2/sys/dev/mmc/mmcsd.c projects/fuse2/sys/dev/mpr/mpr.c projects/fuse2/sys/dev/mpr/mpr_sas.c projects/fuse2/sys/dev/mpr/mpr_sas_lsi.c projects/fuse2/sys/dev/mpr/mprvar.h projects/fuse2/sys/dev/mps/mps.c projects/fuse2/sys/dev/mps/mps_sas.c projects/fuse2/sys/dev/mps/mps_sas_lsi.c projects/fuse2/sys/dev/mps/mpsvar.h projects/fuse2/sys/dev/nctgpio/nctgpio.c projects/fuse2/sys/dev/netmap/netmap_freebsd.c projects/fuse2/sys/dev/netmap/netmap_generic.c projects/fuse2/sys/dev/netmap/netmap_mem2.c projects/fuse2/sys/dev/ntb/ntb.c projects/fuse2/sys/dev/ntb/ntb.h projects/fuse2/sys/dev/ntb/ntb_if.m projects/fuse2/sys/dev/ntb/ntb_transport.c projects/fuse2/sys/dev/nvme/nvme.c projects/fuse2/sys/dev/nvme/nvme.h projects/fuse2/sys/dev/nvme/nvme_ctrlr.c projects/fuse2/sys/dev/nvme/nvme_private.h projects/fuse2/sys/dev/nvme/nvme_qpair.c projects/fuse2/sys/dev/nvme/nvme_sysctl.c projects/fuse2/sys/dev/ow/owc_gpiobus.c projects/fuse2/sys/dev/pci/pci.c projects/fuse2/sys/dev/pci/pci_user.c projects/fuse2/sys/dev/proto/proto.h projects/fuse2/sys/dev/proto/proto_busdma.c projects/fuse2/sys/dev/proto/proto_busdma.h projects/fuse2/sys/dev/proto/proto_core.c projects/fuse2/sys/dev/sdhci/sdhci_fdt.c projects/fuse2/sys/dev/sfxge/common/ef10_impl.h projects/fuse2/sys/dev/sfxge/common/ef10_nvram.c projects/fuse2/sys/dev/sfxge/common/ef10_rx.c projects/fuse2/sys/dev/sfxge/common/efsys.h projects/fuse2/sys/dev/sfxge/common/efx.h projects/fuse2/sys/dev/sfxge/common/efx_mcdi.h projects/fuse2/sys/dev/sfxge/common/efx_tx.c projects/fuse2/sys/dev/sfxge/sfxge_port.c projects/fuse2/sys/dev/sfxge/sfxge_rx.c projects/fuse2/sys/dev/sound/pci/hda/hdaa.c projects/fuse2/sys/dev/sound/pci/hda/hdaa.h projects/fuse2/sys/dev/uart/uart_dev_ns8250.c projects/fuse2/sys/dev/usb/net/if_cdce.c projects/fuse2/sys/dev/usb/net/if_muge.c projects/fuse2/sys/dev/usb/quirk/usb_quirk.c projects/fuse2/sys/dev/usb/serial/ugensa.c projects/fuse2/sys/dev/usb/usb_hub_acpi.c projects/fuse2/sys/dev/usb/usbdevs projects/fuse2/sys/dev/virtio/mmio/virtio_mmio.c projects/fuse2/sys/dev/virtio/pci/virtio_pci.c projects/fuse2/sys/dev/vt/vt_cpulogos.c projects/fuse2/sys/dev/xdma/xdma.c projects/fuse2/sys/dev/xdma/xdma.h projects/fuse2/sys/dev/xdma/xdma_if.m projects/fuse2/sys/dev/xdma/xdma_sg.c projects/fuse2/sys/dev/xilinx/axidma.c projects/fuse2/sys/fs/ext2fs/ext2_balloc.c projects/fuse2/sys/fs/ext2fs/ext2_vfsops.c projects/fuse2/sys/geom/eli/g_eli.c projects/fuse2/sys/geom/mirror/g_mirror.c projects/fuse2/sys/i386/conf/NOTES projects/fuse2/sys/i386/i386/copyout.c projects/fuse2/sys/i386/i386/minidump_machdep_base.c projects/fuse2/sys/i386/i386/pmap.c projects/fuse2/sys/i386/i386/trap.c projects/fuse2/sys/kern/imgact_elf.c projects/fuse2/sys/kern/init_sysent.c projects/fuse2/sys/kern/kern_descrip.c projects/fuse2/sys/kern/kern_exec.c projects/fuse2/sys/kern/kern_fork.c projects/fuse2/sys/kern/kern_mbuf.c projects/fuse2/sys/kern/kern_procctl.c projects/fuse2/sys/kern/kern_sendfile.c projects/fuse2/sys/kern/kern_sig.c projects/fuse2/sys/kern/kern_thread.c projects/fuse2/sys/kern/kern_timeout.c projects/fuse2/sys/kern/kern_umtx.c projects/fuse2/sys/kern/subr_blist.c projects/fuse2/sys/kern/subr_bus.c projects/fuse2/sys/kern/subr_bus_dma.c projects/fuse2/sys/kern/subr_epoch.c projects/fuse2/sys/kern/subr_sglist.c projects/fuse2/sys/kern/subr_syscall.c projects/fuse2/sys/kern/subr_turnstile.c projects/fuse2/sys/kern/sys_generic.c projects/fuse2/sys/kern/sys_pipe.c projects/fuse2/sys/kern/sys_process.c projects/fuse2/sys/kern/syscalls.c projects/fuse2/sys/kern/syscalls.master projects/fuse2/sys/kern/systrace_args.c projects/fuse2/sys/kern/tty.c projects/fuse2/sys/kern/uipc_mbuf.c projects/fuse2/sys/kern/uipc_mqueue.c projects/fuse2/sys/kern/uipc_shm.c projects/fuse2/sys/kern/uipc_sockbuf.c projects/fuse2/sys/kern/uipc_socket.c projects/fuse2/sys/kern/uipc_usrreq.c projects/fuse2/sys/kern/vfs_default.c projects/fuse2/sys/kern/vfs_subr.c projects/fuse2/sys/kern/vfs_syscalls.c projects/fuse2/sys/kern/vfs_vnops.c projects/fuse2/sys/kern/vnode_if.src projects/fuse2/sys/libkern/inet_pton.c projects/fuse2/sys/mips/beri/files.beri projects/fuse2/sys/mips/ingenic/jz4780_machdep.c projects/fuse2/sys/mips/ingenic/jz4780_mmc.c projects/fuse2/sys/mips/ingenic/jz4780_smb.c projects/fuse2/sys/mips/mips/minidump_machdep.c projects/fuse2/sys/mips/mips/pmap.c projects/fuse2/sys/mips/mips/support.S projects/fuse2/sys/mips/mips/trap.c projects/fuse2/sys/modules/Makefile projects/fuse2/sys/modules/dtb/allwinner/Makefile projects/fuse2/sys/modules/i2c/controllers/ichiic/Makefile projects/fuse2/sys/modules/ntb/Makefile projects/fuse2/sys/modules/tcp/rack/Makefile projects/fuse2/sys/modules/usb/Makefile projects/fuse2/sys/modules/usb/usb/Makefile projects/fuse2/sys/net/bpf.c projects/fuse2/sys/net/bpf_buffer.c projects/fuse2/sys/net/bpf_zerocopy.c projects/fuse2/sys/net/ieee_oui.h projects/fuse2/sys/net/if.c projects/fuse2/sys/net/if.h projects/fuse2/sys/net/if_tap.h projects/fuse2/sys/net/if_tun.h projects/fuse2/sys/net/if_tuntap.c projects/fuse2/sys/net/if_vlan.c projects/fuse2/sys/net/if_vxlan.c projects/fuse2/sys/net/iflib.c projects/fuse2/sys/netinet/in_pcb.h projects/fuse2/sys/netinet/ip_output.c projects/fuse2/sys/netinet/sctp_indata.c projects/fuse2/sys/netinet/sctp_input.c projects/fuse2/sys/netinet/sctp_output.c projects/fuse2/sys/netinet/sctp_pcb.c projects/fuse2/sys/netinet/sctp_pcb.h projects/fuse2/sys/netinet/sctp_usrreq.c projects/fuse2/sys/netinet/sctputil.c projects/fuse2/sys/netinet/tcp.h projects/fuse2/sys/netinet/tcp_hpts.c projects/fuse2/sys/netinet/tcp_hpts.h projects/fuse2/sys/netinet/tcp_log_buf.h projects/fuse2/sys/netinet/tcp_output.c projects/fuse2/sys/netinet/tcp_pcap.c projects/fuse2/sys/netinet/tcp_sack.c projects/fuse2/sys/netinet/tcp_stacks/rack.c projects/fuse2/sys/netinet/tcp_stacks/rack_bbr_common.h projects/fuse2/sys/netinet/tcp_subr.c projects/fuse2/sys/netinet/tcp_usrreq.c projects/fuse2/sys/netinet/tcp_var.h projects/fuse2/sys/netinet6/ip6_output.c projects/fuse2/sys/netinet6/sctp6_usrreq.c projects/fuse2/sys/netinet6/udp6_usrreq.c projects/fuse2/sys/netpfil/ipfw/ip_fw_bpf.c projects/fuse2/sys/netpfil/ipfw/ip_fw_eaction.c projects/fuse2/sys/netpfil/pf/pf_ioctl.c projects/fuse2/sys/powerpc/aim/mmu_oea.c projects/fuse2/sys/powerpc/aim/mmu_oea64.c projects/fuse2/sys/powerpc/aim/mmu_oea64.h projects/fuse2/sys/powerpc/aim/moea64_native.c projects/fuse2/sys/powerpc/aim/slb.c projects/fuse2/sys/powerpc/booke/pmap.c projects/fuse2/sys/powerpc/booke/spe.c projects/fuse2/sys/powerpc/powerpc/copyinout.c projects/fuse2/sys/powerpc/powerpc/elf32_machdep.c projects/fuse2/sys/powerpc/powerpc/exec_machdep.c projects/fuse2/sys/powerpc/powerpc/trap.c projects/fuse2/sys/powerpc/ps3/mmu_ps3.c projects/fuse2/sys/powerpc/pseries/mmu_phyp.c projects/fuse2/sys/powerpc/pseries/phyp_llan.c projects/fuse2/sys/powerpc/pseries/platform_chrp.c projects/fuse2/sys/riscv/riscv/minidump_machdep.c projects/fuse2/sys/riscv/riscv/pmap.c projects/fuse2/sys/riscv/riscv/support.S projects/fuse2/sys/riscv/riscv/trap.c projects/fuse2/sys/sparc64/sparc64/pmap.c projects/fuse2/sys/sparc64/sparc64/support.S projects/fuse2/sys/sparc64/sparc64/trap.c projects/fuse2/sys/sparc64/sparc64/vm_machdep.c projects/fuse2/sys/sys/ata.h projects/fuse2/sys/sys/bus.h projects/fuse2/sys/sys/cdio.h projects/fuse2/sys/sys/elf_common.h projects/fuse2/sys/sys/epoch.h projects/fuse2/sys/sys/file.h projects/fuse2/sys/sys/mbuf.h projects/fuse2/sys/sys/mount.h projects/fuse2/sys/sys/param.h projects/fuse2/sys/sys/proc.h projects/fuse2/sys/sys/procctl.h projects/fuse2/sys/sys/ptrace.h projects/fuse2/sys/sys/refcount.h projects/fuse2/sys/sys/sglist.h projects/fuse2/sys/sys/syscall.h projects/fuse2/sys/sys/syscall.mk projects/fuse2/sys/sys/syscallsubr.h projects/fuse2/sys/sys/sysproto.h projects/fuse2/sys/sys/turnstile.h projects/fuse2/sys/sys/vnode.h projects/fuse2/sys/ufs/ffs/ffs_alloc.c projects/fuse2/sys/ufs/ffs/ffs_balloc.c projects/fuse2/sys/ufs/ffs/ffs_extern.h projects/fuse2/sys/ufs/ffs/ffs_softdep.c projects/fuse2/sys/ufs/ffs/ffs_subr.c projects/fuse2/sys/ufs/ffs/ffs_vfsops.c projects/fuse2/sys/ufs/ufs/ufs_bmap.c projects/fuse2/sys/ufs/ufs/ufs_vnops.c projects/fuse2/sys/ufs/ufs/ufsmount.h projects/fuse2/sys/vm/pmap.h projects/fuse2/sys/vm/swap_pager.c projects/fuse2/sys/vm/vm_fault.c projects/fuse2/sys/vm/vm_glue.c projects/fuse2/sys/vm/vm_map.c projects/fuse2/sys/vm/vm_mmap.c projects/fuse2/sys/vm/vm_object.c projects/fuse2/sys/vm/vm_page.c projects/fuse2/sys/vm/vm_page.h projects/fuse2/sys/vm/vm_pageout.c projects/fuse2/sys/vm/vm_pagequeue.h projects/fuse2/sys/vm/vm_swapout.c projects/fuse2/sys/vm/vnode_pager.c projects/fuse2/sys/x86/iommu/intel_drv.c projects/fuse2/sys/x86/x86/cpu_machdep.c projects/fuse2/targets/pseudo/userland/lib/Makefile.depend projects/fuse2/tests/sys/kern/ptrace_test.c projects/fuse2/tests/sys/netpfil/pf/forward.sh projects/fuse2/tests/sys/netpfil/pf/names.sh projects/fuse2/tests/sys/netpfil/pf/set_tos.sh projects/fuse2/tests/sys/netpfil/pf/synproxy.sh projects/fuse2/tests/sys/opencrypto/cryptodev.py projects/fuse2/tools/build/mk/OptionalObsoleteFiles.inc projects/fuse2/tools/bus_space/Python/Makefile projects/fuse2/tools/bus_space/Python/lang.c projects/fuse2/tools/bus_space/examples/am79c900_diag.py projects/fuse2/usr.bin/bluetooth/bthost/Makefile projects/fuse2/usr.bin/bluetooth/btsockstat/Makefile projects/fuse2/usr.bin/bluetooth/rfcomm_sppd/Makefile projects/fuse2/usr.bin/bsdiff/bspatch/bspatch.c projects/fuse2/usr.bin/calendar/calendars/calendar.freebsd projects/fuse2/usr.bin/cpio/Makefile projects/fuse2/usr.bin/dpv/Makefile projects/fuse2/usr.bin/less/defines.h projects/fuse2/usr.bin/login/Makefile projects/fuse2/usr.bin/login/login.1 projects/fuse2/usr.bin/login/login.conf projects/fuse2/usr.bin/login/pathnames.h projects/fuse2/usr.bin/proccontrol/proccontrol.1 projects/fuse2/usr.bin/proccontrol/proccontrol.c projects/fuse2/usr.bin/telnet/Makefile projects/fuse2/usr.bin/top/top.1 projects/fuse2/usr.bin/truss/Makefile projects/fuse2/usr.bin/truss/setup.c projects/fuse2/usr.bin/truss/syscall.h projects/fuse2/usr.bin/truss/syscalls.c projects/fuse2/usr.bin/truss/truss.h projects/fuse2/usr.bin/vi/Makefile projects/fuse2/usr.sbin/bhyve/Makefile projects/fuse2/usr.sbin/bhyve/audio.c projects/fuse2/usr.sbin/bhyve/bhyve.8 projects/fuse2/usr.sbin/bhyve/mevent.c projects/fuse2/usr.sbin/bhyve/net_utils.c projects/fuse2/usr.sbin/bhyve/net_utils.h projects/fuse2/usr.sbin/bhyve/pci_e82545.c projects/fuse2/usr.sbin/bhyve/pci_fbuf.c (contents, props changed) projects/fuse2/usr.sbin/bhyve/pci_hda.c projects/fuse2/usr.sbin/bhyve/pci_nvme.c projects/fuse2/usr.sbin/bhyve/pci_passthru.c projects/fuse2/usr.sbin/bhyve/pci_virtio_console.c projects/fuse2/usr.sbin/bhyve/pci_virtio_net.c projects/fuse2/usr.sbin/bhyve/pci_virtio_scsi.c projects/fuse2/usr.sbin/bhyve/pci_xhci.c (contents, props changed) projects/fuse2/usr.sbin/bhyve/rfb.c (contents, props changed) projects/fuse2/usr.sbin/bhyve/uart_emul.c projects/fuse2/usr.sbin/bhyveload/bhyveload.c projects/fuse2/usr.sbin/bluetooth/ath3kfw/Makefile projects/fuse2/usr.sbin/bluetooth/bcmfw/Makefile projects/fuse2/usr.sbin/bluetooth/bluetooth-config/Makefile projects/fuse2/usr.sbin/bluetooth/bt3cfw/Makefile projects/fuse2/usr.sbin/bluetooth/bthidcontrol/Makefile projects/fuse2/usr.sbin/bluetooth/bthidd/Makefile projects/fuse2/usr.sbin/bluetooth/btpand/Makefile projects/fuse2/usr.sbin/bluetooth/hccontrol/Makefile projects/fuse2/usr.sbin/bluetooth/hcsecd/Makefile projects/fuse2/usr.sbin/bluetooth/hcseriald/Makefile projects/fuse2/usr.sbin/bluetooth/l2control/Makefile projects/fuse2/usr.sbin/bluetooth/l2ping/Makefile projects/fuse2/usr.sbin/bluetooth/rfcomm_pppd/Makefile projects/fuse2/usr.sbin/bluetooth/sdpcontrol/Makefile projects/fuse2/usr.sbin/bluetooth/sdpd/Makefile projects/fuse2/usr.sbin/crunch/crunchgen/crunchgen.1 projects/fuse2/usr.sbin/ctladm/ctladm.8 projects/fuse2/usr.sbin/inetd/Makefile projects/fuse2/usr.sbin/mld6query/Makefile projects/fuse2/usr.sbin/mld6query/mld6.c projects/fuse2/usr.sbin/mptutil/mptutil.c projects/fuse2/usr.sbin/ngctl/Makefile projects/fuse2/usr.sbin/ntp/Makefile.inc projects/fuse2/usr.sbin/pciconf/cap.c projects/fuse2/usr.sbin/periodic/etc/daily/310.accounting projects/fuse2/usr.sbin/ppp/Makefile projects/fuse2/usr.sbin/ppp/bundle.c projects/fuse2/usr.sbin/ppp/physical.c projects/fuse2/usr.sbin/rtadvd/rtadvd.c projects/fuse2/usr.sbin/traceroute6/Makefile projects/fuse2/usr.sbin/traceroute6/traceroute6.8 projects/fuse2/usr.sbin/traceroute6/traceroute6.c projects/fuse2/usr.sbin/tzsetup/tzsetup.c projects/fuse2/usr.sbin/wpa/Makefile.crypto projects/fuse2/usr.sbin/wpa/hostapd/Makefile projects/fuse2/usr.sbin/wpa/hostapd_cli/Makefile projects/fuse2/usr.sbin/wpa/wpa_cli/Makefile projects/fuse2/usr.sbin/wpa/wpa_passphrase/Makefile projects/fuse2/usr.sbin/wpa/wpa_priv/Makefile projects/fuse2/usr.sbin/wpa/wpa_supplicant/Makefile Directory Properties: projects/fuse2/ (props changed) projects/fuse2/cddl/ (props changed) projects/fuse2/cddl/contrib/opensolaris/ (props changed) projects/fuse2/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/fuse2/contrib/amd/ (props changed) projects/fuse2/contrib/bzip2/ (props changed) projects/fuse2/contrib/compiler-rt/ (props changed) projects/fuse2/contrib/elftoolchain/ (props changed) projects/fuse2/contrib/file/ (props changed) projects/fuse2/contrib/ipfilter/ (props changed) projects/fuse2/contrib/less/ (props changed) projects/fuse2/contrib/libarchive/ (props changed) projects/fuse2/contrib/libc++/ (props changed) projects/fuse2/contrib/libcxxrt/ (props changed) projects/fuse2/contrib/libcxxrt/abi_namespace.h (props changed) projects/fuse2/contrib/libcxxrt/auxhelper.cc (props changed) projects/fuse2/contrib/libcxxrt/cxxabi.h (props changed) projects/fuse2/contrib/libcxxrt/dwarf_eh.h (props changed) projects/fuse2/contrib/libcxxrt/dynamic_cast.cc (props changed) projects/fuse2/contrib/libcxxrt/guard.cc (props changed) projects/fuse2/contrib/libcxxrt/libelftc_dem_gnu3.c (props changed) projects/fuse2/contrib/libcxxrt/stdexcept.cc (props changed) projects/fuse2/contrib/libcxxrt/stdexcept.h (props changed) projects/fuse2/contrib/libcxxrt/terminate.cc (props changed) projects/fuse2/contrib/libcxxrt/typeinfo.cc (props changed) projects/fuse2/contrib/libcxxrt/typeinfo.h (props changed) projects/fuse2/contrib/libunwind/ (props changed) projects/fuse2/contrib/llvm/ (props changed) projects/fuse2/contrib/llvm/tools/clang/ (props changed) projects/fuse2/contrib/llvm/tools/lld/ (props changed) projects/fuse2/contrib/llvm/tools/lldb/ (props changed) projects/fuse2/contrib/mandoc/ (props changed) projects/fuse2/contrib/netbsd-tests/ (props changed) projects/fuse2/contrib/openmp/ (props changed) projects/fuse2/contrib/sqlite3/ (props changed) projects/fuse2/contrib/tzdata/ (props changed) projects/fuse2/contrib/unbound/ (props changed) projects/fuse2/sys/cddl/contrib/opensolaris/ (props changed) projects/fuse2/sys/contrib/dev/acpica/ (props changed) projects/fuse2/sys/contrib/ipfilter/ (props changed) Modified: projects/fuse2/.cirrus.yml ============================================================================== --- projects/fuse2/.cirrus.yml Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/.cirrus.yml Sun Jul 28 04:02:22 2019 (r350387) @@ -11,9 +11,9 @@ env: task: timeout_in: 90m install_script: - - pkg install -y qemu-devel + - pkg install -y qemu-devel uefi-edk2-qemu-x86_64 - fetch https://people.freebsd.org/~emaste/OVMF.fd script: - make -j$(sysctl -n hw.ncpu) WITHOUT_TOOLCHAIN=yes buildworld buildkernel test_script: - - OVMF=$(pwd)/OVMF.fd sh tools/boot/ci-qemu-test.sh + - sh tools/boot/ci-qemu-test.sh Modified: projects/fuse2/Makefile ============================================================================== --- projects/fuse2/Makefile Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/Makefile Sun Jul 28 04:02:22 2019 (r350387) @@ -138,7 +138,7 @@ TGTS= all all-man buildenv buildenvvars buildkernel bu build32 distribute32 install32 buildsoft distributesoft installsoft \ builddtb xdev xdev-build xdev-install \ xdev-links native-xtools native-xtools-install stageworld stagekernel \ - stage-packages \ + stage-packages stage-packages-kernel stage-packages-world \ create-packages-world create-packages-kernel create-packages \ packages installconfig real-packages sign-packages package-pkg \ print-dir test-system-compiler test-system-linker Modified: projects/fuse2/Makefile.libcompat ============================================================================== --- projects/fuse2/Makefile.libcompat Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/Makefile.libcompat Sun Jul 28 04:02:22 2019 (r350387) @@ -136,6 +136,7 @@ LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR= _LC_LIBDIRS.yes= lib _LC_LIBDIRS.yes+= gnu/lib +_LC_LIBDIRS.yes+= usr.bin/lex/lib _LC_LIBDIRS.${MK_CDDL:tl}+= cddl/lib _LC_LIBDIRS.${MK_CRYPT:tl}+= secure/lib _LC_LIBDIRS.${MK_KERBEROS:tl}+= kerberos5/lib Modified: projects/fuse2/ObsoleteFiles.inc ============================================================================== --- projects/fuse2/ObsoleteFiles.inc Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/ObsoleteFiles.inc Sun Jul 28 04:02:22 2019 (r350387) @@ -38,10 +38,17 @@ # xargs -n1 | sort | uniq -d; # done +# 20190722: cap_random(3) removed +OLD_FILES+=lib/casper/libcap_random.so.1 +OLD_FILES+=usr/include/casper/cap_random.h +OLD_FILES+=usr/share/man/man3/cap_random.3.gz +OLD_FILES+=usr/share/man/man3/cap_random_buf.3.gz +# 20190708: vm_page_hold() and _unhold() removed +OLD_FILES+=usr/share/man/man9/vm_page_hold.9.gz # 20190618: sys/capability.h removed (sys/capsicum.h is the one to use) OLD_FILES+=usr/include/sys/capability.h -# 20190615: sys/pwm.h renamed to dev/pwmc.h -OLD_FILES+=usr/include/sys/pwm.h +# 20190615: sys/pwm.h renamed to dev/pwmc.h and pwm(9) removed +OLD_FILES+=usr/include/sys/pwm.h usr/share/man/man9/pwm.9.gz # 20190612: new clang import which bumps version from 8.0.0 to 8.0.1. OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/asan_interface.h @@ -388,6 +395,8 @@ OLD_FILES+=usr/include/sys/seq.h # 20190222: libifconfig made INTERNALLIB OLD_FILES+=usr/lib/libprivateifconfig.a OLD_FILES+=usr/lib/libprivateifconfig_p.a +OLD_FILES+=usr/lib32/libprivateifconfig.a +OLD_FILES+=usr/lib32/libprivateifconfig_p.a # 20190131: pfil(9) changed OLD_FILES+=usr/share/man/man9/pfil_hook_get.9.gz OLD_FILES+=usr/share/man/man9/pfil_rlock.9.gz @@ -823,6 +832,7 @@ OLD_FILES+=usr/share/man/man3/arc4random_stir.3.gz OLD_FILES+=usr/bin/send-pr # 20180725: Cleanup old libcasper.so.0 OLD_LIBS+=lib/libcasper.so.0 +OLD_LIBS+=usr/lib32/libcasper.so.0 # 20180722: indent(1) option renamed, test files follow OLD_FILES+=usr/bin/indent/tests/nsac.0 OLD_FILES+=usr/bin/indent/tests/nsac.0.pro @@ -2369,9 +2379,6 @@ OLD_FILES+=usr/tests/usr.sbin/pw/pw_useradd OLD_FILES+=usr/tests/usr.sbin/pw/pw_userdel OLD_FILES+=usr/tests/usr.sbin/pw/pw_usermod OLD_FILES+=usr/tests/usr.sbin/pw/pw_usernext -# 20170322: garbage collect old references to igb(4) -OLD_FILES+=usr/share/man/man4/if_igb.4.gz -OLD_FILES+=usr/share/man/man4/igb.4.gz # 20170319: io_test requires zh_TW.Big5 locale. OLD_FILES+=usr/tests/lib/libc/locale/io_test # 20170319: remove nls for non supported Big5* locales Copied: projects/fuse2/RELNOTES (from r350386, head/RELNOTES) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/fuse2/RELNOTES Sun Jul 28 04:02:22 2019 (r350387, copy of r350386, head/RELNOTES) @@ -0,0 +1,38 @@ +Release notes for FreeBSD 13.0. + +This file describes new user-visible features, changes and updates relevant to +users of binary FreeBSD releases. Each entry should describe the change in no +more than several sentences and should reference manual pages where an +interested user can find more information. Entries should wrap after 80 +columns. Each entry should begin with one or more commit IDs on one line, +specified as a comma separated list and/or range, followed by a colon and a +newline. Entries should be separated by a newline. + +Changes to this file should not be MFCed. + +r350307: + libcap_random(3) has been removed. Applications can use native + APIs to get random data in capability mode. + +r349352: + nand(4) and related components have been removed. + +r349349: + The UEFI loader now supports HTTP boot. + +r349335: + bhyve(8) now implements a High Definition Audio (HDA) driver, allowing + guests to play to and record audio data from the host. + +r349286: + swapon(8) can now erase a swap device immediately before enabling it, + similar to newfs(8)'s -E option. This behaviour can be specified by + adding -E to swapon(8)'s command-line parameters, or by adding the + "trimonce" option to a swap device's /etc/fstab entry. + +r347908-r347923: + The following network drivers have been removed: bm(4), cs(4), de(4), + ed(4), ep(4), ex(4), fe(4), pcn(4), sf(4), sn(4), tl(4), tx(4), txp(4), + vx(4), wb(4), xe(4). + +$FreeBSD$ Modified: projects/fuse2/UPDATING ============================================================================== --- projects/fuse2/UPDATING Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/UPDATING Sun Jul 28 04:02:22 2019 (r350387) @@ -11,11 +11,6 @@ handbook: Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. -NOTE: FreeBSD has switched from gcc to clang. If you have trouble bootstrapping -from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to -the tip of head, and then rebuild without this option. The bootstrap process -from older version of current across the gcc/clang cutover is a bit fragile. - NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: FreeBSD 13.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of @@ -31,7 +26,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) -20190627: +20190727: The vfs.fusefs.sync_unmount and vfs.fusefs.init_backgrounded sysctls and the "-o sync_unmount" and "-o init_backgrounded" mount options have been removed from mount_fusefs(8). You can safely remove them from @@ -42,6 +37,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: vfs.fusefs.reclaim_revoked, and vfs.fusefs.data_cache_invalidate sysctls have been removed. If you felt the need to set any of them to a non-default value, please tell asomers@FreeBSD.org why. + +20190713: + Default permissions on the /var/account/acct file (and copies of it + rotated by periodic daily scripts) are changed from 0644 to 0640 + because the file contains sensitive information that should not be + world-readable. If the /var/account directory must be created by + rc.d/accounting, the mode used is now 0750. Admins who use the + accounting feature are encouraged to change the mode of an existing + /var/account directory to 0750 or 0700. 20190620: Entropy collection and the /dev/random device are no longer optional Modified: projects/fuse2/bin/ls/Makefile ============================================================================== --- projects/fuse2/bin/ls/Makefile Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/bin/ls/Makefile Sun Jul 28 04:02:22 2019 (r350387) @@ -8,8 +8,7 @@ PROG= ls SRCS= cmp.c ls.c print.c util.c LIBADD= util -.if !defined(RELEASE_CRUNCH) && \ - ${MK_LS_COLORS} != no +.if ${MK_LS_COLORS} != no CFLAGS+= -DCOLORLS LIBADD+= termcapw .endif Modified: projects/fuse2/cddl/contrib/opensolaris/lib/libctf/common/ctf.5 ============================================================================== --- projects/fuse2/cddl/contrib/opensolaris/lib/libctf/common/ctf.5 Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/cddl/contrib/opensolaris/lib/libctf/common/ctf.5 Sun Jul 28 04:02:22 2019 (r350387) @@ -231,9 +231,9 @@ The is defined as follows: .Bd -literal typedef struct ctf_preamble { - ushort_t ctp_magic; /* magic number (CTF_MAGIC) */ - uchar_t ctp_version; /* data format version number (CTF_VERSION) */ - uchar_t ctp_flags; /* flags (see below) */ + uint16_t ctp_magic; /* magic number (CTF_MAGIC) */ + uint8_t ctp_version; /* data format version number (CTF_VERSION) */ + uint8_t ctp_flags; /* flags (see below) */ } ctf_preamble_t; .Ed .Pp @@ -313,14 +313,14 @@ and the two have a combined size of 36 bytes. .Bd -literal typedef struct ctf_header { ctf_preamble_t cth_preamble; - uint_t cth_parlabel; /* ref to name of parent lbl uniq'd against */ - uint_t cth_parname; /* ref to basename of parent */ - uint_t cth_lbloff; /* offset of label section */ - uint_t cth_objtoff; /* offset of object section */ - uint_t cth_funcoff; /* offset of function section */ - uint_t cth_typeoff; /* offset of type section */ - uint_t cth_stroff; /* offset of string section */ - uint_t cth_strlen; /* length of string section in bytes */ + uint32_t cth_parlabel; /* ref to name of parent lbl uniq'd against */ + uint32_t cth_parname; /* ref to basename of parent */ + uint32_t cth_lbloff; /* offset of label section */ + uint32_t cth_objtoff; /* offset of object section */ + uint32_t cth_funcoff; /* offset of function section */ + uint32_t cth_typeoff; /* offset of type section */ + uint32_t cth_stroff; /* offset of string section */ + uint32_t cth_strlen; /* length of string section in bytes */ } ctf_header_t; .Ed .Pp @@ -541,8 +541,8 @@ Each label is encoded in the file format using the fol structure: .Bd -literal typedef struct ctf_lblent { - uint_t ctl_label; /* ref to name of label */ - uint_t ctl_typeidx; /* last type associated with this label */ + uint32_t ctl_label; /* ref to name of label */ + uint32_t ctl_typeidx; /* last type associated with this label */ } ctf_lblent_t; .Ed .Lp @@ -728,23 +728,23 @@ The following definitions describe the short and long #define CTF_MAX_LSIZE UINT64_MAX typedef struct ctf_stype { - uint_t ctt_name; /* reference to name in string table */ - ushort_t ctt_info; /* encoded kind, variant length */ + uint32_t ctt_name; /* reference to name in string table */ + uint16_t ctt_info; /* encoded kind, variant length */ union { - ushort_t _size; /* size of entire type in bytes */ - ushort_t _type; /* reference to another type */ + uint16_t _size; /* size of entire type in bytes */ + uint16_t _type; /* reference to another type */ } _u; } ctf_stype_t; typedef struct ctf_type { - uint_t ctt_name; /* reference to name in string table */ - ushort_t ctt_info; /* encoded kind, variant length */ + uint32_t ctt_name; /* reference to name in string table */ + uint16_t ctt_info; /* encoded kind, variant length */ union { - ushort_t _size; /* always CTF_LSIZE_SENT */ - ushort_t _type; /* do not use */ + uint16_t _size; /* always CTF_LSIZE_SENT */ + uint16_t _type; /* do not use */ } _u; - uint_t ctt_lsizehi; /* high 32 bits of type size in bytes */ - uint_t ctt_lsizelo; /* low 32 bits of type size in bytes */ + uint32_t ctt_lsizehi; /* high 32 bits of type size in bytes */ + uint32_t ctt_lsizelo; /* low 32 bits of type size in bytes */ } ctf_type_t; #define ctt_size _u._size /* for fundamental types that have a size */ @@ -754,7 +754,7 @@ typedef struct ctf_type { Type sizes are stored in .Sy bytes . The basic small form uses a -.Sy ushort_t +.Sy uint16_t to store the number of bytes. If the number of bytes in a structure would exceed 0xfffe, then the alternate form, the @@ -806,8 +806,8 @@ various kinds. Integers, which are of type .Sy CTF_K_INTEGER , have no variable length arguments. -Instead, they are followed by a four byte -.Sy uint_t +Instead, they are followed by a +.Sy uint32_t which describes their encoding. All integers must be encoded with a variable length of zero. The @@ -937,9 +937,9 @@ member is set to zero. The structure that follows an array is defined as: .Bd -literal typedef struct ctf_array { - ushort_t cta_contents; /* reference to type of array contents */ - ushort_t cta_index; /* reference to type of array index */ - uint_t cta_nelems; /* number of elements */ + uint16_t cta_contents; /* reference to type of array contents */ + uint16_t cta_index; /* reference to type of array index */ + uint32_t cta_nelems; /* number of elements */ } ctf_array_t; .Ed .Lp @@ -1005,17 +1005,17 @@ all members are encoded using the same structure. The structure for members is as follows: .Bd -literal typedef struct ctf_member { - uint_t ctm_name; /* reference to name in string table */ - ushort_t ctm_type; /* reference to type of member */ - ushort_t ctm_offset; /* offset of this member in bits */ + uint32_t ctm_name; /* reference to name in string table */ + uint16_t ctm_type; /* reference to type of member */ + uint16_t ctm_offset; /* offset of this member in bits */ } ctf_member_t; typedef struct ctf_lmember { - uint_t ctlm_name; /* reference to name in string table */ - ushort_t ctlm_type; /* reference to type of member */ - ushort_t ctlm_pad; /* padding */ - uint_t ctlm_offsethi; /* high 32 bits of member offset in bits */ - uint_t ctlm_offsetlo; /* low 32 bits of member offset in bits */ + uint32_t ctlm_name; /* reference to name in string table */ + uint16_t ctlm_type; /* reference to type of member */ + uint16_t ctlm_pad; /* padding */ + uint32_t ctlm_offsethi; /* high 32 bits of member offset in bits */ + uint32_t ctlm_offsetlo; /* low 32 bits of member offset in bits */ } ctf_lmember_t; .Ed .Lp @@ -1088,8 +1088,8 @@ The enumerators encoded in an enumeration have the fol variable list: .Bd -literal typedef struct ctf_enum { - uint_t cte_name; /* reference to name in string table */ - int cte_value; /* value associated with this name */ + uint32_t cte_name; /* reference to name in string table */ + int32_t cte_value; /* value associated with this name */ } ctf_enum_t; .Ed .Pp Modified: projects/fuse2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c ============================================================================== --- projects/fuse2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Sun Jul 28 04:02:22 2019 (r350387) @@ -1281,12 +1281,14 @@ mountpoint_cmp(const void *arga, const void *argb) } /* - * Reutrn true if path2 is a child of path1 + * Return true if path2 is a child of path1 or path2 equals path1 or + * path1 is "/" (path2 is always a child of "/"). */ static boolean_t libzfs_path_contains(const char *path1, const char *path2) { - return (strstr(path2, path1) == path2 && path2[strlen(path1)] == '/'); + return (strcmp(path1, path2) == 0 || strcmp(path1, "/") == 0 || + (strstr(path2, path1) == path2 && path2[strlen(path1)] == '/')); } Modified: projects/fuse2/contrib/amd/amd/amd.h ============================================================================== --- projects/fuse2/contrib/amd/amd/amd.h Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/amd/amd/amd.h Sun Jul 28 04:02:22 2019 (r350387) @@ -625,7 +625,7 @@ extern void map_flush_srvr(fserver *); extern void mapc_add_kv(mnt_map *, char *, char *); extern mnt_map *mapc_find(char *, char *, const char *, const char *); extern void mapc_free(opaque_t); -extern int mapc_keyiter(mnt_map *, key_fun, opaque_t); +extern int mapc_keyiter(mnt_map *, key_fun *, opaque_t); extern void mapc_reload(void); extern int mapc_search(mnt_map *, char *, char **); extern void mapc_showtypes(char *buf, size_t l); Modified: projects/fuse2/contrib/amd/amd/rpc_fwd.c ============================================================================== --- projects/fuse2/contrib/amd/amd/rpc_fwd.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/amd/amd/rpc_fwd.c Sun Jul 28 04:02:22 2019 (r350387) @@ -221,7 +221,7 @@ fwd_locate(u_int id) * different address. */ int -fwd_packet(int type_id, char *pkt, int len, struct sockaddr_in *fwdto, struct sockaddr_in *replyto, opaque_t cb_arg, fwd_fun cb) +fwd_packet(int type_id, char *pkt, int len, struct sockaddr_in *fwdto, struct sockaddr_in *replyto, opaque_t cb_arg, fwd_fun *cb) { rpc_forward *p; u_int *pkt_int; Modified: projects/fuse2/contrib/bzip2/CHANGES ============================================================================== --- projects/fuse2/contrib/bzip2/CHANGES Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/CHANGES Sun Jul 28 04:02:22 2019 (r350387) @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.6 of 6 September 2010 - Copyright (C) 1996-2010 Julian Seward + bzip2/libbzip2 version 1.0.7 of 27 June 2019 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -325,3 +325,16 @@ Security fix only. Fixes CERT-FI 20469 as it applies Izdebski. * Make the documentation build on Ubuntu 10.04 + +1.0.7 (27 Jun 19) +~~~~~~~~~~~~~~~~~ + +* Fix undefined behavior in the macros SET_BH, CLEAR_BH, & ISSET_BH + +* bzip2: Fix return value when combining --test,-t and -q. + +* bzip2recover: Fix buffer overflow for large argv[0] + +* bzip2recover: Fix use after free issue with outFile (CVE-2016-3189) + +* Make sure nSelectors is not out of range (CVE-2019-12900) Modified: projects/fuse2/contrib/bzip2/LICENSE ============================================================================== --- projects/fuse2/contrib/bzip2/LICENSE Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/LICENSE Sun Jul 28 04:02:22 2019 (r350387) @@ -36,7 +36,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUD NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Julian Seward, jseward@bzip.org -bzip2/libbzip2 version 1.0.6 of 6 September 2010 +Julian Seward, jseward@acm.org +bzip2/libbzip2 version 1.0.7 of 27 June 2019 -------------------------------------------------------------------------- Modified: projects/fuse2/contrib/bzip2/README ============================================================================== --- projects/fuse2/contrib/bzip2/README Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/README Sun Jul 28 04:02:22 2019 (r350387) @@ -6,8 +6,8 @@ This version is fully compatible with the previous pub This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.6 of 6 September 2010 -Copyright (C) 1996-2010 Julian Seward +bzip2/libbzip2 version 1.0.7 of 27 June 2019 +Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in this file. @@ -73,7 +73,7 @@ HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc. It's difficult for me to support compilation on all these platforms. My approach is to collect binaries for these platforms, and put them -on the master web site (http://www.bzip.org). Look there. However +on the master web site (https://sourceware.org/bzip2/). Look there. However (FWIW), bzip2-1.0.X is very standard ANSI C and should compile unmodified with MS Visual C. If you have difficulties building, you might want to read README.COMPILATION.PROBLEMS. @@ -161,43 +161,22 @@ WHAT'S NEW IN 0.9.5 ? * Many small improvements in file and flag handling. * A Y2K statement. -WHAT'S NEW IN 1.0.0 ? +WHAT'S NEW IN 1.0.x ? See the CHANGES file. -WHAT'S NEW IN 1.0.2 ? - - See the CHANGES file. - -WHAT'S NEW IN 1.0.3 ? - - See the CHANGES file. - -WHAT'S NEW IN 1.0.4 ? - - See the CHANGES file. - -WHAT'S NEW IN 1.0.5 ? - - See the CHANGES file. - -WHAT'S NEW IN 1.0.6 ? - - See the CHANGES file. - - I hope you find bzip2 useful. Feel free to contact me at - jseward@bzip.org + jseward@acm.org if you have any suggestions or queries. Many people mailed me with comments, suggestions and patches after the releases of bzip-0.15, bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and 1.0.3, and the changes in bzip2 are largely a result of this feedback. I thank you for your comments. -bzip2's "home" is http://www.bzip.org/ +bzip2's "home" is https://sourceware.org/bzip2/ Julian Seward -jseward@bzip.org +jseward@acm.org Cambridge, UK. 18 July 1996 (version 0.15) @@ -213,3 +192,4 @@ Cambridge, UK. 20 December 2006 (bzip2, version 1.0.4) 10 December 2007 (bzip2, version 1.0.5) 6 Sept 2010 (bzip2, version 1.0.6) +27 June 2019 (bzip2, version 1.0.7) Modified: projects/fuse2/contrib/bzip2/README.COMPILATION.PROBLEMS ============================================================================== --- projects/fuse2/contrib/bzip2/README.COMPILATION.PROBLEMS Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/README.COMPILATION.PROBLEMS Sun Jul 28 04:02:22 2019 (r350387) @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.6 of 6 September 2010 -Copyright (C) 1996-2010 Julian Seward +bzip2/libbzip2 version 1.0.7 of 27 June 2019 +Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -12,7 +12,7 @@ This program is released under the terms of the licens in the file LICENSE. ------------------------------------------------------------------ -bzip2-1.0.6 should compile without problems on the vast majority of +bzip2 should compile without problems on the vast majority of platforms. Using the supplied Makefile, I've built and tested it myself for x86-linux and amd64-linux. With makefile.msc, Visual C++ 6.0 and nmake, you can build a native Win32 version too. Large file Modified: projects/fuse2/contrib/bzip2/blocksort.c ============================================================================== --- projects/fuse2/contrib/bzip2/blocksort.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/blocksort.c Sun Jul 28 04:02:22 2019 (r350387) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.6 of 6 September 2010 - Copyright (C) 1996-2010 Julian Seward + bzip2/libbzip2 version 1.0.7 of 27 June 2019 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -202,9 +202,9 @@ void fallbackQSort3 ( UInt32* fmap, bhtab [ 0 .. 2+(nblock/32) ] destroyed */ -#define SET_BH(zz) bhtab[(zz) >> 5] |= (1 << ((zz) & 31)) -#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31)) -#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1 << ((zz) & 31))) +#define SET_BH(zz) bhtab[(zz) >> 5] |= ((UInt32)1 << ((zz) & 31)) +#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~((UInt32)1 << ((zz) & 31)) +#define ISSET_BH(zz) (bhtab[(zz) >> 5] & ((UInt32)1 << ((zz) & 31))) #define WORD_BH(zz) bhtab[(zz) >> 5] #define UNALIGNED_BH(zz) ((zz) & 0x01f) Modified: projects/fuse2/contrib/bzip2/bzip2.1 ============================================================================== --- projects/fuse2/contrib/bzip2/bzip2.1 Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/bzip2.1 Sun Jul 28 04:02:22 2019 (r350387) @@ -1,6 +1,6 @@ .TH bzip2 1 .SH NAME -bzip2, bunzip2 \- a block-sorting file compressor, v1.0.6 +bzip2, bunzip2 \- a block-sorting file compressor, v1.0.7 .br bzcat \- decompresses files to stdout .br @@ -404,7 +404,7 @@ I/O error messages are not as helpful as they could be tries hard to detect I/O errors and exit cleanly, but the details of what the problem is sometimes seem rather misleading. -This manual page pertains to version 1.0.6 of +This manual page pertains to version 1.0.7 of .I bzip2. Compressed data created by this version is entirely forwards and backwards compatible with the previous public releases, versions @@ -426,9 +426,9 @@ with MaybeUInt64 set to be an unsigned 64-bit integer. .SH AUTHOR -Julian Seward, jsewardbzip.org. +Julian Seward, jseward@acm.org. -http://www.bzip.org +https://sourceware.org/bzip2/ The ideas embodied in .I bzip2 Modified: projects/fuse2/contrib/bzip2/bzip2.c ============================================================================== --- projects/fuse2/contrib/bzip2/bzip2.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/bzip2.c Sun Jul 28 04:02:22 2019 (r350387) @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.6 of 6 September 2010 - Copyright (C) 1996-2010 Julian Seward + bzip2/libbzip2 version 1.0.7 of 27 June 2019 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -554,7 +554,7 @@ static Bool testStream ( FILE *zStream ) { BZFILE* bzf = NULL; - Int32 bzerr, bzerr_dummy, ret, nread, streamNo, i; + Int32 bzerr, bzerr_dummy, ret, streamNo, i; UChar obuf[5000]; UChar unused[BZ_MAX_UNUSED]; Int32 nUnused; @@ -577,7 +577,7 @@ Bool testStream ( FILE *zStream ) streamNo++; while (bzerr == BZ_OK) { - nread = BZ2_bzRead ( &bzerr, bzf, obuf, 5000 ); + BZ2_bzRead ( &bzerr, bzf, obuf, 5000 ); if (bzerr == BZ_DATA_ERROR_MAGIC) goto errhandler; } if (bzerr != BZ_STREAM_END) goto errhandler; @@ -749,7 +749,7 @@ void panic ( const Char* s ) "\n%s: PANIC -- internal consistency error:\n" "\t%s\n" "\tThis is a BUG. Please report it to me at:\n" - "\tjseward@bzip.org\n", + "\tjseward@acm.org\n", progName, s ); showFileNames(); cleanUpAndFail( 3 ); @@ -829,7 +829,7 @@ void mySIGSEGVorSIGBUScatcher ( IntNative n ) " The user's manual, Section 4.3, has more info on (1) and (2).\n" " \n" " If you suspect this is a bug in bzip2, or are unsure about (1)\n" - " or (2), feel free to report it to me at: jseward@bzip.org.\n" + " or (2), feel free to report it to me at: jseward@acm.org.\n" " Section 4.3 of the user's manual describes the info a useful\n" " bug report should have. If the manual is available on your\n" " system, please try and read it before mailing me. If you don't\n" @@ -852,7 +852,7 @@ void mySIGSEGVorSIGBUScatcher ( IntNative n ) " The user's manual, Section 4.3, has more info on (2) and (3).\n" " \n" " If you suspect this is a bug in bzip2, or are unsure about (2)\n" - " or (3), feel free to report it to me at: jseward@bzip.org.\n" + " or (3), feel free to report it to me at: jseward@acm.org.\n" " Section 4.3 of the user's manual describes the info a useful\n" " bug report should have. If the manual is available on your\n" " system, please try and read it before mailing me. If you don't\n" @@ -1609,7 +1609,7 @@ void license ( void ) " \n" " This program is free software; you can redistribute it and/or modify\n" " it under the terms set out in the LICENSE file, which is included\n" - " in the bzip2-1.0.6 source distribution.\n" + " in the bzip2 source distribution.\n" " \n" " This program is distributed in the hope that it will be useful,\n" " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" @@ -2005,12 +2005,14 @@ IntNative main ( IntNative argc, Char *argv[] ) testf ( aa->name ); } } - if (testFailsExist && noisy) { - fprintf ( stderr, - "\n" - "You can use the `bzip2recover' program to attempt to recover\n" - "data from undamaged sections of corrupted files.\n\n" - ); + if (testFailsExist) { + if (noisy) { + fprintf ( stderr, + "\n" + "You can use the `bzip2recover' program to attempt to recover\n" + "data from undamaged sections of corrupted files.\n\n" + ); + } setExit(2); exit(exitValue); } Modified: projects/fuse2/contrib/bzip2/bzip2recover.c ============================================================================== --- projects/fuse2/contrib/bzip2/bzip2recover.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/bzip2recover.c Sun Jul 28 04:02:22 2019 (r350387) @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.6 of 6 September 2010 - Copyright (C) 1996-2010 Julian Seward + bzip2/libbzip2 version 1.0.7 of 27 June 2019 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -309,11 +309,12 @@ Int32 main ( Int32 argc, Char** argv ) UInt32 buffHi, buffLo, blockCRC; Char* p; - strcpy ( progName, argv[0] ); + strncpy ( progName, argv[0], BZ_MAX_FILENAME-1); + progName[BZ_MAX_FILENAME-1]='\0'; inFileName[0] = outFileName[0] = 0; fprintf ( stderr, - "bzip2recover 1.0.6: extracts blocks from damaged .bz2 files.\n" ); + "bzip2recover 1.0.7: extracts blocks from damaged .bz2 files.\n" ); if (argc != 2) { fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n", @@ -457,6 +458,7 @@ Int32 main ( Int32 argc, Char** argv ) bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); bsPutUInt32 ( bsWr, blockCRC ); bsClose ( bsWr ); + outFile = NULL; } if (wrBlock >= rbCtr) break; wrBlock++; Modified: projects/fuse2/contrib/bzip2/bzlib.c ============================================================================== --- projects/fuse2/contrib/bzip2/bzlib.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/bzlib.c Sun Jul 28 04:02:22 2019 (r350387) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.6 of 6 September 2010 - Copyright (C) 1996-2010 Julian Seward + bzip2/libbzip2 version 1.0.7 of 27 June 2019 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -47,7 +47,7 @@ void BZ2_bz__AssertH__fail ( int errcode ) fprintf(stderr, "\n\nbzip2/libbzip2: internal error number %d.\n" "This is a bug in bzip2/libbzip2, %s.\n" - "Please report it to me at: jseward@bzip.org. If this happened\n" + "Please report it to me at: jseward@acm.org. If this happened\n" "when you were using some program which uses libbzip2 as a\n" "component, you should also report this bug to the author(s)\n" "of that program. Please make an effort to report this bug;\n" Modified: projects/fuse2/contrib/bzip2/bzlib.h ============================================================================== --- projects/fuse2/contrib/bzip2/bzlib.h Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/bzlib.h Sun Jul 28 04:02:22 2019 (r350387) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.6 of 6 September 2010 - Copyright (C) 1996-2010 Julian Seward + bzip2/libbzip2 version 1.0.7 of 27 June 2019 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/fuse2/contrib/bzip2/bzlib_private.h ============================================================================== --- projects/fuse2/contrib/bzip2/bzlib_private.h Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/bzlib_private.h Sun Jul 28 04:02:22 2019 (r350387) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.6 of 6 September 2010 - Copyright (C) 1996-2010 Julian Seward + bzip2/libbzip2 version 1.0.7 of 27 June 2019 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -36,7 +36,7 @@ /*-- General stuff. --*/ -#define BZ_VERSION "1.0.6, 6-Sept-2010" +#define BZ_VERSION "1.0.7, 27-Jun-2019" typedef char Char; typedef unsigned char Bool; Modified: projects/fuse2/contrib/bzip2/compress.c ============================================================================== --- projects/fuse2/contrib/bzip2/compress.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/compress.c Sun Jul 28 04:02:22 2019 (r350387) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.6 of 6 September 2010 - Copyright (C) 1996-2010 Julian Seward + bzip2/libbzip2 version 1.0.7 of 27 June 2019 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/fuse2/contrib/bzip2/crctable.c ============================================================================== --- projects/fuse2/contrib/bzip2/crctable.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/crctable.c Sun Jul 28 04:02:22 2019 (r350387) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.6 of 6 September 2010 - Copyright (C) 1996-2010 Julian Seward + bzip2/libbzip2 version 1.0.7 of 27 June 2019 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/fuse2/contrib/bzip2/decompress.c ============================================================================== --- projects/fuse2/contrib/bzip2/decompress.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/decompress.c Sun Jul 28 04:02:22 2019 (r350387) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.6 of 6 September 2010 - Copyright (C) 1996-2010 Julian Seward + bzip2/libbzip2 version 1.0.7 of 27 June 2019 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -285,9 +285,9 @@ Int32 BZ2_decompress ( DState* s ) /*--- Now the selectors ---*/ GET_BITS(BZ_X_SELECTOR_1, nGroups, 3); - if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); + if (nGroups < 2 || nGroups > BZ_N_GROUPS) RETURN(BZ_DATA_ERROR); GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); - if (nSelectors < 1) RETURN(BZ_DATA_ERROR); + if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR); for (i = 0; i < nSelectors; i++) { j = 0; while (True) { Modified: projects/fuse2/contrib/bzip2/huffman.c ============================================================================== --- projects/fuse2/contrib/bzip2/huffman.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/huffman.c Sun Jul 28 04:02:22 2019 (r350387) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.6 of 6 September 2010 - Copyright (C) 1996-2010 Julian Seward + bzip2/libbzip2 version 1.0.7 of 27 June 2019 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/fuse2/contrib/bzip2/randtable.c ============================================================================== --- projects/fuse2/contrib/bzip2/randtable.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/randtable.c Sun Jul 28 04:02:22 2019 (r350387) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.6 of 6 September 2010 - Copyright (C) 1996-2010 Julian Seward + bzip2/libbzip2 version 1.0.7 of 27 June 2019 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/fuse2/contrib/bzip2/spewG.c ============================================================================== --- projects/fuse2/contrib/bzip2/spewG.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/spewG.c Sun Jul 28 04:02:22 2019 (r350387) @@ -13,8 +13,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.6 of 6 September 2010 - Copyright (C) 1996-2010 Julian Seward + bzip2/libbzip2 version 1.0.7 of 27 June 2019 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/fuse2/contrib/bzip2/unzcrash.c ============================================================================== --- projects/fuse2/contrib/bzip2/unzcrash.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/unzcrash.c Sun Jul 28 04:02:22 2019 (r350387) @@ -17,8 +17,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.6 of 6 September 2010 - Copyright (C) 1996-2010 Julian Seward + bzip2/libbzip2 version 1.0.7 of 27 June 2019 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/fuse2/contrib/bzip2/words2 ============================================================================== --- projects/fuse2/contrib/bzip2/words2 Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/bzip2/words2 Sun Jul 28 04:02:22 2019 (r350387) @@ -1,5 +1,5 @@ Checking test results. If any of the four "cmp"s which follow report any differences, something is wrong. If you can't easily -figure out what, please let me know (jseward@bzip.org). +figure out what, please let me know (jseward@acm.org). Modified: projects/fuse2/contrib/elftoolchain/common/_elftc.h ============================================================================== --- projects/fuse2/contrib/elftoolchain/common/_elftc.h Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/elftoolchain/common/_elftc.h Sun Jul 28 04:02:22 2019 (r350387) @@ -374,11 +374,14 @@ extern const char *__progname; #include #define htobe32(x) OSSwapHostToBigInt32(x) +#define htole32(x) OSSwapHostToLittleInt32(x) +#ifndef roundup2 #define roundup2 roundup +#endif -#define ELFTC_BYTE_ORDER _BYTE_ORDER -#define ELFTC_BYTE_ORDER_LITTLE_ENDIAN _LITTLE_ENDIAN -#define ELFTC_BYTE_ORDER_BIG_ENDIAN _BIG_ENDIAN +#define ELFTC_BYTE_ORDER __DARWIN_BYTE_ORDER +#define ELFTC_BYTE_ORDER_LITTLE_ENDIAN __DARWIN_LITTLE_ENDIAN +#define ELFTC_BYTE_ORDER_BIG_ENDIAN __DARWIN_BIG_ENDIAN #define ELFTC_HAVE_MMAP 1 #define ELFTC_HAVE_STRMODE 1 @@ -418,7 +421,9 @@ extern const char *__progname; /* Whether we need to supply {be,le}32dec. */ #define ELFTC_NEED_BYTEORDER_EXTENSIONS 1 +#ifndef roundup2 #define roundup2 roundup +#endif #endif /* __GLIBC__ || __linux__ */ Modified: projects/fuse2/contrib/elftoolchain/common/elfdefinitions.h ============================================================================== --- projects/fuse2/contrib/elftoolchain/common/elfdefinitions.h Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/elftoolchain/common/elfdefinitions.h Sun Jul 28 04:02:22 2019 (r350387) @@ -33,7 +33,7 @@ * See: http://www.sco.com/developers/gabi/latest/ch4.intro.html * - The May 1998 (version 1.5) draft of "The ELF-64 object format". * - Processor-specific ELF ABI definitions for sparc, i386, amd64, mips, - * ia64, and powerpc processors. + * ia64, powerpc, and RISC-V processors. * - The "Linkers and Libraries Guide", from Sun Microsystems. */ @@ -426,6 +426,22 @@ _ELF_DEFINE_EF(EF_PPC_RELOCATABLE, 0x00010000UL, \ "-mrelocatable flag") \ _ELF_DEFINE_EF(EF_PPC_RELOCATABLE_LIB, 0x00008000UL, \ "-mrelocatable-lib flag") \ +_ELF_DEFINE_EF(EF_RISCV_RVC, 0x00000001UL, \ + "Compressed instruction extension") \ +_ELF_DEFINE_EF(EF_RISCV_FLOAT_ABI_MASK, 0x00000006UL, \ + "Floating point ABI") \ +_ELF_DEFINE_EF(EF_RISCV_FLOAT_ABI_SOFT, 0x00000000UL, \ + "Software emulated floating point") \ +_ELF_DEFINE_EF(EF_RISCV_FLOAT_ABI_SINGLE, 0x00000002UL, \ + "Single precision floating point") \ +_ELF_DEFINE_EF(EF_RISCV_FLOAT_ABI_DOUBLE, 0x00000004UL, \ + "Double precision floating point") \ +_ELF_DEFINE_EF(EF_RISCV_FLOAT_ABI_QUAD, 0x00000006UL, \ + "Quad precision floating point") \ +_ELF_DEFINE_EF(EF_RISCV_RVE, 0x00000008UL, \ + "RV32E embedded ABI") \ +_ELF_DEFINE_EF(EF_RISCV_TSO, 0x00000010UL, \ + "RVTSO memory consistency model") \ _ELF_DEFINE_EF(EF_SPARC_EXT_MASK, 0x00ffff00UL, \ "Vendor Extension mask") \ _ELF_DEFINE_EF(EF_SPARC_32PLUS, 0x00000100UL, \ Modified: projects/fuse2/contrib/elftoolchain/elfcopy/sections.c ============================================================================== --- projects/fuse2/contrib/elftoolchain/elfcopy/sections.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/elftoolchain/elfcopy/sections.c Sun Jul 28 04:02:22 2019 (r350387) @@ -1403,7 +1403,7 @@ init_shstrtab(struct elfcopy *ecp) struct section *s; size_t indx, sizehint; - if (elf_getshstrndx(ecp->ein, &indx) != 0) { + if (elf_getshdrstrndx(ecp->ein, &indx) == 0) { shstrtab = elf_getscn(ecp->ein, indx); if (shstrtab == NULL) errx(EXIT_FAILURE, "elf_getscn failed: %s", @@ -1413,6 +1413,8 @@ init_shstrtab(struct elfcopy *ecp) elf_errmsg(-1)); sizehint = shdr.sh_size; } else { + /* Clear the error from elf_getshdrstrndx(3). */ + (void)elf_errno(); sizehint = 0; } Modified: projects/fuse2/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 ============================================================================== --- projects/fuse2/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 Sun Jul 28 04:02:22 2019 (r350387) @@ -76,6 +76,9 @@ Known descriptor names and their properties include: .It Li elf32-powerpc Ta ELF Ta MSB Ta 32 .It Li elf32-powerpc-freebsd Ta ELF Ta MSB Ta 32 .It Li elf32-powerpcle Ta ELF Ta LSB Ta 32 +.It Li elf32-riscv Ta ELF Ta LSB Ta 32 +.It Li elf64-riscv Ta ELF Ta LSB Ta 64 +.It Li elf64-riscv-freebsd Ta ELF Ta LSB Ta 64 .It Li elf32-sh Ta ELF Ta MSB Ta 32 .It Li elf32-shl Ta ELF Ta LSB Ta 32 .It Li elf32-sh-nbsd Ta ELF Ta MSB Ta 32 Modified: projects/fuse2/contrib/elftoolchain/libelftc/elftc_set_timestamps.c ============================================================================== --- projects/fuse2/contrib/elftoolchain/libelftc/elftc_set_timestamps.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/elftoolchain/libelftc/elftc_set_timestamps.c Sun Jul 28 04:02:22 2019 (r350387) @@ -37,7 +37,7 @@ ELFTC_VCSID("$Id$"); * stat'. */ -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) #define ATIME st_atimespec #define MTIME st_mtimespec #define LIBELFTC_HAVE_UTIMES 1 Modified: projects/fuse2/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c ============================================================================== --- projects/fuse2/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c Sun Jul 28 00:48:28 2019 (r350386) +++ projects/fuse2/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c Sun Jul 28 04:02:22 2019 (r350387) @@ -316,6 +316,31 @@ struct _Elftc_Bfd_Target _libelftc_targets[] = { }, { + .bt_name = "elf32-riscv", + .bt_type = ETF_ELF, + .bt_byteorder = ELFDATA2LSB, + .bt_elfclass = ELFCLASS32, + .bt_machine = EM_RISCV, + }, + + { + .bt_name = "elf64-riscv", + .bt_type = ETF_ELF, + .bt_byteorder = ELFDATA2LSB, + .bt_elfclass = ELFCLASS64, + .bt_machine = EM_RISCV, + }, + + { + .bt_name = "elf64-riscv-freebsd", + .bt_type = ETF_ELF, + .bt_byteorder = ELFDATA2MSB, + .bt_elfclass = ELFCLASS64, + .bt_machine = EM_RISCV, + .bt_osabi = ELFOSABI_FREEBSD, + }, + + { .bt_name = "elf64-sh64", .bt_type = ETF_ELF, .bt_byteorder = ELFDATA2MSB, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sun Jul 28 15:17:33 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E549EAD8F9 for ; Sun, 28 Jul 2019 15:17:33 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C28DC69FD6; Sun, 28 Jul 2019 15:17:33 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8C4A9199D4; Sun, 28 Jul 2019 15:17:33 +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 x6SFHXIA050784; Sun, 28 Jul 2019 15:17:33 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6SFHXaa050783; Sun, 28 Jul 2019 15:17:33 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201907281517.x6SFHXaa050783@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 28 Jul 2019 15:17:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r350388 - in projects/fuse2: sys/fs/fuse tests/sys/fs/fusefs X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/fuse2: sys/fs/fuse tests/sys/fs/fusefs X-SVN-Commit-Revision: 350388 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C28DC69FD6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_SHORT(-0.94)[-0.939,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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: Sun, 28 Jul 2019 15:17:34 -0000 Author: asomers Date: Sun Jul 28 15:17:32 2019 New Revision: 350388 URL: https://svnweb.freebsd.org/changeset/base/350388 Log: fusefs: fix panic when writing with O_DIRECT and using writeback cache When a fusefs file system is mounted using the writeback cache, the cache may still be bypassed by opening a file with O_DIRECT. When writing with O_DIRECT, the cache must be invalidated for the affected portion of the file. Fix some panics caused by inadvertently invalidating too much. Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/sys/fs/fuse/fuse_io.c projects/fuse2/tests/sys/fs/fusefs/write.cc Modified: projects/fuse2/sys/fs/fuse/fuse_io.c ============================================================================== --- projects/fuse2/sys/fs/fuse/fuse_io.c Sun Jul 28 04:02:22 2019 (r350387) +++ projects/fuse2/sys/fs/fuse/fuse_io.c Sun Jul 28 15:17:32 2019 (r350388) @@ -119,9 +119,11 @@ SDT_PROVIDER_DECLARE(fusefs); */ SDT_PROBE_DEFINE2(fusefs, , io, trace, "int", "char*"); +static int +fuse_inval_buf_range(struct vnode *vp, off_t filesize, off_t start, off_t end); static void fuse_io_clear_suid_on_write(struct vnode *vp, struct ucred *cred, - struct thread *td); + struct thread *td); static int fuse_read_directbackend(struct vnode *vp, struct uio *uio, struct ucred *cred, struct fuse_filehandle *fufh); @@ -136,6 +138,58 @@ static int fuse_write_biobackend(struct vnode *vp, struct uio *uio, struct ucred *cred, struct fuse_filehandle *fufh, int ioflag, pid_t pid); +/* Invalidate a range of cached data, whether dirty of not */ +static int +fuse_inval_buf_range(struct vnode *vp, off_t filesize, off_t start, off_t end) +{ + struct buf *bp; + daddr_t left_lbn, end_lbn, right_lbn; + off_t new_filesize; + int iosize, left_on, right_on, right_blksize; + + iosize = fuse_iosize(vp); + left_lbn = start / iosize; + end_lbn = howmany(end, iosize); + left_on = start & (iosize - 1); + if (left_on != 0) { + bp = getblk(vp, left_lbn, iosize, PCATCH, 0, 0); + if ((bp->b_flags & B_CACHE) != 0 && bp->b_dirtyend >= left_on) { + /* + * Flush the dirty buffer, because we don't have a + * byte-granular way to record which parts of the + * buffer are valid. + */ + bwrite(bp); + if (bp->b_error) + return (bp->b_error); + } else { + brelse(bp); + } + } + right_on = end & (iosize - 1); + if (right_on != 0) { + right_lbn = end / iosize; + new_filesize = MAX(filesize, end); + right_blksize = MIN(iosize, new_filesize - iosize * right_lbn); + bp = getblk(vp, right_lbn, right_blksize, PCATCH, 0, 0); + if ((bp->b_flags & B_CACHE) != 0 && bp->b_dirtyoff < right_on) { + /* + * Flush the dirty buffer, because we don't have a + * byte-granular way to record which parts of the + * buffer are valid. + */ + bwrite(bp); + if (bp->b_error) + return (bp->b_error); + } else { + brelse(bp); + } + } + + v_inval_buf_range(vp, left_lbn, end_lbn, iosize); + return (0); +} + /* * FreeBSD clears the SUID and SGID bits on any write by a non-root user. */ @@ -236,7 +290,6 @@ fuse_io_dispatch(struct vnode *vp, struct uio *uio, in case UIO_WRITE: fuse_vnode_update(vp, FN_MTIMECHANGE | FN_CTIMECHANGE); if (directio) { - const int iosize = fuse_iosize(vp); off_t start, end, filesize; SDT_PROBE2(fusefs, , io, trace, 1, @@ -252,7 +305,9 @@ fuse_io_dispatch(struct vnode *vp, struct uio *uio, in (IO_VMIO | IO_DIRECT), ("IO_DIRECT used for a cache flush?")); /* Invalidate the write cache when writing directly */ - v_inval_buf_range(vp, start, end, iosize); + err = fuse_inval_buf_range(vp, filesize, start, end); + if (err) + return (err); err = fuse_write_directbackend(vp, uio, cred, fufh, filesize, ioflag, false); } else { Modified: projects/fuse2/tests/sys/fs/fusefs/write.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fusefs/write.cc Sun Jul 28 04:02:22 2019 (r350387) +++ projects/fuse2/tests/sys/fs/fusefs/write.cc Sun Jul 28 15:17:32 2019 (r350388) @@ -951,6 +951,132 @@ TEST_F(WriteBackAsync, delay) } /* + * A direct write should not evict dirty cached data from outside of its own + * byte range. + */ +TEST_F(WriteBackAsync, direct_io_ignores_unrelated_cached) +{ + const char FULLPATH[] = "mountpoint/some_file.txt"; + const char RELPATH[] = "some_file.txt"; + const char CONTENTS0[] = "abcdefgh"; + const char CONTENTS1[] = "ijklmnop"; + uint64_t ino = 42; + int fd; + ssize_t bufsize = strlen(CONTENTS0) + 1; + ssize_t fsize = 2 * m_maxbcachebuf; + char readbuf[bufsize]; + void *zeros; + + zeros = calloc(1, m_maxbcachebuf); + ASSERT_NE(nullptr, zeros); + + expect_lookup(RELPATH, ino, fsize); + expect_open(ino, 0, 1); + expect_read(ino, 0, m_maxbcachebuf, m_maxbcachebuf, zeros); + FuseTest::expect_write(ino, m_maxbcachebuf, bufsize, bufsize, 0, 0, + CONTENTS1); + + fd = open(FULLPATH, O_RDWR); + EXPECT_LE(0, fd) << strerror(errno); + + // Cache first block with dirty data. This will entail first reading + // the existing data. + ASSERT_EQ(bufsize, pwrite(fd, CONTENTS0, bufsize, 0)) + << strerror(errno); + + // Write directly to second block + ASSERT_EQ(0, fcntl(fd, F_SETFL, O_DIRECT)) << strerror(errno); + ASSERT_EQ(bufsize, pwrite(fd, CONTENTS1, bufsize, m_maxbcachebuf)) + << strerror(errno); + + // Read from the first block again. Should be serviced by cache. + ASSERT_EQ(0, fcntl(fd, F_SETFL, 0)) << strerror(errno); + ASSERT_EQ(bufsize, pread(fd, readbuf, bufsize, 0)) << strerror(errno); + ASSERT_STREQ(readbuf, CONTENTS0); + + leak(fd); + free(zeros); +} + +/* + * If a direct io write partially overlaps one or two blocks of dirty cached + * data, No dirty data should be lost. Admittedly this is a weird test, + * because it would be unusual to use O_DIRECT and the writeback cache. + */ +TEST_F(WriteBackAsync, direct_io_partially_overlaps_cached_block) +{ + const char FULLPATH[] = "mountpoint/some_file.txt"; + const char RELPATH[] = "some_file.txt"; + uint64_t ino = 42; + int fd; + off_t bs = m_maxbcachebuf; + ssize_t fsize = 3 * bs; + void *readbuf, *zeros, *ones, *zeroones, *onezeros; + + readbuf = malloc(bs); + ASSERT_NE(nullptr, readbuf) << strerror(errno); + zeros = calloc(1, 3 * bs); + ASSERT_NE(nullptr, zeros); + ones = calloc(1, 2 * bs); + ASSERT_NE(nullptr, ones); + memset(ones, 1, 2 * bs); + zeroones = calloc(1, bs); + ASSERT_NE(nullptr, zeroones); + memset((uint8_t*)zeroones + bs / 2, 1, bs / 2); + onezeros = calloc(1, bs); + ASSERT_NE(nullptr, onezeros); + memset(onezeros, 1, bs / 2); + + expect_lookup(RELPATH, ino, fsize); + expect_open(ino, 0, 1); + + fd = open(FULLPATH, O_RDWR); + EXPECT_LE(0, fd) << strerror(errno); + + /* Cache first and third blocks with dirty data. */ + ASSERT_EQ(3 * bs, pwrite(fd, zeros, 3 * bs, 0)) << strerror(errno); + + /* + * Write directly to all three blocks. The partially written blocks + * will be flushed because they're dirty. + */ + FuseTest::expect_write(ino, 0, bs, bs, 0, 0, zeros); + FuseTest::expect_write(ino, 2 * bs, bs, bs, 0, 0, zeros); + /* The direct write is split in two because of the m_maxwrite value */ + FuseTest::expect_write(ino, bs / 2, bs, bs, 0, 0, ones); + FuseTest::expect_write(ino, 3 * bs / 2, bs, bs, 0, 0, ones); + ASSERT_EQ(0, fcntl(fd, F_SETFL, O_DIRECT)) << strerror(errno); + ASSERT_EQ(2 * bs, pwrite(fd, ones, 2 * bs, bs / 2)) << strerror(errno); + + /* + * Read from both the valid and invalid portions of the first and third + * blocks again. This will entail FUSE_READ operations because these + * blocks were invalidated by the direct write. + */ + expect_read(ino, 0, bs, bs, zeroones); + expect_read(ino, 2 * bs, bs, bs, onezeros); + ASSERT_EQ(0, fcntl(fd, F_SETFL, 0)) << strerror(errno); + ASSERT_EQ(bs / 2, pread(fd, readbuf, bs / 2, 0)) << strerror(errno); + EXPECT_EQ(0, memcmp(zeros, readbuf, bs / 2)); + ASSERT_EQ(bs / 2, pread(fd, readbuf, bs / 2, 5 * bs / 2)) + << strerror(errno); + EXPECT_EQ(0, memcmp(zeros, readbuf, bs / 2)); + ASSERT_EQ(bs / 2, pread(fd, readbuf, bs / 2, bs / 2)) + << strerror(errno); + EXPECT_EQ(0, memcmp(ones, readbuf, bs / 2)); + ASSERT_EQ(bs / 2, pread(fd, readbuf, bs / 2, 2 * bs)) + << strerror(errno); + EXPECT_EQ(0, memcmp(ones, readbuf, bs / 2)); + + leak(fd); + free(zeroones); + free(onezeros); + free(ones); + free(zeros); + free(readbuf); +} + +/* * In WriteBack mode, writes may be cached beyond what the server thinks is the * EOF. In this case, a short read at EOF should _not_ cause fusefs to update * the file's size. From owner-svn-src-projects@freebsd.org Sun Jul 28 15:20:48 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 27E30AD966 for ; Sun, 28 Jul 2019 15:20:48 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0B08A6A126; Sun, 28 Jul 2019 15:20:48 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C9B8119A02; Sun, 28 Jul 2019 15:20:47 +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 x6SFKl1O050996; Sun, 28 Jul 2019 15:20:47 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6SFKlmQ050995; Sun, 28 Jul 2019 15:20:47 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201907281520.x6SFKlmQ050995@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 28 Jul 2019 15:20:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r350389 - projects/fuse2 X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/fuse2 X-SVN-Commit-Revision: 350389 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0B08A6A126 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.993,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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: Sun, 28 Jul 2019 15:20:48 -0000 Author: asomers Date: Sun Jul 28 15:20:47 2019 New Revision: 350389 URL: https://svnweb.freebsd.org/changeset/base/350389 Log: [skip ci] Add me to MAINTAINERS for fusefs Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/MAINTAINERS Modified: projects/fuse2/MAINTAINERS ============================================================================== --- projects/fuse2/MAINTAINERS Sun Jul 28 15:17:32 2019 (r350388) +++ projects/fuse2/MAINTAINERS Sun Jul 28 15:20:47 2019 (r350389) @@ -53,6 +53,7 @@ contrib/pjdfstest asomers,ngie,pjd,#test Pre-commit re etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. fetch des Pre-commit review requested, email only. +fusefs(5) asomers Pre-commit review requested. geli pjd Pre-commit review requested (both sys/geom/eli/ and sbin/geom/class/eli/). isci(4) jimharris Pre-commit review requested. iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org From owner-svn-src-projects@freebsd.org Sun Jul 28 16:22:51 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 802F1AEF23 for ; Sun, 28 Jul 2019 16:22:51 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5F2166CA93; Sun, 28 Jul 2019 16:22:51 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3280F1A65F; Sun, 28 Jul 2019 16:22:51 +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 x6SGMpni092100; Sun, 28 Jul 2019 16:22:51 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6SGMpOc092099; Sun, 28 Jul 2019 16:22:51 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201907281622.x6SGMpOc092099@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 28 Jul 2019 16:22:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r350391 - projects/fuse2/sys/kern X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/fuse2/sys/kern X-SVN-Commit-Revision: 350391 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5F2166CA93 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.993,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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: Sun, 28 Jul 2019 16:22:51 -0000 Author: asomers Date: Sun Jul 28 16:22:50 2019 New Revision: 350391 URL: https://svnweb.freebsd.org/changeset/base/350391 Log: MFHead @350390 Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/sys/kern/vfs_subr.c Directory Properties: projects/fuse2/ (props changed) Modified: projects/fuse2/sys/kern/vfs_subr.c ============================================================================== --- projects/fuse2/sys/kern/vfs_subr.c Sun Jul 28 16:07:27 2019 (r350390) +++ projects/fuse2/sys/kern/vfs_subr.c Sun Jul 28 16:22:50 2019 (r350391) @@ -951,11 +951,12 @@ vattr_null(struct vattr *vap) * @param mp Try to reclaim vnodes from this mountpoint * @param reclaim_nc_src Only reclaim directories with outgoing namecache * entries if this argument is strue - * @param reclaim_free Only reclaim free vnodes if this is set. + * @param trigger Only reclaim vnodes with fewer than this many resident + * pages. * @return The number of vnodes that were reclaimed. */ static int -vlrureclaim(struct mount *mp, int reclaim_nc_src, int trigger) +vlrureclaim(struct mount *mp, bool reclaim_nc_src, int trigger) { struct vnode *vp; int count, done, target; @@ -1244,7 +1245,8 @@ vnlru_proc(void) { struct mount *mp, *nmp; unsigned long onumvnodes; - int done, force, reclaim_nc_src, trigger, usevnodes; + int done, force, trigger, usevnodes; + bool reclaim_nc_src; EVENTHANDLER_REGISTER(shutdown_pre_sync, kproc_shutdown, vnlruproc, SHUTDOWN_PRI_FIRST); From owner-svn-src-projects@freebsd.org Sun Jul 28 22:00:46 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BC650B60FB for ; Sun, 28 Jul 2019 22:00:46 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9BE5F817B2; Sun, 28 Jul 2019 22:00:46 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 676311E51B; Sun, 28 Jul 2019 22:00:46 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6SM0klT091682; Sun, 28 Jul 2019 22:00:46 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6SM0kWX091681; Sun, 28 Jul 2019 22:00:46 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201907282200.x6SM0kWX091681@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 28 Jul 2019 22:00:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r350397 - projects/nfsv42/sys/fs/nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfsv42/sys/fs/nfsserver X-SVN-Commit-Revision: 350397 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9BE5F817B2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.993,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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: Sun, 28 Jul 2019 22:00:46 -0000 Author: rmacklem Date: Sun Jul 28 22:00:45 2019 New Revision: 350397 URL: https://svnweb.freebsd.org/changeset/base/350397 Log: Return NFSERR_NOTSUPP for the NFSv4.2 Copy operation if a pNFS server. A pNFS server would need to proxy the Read/Write operations to the DS(s) for the NFSv4.2 Copy operation. Normally it should be more efficient for the client to do the Read/Write operations directly on the DS(s), so return NFSERR_NOTSUPP for this case to encourage the client to do the I/O directly on the DS(s). Modified: projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c Modified: projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c ============================================================================== --- projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c Sun Jul 28 21:47:04 2019 (r350396) +++ projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c Sun Jul 28 22:00:45 2019 (r350397) @@ -5211,6 +5211,14 @@ nfsrvd_copy_file_range(struct nfsrv_descript *nd, int nd->nd_repstat = NFSERR_WRONGSEC; goto nfsmout; } + if (nfsrv_devidcnt > 0) { + /* + * For a pNFS server, reply NFSERR_NOTSUPP so that the client + * will do the copy via I/O on the DS(s). + */ + nd->nd_repstat = NFSERR_NOTSUPP; + goto nfsmout; + } NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_STATEID + 3 * NFSX_HYPER + 3 * NFSX_UNSIGNED); instp->ls_flags = (NFSLCK_CHECK | NFSLCK_READACCESS); From owner-svn-src-projects@freebsd.org Mon Jul 29 01:00:42 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9DD98B957F for ; Mon, 29 Jul 2019 01:00:42 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7CFF68720D; Mon, 29 Jul 2019 01:00:42 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 555C2205B6; Mon, 29 Jul 2019 01:00:42 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6T10g7p099098; Mon, 29 Jul 2019 01:00:42 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6T10gxA099097; Mon, 29 Jul 2019 01:00:42 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201907290100.x6T10gxA099097@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 29 Jul 2019 01:00:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r350398 - projects/nfsv42/sys/fs/nfs X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfsv42/sys/fs/nfs X-SVN-Commit-Revision: 350398 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7CFF68720D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.94)[-0.936,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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, 29 Jul 2019 01:00:42 -0000 Author: rmacklem Date: Mon Jul 29 01:00:41 2019 New Revision: 350398 URL: https://svnweb.freebsd.org/changeset/base/350398 Log: Fix IO Advise, Layout error and Layout stats to not do vn_start_write(). The configuration of nfsv4_opflag had the "do vn_start_write()" flag erroneously set. Fixed by this patch. Modified: projects/nfsv42/sys/fs/nfs/nfs_commonsubs.c Modified: projects/nfsv42/sys/fs/nfs/nfs_commonsubs.c ============================================================================== --- projects/nfsv42/sys/fs/nfs/nfs_commonsubs.c Sun Jul 28 22:00:45 2019 (r350397) +++ projects/nfsv42/sys/fs/nfs/nfs_commonsubs.c Mon Jul 29 01:00:41 2019 (r350398) @@ -171,9 +171,9 @@ struct nfsv4_opflag nfsv4_opflag[NFSV42_NOPS] = { { 2, 1, 1, 0, LK_SHARED, 1, 0 }, /* Copy */ { 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* Copy Notify */ { 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* Deallocate */ - { 0, 1, 0, 1, LK_SHARED, 1, 0 }, /* IO Advise */ - { 0, 1, 0, 1, LK_EXCLUSIVE, 1, 0 }, /* Layout Error */ - { 0, 1, 0, 1, LK_EXCLUSIVE, 1, 0 }, /* Layout Stats */ + { 0, 1, 0, 0, LK_SHARED, 1, 0 }, /* IO Advise */ + { 0, 1, 0, 0, LK_EXCLUSIVE, 1, 0 }, /* Layout Error */ + { 0, 1, 0, 0, LK_EXCLUSIVE, 1, 0 }, /* Layout Stats */ { 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* Offload Cancel */ { 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* Offload Status */ { 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* Read Plus */ From owner-svn-src-projects@freebsd.org Tue Jul 30 04:17:42 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B7398C01FB for ; Tue, 30 Jul 2019 04:17:42 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A2B3E8A470; Tue, 30 Jul 2019 04:17: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 63087B528; Tue, 30 Jul 2019 04:17:42 +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 x6U4Hg2b068698; Tue, 30 Jul 2019 04:17:42 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6U4Hbji068672; Tue, 30 Jul 2019 04:17:37 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201907300417.x6U4Hbji068672@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 30 Jul 2019 04:17:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r350435 - in projects/fuse2: include lib/libarchive/tests lib/libc/stdio sbin/camcontrol sbin/nvmecontrol share/man/man4 sys/arm/ti sys/arm/ti/cpsw sys/arm64/arm64 sys/arm64/conf sys/co... X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/fuse2: include lib/libarchive/tests lib/libc/stdio sbin/camcontrol sbin/nvmecontrol share/man/man4 sys/arm/ti sys/arm/ti/cpsw sys/arm64/arm64 sys/arm64/conf sys/compat/freebsd32 sys/conf s... X-SVN-Commit-Revision: 350435 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A2B3E8A470 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.98)[-0.982,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 30 Jul 2019 04:17:42 -0000 Author: asomers Date: Tue Jul 30 04:17:36 2019 New Revision: 350435 URL: https://svnweb.freebsd.org/changeset/base/350435 Log: MFHead @350426 Sponsored by: The FreeBSD Foundation Added: projects/fuse2/sys/dev/altera/dwc/ - copied from r350426, head/sys/dev/altera/dwc/ Modified: projects/fuse2/include/stdlib.h projects/fuse2/lib/libarchive/tests/Makefile projects/fuse2/lib/libc/stdio/Makefile.inc projects/fuse2/lib/libc/stdio/Symbol.map projects/fuse2/lib/libc/stdio/mktemp.3 projects/fuse2/lib/libc/stdio/mktemp.c projects/fuse2/sbin/camcontrol/camcontrol.c projects/fuse2/sbin/camcontrol/timestamp.c projects/fuse2/sbin/nvmecontrol/identify_ext.c projects/fuse2/share/man/man4/cc_dctcp.4 projects/fuse2/sys/arm/ti/cpsw/if_cpsw.c projects/fuse2/sys/arm/ti/ti_hwmods.c projects/fuse2/sys/arm64/arm64/pmap.c projects/fuse2/sys/arm64/conf/GENERIC projects/fuse2/sys/compat/freebsd32/freebsd32_capability.c projects/fuse2/sys/conf/files.arm64 projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_data_tlv.c projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_store.c projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_value.c projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_value_prf.c projects/fuse2/sys/dev/drm2/drmP.h projects/fuse2/sys/dev/mii/micphy.c projects/fuse2/sys/dev/nvme/nvme.h projects/fuse2/sys/dev/usb/net/if_urndis.c projects/fuse2/sys/fs/devfs/devfs_vnops.c projects/fuse2/sys/fs/ext2fs/ext2_vnops.c projects/fuse2/sys/fs/fuse/fuse_vnops.c projects/fuse2/sys/kern/kern_event.c projects/fuse2/sys/kern/kern_sendfile.c projects/fuse2/sys/kern/kern_sig.c projects/fuse2/sys/kern/sys_process.c projects/fuse2/sys/kern/uipc_shm.c projects/fuse2/sys/mips/broadcom/bhnd_nexus.c projects/fuse2/sys/netinet/cc/cc_dctcp.c projects/fuse2/sys/netpfil/ipfw/ip_fw2.c projects/fuse2/sys/netpfil/ipfw/ip_fw_eaction.c projects/fuse2/sys/netpfil/ipfw/ip_fw_nat.c projects/fuse2/sys/netpfil/ipfw/ip_fw_private.h projects/fuse2/sys/netpfil/ipfw/ip_fw_sockopt.c projects/fuse2/sys/netpfil/pf/pf.c projects/fuse2/sys/netpfil/pf/pf_norm.c projects/fuse2/sys/riscv/riscv/copyinout.S projects/fuse2/sys/rpc/svc_vc.c projects/fuse2/sys/sys/ata.h projects/fuse2/sys/vm/swap_pager.c projects/fuse2/usr.bin/nfsstat/nfsstat.c projects/fuse2/usr.bin/printf/printf.1 Directory Properties: projects/fuse2/ (props changed) Modified: projects/fuse2/include/stdlib.h ============================================================================== --- projects/fuse2/include/stdlib.h Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/include/stdlib.h Tue Jul 30 04:17:36 2019 (r350435) @@ -297,6 +297,7 @@ int mergesort_b(void *, size_t, size_t, int (^)(const #endif int mkostemp(char *, int); int mkostemps(char *, int, int); +int mkostempsat(int, char *, int, int); void qsort_r(void *, size_t, size_t, void *, int (*)(void *, const void *, const void *)); int radixsort(const unsigned char **, int, const unsigned char *, Modified: projects/fuse2/lib/libarchive/tests/Makefile ============================================================================== --- projects/fuse2/lib/libarchive/tests/Makefile Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/lib/libarchive/tests/Makefile Tue Jul 30 04:17:36 2019 (r350435) @@ -581,7 +581,6 @@ ${PACKAGE}FILES+= test_read_format_zip_jar.jar.uu ${PACKAGE}FILES+= test_read_format_zip_length_at_end.zip.uu ${PACKAGE}FILES+= test_read_format_zip_lzma_alone_leak.zipx.uu ${PACKAGE}FILES+= test_read_format_zip_lzma.zipx.uu -${PACKAGE}FILES+= test_read_format_zip_lzma.zipx.uu ${PACKAGE}FILES+= test_read_format_zip_lzma_multi.zipx.uu ${PACKAGE}FILES+= test_read_format_zip_mac_metadata.zip.uu ${PACKAGE}FILES+= test_read_format_zip_malformed1.zip.uu Modified: projects/fuse2/lib/libc/stdio/Makefile.inc ============================================================================== --- projects/fuse2/lib/libc/stdio/Makefile.inc Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/lib/libc/stdio/Makefile.inc Tue Jul 30 04:17:36 2019 (r350435) @@ -63,7 +63,7 @@ MLINKS+=getc.3 fgetc.3 getc.3 getc_unlocked.3 getc.3 g MLINKS+=getline.3 getdelim.3 MLINKS+=getwc.3 fgetwc.3 getwc.3 getwchar.3 MLINKS+=mktemp.3 mkdtemp.3 mktemp.3 mkstemp.3 mktemp.3 mkstemps.3 \ - mktemp.3 mkostemp.3 mktemp.3 mkostemps.3 + mktemp.3 mkostemp.3 mktemp.3 mkostemps.3 mktemp.3 mkostempsat.3 MLINKS+=open_memstream.3 open_wmemstream.3 MLINKS+=printf.3 asprintf.3 printf.3 dprintf.3 printf.3 fprintf.3 \ printf.3 snprintf.3 printf.3 sprintf.3 \ Modified: projects/fuse2/lib/libc/stdio/Symbol.map ============================================================================== --- projects/fuse2/lib/libc/stdio/Symbol.map Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/lib/libc/stdio/Symbol.map Tue Jul 30 04:17:36 2019 (r350435) @@ -171,6 +171,10 @@ FBSD_1.5 { gets_s; }; +FBSD_1.6 { + mkostempsat; +}; + FBSDprivate_1.0 { _flockfile; _flockfile_debug_stub; Modified: projects/fuse2/lib/libc/stdio/mktemp.3 ============================================================================== --- projects/fuse2/lib/libc/stdio/mktemp.3 Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/lib/libc/stdio/mktemp.3 Tue Jul 30 04:17:36 2019 (r350435) @@ -28,7 +28,7 @@ .\" @(#)mktemp.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd August 8, 2013 +.Dd July 29, 2019 .Dt MKTEMP 3 .Os .Sh NAME @@ -46,6 +46,8 @@ .Fn mkostemp "char *template" "int oflags" .Ft int .Fn mkostemps "char *template" "int suffixlen" "int oflags" +.Ft int +.Fn mkostempsat "int dfd" "char *template" "int suffixlen" "int oflags" .Ft char * .Fn mkdtemp "char *template" .In unistd.h @@ -126,6 +128,21 @@ function are told the length of the suffix string. .Pp The +.Fn mkostempsat +function acts the same as +.Fn mkostemps +but takes an additional directory descriptor as a parameter. +The temporary file is created relative to the corresponding +directory, or to the current working directory if the special +value +.Dv AT_FDCWD +is specified. +If the template path is an absolute path, the +.Fa dfd +parameter is ignored and the behavior is identical to +.Fn mkostemps . +.Pp +The .Fn mkdtemp function makes the same replacement to the template as in .Fn mktemp @@ -262,9 +279,10 @@ and is not specified by .St -p1003.1-2008 . The .Fn mkostemp , -.Fn mkstemps -and +.Fn mkstemps , .Fn mkostemps +and +.Fn mkostempsat functions do not conform to any standard. .Sh HISTORY A @@ -293,6 +311,10 @@ and .Fn mkostemps functions appeared in .Fx 10.0 . +The +.Fn mkostempsat +function appeared in +.Fx 13.0 . .Sh BUGS This family of functions produces filenames which can be guessed, though the risk is minimized when large numbers of @@ -308,10 +330,11 @@ and opening it for use (later in the user application) particularly dangerous from a security perspective. Whenever it is possible, -.Fn mkstemp -or +.Fn mkstemp , .Fn mkostemp -should be used instead, since it does not have the race condition. +or +.Fn mkostempsat +should be used instead, since they do not have the race condition. If .Fn mkstemp cannot be used, the filename created by Modified: projects/fuse2/lib/libc/stdio/mktemp.c ============================================================================== --- projects/fuse2/lib/libc/stdio/mktemp.c Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/lib/libc/stdio/mktemp.c Tue Jul 30 04:17:36 2019 (r350435) @@ -49,17 +49,25 @@ __FBSDID("$FreeBSD$"); char *_mktemp(char *); -static int _gettemp(char *, int *, int, int, int); +static int _gettemp(int, char *, int *, int, int, int); static const unsigned char padchar[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; int +mkostempsat(int dfd, char *path, int slen, int oflags) +{ + int fd; + + return (_gettemp(dfd, path, &fd, 0, slen, oflags) ? fd : -1); +} + +int mkostemps(char *path, int slen, int oflags) { int fd; - return (_gettemp(path, &fd, 0, slen, oflags) ? fd : -1); + return (_gettemp(AT_FDCWD, path, &fd, 0, slen, oflags) ? fd : -1); } int @@ -67,7 +75,7 @@ mkstemps(char *path, int slen) { int fd; - return (_gettemp(path, &fd, 0, slen, 0) ? fd : -1); + return (_gettemp(AT_FDCWD, path, &fd, 0, slen, 0) ? fd : -1); } int @@ -75,7 +83,7 @@ mkostemp(char *path, int oflags) { int fd; - return (_gettemp(path, &fd, 0, 0, oflags) ? fd : -1); + return (_gettemp(AT_FDCWD, path, &fd, 0, 0, oflags) ? fd : -1); } int @@ -83,19 +91,19 @@ mkstemp(char *path) { int fd; - return (_gettemp(path, &fd, 0, 0, 0) ? fd : -1); + return (_gettemp(AT_FDCWD, path, &fd, 0, 0, 0) ? fd : -1); } char * mkdtemp(char *path) { - return (_gettemp(path, (int *)NULL, 1, 0, 0) ? path : (char *)NULL); + return (_gettemp(AT_FDCWD, path, (int *)NULL, 1, 0, 0) ? path : (char *)NULL); } char * _mktemp(char *path) { - return (_gettemp(path, (int *)NULL, 0, 0, 0) ? path : (char *)NULL); + return (_gettemp(AT_FDCWD, path, (int *)NULL, 0, 0, 0) ? path : (char *)NULL); } __warn_references(mktemp, @@ -108,7 +116,7 @@ mktemp(char *path) } static int -_gettemp(char *path, int *doopen, int domkdir, int slen, int oflags) +_gettemp(int dfd, char *path, int *doopen, int domkdir, int slen, int oflags) { char *start, *trv, *suffp, *carryp; char *pad; @@ -155,7 +163,7 @@ _gettemp(char *path, int *doopen, int domkdir, int sle for (; trv > path; --trv) { if (*trv == '/') { *trv = '\0'; - rval = stat(path, &sbuf); + rval = fstatat(dfd, path, &sbuf, 0); *trv = '/'; if (rval != 0) return (0); @@ -168,11 +176,11 @@ _gettemp(char *path, int *doopen, int domkdir, int sle } } + oflags |= O_CREAT | O_EXCL | O_RDWR; for (;;) { if (doopen) { - if ((*doopen = - _open(path, O_CREAT|O_EXCL|O_RDWR|oflags, 0600)) >= - 0) + *doopen = _openat(dfd, path, oflags, 0600); + if (*doopen >= 0) return (1); if (errno != EEXIST) return (0); Modified: projects/fuse2/sbin/camcontrol/camcontrol.c ============================================================================== --- projects/fuse2/sbin/camcontrol/camcontrol.c Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sbin/camcontrol/camcontrol.c Tue Jul 30 04:17:36 2019 (r350435) @@ -1521,6 +1521,7 @@ atacapprint(struct ata_params *parm) printf("WWN %04x%04x%04x%04x\n", parm->wwn[0], parm->wwn[1], parm->wwn[2], parm->wwn[3]); } + printf("additional product id %.8s\n", parm->product_id); if (parm->enabled.extension & ATA_SUPPORT_MEDIASN) { printf("media serial number %.30s\n", parm->media_serial); @@ -1650,35 +1651,39 @@ atacapprint(struct ata_params *parm) } else printf("\n"); printf("Native Command Queuing (NCQ) "); - if (parm->satacapabilities != 0xffff && - (parm->satacapabilities & ATA_SUPPORT_NCQ)) { + if (atasata(parm) && (parm->satacapabilities & ATA_SUPPORT_NCQ)) { printf("yes %d tags\n", ATA_QUEUE_LEN(parm->queue) + 1); + printf("NCQ Priority Information %s\n", + parm->satacapabilities & ATA_SUPPORT_NCQ_PRIO ? + "yes" : "no"); + printf("NCQ Non-Data Command %s\n", + parm->satacapabilities2 & ATA_SUPPORT_NCQ_NON_DATA ? + "yes" : "no"); + printf("NCQ Streaming %s\n", + parm->satacapabilities2 & ATA_SUPPORT_NCQ_STREAM ? + "yes" : "no"); + printf("Receive & Send FPDMA Queued %s\n", + parm->satacapabilities2 & ATA_SUPPORT_RCVSND_FPDMA_QUEUED ? + "yes" : "no"); + printf("NCQ Autosense %s\n", + parm->satasupport & ATA_SUPPORT_NCQ_AUTOSENSE ? + "yes" : "no"); } else printf("no\n"); - printf("NCQ Queue Management %s\n", atasata(parm) && - parm->satacapabilities2 & ATA_SUPPORT_NCQ_QMANAGEMENT ? - "yes" : "no"); - printf("NCQ Streaming %s\n", atasata(parm) && - parm->satacapabilities2 & ATA_SUPPORT_NCQ_STREAM ? - "yes" : "no"); - printf("Receive & Send FPDMA Queued %s\n", atasata(parm) && - parm->satacapabilities2 & ATA_SUPPORT_RCVSND_FPDMA_QUEUED ? - "yes" : "no"); - printf("SMART %s %s\n", parm->support.command1 & ATA_SUPPORT_SMART ? "yes" : "no", parm->enabled.command1 & ATA_SUPPORT_SMART ? "yes" : "no"); - printf("microcode download %s %s\n", - parm->support.command2 & ATA_SUPPORT_MICROCODE ? "yes" : "no", - parm->enabled.command2 & ATA_SUPPORT_MICROCODE ? "yes" : "no"); printf("security %s %s\n", parm->support.command1 & ATA_SUPPORT_SECURITY ? "yes" : "no", parm->enabled.command1 & ATA_SUPPORT_SECURITY ? "yes" : "no"); printf("power management %s %s\n", parm->support.command1 & ATA_SUPPORT_POWERMGT ? "yes" : "no", parm->enabled.command1 & ATA_SUPPORT_POWERMGT ? "yes" : "no"); + printf("microcode download %s %s\n", + parm->support.command2 & ATA_SUPPORT_MICROCODE ? "yes" : "no", + parm->enabled.command2 & ATA_SUPPORT_MICROCODE ? "yes" : "no"); printf("advanced power management %s %s", parm->support.command2 & ATA_SUPPORT_APM ? "yes" : "no", parm->enabled.command2 & ATA_SUPPORT_APM ? "yes" : "no"); @@ -1721,6 +1726,15 @@ atacapprint(struct ata_params *parm) printf("free-fall %s %s\n", parm->support2 & ATA_SUPPORT_FREEFALL ? "yes" : "no", parm->enabled2 & ATA_SUPPORT_FREEFALL ? "yes" : "no"); + printf("sense data reporting %s %s\n", + parm->support2 & ATA_SUPPORT_SENSE_REPORT ? "yes" : "no", + parm->enabled2 & ATA_SUPPORT_SENSE_REPORT ? "yes" : "no"); + printf("extended power conditions %s %s\n", + parm->support2 & ATA_SUPPORT_EPC ? "yes" : "no", + parm->enabled2 & ATA_SUPPORT_EPC ? "yes" : "no"); + printf("device statistics notification %s %s\n", + parm->support2 & ATA_SUPPORT_DSN ? "yes" : "no", + parm->enabled2 & ATA_SUPPORT_DSN ? "yes" : "no"); printf("Data Set Management (DSM/TRIM) "); if (parm->support_dsm & ATA_SUPPORT_DSM_TRIM) { printf("yes\n"); @@ -1743,6 +1757,8 @@ atacapprint(struct ata_params *parm) } else { printf("no\n"); } + printf("encrypts all user data %s\n", + parm->support3 & ATA_ENCRYPTS_ALL_USER_DATA ? "yes" : "no"); printf("Sanitize "); if (parm->multi & ATA_SUPPORT_SANITIZE) { printf("yes\t\t%s%s%s\n", Modified: projects/fuse2/sbin/camcontrol/timestamp.c ============================================================================== --- projects/fuse2/sbin/camcontrol/timestamp.c Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sbin/camcontrol/timestamp.c Tue Jul 30 04:17:36 2019 (r350435) @@ -79,7 +79,6 @@ set_restore_flags(struct cam_device *device, uint8_t * int error = 0; struct scsi_control_ext_page *control_page = NULL; struct scsi_mode_header_10 *mode_hdr = NULL; - struct scsi_mode_sense_10 *cdb = NULL; union ccb *ccb = NULL; unsigned long mode_buf_size = sizeof(struct scsi_mode_header_10) + sizeof(struct scsi_mode_blk_desc) + @@ -96,25 +95,19 @@ set_restore_flags(struct cam_device *device, uint8_t * * Get the control extension subpage, we'll send it back modified to * enable SCSI control over the tape drive's timestamp */ - scsi_mode_sense_len(&ccb->csio, + scsi_mode_sense_subpage(&ccb->csio, /*retries*/ retry_count, /*cbfcnp*/ NULL, /*tag_action*/ task_attr, /*dbd*/ 0, /*page_control*/ SMS_PAGE_CTRL_CURRENT, /*page*/ SCEP_PAGE_CODE, + /*subpage*/ SCEP_SUBPAGE_CODE, /*param_buf*/ &mode_buf[0], /*param_len*/ mode_buf_size, /*minimum_cmd_size*/ 10, /*sense_len*/ SSD_FULL_SIZE, /*timeout*/ timeout ? timeout : 5000); - /* - * scsi_mode_sense_len does not have a subpage argument at the moment, - * so we have to manually set the subpage code before calling - * cam_send_ccb(). - */ - cdb = (struct scsi_mode_sense_10 *)ccb->csio.cdb_io.cdb_bytes; - cdb->subpage = SCEP_SUBPAGE_CODE; ccb->ccb_h.flags |= CAM_DEV_QFRZDIS; if (retry_count > 0) Modified: projects/fuse2/sbin/nvmecontrol/identify_ext.c ============================================================================== --- projects/fuse2/sbin/nvmecontrol/identify_ext.c Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sbin/nvmecontrol/identify_ext.c Tue Jul 30 04:17:36 2019 (r350435) @@ -49,7 +49,7 @@ nvme_print_controller(struct nvme_controller_data *cda uint8_t str[128]; char cbuf[UINT128_DIG + 1]; uint16_t oncs, oacs; - uint8_t compare, write_unc, dsm, vwc_present; + uint8_t compare, write_unc, dsm, t; uint8_t security, fmt, fw, nsmgmt; uint8_t fw_slot1_ro, fw_num_slots; uint8_t ns_smart; @@ -63,8 +63,6 @@ nvme_print_controller(struct nvme_controller_data *cda NVME_CTRLR_DATA_ONCS_WRITE_UNC_MASK; dsm = (oncs >> NVME_CTRLR_DATA_ONCS_DSM_SHIFT) & NVME_CTRLR_DATA_ONCS_DSM_MASK; - vwc_present = (cdata->vwc >> NVME_CTRLR_DATA_VWC_PRESENT_SHIFT) & - NVME_CTRLR_DATA_VWC_PRESENT_MASK; oacs = cdata->oacs; security = (oacs >> NVME_CTRLR_DATA_OACS_SECURITY_SHIFT) & @@ -107,8 +105,10 @@ nvme_print_controller(struct nvme_controller_data *cda printf("Recommended Arb Burst: %d\n", cdata->rab); printf("IEEE OUI Identifier: %02x %02x %02x\n", cdata->ieee[0], cdata->ieee[1], cdata->ieee[2]); - printf("Multi-Path I/O Capabilities: %s%s%s%s\n", + printf("Multi-Path I/O Capabilities: %s%s%s%s%s\n", (cdata->mic == 0) ? "Not Supported" : "", + ((cdata->mic >> NVME_CTRLR_DATA_MIC_ANAR_SHIFT) & + NVME_CTRLR_DATA_MIC_SRIOVVF_MASK) ? "Asymmetric, " : "", ((cdata->mic >> NVME_CTRLR_DATA_MIC_SRIOVVF_SHIFT) & NVME_CTRLR_DATA_MIC_SRIOVVF_MASK) ? "SR-IOV VF, " : "", ((cdata->mic >> NVME_CTRLR_DATA_MIC_MCTRLRS_SHIFT) & @@ -149,9 +149,24 @@ nvme_print_controller(struct nvme_controller_data *cda printf("Virtualization Management: %sSupported\n", ((oacs >> NVME_CTRLR_DATA_OACS_VM_SHIFT) & NVME_CTRLR_DATA_OACS_VM_MASK) ? "" : "Not "); - printf("Doorbell Buffer Config %sSupported\n", + printf("Doorbell Buffer Config: %sSupported\n", ((oacs >> NVME_CTRLR_DATA_OACS_DBBUFFER_SHIFT) & NVME_CTRLR_DATA_OACS_DBBUFFER_MASK) ? "" : "Not "); + printf("Get LBA Status: %sSupported\n", + ((oacs >> NVME_CTRLR_DATA_OACS_GETLBA_SHIFT) & + NVME_CTRLR_DATA_OACS_GETLBA_MASK) ? "" : "Not "); + printf("Sanitize: "); + if (cdata->sanicap != 0) { + printf("%s%s%s\n", + ((cdata->sanicap >> NVME_CTRLR_DATA_SANICAP_CES_SHIFT) & + NVME_CTRLR_DATA_SANICAP_CES_SHIFT) ? "crypto, " : "", + ((cdata->sanicap >> NVME_CTRLR_DATA_SANICAP_BES_SHIFT) & + NVME_CTRLR_DATA_SANICAP_BES_SHIFT) ? "block, " : "", + ((cdata->sanicap >> NVME_CTRLR_DATA_SANICAP_OWS_SHIFT) & + NVME_CTRLR_DATA_SANICAP_OWS_SHIFT) ? "overwrite" : ""); + } else { + printf("Not Supported\n"); + } printf("Abort Command Limit: %d\n", cdata->acl+1); printf("Async Event Request Limit: %d\n", cdata->aerl+1); printf("Number of Firmware Slots: "); @@ -197,6 +212,9 @@ nvme_print_controller(struct nvme_controller_data *cda printf("Timestamp feature: %sSupported\n", ((oncs >> NVME_CTRLR_DATA_ONCS_TIMESTAMP_SHIFT) & NVME_CTRLR_DATA_ONCS_TIMESTAMP_MASK) ? "" : "Not "); + printf("Verify feature: %sSupported\n", + ((oncs >> NVME_CTRLR_DATA_ONCS_VERIFY_SHIFT) & + NVME_CTRLR_DATA_ONCS_VERIFY_MASK) ? "" : "Not "); printf("Fused Operation Support: %s%s\n", (cdata->fuses == 0) ? "Not Supported" : "", ((cdata->fuses >> NVME_CTRLR_DATA_FUSES_CNW_SHIFT) & @@ -208,8 +226,13 @@ nvme_print_controller(struct nvme_controller_data *cda NVME_CTRLR_DATA_FNA_ERASE_ALL_MASK) ? "All-NVM" : "Per-NS", ((cdata->fna >> NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT) & NVME_CTRLR_DATA_FNA_FORMAT_ALL_MASK) ? "All-NVM" : "Per-NS"); - printf("Volatile Write Cache: %s\n", - vwc_present ? "Present" : "Not Present"); + t = (cdata->vwc >> NVME_CTRLR_DATA_VWC_ALL_SHIFT) & + NVME_CTRLR_DATA_VWC_ALL_MASK; + printf("Volatile Write Cache: %s%s\n", + ((cdata->vwc >> NVME_CTRLR_DATA_VWC_PRESENT_SHIFT) & + NVME_CTRLR_DATA_VWC_PRESENT_MASK) ? "Present" : "Not Present", + (t == NVME_CTRLR_DATA_VWC_ALL_NO) ? ", no flush all" : + (t == NVME_CTRLR_DATA_VWC_ALL_YES) ? ", flush all" : ""); if (nsmgmt) { printf("\n"); Modified: projects/fuse2/share/man/man4/cc_dctcp.4 ============================================================================== --- projects/fuse2/share/man/man4/cc_dctcp.4 Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/share/man/man4/cc_dctcp.4 Tue Jul 30 04:17:36 2019 (r350435) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 12, 2015 +.Dd July 29, 2019 .Dt CC_DCTCP 4 .Os .Sh NAME @@ -60,7 +60,7 @@ In addition, when classic ECN is used as sender and DC receiver, DCTCP avoids to mirror back ACKs only when the CWR flag is set in the incoming packet. .Pp -The other specifications are based on the paper and Internet Draft referenced +The other specifications are based on the paper and the RFC referenced in the .Sx SEE ALSO section below. @@ -70,16 +70,27 @@ The algorithm exposes the following tunable variables branch of the .Xr sysctl 3 MIB: -.Bl -tag -width ".Va alpha" +.Bl -tag -width ".Va slowstart" .It Va alpha -An initial estimator of the congestion on the link. -Default is 0. -.It Va dctcp_shift_g -An estimation gain in the alpha calculation. -Default is 16. +The initial value to estimate the congestion on the link. +The valid range is from 0 to 1024, where 1024 reduces the congestion +window to half, if a CE is observed in the first window and +.Va alpha +could not yet adjust to the congestion level on that path. +Default is 1024. +.It Va shift_g +An estimation gain in the +.Va alpha +calculation. +This influences the responsiveness when adjusting alpha +to the most recent observed window. +Valid range from 0 to 10, the default is 4, resulting in an effective +gain of 1 / ( 2 ^ +.Va shift_g +), or 1/16th. .It Va slowstart -A trigger to halve congestion window after slow start. -Default does nothing to halve window. +A flag if the congestion window should be reduced by one half after slow start. +Valid settings 0 and 1, default 0. .El .Sh SEE ALSO .Xr cc_chd 4 , @@ -108,10 +119,12 @@ Default does nothing to halve window. .Re .Rs .%A "Stephen Bensley" -.%A "Lars Eggert" .%A "Dave Thaler" -.%T "Microsoft's Datacenter TCP (DCTCP): TCP Congestion Control for Datacenters" -.%U "http://tools.ietf.org/html/draft-bensley-tcpm-dctcp-01" +.%A "Praveen Balasubramanian" +.%A "Lars Eggert" +.%A "Glenn Judd" +.%T "Data Center TCP (DCTCP): TCP Congestion Control for Data Centers" +.%U "https://tools.ietf.org/html/rfc8257" .Re .Sh HISTORY The Modified: projects/fuse2/sys/arm/ti/cpsw/if_cpsw.c ============================================================================== --- projects/fuse2/sys/arm/ti/cpsw/if_cpsw.c Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sys/arm/ti/cpsw/if_cpsw.c Tue Jul 30 04:17:36 2019 (r350435) @@ -755,7 +755,9 @@ cpsw_get_fdt_data(struct cpsw_softc *sc, int port) continue; } OF_prop_free(name); - if (mdio_child_addr != slave_mdio_addr[port]) + + if (mdio_child_addr != slave_mdio_addr[port] && + mdio_child_addr != (slave_mdio_addr[port] & 0xFFF)) continue; if (fdt_get_phyaddr(child, NULL, &phy, NULL) != 0){ Modified: projects/fuse2/sys/arm/ti/ti_hwmods.c ============================================================================== --- projects/fuse2/sys/arm/ti/ti_hwmods.c Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sys/arm/ti/ti_hwmods.c Tue Jul 30 04:17:36 2019 (r350435) @@ -97,6 +97,16 @@ struct hwmod ti_hwmods[] = { {NULL, 0} }; +static inline int +ti_get_hwmods_prop(phandle_t node, void **name) +{ + int len; + + if ((len = OF_getprop_alloc(node, "ti,hwmods", name)) > 0) + return (len); + return (OF_getprop_alloc(OF_parent(node), "ti,hwmods", name)); +} + clk_ident_t ti_hwmods_get_clock(device_t dev) { @@ -110,7 +120,7 @@ ti_hwmods_get_clock(device_t dev) if ((node = ofw_bus_get_node(dev)) == 0) return (INVALID_CLK_IDENT); - if ((len = OF_getprop_alloc(OF_parent(node), "ti,hwmods", (void**)&name)) <= 0) + if ((len = ti_get_hwmods_prop(node, (void **)&name)) <= 0) return (INVALID_CLK_IDENT); buf = name; @@ -148,7 +158,7 @@ int ti_hwmods_contains(device_t dev, const char *hwmod if ((node = ofw_bus_get_node(dev)) == 0) return (0); - if ((len = OF_getprop_alloc(OF_parent(node), "ti,hwmods", (void**)&name)) <= 0) + if ((len = ti_get_hwmods_prop(node, (void **)&name)) <= 0) return (0); buf = name; @@ -182,7 +192,7 @@ ti_hwmods_get_unit(device_t dev, const char *hwmod) if ((node = ofw_bus_get_node(dev)) == 0) return (0); - if ((len = OF_getprop_alloc(OF_parent(node), "ti,hwmods", (void**)&name)) <= 0) + if ((len = ti_get_hwmods_prop(node, (void **)&name)) <= 0) return (0); buf = name; Modified: projects/fuse2/sys/arm64/arm64/pmap.c ============================================================================== --- projects/fuse2/sys/arm64/arm64/pmap.c Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sys/arm64/arm64/pmap.c Tue Jul 30 04:17:36 2019 (r350435) @@ -5790,7 +5790,7 @@ pmap_fault(pmap_t pmap, uint64_t esr, uint64_t far) (pmap_load(pte) & (ATTR_AP_RW_BIT | ATTR_SW_DBM)) == (ATTR_AP(ATTR_AP_RO) | ATTR_SW_DBM)) { pmap_clear_bits(pte, ATTR_AP_RW_BIT); - pmap_invalidate_page(pmap, trunc_page(far)); + pmap_invalidate_page(pmap, far); rv = KERN_SUCCESS; } PMAP_UNLOCK(pmap); Modified: projects/fuse2/sys/arm64/conf/GENERIC ============================================================================== --- projects/fuse2/sys/arm64/conf/GENERIC Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sys/arm64/conf/GENERIC Tue Jul 30 04:17:36 2019 (r350435) @@ -162,6 +162,7 @@ device smc # SMSC LAN91C111 device vnic # Cavium ThunderX NIC device al_eth # Annapurna Alpine Ethernet NIC device dwc_rk # Rockchip Designware +device dwc_socfpga # Altera SOCFPGA Ethernet MAC # Etherswitch devices device etherswitch # Enable etherswitch support Modified: projects/fuse2/sys/compat/freebsd32/freebsd32_capability.c ============================================================================== --- projects/fuse2/sys/compat/freebsd32/freebsd32_capability.c Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sys/compat/freebsd32/freebsd32_capability.c Tue Jul 30 04:17:36 2019 (r350435) @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/fuse2/sys/conf/files.arm64 ============================================================================== --- projects/fuse2/sys/conf/files.arm64 Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sys/conf/files.arm64 Tue Jul 30 04:17:36 2019 (r350435) @@ -206,6 +206,7 @@ dev/acpica/acpi_pci_link.c optional acpi pci dev/acpica/acpi_pcib.c optional acpi pci dev/acpica/acpi_pxm.c optional acpi dev/ahci/ahci_generic.c optional ahci +dev/altera/dwc/if_dwc_socfpga.c optional fdt dwc_socfpga dev/axgbe/if_axgbe.c optional axgbe dev/axgbe/xgbe-desc.c optional axgbe dev/axgbe/xgbe-dev.c optional axgbe Modified: projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_data_tlv.c ============================================================================== --- projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_data_tlv.c Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_data_tlv.c Tue Jul 30 04:17:36 2019 (r350435) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #ifdef _KERNEL #include #include +#include #include #include #else /* !_KERNEL */ Modified: projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_store.c ============================================================================== --- projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_store.c Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_store.c Tue Jul 30 04:17:36 2019 (r350435) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #ifdef _KERNEL Modified: projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_value.c ============================================================================== --- projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_value.c Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_value.c Tue Jul 30 04:17:36 2019 (r350435) @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #ifdef _KERNEL Modified: projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_value_prf.c ============================================================================== --- projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_value_prf.c Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sys/dev/bhnd/nvram/bhnd_nvram_value_prf.c Tue Jul 30 04:17:36 2019 (r350435) @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #ifdef _KERNEL Modified: projects/fuse2/sys/dev/drm2/drmP.h ============================================================================== --- projects/fuse2/sys/dev/drm2/drmP.h Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sys/dev/drm2/drmP.h Tue Jul 30 04:17:36 2019 (r350435) @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/fuse2/sys/dev/mii/micphy.c ============================================================================== --- projects/fuse2/sys/dev/mii/micphy.c Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sys/dev/mii/micphy.c Tue Jul 30 04:17:36 2019 (r350435) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2014 Ruslan Bukin + * Copyright (c) 2014,2019 Ruslan Bukin * All rights reserved. * * This software was developed by SRI International and the University of @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); /* - * Micrel KSZ9021 Gigabit Ethernet Transceiver + * Micrel KSZ8081/KSZ9021/KSZ9031 Gigabit Ethernet Transceiver */ #include @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define MII_KSZPHY_EXTREG 0x0b #define KSZPHY_EXTREG_WRITE (1 << 15) @@ -251,6 +252,7 @@ micphy_probe(device_t dev) static int micphy_attach(device_t dev) { + mii_fdt_phy_config_t *cfg; struct mii_softc *sc; phandle_t node; device_t miibus; @@ -271,10 +273,12 @@ micphy_attach(device_t dev) if ((node = ofw_bus_get_node(parent)) == -1) return (ENXIO); + cfg = mii_fdt_get_config(dev); + if (sc->mii_mpd_model == MII_MODEL_MICREL_KSZ9031) - ksz9031_load_values(sc, node); + ksz9031_load_values(sc, cfg->phynode); else - ksz9021_load_values(sc, node); + ksz9021_load_values(sc, cfg->phynode); return (0); } Modified: projects/fuse2/sys/dev/nvme/nvme.h ============================================================================== --- projects/fuse2/sys/dev/nvme/nvme.h Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sys/dev/nvme/nvme.h Tue Jul 30 04:17:36 2019 (r350435) @@ -175,6 +175,9 @@ /* SR-IOV Virtual Function */ #define NVME_CTRLR_DATA_MIC_SRIOVVF_SHIFT (2) #define NVME_CTRLR_DATA_MIC_SRIOVVF_MASK (0x1) +/* Asymmetric Namespace Access Reporting */ +#define NVME_CTRLR_DATA_MIC_ANAR_SHIFT (3) +#define NVME_CTRLR_DATA_MIC_ANAR_MASK (0x1) /** OACS - optional admin command support */ /* supports security send/receive commands */ @@ -204,6 +207,9 @@ /* supports Doorbell Buffer Config */ #define NVME_CTRLR_DATA_OACS_DBBUFFER_SHIFT (8) #define NVME_CTRLR_DATA_OACS_DBBUFFER_MASK (0x1) +/* supports Get LBA Status */ +#define NVME_CTRLR_DATA_OACS_GETLBA_SHIFT (9) +#define NVME_CTRLR_DATA_OACS_GETLBA_MASK (0x1) /** firmware updates */ /* first slot is read-only */ @@ -212,6 +218,9 @@ /* number of firmware slots */ #define NVME_CTRLR_DATA_FRMW_NUM_SLOTS_SHIFT (1) #define NVME_CTRLR_DATA_FRMW_NUM_SLOTS_MASK (0x7) +/* firmware activation without reset */ +#define NVME_CTRLR_DATA_FRMW_ACT_WO_RESET_SHIFT (4) +#define NVME_CTRLR_DATA_FRMW_ACT_WO_RESET_MASK (0x1) /** log page attributes */ /* per namespace smart/health log page */ @@ -228,6 +237,26 @@ #define NVME_CTRLR_DATA_APSTA_APST_SUPP_SHIFT (0) #define NVME_CTRLR_DATA_APSTA_APST_SUPP_MASK (0x1) +/** Sanitize Capabilities */ +/* Crypto Erase Support */ +#define NVME_CTRLR_DATA_SANICAP_CES_SHIFT (0) +#define NVME_CTRLR_DATA_SANICAP_CES_MASK (0x1) +/* Block Erase Support */ +#define NVME_CTRLR_DATA_SANICAP_BES_SHIFT (1) +#define NVME_CTRLR_DATA_SANICAP_BES_MASK (0x1) +/* Overwrite Support */ +#define NVME_CTRLR_DATA_SANICAP_OWS_SHIFT (2) +#define NVME_CTRLR_DATA_SANICAP_OWS_MASK (0x1) +/* No-Deallocate Inhibited */ +#define NVME_CTRLR_DATA_SANICAP_NDI_SHIFT (29) +#define NVME_CTRLR_DATA_SANICAP_NDI_MASK (0x1) +/* No-Deallocate Modifies Media After Sanitize */ +#define NVME_CTRLR_DATA_SANICAP_NODMMAS_SHIFT (30) +#define NVME_CTRLR_DATA_SANICAP_NODMMAS_MASK (0x3) +#define NVME_CTRLR_DATA_SANICAP_NODMMAS_UNDEF (0) +#define NVME_CTRLR_DATA_SANICAP_NODMMAS_NO (1) +#define NVME_CTRLR_DATA_SANICAP_NODMMAS_YES (2) + /** submission queue entry size */ #define NVME_CTRLR_DATA_SQES_MIN_SHIFT (0) #define NVME_CTRLR_DATA_SQES_MIN_MASK (0xF) @@ -255,6 +284,8 @@ #define NVME_CTRLR_DATA_ONCS_RESERV_MASK (0x1) #define NVME_CTRLR_DATA_ONCS_TIMESTAMP_SHIFT (6) #define NVME_CTRLR_DATA_ONCS_TIMESTAMP_MASK (0x1) +#define NVME_CTRLR_DATA_ONCS_VERIFY_SHIFT (7) +#define NVME_CTRLR_DATA_ONCS_VERIFY_MASK (0x1) /** Fused Operation Support */ #define NVME_CTRLR_DATA_FUSES_CNW_SHIFT (0) @@ -269,8 +300,15 @@ #define NVME_CTRLR_DATA_FNA_CRYPTO_ERASE_MASK (0x1) /** volatile write cache */ +/* volatile write cache present */ #define NVME_CTRLR_DATA_VWC_PRESENT_SHIFT (0) #define NVME_CTRLR_DATA_VWC_PRESENT_MASK (0x1) +/* flush all namespaces supported */ +#define NVME_CTRLR_DATA_VWC_ALL_SHIFT (1) +#define NVME_CTRLR_DATA_VWC_ALL_MASK (0x3) +#define NVME_CTRLR_DATA_VWC_ALL_UNKNOWN (0) +#define NVME_CTRLR_DATA_VWC_ALL_NO (2) +#define NVME_CTRLR_DATA_VWC_ALL_YES (3) /** namespace features */ /* thin provisioning */ @@ -285,6 +323,9 @@ /* NGUID and EUI64 fields are not reusable */ #define NVME_NS_DATA_NSFEAT_NO_ID_REUSE_SHIFT (3) #define NVME_NS_DATA_NSFEAT_NO_ID_REUSE_MASK (0x1) +/* NPWG, NPWA, NPDG, NPDA, and NOWS are valid */ +#define NVME_NS_DATA_NSFEAT_NPVALID_SHIFT (4) +#define NVME_NS_DATA_NSFEAT_NPVALID_MASK (0x1) /** formatted lba size */ #define NVME_NS_DATA_FLBAS_FORMAT_SHIFT (0) @@ -793,13 +834,28 @@ struct nvme_controller_data { /** Controller Attributes */ uint32_t ctratt; /* bitfield really */ - uint8_t reserved1[12]; + /** Read Recovery Levels Supported */ + uint16_t rrls; + uint8_t reserved1[9]; + + /** Controller Type */ + uint8_t cntrltype; + /** FRU Globally Unique Identifier */ uint8_t fguid[16]; - uint8_t reserved2[128]; + /** Command Retry Delay Time 1 */ + uint16_t crdt1; + /** Command Retry Delay Time 2 */ + uint16_t crdt2; + + /** Command Retry Delay Time 3 */ + uint16_t crdt3; + + uint8_t reserved2[122]; + /* bytes 256-511: admin command set attributes */ /** optional admin command support */ @@ -878,7 +934,34 @@ struct nvme_controller_data { /** Sanitize Capabilities */ uint32_t sanicap; /* Really a bitfield */ - uint8_t reserved3[180]; + /** Host Memory Buffer Minimum Descriptor Entry Size */ + uint32_t hmminds; + + /** Host Memory Maximum Descriptors Entries */ + uint16_t hmmaxd; + + /** NVM Set Identifier Maximum */ + uint16_t nsetidmax; + + /** Endurance Group Identifier Maximum */ + uint16_t endgidmax; + + /** ANA Transition Time */ + uint8_t anatt; + + /** Asymmetric Namespace Access Capabilities */ + uint8_t anacap; + + /** ANA Group Identifier Maximum */ + uint32_t anagrpmax; + + /** Number of ANA Group Identifiers */ + uint32_t nanagrpid; + + /** Persistent Event Log Size */ + uint32_t pels; + + uint8_t reserved3[156]; /* bytes 512-703: nvm command set attributes */ /** submission queue entry size */ @@ -913,8 +996,10 @@ struct nvme_controller_data { /** NVM Vendor Specific Command Configuration */ uint8_t nvscc; - uint8_t reserved5; + /** Namespace Write Protection Capabilities */ + uint8_t nwpc; + /** Atomic Compare & Write Unit */ uint16_t acwu; uint16_t reserved6; @@ -922,8 +1007,11 @@ struct nvme_controller_data { /** SGL Support */ uint32_t sgls; + /** Maximum Number of Allowed Namespaces */ + uint32_t mnan; + /* bytes 540-767: Reserved */ - uint8_t reserved7[228]; + uint8_t reserved7[224]; /** NVM Subsystem NVMe Qualified Name */ uint8_t subnqn[256]; @@ -1008,9 +1096,39 @@ struct nvme_namespace_data { /** NVM Capacity */ uint8_t nvmcap[16]; - /* bytes 64-103: Reserved */ - uint8_t reserved5[40]; + /** Namespace Preferred Write Granularity */ + uint16_t npwg; + /** Namespace Preferred Write Alignment */ + uint16_t npwa; + + /** Namespace Preferred Deallocate Granularity */ + uint16_t npdg; + + /** Namespace Preferred Deallocate Alignment */ + uint16_t npda; + + /** Namespace Optimal Write Size */ + uint16_t nows; + + /* bytes 74-91: Reserved */ + uint8_t reserved5[18]; + + /** ANA Group Identifier */ + uint32_t anagrpid; + + /* bytes 96-98: Reserved */ + uint8_t reserved6[3]; + + /** Namespace Attributes */ + uint8_t nsattr; + + /** NVM Set Identifier */ + uint16_t nvmsetid; + + /** Endurance Group Identifier */ + uint16_t endgid; + /** Namespace Globally Unique Identifier */ uint8_t nguid[16]; @@ -1020,7 +1138,7 @@ struct nvme_namespace_data { /** lba format support */ uint32_t lbaf[16]; - uint8_t reserved6[192]; + uint8_t reserved7[192]; uint8_t vendor_specific[3712]; } __packed __aligned(4); @@ -1402,6 +1520,10 @@ void nvme_controller_data_swapbytes(struct nvme_contro s->rtd3e = le32toh(s->rtd3e); s->oaes = le32toh(s->oaes); s->ctratt = le32toh(s->ctratt); + s->rrls = le16toh(s->rrls); + s->crdt1 = le16toh(s->crdt1); + s->crdt2 = le16toh(s->crdt2); + s->crdt3 = le16toh(s->crdt3); s->oacs = le16toh(s->oacs); s->wctemp = le16toh(s->wctemp); s->cctemp = le16toh(s->cctemp); @@ -1415,6 +1537,13 @@ void nvme_controller_data_swapbytes(struct nvme_contro s->mntmt = le16toh(s->mntmt); s->mxtmt = le16toh(s->mxtmt); s->sanicap = le32toh(s->sanicap); + s->hmminds = le32toh(s->hmminds); + s->hmmaxd = le16toh(s->hmmaxd); + s->nsetidmax = le16toh(s->nsetidmax); + s->endgidmax = le16toh(s->endgidmax); + s->anagrpmax = le32toh(s->anagrpmax); + s->nanagrpid = le32toh(s->nanagrpid); + s->pels = le32toh(s->pels); s->maxcmd = le16toh(s->maxcmd); s->nn = le32toh(s->nn); s->oncs = le16toh(s->oncs); @@ -1423,6 +1552,7 @@ void nvme_controller_data_swapbytes(struct nvme_contro s->awupf = le16toh(s->awupf); s->acwu = le16toh(s->acwu); s->sgls = le32toh(s->sgls); + s->mnan = le32toh(s->mnan); for (i = 0; i < 32; i++) nvme_power_state_swapbytes(&s->power_state[i]); } @@ -1442,6 +1572,14 @@ void nvme_namespace_data_swapbytes(struct nvme_namespa s->nabo = le16toh(s->nabo); s->nabspf = le16toh(s->nabspf); s->noiob = le16toh(s->noiob); + s->npwg = le16toh(s->npwg); + s->npwa = le16toh(s->npwa); + s->npdg = le16toh(s->npdg); + s->npda = le16toh(s->npda); + s->nows = le16toh(s->nows); + s->anagrpid = le32toh(s->anagrpid); + s->nvmsetid = le16toh(s->nvmsetid); + s->endgid = le16toh(s->endgid); for (i = 0; i < 16; i++) s->lbaf[i] = le32toh(s->lbaf[i]); } Modified: projects/fuse2/sys/dev/usb/net/if_urndis.c ============================================================================== --- projects/fuse2/sys/dev/usb/net/if_urndis.c Tue Jul 30 03:32:39 2019 (r350434) +++ projects/fuse2/sys/dev/usb/net/if_urndis.c Tue Jul 30 04:17:36 2019 (r350435) @@ -175,6 +175,9 @@ static const STRUCT_USB_HOST_ID urndis_host_devs[] = { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Tue Jul 30 17:31:10 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3721DA8BE0 for ; Tue, 30 Jul 2019 17:31:10 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 169386A5A3; Tue, 30 Jul 2019 17:31:10 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E3F7B1C6D7; Tue, 30 Jul 2019 17:31:09 +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 x6UHV9FH036404; Tue, 30 Jul 2019 17:31:09 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6UHV9Ve036403; Tue, 30 Jul 2019 17:31:09 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201907301731.x6UHV9Ve036403@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 30 Jul 2019 17:31:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r350452 - projects/fuse2/tests/sys/fs/fusefs X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/fuse2/tests/sys/fs/fusefs X-SVN-Commit-Revision: 350452 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 169386A5A3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 30 Jul 2019 17:31:10 -0000 Author: asomers Date: Tue Jul 30 17:31:09 2019 New Revision: 350452 URL: https://svnweb.freebsd.org/changeset/base/350452 Log: fusefs: nul-terminate some strings in the readdir test Reported by: GCC 8 Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/tests/sys/fs/fusefs/readdir.cc Modified: projects/fuse2/tests/sys/fs/fusefs/readdir.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fusefs/readdir.cc Tue Jul 30 17:18:31 2019 (r350451) +++ projects/fuse2/tests/sys/fs/fusefs/readdir.cc Tue Jul 30 17:31:09 2019 (r350452) @@ -70,19 +70,19 @@ TEST_F(Readdir, dots) struct dirent *de; vector ents(2); vector empty_ents(0); - const char *dot = "."; - const char *dotdot = ".."; + const char dot[] = "."; + const char dotdot[] = ".."; expect_lookup(RELPATH, ino); expect_opendir(ino); ents[0].d_fileno = 2; ents[0].d_off = 2000; - ents[0].d_namlen = strlen(dotdot); + ents[0].d_namlen = sizeof(dotdot); ents[0].d_type = DT_DIR; strncpy(ents[0].d_name, dotdot, ents[0].d_namlen); ents[1].d_fileno = 3; ents[1].d_off = 3000; - ents[1].d_namlen = strlen(dot); + ents[1].d_namlen = sizeof(dot); ents[1].d_type = DT_DIR; strncpy(ents[1].d_name, dot, ents[1].d_namlen); expect_readdir(ino, 0, ents); @@ -102,8 +102,8 @@ TEST_F(Readdir, dots) */ //EXPECT_EQ(2000, de->d_off); EXPECT_EQ(DT_DIR, de->d_type); - EXPECT_EQ(2, de->d_namlen); - EXPECT_EQ(0, strcmp("..", de->d_name)); + EXPECT_EQ(sizeof(dotdot), de->d_namlen); + EXPECT_EQ(0, strcmp(dotdot, de->d_name)); errno = 0; de = readdir(dir); @@ -111,8 +111,8 @@ TEST_F(Readdir, dots) EXPECT_EQ(3ul, de->d_fileno); //EXPECT_EQ(3000, de->d_off); EXPECT_EQ(DT_DIR, de->d_type); - EXPECT_EQ(1, de->d_namlen); - EXPECT_EQ(0, strcmp(".", de->d_name)); + EXPECT_EQ(sizeof(dot), de->d_namlen); + EXPECT_EQ(0, strcmp(dot, de->d_name)); ASSERT_EQ(nullptr, readdir(dir)); ASSERT_EQ(0, errno); From owner-svn-src-projects@freebsd.org Tue Jul 30 19:42:52 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BB645AB611 for ; Tue, 30 Jul 2019 19:42:52 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A27F66E77A; Tue, 30 Jul 2019 19:42: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7F0891E046; Tue, 30 Jul 2019 19:42: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 x6UJgqUr015804; Tue, 30 Jul 2019 19:42:52 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6UJgl2N015775; Tue, 30 Jul 2019 19:42:47 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201907301942.x6UJgl2N015775@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 30 Jul 2019 19:42:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r350454 - in projects/fuse2: . contrib/elftoolchain/elfcopy etc/mtree lib/libcasper/libcasper lib/libcasper/services/cap_fileargs share/man/man9 share/mk stand/efi/loader sys/amd64/conf... X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/fuse2: . contrib/elftoolchain/elfcopy etc/mtree lib/libcasper/libcasper lib/libcasper/services/cap_fileargs share/man/man9 share/mk stand/efi/loader sys/amd64/conf sys/amd64/linux sys/amd6... X-SVN-Commit-Revision: 350454 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A27F66E77A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 30 Jul 2019 19:42:52 -0000 Author: asomers Date: Tue Jul 30 19:42:46 2019 New Revision: 350454 URL: https://svnweb.freebsd.org/changeset/base/350454 Log: MFHead @350453 Sponsored by: The FreeBSD Foundation Added: projects/fuse2/share/man/man9/seqc.9 - copied unchanged from r350453, head/share/man/man9/seqc.9 projects/fuse2/sys/amd64/linux/linux_locore.asm - copied unchanged from r350453, head/sys/amd64/linux/linux_locore.asm projects/fuse2/sys/amd64/linux32/linux32_locore.asm - copied unchanged from r350453, head/sys/amd64/linux32/linux32_locore.asm projects/fuse2/sys/arm64/linux/linux_locore.asm - copied unchanged from r350453, head/sys/arm64/linux/linux_locore.asm projects/fuse2/sys/i386/linux/linux_locore.asm - copied unchanged from r350453, head/sys/i386/linux/linux_locore.asm Deleted: projects/fuse2/sys/amd64/linux/linux_locore.s projects/fuse2/sys/amd64/linux32/linux32_locore.s projects/fuse2/sys/arm/arm/elf_trampoline.c projects/fuse2/sys/arm64/linux/linux_locore.s projects/fuse2/sys/i386/linux/linux_locore.s projects/fuse2/sys/kern/imgact_gzip.c projects/fuse2/sys/kern/subr_inflate.c projects/fuse2/sys/sys/inflate.h Modified: projects/fuse2/.cirrus.yml projects/fuse2/contrib/elftoolchain/elfcopy/main.c projects/fuse2/contrib/elftoolchain/elfcopy/strip.1 projects/fuse2/etc/mtree/BSD.var.dist projects/fuse2/lib/libcasper/libcasper/libcasper.3 projects/fuse2/lib/libcasper/services/cap_fileargs/cap_fileargs.3 projects/fuse2/share/man/man9/Makefile projects/fuse2/share/mk/bsd.sys.mk projects/fuse2/stand/efi/loader/conf.c projects/fuse2/sys/amd64/conf/NOTES projects/fuse2/sys/arm64/arm64/pmap.c projects/fuse2/sys/arm64/conf/GENERIC projects/fuse2/sys/conf/files projects/fuse2/sys/conf/files.amd64 projects/fuse2/sys/conf/files.arm64 projects/fuse2/sys/conf/files.i386 projects/fuse2/sys/dev/mmc/host/dwmmc_altera.c projects/fuse2/sys/dev/sound/pci/hda/hdaa_patches.c projects/fuse2/sys/dev/sound/pci/hda/hdac.h projects/fuse2/sys/i386/conf/NOTES projects/fuse2/sys/kern/capabilities.conf projects/fuse2/sys/kern/init_sysent.c projects/fuse2/sys/kern/kern_exit.c projects/fuse2/sys/kern/kern_sendfile.c projects/fuse2/sys/kern/subr_witness.c projects/fuse2/sys/kern/vfs_bio.c projects/fuse2/sys/modules/linux64/Makefile projects/fuse2/sys/sys/proc.h projects/fuse2/sys/sys/refcount.h projects/fuse2/sys/sys/seqc.h projects/fuse2/sys/vm/vm_page.c projects/fuse2/sys/vm/vm_page.h Directory Properties: projects/fuse2/ (props changed) projects/fuse2/contrib/elftoolchain/ (props changed) Modified: projects/fuse2/.cirrus.yml ============================================================================== --- projects/fuse2/.cirrus.yml Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/.cirrus.yml Tue Jul 30 19:42:46 2019 (r350454) @@ -12,7 +12,6 @@ task: timeout_in: 90m install_script: - pkg install -y qemu-devel uefi-edk2-qemu-x86_64 - - fetch https://people.freebsd.org/~emaste/OVMF.fd script: - make -j$(sysctl -n hw.ncpu) WITHOUT_TOOLCHAIN=yes buildworld buildkernel test_script: Modified: projects/fuse2/contrib/elftoolchain/elfcopy/main.c ============================================================================== --- projects/fuse2/contrib/elftoolchain/elfcopy/main.c Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/contrib/elftoolchain/elfcopy/main.c Tue Jul 30 19:42:46 2019 (r350454) @@ -1187,6 +1187,12 @@ strip_main(struct elfcopy *ecp, int argc, char **argv) ecp->strip = STRIP_ALL; if (optind == argc) strip_usage(); + /* + * Only accept a single input file if an output file had been + * specified. + */ + if (outfile != NULL && argc != (optind + 1)) + strip_usage(); for (i = optind; i < argc; i++) create_file(ecp, argv[i], outfile); Modified: projects/fuse2/contrib/elftoolchain/elfcopy/strip.1 ============================================================================== --- projects/fuse2/contrib/elftoolchain/elfcopy/strip.1 Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/contrib/elftoolchain/elfcopy/strip.1 Tue Jul 30 19:42:46 2019 (r350454) @@ -23,7 +23,7 @@ .\" .\" $Id: strip.1 3642 2018-10-14 14:24:28Z jkoshy $ .\" -.Dd September 17, 2011 +.Dd July 27, 2019 .Dt STRIP 1 .Os .Sh NAME @@ -51,8 +51,16 @@ .Sh DESCRIPTION The .Nm -utility is used to discard information from ELF objects. +utility is used to discard information from the ELF objects +specified by the arguments +.Ar . .Pp +If an explicit output file name is not specified using the +.Fl o +option, the +.Nm +utility will modify its input arguments in-place. +.Pp The .Nm utility supports the following options: @@ -65,8 +73,9 @@ Print a help message and exit. Remove all content except that which would be used for debugging. .It Fl o Ar outputfile | Fl -output-file= Ns Ar outputfile Write the stripped object to file -.Ar outputfile . -The default behaviour is to modify objects in place. +.Ar outputfile +instead of modifying the input in-place. +Only a single input object should be specified if this option is used. .It Fl p | Fl -preserve-dates Preserve the object's access and modification times. .It Fl s | Fl -strip-all Modified: projects/fuse2/etc/mtree/BSD.var.dist ============================================================================== --- projects/fuse2/etc/mtree/BSD.var.dist Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/etc/mtree/BSD.var.dist Tue Jul 30 19:42:46 2019 (r350454) @@ -5,7 +5,7 @@ /set type=dir uname=root gname=wheel mode=0755 tags=package=runtime . - account + account mode=0750 .. at /set uname=daemon Modified: projects/fuse2/lib/libcasper/libcasper/libcasper.3 ============================================================================== --- projects/fuse2/lib/libcasper/libcasper/libcasper.3 Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/lib/libcasper/libcasper/libcasper.3 Tue Jul 30 19:42:46 2019 (r350454) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 5, 2018 +.Dd July 29, 2019 .Dt LIBCASPER 3 .Os .Sh NAME @@ -212,9 +212,6 @@ compatible API provides .Xr getpwent 3 compatible API -.It system.random -allows to obtain entropy from -.Pa /dev/random .It system.sysctl provides .Xr sysctlbyname 3 Modified: projects/fuse2/lib/libcasper/services/cap_fileargs/cap_fileargs.3 ============================================================================== --- projects/fuse2/lib/libcasper/services/cap_fileargs/cap_fileargs.3 Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/lib/libcasper/services/cap_fileargs/cap_fileargs.3 Tue Jul 30 19:42:46 2019 (r350454) @@ -247,7 +247,7 @@ for (i = 0; i < argc; i++) { fd = fileargs_open(fa, argv[i]); if (fd < 0) err(1, "unable to open file %s", argv[i]); - printf("File %s opened in capability mode\n", argv[i]); + printf("File %s opened in capability mode\en", argv[i]); close(fd); } Modified: projects/fuse2/share/man/man9/Makefile ============================================================================== --- projects/fuse2/share/man/man9/Makefile Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/share/man/man9/Makefile Tue Jul 30 19:42:46 2019 (r350454) @@ -289,6 +289,7 @@ MAN= accept_filter.9 \ securelevel_gt.9 \ selrecord.9 \ sema.9 \ + seqc.9 \ sf_buf.9 \ sglist.9 \ shm_map.9 \ @@ -1825,6 +1826,10 @@ MLINKS+=sema.9 sema_destroy.9 \ sema.9 sema_trywait.9 \ sema.9 sema_value.9 \ sema.9 sema_wait.9 +MLINKS+=seqc.9 seqc_consistent.9 \ + seqc.9 seqc_read.9 \ + seqc.9 seqc_write_begin.9 \ + seqc.9 seqc_write_end.9 MLINKS+=sf_buf.9 sf_buf_alloc.9 \ sf_buf.9 sf_buf_free.9 \ sf_buf.9 sf_buf_kva.9 \ Copied: projects/fuse2/share/man/man9/seqc.9 (from r350453, head/share/man/man9/seqc.9) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/fuse2/share/man/man9/seqc.9 Tue Jul 30 19:42:46 2019 (r350454, copy of r350453, head/share/man/man9/seqc.9) @@ -0,0 +1,138 @@ +.\" +.\" Copyright (C) 2019 Mariusz Zaborski +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice(s), this list of conditions and the following disclaimer as +.\" the first lines of this file unmodified other than the possible +.\" addition of one or more copyright notices. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice(s), this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY +.\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +.\" DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY +.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +.\" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +.\" DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd July 29, 2019 +.Dt SEQC 9 +.Os +.Sh NAME +.Nm seqc_consistent , +.Nm seqc_read , +.Nm seqc_write_begin , +.Nm seqc_write_end +.Nd "lockless read algorithm" +.Sh SYNOPSIS +.In sys/seqc.h +.Ft void +.Fn seqc_write_begin "seqc_t *seqcp" +.Ft void +.Fn seqc_write_end "seqc_t *seqcp" +.Ft seqc_t +.Fn seqc_read "seqc_t *seqcp" +.Ft seqc_t +.Fn seqc_consistent "const seqc_t *seqcp" "seqc_t oldseqc" +.Sh DESCRIPTION +The +.Nm seqc +allows zero or more readers and zero or one writer to concurrently access +an object, providing a consistent snapshot of the object for readers. +No mutual exclusion between readers and writers is required, +but readers may be starved indefinitely by writers. +.Pp +The functions +.Fn seqc_write_begin +and +.Fn seqc_write_end +are used to create a transaction for writer, and notify the readers that the +object will be modified. +.Pp +The +.Fn seqc_read +function returns the current sequence number. +If a writer has started a transaction, this function will spin until the +transaction has ended. +.Pp +The +.Fn seqc_consistent +function compares the sequence number with a previously fetched value. +The +.Fa oldseqc +variable should contain a sequence number from the beginning of read +transaction. +.Pp +The reader at the end of a transaction checks if the sequence number has +changed. +If the sequence number didn't change the object wasn't modified, and fetched +variables are valid. +If the sequence number changed the object was modified and the fetch should be +repeated. +In case when sequence number is odd the object change is in progress and the +reader will wait until the write will the sequence number will become even. +.Sh EXAMPLES +The following example for a writer changees the +.Va var1 +and +.Va var2 +variables in the +.Va obj +structure: +.Bd -literal +lock_exclusive(&obj->lock); +seqc_write_begin(&obj->seqc); +obj->var1 = 1; +obj->var2 = 2; +seqc_write_end(&obj->seqc); +unlock_exclusive(&obj->lock); +.Ed +The following example for a reader reads the +.Va var1 +and +.Va var2 +variables from the +.Va obj +structure. +In the case where the sequence number was changed it restarts the whole process. +.Bd -literal +int var1, var2; +seqc_t seqc; + +for (;;) { + seqc = seqc_read(&obj->seqc); + var1 = obj->var1; + var2 = obj->var2; + if (seqc_consistent(&obj->seqc, seqc)) + break; +} +.Ed +.Sh AUTHORS +The +.Nm seqc +functions was implemented by +.An Mateusz Guzik Aq Mt mjg@FreeBSD.org . +This manual page was written by +.An Mariusz Zaborski Aq Mt oshogbo@FreeBSD.org . +.Sh CAVEATS +There is no guarantee of progress for readers. +In case when there are a lot of writers the reader can be starved. +This concern may be solved by returning error after a few attempts. +.Pp +Theoretically if reading takes a very long time, and when there are many writers +the counter may overflow and wrap around to the same value. +In that case the reader will not notice that the object was changed. +Given that this needs 4 billion transactional writes across a single contended +reader, it is unlikely to ever happen. +This could be avoided by extending the interface to allow 64-bit counters. Modified: projects/fuse2/share/mk/bsd.sys.mk ============================================================================== --- projects/fuse2/share/mk/bsd.sys.mk Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/share/mk/bsd.sys.mk Tue Jul 30 19:42:46 2019 (r350454) @@ -234,6 +234,8 @@ DEBUG_FILES_CFLAGS?= -g .if ${MK_WARNS} != "no" CFLAGS+= ${CWARNFLAGS:M*} ${CWARNFLAGS.${COMPILER_TYPE}} CFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} +CXXFLAGS+= ${CXXWARNFLAGS:M*} ${CXXWARNFLAGS.${COMPILER_TYPE}} +CXXFLAGS+= ${CXXWARNFLAGS.${.IMPSRC:T}} .endif CFLAGS+= ${CFLAGS.${COMPILER_TYPE}} Modified: projects/fuse2/stand/efi/loader/conf.c ============================================================================== --- projects/fuse2/stand/efi/loader/conf.c Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/stand/efi/loader/conf.c Tue Jul 30 19:42:46 2019 (r350454) @@ -40,7 +40,9 @@ struct devsw *devsw[] = { &efipart_cddev, &efipart_hddev, &efihttp_dev, /* ordering with efinet_dev matters */ +#if defined(LOADER_NET_SUPPORT) &efinet_dev, +#endif &vdisk_dev, #ifdef EFI_ZFS_BOOT &zfs_dev, @@ -64,7 +66,9 @@ struct fs_ops *file_system[] = { }; struct netif_driver *netif_drivers[] = { +#if defined(LOADER_NET_SUPPORT) &efinetif, +#endif NULL }; Modified: projects/fuse2/sys/amd64/conf/NOTES ============================================================================== --- projects/fuse2/sys/amd64/conf/NOTES Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/sys/amd64/conf/NOTES Tue Jul 30 19:42:46 2019 (r350454) @@ -127,7 +127,6 @@ device nvram # Access to rtc cmos via /dev/nvram device speaker #Play IBM BASIC-style noises out your speaker hint.speaker.0.at="isa" hint.speaker.0.port="0x61" -device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT! ##################################################################### Copied: projects/fuse2/sys/amd64/linux/linux_locore.asm (from r350453, head/sys/amd64/linux/linux_locore.asm) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/fuse2/sys/amd64/linux/linux_locore.asm Tue Jul 30 19:42:46 2019 (r350454, copy of r350453, head/sys/amd64/linux/linux_locore.asm) @@ -0,0 +1,108 @@ +/* $FreeBSD$ */ + +#include "linux_assym.h" /* system definitions */ +#include /* miscellaneous asm macros */ + +#include /* system call numbers */ + + .data + + .globl linux_platform +linux_platform: + .asciz "x86_64" + + + .text +/* + * To avoid excess stack frame the signal trampoline code emulates + * the 'call' instruction. + */ +NON_GPROF_ENTRY(linux_rt_sigcode) + movq %rsp, %rbx /* preserve sigframe */ + call .getip +.getip: + popq %rax + add $.startrtsigcode-.getip, %rax /* ret address */ + pushq %rax + jmp *LINUX_RT_SIGF_HANDLER(%rbx) +.startrtsigcode: + movq $LINUX_SYS_linux_rt_sigreturn,%rax /* linux_rt_sigreturn() */ + syscall /* enter kernel with args */ + hlt +.endrtsigcode: +0: jmp 0b + +NON_GPROF_ENTRY(__vdso_clock_gettime) + movq $LINUX_SYS_linux_clock_gettime,%rax + syscall + ret +.weak clock_gettime +.set clock_gettime, __vdso_clock_gettime + +NON_GPROF_ENTRY(__vdso_time) + movq $LINUX_SYS_linux_time,%rax + syscall + ret +.weak time +.set time, __vdso_time + +NON_GPROF_ENTRY(__vdso_gettimeofday) + movq $LINUX_SYS_gettimeofday,%rax + syscall + ret +.weak gettimeofday +.set gettimeofday, __vdso_gettimeofday + +NON_GPROF_ENTRY(__vdso_getcpu) + movq $-38,%rax /* not implemented */ + ret +.weak getcpu +.set getcpu, __vdso_getcpu + +#if 0 + .section .note.Linux, "a",@note + .long 2f - 1f /* namesz */ + .balign 4 + .long 4f - 3f /* descsz */ + .long 0 +1: + .asciz "Linux" +2: + .balign 4 +3: + .long LINUX_VERSION_CODE +4: + .balign 4 + .previous +#endif + + .section .eh_frame,"a",@progbits +.LSTARTFRAMEDLSI0: + .long .LENDCIEDLSI0-.LSTARTCIEDLSI0 +.LSTARTCIEDLSI0: + .long 0 /* CIE ID */ + .byte 1 /* Version number */ + .string "zR" /* NULL-terminated + * augmentation string + */ + .uleb128 1 /* Code alignment factor */ + .sleb128 -4 /* Data alignment factor */ + .byte 8 /* Return address register column */ + .uleb128 1 /* Augmentation value length */ + .byte 0x1b /* DW_EH_PE_pcrel|DW_EH_PE_sdata4. */ + .byte 0x0c /* DW_CFA_def_cfa */ + .uleb128 4 + .uleb128 4 + .byte 0x88 /* DW_CFA_offset, column 0x8 */ + .uleb128 1 + .align 4 +.LENDCIEDLSI0: + .long .LENDFDEDLSI0-.LSTARTFDEDLSI0 /* Length FDE */ +.LSTARTFDEDLSI0: + .long .LSTARTFDEDLSI0-.LSTARTFRAMEDLSI0 /* CIE pointer */ + .long .startrtsigcode-. /* PC-relative start address */ + .long .endrtsigcode-.startrtsigcode + .uleb128 0 + .align 4 +.LENDFDEDLSI0: + .previous Copied: projects/fuse2/sys/amd64/linux32/linux32_locore.asm (from r350453, head/sys/amd64/linux32/linux32_locore.asm) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/fuse2/sys/amd64/linux32/linux32_locore.asm Tue Jul 30 19:42:46 2019 (r350454, copy of r350453, head/sys/amd64/linux32/linux32_locore.asm) @@ -0,0 +1,156 @@ +/* $FreeBSD$ */ + +#include "linux32_assym.h" /* system definitions */ +#include /* miscellaneous asm macros */ + +#include /* system call numbers */ + +.data + + .globl linux_platform +linux_platform: + .asciz "i686" + +.text +.code32 + +/* + * To avoid excess stack frame the signal trampoline code emulates + * the 'call' instruction. + */ +NON_GPROF_ENTRY(linux32_sigcode) + movl %esp, %ebx /* preserve sigframe */ + call .getip0 +.getip0: + popl %eax + add $.startsigcode-.getip0, %eax /* ret address */ + push %eax + jmp *LINUX_SIGF_HANDLER(%ebx) +.startsigcode: + popl %eax + movl $LINUX32_SYS_linux_sigreturn,%eax /* linux_sigreturn() */ + int $0x80 /* enter kernel with args */ +.endsigcode: +0: jmp 0b + +NON_GPROF_ENTRY(linux32_rt_sigcode) + leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */ + leal LINUX_RT_SIGF_SC(%ebx),%ecx /* linux sigcontext */ + movl %esp, %edi + call .getip1 +.getip1: + popl %eax + add $.startrtsigcode-.getip1, %eax /* ret address */ + push %eax + jmp *LINUX_RT_SIGF_HANDLER(%edi) +.startrtsigcode: + movl $LINUX32_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */ + int $0x80 /* enter kernel with args */ +.endrtsigcode: +0: jmp 0b + +NON_GPROF_ENTRY(linux32_vsyscall) +.startvsyscall: + int $0x80 + ret +.endvsyscall: + +#if 0 + .section .note.Linux, "a",@note + .long 2f - 1f /* namesz */ + .balign 4 + .long 4f - 3f /* descsz */ + .long 0 +1: + .asciz "Linux" +2: + .balign 4 +3: + .long LINUX_VERSION_CODE +4: + .balign 4 + .previous +#endif + +#define do_cfa_expr(offset) \ + .byte 0x0f; /* DW_CFA_def_cfa_expression */ \ + .uleb128 11f-10f; /* length */ \ +10: .byte 0x74; /* DW_OP_breg4 */ \ + .sleb128 offset; /* offset */ \ + .byte 0x06; /* DW_OP_deref */ \ +11: + + + /* CIE */ + .section .eh_frame,"a",@progbits +.LSTARTFRAMEDLSI1: + .long .LENDCIEDLSI1-.LSTARTCIEDLSI1 +.LSTARTCIEDLSI1: + .long 0 /* CIE ID */ + .byte 1 /* Version number */ + .string "zRS" /* NULL-terminated + * augmentation string + */ + .uleb128 1 /* Code alignment factor */ + .sleb128 -4 /* Data alignment factor */ + .byte 8 /* Return address + * register column + */ + .uleb128 1 /* Augmentation value length */ + .byte 0x1b /* DW_EH_PE_pcrel|DW_EH_PE_sdata4. */ + .byte 0 /* DW_CFA_nop */ + .align 4 +.LENDCIEDLSI1: + + /* FDE */ + .long .LENDFDEDLSI1-.LSTARTFDEDLSI1 /* Length FDE */ +.LSTARTFDEDLSI1: + .long .LSTARTFDEDLSI1-.LSTARTFRAMEDLSI1 /* CIE pointer */ + .long .startsigcode-. /* PC-relative start address */ + .long .endsigcode-.startsigcode + .uleb128 0 /* Augmentation */ + do_cfa_expr(LINUX_SIGF_SC-8) + .align 4 +.LENDFDEDLSI1: + + .long .LENDFDEDLSI2-.LSTARTFDEDLSI2 /* Length FDE */ +.LSTARTFDEDLSI2: + .long .LSTARTFDEDLSI2-.LSTARTFRAMEDLSI1 /* CIE pointer */ + .long .startrtsigcode-. /* PC-relative start address */ + .long .endrtsigcode-.startrtsigcode + .uleb128 0 /* Augmentation */ + do_cfa_expr(LINUX_RT_SIGF_SC-4+LINUX_SC_ESP) + .align 4 +.LENDFDEDLSI2: + .previous + + .section .eh_frame,"a",@progbits +.LSTARTFRAMEDLSI2: + .long .LENDCIEDLSI2-.LSTARTCIEDLSI2 +.LSTARTCIEDLSI2: + .long 0 /* CIE ID */ + .byte 1 /* Version number */ + .string "zR" /* NULL-terminated + * augmentation string + */ + .uleb128 1 /* Code alignment factor */ + .sleb128 -4 /* Data alignment factor */ + .byte 8 /* Return address register column */ + .uleb128 1 /* Augmentation value length */ + .byte 0x1b /* DW_EH_PE_pcrel|DW_EH_PE_sdata4. */ + .byte 0x0c /* DW_CFA_def_cfa */ + .uleb128 4 + .uleb128 4 + .byte 0x88 /* DW_CFA_offset, column 0x8 */ + .uleb128 1 + .align 4 +.LENDCIEDLSI2: + .long .LENDFDEDLSI3-.LSTARTFDEDLSI3 /* Length FDE */ +.LSTARTFDEDLSI3: + .long .LSTARTFDEDLSI3-.LSTARTFRAMEDLSI2 /* CIE pointer */ + .long .startvsyscall-. /* PC-relative start address */ + .long .endvsyscall-.startvsyscall + .uleb128 0 + .align 4 +.LENDFDEDLSI3: + .previous Modified: projects/fuse2/sys/arm64/arm64/pmap.c ============================================================================== --- projects/fuse2/sys/arm64/arm64/pmap.c Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/sys/arm64/arm64/pmap.c Tue Jul 30 19:42:46 2019 (r350454) @@ -5743,7 +5743,7 @@ pmap_sync_icache(pmap_t pmap, vm_offset_t va, vm_size_ int pmap_fault(pmap_t pmap, uint64_t esr, uint64_t far) { - pt_entry_t *pte; + pt_entry_t pte, *ptep; register_t intr; uint64_t ec, par; int lvl, rv; @@ -5767,9 +5767,9 @@ pmap_fault(pmap_t pmap, uint64_t esr, uint64_t far) case ISS_DATA_DFSC_AFF_L2: case ISS_DATA_DFSC_AFF_L3: PMAP_LOCK(pmap); - pte = pmap_pte(pmap, far, &lvl); - if (pte != NULL) { - pmap_set_bits(pte, ATTR_AF); + ptep = pmap_pte(pmap, far, &lvl); + if (ptep != NULL) { + pmap_set_bits(ptep, ATTR_AF); rv = KERN_SUCCESS; /* * XXXMJ as an optimization we could mark the entry @@ -5785,12 +5785,13 @@ pmap_fault(pmap_t pmap, uint64_t esr, uint64_t far) (esr & ISS_DATA_WnR) == 0) return (rv); PMAP_LOCK(pmap); - pte = pmap_pte(pmap, far, &lvl); - if (pte != NULL && - (pmap_load(pte) & (ATTR_AP_RW_BIT | ATTR_SW_DBM)) == - (ATTR_AP(ATTR_AP_RO) | ATTR_SW_DBM)) { - pmap_clear_bits(pte, ATTR_AP_RW_BIT); - pmap_invalidate_page(pmap, far); + ptep = pmap_pte(pmap, far, &lvl); + if (ptep != NULL && + ((pte = pmap_load(ptep)) & ATTR_SW_DBM) != 0) { + if ((pte & ATTR_AP_RW_BIT) == ATTR_AP(ATTR_AP_RO)) { + pmap_clear_bits(ptep, ATTR_AP_RW_BIT); + pmap_invalidate_page(pmap, far); + } rv = KERN_SUCCESS; } PMAP_UNLOCK(pmap); Modified: projects/fuse2/sys/arm64/conf/GENERIC ============================================================================== --- projects/fuse2/sys/arm64/conf/GENERIC Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/sys/arm64/conf/GENERIC Tue Jul 30 19:42:46 2019 (r350454) @@ -189,6 +189,7 @@ device aw_mmc # Allwinner SD/MMC controller device mmc # mmc/sd bus device mmcsd # mmc/sd flash cards device dwmmc +device dwmmc_altera device rk_emmcphy # Serial (COM) ports Copied: projects/fuse2/sys/arm64/linux/linux_locore.asm (from r350453, head/sys/arm64/linux/linux_locore.asm) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/fuse2/sys/arm64/linux/linux_locore.asm Tue Jul 30 19:42:46 2019 (r350454, copy of r350453, head/sys/arm64/linux/linux_locore.asm) @@ -0,0 +1,58 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (C) 2018 Turing Robotic Industries Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* + * arm64 Linux VDSO implementation. + */ + +#include + + .data + + .globl linux_platform +linux_platform: + .asciz "arm64" + + .text + +ENTRY(__kernel_rt_sigreturn) + brk #0 /* LINUXTODO: implement __kernel_rt_sigreturn */ + ret + +ENTRY(__kernel_gettimeofday) + brk #0 /* LINUXTODO: implement __kernel_gettimeofday */ + ret + +ENTRY(__kernel_clock_gettime) + brk #0 /* LINUXTODO: implement __kernel_clock_gettime */ + ret + +ENTRY(__kernel_clock_getres) + brk #0 /* LINUXTODO: implement __kernel_clock_getres */ + ret Modified: projects/fuse2/sys/conf/files ============================================================================== --- projects/fuse2/sys/conf/files Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/sys/conf/files Tue Jul 30 19:42:46 2019 (r350454) @@ -3814,7 +3814,6 @@ kern/subr_firmware.c optional firmware kern/subr_gtaskqueue.c standard kern/subr_hash.c standard kern/subr_hints.c standard -kern/subr_inflate.c optional gzip kern/subr_kdb.c standard kern/subr_kobj.c standard kern/subr_lock.c standard Modified: projects/fuse2/sys/conf/files.amd64 ============================================================================== --- projects/fuse2/sys/conf/files.amd64 Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/sys/conf/files.amd64 Tue Jul 30 19:42:46 2019 (r350454) @@ -45,7 +45,7 @@ linux32_assym.h optional compat_linux32 \ clean "linux32_assym.h" # linux32_locore.o optional compat_linux32 \ - dependency "linux32_assym.h $S/amd64/linux32/linux32_locore.s" \ + dependency "linux32_assym.h $S/amd64/linux32/linux32_locore.asm" \ compile-with "${CC} -x assembler-with-cpp -DLOCORE -m32 -shared -s -pipe -I. -I$S -Werror -Wall -fPIC -fno-common -nostdinc -nostdlib -Wl,-T$S/amd64/linux32/linux32_vdso.lds.s -Wl,-soname=linux32_vdso.so,--eh-frame-hdr,-warn-common ${.IMPSRC} -o ${.TARGET}" \ no-obj no-implicit-rule \ clean "linux32_locore.o" @@ -633,7 +633,6 @@ isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/kern_clocksource.c standard kern/imgact_aout.c optional compat_aout -kern/imgact_gzip.c optional gzip kern/link_elf_obj.c standard libkern/x86/crc32_sse42.c standard # Modified: projects/fuse2/sys/conf/files.arm64 ============================================================================== --- projects/fuse2/sys/conf/files.arm64 Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/sys/conf/files.arm64 Tue Jul 30 19:42:46 2019 (r350454) @@ -221,6 +221,7 @@ dev/hwpmc/hwpmc_arm64.c optional hwpmc dev/hwpmc/hwpmc_arm64_md.c optional hwpmc dev/mbox/mbox_if.m optional soc_brcm_bcm2837 dev/mmc/host/dwmmc.c optional dwmmc fdt +dev/mmc/host/dwmmc_altera.c optional dwmmc fdt dwmmc_altera dev/mmc/host/dwmmc_hisi.c optional dwmmc fdt soc_hisi_hi6220 dev/mmc/host/dwmmc_rockchip.c optional dwmmc fdt soc_rockchip_rk3328 dev/neta/if_mvneta_fdt.c optional neta fdt Modified: projects/fuse2/sys/conf/files.i386 ============================================================================== --- projects/fuse2/sys/conf/files.i386 Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/sys/conf/files.i386 Tue Jul 30 19:42:46 2019 (r350454) @@ -32,7 +32,7 @@ linux_assym.h optional compat_linux \ clean "linux_assym.h" # linux_locore.o optional compat_linux \ - dependency "linux_assym.h $S/i386/linux/linux_locore.s" \ + dependency "linux_assym.h $S/i386/linux/linux_locore.asm" \ compile-with "${CC} -x assembler-with-cpp -DLOCORE -shared -s -pipe -I. -I$S -Werror -Wall -fPIC -fno-common -nostdinc -nostdlib -Wl,-T$S/i386/linux/linux_vdso.lds.s -Wl,-soname=linux_vdso.so,--eh-frame-hdr,-warn-common ${.IMPSRC} -o ${.TARGET}" \ no-obj no-implicit-rule \ clean "linux_locore.o" @@ -529,7 +529,6 @@ isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/kern_clocksource.c standard kern/imgact_aout.c optional compat_aout -kern/imgact_gzip.c optional gzip kern/subr_sfbuf.c standard libkern/divdi3.c standard libkern/ffsll.c standard Modified: projects/fuse2/sys/dev/mmc/host/dwmmc_altera.c ============================================================================== --- projects/fuse2/sys/dev/mmc/host/dwmmc_altera.c Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/sys/dev/mmc/host/dwmmc_altera.c Tue Jul 30 19:42:46 2019 (r350454) @@ -41,6 +41,8 @@ __FBSDID("$FreeBSD$"); #include +#include "opt_mmccam.h" + static struct ofw_compat_data compat_data[] = { {"altr,socfpga-dw-mshc", 1}, {NULL, 0}, @@ -66,9 +68,17 @@ static int altera_dwmmc_attach(device_t dev) { struct dwmmc_softc *sc; + phandle_t root; sc = device_get_softc(dev); sc->hwtype = HWTYPE_ALTERA; + + root = OF_finddevice("/"); + + if (ofw_bus_node_is_compatible(root, "altr,socfpga-stratix10")) { + sc->bus_hz = 24000000; + sc->use_pio = 1; + } return (dwmmc_attach(dev)); } Modified: projects/fuse2/sys/dev/sound/pci/hda/hdaa_patches.c ============================================================================== --- projects/fuse2/sys/dev/sound/pci/hda/hdaa_patches.c Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/sys/dev/sound/pci/hda/hdaa_patches.c Tue Jul 30 19:42:46 2019 (r350454) @@ -425,12 +425,21 @@ hdac_pin_patch(struct hdaa_widget *w) } else if (id == HDA_CODEC_ALC298 && subid == DELL_XPS9560_SUBVENDOR) { switch (nid) { case 24: - config = 0x01a1913c; + config = 0x01a1913c; break; case 26: - config = 0x01a1913d; + config = 0x01a1913d; break; } + } else if (id == HDA_CODEC_ALC256 && subid == DELL_I7577_SUBVENDOR ) { + switch (nid) { + case 20: + patch = "as=1 seq=0"; + break; + case 33: + patch = "as=1 seq=15"; + break; + } } if (patch != NULL) @@ -768,6 +777,10 @@ hdaa_patch_direct(struct hdaa_devinfo *devinfo) hdaa_write_coef(dev, 0x20, 0x07, 0x7cb); } break; + } + if (id == HDA_CODEC_ALC255 || id == HDA_CODEC_ALC256) { + val = hdaa_read_coef(dev, 0x20, 0x46); + hdaa_write_coef(dev, 0x20, 0x46, val|0x3000); } if (subid == APPLE_INTEL_MAC) hda_command(dev, HDA_CMD_12BIT(0, devinfo->nid, Modified: projects/fuse2/sys/dev/sound/pci/hda/hdac.h ============================================================================== --- projects/fuse2/sys/dev/sound/pci/hda/hdac.h Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/sys/dev/sound/pci/hda/hdac.h Tue Jul 30 19:42:46 2019 (r350454) @@ -203,6 +203,7 @@ #define DELL_XPSM1210_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01d7) #define DELL_OPLX745_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01da) #define DELL_XPS9560_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x07be) +#define DELL_I7577_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x0802) #define DELL_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0xffff) /* Clevo */ Modified: projects/fuse2/sys/i386/conf/NOTES ============================================================================== --- projects/fuse2/sys/i386/conf/NOTES Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/sys/i386/conf/NOTES Tue Jul 30 19:42:46 2019 (r350454) @@ -275,7 +275,6 @@ device nvram # Access to rtc cmos via /dev/nvram device speaker #Play IBM BASIC-style noises out your speaker hint.speaker.0.at="isa" hint.speaker.0.port="0x61" -device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT! device apm_saver # Requires APM Copied: projects/fuse2/sys/i386/linux/linux_locore.asm (from r350453, head/sys/i386/linux/linux_locore.asm) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/fuse2/sys/i386/linux/linux_locore.asm Tue Jul 30 19:42:46 2019 (r350454, copy of r350453, head/sys/i386/linux/linux_locore.asm) @@ -0,0 +1,149 @@ +/* $FreeBSD$ */ + +#include "linux_assym.h" /* system definitions */ +#include /* miscellaneous asm macros */ + +#include /* system call numbers */ + +#include "assym.inc" + +/* + * To avoid excess stack frame the signal trampoline code emulates + * the 'call' instruction. + */ +NON_GPROF_ENTRY(linux_sigcode) + movl %esp, %ebx /* preserve sigframe */ + call .getip0 +.getip0: + popl %eax + add $.startsigcode-.getip0, %eax /* ret address */ + push %eax + jmp *LINUX_SIGF_HANDLER(%ebx) +.startsigcode: + popl %eax /* gcc unwind code need this */ + movl $LINUX_SYS_linux_sigreturn,%eax /* linux_sigreturn() */ + int $0x80 /* enter kernel with args */ +.endsigcode: +0: jmp 0b + +NON_GPROF_ENTRY(linux_rt_sigcode) + leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */ + leal LINUX_RT_SIGF_SC(%ebx),%ecx /* linux sigcontext */ + movl %esp, %edi + call .getip1 +.getip1: + popl %eax + add $.startrtsigcode-.getip1, %eax /* ret address */ + push %eax + jmp *LINUX_RT_SIGF_HANDLER(%edi) +.startrtsigcode: + movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */ + int $0x80 /* enter kernel with args */ +.endrtsigcode: +0: jmp 0b + +NON_GPROF_ENTRY(linux_vsyscall) +.startvsyscall: + int $0x80 + ret +.endvsyscall: + +#if 0 + .section .note.Linux, "a",@note + .long 2f - 1f /* namesz */ + .balign 4 + .long 4f - 3f /* descsz */ + .long 0 +1: + .asciz "Linux" +2: + .balign 4 +3: + .long LINUX_VERSION_CODE +4: + .balign 4 + .previous +#endif + +#define do_cfa_expr(offset) \ + .byte 0x0f; /* DW_CFA_def_cfa_expression */ \ + .uleb128 11f-10f; /* length */ \ +10: .byte 0x74; /* DW_OP_breg4 */ \ + .sleb128 offset; /* offset */ \ + .byte 0x06; /* DW_OP_deref */ \ +11: + + + /* CIE */ + .section .eh_frame,"a",@progbits +.LSTARTFRAMEDLSI1: + .long .LENDCIEDLSI1-.LSTARTCIEDLSI1 +.LSTARTCIEDLSI1: + .long 0 /* CIE ID */ + .byte 1 /* Version number */ + .string "zRS" /* NULL-terminated + * augmentation string + */ + .uleb128 1 /* Code alignment factor */ + .sleb128 -4 /* Data alignment factor */ + .byte 8 /* Return address + * register column + */ + .uleb128 1 /* Augmentation value length */ + .byte 0x1b /* DW_EH_PE_pcrel|DW_EH_PE_sdata4. */ + .byte 0 /* DW_CFA_nop */ + .align 4 +.LENDCIEDLSI1: + + /* FDE */ + .long .LENDFDEDLSI1-.LSTARTFDEDLSI1 /* Length FDE */ +.LSTARTFDEDLSI1: + .long .LSTARTFDEDLSI1-.LSTARTFRAMEDLSI1 /* CIE pointer */ + .long .startsigcode-. /* PC-relative start address */ + .long .endsigcode-.startsigcode + .uleb128 0 /* Augmentation */ + do_cfa_expr(LINUX_SIGF_SC-8) + .align 4 +.LENDFDEDLSI1: + + .long .LENDFDEDLSI2-.LSTARTFDEDLSI2 /* Length FDE */ +.LSTARTFDEDLSI2: + .long .LSTARTFDEDLSI2-.LSTARTFRAMEDLSI1 /* CIE pointer */ + .long .startrtsigcode-. /* PC-relative start address */ + .long .endrtsigcode-.startrtsigcode + .uleb128 0 /* Augmentation */ + do_cfa_expr(LINUX_RT_SIGF_SC-4+LINUX_SC_ESP) + .align 4 +.LENDFDEDLSI2: + .previous + + .section .eh_frame,"a",@progbits +.LSTARTFRAMEDLSI2: + .long .LENDCIEDLSI2-.LSTARTCIEDLSI2 +.LSTARTCIEDLSI2: + .long 0 /* CIE ID */ + .byte 1 /* Version number */ + .string "zR" /* NULL-terminated + * augmentation string + */ + .uleb128 1 /* Code alignment factor */ + .sleb128 -4 /* Data alignment factor */ + .byte 8 /* Return address register column */ + .uleb128 1 /* Augmentation value length */ + .byte 0x1b /* DW_EH_PE_pcrel|DW_EH_PE_sdata4. */ + .byte 0x0c /* DW_CFA_def_cfa */ + .uleb128 4 + .uleb128 4 + .byte 0x88 /* DW_CFA_offset, column 0x8 */ + .uleb128 1 + .align 4 +.LENDCIEDLSI2: + .long .LENDFDEDLSI3-.LSTARTFDEDLSI3 /* Length FDE */ +.LSTARTFDEDLSI3: + .long .LSTARTFDEDLSI3-.LSTARTFRAMEDLSI2 /* CIE pointer */ + .long .startvsyscall-. /* PC-relative start address */ + .long .endvsyscall-.startvsyscall + .uleb128 0 + .align 4 +.LENDFDEDLSI3: + .previous Modified: projects/fuse2/sys/kern/capabilities.conf ============================================================================== --- projects/fuse2/sys/kern/capabilities.conf Tue Jul 30 19:34:39 2019 (r350453) +++ projects/fuse2/sys/kern/capabilities.conf Tue Jul 30 19:42:46 2019 (r350454) @@ -133,6 +133,11 @@ closefrom connectat *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Tue Jul 30 19:47:46 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7208AAB69D for ; Tue, 30 Jul 2019 19:47:46 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C24F6E897; Tue, 30 Jul 2019 19:47:46 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 227D01E049; Tue, 30 Jul 2019 19:47:46 +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 x6UJljfR016091; Tue, 30 Jul 2019 19:47:45 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6UJljmK016090; Tue, 30 Jul 2019 19:47:45 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201907301947.x6UJljmK016090@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 30 Jul 2019 19:47:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r350455 - projects/fuse2/tests/sys/fs/fusefs X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/fuse2/tests/sys/fs/fusefs X-SVN-Commit-Revision: 350455 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4C24F6E897 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 30 Jul 2019 19:47:46 -0000 Author: asomers Date: Tue Jul 30 19:47:45 2019 New Revision: 350455 URL: https://svnweb.freebsd.org/changeset/base/350455 Log: fusefs: fix building tests with GCC 8 GCC 8 objected to including C++-only flags in CWARNFLAGS Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/tests/sys/fs/fusefs/Makefile Modified: projects/fuse2/tests/sys/fs/fusefs/Makefile ============================================================================== --- projects/fuse2/tests/sys/fs/fusefs/Makefile Tue Jul 30 19:42:46 2019 (r350454) +++ projects/fuse2/tests/sys/fs/fusefs/Makefile Tue Jul 30 19:47:45 2019 (r350455) @@ -65,7 +65,7 @@ TEST_METADATA+= timeout=10 FUSEFS= ${SRCTOP}/sys/fs/fuse MOUNT= ${SRCTOP}/sbin/mount # Suppress warnings that GCC generates for the libc++ and gtest headers. -CWARNFLAGS.gcc+= -Wno-placement-new -Wno-attributes -Wno-class-memaccess +CXXWARNFLAGS.gcc+= -Wno-placement-new -Wno-attributes -Wno-class-memaccess CXXFLAGS+= -I${SRCTOP}/tests CXXFLAGS+= -I${FUSEFS} CXXFLAGS+= -I${MOUNT} From owner-svn-src-projects@freebsd.org Tue Jul 30 19:55:56 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 58296AB992 for ; Tue, 30 Jul 2019 19:55:56 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 37F8C6ED93; Tue, 30 Jul 2019 19:55:56 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 10C461E239; Tue, 30 Jul 2019 19:55:56 +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 x6UJttsW021909; Tue, 30 Jul 2019 19:55:55 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6UJttY0021908; Tue, 30 Jul 2019 19:55:55 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201907301955.x6UJttY0021908@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 30 Jul 2019 19:55:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r350456 - projects/fuse2/sys/sys X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/fuse2/sys/sys X-SVN-Commit-Revision: 350456 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 37F8C6ED93 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 30 Jul 2019 19:55:56 -0000 Author: asomers Date: Tue Jul 30 19:55:55 2019 New Revision: 350456 URL: https://svnweb.freebsd.org/changeset/base/350456 Log: Bump __FreeBSD_version r350437 presents a merge conflict with r350115, which raised __FreeBSD_version due to the addition of fusefs's intr/nointr mount options. Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/sys/sys/param.h Modified: projects/fuse2/sys/sys/param.h ============================================================================== --- projects/fuse2/sys/sys/param.h Tue Jul 30 19:47:45 2019 (r350455) +++ projects/fuse2/sys/sys/param.h Tue Jul 30 19:55:55 2019 (r350456) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1300038 /* Master, propagated to newvers */ +#define __FreeBSD_version 1300039 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From owner-svn-src-projects@freebsd.org Wed Jul 31 16:07:18 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0971BA2A68 for ; Wed, 31 Jul 2019 16:07:18 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 45zJGY5P4Sz41FQ; Wed, 31 Jul 2019 16:07:17 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9BBB8419B; Wed, 31 Jul 2019 16:07:17 +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 x6VG7HfA035542; Wed, 31 Jul 2019 16:07:17 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6VG7Hln035541; Wed, 31 Jul 2019 16:07:17 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201907311607.x6VG7Hln035541@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 31 Jul 2019 16:07:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r350466 - in projects/fuse2: sbin/mount_fusefs share/man/man5 X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/fuse2: sbin/mount_fusefs share/man/man5 X-SVN-Commit-Revision: 350466 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 45zJGY5P4Sz41FQ X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.36 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.36)[0.363,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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, 31 Jul 2019 16:07:18 -0000 Author: asomers Date: Wed Jul 31 16:07:16 2019 New Revision: 350466 URL: https://svnweb.freebsd.org/changeset/base/350466 Log: fusefs: proofread man pages Reported by: bcr, mandoc, textproc/igor Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/sbin/mount_fusefs/mount_fusefs.8 projects/fuse2/share/man/man5/fusefs.5 Modified: projects/fuse2/sbin/mount_fusefs/mount_fusefs.8 ============================================================================== --- projects/fuse2/sbin/mount_fusefs/mount_fusefs.8 Wed Jul 31 15:56:40 2019 (r350465) +++ projects/fuse2/sbin/mount_fusefs/mount_fusefs.8 Wed Jul 31 16:07:16 2019 (r350466) @@ -34,7 +34,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 18, 2019 +.Dd July 31, 2019 .Dt MOUNT_FUSEFS 8 .Os .Sh NAME @@ -113,27 +113,27 @@ Intended for use in scripts and the .Xr sudoers 5 file. .It Fl S , Ic --safe -Run in safe mode (i.e. reject invoking a filesystem daemon) +Run in safe mode (i.e., reject invoking a filesystem daemon). .It Fl v -Be verbose -.It Fl D, Ic --daemon Ar daemon +Be verbose. +.It Fl D , Ic --daemon Ar daemon Call the specified -.Ar daemon -.It Fl O, Ic --daemon_opts Ar opts +.Ar daemon . +.It Fl O , Ic --daemon_opts Ar opts Add .Ar opts -to the daemon's command line -.It Fl s, Ic --special Ar special +to the daemon's command line. +.It Fl s , Ic --special Ar special Use .Ar special -as special -.It Fl m, Ic --mountpath Ar node +as special. +.It Fl m , Ic --mountpath Ar node Mount on -.Ar node -.It Fl h, Ic --help -Show help -.It Fl V, Ic --version -Show version information +.Ar node . +.It Fl h , Ic --help +Show help. +.It Fl V , Ic --version +Show version information. .It Fl o Mount options are specified via .Fl o . @@ -144,12 +144,12 @@ by prefixing them with .It Cm allow_other Do not apply .Sx STRICT ACCESS POLICY . -Only root can use this option +Only root can use this option. .It Cm async I/O to the file system may be done asynchronously. -Writes may delayed and/or reordered. +Writes may be delayed and/or reordered. .It Cm default_permissions -Enable traditional (file mode based) permission checking in kernel +Enable traditional (file mode based) permission checking in kernel. .It Cm intr Allow signals to interrupt operations that are blocked waiting for a reply from the server. When this option is in use, system calls may fail with @@ -157,15 +157,15 @@ When this option is in use, system calls may fail with whenever a signal is received. .It Cm max_read Ns = Ns Ar n Limit size of read requests to -.Ar n +.Ar n . .It Cm neglect_shares -Do not refuse unmounting if there are secondary mounts +Do not refuse unmounting if there are secondary mounts. .It Cm private Refuse shared mounting of the daemon. This is the default behaviour, to allow sharing, expicitly use -.Fl o Cm noprivate +.Fl o Cm noprivate . .It Cm push_symlinks_in -Prefix absolute symlinks with the mountpoint +Prefix absolute symlinks with the mountpoint. .It Cm subtype Ns = Ns Ar fsname Suffix .Ar fsname @@ -187,11 +187,11 @@ However, there are some which do require in-kernel sup Currently the options supported by the kernel are: .Bl -tag -width indent .It Cm direct_io -Bypass the buffer cache system +Bypass the buffer cache system. .It Cm kernel_cache By default cached buffers of a given file are flushed at each .Xr open 2 . -This option disables this behaviour +This option disables this behaviour. .El .Sh DAEMON MOUNTS Usually users do not need to use @@ -214,7 +214,7 @@ only if the filesystem daemon has the same credentials real gid) as the user. .Pp This is applied for Fuse mounts by default and only root can mount without -the strict access policy (i.e. the +the strict access policy (i.e., the .Cm allow_other mount option). .Pp @@ -226,7 +226,7 @@ Users might opt to willingly relax strict access polic are concerned) by doing their own secondary mount (See .Sx SHARED MOUNTS ) . .Sh SHARED MOUNTS -A Fuse daemon can be shared (i.e. mounted multiple times). +A Fuse daemon can be shared (i.e., mounted multiple times). When doing the first (primary) mount, the spawner and the mounter of the daemon must have the same uid, or the mounter should be the superuser. .Pp @@ -245,7 +245,7 @@ is used or not. .Pp The device name of a secondary mount is the device name of the corresponding primary mount, followed by a '#' character and the index of the secondary -mount; e.g. +mount; e.g., .Pa /dev/fuse0#3 . .Sh SECURITY System administrators might want to use a custom mount policy (ie., one going @@ -259,7 +259,7 @@ However, given that is capable of invoking an arbitrary program, one must be careful when doing this. .Nm is designed in a way such that it makes that easy. -For this purpose, there are options which disable certain risky features (i.e. +For this purpose, there are options which disable certain risky features ( .Fl S and .Fl A ) , @@ -362,7 +362,7 @@ does not call any external utility and also provides a was written as the part of the .Fx implementation of the Fuse userspace filesystem framework (see -.Xr https://github.com/libfuse/libfuse ) +.Lk https://github.com/libfuse/libfuse ) and first appeared in the .Pa sysutils/fusefs-kmod port, supporting Modified: projects/fuse2/share/man/man5/fusefs.5 ============================================================================== --- projects/fuse2/share/man/man5/fusefs.5 Wed Jul 31 15:56:40 2019 (r350465) +++ projects/fuse2/share/man/man5/fusefs.5 Wed Jul 31 16:07:16 2019 (r350466) @@ -28,7 +28,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd June 27, 2019 +.Dd July 31, 2019 .Dt FUSEFS 5 .Os .Sh NAME @@ -60,7 +60,7 @@ Finally, the API is portable. Many daemons can run on multiple operating systems with minimal modifications. .Sh SYSCTL VARIABLES -The following +The following .Xr sysctl 8 variables are available: .Bl -tag -width indent @@ -95,12 +95,13 @@ Total number of lookup cache misses. Current number of allocated FUSE vnodes. .It Va vfs.fusefs.stats.ticket_count Current number of allocated FUSE tickets, which is roughly equal to the number -number of FUSE operations currently being processed by daemons. +of FUSE operations currently being processed by daemons. .\" Undocumented sysctls .\" ==================== .\" vfs.fusefs.enforce_dev_perms: I don't understand it well enough. .\" vfs.fusefs.iov_credit: I don't understand it well enough .\" vfs.fusefs.iov_permanent_bufsize: I don't understand it well enough +.El .Sh SEE ALSO .Xr mount_fusefs 8 .Sh HISTORY @@ -109,7 +110,7 @@ The driver was written as the part of the .Fx implementation of the FUSE userspace file system framework (see -.Xr https://github.com/libfuse/libfuse ) +.Lk https://github.com/libfuse/libfuse ) and first appeared in the .Pa sysutils/fusefs-kmod port, supporting From owner-svn-src-projects@freebsd.org Wed Jul 31 21:48:35 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F000EA9826 for ; Wed, 31 Jul 2019 21:48:35 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 45zRrM5v16z4P67; Wed, 31 Jul 2019 21:48:35 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A7E6880DF; Wed, 31 Jul 2019 21:48:35 +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 x6VLmZUb043392; Wed, 31 Jul 2019 21:48:35 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6VLmZsE043391; Wed, 31 Jul 2019 21:48:35 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201907312148.x6VLmZsE043391@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 31 Jul 2019 21:48:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r350489 - projects/fuse2/sys/fs/fuse X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/fuse2/sys/fs/fuse X-SVN-Commit-Revision: 350489 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 45zRrM5v16z4P67 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.56 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.56)[0.558,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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, 31 Jul 2019 21:48:36 -0000 Author: asomers Date: Wed Jul 31 21:48:35 2019 New Revision: 350489 URL: https://svnweb.freebsd.org/changeset/base/350489 Log: fusefs: fix the build after r350446 fuse needs to include an additional header after r350446 Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/sys/fs/fuse/fuse_internal.h Modified: projects/fuse2/sys/fs/fuse/fuse_internal.h ============================================================================== --- projects/fuse2/sys/fs/fuse/fuse_internal.h Wed Jul 31 21:39:03 2019 (r350488) +++ projects/fuse2/sys/fs/fuse/fuse_internal.h Wed Jul 31 21:48:35 2019 (r350489) @@ -67,6 +67,7 @@ #include #include +#include #include #include #include From owner-svn-src-projects@freebsd.org Sat Aug 3 22:41:35 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AEEB5BD733 for ; Sat, 3 Aug 2019 22:41:35 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 461Jt74sLLz3Kdq; Sat, 3 Aug 2019 22:41:35 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8941921F41; Sat, 3 Aug 2019 22:41:35 +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 x73MfZZq051206; Sat, 3 Aug 2019 22:41:35 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x73MfUci048171; Sat, 3 Aug 2019 22:41:30 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201908032241.x73MfUci048171@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Sat, 3 Aug 2019 22:41:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r350564 - in projects/runtime-coverage-v2: . cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common contrib/binutils/binutils/doc contrib/binutils/gas/doc contrib/e... X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/runtime-coverage-v2: . cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common contrib/binutils/binutils/doc contrib/binutils/gas/doc contrib/elftoolchain/addr2line con... X-SVN-Commit-Revision: 350564 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.29 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, 03 Aug 2019 22:41:35 -0000 Author: ngie Date: Sat Aug 3 22:41:29 2019 New Revision: 350564 URL: https://svnweb.freebsd.org/changeset/base/350564 Log: MFhead@r350563 Added: projects/runtime-coverage-v2/lib/libc/sys/copy_file_range.2 - copied unchanged from r350563, head/lib/libc/sys/copy_file_range.2 projects/runtime-coverage-v2/release/packages/bluetooth.ucl - copied unchanged from r350563, head/release/packages/bluetooth.ucl projects/runtime-coverage-v2/release/packages/hostapd.ucl - copied unchanged from r350563, head/release/packages/hostapd.ucl projects/runtime-coverage-v2/release/packages/wpa.ucl - copied unchanged from r350563, head/release/packages/wpa.ucl projects/runtime-coverage-v2/sbin/nvmecontrol/nsid.c - copied unchanged from r350563, head/sbin/nvmecontrol/nsid.c projects/runtime-coverage-v2/sbin/nvmecontrol/sanitize.c - copied unchanged from r350563, head/sbin/nvmecontrol/sanitize.c projects/runtime-coverage-v2/share/man/man9/VOP_COPY_FILE_RANGE.9 - copied unchanged from r350563, head/share/man/man9/VOP_COPY_FILE_RANGE.9 projects/runtime-coverage-v2/share/man/man9/seqc.9 - copied unchanged from r350563, head/share/man/man9/seqc.9 projects/runtime-coverage-v2/stand/powerpc/ofw/cas.c - copied unchanged from r350563, head/stand/powerpc/ofw/cas.c projects/runtime-coverage-v2/sys/amd64/linux/linux_locore.asm - copied unchanged from r350563, head/sys/amd64/linux/linux_locore.asm projects/runtime-coverage-v2/sys/amd64/linux32/linux32_locore.asm - copied unchanged from r350563, head/sys/amd64/linux32/linux32_locore.asm projects/runtime-coverage-v2/sys/arm/ti/ti_sysc.c - copied unchanged from r350563, head/sys/arm/ti/ti_sysc.c projects/runtime-coverage-v2/sys/arm64/linux/linux_locore.asm - copied unchanged from r350563, head/sys/arm64/linux/linux_locore.asm projects/runtime-coverage-v2/sys/arm64/rockchip/rk3399_emmcphy.c - copied unchanged from r350563, head/sys/arm64/rockchip/rk3399_emmcphy.c projects/runtime-coverage-v2/sys/dev/altera/dwc/ - copied from r350563, head/sys/dev/altera/dwc/ projects/runtime-coverage-v2/sys/dev/xdma/xdma_iommu.c - copied unchanged from r350563, head/sys/dev/xdma/xdma_iommu.c projects/runtime-coverage-v2/sys/dev/zlib/ - copied from r350563, head/sys/dev/zlib/ projects/runtime-coverage-v2/sys/dts/arm/overlays/sun8i-h3-i2c0.dtso - copied unchanged from r350563, head/sys/dts/arm/overlays/sun8i-h3-i2c0.dtso projects/runtime-coverage-v2/sys/i386/linux/linux_locore.asm - copied unchanged from r350563, head/sys/i386/linux/linux_locore.asm projects/runtime-coverage-v2/sys/mips/beri/beri_iommu.c - copied unchanged from r350563, head/sys/mips/beri/beri_iommu.c projects/runtime-coverage-v2/sys/netinet/tcp_ratelimit.c - copied unchanged from r350563, head/sys/netinet/tcp_ratelimit.c projects/runtime-coverage-v2/sys/netinet/tcp_ratelimit.h - copied unchanged from r350563, head/sys/netinet/tcp_ratelimit.h projects/runtime-coverage-v2/usr.bin/login/motd.template - copied unchanged from r350563, head/usr.bin/login/motd.template Deleted: projects/runtime-coverage-v2/contrib/mandoc/libroff.h projects/runtime-coverage-v2/lib/libcasper/services/cap_random/ projects/runtime-coverage-v2/sys/amd64/linux/linux_locore.s projects/runtime-coverage-v2/sys/amd64/linux32/linux32_locore.s projects/runtime-coverage-v2/sys/arm/arm/elf_trampoline.c projects/runtime-coverage-v2/sys/arm/arm/inckern.S projects/runtime-coverage-v2/sys/arm64/linux/linux_locore.s projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h projects/runtime-coverage-v2/sys/i386/linux/linux_locore.s projects/runtime-coverage-v2/sys/kern/imgact_gzip.c projects/runtime-coverage-v2/sys/kern/subr_inflate.c projects/runtime-coverage-v2/sys/sys/inflate.h projects/runtime-coverage-v2/tools/debugscripts/kld_deb.py projects/runtime-coverage-v2/usr.bin/login/motd Modified: projects/runtime-coverage-v2/.cirrus.yml projects/runtime-coverage-v2/Makefile projects/runtime-coverage-v2/ObsoleteFiles.inc projects/runtime-coverage-v2/RELNOTES projects/runtime-coverage-v2/UPDATING projects/runtime-coverage-v2/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/runtime-coverage-v2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c projects/runtime-coverage-v2/contrib/binutils/binutils/doc/binutils.texi projects/runtime-coverage-v2/contrib/binutils/gas/doc/as.texinfo projects/runtime-coverage-v2/contrib/elftoolchain/addr2line/addr2line.c projects/runtime-coverage-v2/contrib/elftoolchain/elfcopy/main.c projects/runtime-coverage-v2/contrib/elftoolchain/elfcopy/strip.1 projects/runtime-coverage-v2/contrib/elftoolchain/readelf/readelf.c projects/runtime-coverage-v2/contrib/elftoolchain/size/size.c projects/runtime-coverage-v2/contrib/libcxxrt/exception.cc (contents, props changed) projects/runtime-coverage-v2/contrib/libcxxrt/memory.cc (contents, props changed) projects/runtime-coverage-v2/contrib/libunwind/src/assembly.h projects/runtime-coverage-v2/contrib/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp projects/runtime-coverage-v2/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp projects/runtime-coverage-v2/contrib/llvm/tools/clang/lib/Basic/Version.cpp projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Config.h projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Driver.cpp projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/InputSection.cpp projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Relocations.cpp projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Relocations.h projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Symbols.cpp projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Symbols.h projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/SyntheticSections.cpp projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Writer.cpp projects/runtime-coverage-v2/contrib/mandoc/Makefile.depend projects/runtime-coverage-v2/contrib/mandoc/TODO projects/runtime-coverage-v2/contrib/mandoc/arch.c projects/runtime-coverage-v2/contrib/mandoc/cgi.c projects/runtime-coverage-v2/contrib/mandoc/configure projects/runtime-coverage-v2/contrib/mandoc/dbm.c projects/runtime-coverage-v2/contrib/mandoc/dbm_map.h projects/runtime-coverage-v2/contrib/mandoc/eqn.7 projects/runtime-coverage-v2/contrib/mandoc/eqn_html.c projects/runtime-coverage-v2/contrib/mandoc/html.c projects/runtime-coverage-v2/contrib/mandoc/html.h projects/runtime-coverage-v2/contrib/mandoc/lib.in projects/runtime-coverage-v2/contrib/mandoc/main.c projects/runtime-coverage-v2/contrib/mandoc/man.7 projects/runtime-coverage-v2/contrib/mandoc/man_html.c projects/runtime-coverage-v2/contrib/mandoc/man_term.c projects/runtime-coverage-v2/contrib/mandoc/man_validate.c projects/runtime-coverage-v2/contrib/mandoc/mandoc.1 projects/runtime-coverage-v2/contrib/mandoc/mandoc.c projects/runtime-coverage-v2/contrib/mandoc/mandoc.css projects/runtime-coverage-v2/contrib/mandoc/mandoc.h projects/runtime-coverage-v2/contrib/mandoc/mandoc_char.7 projects/runtime-coverage-v2/contrib/mandoc/mandoc_headers.3 projects/runtime-coverage-v2/contrib/mandoc/mandoc_msg.c projects/runtime-coverage-v2/contrib/mandoc/mandocdb.c projects/runtime-coverage-v2/contrib/mandoc/manpath.c projects/runtime-coverage-v2/contrib/mandoc/mansearch.c projects/runtime-coverage-v2/contrib/mandoc/mansearch.h projects/runtime-coverage-v2/contrib/mandoc/mdoc.7 projects/runtime-coverage-v2/contrib/mandoc/mdoc_argv.c projects/runtime-coverage-v2/contrib/mandoc/mdoc_markdown.c projects/runtime-coverage-v2/contrib/mandoc/mdoc_term.c projects/runtime-coverage-v2/contrib/mandoc/mdoc_validate.c projects/runtime-coverage-v2/contrib/mandoc/out.c projects/runtime-coverage-v2/contrib/mandoc/read.c projects/runtime-coverage-v2/contrib/mandoc/roff.7 projects/runtime-coverage-v2/contrib/mandoc/roff.c projects/runtime-coverage-v2/contrib/mandoc/roff_html.c projects/runtime-coverage-v2/contrib/mandoc/tag.c projects/runtime-coverage-v2/contrib/mandoc/tbl_html.c projects/runtime-coverage-v2/contrib/mandoc/tbl_term.c projects/runtime-coverage-v2/contrib/mandoc/term.c projects/runtime-coverage-v2/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c projects/runtime-coverage-v2/contrib/telnet/telnet/commands.c projects/runtime-coverage-v2/etc/mtree/BSD.var.dist projects/runtime-coverage-v2/gnu/usr.bin/binutils/as/as.1 projects/runtime-coverage-v2/gnu/usr.bin/binutils/objdump/objdump.1 projects/runtime-coverage-v2/include/stdlib.h projects/runtime-coverage-v2/include/unistd.h projects/runtime-coverage-v2/lib/clang/include/clang/Basic/Version.inc projects/runtime-coverage-v2/lib/clang/include/lld/Common/Version.inc projects/runtime-coverage-v2/lib/clang/include/llvm/Support/VCSRevision.h projects/runtime-coverage-v2/lib/geom/nop/geom_nop.c projects/runtime-coverage-v2/lib/geom/nop/gnop.8 projects/runtime-coverage-v2/lib/libarchive/tests/Makefile projects/runtime-coverage-v2/lib/libc/gen/Makefile.inc projects/runtime-coverage-v2/lib/libc/gen/daemon.3 projects/runtime-coverage-v2/lib/libc/gen/getvfsbyname.c projects/runtime-coverage-v2/lib/libc/gen/setmode.3 projects/runtime-coverage-v2/lib/libc/stdio/Makefile.inc projects/runtime-coverage-v2/lib/libc/stdio/Symbol.map projects/runtime-coverage-v2/lib/libc/stdio/mktemp.3 projects/runtime-coverage-v2/lib/libc/stdio/mktemp.c projects/runtime-coverage-v2/lib/libc/sys/Makefile.inc projects/runtime-coverage-v2/lib/libc/sys/Symbol.map projects/runtime-coverage-v2/lib/libc/tests/gen/dir2_test.c projects/runtime-coverage-v2/lib/libc/tests/string/wcsnlen_test.c projects/runtime-coverage-v2/lib/libcasper/libcasper/libcasper.3 projects/runtime-coverage-v2/lib/libcasper/services/Makefile projects/runtime-coverage-v2/lib/libcasper/services/cap_fileargs/Makefile projects/runtime-coverage-v2/lib/libcasper/services/cap_fileargs/cap_fileargs.3 projects/runtime-coverage-v2/lib/libcxxrt/Makefile projects/runtime-coverage-v2/lib/libcxxrt/Version.map projects/runtime-coverage-v2/lib/libdpv/Makefile projects/runtime-coverage-v2/lib/libfigpar/Makefile projects/runtime-coverage-v2/lib/libgssapi/gss_accept_sec_context.c projects/runtime-coverage-v2/lib/libgssapi/gss_names.c projects/runtime-coverage-v2/lib/libproc/proc_bkpt.c projects/runtime-coverage-v2/lib/libproc/proc_sym.c projects/runtime-coverage-v2/lib/libsysdecode/Makefile projects/runtime-coverage-v2/lib/libthr/thread/thr_attr.c projects/runtime-coverage-v2/lib/libthr/thread/thr_cancel.c projects/runtime-coverage-v2/lib/libthr/thread/thr_clean.c projects/runtime-coverage-v2/lib/libthr/thread/thr_cond.c projects/runtime-coverage-v2/lib/libthr/thread/thr_detach.c projects/runtime-coverage-v2/lib/libthr/thread/thr_equal.c projects/runtime-coverage-v2/lib/libthr/thread/thr_exit.c projects/runtime-coverage-v2/lib/libthr/thread/thr_fork.c projects/runtime-coverage-v2/lib/libthr/thread/thr_getthreadid_np.c projects/runtime-coverage-v2/lib/libthr/thread/thr_init.c projects/runtime-coverage-v2/lib/libthr/thread/thr_join.c projects/runtime-coverage-v2/lib/libthr/thread/thr_kill.c projects/runtime-coverage-v2/lib/libthr/thread/thr_main_np.c projects/runtime-coverage-v2/lib/libthr/thread/thr_mutex.c projects/runtime-coverage-v2/lib/libthr/thread/thr_mutexattr.c projects/runtime-coverage-v2/lib/libthr/thread/thr_once.c projects/runtime-coverage-v2/lib/libthr/thread/thr_private.h projects/runtime-coverage-v2/lib/libthr/thread/thr_rwlock.c projects/runtime-coverage-v2/lib/libthr/thread/thr_self.c projects/runtime-coverage-v2/lib/libthr/thread/thr_sig.c projects/runtime-coverage-v2/lib/libthr/thread/thr_spec.c projects/runtime-coverage-v2/lib/libutil/expand_number.3 projects/runtime-coverage-v2/libexec/bootpd/Makefile.inc projects/runtime-coverage-v2/libexec/bootpd/tools/Makefile.inc projects/runtime-coverage-v2/libexec/rc/rc.d/Makefile projects/runtime-coverage-v2/libexec/rc/rc.d/motd projects/runtime-coverage-v2/release/packages/Makefile.package projects/runtime-coverage-v2/release/picobsd/tinyware/login/pathnames.h projects/runtime-coverage-v2/sbin/camcontrol/camcontrol.8 projects/runtime-coverage-v2/sbin/camcontrol/camcontrol.c projects/runtime-coverage-v2/sbin/camcontrol/camcontrol.h projects/runtime-coverage-v2/sbin/camcontrol/modeedit.c projects/runtime-coverage-v2/sbin/camcontrol/timestamp.c projects/runtime-coverage-v2/sbin/fsck_ffs/pass1.c projects/runtime-coverage-v2/sbin/fsck_ffs/suj.c projects/runtime-coverage-v2/sbin/ifconfig/Makefile projects/runtime-coverage-v2/sbin/mount/mount.c projects/runtime-coverage-v2/sbin/nvmecontrol/Makefile projects/runtime-coverage-v2/sbin/nvmecontrol/comnd.c projects/runtime-coverage-v2/sbin/nvmecontrol/devlist.c projects/runtime-coverage-v2/sbin/nvmecontrol/firmware.c projects/runtime-coverage-v2/sbin/nvmecontrol/format.c projects/runtime-coverage-v2/sbin/nvmecontrol/identify.c projects/runtime-coverage-v2/sbin/nvmecontrol/identify_ext.c projects/runtime-coverage-v2/sbin/nvmecontrol/logpage.c projects/runtime-coverage-v2/sbin/nvmecontrol/ns.c projects/runtime-coverage-v2/sbin/nvmecontrol/nvmecontrol.8 projects/runtime-coverage-v2/sbin/nvmecontrol/nvmecontrol.c projects/runtime-coverage-v2/sbin/nvmecontrol/nvmecontrol.h projects/runtime-coverage-v2/sbin/nvmecontrol/perftest.c projects/runtime-coverage-v2/sbin/nvmecontrol/reset.c projects/runtime-coverage-v2/sbin/ping6/Makefile projects/runtime-coverage-v2/sbin/ping6/ping6.c projects/runtime-coverage-v2/sbin/swapon/swapon.c projects/runtime-coverage-v2/share/man/man1/Makefile projects/runtime-coverage-v2/share/man/man3/Makefile projects/runtime-coverage-v2/share/man/man4/Makefile projects/runtime-coverage-v2/share/man/man4/cc_dctcp.4 projects/runtime-coverage-v2/share/man/man4/cue.4 projects/runtime-coverage-v2/share/man/man4/kue.4 projects/runtime-coverage-v2/share/man/man4/man4.aarch64/Makefile projects/runtime-coverage-v2/share/man/man4/man4.arm/Makefile projects/runtime-coverage-v2/share/man/man4/man4.i386/Makefile projects/runtime-coverage-v2/share/man/man4/man4.powerpc/Makefile projects/runtime-coverage-v2/share/man/man4/man4.sparc64/Makefile projects/runtime-coverage-v2/share/man/man4/mxge.4 projects/runtime-coverage-v2/share/man/man4/nvme.4 projects/runtime-coverage-v2/share/man/man4/rgephy.4 projects/runtime-coverage-v2/share/man/man4/tcp.4 projects/runtime-coverage-v2/share/man/man5/Makefile projects/runtime-coverage-v2/share/man/man5/fstab.5 projects/runtime-coverage-v2/share/man/man5/motd.5 projects/runtime-coverage-v2/share/man/man6/Makefile projects/runtime-coverage-v2/share/man/man7/Makefile projects/runtime-coverage-v2/share/man/man8/Makefile projects/runtime-coverage-v2/share/man/man8/picobsd.8 projects/runtime-coverage-v2/share/man/man9/Makefile projects/runtime-coverage-v2/share/man/man9/VOP_FSYNC.9 projects/runtime-coverage-v2/share/man/man9/VOP_PATHCONF.9 projects/runtime-coverage-v2/share/man/man9/refcount.9 projects/runtime-coverage-v2/share/misc/organization.dot projects/runtime-coverage-v2/share/mk/bsd.compiler.mk projects/runtime-coverage-v2/share/mk/bsd.confs.mk projects/runtime-coverage-v2/share/mk/bsd.cpu.mk projects/runtime-coverage-v2/share/mk/bsd.dep.mk projects/runtime-coverage-v2/share/mk/bsd.snmpmod.mk projects/runtime-coverage-v2/share/mk/bsd.sys.mk projects/runtime-coverage-v2/share/mk/src.libnames.mk projects/runtime-coverage-v2/share/mk/src.opts.mk projects/runtime-coverage-v2/share/mk/sys.mk projects/runtime-coverage-v2/stand/efi/loader/conf.c projects/runtime-coverage-v2/stand/powerpc/ofw/Makefile projects/runtime-coverage-v2/stand/powerpc/ofw/main.c projects/runtime-coverage-v2/sys/amd64/amd64/elf_machdep.c projects/runtime-coverage-v2/sys/amd64/amd64/exception.S projects/runtime-coverage-v2/sys/amd64/amd64/pmap.c projects/runtime-coverage-v2/sys/amd64/conf/NOTES projects/runtime-coverage-v2/sys/amd64/include/asmacros.h projects/runtime-coverage-v2/sys/amd64/include/vmm.h projects/runtime-coverage-v2/sys/amd64/vmm/intel/vmx.c projects/runtime-coverage-v2/sys/amd64/vmm/intel/vmx_msr.c projects/runtime-coverage-v2/sys/amd64/vmm/io/ppt.c projects/runtime-coverage-v2/sys/amd64/vmm/io/ppt.h projects/runtime-coverage-v2/sys/amd64/vmm/io/vatpit.c projects/runtime-coverage-v2/sys/amd64/vmm/io/vlapic.c projects/runtime-coverage-v2/sys/amd64/vmm/vmm.c projects/runtime-coverage-v2/sys/amd64/vmm/vmm_lapic.c projects/runtime-coverage-v2/sys/amd64/vmm/vmm_lapic.h projects/runtime-coverage-v2/sys/amd64/vmm/vmm_util.c projects/runtime-coverage-v2/sys/amd64/vmm/vmm_util.h projects/runtime-coverage-v2/sys/arm/conf/NOTES.armv5 projects/runtime-coverage-v2/sys/arm/conf/TEGRA124 projects/runtime-coverage-v2/sys/arm/mv/discovery/std.db78xxx projects/runtime-coverage-v2/sys/arm/mv/orion/std.db88f5xxx projects/runtime-coverage-v2/sys/arm/mv/orion/std.ts7800 projects/runtime-coverage-v2/sys/arm/ralink/std.ralink projects/runtime-coverage-v2/sys/arm/ti/cpsw/if_cpsw.c projects/runtime-coverage-v2/sys/arm/ti/files.ti projects/runtime-coverage-v2/sys/arm/ti/ti_hwmods.c projects/runtime-coverage-v2/sys/arm64/arm64/elf_machdep.c projects/runtime-coverage-v2/sys/arm64/arm64/identcpu.c projects/runtime-coverage-v2/sys/arm64/arm64/pmap.c projects/runtime-coverage-v2/sys/arm64/conf/GENERIC projects/runtime-coverage-v2/sys/arm64/include/armreg.h projects/runtime-coverage-v2/sys/arm64/include/cpu.h projects/runtime-coverage-v2/sys/arm64/include/elf.h projects/runtime-coverage-v2/sys/arm64/include/pte.h projects/runtime-coverage-v2/sys/cam/ata/ata_all.c projects/runtime-coverage-v2/sys/cam/ata/ata_da.c projects/runtime-coverage-v2/sys/cam/ata/ata_xpt.c projects/runtime-coverage-v2/sys/cam/ctl/ctl.c projects/runtime-coverage-v2/sys/cam/ctl/ctl.h projects/runtime-coverage-v2/sys/cam/ctl/ctl_backend_ramdisk.c projects/runtime-coverage-v2/sys/cam/ctl/ctl_private.h projects/runtime-coverage-v2/sys/cam/scsi/scsi_all.c projects/runtime-coverage-v2/sys/cam/scsi/scsi_all.h projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c projects/runtime-coverage-v2/sys/compat/cloudabi/cloudabi_fd.c projects/runtime-coverage-v2/sys/compat/freebsd32/freebsd32_capability.c projects/runtime-coverage-v2/sys/compat/freebsd32/freebsd32_misc.c projects/runtime-coverage-v2/sys/compat/freebsd32/freebsd32_syscall.h projects/runtime-coverage-v2/sys/compat/freebsd32/freebsd32_syscalls.c projects/runtime-coverage-v2/sys/compat/freebsd32/freebsd32_sysent.c projects/runtime-coverage-v2/sys/compat/freebsd32/freebsd32_systrace_args.c projects/runtime-coverage-v2/sys/compat/freebsd32/syscalls.master projects/runtime-coverage-v2/sys/compat/ia32/ia32_sysvec.c projects/runtime-coverage-v2/sys/conf/Makefile.arm projects/runtime-coverage-v2/sys/conf/NOTES projects/runtime-coverage-v2/sys/conf/config.mk projects/runtime-coverage-v2/sys/conf/files projects/runtime-coverage-v2/sys/conf/files.amd64 projects/runtime-coverage-v2/sys/conf/files.arm64 projects/runtime-coverage-v2/sys/conf/files.i386 projects/runtime-coverage-v2/sys/conf/kern.pre.mk projects/runtime-coverage-v2/sys/conf/kmod.mk projects/runtime-coverage-v2/sys/conf/newvers.sh projects/runtime-coverage-v2/sys/conf/options.powerpc projects/runtime-coverage-v2/sys/contrib/dev/acpica/changes.txt projects/runtime-coverage-v2/sys/contrib/dev/acpica/compiler/asldefine.h projects/runtime-coverage-v2/sys/contrib/dev/acpica/compiler/aslglobal.h projects/runtime-coverage-v2/sys/contrib/dev/acpica/compiler/aslload.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/compiler/aslmessages.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/compiler/aslmessages.h projects/runtime-coverage-v2/sys/contrib/dev/acpica/compiler/aslstubs.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/compiler/aslsupport.l projects/runtime-coverage-v2/sys/contrib/dev/acpica/components/dispatcher/dsinit.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/components/events/evgpe.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/components/events/evgpeblk.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/components/events/evxface.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/components/events/evxfgpe.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/components/executer/exconfig.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/components/namespace/nsaccess.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/components/namespace/nseval.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/components/namespace/nsinit.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/components/namespace/nsload.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/components/namespace/nsutils.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/components/tables/tbdata.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/components/tables/tbxfload.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/components/utilities/utinit.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/components/utilities/utxfinit.c projects/runtime-coverage-v2/sys/contrib/dev/acpica/include/acevents.h projects/runtime-coverage-v2/sys/contrib/dev/acpica/include/acglobal.h projects/runtime-coverage-v2/sys/contrib/dev/acpica/include/acnamesp.h projects/runtime-coverage-v2/sys/contrib/dev/acpica/include/acpixf.h projects/runtime-coverage-v2/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c projects/runtime-coverage-v2/sys/contrib/zlib/deflate.c projects/runtime-coverage-v2/sys/contrib/zlib/zconf.h projects/runtime-coverage-v2/sys/contrib/zlib/zutil.h projects/runtime-coverage-v2/sys/dev/acpica/acpi_resource.c projects/runtime-coverage-v2/sys/dev/altera/msgdma/msgdma.c projects/runtime-coverage-v2/sys/dev/bhnd/nvram/bhnd_nvram_data_tlv.c projects/runtime-coverage-v2/sys/dev/bhnd/nvram/bhnd_nvram_store.c projects/runtime-coverage-v2/sys/dev/bhnd/nvram/bhnd_nvram_value.c projects/runtime-coverage-v2/sys/dev/bhnd/nvram/bhnd_nvram_value_prf.c projects/runtime-coverage-v2/sys/dev/cxgbe/adapter.h projects/runtime-coverage-v2/sys/dev/cxgbe/t4_main.c projects/runtime-coverage-v2/sys/dev/cxgbe/t4_sched.c projects/runtime-coverage-v2/sys/dev/drm2/drmP.h projects/runtime-coverage-v2/sys/dev/iicbus/nxprtc.c projects/runtime-coverage-v2/sys/dev/ixgbe/if_ix.c projects/runtime-coverage-v2/sys/dev/ixgbe/if_ixv.c projects/runtime-coverage-v2/sys/dev/ixgbe/ixgbe.h projects/runtime-coverage-v2/sys/dev/mii/micphy.c projects/runtime-coverage-v2/sys/dev/mlx5/mlx5_en/mlx5_en_main.c projects/runtime-coverage-v2/sys/dev/mmc/host/dwmmc_altera.c projects/runtime-coverage-v2/sys/dev/mmc/mmcsd.c projects/runtime-coverage-v2/sys/dev/mxge/if_mxge.c projects/runtime-coverage-v2/sys/dev/nvme/nvme.c projects/runtime-coverage-v2/sys/dev/nvme/nvme.h projects/runtime-coverage-v2/sys/dev/nvme/nvme_ctrlr.c projects/runtime-coverage-v2/sys/dev/nvme/nvme_ns.c projects/runtime-coverage-v2/sys/dev/nvme/nvme_private.h projects/runtime-coverage-v2/sys/dev/nvme/nvme_qpair.c projects/runtime-coverage-v2/sys/dev/nvme/nvme_sysctl.c projects/runtime-coverage-v2/sys/dev/sdhci/sdhci_fdt.c projects/runtime-coverage-v2/sys/dev/sfxge/common/ef10_impl.h projects/runtime-coverage-v2/sys/dev/sfxge/common/ef10_nvram.c projects/runtime-coverage-v2/sys/dev/sfxge/common/ef10_rx.c projects/runtime-coverage-v2/sys/dev/sfxge/common/efsys.h projects/runtime-coverage-v2/sys/dev/sfxge/common/efx.h projects/runtime-coverage-v2/sys/dev/sfxge/common/efx_mcdi.h projects/runtime-coverage-v2/sys/dev/sfxge/common/efx_tx.c projects/runtime-coverage-v2/sys/dev/sfxge/sfxge_port.c projects/runtime-coverage-v2/sys/dev/sfxge/sfxge_rx.c projects/runtime-coverage-v2/sys/dev/sound/pci/hda/hdaa_patches.c projects/runtime-coverage-v2/sys/dev/sound/pci/hda/hdac.h projects/runtime-coverage-v2/sys/dev/usb/net/if_urndis.c projects/runtime-coverage-v2/sys/dev/usb/usb_hub_acpi.c projects/runtime-coverage-v2/sys/dev/virtio/mmio/virtio_mmio.c projects/runtime-coverage-v2/sys/dev/virtio/pci/virtio_pci.c projects/runtime-coverage-v2/sys/dev/xdma/xdma.c projects/runtime-coverage-v2/sys/dev/xdma/xdma.h projects/runtime-coverage-v2/sys/dev/xdma/xdma_if.m projects/runtime-coverage-v2/sys/dev/xdma/xdma_sg.c projects/runtime-coverage-v2/sys/fs/devfs/devfs_vnops.c projects/runtime-coverage-v2/sys/fs/ext2fs/ext2_vnops.c projects/runtime-coverage-v2/sys/fs/fuse/fuse_vnops.c projects/runtime-coverage-v2/sys/fs/unionfs/union_subr.c projects/runtime-coverage-v2/sys/fs/unionfs/union_vnops.c projects/runtime-coverage-v2/sys/geom/nop/g_nop.c projects/runtime-coverage-v2/sys/geom/nop/g_nop.h projects/runtime-coverage-v2/sys/i386/conf/NOTES projects/runtime-coverage-v2/sys/i386/i386/pmap.c projects/runtime-coverage-v2/sys/i386/i386/pmap_base.c projects/runtime-coverage-v2/sys/i386/include/pmap_base.h projects/runtime-coverage-v2/sys/kern/capabilities.conf projects/runtime-coverage-v2/sys/kern/imgact_elf.c projects/runtime-coverage-v2/sys/kern/init_sysent.c projects/runtime-coverage-v2/sys/kern/kern_descrip.c projects/runtime-coverage-v2/sys/kern/kern_event.c projects/runtime-coverage-v2/sys/kern/kern_exec.c projects/runtime-coverage-v2/sys/kern/kern_exit.c projects/runtime-coverage-v2/sys/kern/kern_sendfile.c projects/runtime-coverage-v2/sys/kern/kern_sig.c projects/runtime-coverage-v2/sys/kern/kern_umtx.c projects/runtime-coverage-v2/sys/kern/subr_epoch.c projects/runtime-coverage-v2/sys/kern/subr_turnstile.c projects/runtime-coverage-v2/sys/kern/subr_witness.c projects/runtime-coverage-v2/sys/kern/sys_generic.c projects/runtime-coverage-v2/sys/kern/sys_process.c projects/runtime-coverage-v2/sys/kern/syscalls.c projects/runtime-coverage-v2/sys/kern/syscalls.master projects/runtime-coverage-v2/sys/kern/systrace_args.c projects/runtime-coverage-v2/sys/kern/uipc_mqueue.c projects/runtime-coverage-v2/sys/kern/uipc_shm.c projects/runtime-coverage-v2/sys/kern/uipc_usrreq.c projects/runtime-coverage-v2/sys/kern/vfs_bio.c projects/runtime-coverage-v2/sys/kern/vfs_cache.c projects/runtime-coverage-v2/sys/kern/vfs_default.c projects/runtime-coverage-v2/sys/kern/vfs_subr.c projects/runtime-coverage-v2/sys/kern/vfs_syscalls.c projects/runtime-coverage-v2/sys/kern/vfs_vnops.c projects/runtime-coverage-v2/sys/kern/vnode_if.src projects/runtime-coverage-v2/sys/libkern/inet_pton.c projects/runtime-coverage-v2/sys/libkern/zlib.c projects/runtime-coverage-v2/sys/mips/beri/files.beri projects/runtime-coverage-v2/sys/mips/broadcom/bhnd_nexus.c projects/runtime-coverage-v2/sys/modules/crypto/Makefile projects/runtime-coverage-v2/sys/modules/dtb/allwinner/Makefile projects/runtime-coverage-v2/sys/modules/i2c/controllers/ichiic/Makefile projects/runtime-coverage-v2/sys/modules/linux64/Makefile projects/runtime-coverage-v2/sys/modules/mxge/mxge/Makefile projects/runtime-coverage-v2/sys/modules/zfs/Makefile projects/runtime-coverage-v2/sys/modules/zlib/Makefile projects/runtime-coverage-v2/sys/net/if_dead.c projects/runtime-coverage-v2/sys/net/if_lagg.c projects/runtime-coverage-v2/sys/net/if_spppsubr.c projects/runtime-coverage-v2/sys/net/if_tap.h projects/runtime-coverage-v2/sys/net/if_tun.h projects/runtime-coverage-v2/sys/net/if_tuntap.c projects/runtime-coverage-v2/sys/net/if_var.h projects/runtime-coverage-v2/sys/net/if_vxlan.c projects/runtime-coverage-v2/sys/net/iflib.c projects/runtime-coverage-v2/sys/net/route.c projects/runtime-coverage-v2/sys/netinet/cc/cc_dctcp.c projects/runtime-coverage-v2/sys/netinet/in_pcb.c projects/runtime-coverage-v2/sys/netinet/in_pcb.h projects/runtime-coverage-v2/sys/netinet/sctp_asconf.c projects/runtime-coverage-v2/sys/netinet/sctp_indata.c projects/runtime-coverage-v2/sys/netinet/sctp_os_bsd.h projects/runtime-coverage-v2/sys/netinet/sctp_output.c projects/runtime-coverage-v2/sys/netinet/sctp_pcb.c projects/runtime-coverage-v2/sys/netinet/sctp_pcb.h projects/runtime-coverage-v2/sys/netinet/sctp_usrreq.c projects/runtime-coverage-v2/sys/netinet/tcp_subr.c projects/runtime-coverage-v2/sys/netinet/tcp_usrreq.c projects/runtime-coverage-v2/sys/netinet/tcp_var.h projects/runtime-coverage-v2/sys/netinet6/frag6.c projects/runtime-coverage-v2/sys/netinet6/icmp6.c projects/runtime-coverage-v2/sys/netinet6/in6_mcast.c projects/runtime-coverage-v2/sys/netinet6/in6_pcb.c projects/runtime-coverage-v2/sys/netinet6/in6_pcb.h projects/runtime-coverage-v2/sys/netinet6/in6_proto.c projects/runtime-coverage-v2/sys/netinet6/in6_src.c projects/runtime-coverage-v2/sys/netinet6/ip6_input.c projects/runtime-coverage-v2/sys/netinet6/ip6_output.c projects/runtime-coverage-v2/sys/netinet6/ip6_var.h projects/runtime-coverage-v2/sys/netinet6/raw_ip6.c projects/runtime-coverage-v2/sys/netinet6/sctp6_usrreq.c projects/runtime-coverage-v2/sys/netpfil/ipfw/ip_fw2.c projects/runtime-coverage-v2/sys/netpfil/ipfw/ip_fw_bpf.c projects/runtime-coverage-v2/sys/netpfil/ipfw/ip_fw_eaction.c projects/runtime-coverage-v2/sys/netpfil/ipfw/ip_fw_nat.c projects/runtime-coverage-v2/sys/netpfil/ipfw/ip_fw_private.h projects/runtime-coverage-v2/sys/netpfil/ipfw/ip_fw_sockopt.c projects/runtime-coverage-v2/sys/netpfil/pf/pf.c projects/runtime-coverage-v2/sys/netpfil/pf/pf_ioctl.c projects/runtime-coverage-v2/sys/netpfil/pf/pf_norm.c projects/runtime-coverage-v2/sys/opencrypto/cryptodeflate.c projects/runtime-coverage-v2/sys/opencrypto/deflate.h projects/runtime-coverage-v2/sys/powerpc/aim/mmu_oea64.c projects/runtime-coverage-v2/sys/powerpc/aim/mmu_oea64.h projects/runtime-coverage-v2/sys/powerpc/aim/moea64_native.c projects/runtime-coverage-v2/sys/powerpc/aim/slb.c projects/runtime-coverage-v2/sys/powerpc/booke/spe.c projects/runtime-coverage-v2/sys/powerpc/include/pmap.h projects/runtime-coverage-v2/sys/powerpc/powernv/opal.h projects/runtime-coverage-v2/sys/powerpc/powernv/opal_pci.c projects/runtime-coverage-v2/sys/powerpc/ps3/mmu_ps3.c projects/runtime-coverage-v2/sys/powerpc/pseries/mmu_phyp.c projects/runtime-coverage-v2/sys/riscv/riscv/copyinout.S projects/runtime-coverage-v2/sys/riscv/riscv/pmap.c projects/runtime-coverage-v2/sys/rpc/svc_vc.c projects/runtime-coverage-v2/sys/sys/ata.h projects/runtime-coverage-v2/sys/sys/file.h projects/runtime-coverage-v2/sys/sys/imgact.h projects/runtime-coverage-v2/sys/sys/imgact_elf.h projects/runtime-coverage-v2/sys/sys/param.h projects/runtime-coverage-v2/sys/sys/proc.h projects/runtime-coverage-v2/sys/sys/refcount.h projects/runtime-coverage-v2/sys/sys/seqc.h projects/runtime-coverage-v2/sys/sys/syscall.h projects/runtime-coverage-v2/sys/sys/syscall.mk projects/runtime-coverage-v2/sys/sys/syscallsubr.h projects/runtime-coverage-v2/sys/sys/sysent.h projects/runtime-coverage-v2/sys/sys/sysproto.h projects/runtime-coverage-v2/sys/sys/turnstile.h projects/runtime-coverage-v2/sys/sys/vnode.h projects/runtime-coverage-v2/sys/sys/zlib.h projects/runtime-coverage-v2/sys/ufs/ffs/ffs_inode.c projects/runtime-coverage-v2/sys/ufs/ffs/ffs_softdep.c projects/runtime-coverage-v2/sys/ufs/ufs/ufs_quota.c projects/runtime-coverage-v2/sys/ufs/ufs/ufs_vnops.c projects/runtime-coverage-v2/sys/vm/swap_pager.c projects/runtime-coverage-v2/sys/vm/vm_map.c projects/runtime-coverage-v2/sys/vm/vm_page.c projects/runtime-coverage-v2/sys/vm/vm_page.h projects/runtime-coverage-v2/targets/pseudo/userland/lib/Makefile.depend projects/runtime-coverage-v2/tests/sys/kern/ptrace_test.c projects/runtime-coverage-v2/tests/sys/netpfil/pf/forward.sh projects/runtime-coverage-v2/tests/sys/netpfil/pf/set_tos.sh projects/runtime-coverage-v2/tools/build/Makefile projects/runtime-coverage-v2/usr.bin/bluetooth/bthost/Makefile projects/runtime-coverage-v2/usr.bin/bluetooth/btsockstat/Makefile projects/runtime-coverage-v2/usr.bin/bluetooth/rfcomm_sppd/Makefile projects/runtime-coverage-v2/usr.bin/bsdiff/bspatch/bspatch.c projects/runtime-coverage-v2/usr.bin/bzip2recover/Makefile projects/runtime-coverage-v2/usr.bin/dpv/Makefile projects/runtime-coverage-v2/usr.bin/login/Makefile projects/runtime-coverage-v2/usr.bin/login/login.1 projects/runtime-coverage-v2/usr.bin/login/login.conf projects/runtime-coverage-v2/usr.bin/login/pathnames.h projects/runtime-coverage-v2/usr.bin/netstat/inet6.c projects/runtime-coverage-v2/usr.bin/nfsstat/nfsstat.c projects/runtime-coverage-v2/usr.bin/printf/printf.1 projects/runtime-coverage-v2/usr.bin/readelf/Makefile projects/runtime-coverage-v2/usr.bin/size/Makefile projects/runtime-coverage-v2/usr.bin/vi/Makefile projects/runtime-coverage-v2/usr.sbin/bhyve/pci_hda.c projects/runtime-coverage-v2/usr.sbin/bhyve/pci_xhci.c (contents, props changed) projects/runtime-coverage-v2/usr.sbin/bluetooth/ath3kfw/Makefile projects/runtime-coverage-v2/usr.sbin/bluetooth/bcmfw/Makefile projects/runtime-coverage-v2/usr.sbin/bluetooth/bluetooth-config/Makefile projects/runtime-coverage-v2/usr.sbin/bluetooth/bt3cfw/Makefile projects/runtime-coverage-v2/usr.sbin/bluetooth/bthidcontrol/Makefile projects/runtime-coverage-v2/usr.sbin/bluetooth/bthidd/Makefile projects/runtime-coverage-v2/usr.sbin/bluetooth/btpand/Makefile projects/runtime-coverage-v2/usr.sbin/bluetooth/hccontrol/Makefile projects/runtime-coverage-v2/usr.sbin/bluetooth/hcsecd/Makefile projects/runtime-coverage-v2/usr.sbin/bluetooth/hcseriald/Makefile projects/runtime-coverage-v2/usr.sbin/bluetooth/l2control/Makefile projects/runtime-coverage-v2/usr.sbin/bluetooth/l2ping/Makefile projects/runtime-coverage-v2/usr.sbin/bluetooth/rfcomm_pppd/Makefile projects/runtime-coverage-v2/usr.sbin/bluetooth/sdpcontrol/Makefile projects/runtime-coverage-v2/usr.sbin/bluetooth/sdpd/Makefile projects/runtime-coverage-v2/usr.sbin/crunch/crunchgen/crunchgen.1 projects/runtime-coverage-v2/usr.sbin/ctladm/ctladm.8 projects/runtime-coverage-v2/usr.sbin/mld6query/Makefile projects/runtime-coverage-v2/usr.sbin/mld6query/mld6.c projects/runtime-coverage-v2/usr.sbin/mptutil/mptutil.c projects/runtime-coverage-v2/usr.sbin/pciconf/cap.c projects/runtime-coverage-v2/usr.sbin/traceroute6/Makefile projects/runtime-coverage-v2/usr.sbin/traceroute6/traceroute6.c projects/runtime-coverage-v2/usr.sbin/wpa/hostapd/Makefile projects/runtime-coverage-v2/usr.sbin/wpa/hostapd_cli/Makefile projects/runtime-coverage-v2/usr.sbin/wpa/wpa_cli/Makefile projects/runtime-coverage-v2/usr.sbin/wpa/wpa_passphrase/Makefile projects/runtime-coverage-v2/usr.sbin/wpa/wpa_priv/Makefile projects/runtime-coverage-v2/usr.sbin/wpa/wpa_supplicant/Makefile Directory Properties: projects/runtime-coverage-v2/ (props changed) projects/runtime-coverage-v2/cddl/ (props changed) projects/runtime-coverage-v2/cddl/contrib/opensolaris/ (props changed) projects/runtime-coverage-v2/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/runtime-coverage-v2/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/runtime-coverage-v2/contrib/binutils/ (props changed) projects/runtime-coverage-v2/contrib/compiler-rt/ (props changed) projects/runtime-coverage-v2/contrib/elftoolchain/ (props changed) projects/runtime-coverage-v2/contrib/libc++/ (props changed) projects/runtime-coverage-v2/contrib/libcxxrt/ (props changed) projects/runtime-coverage-v2/contrib/libcxxrt/abi_namespace.h (props changed) projects/runtime-coverage-v2/contrib/libcxxrt/auxhelper.cc (props changed) projects/runtime-coverage-v2/contrib/libcxxrt/cxxabi.h (props changed) projects/runtime-coverage-v2/contrib/libcxxrt/dwarf_eh.h (props changed) projects/runtime-coverage-v2/contrib/libcxxrt/dynamic_cast.cc (props changed) projects/runtime-coverage-v2/contrib/libcxxrt/guard.cc (props changed) projects/runtime-coverage-v2/contrib/libcxxrt/libelftc_dem_gnu3.c (props changed) projects/runtime-coverage-v2/contrib/libcxxrt/stdexcept.cc (props changed) projects/runtime-coverage-v2/contrib/libcxxrt/stdexcept.h (props changed) projects/runtime-coverage-v2/contrib/libcxxrt/terminate.cc (props changed) projects/runtime-coverage-v2/contrib/libcxxrt/typeinfo.cc (props changed) projects/runtime-coverage-v2/contrib/libcxxrt/typeinfo.h (props changed) projects/runtime-coverage-v2/contrib/libunwind/ (props changed) projects/runtime-coverage-v2/contrib/llvm/ (props changed) projects/runtime-coverage-v2/contrib/llvm/tools/clang/ (props changed) projects/runtime-coverage-v2/contrib/llvm/tools/lld/ (props changed) projects/runtime-coverage-v2/contrib/llvm/tools/lldb/ (props changed) projects/runtime-coverage-v2/contrib/mandoc/ (props changed) projects/runtime-coverage-v2/contrib/netbsd-tests/ (props changed) projects/runtime-coverage-v2/contrib/openmp/ (props changed) projects/runtime-coverage-v2/gnu/usr.bin/binutils/ (props changed) projects/runtime-coverage-v2/sys/cddl/contrib/opensolaris/ (props changed) projects/runtime-coverage-v2/sys/contrib/dev/acpica/ (props changed) projects/runtime-coverage-v2/sys/contrib/ipfilter/ (props changed) projects/runtime-coverage-v2/sys/contrib/zlib/ (props changed) Modified: projects/runtime-coverage-v2/.cirrus.yml ============================================================================== --- projects/runtime-coverage-v2/.cirrus.yml Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/.cirrus.yml Sat Aug 3 22:41:29 2019 (r350564) @@ -11,9 +11,8 @@ env: task: timeout_in: 90m install_script: - - pkg install -y qemu-devel - - fetch https://people.freebsd.org/~emaste/OVMF.fd + - pkg install -y qemu-devel uefi-edk2-qemu-x86_64 script: - make -j$(sysctl -n hw.ncpu) WITHOUT_TOOLCHAIN=yes buildworld buildkernel test_script: - - OVMF=$(pwd)/OVMF.fd sh tools/boot/ci-qemu-test.sh + - sh tools/boot/ci-qemu-test.sh Modified: projects/runtime-coverage-v2/Makefile ============================================================================== --- projects/runtime-coverage-v2/Makefile Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/Makefile Sat Aug 3 22:41:29 2019 (r350564) @@ -138,7 +138,7 @@ TGTS= all all-man buildenv buildenvvars buildkernel bu build32 distribute32 install32 buildsoft distributesoft installsoft \ builddtb xdev xdev-build xdev-install \ xdev-links native-xtools native-xtools-install stageworld stagekernel \ - stage-packages \ + stage-packages stage-packages-kernel stage-packages-world \ create-packages-world create-packages-kernel create-packages \ packages installconfig real-packages sign-packages package-pkg \ print-dir test-system-compiler test-system-linker Modified: projects/runtime-coverage-v2/ObsoleteFiles.inc ============================================================================== --- projects/runtime-coverage-v2/ObsoleteFiles.inc Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/ObsoleteFiles.inc Sat Aug 3 22:41:29 2019 (r350564) @@ -38,6 +38,11 @@ # xargs -n1 | sort | uniq -d; # done +# 20190722: cap_random(3) removed +OLD_FILES+=lib/casper/libcap_random.so.1 +OLD_FILES+=usr/include/casper/cap_random.h +OLD_FILES+=usr/share/man/man3/cap_random.3.gz +OLD_FILES+=usr/share/man/man3/cap_random_buf.3.gz # 20190708: vm_page_hold() and _unhold() removed OLD_FILES+=usr/share/man/man9/vm_page_hold.9.gz # 20190618: sys/capability.h removed (sys/capsicum.h is the one to use) Modified: projects/runtime-coverage-v2/RELNOTES ============================================================================== --- projects/runtime-coverage-v2/RELNOTES Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/RELNOTES Sat Aug 3 22:41:29 2019 (r350564) @@ -10,6 +10,17 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +r350471: + gnop(8) can now configure a delay to be applied to read and write + request delays. See the -d, -q and -x parameters. + +r350315, r350316: + Adds a Linux compatible copy_file_range(2) syscall. + +r350307: + libcap_random(3) has been removed. Applications can use native + APIs to get random data in capability mode. + r349352: nand(4) and related components have been removed. Modified: projects/runtime-coverage-v2/UPDATING ============================================================================== --- projects/runtime-coverage-v2/UPDATING Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/UPDATING Sat Aug 3 22:41:29 2019 (r350564) @@ -27,12 +27,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: "ln -s 'abort:false,junk:false' /etc/malloc.conf".) 20190713: - Default permissions on the /var/account/acct file (and copies of it rotated - by periodic daily scripts) are changed from 0644 to 0640 because the file - contains sensitive information that should not be world-readable. If the - /var/account directory must be created by rc.d/accounting, the mode used is - now 0750. Admins who use the accounting feature are encouraged to change - the mode of an existing /var/account directory to 0750 or 0700. + Default permissions on the /var/account/acct file (and copies of it + rotated by periodic daily scripts) are changed from 0644 to 0640 + because the file contains sensitive information that should not be + world-readable. If the /var/account directory must be created by + rc.d/accounting, the mode used is now 0750. Admins who use the + accounting feature are encouraged to change the mode of an existing + /var/account directory to 0750 or 0700. 20190620: Entropy collection and the /dev/random device are no longer optional Modified: projects/runtime-coverage-v2/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/runtime-coverage-v2/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sat Aug 3 22:41:29 2019 (r350564) @@ -1501,7 +1501,9 @@ command, or by changing the value of the .Sy refreservation property, or .Sy reservation -property on pool version 8 or earlier +property on pool +.Po +version 8 or earlier .Pc after the volume has been created. A "sparse volume" is a volume where the value of Modified: projects/runtime-coverage-v2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c ============================================================================== --- projects/runtime-coverage-v2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Sat Aug 3 22:41:29 2019 (r350564) @@ -1281,12 +1281,14 @@ mountpoint_cmp(const void *arga, const void *argb) } /* - * Reutrn true if path2 is a child of path1 + * Return true if path2 is a child of path1 or path2 equals path1 or + * path1 is "/" (path2 is always a child of "/"). */ static boolean_t libzfs_path_contains(const char *path1, const char *path2) { - return (strstr(path2, path1) == path2 && path2[strlen(path1)] == '/'); + return (strcmp(path1, path2) == 0 || strcmp(path1, "/") == 0 || + (strstr(path2, path1) == path2 && path2[strlen(path1)] == '/')); } Modified: projects/runtime-coverage-v2/contrib/binutils/binutils/doc/binutils.texi ============================================================================== --- projects/runtime-coverage-v2/contrib/binutils/binutils/doc/binutils.texi Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/binutils/binutils/doc/binutils.texi Sat Aug 3 22:41:29 2019 (r350564) @@ -1624,8 +1624,8 @@ program to compile and work. specify archives, @command{objdump} shows information on each of the member object files. -@command{objdump} will be removed from a future version of the -FreeBSD base system. Users who require @command{objdump} are advised +GNU @command{objdump} will be removed from a future version of the +FreeBSD base system. Users who require GNU @command{objdump} are advised to install the binutils port or package. @c man end Modified: projects/runtime-coverage-v2/contrib/binutils/gas/doc/as.texinfo ============================================================================== --- projects/runtime-coverage-v2/contrib/binutils/gas/doc/as.texinfo Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/binutils/gas/doc/as.texinfo Sat Aug 3 22:41:29 2019 (r350564) @@ -1295,6 +1295,9 @@ computer-readable series of instructions. Different v @section The GNU Assembler @c man begin DESCRIPTION +@sc{gnu} @command{as} will be removed from a future version of the +FreeBSD base system. Users who require +@sc{gnu} @command{as} are advised to install the binutils port or package. @sc{gnu} @command{as} is really a family of assemblers. @ifclear GENERIC Modified: projects/runtime-coverage-v2/contrib/elftoolchain/addr2line/addr2line.c ============================================================================== --- projects/runtime-coverage-v2/contrib/elftoolchain/addr2line/addr2line.c Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/elftoolchain/addr2line/addr2line.c Sat Aug 3 22:41:29 2019 (r350564) @@ -25,6 +25,8 @@ */ #include + +#include #include #include #include @@ -649,6 +651,7 @@ find_section_base(const char *exe, Elf *e, const char int main(int argc, char **argv) { + cap_rights_t rights; Elf *e; Dwarf_Debug dbg; Dwarf_Error de; @@ -705,6 +708,16 @@ main(int argc, char **argv) if ((fd = open(exe, O_RDONLY)) < 0) err(EXIT_FAILURE, "%s", exe); + + if (caph_rights_limit(fd, cap_rights_init(&rights, CAP_FSTAT, + CAP_MMAP_R)) < 0) + errx(EXIT_FAILURE, "caph_rights_limit"); + + caph_cache_catpages(); + if (caph_limit_stdio() < 0) + errx(EXIT_FAILURE, "failed to limit stdio rights"); + if (caph_enter() < 0) + errx(EXIT_FAILURE, "failed to enter capability mode"); if (dwarf_init(fd, DW_DLC_READ, NULL, NULL, &dbg, &de)) errx(EXIT_FAILURE, "dwarf_init: %s", dwarf_errmsg(de)); Modified: projects/runtime-coverage-v2/contrib/elftoolchain/elfcopy/main.c ============================================================================== --- projects/runtime-coverage-v2/contrib/elftoolchain/elfcopy/main.c Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/elftoolchain/elfcopy/main.c Sat Aug 3 22:41:29 2019 (r350564) @@ -1187,6 +1187,12 @@ strip_main(struct elfcopy *ecp, int argc, char **argv) ecp->strip = STRIP_ALL; if (optind == argc) strip_usage(); + /* + * Only accept a single input file if an output file had been + * specified. + */ + if (outfile != NULL && argc != (optind + 1)) + strip_usage(); for (i = optind; i < argc; i++) create_file(ecp, argv[i], outfile); Modified: projects/runtime-coverage-v2/contrib/elftoolchain/elfcopy/strip.1 ============================================================================== --- projects/runtime-coverage-v2/contrib/elftoolchain/elfcopy/strip.1 Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/elftoolchain/elfcopy/strip.1 Sat Aug 3 22:41:29 2019 (r350564) @@ -23,7 +23,7 @@ .\" .\" $Id: strip.1 3642 2018-10-14 14:24:28Z jkoshy $ .\" -.Dd September 17, 2011 +.Dd July 27, 2019 .Dt STRIP 1 .Os .Sh NAME @@ -51,8 +51,16 @@ .Sh DESCRIPTION The .Nm -utility is used to discard information from ELF objects. +utility is used to discard information from the ELF objects +specified by the arguments +.Ar . .Pp +If an explicit output file name is not specified using the +.Fl o +option, the +.Nm +utility will modify its input arguments in-place. +.Pp The .Nm utility supports the following options: @@ -65,8 +73,9 @@ Print a help message and exit. Remove all content except that which would be used for debugging. .It Fl o Ar outputfile | Fl -output-file= Ns Ar outputfile Write the stripped object to file -.Ar outputfile . -The default behaviour is to modify objects in place. +.Ar outputfile +instead of modifying the input in-place. +Only a single input object should be specified if this option is used. .It Fl p | Fl -preserve-dates Preserve the object's access and modification times. .It Fl s | Fl -strip-all Modified: projects/runtime-coverage-v2/contrib/elftoolchain/readelf/readelf.c ============================================================================== --- projects/runtime-coverage-v2/contrib/elftoolchain/readelf/readelf.c Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/elftoolchain/readelf/readelf.c Sat Aug 3 22:41:29 2019 (r350564) @@ -26,8 +26,10 @@ #include #include + #include #include +#include #include #include #include @@ -45,6 +47,9 @@ #include #include +#include +#include + #include "_elftc.h" ELFTC_VCSID("$Id: readelf.c 3649 2018-11-24 03:26:23Z emaste $"); @@ -322,11 +327,13 @@ static void dump_mips_specific_info(struct readelf *re static void dump_notes(struct readelf *re); static void dump_notes_content(struct readelf *re, const char *buf, size_t sz, off_t off); -static void dump_notes_data(const char *name, uint32_t type, const char *buf, - size_t sz); +static void dump_notes_data(struct readelf *re, const char *name, + uint32_t type, const char *buf, size_t sz); static void dump_svr4_hash(struct section *s); static void dump_svr4_hash64(struct readelf *re, struct section *s); static void dump_gnu_hash(struct readelf *re, struct section *s); +static void dump_gnu_property_type_0(struct readelf *re, const char *buf, + size_t sz); static void dump_hash(struct readelf *re); static void dump_phdr(struct readelf *re); static void dump_ppc_attributes(uint8_t *p, uint8_t *pe); @@ -3517,7 +3524,63 @@ dump_gnu_hash(struct readelf *re, struct section *s) free(bl); } +static struct flag_desc gnu_property_x86_feature_1_and_bits[] = { + { GNU_PROPERTY_X86_FEATURE_1_IBT, "IBT" }, + { GNU_PROPERTY_X86_FEATURE_1_SHSTK, "SHSTK" }, + { 0, NULL } +}; + static void +dump_gnu_property_type_0(struct readelf *re, const char *buf, size_t sz) +{ + size_t i; + uint32_t type, prop_sz; + + printf(" Properties: "); + while (sz > 0) { + if (sz < 8) + goto bad; + + type = *(const uint32_t *)(const void *)buf; + prop_sz = *(const uint32_t *)(const void *)(buf + 4); + buf += 8; + sz -= 8; + + if (prop_sz > sz) + goto bad; + + if (type >= GNU_PROPERTY_LOPROC && + type <= GNU_PROPERTY_HIPROC) { + if (re->ehdr.e_machine != EM_X86_64) { + printf("machine type %x unknown\n", + re->ehdr.e_machine); + goto unknown; + } + switch (type) { + case GNU_PROPERTY_X86_FEATURE_1_AND: + printf("x86 features:"); + if (prop_sz != 4) + goto bad; + dump_flags(gnu_property_x86_feature_1_and_bits, + *(const uint32_t *)(const void *)buf); + break; + } + } + + buf += roundup2(prop_sz, 8); + sz -= roundup2(prop_sz, 8); + } + return; +bad: + printf("corrupt GNU property\n"); +unknown: + printf("remaining description data:"); + for (i = 0; i < sz; i++) + printf(" %02x", (unsigned char)buf[i]); + printf("\n"); +} + +static void dump_hash(struct readelf *re) { struct section *s; @@ -3608,7 +3671,8 @@ static struct flag_desc note_feature_ctl_flags[] = { }; static void -dump_notes_data(const char *name, uint32_t type, const char *buf, size_t sz) +dump_notes_data(struct readelf *re, const char *name, uint32_t type, + const char *buf, size_t sz) { size_t i; const uint32_t *ubuf; @@ -3640,6 +3704,12 @@ dump_notes_data(const char *name, uint32_t type, const dump_flags(note_feature_ctl_flags, ubuf[0]); return; } + } else if (strcmp(name, "GNU") == 0) { + switch (type) { + case NT_GNU_PROPERTY_TYPE_0: + dump_gnu_property_type_0(re, buf, sz); + return; + } } unknown: printf(" description data:"); @@ -3684,7 +3754,7 @@ dump_notes_content(struct readelf *re, const char *buf printf(" %-13s %#010jx", name, (uintmax_t) note->n_descsz); printf(" %s\n", note_type(name, re->ehdr.e_type, note->n_type)); - dump_notes_data(name, note->n_type, buf, note->n_descsz); + dump_notes_data(re, name, note->n_type, buf, note->n_descsz); buf += roundup2(note->n_descsz, 4); } } @@ -7149,15 +7219,8 @@ process_members: } static void -dump_object(struct readelf *re) +dump_object(struct readelf *re, int fd) { - int fd; - - if ((fd = open(re->filename, O_RDONLY)) == -1) { - warn("open %s failed", re->filename); - return; - } - if ((re->flags & DISPLAY_FILENAME) != 0) printf("\nFile: %s\n", re->filename); @@ -7524,9 +7587,11 @@ readelf_usage(int status) int main(int argc, char **argv) { + cap_rights_t rights; + fileargs_t *fa; struct readelf *re, re_storage; unsigned long si; - int opt, i; + int fd, opt, i; char *ep; re = &re_storage; @@ -7649,9 +7714,28 @@ main(int argc, char **argv) errx(EXIT_FAILURE, "ELF library initialization failed: %s", elf_errmsg(-1)); + cap_rights_init(&rights, CAP_FCNTL, CAP_FSTAT, CAP_MMAP_R, CAP_SEEK); + fa = fileargs_init(argc, argv, O_RDONLY, 0, &rights, FA_OPEN); + if (fa == NULL) + err(1, "Unable to initialize casper fileargs"); + + caph_cache_catpages(); + if (caph_limit_stdio() < 0) { + fileargs_free(fa); + err(1, "Unable to limit stdio rights"); + } + if (caph_enter_casper() < 0) { + fileargs_free(fa); + err(1, "Unable to enter capability mode"); + } + for (i = 0; i < argc; i++) { re->filename = argv[i]; - dump_object(re); + fd = fileargs_open(fa, re->filename); + if (fd < 0) + warn("open %s failed", re->filename); + else + dump_object(re, fd); } exit(EXIT_SUCCESS); Modified: projects/runtime-coverage-v2/contrib/elftoolchain/size/size.c ============================================================================== --- projects/runtime-coverage-v2/contrib/elftoolchain/size/size.c Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/elftoolchain/size/size.c Sat Aug 3 22:41:29 2019 (r350564) @@ -25,6 +25,7 @@ */ #include +#include #include #include #include @@ -36,6 +37,9 @@ #include #include +#include +#include + #include "_elftc.h" ELFTC_VCSID("$Id: size.c 3458 2016-05-09 15:01:25Z emaste $"); @@ -46,7 +50,6 @@ ELFTC_VCSID("$Id: size.c 3458 2016-05-09 15:01:25Z ema enum return_code { RETURN_OK, - RETURN_NOINPUT, RETURN_DATAERR, RETURN_USAGE }; @@ -68,7 +71,6 @@ static int show_totals; static int size_option; static enum radix_style radix = RADIX_DECIMAL; static enum output_style style = STYLE_BERKELEY; -static const char *default_args[2] = { "a.out", NULL }; static struct { int row; @@ -97,7 +99,7 @@ static void berkeley_header(void); static void berkeley_totals(void); static int handle_core(char const *, Elf *elf, GElf_Ehdr *); static void handle_core_note(Elf *, GElf_Ehdr *, GElf_Phdr *, char **); -static int handle_elf(char const *); +static int handle_elf(int, char const *); static void handle_phdr(Elf *, GElf_Ehdr *, GElf_Phdr *, uint32_t, const char *); static void show_version(void); @@ -119,8 +121,11 @@ static void tbl_flush(void); int main(int argc, char **argv) { - int ch, r, rc; - const char **files, *fn; + cap_rights_t rights; + fileargs_t *fa; + int ch, fd, r, rc; + const char *fn; + char *defaultfn; rc = RETURN_OK; @@ -193,21 +198,45 @@ main(int argc, char **argv) argc -= optind; argv += optind; - files = (argc == 0) ? default_args : (void *) argv; + if (argc == 0) { + defaultfn = strdup("a.out"); + if (defaultfn == NULL) + err(EXIT_FAILURE, "strdup"); + argc = 1; + argv = &defaultfn; + } else { + defaultfn = NULL; + } - while ((fn = *files) != NULL) { - rc = handle_elf(fn); + cap_rights_init(&rights, CAP_FSTAT, CAP_MMAP_R); + fa = fileargs_init(argc, argv, O_RDONLY, 0, &rights, FA_OPEN); + if (fa == NULL) + err(EXIT_FAILURE, "failed to initialize fileargs"); + + caph_cache_catpages(); + if (caph_limit_stdio() < 0) + err(EXIT_FAILURE, "failed to limit stdio rights"); + if (caph_enter_casper() < 0) + err(EXIT_FAILURE, "failed to enter capability mode"); + + for (; argc > 0; argc--, argv++) { + fn = argv[0]; + fd = fileargs_open(fa, fn); + if (fd < 0) { + warn("%s: Failed to open", fn); + continue; + } + rc = handle_elf(fd, fn); if (rc != RETURN_OK) - warnx(rc == RETURN_NOINPUT ? - "'%s': No such file" : - "%s: File format not recognized", fn); - files++; + warnx("%s: File format not recognized", fn); } if (style == STYLE_BERKELEY) { if (show_totals) berkeley_totals(); tbl_flush(); } + fileargs_free(fa); + free(defaultfn); return (rc); } @@ -582,7 +611,7 @@ handle_core(char const *name, Elf *elf, GElf_Ehdr *elf * or the size of the text, data, bss sections will be printed out. */ static int -handle_elf(char const *name) +handle_elf(int fd, const char *name) { GElf_Ehdr elfhdr; GElf_Shdr shdr; @@ -590,13 +619,7 @@ handle_elf(char const *name) Elf_Arhdr *arhdr; Elf_Scn *scn; Elf_Cmd elf_cmd; - int exit_code, fd; - - if (name == NULL) - return (RETURN_NOINPUT); - - if ((fd = open(name, O_RDONLY, 0)) < 0) - return (RETURN_NOINPUT); + int exit_code; elf_cmd = ELF_C_READ; elf1 = elf_begin(fd, elf_cmd, NULL); Modified: projects/runtime-coverage-v2/contrib/libcxxrt/exception.cc ============================================================================== --- projects/runtime-coverage-v2/contrib/libcxxrt/exception.cc Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/libcxxrt/exception.cc Sat Aug 3 22:41:29 2019 (r350564) @@ -879,6 +879,13 @@ extern "C" void __cxa_rethrow() assert(ex->handlerCount > 0 && "Rethrowing uncaught exception!"); + // `globals->uncaughtExceptions` was decremented by `__cxa_begin_catch`. + // It's normally incremented by `throw_exception`, but this path invokes + // `_Unwind_Resume_or_Rethrow` directly to rethrow the exception. + // This path is only reachable if we're rethrowing a C++ exception - + // foreign exceptions don't adjust any of this state. + globals->uncaughtExceptions++; + // ex->handlerCount will be decremented in __cxa_end_catch in enclosing // catch block @@ -1224,11 +1231,13 @@ extern "C" void *__cxa_begin_catch(void *e) // we see is a foreign exception then we won't have called it yet. __cxa_thread_info *ti = thread_info(); __cxa_eh_globals *globals = &ti->globals; - globals->uncaughtExceptions--; _Unwind_Exception *exceptionObject = static_cast<_Unwind_Exception*>(e); if (isCXXException(exceptionObject->exception_class)) { + // Only exceptions thrown with a C++ exception throwing function will + // increment this, so don't decrement it here. + globals->uncaughtExceptions--; __cxa_exception *ex = exceptionFromPointer(exceptionObject); if (ex->handlerCount == 0) @@ -1365,6 +1374,14 @@ extern "C" std::type_info *__cxa_current_exception_typ } /** + * Cleanup, ensures that `__cxa_end_catch` is called to balance an explicit + * `__cxa_begin_catch` call. + */ +static void end_catch(char *) +{ + __cxa_end_catch(); +} +/** * ABI function, called when an exception specification is violated. * * This function does not return. @@ -1372,6 +1389,12 @@ extern "C" std::type_info *__cxa_current_exception_typ extern "C" void __cxa_call_unexpected(void*exception) { _Unwind_Exception *exceptionObject = static_cast<_Unwind_Exception*>(exception); + // Wrap the call to the unexpected handler in calls to `__cxa_begin_catch` + // and `__cxa_end_catch` so that we correctly update exception counts if + // the unexpected handler throws an exception. + __cxa_begin_catch(exceptionObject); + __attribute__((cleanup(end_catch))) + char unused; if (exceptionObject->exception_class == exception_class) { __cxa_exception *ex = exceptionFromPointer(exceptionObject); Modified: projects/runtime-coverage-v2/contrib/libcxxrt/memory.cc ============================================================================== --- projects/runtime-coverage-v2/contrib/libcxxrt/memory.cc Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/libcxxrt/memory.cc Sat Aug 3 22:41:29 2019 (r350564) @@ -151,4 +151,21 @@ void operator delete[](void * ptr) NOEXCEPT ::operator delete(ptr); } +// C++14 additional delete operators +#if __cplusplus >= 201402L + +__attribute__((weak)) +void operator delete(void * ptr, size_t) NOEXCEPT +{ + ::operator delete(ptr); +} + + +__attribute__((weak)) +void operator delete[](void * ptr, size_t) NOEXCEPT +{ + ::operator delete(ptr); +} + +#endif Modified: projects/runtime-coverage-v2/contrib/libunwind/src/assembly.h ============================================================================== --- projects/runtime-coverage-v2/contrib/libunwind/src/assembly.h Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/libunwind/src/assembly.h Sat Aug 3 22:41:29 2019 (r350564) @@ -117,7 +117,9 @@ .globl SYMBOL_NAME(name) SEPARATOR \ HIDDEN_SYMBOL(SYMBOL_NAME(name)) SEPARATOR \ SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR \ - SYMBOL_NAME(name): + PPC64_OPD1 \ + SYMBOL_NAME(name): \ + PPC64_OPD2 #if defined(__arm__) #if !defined(__ARM_ARCH) Modified: projects/runtime-coverage-v2/contrib/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp ============================================================================== --- projects/runtime-coverage-v2/contrib/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp Sat Aug 3 22:41:29 2019 (r350564) @@ -200,19 +200,27 @@ void LocalStackSlotPass::calculateFrameObjectOffsets(M // Make sure that the stack protector comes before the local variables on the // stack. SmallSet ProtectedObjs; - if (MFI.getStackProtectorIndex() >= 0) { + if (MFI.hasStackProtectorIndex()) { + int StackProtectorFI = MFI.getStackProtectorIndex(); + + // We need to make sure we didn't pre-allocate the stack protector when + // doing this. + // If we already have a stack protector, this will re-assign it to a slot + // that is **not** covering the protected objects. + assert(!MFI.isObjectPreAllocated(StackProtectorFI) && + "Stack protector pre-allocated in LocalStackSlotAllocation"); + StackObjSet LargeArrayObjs; StackObjSet SmallArrayObjs; StackObjSet AddrOfObjs; - AdjustStackOffset(MFI, MFI.getStackProtectorIndex(), Offset, - StackGrowsDown, MaxAlign); + AdjustStackOffset(MFI, StackProtectorFI, Offset, StackGrowsDown, MaxAlign); // Assign large stack objects first. for (unsigned i = 0, e = MFI.getObjectIndexEnd(); i != e; ++i) { if (MFI.isDeadObjectIndex(i)) continue; - if (MFI.getStackProtectorIndex() == (int)i) + if (StackProtectorFI == (int)i) continue; switch (MFI.getObjectSSPLayout(i)) { @@ -343,6 +351,14 @@ bool LocalStackSlotPass::insertFrameReferenceRegisters int FrameIdx = FR.getFrameIndex(); assert(MFI.isObjectPreAllocated(FrameIdx) && "Only pre-allocated locals expected!"); + + // We need to keep the references to the stack protector slot through frame + // index operands so that it gets resolved by PEI rather than this pass. + // This avoids accesses to the stack protector though virtual base + // registers, and forces PEI to address it using fp/sp/bp. + if (MFI.hasStackProtectorIndex() && + FrameIdx == MFI.getStackProtectorIndex()) + continue; LLVM_DEBUG(dbgs() << "Considering: " << MI); Modified: projects/runtime-coverage-v2/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp ============================================================================== --- projects/runtime-coverage-v2/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp Sat Aug 3 22:41:29 2019 (r350564) @@ -845,18 +845,26 @@ void PEI::calculateFrameObjectOffsets(MachineFunction // Make sure that the stack protector comes before the local variables on the // stack. SmallSet ProtectedObjs; - if (MFI.getStackProtectorIndex() >= 0) { + if (MFI.hasStackProtectorIndex()) { + int StackProtectorFI = MFI.getStackProtectorIndex(); StackObjSet LargeArrayObjs; StackObjSet SmallArrayObjs; StackObjSet AddrOfObjs; - AdjustStackOffset(MFI, MFI.getStackProtectorIndex(), StackGrowsDown, - Offset, MaxAlign, Skew); + // If we need a stack protector, we need to make sure that + // LocalStackSlotPass didn't already allocate a slot for it. + // If we are told to use the LocalStackAllocationBlock, the stack protector + // is expected to be already pre-allocated. + if (!MFI.getUseLocalStackAllocationBlock()) + AdjustStackOffset(MFI, StackProtectorFI, StackGrowsDown, Offset, MaxAlign, + Skew); + else if (!MFI.isObjectPreAllocated(MFI.getStackProtectorIndex())) + llvm_unreachable( + "Stack protector not pre-allocated by LocalStackSlotPass."); // Assign large stack objects first. for (unsigned i = 0, e = MFI.getObjectIndexEnd(); i != e; ++i) { - if (MFI.isObjectPreAllocated(i) && - MFI.getUseLocalStackAllocationBlock()) + if (MFI.isObjectPreAllocated(i) && MFI.getUseLocalStackAllocationBlock()) continue; if (i >= MinCSFrameIndex && i <= MaxCSFrameIndex) continue; @@ -864,8 +872,7 @@ void PEI::calculateFrameObjectOffsets(MachineFunction continue; if (MFI.isDeadObjectIndex(i)) continue; - if (MFI.getStackProtectorIndex() == (int)i || - EHRegNodeFrameIndex == (int)i) + if (StackProtectorFI == (int)i || EHRegNodeFrameIndex == (int)i) continue; switch (MFI.getObjectSSPLayout(i)) { @@ -884,6 +891,15 @@ void PEI::calculateFrameObjectOffsets(MachineFunction llvm_unreachable("Unexpected SSPLayoutKind."); } + // We expect **all** the protected stack objects to be pre-allocated by + // LocalStackSlotPass. If it turns out that PEI still has to allocate some + // of them, we may end up messing up the expected order of the objects. + if (MFI.getUseLocalStackAllocationBlock() && + !(LargeArrayObjs.empty() && SmallArrayObjs.empty() && + AddrOfObjs.empty())) + llvm_unreachable("Found protected stack objects not pre-allocated by " + "LocalStackSlotPass."); + AssignProtectedObjSet(LargeArrayObjs, ProtectedObjs, MFI, StackGrowsDown, Offset, MaxAlign, Skew); AssignProtectedObjSet(SmallArrayObjs, ProtectedObjs, MFI, StackGrowsDown, @@ -905,8 +921,7 @@ void PEI::calculateFrameObjectOffsets(MachineFunction continue; if (MFI.isDeadObjectIndex(i)) continue; - if (MFI.getStackProtectorIndex() == (int)i || - EHRegNodeFrameIndex == (int)i) + if (MFI.getStackProtectorIndex() == (int)i || EHRegNodeFrameIndex == (int)i) continue; if (ProtectedObjs.count(i)) continue; Modified: projects/runtime-coverage-v2/contrib/llvm/tools/clang/lib/Basic/Version.cpp ============================================================================== --- projects/runtime-coverage-v2/contrib/llvm/tools/clang/lib/Basic/Version.cpp Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/llvm/tools/clang/lib/Basic/Version.cpp Sat Aug 3 22:41:29 2019 (r350564) @@ -36,7 +36,7 @@ std::string getClangRepositoryPath() { // If the SVN_REPOSITORY is empty, try to use the SVN keyword. This helps us // pick up a tag in an SVN export, for example. - StringRef SVNRepository("$URL: https://llvm.org/svn/llvm-project/cfe/branches/release_80/lib/Basic/Version.cpp $"); + StringRef SVNRepository("$URL: https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_801/final/lib/Basic/Version.cpp $"); if (URL.empty()) { URL = SVNRepository.slice(SVNRepository.find(':'), SVNRepository.find("/lib/Basic")); Modified: projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Config.h ============================================================================== --- projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Config.h Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Config.h Sat Aug 3 22:41:29 2019 (r350564) @@ -191,7 +191,7 @@ struct Configuration { bool ZExecstack; bool ZGlobal; bool ZHazardplt; - bool ZIfuncnoplt; + bool ZIfuncNoplt; bool ZInitfirst; bool ZInterpose; bool ZKeepTextSectionPrefix; Modified: projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Driver.cpp ============================================================================== --- projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Driver.cpp Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Driver.cpp Sat Aug 3 22:41:29 2019 (r350564) @@ -299,6 +299,9 @@ static void checkOptions() { if (!Config->Relocatable && !Config->DefineCommon) error("-no-define-common not supported in non relocatable output"); + if (Config->ZText && Config->ZIfuncNoplt) + error("-z text and -z ifunc-noplt may not be used together"); + if (Config->Relocatable) { if (Config->Shared) error("-r and -shared may not be used together"); @@ -348,8 +351,7 @@ static bool getZFlag(opt::InputArgList &Args, StringRe static bool isKnownZFlag(StringRef S) { return S == "combreloc" || S == "copyreloc" || S == "defs" || S == "execstack" || S == "global" || S == "hazardplt" || - S == "ifunc-noplt" || - S == "initfirst" || S == "interpose" || + S == "ifunc-noplt" || S == "initfirst" || S == "interpose" || S == "keep-text-section-prefix" || S == "lazy" || S == "muldefs" || S == "nocombreloc" || S == "nocopyreloc" || S == "nodefaultlib" || S == "nodelete" || S == "nodlopen" || S == "noexecstack" || @@ -875,7 +877,7 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args Config->ZExecstack = getZFlag(Args, "execstack", "noexecstack", false); Config->ZGlobal = hasZOption(Args, "global"); Config->ZHazardplt = hasZOption(Args, "hazardplt"); - Config->ZIfuncnoplt = hasZOption(Args, "ifunc-noplt"); + Config->ZIfuncNoplt = hasZOption(Args, "ifunc-noplt"); Config->ZInitfirst = hasZOption(Args, "initfirst"); Config->ZInterpose = hasZOption(Args, "interpose"); Config->ZKeepTextSectionPrefix = getZFlag( Modified: projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/InputSection.cpp ============================================================================== --- projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/InputSection.cpp Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/InputSection.cpp Sat Aug 3 22:41:29 2019 (r350564) @@ -610,7 +610,6 @@ static uint64_t getRelocTargetVA(const InputFile *File case R_ARM_SBREL: return Sym.getVA(A) - getARMStaticBase(Sym); case R_GOT: - case R_GOT_PLT: case R_RELAX_TLS_GD_TO_IE_ABS: return Sym.getGotVA() + A; case R_GOTONLY_PC: @@ -629,7 +628,6 @@ static uint64_t getRelocTargetVA(const InputFile *File case R_RELAX_TLS_GD_TO_IE_GOT_OFF: return Sym.getGotOffset() + A; case R_AARCH64_GOT_PAGE_PC: - case R_AARCH64_GOT_PAGE_PC_PLT: case R_AARCH64_RELAX_TLS_GD_TO_IE_PAGE_PC: return getAArch64Page(Sym.getGotVA() + A) - getAArch64Page(P); case R_GOT_PC: @@ -677,10 +675,6 @@ static uint64_t getRelocTargetVA(const InputFile *File In.MipsGot->getGp(File); case R_AARCH64_PAGE_PC: { uint64_t Val = Sym.isUndefWeak() ? P + A : Sym.getVA(A); - return getAArch64Page(Val) - getAArch64Page(P); - } - case R_AARCH64_PLT_PAGE_PC: { - uint64_t Val = Sym.isUndefWeak() ? P + A : Sym.getPltVA() + A; return getAArch64Page(Val) - getAArch64Page(P); } case R_RISCV_PC_INDIRECT: { Modified: projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Relocations.cpp ============================================================================== --- projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Relocations.cpp Sat Aug 3 19:24:56 2019 (r350563) +++ projects/runtime-coverage-v2/contrib/llvm/tools/lld/ELF/Relocations.cpp Sat Aug 3 22:41:29 2019 (r350564) @@ -337,8 +337,7 @@ static bool isAbsoluteValue(const Symbol &Sym) { // Returns true if Expr refers a PLT entry. static bool needsPlt(RelExpr Expr) { - return isRelExprOneOf(Expr); + return isRelExprOneOf(Expr); } // Returns true if Expr refers a GOT entry. Note that this function @@ -347,8 +346,7 @@ static bool needsPlt(RelExpr Expr) { static bool needsGot(RelExpr Expr) { return isRelExprOneOf(Expr); + R_GOT_PC, R_GOT_FROM_END>(Expr); } // True if this expression is of the form Sym - X, where X is a position in the @@ -356,7 +354,7 @@ static bool needsGot(RelExpr Expr) { static bool isRelExpr(RelExpr Expr) { return isRelExprOneOf(Expr); + R_RELAX_GOT_PC>(Expr); } // Returns true if a given relocation can be computed at link-time. @@ -374,20 +372,16 @@ static bool isStaticLinkTimeConstant(RelExpr E, RelTyp if (isRelExprOneOf(E)) return true; - // The computation involves output from the ifunc resolver. - if (Sym.isGnuIFunc() && Config->ZIfuncnoplt) - return false; - // These never do, except if the entire file is position dependent or if // only the low bits are used. - if (E == R_GOT || E == R_GOT_PLT || E == R_PLT || E == R_TLSDESC) + if (E == R_GOT || E == R_PLT || E == R_TLSDESC) return Target->usesOnlyLowPageBits(Type) || !Config->Pic; if (Sym.IsPreemptible) @@ -433,14 +427,8 @@ static RelExpr toPlt(RelExpr Expr) { return R_PPC_CALL_PLT; case R_PC: return R_PLT_PC; - case R_AARCH64_PAGE_PC: - return R_AARCH64_PLT_PAGE_PC; - case R_AARCH64_GOT_PAGE_PC: - return R_AARCH64_GOT_PAGE_PC_PLT; case R_ABS: return R_PLT; - case R_GOT: - return R_GOT_PLT; default: return Expr; } @@ -772,14 +760,7 @@ static void addPltEntry(PltSection *Plt, GotPltSection template static void addGotEntry(Symbol &Sym) { In.Got->addEntry(Sym); - RelExpr Expr; - if (Sym.isTls()) - Expr = R_TLS; - else if (Sym.isGnuIFunc()) - Expr = R_PLT; - else - Expr = R_ABS; - + RelExpr Expr = Sym.isTls() ? R_TLS : R_ABS; uint64_t Off = Sym.getGotOffset(); // If a GOT slot value can be calculated at link-time, which is now, @@ -848,10 +829,6 @@ static void processRelocAux(InputSectionBase &Sec, Rel Sec.Relocations.push_back({Expr, Type, Offset, Addend, &Sym}); return; } - if (Sym.isGnuIFunc() && Config->ZIfuncnoplt) { - In.RelaDyn->addReloc(Type, &Sec, Offset, &Sym, Addend, R_ADDEND, Type); - return; - } bool CanWrite = (Sec.Flags & SHF_WRITE) || !Config->ZText; if (CanWrite) { // R_GOT refers to a position in the got, even if the symbol is preemptible. @@ -978,6 +955,15 @@ static void processRelocAux(InputSectionBase &Sec, Rel getLocation(Sec, Sym, Offset)); } +struct IRelativeReloc { + RelType Type; + InputSectionBase *Sec; + uint64_t Offset; + Symbol *Sym; +}; + +static std::vector IRelativeRelocs; + template static void scanReloc(InputSectionBase &Sec, OffsetGetter &GetOffset, RelTy *&I, RelTy *End) { @@ -1009,32 +995,29 @@ static void scanReloc(InputSectionBase &Sec, OffsetGet if (isRelExprOneOf(Expr)) return; - // Strenghten or relax relocations. + if (Sym.isGnuIFunc() && !Config->ZText && Config->WarnIfuncTextrel) { + warn("using ifunc symbols when text relocations are allowed may produce " + "a binary that will segfault, if the object file is linked with " + "old version of glibc (glibc 2.28 and earlier). If this applies to " + "you, consider recompiling the object files without -fPIC and " + "without -Wl,-z,notext option. Use -no-warn-ifunc-textrel to " + "turn off this warning." + + getLocation(Sec, Sym, Offset)); + } + + // Relax relocations. // - // GNU ifunc symbols must be accessed via PLT because their addresses - // are determined by runtime. - // - // On the other hand, if we know that a PLT entry will be resolved within - // the same ELF module, we can skip PLT access and directly jump to the - // destination function. For example, if we are linking a main exectuable, - // all dynamic symbols that can be resolved within the executable will - // actually be resolved that way at runtime, because the main exectuable - // is always at the beginning of a search list. We can leverage that fact. - if (Sym.isGnuIFunc() && !Config->ZIfuncnoplt) { - if (!Config->ZText && Config->WarnIfuncTextrel) { - warn("using ifunc symbols when text relocations are allowed may produce " *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***