Date: Fri, 16 Mar 2018 16:04:07 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r331062 - in user/markj/vm-playground: . bin/ps contrib/llvm/lib/Target/ARM etc/mtree etc/rc.d gnu/usr.bin/gdb/kgdb lib/libc/net lib/libc/sys lib/libdpv lib/libfigpar lib/libipsec lib/l... Message-ID: <201803161604.w2GG47co091563@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Fri Mar 16 16:04:06 2018 New Revision: 331062 URL: https://svnweb.freebsd.org/changeset/base/331062 Log: Merge from user/jeff/numa at r331061. Added: user/markj/vm-playground/libexec/tftpd/tests/ - copied from r331061, user/jeff/numa/libexec/tftpd/tests/ user/markj/vm-playground/sbin/nvmecontrol/format.c - copied unchanged from r331061, user/jeff/numa/sbin/nvmecontrol/format.c user/markj/vm-playground/stand/efi/libefi/efienv.c - copied unchanged from r331061, user/jeff/numa/stand/efi/libefi/efienv.c user/markj/vm-playground/sys/contrib/zstd/doc/images/zstd_logo86.png - copied unchanged from r331061, user/jeff/numa/sys/contrib/zstd/doc/images/zstd_logo86.png user/markj/vm-playground/sys/contrib/zstd/lib/compress/zstd_compress_internal.h - copied unchanged from r331061, user/jeff/numa/sys/contrib/zstd/lib/compress/zstd_compress_internal.h user/markj/vm-playground/sys/contrib/zstd/tests/seqgen.c - copied unchanged from r331061, user/jeff/numa/sys/contrib/zstd/tests/seqgen.c user/markj/vm-playground/sys/contrib/zstd/tests/seqgen.h - copied unchanged from r331061, user/jeff/numa/sys/contrib/zstd/tests/seqgen.h user/markj/vm-playground/sys/dev/cxgbe/tom/t4_tls.c - copied unchanged from r331061, user/jeff/numa/sys/dev/cxgbe/tom/t4_tls.c user/markj/vm-playground/sys/dev/cxgbe/tom/t4_tls.h - copied unchanged from r331061, user/jeff/numa/sys/dev/cxgbe/tom/t4_tls.h user/markj/vm-playground/usr.sbin/cxgbetool/tcb_common.c - copied unchanged from r331061, user/jeff/numa/usr.sbin/cxgbetool/tcb_common.c user/markj/vm-playground/usr.sbin/cxgbetool/tcb_common.h - copied unchanged from r331061, user/jeff/numa/usr.sbin/cxgbetool/tcb_common.h user/markj/vm-playground/usr.sbin/cxgbetool/tcbinfot4.c - copied unchanged from r331061, user/jeff/numa/usr.sbin/cxgbetool/tcbinfot4.c user/markj/vm-playground/usr.sbin/cxgbetool/tcbinfot5.c - copied unchanged from r331061, user/jeff/numa/usr.sbin/cxgbetool/tcbinfot5.c user/markj/vm-playground/usr.sbin/cxgbetool/tcbinfot6.c - copied unchanged from r331061, user/jeff/numa/usr.sbin/cxgbetool/tcbinfot6.c user/markj/vm-playground/usr.sbin/cxgbetool/tcbshowt4.c - copied unchanged from r331061, user/jeff/numa/usr.sbin/cxgbetool/tcbshowt4.c user/markj/vm-playground/usr.sbin/cxgbetool/tcbshowt5.c - copied unchanged from r331061, user/jeff/numa/usr.sbin/cxgbetool/tcbshowt5.c user/markj/vm-playground/usr.sbin/cxgbetool/tcbshowt6.c - copied unchanged from r331061, user/jeff/numa/usr.sbin/cxgbetool/tcbshowt6.c user/markj/vm-playground/usr.sbin/mpsutil/mps_debug.c - copied unchanged from r331061, user/jeff/numa/usr.sbin/mpsutil/mps_debug.c Deleted: user/markj/vm-playground/sys/arm/conf/BEAGLEBONE-MMCCAM user/markj/vm-playground/sys/arm/conf/IMX6-MMCCAM user/markj/vm-playground/sys/contrib/zstd/lib/compress/zstd_compress.h user/markj/vm-playground/sys/i386/include/pcaudioio.h user/markj/vm-playground/sys/sys/dataacq.h Modified: user/markj/vm-playground/Makefile.inc1 user/markj/vm-playground/bin/ps/extern.h user/markj/vm-playground/bin/ps/keyword.c user/markj/vm-playground/bin/ps/print.c user/markj/vm-playground/bin/ps/ps.1 user/markj/vm-playground/bin/ps/ps.c user/markj/vm-playground/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp user/markj/vm-playground/etc/mtree/BSD.tests.dist user/markj/vm-playground/etc/rc.d/fsck user/markj/vm-playground/etc/rc.d/hostname user/markj/vm-playground/gnu/usr.bin/gdb/kgdb/trgt_amd64.c user/markj/vm-playground/lib/libc/net/getnameinfo.3 user/markj/vm-playground/lib/libc/net/getnameinfo.c user/markj/vm-playground/lib/libc/sys/sendfile.2 user/markj/vm-playground/lib/libdpv/dialog_util.c user/markj/vm-playground/lib/libdpv/dpv.3 user/markj/vm-playground/lib/libdpv/util.c user/markj/vm-playground/lib/libfigpar/figpar.3 user/markj/vm-playground/lib/libipsec/pfkey.c user/markj/vm-playground/lib/libmagic/Makefile user/markj/vm-playground/lib/libsysdecode/mktables user/markj/vm-playground/libexec/tftpd/Makefile user/markj/vm-playground/libexec/tftpd/tftp-transfer.c user/markj/vm-playground/libexec/tftpd/tftpd.c user/markj/vm-playground/release/packages/kernel.ucl user/markj/vm-playground/sbin/ipfw/ipfw.8 user/markj/vm-playground/sbin/mount/mount.c user/markj/vm-playground/sbin/nvmecontrol/Makefile user/markj/vm-playground/sbin/nvmecontrol/identify.c user/markj/vm-playground/sbin/nvmecontrol/logpage.c user/markj/vm-playground/sbin/nvmecontrol/nvmecontrol.8 user/markj/vm-playground/sbin/nvmecontrol/nvmecontrol.c user/markj/vm-playground/sbin/nvmecontrol/nvmecontrol.h user/markj/vm-playground/sbin/sysctl/sysctl.8 user/markj/vm-playground/sbin/sysctl/sysctl.c user/markj/vm-playground/share/examples/Makefile user/markj/vm-playground/share/man/man4/atrtc.4 user/markj/vm-playground/share/man/man5/rc.conf.5 user/markj/vm-playground/share/man/man9/style.9 user/markj/vm-playground/share/misc/committers-ports.dot user/markj/vm-playground/share/misc/pci_vendors user/markj/vm-playground/share/termcap/termcap user/markj/vm-playground/stand/common/bootstrap.h user/markj/vm-playground/stand/common/disk.c user/markj/vm-playground/stand/common/disk.h user/markj/vm-playground/stand/common/interp_lua.c user/markj/vm-playground/stand/common/isapnp.c user/markj/vm-playground/stand/common/load_elf.c user/markj/vm-playground/stand/common/load_elf_obj.c user/markj/vm-playground/stand/common/metadata.c user/markj/vm-playground/stand/common/misc.c user/markj/vm-playground/stand/common/pnp.c user/markj/vm-playground/stand/efi/boot1/boot1.c user/markj/vm-playground/stand/efi/boot1/ufs_module.c user/markj/vm-playground/stand/efi/include/efi.h user/markj/vm-playground/stand/efi/include/efilib.h user/markj/vm-playground/stand/efi/libefi/Makefile user/markj/vm-playground/stand/efi/libefi/devicename.c user/markj/vm-playground/stand/efi/libefi/efipart.c user/markj/vm-playground/stand/efi/libefi/efizfs.c user/markj/vm-playground/stand/efi/libefi/env.c user/markj/vm-playground/stand/efi/loader/arch/arm/exec.c user/markj/vm-playground/stand/efi/loader/bootinfo.c user/markj/vm-playground/stand/efi/loader/main.c user/markj/vm-playground/stand/ficl/aarch64/sysdep.c user/markj/vm-playground/stand/ficl/amd64/sysdep.c user/markj/vm-playground/stand/ficl/arm/sysdep.c user/markj/vm-playground/stand/ficl/i386/sysdep.c user/markj/vm-playground/stand/ficl/mips/sysdep.c user/markj/vm-playground/stand/ficl/mips64/sysdep.c user/markj/vm-playground/stand/ficl/powerpc/sysdep.c user/markj/vm-playground/stand/ficl/riscv/sysdep.c user/markj/vm-playground/stand/ficl/sparc64/sysdep.c user/markj/vm-playground/stand/i386/btx/lib/btxv86.h user/markj/vm-playground/stand/i386/libi386/biosacpi.c user/markj/vm-playground/stand/i386/libi386/bioscd.c user/markj/vm-playground/stand/i386/libi386/biosdisk.c user/markj/vm-playground/stand/i386/libi386/biospnp.c user/markj/vm-playground/stand/i386/libi386/bootinfo32.c user/markj/vm-playground/stand/i386/libi386/bootinfo64.c user/markj/vm-playground/stand/i386/libi386/devicename.c user/markj/vm-playground/stand/i386/libi386/elf64_freebsd.c user/markj/vm-playground/stand/i386/libi386/libi386.h user/markj/vm-playground/stand/i386/libi386/multiboot.c user/markj/vm-playground/stand/i386/libi386/pxe.c user/markj/vm-playground/stand/i386/loader/chain.c user/markj/vm-playground/stand/i386/loader/main.c user/markj/vm-playground/stand/libsa/arp.c user/markj/vm-playground/stand/libsa/bootp.c user/markj/vm-playground/stand/libsa/bootparam.c user/markj/vm-playground/stand/libsa/dosfs.h user/markj/vm-playground/stand/libsa/ext2fs.c user/markj/vm-playground/stand/libsa/net.h user/markj/vm-playground/stand/libsa/rpc.c user/markj/vm-playground/stand/libsa/stand.h user/markj/vm-playground/stand/loader.mk user/markj/vm-playground/stand/lua/config.lua user/markj/vm-playground/stand/lua/core.lua user/markj/vm-playground/stand/lua/menu.lua user/markj/vm-playground/stand/mips/beri/boot2/boot2.c user/markj/vm-playground/stand/mips/beri/common/altera_jtag_uart.c user/markj/vm-playground/stand/mips/beri/common/cons.h user/markj/vm-playground/stand/mips/beri/loader/beri_console.c user/markj/vm-playground/stand/mips/beri/loader/beri_disk_cfi.c user/markj/vm-playground/stand/mips/beri/loader/beri_disk_sdcard.c user/markj/vm-playground/stand/mips/beri/loader/devicename.c user/markj/vm-playground/stand/ofw/libofw/devicename.c user/markj/vm-playground/stand/ofw/libofw/libofw.h user/markj/vm-playground/stand/ofw/libofw/openfirm.c user/markj/vm-playground/stand/powerpc/boot1.chrp/boot1.c user/markj/vm-playground/stand/powerpc/kboot/ppc64_elf_freebsd.c user/markj/vm-playground/stand/powerpc/ofw/elf_freebsd.c user/markj/vm-playground/stand/powerpc/ofw/main.c user/markj/vm-playground/stand/powerpc/ofw/ppc64_elf_freebsd.c user/markj/vm-playground/stand/sparc64/boot1/boot1.c user/markj/vm-playground/stand/sparc64/loader/main.c user/markj/vm-playground/stand/uboot/common/main.c user/markj/vm-playground/stand/uboot/lib/devicename.c user/markj/vm-playground/stand/uboot/lib/disk.c user/markj/vm-playground/stand/uboot/lib/elf_freebsd.c user/markj/vm-playground/stand/uboot/lib/libuboot.h user/markj/vm-playground/stand/userboot/userboot/bootinfo32.c user/markj/vm-playground/stand/userboot/userboot/bootinfo64.c user/markj/vm-playground/stand/userboot/userboot/devicename.c user/markj/vm-playground/stand/userboot/userboot/elf64_freebsd.c user/markj/vm-playground/stand/userboot/userboot/main.c user/markj/vm-playground/stand/userboot/userboot/userboot_disk.c user/markj/vm-playground/stand/zfs/libzfs.h user/markj/vm-playground/stand/zfs/zfs.c user/markj/vm-playground/sys/amd64/amd64/efirt_machdep.c (contents, props changed) user/markj/vm-playground/sys/amd64/linux/linux_sysvec.c user/markj/vm-playground/sys/amd64/linux32/linux32_sysvec.c user/markj/vm-playground/sys/arm/allwinner/clkng/ccu_sun8i_r.c user/markj/vm-playground/sys/arm/broadcom/bcm2835/bcm2835_rng.c user/markj/vm-playground/sys/arm64/arm64/efirt_machdep.c user/markj/vm-playground/sys/arm64/arm64/gicv3_its.c user/markj/vm-playground/sys/cam/ata/ata_da.c user/markj/vm-playground/sys/cam/cam_iosched.c user/markj/vm-playground/sys/cam/cam_periph.c user/markj/vm-playground/sys/cam/cam_periph.h user/markj/vm-playground/sys/cam/ctl/ctl_frontend_iscsi.c user/markj/vm-playground/sys/cam/ctl/ctl_frontend_iscsi.h user/markj/vm-playground/sys/cam/nvme/nvme_da.c user/markj/vm-playground/sys/cam/scsi/scsi_da.c user/markj/vm-playground/sys/cam/scsi/scsi_enc.c user/markj/vm-playground/sys/cam/scsi/scsi_pass.c user/markj/vm-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c user/markj/vm-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h user/markj/vm-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c user/markj/vm-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/markj/vm-playground/sys/compat/linux/linux_ioctl.c user/markj/vm-playground/sys/compat/linux/linux_signal.c user/markj/vm-playground/sys/compat/linux/linux_stats.c user/markj/vm-playground/sys/compat/linux/linux_util.c user/markj/vm-playground/sys/compat/linuxkpi/common/include/linux/kernel.h user/markj/vm-playground/sys/compat/linuxkpi/common/src/linux_compat.c user/markj/vm-playground/sys/conf/NOTES user/markj/vm-playground/sys/conf/config.mk user/markj/vm-playground/sys/conf/files.powerpc user/markj/vm-playground/sys/conf/kern.mk user/markj/vm-playground/sys/conf/kern.opts.mk user/markj/vm-playground/sys/conf/kern.post.mk user/markj/vm-playground/sys/conf/kern.pre.mk user/markj/vm-playground/sys/conf/options user/markj/vm-playground/sys/contrib/dev/acpica/changes.txt user/markj/vm-playground/sys/contrib/dev/acpica/components/debugger/dbdisply.c user/markj/vm-playground/sys/contrib/dev/acpica/components/dispatcher/dspkginit.c user/markj/vm-playground/sys/contrib/dev/acpica/components/events/evevent.c user/markj/vm-playground/sys/contrib/dev/acpica/components/events/evgpe.c user/markj/vm-playground/sys/contrib/dev/acpica/components/events/evgpeblk.c user/markj/vm-playground/sys/contrib/dev/acpica/components/events/evrgnini.c user/markj/vm-playground/sys/contrib/dev/acpica/components/events/evxface.c user/markj/vm-playground/sys/contrib/dev/acpica/components/events/evxfgpe.c user/markj/vm-playground/sys/contrib/dev/acpica/components/executer/exdebug.c user/markj/vm-playground/sys/contrib/dev/acpica/components/hardware/hwgpe.c user/markj/vm-playground/sys/contrib/dev/acpica/components/hardware/hwsleep.c user/markj/vm-playground/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c user/markj/vm-playground/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c user/markj/vm-playground/sys/contrib/dev/acpica/components/namespace/nseval.c user/markj/vm-playground/sys/contrib/dev/acpica/components/namespace/nsload.c user/markj/vm-playground/sys/contrib/dev/acpica/components/namespace/nsparse.c user/markj/vm-playground/sys/contrib/dev/acpica/components/namespace/nsxfname.c user/markj/vm-playground/sys/contrib/dev/acpica/components/parser/psargs.c user/markj/vm-playground/sys/contrib/dev/acpica/components/parser/psloop.c user/markj/vm-playground/sys/contrib/dev/acpica/components/parser/psobject.c user/markj/vm-playground/sys/contrib/dev/acpica/components/tables/tbdata.c user/markj/vm-playground/sys/contrib/dev/acpica/components/tables/tbinstal.c user/markj/vm-playground/sys/contrib/dev/acpica/components/tables/tbxfload.c user/markj/vm-playground/sys/contrib/dev/acpica/components/utilities/utosi.c user/markj/vm-playground/sys/contrib/dev/acpica/components/utilities/utxfinit.c user/markj/vm-playground/sys/contrib/dev/acpica/include/acevents.h user/markj/vm-playground/sys/contrib/dev/acpica/include/acmacros.h user/markj/vm-playground/sys/contrib/dev/acpica/include/acpixf.h user/markj/vm-playground/sys/contrib/dev/acpica/include/actypes.h user/markj/vm-playground/sys/contrib/zstd/Makefile user/markj/vm-playground/sys/contrib/zstd/NEWS user/markj/vm-playground/sys/contrib/zstd/README.md user/markj/vm-playground/sys/contrib/zstd/circle.yml user/markj/vm-playground/sys/contrib/zstd/contrib/meson/meson.build user/markj/vm-playground/sys/contrib/zstd/doc/zstd_compression_format.md user/markj/vm-playground/sys/contrib/zstd/doc/zstd_manual.html user/markj/vm-playground/sys/contrib/zstd/lib/BUCK user/markj/vm-playground/sys/contrib/zstd/lib/common/bitstream.h user/markj/vm-playground/sys/contrib/zstd/lib/common/mem.h user/markj/vm-playground/sys/contrib/zstd/lib/common/pool.c user/markj/vm-playground/sys/contrib/zstd/lib/common/xxhash.c user/markj/vm-playground/sys/contrib/zstd/lib/common/zstd_common.c user/markj/vm-playground/sys/contrib/zstd/lib/common/zstd_internal.h user/markj/vm-playground/sys/contrib/zstd/lib/compress/zstd_compress.c user/markj/vm-playground/sys/contrib/zstd/lib/compress/zstd_double_fast.c user/markj/vm-playground/sys/contrib/zstd/lib/compress/zstd_double_fast.h user/markj/vm-playground/sys/contrib/zstd/lib/compress/zstd_fast.c user/markj/vm-playground/sys/contrib/zstd/lib/compress/zstd_fast.h user/markj/vm-playground/sys/contrib/zstd/lib/compress/zstd_lazy.c user/markj/vm-playground/sys/contrib/zstd/lib/compress/zstd_lazy.h user/markj/vm-playground/sys/contrib/zstd/lib/compress/zstd_ldm.h user/markj/vm-playground/sys/contrib/zstd/lib/compress/zstd_opt.c user/markj/vm-playground/sys/contrib/zstd/lib/compress/zstd_opt.h user/markj/vm-playground/sys/contrib/zstd/lib/compress/zstdmt_compress.c user/markj/vm-playground/sys/contrib/zstd/lib/compress/zstdmt_compress.h user/markj/vm-playground/sys/contrib/zstd/lib/decompress/zstd_decompress.c user/markj/vm-playground/sys/contrib/zstd/lib/deprecated/zbuff_compress.c user/markj/vm-playground/sys/contrib/zstd/lib/dictBuilder/zdict.c user/markj/vm-playground/sys/contrib/zstd/lib/legacy/zstd_v01.c user/markj/vm-playground/sys/contrib/zstd/lib/legacy/zstd_v02.c user/markj/vm-playground/sys/contrib/zstd/lib/legacy/zstd_v03.c user/markj/vm-playground/sys/contrib/zstd/lib/legacy/zstd_v04.c user/markj/vm-playground/sys/contrib/zstd/lib/legacy/zstd_v05.c user/markj/vm-playground/sys/contrib/zstd/lib/legacy/zstd_v06.c user/markj/vm-playground/sys/contrib/zstd/lib/legacy/zstd_v07.c user/markj/vm-playground/sys/contrib/zstd/lib/zstd.h user/markj/vm-playground/sys/contrib/zstd/programs/BUCK user/markj/vm-playground/sys/contrib/zstd/programs/Makefile user/markj/vm-playground/sys/contrib/zstd/programs/bench.c user/markj/vm-playground/sys/contrib/zstd/programs/bench.h user/markj/vm-playground/sys/contrib/zstd/programs/dibio.c user/markj/vm-playground/sys/contrib/zstd/programs/fileio.c user/markj/vm-playground/sys/contrib/zstd/programs/fileio.h user/markj/vm-playground/sys/contrib/zstd/programs/platform.h user/markj/vm-playground/sys/contrib/zstd/programs/util.h user/markj/vm-playground/sys/contrib/zstd/programs/zstd.1 user/markj/vm-playground/sys/contrib/zstd/programs/zstd.1.md user/markj/vm-playground/sys/contrib/zstd/programs/zstdcli.c user/markj/vm-playground/sys/contrib/zstd/tests/Makefile user/markj/vm-playground/sys/contrib/zstd/tests/decodecorpus.c user/markj/vm-playground/sys/contrib/zstd/tests/fullbench.c user/markj/vm-playground/sys/contrib/zstd/tests/fuzzer.c user/markj/vm-playground/sys/contrib/zstd/tests/paramgrill.c user/markj/vm-playground/sys/contrib/zstd/tests/playTests.sh user/markj/vm-playground/sys/contrib/zstd/tests/zbufftest.c user/markj/vm-playground/sys/contrib/zstd/tests/zstreamtest.c user/markj/vm-playground/sys/contrib/zstd/zlibWrapper/BUCK user/markj/vm-playground/sys/contrib/zstd/zlibWrapper/examples/zwrapbench.c user/markj/vm-playground/sys/contrib/zstd/zlibWrapper/zstd_zlibwrapper.c user/markj/vm-playground/sys/crypto/aesni/aesni.c user/markj/vm-playground/sys/dev/aac/aac.c user/markj/vm-playground/sys/dev/aacraid/aacraid.c user/markj/vm-playground/sys/dev/acpica/acpi.c user/markj/vm-playground/sys/dev/acpica/acpivar.h user/markj/vm-playground/sys/dev/bwn/if_bwn.c user/markj/vm-playground/sys/dev/cxgbe/adapter.h user/markj/vm-playground/sys/dev/cxgbe/firmware/t6fw_cfg.txt user/markj/vm-playground/sys/dev/cxgbe/offload.h user/markj/vm-playground/sys/dev/cxgbe/t4_main.c user/markj/vm-playground/sys/dev/cxgbe/tom/t4_connect.c user/markj/vm-playground/sys/dev/cxgbe/tom/t4_cpl_io.c user/markj/vm-playground/sys/dev/cxgbe/tom/t4_ddp.c user/markj/vm-playground/sys/dev/cxgbe/tom/t4_listen.c user/markj/vm-playground/sys/dev/cxgbe/tom/t4_tom.c user/markj/vm-playground/sys/dev/cxgbe/tom/t4_tom.h user/markj/vm-playground/sys/dev/e1000/e1000_82575.c user/markj/vm-playground/sys/dev/e1000/e1000_mbx.c user/markj/vm-playground/sys/dev/e1000/e1000_phy.c user/markj/vm-playground/sys/dev/e1000/e1000_vf.c user/markj/vm-playground/sys/dev/efidev/efirt.c (contents, props changed) user/markj/vm-playground/sys/dev/extres/regulator/regulator.c user/markj/vm-playground/sys/dev/extres/regulator/regulator.h user/markj/vm-playground/sys/dev/iscsi/iscsi.c user/markj/vm-playground/sys/dev/isp/isp.c user/markj/vm-playground/sys/dev/isp/isp_freebsd.c user/markj/vm-playground/sys/dev/md/md.c user/markj/vm-playground/sys/dev/mlx5/driver.h user/markj/vm-playground/sys/dev/mpr/mpr.c user/markj/vm-playground/sys/dev/mps/mps.c user/markj/vm-playground/sys/dev/mps/mps_sas_lsi.c user/markj/vm-playground/sys/dev/mps/mpsvar.h user/markj/vm-playground/sys/dev/nvme/nvme.h user/markj/vm-playground/sys/dev/nvme/nvme_ctrlr.c user/markj/vm-playground/sys/dev/nvme/nvme_ns.c user/markj/vm-playground/sys/dev/nvme/nvme_qpair.c user/markj/vm-playground/sys/dev/otus/if_otus.c user/markj/vm-playground/sys/dev/ral/rt2560.c user/markj/vm-playground/sys/dev/ral/rt2661.c user/markj/vm-playground/sys/dev/rtwn/rtl8188e/r88e_chan.c user/markj/vm-playground/sys/dev/rtwn/rtl8192c/r92c_chan.c user/markj/vm-playground/sys/dev/usb/wlan/if_rum.c user/markj/vm-playground/sys/dev/usb/wlan/if_run.c user/markj/vm-playground/sys/dev/usb/wlan/if_uath.c user/markj/vm-playground/sys/dev/usb/wlan/if_upgt.c user/markj/vm-playground/sys/dev/usb/wlan/if_ural.c user/markj/vm-playground/sys/dev/usb/wlan/if_urtw.c user/markj/vm-playground/sys/dev/usb/wlan/if_zyd.c user/markj/vm-playground/sys/dev/vt/hw/vga/vt_vga.c user/markj/vm-playground/sys/dts/arm/rpi.dts user/markj/vm-playground/sys/dts/arm/rpi2.dts user/markj/vm-playground/sys/geom/geom.h user/markj/vm-playground/sys/geom/geom_subr.c user/markj/vm-playground/sys/i386/linux/imgact_linux.c user/markj/vm-playground/sys/i386/linux/linux_machdep.c user/markj/vm-playground/sys/i386/linux/linux_sysvec.c user/markj/vm-playground/sys/isa/rtc.h user/markj/vm-playground/sys/kern/imgact_aout.c user/markj/vm-playground/sys/kern/imgact_binmisc.c user/markj/vm-playground/sys/kern/imgact_elf.c user/markj/vm-playground/sys/kern/imgact_gzip.c user/markj/vm-playground/sys/kern/imgact_shell.c user/markj/vm-playground/sys/kern/subr_gtaskqueue.c user/markj/vm-playground/sys/kern/subr_uio.c user/markj/vm-playground/sys/kern/tty_compat.c user/markj/vm-playground/sys/kern/vfs_bio.c user/markj/vm-playground/sys/kern/vfs_mountroot.c user/markj/vm-playground/sys/mips/include/param.h user/markj/vm-playground/sys/mips/mips/support.S user/markj/vm-playground/sys/modules/aac/Makefile user/markj/vm-playground/sys/modules/aacraid/Makefile user/markj/vm-playground/sys/modules/cam/Makefile user/markj/vm-playground/sys/modules/cxgbe/tom/Makefile user/markj/vm-playground/sys/modules/isp/Makefile user/markj/vm-playground/sys/modules/usb/rum/Makefile user/markj/vm-playground/sys/modules/usb/run/Makefile user/markj/vm-playground/sys/modules/usb/uath/Makefile user/markj/vm-playground/sys/modules/usb/upgt/Makefile user/markj/vm-playground/sys/modules/usb/ural/Makefile user/markj/vm-playground/sys/modules/usb/urtw/Makefile user/markj/vm-playground/sys/modules/usb/zyd/Makefile user/markj/vm-playground/sys/net80211/ieee80211_output.c user/markj/vm-playground/sys/net80211/ieee80211_proto.h user/markj/vm-playground/sys/netipsec/keysock.c user/markj/vm-playground/sys/netipsec/keysock.h user/markj/vm-playground/sys/netpfil/ipfw/ip_fw2.c user/markj/vm-playground/sys/powerpc/aim/aim_machdep.c user/markj/vm-playground/sys/powerpc/aim/locore64.S user/markj/vm-playground/sys/powerpc/aim/mmu_oea64.c user/markj/vm-playground/sys/powerpc/ofw/ofw_machdep.c user/markj/vm-playground/sys/powerpc/ofw/ofwcall64.S user/markj/vm-playground/sys/powerpc/powerpc/machdep.c user/markj/vm-playground/sys/sys/aac_ioctl.h user/markj/vm-playground/sys/sys/imgact_elf.h user/markj/vm-playground/sys/sys/mdioctl.h user/markj/vm-playground/sys/vm/vm_kern.c user/markj/vm-playground/sys/vm/vm_page.c user/markj/vm-playground/sys/vm/vm_reserv.c user/markj/vm-playground/sys/vm/vm_reserv.h user/markj/vm-playground/sys/x86/isa/atrtc.c user/markj/vm-playground/sys/x86/isa/clock.c user/markj/vm-playground/sys/x86/x86/identcpu.c user/markj/vm-playground/tests/sys/cddl/zfs/include/libtest.kshlib user/markj/vm-playground/tests/sys/cddl/zfs/tests/cache/cache.kshlib user/markj/vm-playground/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh user/markj/vm-playground/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_005_neg.ksh user/markj/vm-playground/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib user/markj/vm-playground/tests/sys/cddl/zfs/tests/cli_root/zpool_export/setup.ksh user/markj/vm-playground/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg user/markj/vm-playground/tests/sys/cddl/zfs/tests/cli_root/zpool_get/setup.ksh user/markj/vm-playground/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg user/markj/vm-playground/tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh user/markj/vm-playground/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history.cfg user/markj/vm-playground/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh user/markj/vm-playground/tests/sys/cddl/zfs/tests/hotplug/setup.ksh user/markj/vm-playground/tests/sys/cddl/zfs/tests/slog/slog.kshlib user/markj/vm-playground/usr.bin/calendar/calendars/calendar.freebsd user/markj/vm-playground/usr.bin/dpv/dpv.1 user/markj/vm-playground/usr.bin/iscsictl/iscsictl.c user/markj/vm-playground/usr.bin/tftp/tftp.c user/markj/vm-playground/usr.sbin/bhyvectl/bhyvectl.c user/markj/vm-playground/usr.sbin/bsdconfig/bsdconfig.8 user/markj/vm-playground/usr.sbin/cxgbetool/Makefile user/markj/vm-playground/usr.sbin/cxgbetool/cxgbetool.c user/markj/vm-playground/usr.sbin/lpr/common_source/ctlinfo.c user/markj/vm-playground/usr.sbin/mpsutil/Makefile user/markj/vm-playground/usr.sbin/mpsutil/mps_show.c user/markj/vm-playground/usr.sbin/mpsutil/mpsutil.c user/markj/vm-playground/usr.sbin/mpsutil/mpsutil.h user/markj/vm-playground/usr.sbin/usbconfig/usbconfig.8 user/markj/vm-playground/usr.sbin/usbconfig/usbconfig.c Directory Properties: user/markj/vm-playground/ (props changed) user/markj/vm-playground/contrib/llvm/ (props changed) user/markj/vm-playground/gnu/usr.bin/gdb/ (props changed) user/markj/vm-playground/sys/cddl/contrib/opensolaris/ (props changed) user/markj/vm-playground/sys/contrib/dev/acpica/ (props changed) user/markj/vm-playground/sys/contrib/zstd/ (props changed) user/markj/vm-playground/usr.sbin/cxgbetool/reg_defs_t5.c (props changed) user/markj/vm-playground/usr.sbin/cxgbetool/reg_defs_t6.c (props changed) Modified: user/markj/vm-playground/Makefile.inc1 ============================================================================== --- user/markj/vm-playground/Makefile.inc1 Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/Makefile.inc1 Fri Mar 16 16:04:06 2018 (r331062) @@ -1698,6 +1698,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_defaul pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \ sed -e "s/%VERSION%/${PKG_VERSION}/" \ -e "s/%PKGNAME%/kernel-${INSTALLKERNEL:tl}${flavor}/" \ + -e "s/%KERNELDIR%/kernel/" \ -e "s/%COMMENT%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \ -e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \ -e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \ @@ -1733,6 +1734,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_ pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \ sed -e "s/%VERSION%/${PKG_VERSION}/" \ -e "s/%PKGNAME%/kernel-${_kernel:tl}${flavor}/" \ + -e "s/%KERNELDIR%/kernel.${_kernel}/" \ -e "s/%COMMENT%/FreeBSD ${_kernel} kernel ${flavor}/" \ -e "s/%DESC%/FreeBSD ${_kernel} kernel ${flavor}/" \ -e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \ Modified: user/markj/vm-playground/bin/ps/extern.h ============================================================================== --- user/markj/vm-playground/bin/ps/extern.h Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/bin/ps/extern.h Fri Mar 16 16:04:06 2018 (r331062) @@ -55,6 +55,7 @@ char *emulname(KINFO *, VARENT *); VARENT *find_varentry(VAR *); const char *fmt_argv(char **, char *, char *, size_t); double getpcpu(const KINFO *); +char *jailname(KINFO *, VARENT *); char *kvar(KINFO *, VARENT *); char *label(KINFO *, VARENT *); char *loginclass(KINFO *, VARENT *); Modified: user/markj/vm-playground/bin/ps/keyword.c ============================================================================== --- user/markj/vm-playground/bin/ps/keyword.c Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/bin/ps/keyword.c Fri Mar 16 16:04:06 2018 (r331062) @@ -108,6 +108,7 @@ static VAR var[] = { {"inblk", "INBLK", NULL, "read-blocks", USER, rvar, ROFF(ru_inblock), LONG, "ld", 0}, {"inblock", "", "inblk", NULL, 0, NULL, 0, CHAR, NULL, 0}, + {"jail", "JAIL", NULL, "jail-name", LJUST, jailname, 0, CHAR, NULL, 0}, {"jid", "JID", NULL, "jail-id", 0, kvar, KOFF(ki_jid), INT, "d", 0}, {"jobc", "JOBC", NULL, "job-control-count", 0, kvar, KOFF(ki_jobc), SHORT, "d", 0}, Modified: user/markj/vm-playground/bin/ps/print.c ============================================================================== --- user/markj/vm-playground/bin/ps/print.c Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/bin/ps/print.c Fri Mar 16 16:04:06 2018 (r331062) @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include <err.h> #include <grp.h> +#include <jail.h> #include <langinfo.h> #include <locale.h> #include <math.h> @@ -839,4 +840,17 @@ loginclass(KINFO *k, VARENT *ve __unused) return (strdup("-")); } return (strdup(k->ki_p->ki_loginclass)); +} + +char * +jailname(KINFO *k, VARENT *ve __unused) +{ + char *name; + + if (k->ki_p->ki_jid == 0) + return (strdup("-")); + name = jail_getname(k->ki_p->ki_jid); + if (name == NULL) + return (strdup("-")); + return (name); } Modified: user/markj/vm-playground/bin/ps/ps.1 ============================================================================== --- user/markj/vm-playground/bin/ps/ps.1 Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/bin/ps/ps.1 Fri Mar 16 16:04:06 2018 (r331062) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd January 23, 2018 +.Dd March 13, 2018 .Dt PS 1 .Os .Sh NAME @@ -101,6 +101,14 @@ The default output format includes, for each process, controlling terminal, state, CPU time (including both user and system time) and associated command. .Pp +If the +.Nm +process is associated with a terminal, the default output width is that of the +terminal; otherwise the output width is unlimited. +See also the +.Fl w +option. +.Pp The options are as follows: .Bl -tag -width indent .It Fl -libxo @@ -257,13 +265,15 @@ option implies the .Fl m option. .It Fl w -Use 132 columns to display information, instead of the default which -is your window size. +Use at least 132 columns to display information, instead of the default which +is the window size if +.Nm +is associated with a terminal. If the .Fl w option is specified more than once, .Nm -will use as many columns as necessary without regard for your window size. +will use as many columns as necessary without regard for the window size. Note that this option has no effect if the .Dq command column is not the last column displayed. @@ -566,6 +576,8 @@ group name (from egid) (alias .It Cm inblk total blocks read (alias .Cm inblock ) +.It Cm jail +jail name .It Cm jid jail ID .It Cm jobc Modified: user/markj/vm-playground/bin/ps/ps.c ============================================================================== --- user/markj/vm-playground/bin/ps/ps.c Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/bin/ps/ps.c Fri Mar 16 16:04:06 2018 (r331062) @@ -202,6 +202,11 @@ main(int argc, char *argv[]) * any of stdout, stderr, or stdin is a terminal. The intent * is that "ps", "ps | more", and "ps | grep" all use the same * default line length unless -w is specified. + * + * If not interactive, the default length was traditionally 79. + * It has been changed to unlimited. This is mostly for the + * benefit of non-interactive scripts, which arguably should + * use -ww, but is compatible with Linux. */ if ((cols = getenv("COLUMNS")) != NULL && *cols != '\0') termwidth = atoi(cols); @@ -209,7 +214,7 @@ main(int argc, char *argv[]) ioctl(STDERR_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && ioctl(STDIN_FILENO, TIOCGWINSZ, (char *)&ws) == -1) || ws.ws_col == 0) - termwidth = 79; + termwidth = UNLIMITED; else termwidth = ws.ws_col - 1; Modified: user/markj/vm-playground/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp ============================================================================== --- user/markj/vm-playground/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp Fri Mar 16 16:04:06 2018 (r331062) @@ -10201,7 +10201,14 @@ static SDValue PerformSHLSimplify(SDNode *N, case ISD::XOR: case ISD::SETCC: case ARMISD::CMP: - // Check that its not already using a shl. + // Check that the user isn't already using a constant because there + // aren't any instructions that support an immediate operand and a + // shifted operand. + if (isa<ConstantSDNode>(U->getOperand(0)) || + isa<ConstantSDNode>(U->getOperand(1))) + return SDValue(); + + // Check that it's not already using a shift. if (U->getOperand(0).getOpcode() == ISD::SHL || U->getOperand(1).getOpcode() == ISD::SHL) return SDValue(); @@ -10223,8 +10230,6 @@ static SDValue PerformSHLSimplify(SDNode *N, if (!C1ShlC2 || !C2) return SDValue(); - DEBUG(dbgs() << "Trying to simplify shl: "; N->dump()); - APInt C2Int = C2->getAPIntValue(); APInt C1Int = C1ShlC2->getAPIntValue(); @@ -10238,12 +10243,12 @@ static SDValue PerformSHLSimplify(SDNode *N, C1Int.lshrInPlace(C2Int); // The immediates are encoded as an 8-bit value that can be rotated. - unsigned Zeros = C1Int.countLeadingZeros() + C1Int.countTrailingZeros(); - if (C1Int.getBitWidth() - Zeros > 8) - return SDValue(); + auto LargeImm = [](const APInt &Imm) { + unsigned Zeros = Imm.countLeadingZeros() + Imm.countTrailingZeros(); + return Imm.getBitWidth() - Zeros > 8; + }; - Zeros = C2Int.countLeadingZeros() + C2Int.countTrailingZeros(); - if (C2Int.getBitWidth() - Zeros > 8) + if (LargeImm(C1Int) || LargeImm(C2Int)) return SDValue(); SelectionDAG &DAG = DCI.DAG; @@ -10253,6 +10258,10 @@ static SDValue PerformSHLSimplify(SDNode *N, DAG.getConstant(C1Int, dl, MVT::i32)); // Shift left to compensate for the lshr of C1Int. SDValue Res = DAG.getNode(ISD::SHL, dl, MVT::i32, BinOp, SHL.getOperand(1)); + + DEBUG(dbgs() << "Simplify shl use:\n"; SHL.getOperand(0).dump(); SHL.dump(); + N->dump()); + DEBUG(dbgs() << "Into:\n"; X.dump(); BinOp.dump(); Res.dump()); DAG.ReplaceAllUsesWith(SDValue(N, 0), Res); return SDValue(N, 0); Modified: user/markj/vm-playground/etc/mtree/BSD.tests.dist ============================================================================== --- user/markj/vm-playground/etc/mtree/BSD.tests.dist Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/etc/mtree/BSD.tests.dist Fri Mar 16 16:04:06 2018 (r331062) @@ -382,6 +382,8 @@ .. rtld-elf .. + tftpd + .. .. sbin dhclient Modified: user/markj/vm-playground/etc/rc.d/fsck ============================================================================== --- user/markj/vm-playground/etc/rc.d/fsck Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/etc/rc.d/fsck Fri Mar 16 16:04:06 2018 (r331062) @@ -57,7 +57,7 @@ fsck_start() echo "Reboot failed; help!" stop_boot ;; - 8) + 8|16) if checkyesno fsck_y_enable; then echo "File system preen failed, trying fsck -y ${fsck_y_flags}" fsck -y ${fsck_y_flags} Modified: user/markj/vm-playground/etc/rc.d/hostname ============================================================================== --- user/markj/vm-playground/etc/rc.d/hostname Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/etc/rc.d/hostname Fri Mar 16 16:04:06 2018 (r331062) @@ -60,9 +60,11 @@ hostname_start() # Have we got a hostname yet? # if [ -z "${hostname}" ]; then - # Null hostname is probably OK if DHCP is in use. + # Null hostname is probably OK if DHCP is in use, + # or when hostname is already set (common for jails). # - if [ -z "`list_net_interfaces dhcp`" ]; then + if [ -z "`list_net_interfaces dhcp`" -a \ + -z "`/bin/hostname`" ]; then warn "\$hostname is not set -- see rc.conf(5)." fi return Modified: user/markj/vm-playground/gnu/usr.bin/gdb/kgdb/trgt_amd64.c ============================================================================== --- user/markj/vm-playground/gnu/usr.bin/gdb/kgdb/trgt_amd64.c Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/gnu/usr.bin/gdb/kgdb/trgt_amd64.c Fri Mar 16 16:04:06 2018 (r331062) @@ -189,6 +189,7 @@ kgdb_trgt_trapframe_sniffer(struct frame_info *next_fr if (pname == NULL) return (NULL); if (strcmp(pname, "calltrap") == 0 || + strcmp(pname, "fast_syscall_common") == 0 || strcmp(pname, "mchk_calltrap") == 0 || strcmp(pname, "nmi_calltrap") == 0 || (pname[0] == 'X' && pname[1] != '_')) Modified: user/markj/vm-playground/lib/libc/net/getnameinfo.3 ============================================================================== --- user/markj/vm-playground/lib/libc/net/getnameinfo.3 Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/lib/libc/net/getnameinfo.3 Fri Mar 16 16:04:06 2018 (r331062) @@ -18,7 +18,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 28, 2016 +.Dd March 15, 2018 .Dt GETNAMEINFO 3 .Os .Sh NAME @@ -80,6 +80,20 @@ or UNIX-domain respectively that is .Fa salen bytes long. +If +.Fa salen +is shorter than the length corresponding to the specified +address family or longer than +.Fn sizeof "struct sockaddr_storage" , +it returns +.Er EAI_FAMILY . +Note that +.Va sa->sa_len +should be consistent with +.Fa salen +though the value of +.Va sa->sa_len +is not directly used in this function. .Pp The host and service names associated with .Fa sa Modified: user/markj/vm-playground/lib/libc/net/getnameinfo.c ============================================================================== --- user/markj/vm-playground/lib/libc/net/getnameinfo.c Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/lib/libc/net/getnameinfo.c Fri Mar 16 16:04:06 2018 (r331062) @@ -124,26 +124,36 @@ getnameinfo(const struct sockaddr *sa, socklen_t salen afd = find_afd(sa->sa_family); if (afd == NULL) return (EAI_FAMILY); + /* + * getnameinfo() accepts an salen of sizeof(struct sockaddr_storage) + * at maximum as shown in RFC 4038 Sec.6.2.3. + */ + if (salen > sizeof(struct sockaddr_storage)) + return (EAI_FAMILY); + switch (sa->sa_family) { case PF_LOCAL: /* - * PF_LOCAL uses variable sa->sa_len depending on the + * PF_LOCAL uses variable salen depending on the * content length of sun_path. Require 1 byte in * sun_path at least. */ - if (salen > afd->a_socklen || - salen <= afd->a_socklen - + if (salen <= afd->a_socklen - sizeofmember(struct sockaddr_un, sun_path)) - return (EAI_FAIL); + return (EAI_FAMILY); + else if (salen > afd->a_socklen) + salen = afd->a_socklen; break; case PF_LINK: if (salen <= afd->a_socklen - sizeofmember(struct sockaddr_dl, sdl_data)) - return (EAI_FAIL); + return (EAI_FAMILY); break; default: - if (salen != afd->a_socklen) - return (EAI_FAIL); + if (salen < afd->a_socklen) + return (EAI_FAMILY); + else + salen = afd->a_socklen; break; } @@ -517,7 +527,7 @@ getnameinfo_un(const struct afd *afd, if (serv != NULL && servlen > 0) *serv = '\0'; if (host != NULL && hostlen > 0) { - pathlen = sa->sa_len - afd->a_off; + pathlen = salen - afd->a_off; if (pathlen + 1 > hostlen) { *host = '\0'; Modified: user/markj/vm-playground/lib/libc/sys/sendfile.2 ============================================================================== --- user/markj/vm-playground/lib/libc/sys/sendfile.2 Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/lib/libc/sys/sendfile.2 Fri Mar 16 16:04:06 2018 (r331062) @@ -129,8 +129,8 @@ Starting with .Nm sending files off the .Xr ffs 7 -filesystem doesn't block on I/O -(see +filesystem does not block on I/O +(see .Sx IMPLEMENTATION NOTES ), so the condition no longer applies. However, it is safe if an application utilizes @@ -140,8 +140,8 @@ and on performs the same action as it did in older .Fx -versions, e.g. -.Xr aio_read 2, +versions, e.g., +.Xr aio_read 2 , .Xr read 2 or .Nm @@ -210,7 +210,7 @@ The .Fx implementation of .Fn sendfile -doesn't block on disk I/O when it sends a file off the +does not block on disk I/O when it sends a file off the .Xr ffs 7 filesystem. The syscall returns success before the actual I/O completes, and data Modified: user/markj/vm-playground/lib/libdpv/dialog_util.c ============================================================================== --- user/markj/vm-playground/lib/libdpv/dialog_util.c Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/lib/libdpv/dialog_util.c Fri Mar 16 16:04:06 2018 (r331062) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2013-2014 Devin Teske <dteske@FreeBSD.org> + * Copyright (c) 2013-2018 Devin Teske <dteske@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -328,8 +328,7 @@ dialog_spawn_gauge(char *init_prompt, pid_t *pid) posix_spawn_file_actions_addclose(&action, stdin_pipe[1]); error = posix_spawnp(pid, dialog, &action, (const posix_spawnattr_t *)NULL, dargv, environ); - if (error != 0) - err(EXIT_FAILURE, "%s: posix_spawnp(3)", __func__); + if (error != 0) err(EXIT_FAILURE, "%s", dialog); /* NB: Do not free(3) *dargv[], else SIGSEGV */ Modified: user/markj/vm-playground/lib/libdpv/dpv.3 ============================================================================== --- user/markj/vm-playground/lib/libdpv/dpv.3 Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/lib/libdpv/dpv.3 Fri Mar 16 16:04:06 2018 (r331062) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2013-2016 Devin Teske +.\" Copyright (c) 2013-2018 Devin Teske .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Jan 26, 2016 +.Dd March 13, 2018 .Dt DPV 3 .Os .Sh NAME @@ -36,7 +36,8 @@ .In dpv.h .Ft int .Fo dpv -.Fa "struct dpv_config *config, struct dpv_file_node *file_list" +.Fa "struct dpv_config *config" +.Fa "struct dpv_file_node *file_list" .Fc .Ft void .Fo dpv_free @@ -60,8 +61,7 @@ or The .Fn dpv .Fa config -argument contains the following properties for configuring global display -features: +argument properties for configuring global display features: .Bd -literal -offset indent struct dpv_config { uint8_t keep_tite; /* Cleaner exit for scripts */ @@ -113,11 +113,12 @@ member of the .Fn dpv .Fa config argument is a mask of bit fields indicating various processing options. -Possible flags are as follows: +Possible flags are: .Bl -tag -width DPV_NO_OVERRUN .It Dv DPV_TEST_MODE Enable test mode. -In test mode, the +In test mode, +the .Fn action callback of the .Fa config @@ -126,18 +127,21 @@ Appends .Dq [TEST MODE] to the status line .Po -to override, set the +to override, +set the .Va status_format member of the .Fn dpv .Fa config argument; -e.g., to +for example, +to .Dv DPV_STATUS_DEFAULT .Pc . .It Dv DPV_WIDE_MODE Enable wide mode. -In wide mode, the length of the +In wide mode, +the length of the .Va aprompt and .Va pprompt @@ -169,7 +173,8 @@ does not support color environment variable is ignored .Pc . .It Dv DPV_NO_OVERRUN -When enabled, callbacks for the current +When enabled, +callbacks for the current .Vt dpv_file_node are terminated when .Fn action @@ -189,7 +194,7 @@ argument to .Fn dpv is a pointer to a .Dq linked-list , -described as follows in +described in .In dpv.h : .Bd -literal -offset indent struct dpv_file_node { @@ -206,7 +211,8 @@ struct dpv_file_node { For each of the items in the .Fa file_list .Dq linked-list -argument, the +argument, +the .Fn action callback member of the .Fn dpv @@ -214,7 +220,7 @@ callback member of the argument is called. The .Fn action -function should perform a +function performs a .Dq nominal action on the file and return. The return value of @@ -231,7 +237,7 @@ provides a reference to the current .Vt dpv_file_node being processed. .Fa out -provides a file descriptor where the data should go. +provides a file descriptor where the data goes. .Pp If the .Va output @@ -244,7 +250,7 @@ the .Fa out file descriptor of .Fn action -will be zero and should be ignored. +will be zero and can be ignored. If .Fa output was set to DPV_OUTPUT_FILE, @@ -257,14 +263,16 @@ was set to DPV_OUTPUT_SHELL, will be an open file descriptor to a pipe for a spawned shell program. When .Fa out -is greater than zero, you should write any data you have read back to +is greater than zero, +write data that has been read back to .Fa out . .Pp To abort .Fn dpv , either from the .Fn action -callback or asynchronously from a signal handler, two globals are provided via +callback or asynchronously from a signal handler, +two globals are provided via .In dpv.h : .Bd -literal -offset indent extern int dpv_interrupt; /* Set to TRUE in interrupt handler */ @@ -272,11 +280,12 @@ extern int dpv_abort; /* Set to true in callback t .Ed .Pp These globals are not automatically reset and must be manually maintained. -Don't forget to reset these globals before subsequent invocations of +Do not forget to reset these globals before subsequent invocations of .Fn dpv when making multiple calls from the same program. .Pp -In addition, the +In addition, +the .Va status member of the .Fn action @@ -284,7 +293,7 @@ member of the argument can be used to control callbacks for the current file. The .Va status -member can be set to any of the following from +member can be set to any of the below from .In dpv.h : .Bd -literal -offset indent enum dpv_status { @@ -296,13 +305,17 @@ enum dpv_status { .Pp The default .Fa status -is zero, DPV_STATUS_RUNING, which keeps the callbacks coming for the current +is zero, +DPV_STATUS_RUNNING, +which keeps the callbacks coming for the current .Fn file . Setting .Ql file->status to anything other than DPV_STATUS_RUNNING will cause .Fn dpv -to loop to the next file, effecting the next callback, if any. +to loop to the next file, +effecting the next callback, +if any. .Pp The .Fn action @@ -318,7 +331,7 @@ Percentages are reported through the return value of the .Fn action callback. -Throughput statistics are calculated from the following global +Throughput statistics are calculated from the below global .Vt int in .In dpv.h : @@ -326,7 +339,7 @@ in extern int dpv_overall_read; .Ed .Pp -This should be set to the number of bytes that have been read for all files. +Set this to the number of bytes that have been read for all files. Throughput information is displayed in the status line .Pq only available when using Xr dialog 3 at the bottom of the screen. @@ -335,18 +348,20 @@ See DPV_DISPLAY_LIBDIALOG above. Note that .Va dpv_overall_read does not have to represent bytes. -For example, you can change the +For example, +the .Va status_format -to display something other than +can be changed to display something other than .Dq Li bytes and increment .Va dpv_overall_read accordingly -.Pq e.g., counting lines . +.Pq for example, counting lines . .Pp When .Fn dpv -is processing the current file, the +is processing the current file, +the .Va length and .Va read @@ -355,7 +370,8 @@ members of the .Fa file argument are used for calculating the display of mini progress bars .Po -if enabled; see +if enabled; +see .Va pbar_size above .Pc . @@ -381,7 +397,7 @@ function performs on private global variables initialized by .Fn dpv . .Sh ENVIRONMENT -The following environment variables are referenced by +The below environment variables are referenced by .Nm : .Bl -tag -width ".Ev USE_COLOR" .It Ev DIALOG @@ -398,17 +414,20 @@ or .Ql Xdialog .Pq for Dv DPV_DISPLAY_XDIALOG . .It Ev DIALOGRC -If set and non-NULL, path to +If set and non-NULL, +path to .Ql .dialogrc file. .It Ev HOME If .Ql Ev $DIALOGRC -is either not set or NULL, used as a prefix to +is either not set or NULL, +used as a prefix to .Ql .dialogrc -.Pq i.e., Ql $HOME/.dialogrc . +.Pq that is, Ql $HOME/.dialogrc . .It Ev USE_COLOR -If set and NULL, disables the use of color when using +If set and NULL, +disables the use of color when using .Xr dialog 1 .Pq does not apply to Xr Xdialog 1 . .It Ev msg_done Ev msg_fail Ev msg_pending @@ -418,7 +437,8 @@ Internationalization strings for overriding the defaul and .Ql Pending respectively. -To prevent their usage, explicitly set the +To prevent their usage, +explicitly set the .Va msg_done , .Va msg_fail , and @@ -471,11 +491,11 @@ This is a known issue with the .Ql --gauge widget in .Xr Xdialog 1 . -Embed escaped newlines within prompt text(s) to force line breaks. +Embed escaped newlines within prompt text to force line breaks. .Pp .Xr dialog 1 does not display the first character after a series of escaped escape-sequences -(e.g., ``\\\\n'' produces ``\\'' instead of ``\\n''). +(for example, ``\\\\n'' produces ``\\'' instead of ``\\n''). This is a known issue with .Xr dialog 1 and does not affect @@ -483,10 +503,10 @@ and does not affect or .Xr Xdialog 1 . .Pp -If your application ignores +If an application ignores .Ev USE_COLOR when set and NULL before calling -.Xr dpv 3 +.Fn dpv with color escape sequences anyway, .Xr dialog 3 and Modified: user/markj/vm-playground/lib/libdpv/util.c ============================================================================== --- user/markj/vm-playground/lib/libdpv/util.c Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/lib/libdpv/util.c Fri Mar 16 16:04:06 2018 (r331062) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2013-2014 Devin Teske <dteske@FreeBSD.org> + * Copyright (c) 2013-2018 Devin Teske <dteske@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -100,8 +100,7 @@ shell_spawn_pipecmd(const char *cmd, const char *label posix_spawn_file_actions_addclose(&action, stdin_pipe[1]); error = posix_spawnp(pid, shellcmd, &action, (const posix_spawnattr_t *)NULL, shellcmd_argv, environ); - if (error != 0) - err(EXIT_FAILURE, "%s: posix_spawnp(3)", __func__); + if (error != 0) err(EXIT_FAILURE, "%s", shellcmd); return stdin_pipe[1]; } Modified: user/markj/vm-playground/lib/libfigpar/figpar.3 ============================================================================== --- user/markj/vm-playground/lib/libfigpar/figpar.3 Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/lib/libfigpar/figpar.3 Fri Mar 16 16:04:06 2018 (r331062) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2013-2015 Devin Teske <dteske@FreeBSD.org> +.\" Copyright (c) 2013-2018 Devin Teske <dteske@FreeBSD.org> .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Nov 2, 2015 +.Dd March 13, 2018 .Dt FIGPAR 3 .Os .Sh NAME @@ -38,22 +38,30 @@ .In figpar.h .Ft int .Fo parse_config -.Fa "struct figpar_config options[], const char *path" -.Fa "int \*[lp]*unknown\*[rp]\*[lp]struct figpar_config *option, uint32_t line" -.Fa "char *directive, char *value\*[rp], uint8_t processing_options" +.Fa "struct figpar_config options[]" +.Fa "const char *path" +.Fa "int \*[lp]*unknown\*[rp]\*[lp]struct figpar_config *option" +.Fa "uint32_t line" +.Fa "char *directive" +.Fa "char *value\*[rp]" +.Fa "uint8_t processing_options" .Fc .Ft "struct figpar_config *" .Fo get_config_option -.Fa "struct figpar_config options[], const char *directive" +.Fa "struct figpar_config options[]" +.Fa "const char *directive" .Fc .In string_m.h .Ft int .Fo replaceall -.Fa "char *source, const char *find, const char *replace" +.Fa "char *source" +.Fa "const char *find" +.Fa "const char *replace" .Fc .Ft unsigned int .Fo strcount -.Fa "const char *source, const char *find" +.Fa "const char *source" +.Fa "const char *find" .Fc .Ft void .Fo strexpand @@ -70,7 +78,8 @@ .Sh DESCRIPTION The .Nm -library provides a light-weight, portable framework for parsing configuration +library provides a light-weight, +portable framework for parsing configuration files. The library uses .Xr open 2 , @@ -87,8 +96,9 @@ provides raw data to a set of callback functions. These callback functions can in-turn initiate abort through their return value, allowing custom syntax validation during parsing. .Pp -Configuration directives, types, and callback functions are provided through -data structures defined in +Configuration directives, +types, +and callback functions are provided through data structures defined in .In figpar.h : .Bd -literal -offset indent struct figpar_config { @@ -132,7 +142,7 @@ argument to .Fn parse_config is a mask of bit fields which indicate various processing options. -The possible flags are as follows: +The possible flags are: .Bl -tag -width FIGPAR_BREAK_ON_SEMICOLON .It Dv FIGPAR_BREAK_ON_EQUALS An equals sign @@ -151,7 +161,8 @@ Normally directives are matched case insensitively usi .Xr fnmatch 3 . This flag enables directive matching to be case sensitive. .It Dv FIGPAR_REQUIRE_EQUALS -If a directive is not followed by an equals, processing is aborted. +If a directive is not followed by an equals, +processing is aborted. .It Dv FIGPAR_STRICT_EQUALS Equals must be part of the directive to be considered a delimiter between directive and value. @@ -159,7 +170,7 @@ directive and value. .Pp The .Fa options -struct array pointer can be NULL and every directive will invoke the +struct array pointer can be NULL and every directive will run the .Fn unknown function argument. .Pp @@ -168,13 +179,16 @@ The directive for each figpar_config item in the options argument is matched against each parsed directive using .Xr fnmatch 3 until a match is found. -If a match is found, the +If a match is found, +the .Fn action -function for that figpar_config directive is invoked with the line number, -directive, and value. -Otherwise if no match, the +function for that figpar_config directive is run with the line number, +directive, +and value. +Otherwise if no match, +the .Fn unknown -function is invoked +function is run .Pq with the same arguments . .Pp If either @@ -197,19 +211,20 @@ is entirely optional as-is the use of .Fa "enum figpar_cfgtype" or .Fa "union figpar_cfgvalue" . -For example, you could choose to pass a NULL pointer to +For example, +a NULL pointer can be passed to .Fn parse_config -for the first argument and then provide a simple +for the first argument while providing a simple .Fa unknown function based on .Xr queue 3 -that populates a singly-linked list of your own struct containing the +that populates a singly-linked list of a struct containing the .Fa directive and .Fa value . .Pp -In addition, the following miscellaneous string manipulation routines are -provided by +In addition, +miscellaneous string manipulation routines are provided by .In string_m.h : .Bl -tag -width strexpandnl() .It Fn replaceall @@ -224,8 +239,7 @@ Count the number of occurrences of one string that app .Fa source string. Return value is the total count. -An example use would be if you need to know how large a block of memory needs -to be for a +An example use would be to show how large a block of memory needs to be for a .Fn replaceall series. .It Fn strexpand Modified: user/markj/vm-playground/lib/libipsec/pfkey.c ============================================================================== --- user/markj/vm-playground/lib/libipsec/pfkey.c Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/lib/libipsec/pfkey.c Fri Mar 16 16:04:06 2018 (r331062) @@ -1595,10 +1595,12 @@ pfkey_send_x5(so, type, spid) * others : success and return value of socket. */ int -pfkey_open() +pfkey_open(void) { int so; - const int bufsiz = 128 * 1024; /*is 128K enough?*/ + int bufsiz_current, bufsiz_wanted; + int ret; + socklen_t len; if ((so = socket(PF_KEY, SOCK_RAW, PF_KEY_V2)) < 0) { __ipsec_set_strerror(strerror(errno)); @@ -1609,8 +1611,28 @@ pfkey_open() * This is a temporary workaround for KAME PR 154. * Don't really care even if it fails. */ - (void)setsockopt(so, SOL_SOCKET, SO_SNDBUF, &bufsiz, sizeof(bufsiz)); - (void)setsockopt(so, SOL_SOCKET, SO_RCVBUF, &bufsiz, sizeof(bufsiz)); + /* Try to have 128k. If we have more, do not lower it. */ + bufsiz_wanted = 128 * 1024; + len = sizeof(bufsiz_current); + ret = getsockopt(so, SOL_SOCKET, SO_SNDBUF, + &bufsiz_current, &len); + if ((ret < 0) || (bufsiz_current < bufsiz_wanted)) + (void)setsockopt(so, SOL_SOCKET, SO_SNDBUF, + &bufsiz_wanted, sizeof(bufsiz_wanted)); + + /* Try to have have at least 2MB. If we have more, do not lower it. */ + bufsiz_wanted = 2 * 1024 * 1024; + len = sizeof(bufsiz_current); + ret = getsockopt(so, SOL_SOCKET, SO_RCVBUF, + &bufsiz_current, &len); + if (ret < 0) + bufsiz_current = 128 * 1024; + + for (; bufsiz_wanted > bufsiz_current; bufsiz_wanted /= 2) { + if (setsockopt(so, SOL_SOCKET, SO_RCVBUF, + &bufsiz_wanted, sizeof(bufsiz_wanted)) == 0) + break; + } __ipsec_errcode = EIPSEC_NO_ERROR; return so; Modified: user/markj/vm-playground/lib/libmagic/Makefile ============================================================================== --- user/markj/vm-playground/lib/libmagic/Makefile Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/lib/libmagic/Makefile Fri Mar 16 16:04:06 2018 (r331062) @@ -8,7 +8,9 @@ CONTRDIR= ${SRCTOP}/contrib/file LIB= magic SHLIB_MAJOR= 4 +.if !make(build-tools) LIBADD= z +.endif MAN= libmagic.3 magic.5 SRCS= apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c compress.c \ Modified: user/markj/vm-playground/lib/libsysdecode/mktables ============================================================================== --- user/markj/vm-playground/lib/libsysdecode/mktables Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/lib/libsysdecode/mktables Fri Mar 16 16:04:06 2018 (r331062) @@ -146,7 +146,7 @@ gen_table "socktype" "SOCK_[A-Z]+[[:space:]]+[1 gen_table "thrcreateflags" "THR_[A-Z]+[[:space:]]+0x[0-9]+" "sys/thr.h" gen_table "umtxop" "UMTX_OP_[[:alnum:]_]+[[:space:]]+[0-9]+" "sys/umtx.h" gen_table "vmprot" "VM_PROT_[A-Z]+[[:space:]]+\(\(vm_prot_t\)[[:space:]]+0x[0-9]+\)" "vm/vm.h" -gen_table "vmresult" "KERN_[A-Z]+[[:space:]]+[0-9]+" "vm/vm_param.h" +gen_table "vmresult" "KERN_[A-Z_]+[[:space:]]+[0-9]+" "vm/vm_param.h" gen_table "wait6opt" "W[A-Z]+[[:space:]]+[0-9]+" "sys/wait.h" gen_table "seekwhence" "SEEK_[A-Z]+[[:space:]]+[0-9]+" "sys/unistd.h" gen_table "fcntlcmd" "F_[A-Z0-9_]+[[:space:]]+[0-9]+[[:space:]]+" "sys/fcntl.h" "F_CANCEL|F_..LCK" Modified: user/markj/vm-playground/libexec/tftpd/Makefile ============================================================================== --- user/markj/vm-playground/libexec/tftpd/Makefile Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/libexec/tftpd/Makefile Fri Mar 16 16:04:06 2018 (r331062) @@ -14,4 +14,7 @@ CFLAGS+= -DLIBWRAP LIBADD= wrap .endif +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include <bsd.prog.mk> Modified: user/markj/vm-playground/libexec/tftpd/tftp-transfer.c ============================================================================== --- user/markj/vm-playground/libexec/tftpd/tftp-transfer.c Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/libexec/tftpd/tftp-transfer.c Fri Mar 16 16:04:06 2018 (r331062) @@ -304,6 +304,8 @@ send_ack: gettimeofday(&(ts->tstop), NULL); } while (n_data == segsize); + write_close(); + /* Don't do late packet management for the client implementation */ if (acting_as_client) return; Modified: user/markj/vm-playground/libexec/tftpd/tftpd.c ============================================================================== --- user/markj/vm-playground/libexec/tftpd/tftpd.c Fri Mar 16 15:26:07 2018 (r331061) +++ user/markj/vm-playground/libexec/tftpd/tftpd.c Fri Mar 16 16:04:06 2018 (r331062) @@ -421,8 +421,7 @@ main(int argc, char *argv[]) "%s read access denied", peername); exit(1); } - } - if (tp->th_opcode == WRQ) { + } else if (tp->th_opcode == WRQ) { if (allow_wo) tftp_wrq(peer, tp->th_stuff, n - 1); else { @@ -430,7 +429,8 @@ main(int argc, char *argv[]) "%s write access denied", peername); exit(1); } - } + } else + send_error(peer, EBADOP); exit(1); } *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803161604.w2GG47co091563>