From owner-svn-src-user@freebsd.org Tue May 23 04:10:39 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CE6D0D798A9 for ; Tue, 23 May 2017 04:10:39 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 89EC010D6; Tue, 23 May 2017 04:10:39 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4N4AcT9081910; Tue, 23 May 2017 04:10:38 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4N4AaeL081886; Tue, 23 May 2017 04:10:36 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201705230410.v4N4AaeL081886@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 23 May 2017 04:10:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318691 - in user/markj/PQ_LAUNDRY_11: . contrib/libstdc++/config/abi/pre etc etc/autofs gnu/usr.bin/groff/tmac lib lib/clang lib/libefi lib/libefivar libexec/rtld-elf release/doc/en_US... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 May 2017 04:10:39 -0000 Author: markj Date: Tue May 23 04:10:36 2017 New Revision: 318691 URL: https://svnweb.freebsd.org/changeset/base/318691 Log: Merge from stable/11 at r318690. Added: user/markj/PQ_LAUNDRY_11/lib/libefivar/ - copied from r318690, stable/11/lib/libefivar/ user/markj/PQ_LAUNDRY_11/share/man/man5/cd9660.5 - copied unchanged from r318690, stable/11/share/man/man5/cd9660.5 user/markj/PQ_LAUNDRY_11/sys/boot/efi/include/efichar.h - copied unchanged from r318690, stable/11/sys/boot/efi/include/efichar.h user/markj/PQ_LAUNDRY_11/sys/boot/efi/libefi/efichar.c - copied unchanged from r318690, stable/11/sys/boot/efi/libefi/efichar.c user/markj/PQ_LAUNDRY_11/sys/contrib/edk2/ - copied from r318690, stable/11/sys/contrib/edk2/ user/markj/PQ_LAUNDRY_11/sys/dev/efidev/ - copied from r318690, stable/11/sys/dev/efidev/ user/markj/PQ_LAUNDRY_11/sys/i386/include/efi.h - copied unchanged from r318690, stable/11/sys/i386/include/efi.h user/markj/PQ_LAUNDRY_11/sys/mips/include/efi.h - copied unchanged from r318690, stable/11/sys/mips/include/efi.h user/markj/PQ_LAUNDRY_11/sys/pc98/include/efi.h - copied unchanged from r318690, stable/11/sys/pc98/include/efi.h user/markj/PQ_LAUNDRY_11/sys/powerpc/include/efi.h - copied unchanged from r318690, stable/11/sys/powerpc/include/efi.h user/markj/PQ_LAUNDRY_11/sys/riscv/include/efi.h - copied unchanged from r318690, stable/11/sys/riscv/include/efi.h user/markj/PQ_LAUNDRY_11/sys/sparc64/include/efi.h - copied unchanged from r318690, stable/11/sys/sparc64/include/efi.h user/markj/PQ_LAUNDRY_11/sys/sys/efiio.h - copied unchanged from r318690, stable/11/sys/sys/efiio.h user/markj/PQ_LAUNDRY_11/tools/build/options/WITHOUT_EFI - copied unchanged from r318690, stable/11/tools/build/options/WITHOUT_EFI user/markj/PQ_LAUNDRY_11/tools/build/options/WITH_EFI - copied unchanged from r318690, stable/11/tools/build/options/WITH_EFI user/markj/PQ_LAUNDRY_11/usr.sbin/efidp/ - copied from r318690, stable/11/usr.sbin/efidp/ user/markj/PQ_LAUNDRY_11/usr.sbin/efivar/ - copied from r318690, stable/11/usr.sbin/efivar/ Deleted: user/markj/PQ_LAUNDRY_11/lib/libefi/ Modified: user/markj/PQ_LAUNDRY_11/Makefile.inc1 user/markj/PQ_LAUNDRY_11/contrib/libstdc++/config/abi/pre/gnu.ver user/markj/PQ_LAUNDRY_11/etc/autofs/special_media user/markj/PQ_LAUNDRY_11/etc/rc user/markj/PQ_LAUNDRY_11/gnu/usr.bin/groff/tmac/mdoc.local.in user/markj/PQ_LAUNDRY_11/lib/Makefile user/markj/PQ_LAUNDRY_11/lib/clang/llvm.build.mk user/markj/PQ_LAUNDRY_11/libexec/rtld-elf/rtld.c user/markj/PQ_LAUNDRY_11/release/doc/en_US.ISO8859-1/relnotes/article.xml user/markj/PQ_LAUNDRY_11/sbin/dhclient/dhclient.c user/markj/PQ_LAUNDRY_11/sbin/dhclient/options.c user/markj/PQ_LAUNDRY_11/sbin/kldconfig/kldconfig.8 user/markj/PQ_LAUNDRY_11/sbin/kldload/kldload.8 user/markj/PQ_LAUNDRY_11/sbin/mount/mount.8 user/markj/PQ_LAUNDRY_11/sbin/mount_cd9660/mount_cd9660.8 user/markj/PQ_LAUNDRY_11/sbin/mount_nfs/mount_nfs.c user/markj/PQ_LAUNDRY_11/share/man/man3/intro.3 user/markj/PQ_LAUNDRY_11/share/man/man4/geom.4 user/markj/PQ_LAUNDRY_11/share/man/man4/u3g.4 user/markj/PQ_LAUNDRY_11/share/man/man4/uark.4 user/markj/PQ_LAUNDRY_11/share/man/man4/uart.4 user/markj/PQ_LAUNDRY_11/share/man/man4/ubsa.4 user/markj/PQ_LAUNDRY_11/share/man/man4/ubser.4 user/markj/PQ_LAUNDRY_11/share/man/man4/uchcom.4 user/markj/PQ_LAUNDRY_11/share/man/man4/ucom.4 user/markj/PQ_LAUNDRY_11/share/man/man4/ucycom.4 user/markj/PQ_LAUNDRY_11/share/man/man4/uftdi.4 user/markj/PQ_LAUNDRY_11/share/man/man4/uipaq.4 user/markj/PQ_LAUNDRY_11/share/man/man4/umcs.4 user/markj/PQ_LAUNDRY_11/share/man/man4/umct.4 user/markj/PQ_LAUNDRY_11/share/man/man4/umodem.4 user/markj/PQ_LAUNDRY_11/share/man/man4/umoscom.4 user/markj/PQ_LAUNDRY_11/share/man/man4/uplcom.4 user/markj/PQ_LAUNDRY_11/share/man/man4/usb.4 user/markj/PQ_LAUNDRY_11/share/man/man4/uslcom.4 user/markj/PQ_LAUNDRY_11/share/man/man4/uvisor.4 user/markj/PQ_LAUNDRY_11/share/man/man4/uvscom.4 user/markj/PQ_LAUNDRY_11/share/man/man5/Makefile user/markj/PQ_LAUNDRY_11/share/man/man5/src.conf.5 user/markj/PQ_LAUNDRY_11/share/mk/bsd.init.mk user/markj/PQ_LAUNDRY_11/share/mk/bsd.libnames.mk user/markj/PQ_LAUNDRY_11/share/mk/src.libnames.mk user/markj/PQ_LAUNDRY_11/share/mk/src.opts.mk user/markj/PQ_LAUNDRY_11/sys/amd64/amd64/efirt.c user/markj/PQ_LAUNDRY_11/sys/amd64/amd64/pmap.c user/markj/PQ_LAUNDRY_11/sys/arm/include/efi.h user/markj/PQ_LAUNDRY_11/sys/arm/include/vmparam.h user/markj/PQ_LAUNDRY_11/sys/arm64/include/efi.h user/markj/PQ_LAUNDRY_11/sys/boot/efi/boot1/boot1.c user/markj/PQ_LAUNDRY_11/sys/boot/efi/boot1/boot_module.h user/markj/PQ_LAUNDRY_11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/markj/PQ_LAUNDRY_11/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c user/markj/PQ_LAUNDRY_11/sys/cddl/dev/fbt/powerpc/fbt_isa.c user/markj/PQ_LAUNDRY_11/sys/conf/files user/markj/PQ_LAUNDRY_11/sys/conf/newvers.sh user/markj/PQ_LAUNDRY_11/sys/dev/atkbdc/psm.c user/markj/PQ_LAUNDRY_11/sys/dev/mmc/bridge.h user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmc.c user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmcbr_if.m user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmcbrvar.h user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmcreg.h user/markj/PQ_LAUNDRY_11/sys/dev/qlnx/qlnxe/qlnx_def.h user/markj/PQ_LAUNDRY_11/sys/dev/qlnx/qlnxe/qlnx_ioctl.c user/markj/PQ_LAUNDRY_11/sys/dev/qlnx/qlnxe/qlnx_os.c user/markj/PQ_LAUNDRY_11/sys/dev/qlnx/qlnxe/qlnx_os.h user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci.c user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci.h user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci_acpi.c user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci_if.m user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci_pci.c user/markj/PQ_LAUNDRY_11/sys/dev/usb/controller/xhci_pci.c user/markj/PQ_LAUNDRY_11/sys/dev/vt/vt_core.c user/markj/PQ_LAUNDRY_11/sys/fs/nfsclient/nfs_clcomsubs.c user/markj/PQ_LAUNDRY_11/sys/kern/kern_sig.c user/markj/PQ_LAUNDRY_11/sys/kern/vfs_bio.c user/markj/PQ_LAUNDRY_11/sys/libkern/crc32.c user/markj/PQ_LAUNDRY_11/sys/modules/efirt/Makefile user/markj/PQ_LAUNDRY_11/sys/modules/qlnx/qlnxe/Makefile user/markj/PQ_LAUNDRY_11/sys/net/ethernet.h user/markj/PQ_LAUNDRY_11/sys/net/if_var.h user/markj/PQ_LAUNDRY_11/sys/netinet/libalias/alias.c user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/en_netdev.c user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/eq.c user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/fw.c user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/fw.h user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/main.c user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/mlx4_en.h user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/profile.c user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/qp.c user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/resource_tracker.c user/markj/PQ_LAUNDRY_11/sys/ofed/include/linux/mlx4/device.h user/markj/PQ_LAUNDRY_11/sys/powerpc/booke/trap_subr.S user/markj/PQ_LAUNDRY_11/sys/powerpc/include/trap.h user/markj/PQ_LAUNDRY_11/sys/rpc/clnt_vc.c user/markj/PQ_LAUNDRY_11/sys/sys/proc.h user/markj/PQ_LAUNDRY_11/tools/build/options/makeman user/markj/PQ_LAUNDRY_11/usr.bin/grep/grep.1 user/markj/PQ_LAUNDRY_11/usr.bin/sort/sort.1.in user/markj/PQ_LAUNDRY_11/usr.bin/tip/tip/cu.1 user/markj/PQ_LAUNDRY_11/usr.bin/which/which.c user/markj/PQ_LAUNDRY_11/usr.sbin/Makefile user/markj/PQ_LAUNDRY_11/usr.sbin/fstyp/fstyp.8 user/markj/PQ_LAUNDRY_11/usr.sbin/fstyp/fstyp.c user/markj/PQ_LAUNDRY_11/usr.sbin/rmt/Makefile user/markj/PQ_LAUNDRY_11/usr.sbin/rpcbind/rpcbind.c Directory Properties: user/markj/PQ_LAUNDRY_11/ (props changed) Modified: user/markj/PQ_LAUNDRY_11/Makefile.inc1 ============================================================================== --- user/markj/PQ_LAUNDRY_11/Makefile.inc1 Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/Makefile.inc1 Tue May 23 04:10:36 2017 (r318691) @@ -596,7 +596,7 @@ XCXXFLAGS+= -isystem ${WORLDTMP}/usr/inc .endif .else TARGET_ABI?= unknown -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.1 XCFLAGS+= -target ${TARGET_TRIPLE} .endif XCFLAGS+= --sysroot=${WORLDTMP} Modified: user/markj/PQ_LAUNDRY_11/contrib/libstdc++/config/abi/pre/gnu.ver ============================================================================== --- user/markj/PQ_LAUNDRY_11/contrib/libstdc++/config/abi/pre/gnu.ver Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/contrib/libstdc++/config/abi/pre/gnu.ver Tue May 23 04:10:36 2017 (r318691) @@ -121,7 +121,7 @@ GLIBCXX_3.4 { std::__moneypunct_cache*; std::__numpunct_cache*; std::__timepunct_cache*; - __gnu_debug::_Error_formatter* + __gnu_debug::_Error_formatter*; }; # Names not in an 'extern' block are mangled names. @@ -604,34 +604,6 @@ GLIBCXX_3.4.4 { } GLIBCXX_3.4.3; GLIBCXX_3.4.5 { - - # std::string - _ZNKSs11_M_disjunctEPKc; - _ZNKSs15_M_check_lengthE[jm][jm]PKc; - _ZNSs4_Rep26_M_set_length_and_sharableE*; - _ZNSs7_M_copyEPcPKc[jm]; - _ZNSs7_M_moveEPcPKc[jm]; - _ZNSs9_M_assignEPc[jm]c; - - # std::wstring - _ZNKSbIwSt11char_traitsIwESaIwEE11_M_disjunctEPKw; - _ZNKSbIwSt11char_traitsIwESaIwEE15_M_check_lengthE[jm][jm]PKc; - _ZNSbIwSt11char_traitsIwESaIwEE4_Rep26_M_set_length_and_sharableE*; - _ZNSbIwSt11char_traitsIwESaIwEE7_M_copyEPwPKw[jm]; - _ZNSbIwSt11char_traitsIwESaIwEE7_M_moveEPwPKw[jm]; - _ZNSbIwSt11char_traitsIwESaIwEE9_M_assignEPw[jm]w; - - _ZNKSt13basic_fstreamI[cw]St11char_traitsI[cw]EE7is_openEv; - _ZNKSt14basic_ifstreamI[cw]St11char_traitsI[cw]EE7is_openEv; - _ZNKSt14basic_ofstreamI[cw]St11char_traitsI[cw]EE7is_openEv; - - _ZNSi6ignoreE[ilv]; - _ZNSt13basic_istreamIwSt11char_traitsIwEE6ignoreE[ilv]; - - _ZNSt11char_traitsI[cw]E2eqERK[cw]S2_; - - _ZNSt19istreambuf_iteratorI[cw]St11char_traitsI[cw]EEppEv; - } GLIBCXX_3.4.4; GLIBCXX_3.4.6 { @@ -643,8 +615,6 @@ GLIBCXX_3.4.6 { _ZNSt15basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE9showmanycEv; - _ZNKSt15basic_stringbufIwSt11char_traitsIwESaIwEE3strEv; - _ZN9__gnu_cxx6__poolILb1EE13_M_initializeEv; } GLIBCXX_3.4.5; Modified: user/markj/PQ_LAUNDRY_11/etc/autofs/special_media ============================================================================== --- user/markj/PQ_LAUNDRY_11/etc/autofs/special_media Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/etc/autofs/special_media Tue May 23 04:10:36 2017 (r318691) @@ -39,6 +39,15 @@ print_map_entry() { _p="$2" case "${_fstype}" in + "exfat") + if [ -f "/usr/local/sbin/mount.exfat" ]; then + echo "-mountprog=/usr/local/sbin/mount.exfat,fstype=${_fstype},nosuid :/dev/${_p}" + else + /usr/bin/logger -p info -t "special_media[$$]" \ + "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-exfat first" + exit 1 + fi + ;; "ntfs") if [ -f "/usr/local/bin/ntfs-3g" ]; then echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype},nosuid :/dev/${_p}" Modified: user/markj/PQ_LAUNDRY_11/etc/rc ============================================================================== --- user/markj/PQ_LAUNDRY_11/etc/rc Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/etc/rc Tue May 23 04:10:36 2017 (r318691) @@ -135,16 +135,16 @@ done # Note: this assumes firstboot_sentinel is on / when we have # a read-only /, or that it is on media that's writable. if [ -e ${firstboot_sentinel} ]; then - [ ${root_rw_mount} = "yes" ] || mount -uw / + [ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -uw / chflags -R 0 ${firstboot_sentinel} rm -rf ${firstboot_sentinel} if [ -e ${firstboot_sentinel}-reboot ]; then chflags -R 0 ${firstboot_sentinel}-reboot rm -rf ${firstboot_sentinel}-reboot - [ ${root_rw_mount} = "yes" ] || mount -ur / + [ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur / kill -INT 1 fi - [ ${root_rw_mount} = "yes" ] || mount -ur / + [ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur / fi echo '' Modified: user/markj/PQ_LAUNDRY_11/gnu/usr.bin/groff/tmac/mdoc.local.in ============================================================================== --- user/markj/PQ_LAUNDRY_11/gnu/usr.bin/groff/tmac/mdoc.local.in Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/gnu/usr.bin/groff/tmac/mdoc.local.in Tue May 23 04:10:36 2017 (r318691) @@ -50,7 +50,7 @@ .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads) . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~11.0 +.ds doc-default-operating-system FreeBSD\~11.1 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-2.2.9 2.2.9 @@ -62,7 +62,10 @@ .ds doc-operating-system-FreeBSD-9.3 9.3 .ds doc-operating-system-FreeBSD-10.0 10.0 .ds doc-operating-system-FreeBSD-10.1 10.1 +.ds doc-operating-system-FreeBSD-10.2 10.2 +.ds doc-operating-system-FreeBSD-10.3 10.3 .ds doc-operating-system-FreeBSD-11.0 11.0 +.ds doc-operating-system-FreeBSD-11.1 11.1 . .\" Definitions for other *BSDs not (yet) in doc-common .ds doc-operating-system-NetBSD-7.0 7.0 Modified: user/markj/PQ_LAUNDRY_11/lib/Makefile ============================================================================== --- user/markj/PQ_LAUNDRY_11/lib/Makefile Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/lib/Makefile Tue May 23 04:10:36 2017 (r318691) @@ -49,6 +49,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ libdpv \ libdwarf \ libedit \ + ${_libefivar} \ ${_libelftc} \ libevent \ libexecinfo \ @@ -232,6 +233,10 @@ _libcxxrt= libcxxrt _libcplusplus= libc++ .endif +.if ${MK_EFI} != "no" +_libefivar= libefivar +.endif + .if ${MK_LIBTHR} != "no" _libthr= libthr .endif Modified: user/markj/PQ_LAUNDRY_11/lib/clang/llvm.build.mk ============================================================================== --- user/markj/PQ_LAUNDRY_11/lib/clang/llvm.build.mk Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/lib/clang/llvm.build.mk Tue May 23 04:10:36 2017 (r318691) @@ -31,7 +31,7 @@ TARGET_ABI= gnueabi .else TARGET_ABI= unknown .endif -OS_VERSION= freebsd11.0 +OS_VERSION= freebsd11.1 TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${TARGET_ABI}-${OS_VERSION} BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-unknown-${OS_VERSION} Modified: user/markj/PQ_LAUNDRY_11/libexec/rtld-elf/rtld.c ============================================================================== --- user/markj/PQ_LAUNDRY_11/libexec/rtld-elf/rtld.c Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/libexec/rtld-elf/rtld.c Tue May 23 04:10:36 2017 (r318691) @@ -339,22 +339,16 @@ _LD(const char *var) func_ptr_type _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) { - Elf_Auxinfo *aux_info[AT_COUNT]; - int i; - int argc; - char **argv; - char **env; - Elf_Auxinfo *aux; - Elf_Auxinfo *auxp; - const char *argv0; + Elf_Auxinfo *aux, *auxp, *aux_info[AT_COUNT]; Objlist_Entry *entry; - Obj_Entry *obj; - Obj_Entry *preload_tail; - Obj_Entry *last_interposer; + Obj_Entry *last_interposer, *obj, *preload_tail; + const Elf_Phdr *phdr; Objlist initlist; RtldLockState lockstate; - char *library_path_rpath; - int mib[2]; + char **argv, *argv0, **env, *kexecpath, *library_path_rpath; + caddr_t imgentry; + char buf[MAXPATHLEN]; + int argc, fd, i, mib[2], phnum; size_t len; /* @@ -477,7 +471,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ * already loaded. */ if (aux_info[AT_EXECFD] != NULL) { /* Load the main program. */ - int fd = aux_info[AT_EXECFD]->a_un.a_val; + fd = aux_info[AT_EXECFD]->a_un.a_val; dbg("loading main program"); obj_main = map_object(fd, argv0, NULL); close(fd); @@ -485,10 +479,6 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ rtld_die(); max_stack_flags = obj->stack_flags; } else { /* Main program already loaded. */ - const Elf_Phdr *phdr; - int phnum; - caddr_t entry; - dbg("processing main program's program header"); assert(aux_info[AT_PHDR] != NULL); phdr = (const Elf_Phdr *) aux_info[AT_PHDR]->a_un.a_ptr; @@ -497,15 +487,12 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ assert(aux_info[AT_PHENT] != NULL); assert(aux_info[AT_PHENT]->a_un.a_val == sizeof(Elf_Phdr)); assert(aux_info[AT_ENTRY] != NULL); - entry = (caddr_t) aux_info[AT_ENTRY]->a_un.a_ptr; - if ((obj_main = digest_phdr(phdr, phnum, entry, argv0)) == NULL) + imgentry = (caddr_t) aux_info[AT_ENTRY]->a_un.a_ptr; + if ((obj_main = digest_phdr(phdr, phnum, imgentry, argv0)) == NULL) rtld_die(); } if (aux_info[AT_EXECPATH] != NULL) { - char *kexecpath; - char buf[MAXPATHLEN]; - kexecpath = aux_info[AT_EXECPATH]->a_un.a_ptr; dbg("AT_EXECPATH %p %s", kexecpath, kexecpath); if (kexecpath[0] == '/') Modified: user/markj/PQ_LAUNDRY_11/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- user/markj/PQ_LAUNDRY_11/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue May 23 04:10:36 2017 (r318691) @@ -159,8 +159,8 @@ Userland Configuration Changes - The &man.inetd.8; utility can now be - built without libwrap support when + The &man.inetd.8; utility is now built + without libwrap support when WITHOUT_TCP_WRAPPERS is set in &man.src.conf.5;. @@ -174,11 +174,20 @@ WITH_LLD_AS_LD build knob has been added, which installs LLD as /usr/bin/ld if set. + + + LLD has been enabled by default and + installed as /usr/bin/ld on + &os;/&arch.arm64;. Userland Application Changes + Support for &man.blacklistd.8; has been added + to OpenSSH. + The &man.cron.8; utility has been updated to add support for including files within The &man.zfsbootcfg.8; utility has been - added, providing one-time &man.nextboot.8; options for - &man.zfsboot.8;. + added, providing one-time &man.boot.config.5;-style options + for &man.zfsboot.8;. The &man.setkey.8; utility has been modified to show the runtime NAT-T configuration. The -g and -t flags have been added, which list only global and virtual policies, - respectively when used with the -D and + respectively, when used with the -D and -P flags. The &man.daemon.8; utility has been updated to allow redirecting &man.stdout.4; and &man.stderr.4; - output to &man.syslog.3; and to a file. + output to &man.syslog.3; or to a file. + + The + &man.efivar.8; utility has been added, providing an interface + to manage UEFI variables. @@ -307,8 +320,8 @@ sponsor="&ff;">&man.blacklistd.8; support for OpenSSH has been refined to adjust notification points to catch all authentication failures - rather than authentication failures caused by invalid - login usernames. + rather than only those caused by invalid login + usernames. @@ -333,6 +346,13 @@ <filename class="directory">/etc/periodic</filename> Scripts + The default &man.periodic.conf.5; has + been updated to include the + anticongestion_sleeptime option, + consolidating random sleeps in &man.periodic.8; scripts and + replacing the daily_ntpd_avoid_congestion + option. The default value is 3600 seconds. + The 410.status-mfi &man.periodic.8; script has been added to monitor the status of &man.mfi.4; volumes. @@ -341,16 +361,31 @@ Runtime Libraries and API + The &man.kvm.close.3; function has been + updated to return the accumulated error from previous + &man.close.2; calls. + + The C standard library has been updated + to make use of &man.reallocarray.3; for bounds + checking. + The clock_nanosleep() system call has been added. The nanosleep() system call is now a wrapper around clock_nanosleep(). + + The system libraries have been updated + to make use of &man.reallocarray.3; for bounds + checking. ABI Compatibility + The type max_align_t + is now defined for C11 compliance. + The sem_clockwait_np() library function has @@ -358,8 +393,25 @@ clock and choose between absolute and relative mode. The clang - nullability attribute has been added to the - C library headers. + nullability qualifiers have been added to + the C library headers. + + Uses of the GNU + __nonnull__ attribute have been replaced + with the more benign Clang + nullability attributes. + + + + Userland Debugging + + &man.ptrace.2; now supports events for + &man.vfork.2;, permitting reliable debugging across + &man.vfork.2; invocations. + + Process core dumps now include the + process ID (PID) and command line + arguments. @@ -373,14 +425,10 @@ Kernel Bug Fixes - The &man.kvm.close.3; function has been - updated to return the accumulated error from previous - &man.close.2; calls. - The &man.ipf.4; packet filter has been - updated to prevent "keep state" from incorrectly - implying "keep frags", matching the behavior - documented in &man.ipf.5;. + updated to prevent keep state from + incorrectly implying keep frags, matching + the behavior documented in &man.ipf.5;. @@ -400,6 +448,11 @@ Kernel Modules + &man.cloudabi.4; has been updated to + allow running 32-bit binaries within 64-bit userland + environments when the kernel configuration file has the + COMPAT_CLOUDABI32 option present. + The ipsec and tcpmd5 kernel modules have been added. @@ -473,6 +526,17 @@ The &man.bytgpio.4; driver has been added, providing support for Intel® Bay Trail™ SoC GPIO controllers. + + /dev/kmem no longer + supports access via mmap(). Consumers + wishing to use /dev/kmem must use + read() and + write(). + + &man.devctl.8; now supports a "clear + driver" command as a complement to "set + driver". @@ -484,11 +548,42 @@ Network Drivers + The &man.cxgbe.4; driver has been updated + to provide support for Virtual Function devices + (VFs) on Chelsio T4 and T5 adapters. + + TCP connections using the TCP Offload + Engine (TOE) on Chelsio T4+ adapters can + now perform zero-copy sends via + aio_write(). + + The &man.cxgbev.4; driver has been added, + providing support for Virtual Function devices + (VFs) on Chelsio T4 and T5 adapters. + The &man.bnxt.4; driver has been added, providing support for Broadcom® NetXtreme-C™ and NetXtreme-E™ devices. + The &man.cxgbe.4; driver now supports + devices using T6-based adapters which support 10, 25, 40, and + 100 Gbps. + + The &man.cxgbe.4; driver has been updated + to provide support for Virtual Function devices + (VFs) on Chelsio T6 adapters. + + The &man.cxgbev.4; driver has been updated + to provide support for Virtual Function devices + (VFs) on Chelsio T6 adapters. + The &man.miibus.4; driver has been updated to support Microchip/Micrel KSZ9031 Gigabit ethernet @@ -511,6 +606,12 @@ sponsor="&netgate;">The &man.etherswitch.4; driver has been updated to support RTL8366RB and RTL8366SR cards. + The + &man.if.ipsec.4; virtual tunneling interface has been added, + implementing route-based VPNs protected + with Encapsulating Security Payload + (ESP). + The &man.qlnxe.4; driver has been added, providing support for Cavium® Qlogic™ 45000 Series adapters. @@ -535,12 +636,6 @@ Hardware Support - The &man.cloudabi.4; driver has been - updated to allow running 32-bit binaries within 64-bit - userland environments when the kernel configuration file has - the COMPAT_CLOUDABI32 option - present. - The &man.atkbdc.4; driver has been updated to provide support for Elantech® trackpads. To enable hardware support, add @@ -551,7 +646,35 @@ Virtualization Support -   + PCI passthrough with + &man.bhyve.4; supports more dynamic configurations permitting + devices to be marked for passthrough or host use at + runtime. + + PCI passthrough with + &man.bhyve.4; resets functions via FLR when + a virtual machine is started and stopped. + + PCI passthrough support has + been enabled on &os; virtual machines running on + Microsoft® Hyper-V™. + + The + &man.hv.netvsc.4; driver SR-IOV + implementation has been updated to support Virtual Function + (VF) devices, such as the Mellanox® + Connect-X3™ network card. + + Support + for Microsoft® Hyper-V™ Generation 2 virtual + machines has been added. + + Support + for synthetic keyboards has been added for virtual machines + running on Microsoft® Hyper-V™. @@ -587,7 +710,7 @@ - &man.geom.4; + <literal>geom(4)</literal>   @@ -633,7 +756,7 @@ sponsor="&dellemc;">The network stack has been modified to fix incorrect or invalid IP addresses if multiple threads emit a UDP - log_in_vein message concurrently. + log_in_vain message concurrently. The TCP stack has @@ -646,7 +769,8 @@ Support for GARP - retransmit has been added. A new &man.sysctl.8;, + (gratuitous ARP) retransmit has been added. + A new &man.sysctl.8;, net.link.ether.inet.garp_rexmit_count, has been added, which sets the maximum number of retransmissions when set to a non-zero value. Modified: user/markj/PQ_LAUNDRY_11/sbin/dhclient/dhclient.c ============================================================================== --- user/markj/PQ_LAUNDRY_11/sbin/dhclient/dhclient.c Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/sbin/dhclient/dhclient.c Tue May 23 04:10:36 2017 (r318691) @@ -107,7 +107,11 @@ struct pidfh *pidfile; */ #define ASSERT_STATE(state_is, state_shouldbe) {} -#define TIME_MAX 2147483647 +/* + * We need to check that the expiry, renewal and rebind times are not beyond + * the end of time (~2038 when a 32-bit time_t is being used). + */ +#define TIME_MAX ((((time_t) 1 << (sizeof(time_t) * CHAR_BIT - 2)) - 1) * 2 + 1) int log_priority; int no_daemon; @@ -762,15 +766,17 @@ dhcpack(struct packet *packet) else ip->client->new->expiry = default_lease_time; /* A number that looks negative here is really just very large, - because the lease expiry offset is unsigned. */ - if (ip->client->new->expiry < 0) - ip->client->new->expiry = TIME_MAX; + because the lease expiry offset is unsigned. Also make sure that + the addition of cur_time below does not overflow (a 32 bit) time_t. */ + if (ip->client->new->expiry < 0 || + ip->client->new->expiry > TIME_MAX - cur_time) + ip->client->new->expiry = TIME_MAX - cur_time; /* XXX should be fixed by resetting the client state */ if (ip->client->new->expiry < 60) ip->client->new->expiry = 60; /* Unless overridden in the config, take the server-provided renewal - * time if there is one; otherwise figure it out according to the spec. + * time if there is one. Otherwise figure it out according to the spec. * Also make sure the renewal time does not exceed the expiry time. */ if (ip->client->config->default_actions[DHO_DHCP_RENEWAL_TIME] == @@ -782,7 +788,8 @@ dhcpack(struct packet *packet) ip->client->new->options[DHO_DHCP_RENEWAL_TIME].data); else ip->client->new->renewal = ip->client->new->expiry / 2; - if (ip->client->new->renewal > ip->client->new->expiry / 2) + if (ip->client->new->renewal < 0 || + ip->client->new->renewal > ip->client->new->expiry / 2) ip->client->new->renewal = ip->client->new->expiry / 2; /* Same deal with the rebind time. */ @@ -794,20 +801,15 @@ dhcpack(struct packet *packet) ip->client->new->rebind = getULong( ip->client->new->options[DHO_DHCP_REBINDING_TIME].data); else - ip->client->new->rebind = ip->client->new->renewal * 7 / 4; - if (ip->client->new->rebind > ip->client->new->renewal * 7 / 4) - ip->client->new->rebind = ip->client->new->renewal * 7 / 4; - - ip->client->new->expiry += cur_time; - /* Lease lengths can never be negative. */ - if (ip->client->new->expiry < cur_time) - ip->client->new->expiry = TIME_MAX; - ip->client->new->renewal += cur_time; - if (ip->client->new->renewal < cur_time) - ip->client->new->renewal = TIME_MAX; - ip->client->new->rebind += cur_time; - if (ip->client->new->rebind < cur_time) - ip->client->new->rebind = TIME_MAX; + ip->client->new->rebind = ip->client->new->renewal / 4 * 7; + if (ip->client->new->rebind < 0 || + ip->client->new->rebind > ip->client->new->renewal / 4 * 7) + ip->client->new->rebind = ip->client->new->renewal / 4 * 7; + + /* Convert the time offsets into seconds-since-the-epoch */ + ip->client->new->expiry += cur_time; + ip->client->new->renewal += cur_time; + ip->client->new->rebind += cur_time; bind_lease(ip); } Modified: user/markj/PQ_LAUNDRY_11/sbin/dhclient/options.c ============================================================================== --- user/markj/PQ_LAUNDRY_11/sbin/dhclient/options.c Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/sbin/dhclient/options.c Tue May 23 04:10:36 2017 (r318691) @@ -783,7 +783,7 @@ pretty_print_option(unsigned int code, u dp += 4; break; case 'L': - opcount = snprintf(op, opleft, "%ld", + opcount = snprintf(op, opleft, "%lu", (unsigned long)getULong(dp)); if (opcount >= opleft || opcount == -1) goto toobig; @@ -799,7 +799,7 @@ pretty_print_option(unsigned int code, u dp += 2; break; case 'S': - opcount = snprintf(op, opleft, "%d", + opcount = snprintf(op, opleft, "%u", getUShort(dp)); if (opcount >= opleft || opcount == -1) goto toobig; Modified: user/markj/PQ_LAUNDRY_11/sbin/kldconfig/kldconfig.8 ============================================================================== --- user/markj/PQ_LAUNDRY_11/sbin/kldconfig/kldconfig.8 Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/sbin/kldconfig/kldconfig.8 Tue May 23 04:10:36 2017 (r318691) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 15, 2001 +.Dd April 27, 2017 .Dt KLDCONFIG 8 .Os .Sh NAME @@ -98,6 +98,7 @@ The default module search path used by t .Sh SEE ALSO .Xr kldload 2 , .Xr kldload 8 , +.Xr kldxref 8 , .Xr sysctl 8 .Sh HISTORY The Modified: user/markj/PQ_LAUNDRY_11/sbin/kldload/kldload.8 ============================================================================== --- user/markj/PQ_LAUNDRY_11/sbin/kldload/kldload.8 Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/sbin/kldload/kldload.8 Tue May 23 04:10:36 2017 (r318691) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 18, 2012 +.Dd April 27, 2017 .Dt KLDLOAD 8 .Os .Sh NAME @@ -116,7 +116,8 @@ Modules may also be auto-loaded through .Xr security 7 , .Xr kldconfig 8 , .Xr kldstat 8 , -.Xr kldunload 8 +.Xr kldunload 8 , +.Xr kldxref 8 .Sh HISTORY The .Nm Modified: user/markj/PQ_LAUNDRY_11/sbin/mount/mount.8 ============================================================================== --- user/markj/PQ_LAUNDRY_11/sbin/mount/mount.8 Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/sbin/mount/mount.8 Tue May 23 04:10:36 2017 (r318691) @@ -28,7 +28,7 @@ .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 .\" $FreeBSD$ .\" -.Dd October 13, 2015 +.Dd March 22, 2017 .Dt MOUNT 8 .Os .Sh NAME @@ -543,6 +543,7 @@ support for a particular file system mig .Xr nmount 2 , .Xr acl 3 , .Xr mac 4 , +.Xr cd9660 5 , .Xr devfs 5 , .Xr ext2fs 5 , .Xr fstab 5 , Modified: user/markj/PQ_LAUNDRY_11/sbin/mount_cd9660/mount_cd9660.8 ============================================================================== --- user/markj/PQ_LAUNDRY_11/sbin/mount_cd9660/mount_cd9660.8 Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/sbin/mount_cd9660/mount_cd9660.8 Tue May 23 04:10:36 2017 (r318691) @@ -32,7 +32,7 @@ .\" @(#)mount_cd9660.8 8.3 (Berkeley) 3/27/94 .\" $FreeBSD$ .\" -.Dd March 5, 2013 +.Dd March 22, 2017 .Dt MOUNT_CD9660 8 .Os .Sh NAME @@ -138,6 +138,7 @@ The following command can be used to mou .Xr cdcontrol 1 , .Xr mount 2 , .Xr unmount 2 , +.Xr cd9660 5 , .Xr fstab 5 , .Xr mount 8 .Sh HISTORY Modified: user/markj/PQ_LAUNDRY_11/sbin/mount_nfs/mount_nfs.c ============================================================================== --- user/markj/PQ_LAUNDRY_11/sbin/mount_nfs/mount_nfs.c Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/sbin/mount_nfs/mount_nfs.c Tue May 23 04:10:36 2017 (r318691) @@ -651,7 +651,7 @@ getnfsargs(char *spec, struct iovec **io build_iovec(iov, iovlen, "hostname", nam, (size_t)-1); /* Add mounted file system to PATH_MOUNTTAB */ - if (!add_mtab(hostp, spec)) + if (mountmode != V4 && !add_mtab(hostp, spec)) warnx("can't update %s for %s:%s", PATH_MOUNTTAB, hostp, spec); return (1); } Modified: user/markj/PQ_LAUNDRY_11/share/man/man3/intro.3 ============================================================================== --- user/markj/PQ_LAUNDRY_11/share/man/man3/intro.3 Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/share/man/man3/intro.3 Tue May 23 04:10:36 2017 (r318691) @@ -28,7 +28,7 @@ .\" @(#)intro.3 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd June 5, 1993 +.Dd March 22, 2017 .Dt INTRO 3 .Os .Sh NAME @@ -40,26 +40,16 @@ library functions, their error returns a common definitions and concepts. Most of these functions are available from the C library, .Em libc . -.\" (see -.\" .Xr libc 3 ) . Other libraries, such as the math library, .Em libm , must be indicated at compile time with the .Fl l option of the compiler. -.\" .Pp -.\" A subset of the -.\" .Xr libc functions -.\" are available from Fortran; -.\" they are described separately in -.\" .Xr intro 3f . .Pp The various libraries (followed by the loader flag): .Bl -tag -width "libc (-lc)" -.It Xr libc Pq Fl l Ns Ar c +.It Em libc Pq Fl l Ns Ar c Standard C library functions. -.\" (See -.\" .Xr libc 3 . ) When using the C compiler .Xr cc 1 , it is not necessary @@ -67,8 +57,8 @@ to supply the loader flag .Fl l Ns Ar c for these functions. There are several `libraries' or groups of functions included inside of -.Xr libc : -the standard +.Em libc +: the standard .Tn I/O routines, database routines, @@ -77,12 +67,12 @@ string operators, character tests and character operators, des encryption routines, storage allocation, time functions, signal handling and more. -.It Xr libcurses Pq Fl l Ns Ar curses Fl l Ns Ar termcap +.It Em libcurses Pq Fl l Ns Ar curses Fl l Ns Ar termcap Terminal independent screen management routines for two dimensional non-bitmap display terminals. (See .Xr ncurses 3 . ) -.It Xr libcompat Pq Fl l Ns Ar compat +.It Em libcompat Pq Fl l Ns Ar compat Functions which are obsolete but are available for compatibility with .Bx 4.3 . In particular, @@ -92,45 +82,30 @@ have been included for source code compa Use of these routines should, for the most part, be avoided. The manual page entry for each compatibility routine indicates the proper interface to use. -.It Xr libkvm Pq Fl l Ns Ar kvm +.It Em libkvm Pq Fl l Ns Ar kvm Functions used to access kernel memory are in this library. They can be used against both a running system and a crash dump. (See .Xr kvm 3 . ) -.It Xr libl Pq Fl l Ns Ar l +.It Em libl Pq Fl l Ns Ar l The library for .Xr lex 1 . -.\" .It Xr libln -.It Xr libm Pq Fl l Ns Ar m +.It Em libm Pq Fl l Ns Ar m The math library, .Em libm . The math library is loaded as needed by the Pascal compiler, -.\" .Xr pc 1 , but not by the C compiler which requires the .Fl l Ns Ar m flag. (See .Xr math 3 . ) -.It Xr libmp Pq Fl l Ns Ar mp -.\" .It Xr libom -.\" Old math library. -.\" .It Xr libplot Pq Fl l Ns Ar plot -.\" Device independent plotting functions. -.\" (See -.\" .Xr plot 3 . ) -.\" .It Xr libplotf77 Pq Fl l Ns Ar plotf77 -.\" The device independent plotting functions for fortran. -.\" (See -.\" .Xr plot 3 . ) -.\" .It Xr libresolv Pq Fl l Ns Ar resolv -.\" Routines for network address resolution. -.It Xr libtermcap Pq Fl l Ns Ar termcap +.It Em libmp Pq Fl l Ns Ar mp +.It Em libtermcap Pq Fl l Ns Ar termcap The terminal independent operation library package. (See .Xr termcap 3 . ) -.\" .It libvt0.a -.It Xr liby Pq Fl l Ns Ar y +.It Em liby Pq Fl l Ns Ar y The library for .Xr yacc 1 . .El @@ -146,17 +121,12 @@ the math library the math library compiled for profiling .El .Sh SEE ALSO -.\" .Xr libc 3 , .Xr cc 1 , .Xr ld 1 , .Xr nm 1 , .Xr intro 2 , .Xr math 3 , .Xr stdio 3 -.\" .Sh LIST OF FUNCTIONS -.\" .Bl -column "strncasecmpxxx" "system" -.\" .Sy Name Description -.\" .El .Sh HISTORY An .Nm Modified: user/markj/PQ_LAUNDRY_11/share/man/man4/geom.4 ============================================================================== --- user/markj/PQ_LAUNDRY_11/share/man/man4/geom.4 Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/share/man/man4/geom.4 Tue May 23 04:10:36 2017 (r318691) @@ -34,7 +34,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 8, 2015 +.Dd April 20, 2017 .Dt GEOM 4 .Os .Sh NAME @@ -55,6 +55,7 @@ .Cd options GEOM_MAP .Cd options GEOM_MBR .Cd options GEOM_MIRROR +.Cd options GEOM_MOUNTVER .Cd options GEOM_MULTIPATH .Cd options GEOM_NOP .Cd options GEOM_PART_APM Modified: user/markj/PQ_LAUNDRY_11/share/man/man4/u3g.4 ============================================================================== --- user/markj/PQ_LAUNDRY_11/share/man/man4/u3g.4 Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/share/man/man4/u3g.4 Tue May 23 04:10:36 2017 (r318691) @@ -18,7 +18,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 26, 2013 +.Dd April 26, 2017 .Dt U3G 4 .Os .Sh NAME @@ -97,6 +97,20 @@ See .Xr usbconfig 8 and .Xr usb_quirk 4 . +.Sh FILES +.Bl -tag -width "/dev/ttyU*.*.init" -compact +.It Pa /dev/ttyU*.* +for callin ports +.It Pa /dev/ttyU*.*.init +.It Pa /dev/ttyU*.*.lock +corresponding callin initial-state and lock-state devices +.Pp +.It Pa /dev/cuaU*.* +for callout ports +.It Pa /dev/cuaU*.*.init +.It Pa /dev/cuaU*.*.lock +corresponding callout initial-state and lock-state devices +.El .Sh SEE ALSO .Xr tty 4 , .Xr ucom 4 , Modified: user/markj/PQ_LAUNDRY_11/share/man/man4/uark.4 ============================================================================== --- user/markj/PQ_LAUNDRY_11/share/man/man4/uark.4 Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/share/man/man4/uark.4 Tue May 23 04:10:36 2017 (r318691) @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 20, 2011 +.Dd April 26, 2017 .Dt UARK 4 .Os .Sh NAME @@ -57,6 +57,20 @@ KQ-U8A Data Cable .It Skymaster USB to RS232 .El +.Sh FILES +.Bl -tag -width "/dev/ttyU*.init" -compact +.It Pa /dev/ttyU* +for callin ports +.It Pa /dev/ttyU*.init +.It Pa /dev/ttyU*.lock +corresponding callin initial-state and lock-state devices +.Pp +.It Pa /dev/cuaU* +for callout ports +.It Pa /dev/cuaU*.init +.It Pa /dev/cuaU*.lock +corresponding callout initial-state and lock-state devices +.El .Sh SEE ALSO .Xr tty 4 , .Xr ucom 4 , Modified: user/markj/PQ_LAUNDRY_11/share/man/man4/uart.4 ============================================================================== --- user/markj/PQ_LAUNDRY_11/share/man/man4/uart.4 Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/share/man/man4/uart.4 Tue May 23 04:10:36 2017 (r318691) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 9, 2015 +.Dd April 26, 2017 .Dt UART 4 .Os .Sh NAME @@ -226,7 +226,7 @@ level signal at up to 12 volts. A connection to header pins or an edge-connector on an embedded board is typically a TTL signal at 3.3 or 5 volts. .Sh FILES -.Bl -tag -width ".Pa /dev/ttyu?.init" -compact +.Bl -tag -width "/dev/ttyu?.init" -compact .It Pa /dev/ttyu? for callin ports .It Pa /dev/ttyu?.init Modified: user/markj/PQ_LAUNDRY_11/share/man/man4/ubsa.4 ============================================================================== --- user/markj/PQ_LAUNDRY_11/share/man/man4/ubsa.4 Tue May 23 03:48:42 2017 (r318690) +++ user/markj/PQ_LAUNDRY_11/share/man/man4/ubsa.4 Tue May 23 04:10:36 2017 (r318691) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 20, 2011 +.Dd April 26, 2017 .Dt UBSA 4 .Os .Sh NAME @@ -81,6 +81,20 @@ GoHubs GoCOM232 .It *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Tue May 23 04:14:36 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6E6E0D79C49 for ; Tue, 23 May 2017 04:14:36 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3000915B4; Tue, 23 May 2017 04:14:36 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4N4EZqA085611; Tue, 23 May 2017 04:14:35 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4N4EYPF085606; Tue, 23 May 2017 04:14:34 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201705230414.v4N4EYPF085606@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 23 May 2017 04:14:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318692 - in user/markj/PQ_LAUNDRY_11/usr.bin: systat top vmstat X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 May 2017 04:14:36 -0000 Author: markj Date: Tue May 23 04:14:34 2017 New Revision: 318692 URL: https://svnweb.freebsd.org/changeset/base/318692 Log: MFC r308489, r308706: Add the laundry page count to the displays of systat, top, and vmstat. Modified: user/markj/PQ_LAUNDRY_11/usr.bin/systat/systat.1 user/markj/PQ_LAUNDRY_11/usr.bin/systat/vmstat.c user/markj/PQ_LAUNDRY_11/usr.bin/top/machine.c user/markj/PQ_LAUNDRY_11/usr.bin/top/top.local.1 user/markj/PQ_LAUNDRY_11/usr.bin/vmstat/vmstat.c Directory Properties: user/markj/PQ_LAUNDRY_11/ (props changed) Modified: user/markj/PQ_LAUNDRY_11/usr.bin/systat/systat.1 ============================================================================== --- user/markj/PQ_LAUNDRY_11/usr.bin/systat/systat.1 Tue May 23 04:10:36 2017 (r318691) +++ user/markj/PQ_LAUNDRY_11/usr.bin/systat/systat.1 Tue May 23 04:14:34 2017 (r318692) @@ -414,7 +414,7 @@ as amounts of memory in kilobytes, pages wired down (`wire'), active pages (`act'), inactive pages (`inact'), -pages on the cache queue (`cache'), +dirty pages queued for laundering (`laund'), and free pages (`free'). Note that the values displayed are the current transient ones; Modified: user/markj/PQ_LAUNDRY_11/usr.bin/systat/vmstat.c ============================================================================== --- user/markj/PQ_LAUNDRY_11/usr.bin/systat/vmstat.c Tue May 23 04:10:36 2017 (r318691) +++ user/markj/PQ_LAUNDRY_11/usr.bin/systat/vmstat.c Tue May 23 04:14:34 2017 (r318692) @@ -92,7 +92,7 @@ static struct Info { u_int v_vnodepgsin; /* vnode_pager pages paged in */ u_int v_vnodepgsout; /* vnode pager pages paged out */ u_int v_intrans; /* intransit blocking page faults */ - u_int v_reactivated; /* number of pages reactivated from free list */ + u_int v_reactivated; /* number of pages reactivated by pagedaemon */ u_int v_pdwakeups; /* number of times daemon has awaken from sleep */ u_int v_pdpages; /* number of pages analyzed by daemon */ @@ -107,7 +107,7 @@ static struct Info { u_int v_wire_count; /* number of pages wired down */ u_int v_active_count; /* number of pages active */ u_int v_inactive_count; /* number of pages inactive */ - u_int v_cache_count; /* number of pages on buffer cache queue */ + u_int v_laundry_count; /* number of pages in laundry queue */ u_long v_kmem_map_size; /* Current kmem allocation size */ struct vmtotal Total; struct nchstats nchstats; @@ -343,7 +343,7 @@ labelkre(void) mvprintw(VMSTATROW + 12, VMSTATCOL + 9, "wire"); mvprintw(VMSTATROW + 13, VMSTATCOL + 9, "act"); mvprintw(VMSTATROW + 14, VMSTATCOL + 9, "inact"); - mvprintw(VMSTATROW + 15, VMSTATCOL + 9, "cache"); + mvprintw(VMSTATROW + 15, VMSTATCOL + 9, "laund"); mvprintw(VMSTATROW + 16, VMSTATCOL + 9, "free"); if (LINES - 1 > VMSTATROW + 17) mvprintw(VMSTATROW + 17, VMSTATCOL + 9, "buf"); @@ -519,7 +519,7 @@ showkre(void) putint(pgtokb(s.v_wire_count), VMSTATROW + 12, VMSTATCOL, 8); putint(pgtokb(s.v_active_count), VMSTATROW + 13, VMSTATCOL, 8); putint(pgtokb(s.v_inactive_count), VMSTATROW + 14, VMSTATCOL, 8); - putint(pgtokb(s.v_cache_count), VMSTATROW + 15, VMSTATCOL, 8); + putint(pgtokb(s.v_laundry_count), VMSTATROW + 15, VMSTATCOL, 8); putint(pgtokb(s.v_free_count), VMSTATROW + 16, VMSTATCOL, 8); if (LINES - 1 > VMSTATROW + 17) putint(s.bufspace / 1024, VMSTATROW + 17, VMSTATCOL, 8); @@ -794,7 +794,7 @@ getinfo(struct Info *ls) GETSYSCTL("vm.stats.vm.v_wire_count", ls->v_wire_count); GETSYSCTL("vm.stats.vm.v_active_count", ls->v_active_count); GETSYSCTL("vm.stats.vm.v_inactive_count", ls->v_inactive_count); - GETSYSCTL("vm.stats.vm.v_cache_count", ls->v_cache_count); + GETSYSCTL("vm.stats.vm.v_laundry_count", ls->v_laundry_count); GETSYSCTL("vfs.bufspace", ls->bufspace); GETSYSCTL("kern.maxvnodes", ls->desiredvnodes); GETSYSCTL("vfs.numvnodes", ls->numvnodes); Modified: user/markj/PQ_LAUNDRY_11/usr.bin/top/machine.c ============================================================================== --- user/markj/PQ_LAUNDRY_11/usr.bin/top/machine.c Tue May 23 04:10:36 2017 (r318691) +++ user/markj/PQ_LAUNDRY_11/usr.bin/top/machine.c Tue May 23 04:14:34 2017 (r318692) @@ -178,7 +178,7 @@ char *cpustatenames[] = { int memory_stats[7]; char *memorynames[] = { - "K Active, ", "K Inact, ", "K Wired, ", "K Cache, ", "K Buf, ", + "K Active, ", "K Inact, ", "K Laundry, ", "K Wired, ", "K Buf, ", "K Free", NULL }; @@ -521,8 +521,8 @@ get_system_info(struct system_info *si) GETSYSCTL("vfs.bufspace", bufspace); GETSYSCTL("vm.stats.vm.v_active_count", memory_stats[0]); GETSYSCTL("vm.stats.vm.v_inactive_count", memory_stats[1]); - GETSYSCTL("vm.stats.vm.v_wire_count", memory_stats[2]); - GETSYSCTL("vm.stats.vm.v_cache_count", memory_stats[3]); + GETSYSCTL("vm.stats.vm.v_laundry_count", memory_stats[2]); + GETSYSCTL("vm.stats.vm.v_wire_count", memory_stats[3]); GETSYSCTL("vm.stats.vm.v_free_count", memory_stats[5]); GETSYSCTL("vm.stats.vm.v_swappgsin", nspgsin); GETSYSCTL("vm.stats.vm.v_swappgsout", nspgsout); Modified: user/markj/PQ_LAUNDRY_11/usr.bin/top/top.local.1 ============================================================================== --- user/markj/PQ_LAUNDRY_11/usr.bin/top/top.local.1 Tue May 23 04:10:36 2017 (r318691) +++ user/markj/PQ_LAUNDRY_11/usr.bin/top/top.local.1 Tue May 23 04:14:34 2017 (r318692) @@ -2,7 +2,7 @@ .SH "FreeBSD NOTES" .SH DESCRIPTION OF MEMORY -Mem: 61M Active, 86M Inact, 22G Wired, 1M Cache, 2M Buf, 102G Free +Mem: 61M Active, 86M Inact, 1M Laundry, 22G Wired, 2M Buf, 102G Free ARC: 15G Total, 9303M MFU, 6155M MRU, 1464K Anon, 98M Header, 35M Other 15G Compressed, 27G Uncompressed, 1.75:1 Ratio, 174M Overhead Swap: 4096M Total, 532M Free, 13% Inuse, 80K In, 104K Out @@ -24,15 +24,14 @@ Gigabyte number of bytes active .TP .B Inact: -number of bytes inactive +number of clean bytes inactive +.TP +.B Laundry: +number of dirty bytes queued for laundering .TP .B Wired: number of bytes wired down, including BIO-level cached file data pages .TP -.B Cache: -number of clean bytes caching data that are available for -immediate reallocation -.TP .B Buf: number of bytes used for BIO-level disk caching .TP Modified: user/markj/PQ_LAUNDRY_11/usr.bin/vmstat/vmstat.c ============================================================================== --- user/markj/PQ_LAUNDRY_11/usr.bin/vmstat/vmstat.c Tue May 23 04:10:36 2017 (r318691) +++ user/markj/PQ_LAUNDRY_11/usr.bin/vmstat/vmstat.c Tue May 23 04:14:34 2017 (r318692) @@ -563,7 +563,7 @@ fill_vmmeter(struct vmmeter *vmmp) GET_VM_STATS(vm, v_reactivated); GET_VM_STATS(vm, v_pdwakeups); GET_VM_STATS(vm, v_pdpages); - GET_VM_STATS(vm, v_tcached); + GET_VM_STATS(vm, v_pdshortfalls); GET_VM_STATS(vm, v_dfree); GET_VM_STATS(vm, v_pfree); GET_VM_STATS(vm, v_tfree); @@ -577,7 +577,7 @@ fill_vmmeter(struct vmmeter *vmmp) GET_VM_STATS(vm, v_active_count); GET_VM_STATS(vm, v_inactive_target); GET_VM_STATS(vm, v_inactive_count); - GET_VM_STATS(vm, v_cache_count); + GET_VM_STATS(vm, v_laundry_count); GET_VM_STATS(vm, v_pageout_free_min); GET_VM_STATS(vm, v_interrupt_free_min); /*GET_VM_STATS(vm, v_free_severe);*/ @@ -1055,7 +1055,9 @@ dosum(void) sum.v_pdwakeups); xo_emit("{:page-daemon-pages/%9u} {N:pages examined by the page daemon}\n", sum.v_pdpages); - xo_emit("{:reactivated/%9u} {N:pages reactivated}\n", + xo_emit("{:page-reclamation-shortfalls/%9u} {N:clean page reclamation shortfalls}\n", + sum.v_pdshortfalls); + xo_emit("{:reactivated/%9u} {N:pages reactivated by the page daemon}\n", sum.v_reactivated); xo_emit("{:copy-on-write-faults/%9u} {N:copy-on-write faults}\n", sum.v_cow_faults); @@ -1079,8 +1081,6 @@ dosum(void) sum.v_vforkpages); xo_emit("{:pages-rfork/%9u} {N:pages affected by rfork}()\n", sum.v_rforkpages); - xo_emit("{:pages-total-cached/%9u} {N:pages cached}\n", - sum.v_tcached); xo_emit("{:pages-freed/%9u} {N:pages freed}\n", sum.v_tfree); xo_emit("{:pages-freed-by-daemon/%9u} {N:pages freed by daemon}\n", @@ -1091,8 +1091,8 @@ dosum(void) sum.v_active_count); xo_emit("{:inactive-pages/%9u} {N:pages inactive}\n", sum.v_inactive_count); - xo_emit("{:vm-cache/%9u} {N:pages in VM cache}\n", - sum.v_cache_count); + xo_emit("{:laundry-pages/%9u} {N:pages in the laundry queue}\n", + sum.v_laundry_count); xo_emit("{:wired-pages/%9u} {N:pages wired down}\n", sum.v_wire_count); xo_emit("{:free-pages/%9u} {N:pages free}\n", From owner-svn-src-user@freebsd.org Wed May 24 09:09:14 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0C223D7BAD4 for ; Wed, 24 May 2017 09:09:14 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD6061896; Wed, 24 May 2017 09:09:13 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4O99COk018508; Wed, 24 May 2017 09:09:12 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4O99ACb018488; Wed, 24 May 2017 09:09:10 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705240909.v4O99ACb018488@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 24 May 2017 09:09:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318779 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2017 09:09:14 -0000 Author: pho Date: Wed May 24 09:09:10 2017 New Revision: 318779 URL: https://svnweb.freebsd.org/changeset/base/318779 Log: Fix more hard coded mount point names. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/dangling.sh user/pho/stress2/misc/extattr.sh user/pho/stress2/misc/extattrctl.sh user/pho/stress2/misc/isofs3.sh user/pho/stress2/misc/md3.sh user/pho/stress2/misc/mlockall4.sh user/pho/stress2/misc/mmap29.sh user/pho/stress2/misc/overcommit2.sh user/pho/stress2/misc/quota9.sh user/pho/stress2/misc/sigxcpu.sh user/pho/stress2/misc/snap9.sh user/pho/stress2/misc/suj16.sh user/pho/stress2/misc/suj26.sh user/pho/stress2/misc/suj27.sh user/pho/stress2/misc/suj28.sh user/pho/stress2/misc/suj4.sh user/pho/stress2/misc/suj8.sh user/pho/stress2/misc/tmpfs14.sh user/pho/stress2/misc/unionfs.sh Modified: user/pho/stress2/misc/dangling.sh ============================================================================== --- user/pho/stress2/misc/dangling.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/dangling.sh Wed May 24 09:09:10 2017 (r318779) @@ -51,7 +51,7 @@ chmod 777 $mntpoint export runRUNTIME=4m export RUNDIR=$mntpoint/stressX -set `df -ik /mnt | tail -1 | awk '{print $4,$7}'` +set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 / 4)) export INODES=$(($2 / 4)) Modified: user/pho/stress2/misc/extattr.sh ============================================================================== --- user/pho/stress2/misc/extattr.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/extattr.sh Wed May 24 09:09:10 2017 (r318779) @@ -60,7 +60,7 @@ cd $mntpoint/.attribute/system extattrctl initattr -p . 388 posix1e.acl_access extattrctl initattr -p . 388 posix1e.acl_default cd / -umount /mnt +umount $mntpoint tunefs -a enable /dev/md${mdstart}$part mount /dev/md${mdstart}$part $mntpoint mount | grep md${mdstart}$part Modified: user/pho/stress2/misc/extattrctl.sh ============================================================================== --- user/pho/stress2/misc/extattrctl.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/extattrctl.sh Wed May 24 09:09:10 2017 (r318779) @@ -60,7 +60,7 @@ cd $mntpoint/.attribute/system extattrctl initattr -p . 388 posix1e.acl_access extattrctl initattr -p . 388 posix1e.acl_default cd / -umount /mnt +umount $mntpoint tunefs -a enable /dev/md${mdstart}$part mount /dev/md${mdstart}$part $mntpoint mount | grep md${mdstart}$part Modified: user/pho/stress2/misc/isofs3.sh ============================================================================== --- user/pho/stress2/misc/isofs3.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/isofs3.sh Wed May 24 09:09:10 2017 (r318779) @@ -60,9 +60,9 @@ export RUNDIR=$mntpoint/stressX export runRUNTIME=5m (cd $mntpoint/stress2; ./run.sh marcus.cfg) > /dev/null -umount /mnt +umount $mntpoint mdconfig -d -u $m2 -umount /mnt +umount $mntpoint mdconfig -d -u $mdstart rm -rf $D $I exit 0 Modified: user/pho/stress2/misc/md3.sh ============================================================================== --- user/pho/stress2/misc/md3.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/md3.sh Wed May 24 09:09:10 2017 (r318779) @@ -44,7 +44,7 @@ newfs $newfs_flags md5$part > /dev/null mount /dev/md5$part $mntpoint # Stop FS "out of inodes" problem by only using 70% -set `df -ik /mnt | tail -1 | awk '{print $4,$7}'` +set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 / 10 * 7)) export INODES=$(($2 / 10 * 7)) Modified: user/pho/stress2/misc/mlockall4.sh ============================================================================== --- user/pho/stress2/misc/mlockall4.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/mlockall4.sh Wed May 24 09:09:10 2017 (r318779) @@ -44,7 +44,7 @@ rm -f mlockall4.c mount | grep -q "on $mntpoint " && umount -f $mntpoint mount -t nullfs /tmp $mntpoint -/mnt/mlockall4 & +$mntpoint/mlockall4 & sleep 2 umount -f $mntpoint Modified: user/pho/stress2/misc/mmap29.sh ============================================================================== --- user/pho/stress2/misc/mmap29.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/mmap29.sh Wed May 24 09:09:10 2017 (r318779) @@ -19,7 +19,7 @@ bsdlabel -w md$mdstart auto newfs -U md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint -mkdir /mnt/mmap29 +mkdir $mntpoint/mmap29 cd /tmp cat > mmap29.c < @@ -60,7 +60,7 @@ EOFHERE cc -o mmap29 -Wall -Wextra -O0 -g mmap29.c || exit 1 rm mmap29.c -./mmap29 /mnt/mmap29/mmap291 +./mmap29 $mntpoint/mmap29/mmap291 old=`sysctl -n kern.maxvnodes` trap "sysctl kern.maxvnodes=$old" EXIT INT sysctl kern.maxvnodes=2000 Modified: user/pho/stress2/misc/overcommit2.sh ============================================================================== --- user/pho/stress2/misc/overcommit2.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/overcommit2.sh Wed May 24 09:09:10 2017 (r318779) @@ -57,7 +57,7 @@ echo "Expect: dd: /mnt/big.1: No space left on device" for i in `jot 10`; do - dd if=/dev/zero of=/mnt/big.$i bs=1m 2>&1 | \ + dd if=/dev/zero of=$mntpoint/big.$i bs=1m 2>&1 | \ egrep -v "records|transferred" & done wait Modified: user/pho/stress2/misc/quota9.sh ============================================================================== --- user/pho/stress2/misc/quota9.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/quota9.sh Wed May 24 09:09:10 2017 (r318779) @@ -73,7 +73,7 @@ if [ $# -eq 0 ]; then qc $mntpoint su $testuser $0 xxx - du -k /mnt/stressX + du -k $mntpoint/stressX qc $mntpoint Modified: user/pho/stress2/misc/sigxcpu.sh ============================================================================== --- user/pho/stress2/misc/sigxcpu.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/sigxcpu.sh Wed May 24 09:09:10 2017 (r318779) @@ -55,7 +55,7 @@ chmod 777 $mntpoint export runRUNTIME=4m export RUNDIR=$mntpoint/stressX -set `df -ik /mnt | tail -1 | awk '{print $4,$7}'` +set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 / 4)) export INODES=$(($2 / 4)) Modified: user/pho/stress2/misc/snap9.sh ============================================================================== --- user/pho/stress2/misc/snap9.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/snap9.sh Wed May 24 09:09:10 2017 (r318779) @@ -63,6 +63,6 @@ rm $mntpoint/big.* rm -f $mntpoint/.snap/snap while mount | grep "$mntpoint" | grep -q md$mdstart; do - umount /mnt || sleep 1 + umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart Modified: user/pho/stress2/misc/suj16.sh ============================================================================== --- user/pho/stress2/misc/suj16.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/suj16.sh Wed May 24 09:09:10 2017 (r318779) @@ -64,11 +64,11 @@ mntpoint2=${mntpoint}2 mount | grep $mntpoint2 | grep -q /dev/md && umount -f $mntpoint2 mdconfig -l | grep -q md$mdstart2 && mdconfig -d -u $mdstart2 while kill -0 $rpid 2> /dev/null; do - rm -f /mnt/.snap/suj16 - { mksnap_ffs /mnt /mnt/.snap/suj16 || continue; } 2>&1 | \ + rm -f $mntpoint/.snap/suj16 + { mksnap_ffs $mntpoint $mntpoint/.snap/suj16 || continue; } 2>&1 | \ grep -v "Resource temporarily unavailable" - [ ! -s /mnt/.snap/suj16 ] && continue - mdconfig -a -t vnode -f /mnt/.snap/suj16 -u $mdstart2 -o readonly + [ ! -s $mntpoint/.snap/suj16 ] && continue + mdconfig -a -t vnode -f $mntpoint/.snap/suj16 -u $mdstart2 -o readonly mount -r /dev/md$mdstart2 $mntpoint2 ls -l $mntpoint2 > /dev/null Modified: user/pho/stress2/misc/suj26.sh ============================================================================== --- user/pho/stress2/misc/suj26.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/suj26.sh Wed May 24 09:09:10 2017 (r318779) @@ -65,11 +65,11 @@ mntpoint2=${mntpoint}2 mount | grep $mntpoint2 | grep -q /dev/md && umount -f $mntpoint2 mdconfig -l | grep -q md$mdstart2 && mdconfig -d -u $mdstart2 while kill -0 $rpid 2> /dev/null; do - rm -f /mnt/.snap/suj26 - { mksnap_ffs /mnt /mnt/.snap/suj26 || continue; } 2>&1 | \ + rm -f $mntpoint/.snap/suj26 + { mksnap_ffs $mntpoint $mntpoint/.snap/suj26 || continue; } 2>&1 | \ grep -v "Resource temporarily unavailable" - [ ! -s /mnt/.snap/suj26 ] && continue - mdconfig -a -t vnode -f /mnt/.snap/suj26 -u $mdstart2 -o readonly + [ ! -s $mntpoint/.snap/suj26 ] && continue + mdconfig -a -t vnode -f $mntpoint/.snap/suj26 -u $mdstart2 -o readonly mount -r /dev/md$mdstart2 $mntpoint2 ls -l $mntpoint2 > /dev/null Modified: user/pho/stress2/misc/suj27.sh ============================================================================== --- user/pho/stress2/misc/suj27.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/suj27.sh Wed May 24 09:09:10 2017 (r318779) @@ -66,11 +66,11 @@ mntpoint2=${mntpoint}2 mount | grep $mntpoint2 | grep -q /dev/md && umount -f $mntpoint2 mdconfig -l | grep -q md$mdstart2 && mdconfig -d -u $mdstart2 while kill -0 $rpid 2> /dev/null; do - rm -f /mnt/.snap/suj27 - { mksnap_ffs /mnt /mnt/.snap/suj27 || continue; } 2>&1 | \ + rm -f $mntpoint/.snap/suj27 + { mksnap_ffs $mntpoint $mntpoint/.snap/suj27 || continue; } 2>&1 | \ grep -v "Resource temporarily unavailable" - [ ! -s /mnt/.snap/suj27 ] && continue - mdconfig -a -t vnode -f /mnt/.snap/suj27 -u $mdstart2 -o readonly + [ ! -s $mntpoint/.snap/suj27 ] && continue + mdconfig -a -t vnode -f $mntpoint/.snap/suj27 -u $mdstart2 -o readonly mount -r /dev/md$mdstart2 $mntpoint2 ls -l $mntpoint2 > /dev/null Modified: user/pho/stress2/misc/suj28.sh ============================================================================== --- user/pho/stress2/misc/suj28.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/suj28.sh Wed May 24 09:09:10 2017 (r318779) @@ -65,11 +65,11 @@ mntpoint2=${mntpoint}2 mount | grep $mntpoint2 | grep -q /dev/md && umount -f $mntpoint2 mdconfig -l | grep -q md$mdstart2 && mdconfig -d -u $mdstart2 while kill -0 $rpid 2> /dev/null; do - rm -f /mnt/.snap/suj28 - { mksnap_ffs /mnt /mnt/.snap/suj28 || continue; } 2>&1 | \ + rm -f $mntpoint/.snap/suj28 + { mksnap_ffs $mntpoint $mntpoint/.snap/suj28 || continue; } 2>&1 | \ grep -v "Resource temporarily unavailable" - [ ! -s /mnt/.snap/suj28 ] && continue - mdconfig -a -t vnode -f /mnt/.snap/suj28 -u $mdstart2 -o readonly + [ ! -s $mntpoint/.snap/suj28 ] && continue + mdconfig -a -t vnode -f $mntpoint/.snap/suj28 -u $mdstart2 -o readonly mount -r /dev/md$mdstart2 $mntpoint2 ls -l $mntpoint2 > /dev/null Modified: user/pho/stress2/misc/suj4.sh ============================================================================== --- user/pho/stress2/misc/suj4.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/suj4.sh Wed May 24 09:09:10 2017 (r318779) @@ -44,7 +44,7 @@ chmod 777 $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=30m -set `df -ik /mnt | tail -1 | awk '{print $4,$7}'` +set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 / 2)) export INODES=$(($2 / 2)) export rwINCARNATIONS=10 Modified: user/pho/stress2/misc/suj8.sh ============================================================================== --- user/pho/stress2/misc/suj8.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/suj8.sh Wed May 24 09:09:10 2017 (r318779) @@ -50,7 +50,7 @@ for i in 1 2 ; do mount /dev/md${mdstart}$part $mntpoint - dd if=/dev/zero of=/mnt/big bs=4k > /dev/null 2>&1 + dd if=/dev/zero of=$mntpoint/big bs=4k > /dev/null 2>&1 while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 Modified: user/pho/stress2/misc/tmpfs14.sh ============================================================================== --- user/pho/stress2/misc/tmpfs14.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/tmpfs14.sh Wed May 24 09:09:10 2017 (r318779) @@ -45,7 +45,7 @@ rm -f tmpfs14.c cd $odir mount | grep -q "$mntpoint " && umount -f $mntpoint -mount -t tmpfs tmpfs /mnt +mount -t tmpfs tmpfs $mntpoint (cd $mntpoint; /tmp/tmpfs14) & Modified: user/pho/stress2/misc/unionfs.sh ============================================================================== --- user/pho/stress2/misc/unionfs.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/unionfs.sh Wed May 24 09:09:10 2017 (r318779) @@ -43,7 +43,7 @@ mdconfig -a -t vnode -f $diskimage -u $m bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint -mount -t unionfs -o noatime /mnt /tmp +mount -t unionfs -o noatime $mntpoint /tmp export RUNDIR=/tmp/stressX export runRUNTIME=10m # Run tests for 10 minutes (cd ..; ./run.sh disk.cfg) From owner-svn-src-user@freebsd.org Thu May 25 08:53:57 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D6CCD72E8F for ; Thu, 25 May 2017 08:53:57 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 20DF8162D; Thu, 25 May 2017 08:53:57 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4P8rucB016843; Thu, 25 May 2017 08:53:56 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4P8rufI016842; Thu, 25 May 2017 08:53:56 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705250853.v4P8rufI016842@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Thu, 25 May 2017 08:53:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318862 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 May 2017 08:53:57 -0000 Author: pho Date: Thu May 25 08:53:55 2017 New Revision: 318862 URL: https://svnweb.freebsd.org/changeset/base/318862 Log: Improve error handling and return error status. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/bio.sh Modified: user/pho/stress2/misc/bio.sh ============================================================================== --- user/pho/stress2/misc/bio.sh Thu May 25 08:34:24 2017 (r318861) +++ user/pho/stress2/misc/bio.sh Thu May 25 08:53:55 2017 (r318862) @@ -50,15 +50,17 @@ rm -f bio.c cd $odir mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint -[ -c md$mdstart ] && mdconfig -d -u $mdstart +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart || exit 1 bsdlabel -w md$mdstart auto newfs -n md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint (cd $mntpoint; /tmp/bio) & +pid1=$! sleep 5 (cd ../testcases/swap; ./swap -t 10m -i 20 -k -l 100 -h) & +pid2=$! while pgrep -q bio; do sleep 2 @@ -67,14 +69,16 @@ done while pgrep -q swap; do pkill -9 swap done -wait +wait $pid2 +wait $pid1 +s=$? while mount | grep "on $mntpoint " | grep -q /dev/md; do umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart rm -rf /tmp/bio -exit +exit $s EOF #include @@ -100,13 +104,16 @@ EOF #define PAGES (512 * 1024 * 1024 / PS) /* 512MB file size */ #define PARALLEL 3 #define RUNTIME (5 * 60) +#define TIMEOUT (20 * 60) char buf[PS]; void test(int inx) { + pid_t pid; size_t i, len, slen; + time_t start; volatile u_int *share; int fd, r; u_int *ip, val; @@ -131,7 +138,9 @@ test(int inx) fd, 0)) == MAP_FAILED) err(1, "mmap"); - if (fork() == 0) { + start = time(NULL); + if ((pid = fork()) == 0) { + alarm(2 * RUNTIME); /* mmap read / write access */ for (i = 0; i < (size_t)(PAGES * PS); i += PS) { while (share[SYN1] == 0) @@ -144,11 +153,16 @@ test(int inx) share[INDX] += PS; ip[share[INDX] / sizeof(u_int)] = share[INDX]; atomic_add_int(&share[SYN2], 1); /* signal parent */ + if (i % 1000 == 0 && time(NULL) - start > TIMEOUT) + errx(1, "Timed out");; } _exit(0); } + if (pid == -1) + err(1, "fork()"); share[INDX] = 0; atomic_add_int(&share[SYN2], 1); + alarm(2 * RUNTIME); for (i = 0; i < (size_t)(PAGES * PS); i += PS) { while (share[SYN2] == 0) sched_yield(); @@ -167,9 +181,11 @@ test(int inx) err(1, "write"); atomic_add_int(&share[SYN1], 1); /* signal child */ + if (i % 1000 == 0 && time(NULL) - start > TIMEOUT) + errx(1, "Timed out");; } atomic_add_int(&share[SYN2], -1); - if (wait(NULL) == -1) + if (waitpid(pid, NULL, 0) != pid) err(1, "wait"); if (munmap(ip, len) == -1) @@ -186,6 +202,7 @@ test(int inx) int main(void) { + pid_t pids[PARALLEL]; time_t start; int i, s, status; @@ -193,13 +210,13 @@ main(void) s = 0; while ((time(NULL) - start) < RUNTIME && s == 0) { for (i = 0; i < PARALLEL; i++) { - if (fork() == 0) + if ((pids[i] = fork()) == 0) test(i); } for (i = 0; i < PARALLEL; i++) { - if (wait(&status) == -1) - err(1, "wait"); - s += WEXITSTATUS(status); + if (waitpid(pids[i], &status, 0) == -1) + err(1, "waitpid(%d)", pids[i]); + s += status == 0 ? 0 : 1; } } From owner-svn-src-user@freebsd.org Fri May 26 01:53:26 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E581FD8273D for ; Fri, 26 May 2017 01:53:26 +0000 (UTC) (envelope-from risk-mcz1@i.softbank.jp) Received: from icmsa400101.i.softbank.jp (imsa4001.mailsv.softbank.jp [101.110.9.77]) (using TLSv1.2 with cipher AES128-SHA (128/128 bits)) (Client CN "smtp.softbank.jp", Issuer "Cybertrust Japan Public CA G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 71F7B18A7 for ; Fri, 26 May 2017 01:53:22 +0000 (UTC) (envelope-from risk-mcz1@i.softbank.jp) Received: from outlook.com by icmsa400101.i.softbank.jp with ESMTP id <20170526015315116.DSHK.57108.icmsa400101.i.softbank.jp@icmsa400101.mailsv.softbank.jp>; Fri, 26 May 2017 10:53:15 +0900 MIME-Version: 1.0 To: tashirol@saclink.csus.edu, info@sonasearch.com, russo@r2tri.com, svn-src-user@freebsd.org, kent@4dimensions.com, bobbi@bobbihansen.com, ben@paperbox.org From: "Sexy Girl" Subject: Re: We over eat in this country Date: Fri, 26 May 2017 04:53:16 +0300 Importance: normal X-Priority: 3 Message-ID: <3gdqdu7-mnqfou-4F@i.softbank.jp> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 May 2017 01:53:27 -0000 I started last sunday and I am aready down two sizes.-https://goo.gl/Q= etyHr