From owner-svn-src-projects@FreeBSD.ORG Mon Apr 6 06:44:50 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 26CF8AE7; Mon, 6 Apr 2015 06:44:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 077ECAF3; Mon, 6 Apr 2015 06:44:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t366inQZ034791; Mon, 6 Apr 2015 06:44:49 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t366in5D034790; Mon, 6 Apr 2015 06:44:49 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504060644.t366in5D034790@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 6 Apr 2015 06:44:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281137 - projects/ifnet/sys/netgraph X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2015 06:44:50 -0000 Author: glebius Date: Mon Apr 6 06:44:48 2015 New Revision: 281137 URL: https://svnweb.freebsd.org/changeset/base/281137 Log: - Make ng_iface(4) again compilable. - Remove unused commands. Sponsored by: Nginx, Inc. Modified: projects/ifnet/sys/netgraph/ng_iface.c Modified: projects/ifnet/sys/netgraph/ng_iface.c ============================================================================== --- projects/ifnet/sys/netgraph/ng_iface.c Mon Apr 6 06:02:58 2015 (r281136) +++ projects/ifnet/sys/netgraph/ng_iface.c Mon Apr 6 06:44:48 2015 (r281137) @@ -110,6 +110,7 @@ struct ng_iface_private { if_t ifp; /* Our interface */ u_int fib; /* Interface fib */ int unit; /* Interface unit number */ + uint32_t flags; /* Interface flags */ node_p node; /* Our netgraph node */ hook_p hooks[NUM_FAMILIES]; /* Hook for each address family */ }; @@ -283,10 +284,8 @@ ng_iface_ioctl(if_t ifp, u_long command, ng_iface_print_ioctl(ifp, command, data); #endif switch (command) { - - /* These two are mostly handled at a higher layer */ - case SIOCSIFADDR: - if_addflags(ifp, IF_FLAGS, IFF_UP); + case SIOCSIFFLAGS: + priv->flags = ifr->ifr_flags; break; /* Set the interface MTU */ @@ -303,7 +302,6 @@ ng_iface_ioctl(if_t ifp, u_long command, /* Stuff that's not supported */ case SIOCGIFADDR: - case SIOCSIFFLAGS: case SIOCADDMULTI: case SIOCDELMULTI: break; @@ -325,11 +323,12 @@ static int ng_iface_output(if_t ifp, struct mbuf *m, const struct sockaddr *dst, struct route *ro) { + const priv_p priv = if_getsoftc(ifp, IF_DRIVER_SOFTC); struct m_tag *mtag; uint32_t af; /* Check interface flags */ - if ((if_get(ifp, IF_FLAGS) & IFF_UP) == 0) { + if ((priv->flags & IFF_UP) == 0) { m_freem(m); return (ENETDOWN); } @@ -482,6 +481,7 @@ ng_iface_constructor(node_p node) priv->node = node; ifat.ifat_softc = priv; ifat.ifat_dunit = priv->unit = alloc_unr(V_ng_iface_unit); + priv->flags = ifat.ifat_flags; priv->ifp = if_attach(&ifat); /* Give this node the same name as the interface (if possible) */ @@ -537,28 +537,6 @@ ng_iface_rcvmsg(node_p node, item_p item strlcpy(resp->data, if_name(ifp), IFNAMSIZ); break; - case NGM_IFACE_POINT2POINT: - case NGM_IFACE_BROADCAST: - { - - /* Deny request if interface is UP */ - if ((if_get(ifp, IF_FLAGS) & IFF_UP) != 0) - return (EBUSY); - - /* Change flags */ - switch (msg->header.cmd) { - case NGM_IFACE_POINT2POINT: - if_addflags(ifp, IF_FLAGS, IFF_POINTOPOINT); - if_clrflags(ifp, IF_FLAGS, IFF_BROADCAST); - break; - case NGM_IFACE_BROADCAST: - if_clrflags(ifp, IF_FLAGS, IFF_POINTOPOINT); - if_addflags(ifp, IF_FLAGS, IFF_BROADCAST); - break; - } - break; - } - case NGM_IFACE_GET_IFINDEX: { struct ifreq ifr; @@ -616,7 +594,7 @@ ng_iface_rcvdata(hook_p hook, item_p ite /* Sanity checks */ KASSERT(iffam != NULL, ("%s: iffam", __func__)); M_ASSERTPKTHDR(m); - if ((if_get(ifp, IF_FLAGS) & IFF_UP) == 0) { + if ((priv->flags & IFF_UP) == 0) { NG_FREE_M(m); return (ENETDOWN); } From owner-svn-src-projects@FreeBSD.ORG Mon Apr 6 07:42:06 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 97B1A18F; Mon, 6 Apr 2015 07:42:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 82F5D149; Mon, 6 Apr 2015 07:42:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t367g5kQ063730; Mon, 6 Apr 2015 07:42:05 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t367g5iM063729; Mon, 6 Apr 2015 07:42:05 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504060742.t367g5iM063729@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 6 Apr 2015 07:42:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281139 - projects/ifnet/sys/amd64/conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2015 07:42:06 -0000 Author: glebius Date: Mon Apr 6 07:42:05 2015 New Revision: 281139 URL: https://svnweb.freebsd.org/changeset/base/281139 Log: A kernel that is based on GENERIC and has all not yet converted drivers disabled. Depicts the amount of work to be done. Added: projects/ifnet/sys/amd64/conf/IFNET Added: projects/ifnet/sys/amd64/conf/IFNET ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/sys/amd64/conf/IFNET Mon Apr 6 07:42:05 2015 (r281139) @@ -0,0 +1,77 @@ +include GENERIC + +# Untrivial stuff +nodevice netmap +nodevice wlan +nodevice wlan_wep +nodevice wlan_ccmp +nodevice wlan_tkip +nodevice wlan_amrr + +# Should be easy +nodevice an +nodevice ath +nodevice ath_pci +nodevice ath_hal +nodevice ath_rate_sample +nodevice gem +nodevice hme +nodevice malo +nodevice le +nodevice mwl +nodevice ral +nodevice wi +nodevice vx +nodevice hyperv +nodevice lem +nodevice em +nodevice de +nodevice iwn +nodevice iwi +nodevice ipw +nodevice ti +nodevice bxe +nodevice txp +nodevice vmx +nodevice wpi +nodevice dc +nodevice fxp +nodevice jme +nodevice ale +nodevice age +nodevice cas +nodevice nge +nodevice rl +nodevice alc +nodevice sis +nodevice sf +nodevice ae +nodevice et +nodevice bce +nodevice bfe +nodevice lge +nodevice vge +nodevice tl +nodevice tx +nodevice sk +nodevice wb +nodevice vr +nodevice ste +nodevice stge +nodevice sge +nodevice pcn +nodevice nfe +nodevice xenpci # netfront +nooptions XENHVM # netfront + +# Could be not easy +nodevice ixgb +nodevice ixgbe +nodevice ix +nodevice ixv +nodevice ixl +nodevice ixlv + +# Software interfaces, must be easy +nodevice gif +nodevice tun From owner-svn-src-projects@FreeBSD.ORG Mon Apr 6 09:52:31 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 49C8AF84; Mon, 6 Apr 2015 09:52:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 3126DF71; Mon, 6 Apr 2015 09:52:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t369qVu7026786; Mon, 6 Apr 2015 09:52:31 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t369qHah026613; Mon, 6 Apr 2015 09:52:17 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504060952.t369qHah026613@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 6 Apr 2015 09:52:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281144 - in projects/ifnet: contrib/binutils/bfd contrib/binutils/include/elf contrib/ipfilter/ipsend contrib/ipfilter/lib contrib/ipfilter/tools contrib/llvm contrib/llvm/patches cont... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2015 09:52:31 -0000 Author: glebius Date: Mon Apr 6 09:52:16 2015 New Revision: 281144 URL: https://svnweb.freebsd.org/changeset/base/281144 Log: Merge head r257698 through r281143. Added: projects/ifnet/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff - copied unchanged from r281143, head/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff projects/ifnet/contrib/llvm/tools/llvm-cov/ - copied from r281143, head/contrib/llvm/tools/llvm-cov/ projects/ifnet/contrib/llvm/tools/llvm-profdata/ - copied from r281143, head/contrib/llvm/tools/llvm-profdata/ projects/ifnet/sys/boot/efi/fdt/ - copied from r281143, head/sys/boot/efi/fdt/ projects/ifnet/sys/boot/forth/Makefile - copied unchanged from r281143, head/sys/boot/forth/Makefile projects/ifnet/sys/boot/i386/libi386/smbios.h - copied unchanged from r281143, head/sys/boot/i386/libi386/smbios.h projects/ifnet/sys/dev/hwpmc/hwpmc_mips74k.c - copied unchanged from r281143, head/sys/dev/hwpmc/hwpmc_mips74k.c projects/ifnet/sys/powerpc/mpc85xx/mpc85xx_gpio.c - copied unchanged from r281143, head/sys/powerpc/mpc85xx/mpc85xx_gpio.c projects/ifnet/sys/powerpc/powerpc/trap.c - copied unchanged from r281143, head/sys/powerpc/powerpc/trap.c projects/ifnet/usr.bin/clang/llvm-cov/ - copied from r281143, head/usr.bin/clang/llvm-cov/ projects/ifnet/usr.bin/clang/llvm-profdata/ - copied from r281143, head/usr.bin/clang/llvm-profdata/ Deleted: projects/ifnet/sys/powerpc/aim/trap.c projects/ifnet/sys/powerpc/booke/trap.c Modified: projects/ifnet/contrib/binutils/bfd/elf-bfd.h projects/ifnet/contrib/binutils/bfd/elf32-arm.c projects/ifnet/contrib/binutils/include/elf/arm.h projects/ifnet/contrib/ipfilter/ipsend/44arp.c projects/ifnet/contrib/ipfilter/ipsend/ip.c projects/ifnet/contrib/ipfilter/ipsend/resend.c projects/ifnet/contrib/ipfilter/lib/kmem.c projects/ifnet/contrib/ipfilter/tools/ipfs.c projects/ifnet/contrib/ipfilter/tools/ipnat.c projects/ifnet/contrib/ipfilter/tools/ipnat_y.y projects/ifnet/contrib/ipfilter/tools/ippool.c projects/ifnet/contrib/ipfilter/tools/ippool_y.y projects/ifnet/contrib/llvm/FREEBSD-Xlist projects/ifnet/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp projects/ifnet/etc/Makefile projects/ifnet/etc/login.conf projects/ifnet/etc/rc.d/pflog projects/ifnet/include/pthread.h projects/ifnet/include/signal.h projects/ifnet/include/stdlib.h projects/ifnet/lib/libc/gen/fts.c projects/ifnet/lib/libc/net/getaddrinfo.c projects/ifnet/lib/libc/net/name6.c projects/ifnet/lib/libc/string/strlcat.c projects/ifnet/lib/libc/string/strlcpy.c projects/ifnet/lib/libpmc/libpmc.c projects/ifnet/libexec/rtld-elf/mips/reloc.c projects/ifnet/sbin/ifconfig/af_inet.c projects/ifnet/sbin/ifconfig/af_inet6.c projects/ifnet/sbin/ifconfig/af_nd6.c projects/ifnet/sbin/ifconfig/carp.c projects/ifnet/sbin/ifconfig/ifconfig.c projects/ifnet/sbin/ifconfig/ifvlan.c projects/ifnet/sbin/ifconfig/ifvxlan.c projects/ifnet/share/man/man4/inet.4 projects/ifnet/share/man/man5/src.conf.5 projects/ifnet/share/mk/bsd.progs.mk projects/ifnet/sys/arm/allwinner/a10_clk.c projects/ifnet/sys/arm/allwinner/a10_common.c projects/ifnet/sys/arm/allwinner/a10_gpio.c projects/ifnet/sys/arm/allwinner/a10_sramc.c projects/ifnet/sys/arm/allwinner/a10_wdog.c projects/ifnet/sys/arm/allwinner/a20/a20_cpu_cfg.c projects/ifnet/sys/arm/allwinner/a20/a20_mp.c projects/ifnet/sys/arm/allwinner/timer.c projects/ifnet/sys/arm/altera/socfpga/socfpga_gpio.c projects/ifnet/sys/arm/altera/socfpga/socfpga_manager.c projects/ifnet/sys/arm/altera/socfpga/socfpga_mp.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_fb.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_mp.c projects/ifnet/sys/arm/arm/generic_timer.c projects/ifnet/sys/arm/arm/intr.c projects/ifnet/sys/arm/arm/mpcore_timer.c projects/ifnet/sys/arm/arm/pmu.c projects/ifnet/sys/arm/at91/at91_common.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_common.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_fbd.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_spi.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_systimer.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_wdog.c projects/ifnet/sys/arm/freescale/imx/imx51_ccm.c projects/ifnet/sys/arm/freescale/imx/imx51_ipuv3.c projects/ifnet/sys/arm/freescale/imx/imx51_ipuv3_fbd.c projects/ifnet/sys/arm/freescale/imx/imx6_anatop.c projects/ifnet/sys/arm/freescale/imx/imx6_audmux.c projects/ifnet/sys/arm/freescale/imx/imx6_mp.c projects/ifnet/sys/arm/freescale/imx/imx6_sdma.c projects/ifnet/sys/arm/freescale/imx/imx6_ssi.c projects/ifnet/sys/arm/freescale/imx/imx_common.c projects/ifnet/sys/arm/freescale/imx/imx_gpt.c projects/ifnet/sys/arm/freescale/imx/imx_iomux.c projects/ifnet/sys/arm/freescale/imx/imx_wdog.c projects/ifnet/sys/arm/freescale/vybrid/vf_adc.c projects/ifnet/sys/arm/freescale/vybrid/vf_anadig.c projects/ifnet/sys/arm/freescale/vybrid/vf_ccm.c projects/ifnet/sys/arm/freescale/vybrid/vf_dcu4.c projects/ifnet/sys/arm/freescale/vybrid/vf_dmamux.c projects/ifnet/sys/arm/freescale/vybrid/vf_edma.c projects/ifnet/sys/arm/freescale/vybrid/vf_gpio.c projects/ifnet/sys/arm/freescale/vybrid/vf_i2c.c projects/ifnet/sys/arm/freescale/vybrid/vf_iomuxc.c projects/ifnet/sys/arm/freescale/vybrid/vf_mscm.c projects/ifnet/sys/arm/freescale/vybrid/vf_nfc.c projects/ifnet/sys/arm/freescale/vybrid/vf_port.c projects/ifnet/sys/arm/freescale/vybrid/vf_sai.c projects/ifnet/sys/arm/freescale/vybrid/vf_spi.c projects/ifnet/sys/arm/freescale/vybrid/vf_src.c projects/ifnet/sys/arm/freescale/vybrid/vf_tcon.c projects/ifnet/sys/arm/freescale/vybrid/vf_uart.c projects/ifnet/sys/arm/include/fdt.h projects/ifnet/sys/arm/mv/armadaxp/armadaxp_mp.c projects/ifnet/sys/arm/mv/gpio.c projects/ifnet/sys/arm/mv/mv_localbus.c projects/ifnet/sys/arm/mv/mv_ts.c projects/ifnet/sys/arm/mv/mvvar.h projects/ifnet/sys/arm/rockchip/rk30xx_common.c projects/ifnet/sys/arm/rockchip/rk30xx_gpio.c projects/ifnet/sys/arm/rockchip/rk30xx_grf.c projects/ifnet/sys/arm/rockchip/rk30xx_mp.c projects/ifnet/sys/arm/rockchip/rk30xx_pmu.c projects/ifnet/sys/arm/samsung/exynos/exynos5_mp.c projects/ifnet/sys/arm/ti/am335x/am335x_dmtimer.c projects/ifnet/sys/arm/ti/am335x/am335x_prcm.c projects/ifnet/sys/arm/ti/omap4/omap4_mp.c projects/ifnet/sys/arm/ti/ti_common.c projects/ifnet/sys/arm/ti/ti_mbox.c projects/ifnet/sys/arm/ti/ti_pruss.c projects/ifnet/sys/arm/ti/ti_wdt.c projects/ifnet/sys/arm/versatile/pl050.c projects/ifnet/sys/arm/versatile/sp804.c projects/ifnet/sys/arm/versatile/versatile_clcd.c projects/ifnet/sys/arm/versatile/versatile_common.c projects/ifnet/sys/arm/versatile/versatile_pci.c projects/ifnet/sys/arm/versatile/versatile_timer.c projects/ifnet/sys/arm/xilinx/zy7_mp.c projects/ifnet/sys/boot/Makefile projects/ifnet/sys/boot/common/Makefile.inc projects/ifnet/sys/boot/efi/Makefile projects/ifnet/sys/boot/efi/Makefile.inc projects/ifnet/sys/boot/efi/boot1/Makefile projects/ifnet/sys/boot/efi/boot1/boot1.c projects/ifnet/sys/boot/efi/loader/Makefile projects/ifnet/sys/boot/efi/loader/bootinfo.c projects/ifnet/sys/boot/efi/loader/main.c projects/ifnet/sys/boot/i386/libi386/libi386.h projects/ifnet/sys/boot/i386/libi386/smbios.c projects/ifnet/sys/boot/i386/loader/main.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/ifnet/sys/conf/files.mips projects/ifnet/sys/conf/files.powerpc projects/ifnet/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/ifnet/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/ifnet/sys/dev/atkbdc/psm.c projects/ifnet/sys/dev/hwpmc/hwpmc_core.c projects/ifnet/sys/dev/hwpmc/hwpmc_intel.c projects/ifnet/sys/dev/hwpmc/pmc_events.h projects/ifnet/sys/dev/ichsmb/ichsmb_pci.c projects/ifnet/sys/dev/iscsi/icl_conn_if.m projects/ifnet/sys/dev/iscsi/icl_soft.c projects/ifnet/sys/dev/iscsi/icl_wrappers.h projects/ifnet/sys/dev/uart/uart_bus_fdt.c projects/ifnet/sys/dev/uart/uart_cpu_fdt.c projects/ifnet/sys/dev/uart/uart_cpu_fdt.h projects/ifnet/sys/dev/usb/wlan/if_urtwn.c projects/ifnet/sys/fs/msdosfs/msdosfs_fat.c projects/ifnet/sys/fs/msdosfs/msdosfs_vfsops.c projects/ifnet/sys/kern/subr_vmem.c projects/ifnet/sys/kern/sysv_shm.c projects/ifnet/sys/kern/vfs_syscalls.c projects/ifnet/sys/mips/conf/DIR-655A1.hints projects/ifnet/sys/mips/conf/DIR-825C1.hints projects/ifnet/sys/modules/i2c/iicbb/Makefile projects/ifnet/sys/powerpc/aim/machdep.c projects/ifnet/sys/powerpc/include/trap.h projects/ifnet/sys/sys/mbuf.h projects/ifnet/sys/sys/mouse.h projects/ifnet/sys/sys/pmc.h projects/ifnet/sys/sys/vmem.h projects/ifnet/sys/vm/uma_core.c projects/ifnet/sys/vm/vm_fault.c projects/ifnet/tools/build/options/WITHOUT_CXX projects/ifnet/tools/tools/ath/athratestats/main.c projects/ifnet/tools/tools/ath/athstats/athstats.c projects/ifnet/tools/tools/cxgbtool/cxgbtool.c projects/ifnet/tools/tools/iwn/iwnstats/iwn_ioctl.c projects/ifnet/usr.bin/bluetooth/btsockstat/btsockstat.c projects/ifnet/usr.bin/clang/Makefile projects/ifnet/usr.bin/kdump/mkioctls projects/ifnet/usr.bin/netstat/bpf.c projects/ifnet/usr.bin/netstat/if.c projects/ifnet/usr.bin/netstat/inet6.c projects/ifnet/usr.bin/sort/bwstring.c projects/ifnet/usr.bin/sort/coll.c projects/ifnet/usr.bin/sort/file.c projects/ifnet/usr.bin/sort/file.h projects/ifnet/usr.bin/sort/mem.c projects/ifnet/usr.bin/sort/radixsort.c projects/ifnet/usr.bin/sort/sort.1.in projects/ifnet/usr.bin/sort/sort.c projects/ifnet/usr.sbin/amd/include/config.h projects/ifnet/usr.sbin/ancontrol/ancontrol.c projects/ifnet/usr.sbin/bluetooth/bthidd/hid.c projects/ifnet/usr.sbin/ctld/ctld.c projects/ifnet/usr.sbin/ifmcstat/ifmcstat.c projects/ifnet/usr.sbin/ip6addrctl/ip6addrctl.c projects/ifnet/usr.sbin/mld6query/mld6.c projects/ifnet/usr.sbin/ndp/ndp.c projects/ifnet/usr.sbin/ntp/config.h projects/ifnet/usr.sbin/pkg/pkg.c projects/ifnet/usr.sbin/ppp/iface.c projects/ifnet/usr.sbin/rip6query/rip6query.c projects/ifnet/usr.sbin/route6d/route6d.c projects/ifnet/usr.sbin/rrenumd/lexer.l projects/ifnet/usr.sbin/rrenumd/parser.y projects/ifnet/usr.sbin/rtadvctl/rtadvctl.c projects/ifnet/usr.sbin/rtadvd/config.c projects/ifnet/usr.sbin/rtadvd/if.c projects/ifnet/usr.sbin/rtadvd/rrenum.c projects/ifnet/usr.sbin/rtadvd/rtadvd.c projects/ifnet/usr.sbin/rtsold/if.c projects/ifnet/usr.sbin/rtsold/probe.c projects/ifnet/usr.sbin/rtsold/rtsold.c projects/ifnet/usr.sbin/uhsoctl/uhsoctl.c projects/ifnet/usr.sbin/wpa/ndis_events/ndis_events.c projects/ifnet/usr.sbin/wpa/wpa_supplicant/Packet32.c Directory Properties: projects/ifnet/ (props changed) projects/ifnet/contrib/binutils/ (props changed) projects/ifnet/contrib/ipfilter/ (props changed) projects/ifnet/contrib/llvm/ (props changed) projects/ifnet/contrib/llvm/tools/clang/ (props changed) projects/ifnet/etc/ (props changed) projects/ifnet/include/ (props changed) projects/ifnet/lib/libc/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/share/ (props changed) projects/ifnet/share/man/man4/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/boot/ (props changed) projects/ifnet/sys/cddl/contrib/opensolaris/ (props changed) projects/ifnet/sys/conf/ (props changed) projects/ifnet/usr.sbin/rtadvctl/ (props changed) projects/ifnet/usr.sbin/rtadvd/ (props changed) projects/ifnet/usr.sbin/rtsold/ (props changed) Modified: projects/ifnet/contrib/binutils/bfd/elf-bfd.h ============================================================================== --- projects/ifnet/contrib/binutils/bfd/elf-bfd.h Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/contrib/binutils/bfd/elf-bfd.h Mon Apr 6 09:52:16 2015 (r281144) @@ -1286,7 +1286,7 @@ struct elf_find_verdep_info }; /* The maximum number of known object attributes for any target. */ -#define NUM_KNOWN_OBJ_ATTRIBUTES 32 +#define NUM_KNOWN_OBJ_ATTRIBUTES 71 /* The value of an object attribute. type & 1 indicates whether there is an integer value; type & 2 indicates whether there is a string Modified: projects/ifnet/contrib/binutils/bfd/elf32-arm.c ============================================================================== --- projects/ifnet/contrib/binutils/bfd/elf32-arm.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/contrib/binutils/bfd/elf32-arm.c Mon Apr 6 09:52:16 2015 (r281144) @@ -6835,6 +6835,8 @@ elf32_arm_merge_eabi_attributes (bfd *ib case Tag_ABI_FP_number_model: case Tag_ABI_align8_preserved: case Tag_ABI_HardFP_use: + case Tag_CPU_unaligned_access: + case Tag_FP_HP_extension: /* Use the largest value specified. */ if (in_attr[i].i > out_attr[i].i) out_attr[i].i = in_attr[i].i; @@ -6951,7 +6953,9 @@ elf32_arm_merge_eabi_attributes (bfd *ib } break; default: /* All known attributes should be explicitly covered. */ - abort (); + /* XXX Not now */ + /* abort (); */ + break; } } Modified: projects/ifnet/contrib/binutils/include/elf/arm.h ============================================================================== --- projects/ifnet/contrib/binutils/include/elf/arm.h Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/contrib/binutils/include/elf/arm.h Mon Apr 6 09:52:16 2015 (r281144) @@ -271,7 +271,11 @@ enum Tag_ABI_optimization_goals, Tag_ABI_FP_optimization_goals, /* 32 is generic. */ - + Tag_CPU_unaligned_access = 34, + Tag_FP_HP_extension = 36, + Tag_ABI_FP_16bit_format = 38, + Tag_MPextension_use = 42, + Tag_DIV_use = 44, Tag_Virtualization_use = 68, }; Modified: projects/ifnet/contrib/ipfilter/ipsend/44arp.c ============================================================================== --- projects/ifnet/contrib/ipfilter/ipsend/44arp.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/contrib/ipfilter/ipsend/44arp.c Mon Apr 6 09:52:16 2015 (r281144) @@ -8,9 +8,6 @@ #include #include #include -#if __FreeBSD_version >= 300000 -# include -#endif #include #include #ifndef __osf__ Modified: projects/ifnet/contrib/ipfilter/ipsend/ip.c ============================================================================== --- projects/ifnet/contrib/ipfilter/ipsend/ip.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/contrib/ipfilter/ipsend/ip.c Mon Apr 6 09:52:16 2015 (r281144) @@ -21,9 +21,6 @@ static const char rcsid[] = "@(#)$Id$"; # include # include # include -# if __FreeBSD_version >= 300000 -# include -# endif #endif #include #include Modified: projects/ifnet/contrib/ipfilter/ipsend/resend.c ============================================================================== --- projects/ifnet/contrib/ipfilter/ipsend/resend.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/contrib/ipfilter/ipsend/resend.c Mon Apr 6 09:52:16 2015 (r281144) @@ -22,9 +22,6 @@ static const char rcsid[] = "@(#)$Id$"; #ifndef linux # include # include -# if __FreeBSD_version >= 300000 -# include -# endif #endif #include #include Modified: projects/ifnet/contrib/ipfilter/lib/kmem.c ============================================================================== --- projects/ifnet/contrib/ipfilter/lib/kmem.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/contrib/ipfilter/lib/kmem.c Mon Apr 6 09:52:16 2015 (r281144) @@ -29,9 +29,6 @@ #include #include #include -#if __FreeBSD_version >= 300000 -# include -#endif #if defined(linux) || defined(__osf__) || defined(__sgi) || defined(__hpux) # include #endif Modified: projects/ifnet/contrib/ipfilter/tools/ipfs.c ============================================================================== --- projects/ifnet/contrib/ipfilter/tools/ipfs.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/contrib/ipfilter/tools/ipfs.c Mon Apr 6 09:52:16 2015 (r281144) @@ -33,9 +33,6 @@ #include #include #include -#if __FreeBSD_version >= 300000 -# include -#endif #include #include #include Modified: projects/ifnet/contrib/ipfilter/tools/ipnat.c ============================================================================== --- projects/ifnet/contrib/ipfilter/tools/ipnat.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/contrib/ipfilter/tools/ipnat.c Mon Apr 6 09:52:16 2015 (r281144) @@ -37,9 +37,6 @@ #include #include #include -#if __FreeBSD_version >= 300000 -# include -#endif #include #include #include Modified: projects/ifnet/contrib/ipfilter/tools/ipnat_y.y ============================================================================== --- projects/ifnet/contrib/ipfilter/tools/ipnat_y.y Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/contrib/ipfilter/tools/ipnat_y.y Mon Apr 6 09:52:16 2015 (r281144) @@ -35,9 +35,6 @@ #include #include #include -#if __FreeBSD_version >= 300000 -# include -#endif #include #include #include Modified: projects/ifnet/contrib/ipfilter/tools/ippool.c ============================================================================== --- projects/ifnet/contrib/ipfilter/tools/ippool.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/contrib/ipfilter/tools/ippool.c Mon Apr 6 09:52:16 2015 (r281144) @@ -15,9 +15,6 @@ #include #include -#if __FreeBSD_version >= 300000 -# include -#endif #include #include Modified: projects/ifnet/contrib/ipfilter/tools/ippool_y.y ============================================================================== --- projects/ifnet/contrib/ipfilter/tools/ippool_y.y Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/contrib/ipfilter/tools/ippool_y.y Mon Apr 6 09:52:16 2015 (r281144) @@ -16,9 +16,6 @@ #include #include -#if __FreeBSD_version >= 300000 -# include -#endif #include #include Modified: projects/ifnet/contrib/llvm/FREEBSD-Xlist ============================================================================== --- projects/ifnet/contrib/llvm/FREEBSD-Xlist Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/contrib/llvm/FREEBSD-Xlist Mon Apr 6 09:52:16 2015 (r281144) @@ -397,7 +397,9 @@ tools/llvm-bcanalyzer/LLVMBuild.txt tools/llvm-bcanalyzer/Makefile tools/llvm-c-test/ tools/llvm-config/ -tools/llvm-cov/ +tools/llvm-cov/CMakeLists.txt +tools/llvm-cov/LLVMBuild.txt +tools/llvm-cov/Makefile tools/llvm-diff/CMakeLists.txt tools/llvm-diff/LLVMBuild.txt tools/llvm-diff/Makefile @@ -424,7 +426,9 @@ tools/llvm-nm/Makefile tools/llvm-objdump/CMakeLists.txt tools/llvm-objdump/LLVMBuild.txt tools/llvm-objdump/Makefile -tools/llvm-profdata/ +tools/llvm-profdata/CMakeLists.txt +tools/llvm-profdata/LLVMBuild.txt +tools/llvm-profdata/Makefile tools/llvm-readobj/CMakeLists.txt tools/llvm-readobj/LLVMBuild.txt tools/llvm-readobj/Makefile Copied: projects/ifnet/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff (from r281143, head/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff Mon Apr 6 09:52:16 2015 (r281144, copy of r281143, head/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff) @@ -0,0 +1,50 @@ +Pull in r227115 from upstream clang trunk (by Ben Langmuir): + + Fix assert instantiating string init of static variable + + ... when the variable's type is a typedef of a ConstantArrayType. Just + look through the typedef (and any other sugar). We only use the + constant array type here to get the element count. + +This fixes an assertion failure when building the games/redeclipse port. + +Introduced here: http://svnweb.freebsd.org/changeset/base/281046 + +Index: tools/clang/lib/Sema/SemaInit.cpp +=================================================================== +--- tools/clang/lib/Sema/SemaInit.cpp ++++ tools/clang/lib/Sema/SemaInit.cpp +@@ -149,10 +149,10 @@ static void updateStringLiteralType(Expr *E, QualT + static void CheckStringInit(Expr *Str, QualType &DeclT, const ArrayType *AT, + Sema &S) { + // Get the length of the string as parsed. +- uint64_t StrLength = +- cast(Str->getType())->getSize().getZExtValue(); ++ auto *ConstantArrayTy = ++ cast(Str->getType()->getUnqualifiedDesugaredType()); ++ uint64_t StrLength = ConstantArrayTy->getSize().getZExtValue(); + +- + if (const IncompleteArrayType *IAT = dyn_cast(AT)) { + // C99 6.7.8p14. We have an array of character type with unknown size + // being initialized to a string literal. +Index: tools/clang/test/SemaTemplate/instantiate-static-var.cpp +=================================================================== +--- tools/clang/test/SemaTemplate/instantiate-static-var.cpp ++++ tools/clang/test/SemaTemplate/instantiate-static-var.cpp +@@ -114,3 +114,15 @@ namespace PR6449 { + template class X1; + + } ++ ++typedef char MyString[100]; ++template ++struct StaticVarWithTypedefString { ++ static MyString str; ++}; ++template ++MyString StaticVarWithTypedefString::str = ""; ++ ++void testStaticVarWithTypedefString() { ++ (void)StaticVarWithTypedefString::str; ++} Modified: projects/ifnet/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp ============================================================================== --- projects/ifnet/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp Mon Apr 6 09:52:16 2015 (r281144) @@ -149,9 +149,9 @@ static void updateStringLiteralType(Expr static void CheckStringInit(Expr *Str, QualType &DeclT, const ArrayType *AT, Sema &S) { // Get the length of the string as parsed. - uint64_t StrLength = - cast(Str->getType())->getSize().getZExtValue(); - + auto *ConstantArrayTy = + cast(Str->getType()->getUnqualifiedDesugaredType()); + uint64_t StrLength = ConstantArrayTy->getSize().getZExtValue(); if (const IncompleteArrayType *IAT = dyn_cast(AT)) { // C99 6.7.8p14. We have an array of character type with unknown size Modified: projects/ifnet/etc/Makefile ============================================================================== --- projects/ifnet/etc/Makefile Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/etc/Makefile Mon Apr 6 09:52:16 2015 (r281144) @@ -379,7 +379,7 @@ distrib-dirs: ${MTREES:N/*} test "$$d" == "/" && d=""; \ d=${DISTBASE}$$d; \ shift; \ - test -d $$d || mkdir -p $$d; \ + test -d ${DESTDIR}/$$d || mkdir -p ${DESTDIR}/$$d; \ ${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \ "sed s#^\.#.$$d# | ${METALOG.add}" ; \ ${MTREE_CMD:N-W} -C -f $$m -K uname,gname | sed s#^\.#.$$d# | \ Modified: projects/ifnet/etc/login.conf ============================================================================== --- projects/ifnet/etc/login.conf Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/etc/login.conf Mon Apr 6 09:52:16 2015 (r281144) @@ -26,7 +26,7 @@ default:\ :passwd_format=sha512:\ :copyright=/etc/COPYRIGHT:\ :welcome=/etc/motd:\ - :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\ + :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:LC_COLLATE=C:\ :path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\ :nologin=/var/run/nologin:\ :cputime=unlimited:\ @@ -81,8 +81,8 @@ root:\ # Russian Users Accounts. Setup proper environment variables. # russian|Russian Users Accounts:\ - :charset=KOI8-R:\ - :lang=ru_RU.KOI8-R:\ + :charset=UTF-8:\ + :lang=ru_RU.UTF-8:\ :tc=default: Modified: projects/ifnet/etc/rc.d/pflog ============================================================================== --- projects/ifnet/etc/rc.d/pflog Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/etc/rc.d/pflog Mon Apr 6 09:52:16 2015 (r281144) @@ -24,30 +24,30 @@ pflog_prestart() { load_kld pflog || return 1 + # create pflog_dev interface if needed + if ! ifconfig $pflog_dev > /dev/null 2>&1; then + if ! ifconfig $pflog_dev create; then + warn "could not create $pflog_dev." + return 1 + fi + fi + # set pflog_dev interface to up state if ! ifconfig $pflog_dev up; then warn "could not bring up $pflog_dev." return 1 fi + # -p flag requires striping pidfile's leading /var/run and trailing .pid + pidfile=$(echo $pidfile | sed -e 's|/var/run/||' -e 's|.pid$||') + # prepare the command line for pflogd - rc_flags="-f $pflog_logfile -i $pflog_dev $rc_flags" + rc_flags="-p $pidfile -f $pflog_logfile -i $pflog_dev $rc_flags" # report we're ready to run pflogd return 0 } -pflog_poststart() { - # Allow child pflogd to settle - sleep 0.10 - # More elegant(?) method for getting a unique pid - if [ -f /var/run/pflogd.pid ]; then - mv /var/run/pflogd.pid $pidfile - else - warn "/var/run/pflogd.pid does not exist. Too fast." - fi -} - pflog_poststop() { if ! ifconfig $pflog_dev down; then @@ -70,29 +70,33 @@ pflog_resync() load_rc_config $name -# Check if spawning multiple pflogd -echo "Starting pflogd: $pflog_instances" -if [ "$pflog_instances" ] && [ -n "$pflog_instances" ]; then - start_postcmd="pflog_poststart" +# Check if spawning multiple pflogd and told what to spawn +if [ -n "$2" ]; then + # Set required variables + eval pflog_dev=\$pflog_${2}_dev + eval pflog_logfile=\$pflog_${2}_logfile + eval pflog_flags=\$pflog_${2}_flags + # Check that required vars have non-zero length, warn if not. + if [ -z $pflog_dev ]; then + warn "pflog_dev not set" + continue + fi + if [ -z $pflog_logfile ]; then + warn "pflog_logfile not set" + continue + fi + + # Provide a unique pidfile name for pflogd -p flag + pidfile="/var/run/pflogd.$2.pid" + + # Override service name and execute command + name=$pflog_dev + run_rc_command "$1" +# Check if spawning multiple pflogd and not told what to spawn +elif [ "$pflog_instances" ] && [ -n "$pflog_instances" ]; then # Interate through requested instances. for i in $pflog_instances; do - # Set required variables - eval pflog_dev=\$pflog_${i}_dev - eval pflog_logfile=\$pflog_${i}_logfile - eval pflog_flags=\$pflog_${i}_flags - # Check that required vars have non-zero length, warn if not. - if [ -z $pflog_dev ]; then - warn "pflog_dev not set" - continue - fi - if [ -z $pflog_logfile ]; then - warn "pflog_logfile not set" - continue - fi - # pflogd sets a pidfile, but the name is hardcoded. Concoct a - # unique pidfile name. - pidfile="/var/run/pflogd.$i.pid" - run_rc_command "$1" + /etc/rc.d/pflog $1 $i done else # Typical case, spawn single instance only. Modified: projects/ifnet/include/pthread.h ============================================================================== --- projects/ifnet/include/pthread.h Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/include/pthread.h Mon Apr 6 09:52:16 2015 (r281144) @@ -144,19 +144,25 @@ struct _pthread_cleanup_info { */ __BEGIN_DECLS int pthread_atfork(void (*)(void), void (*)(void), void (*)(void)); -int pthread_attr_destroy(pthread_attr_t *); +int pthread_attr_destroy(pthread_attr_t *) __nonnull(1); int pthread_attr_getstack(const pthread_attr_t * __restrict, - void ** __restrict, size_t * __restrict); -int pthread_attr_getstacksize(const pthread_attr_t *, size_t *); + void ** __restrict, size_t * __restrict) + __nonnull_all; +int pthread_attr_getstacksize(const pthread_attr_t *, size_t *) + __nonnull_all; int pthread_attr_getguardsize(const pthread_attr_t *, size_t *); int pthread_attr_getstackaddr(const pthread_attr_t *, void **); -int pthread_attr_getdetachstate(const pthread_attr_t *, int *); -int pthread_attr_init(pthread_attr_t *); -int pthread_attr_setstacksize(pthread_attr_t *, size_t); -int pthread_attr_setguardsize(pthread_attr_t *, size_t); -int pthread_attr_setstack(pthread_attr_t *, void *, size_t); +int pthread_attr_getdetachstate(const pthread_attr_t *, int *) + __nonnull_all; +int pthread_attr_init(pthread_attr_t *) __nonnull(1); +int pthread_attr_setstacksize(pthread_attr_t *, size_t) + __nonnull(1); +int pthread_attr_setguardsize(pthread_attr_t *, size_t) + __nonnull(1); +int pthread_attr_setstack(pthread_attr_t *, void *, size_t) + __nonnull(1); int pthread_attr_setstackaddr(pthread_attr_t *, void *); -int pthread_attr_setdetachstate(pthread_attr_t *, int); +int pthread_attr_setdetachstate(pthread_attr_t *, int) __nonnull(1); int pthread_barrier_destroy(pthread_barrier_t *); int pthread_barrier_init(pthread_barrier_t *, const pthread_barrierattr_t *, unsigned); @@ -164,7 +170,7 @@ int pthread_barrier_wait(pthread_barrie int pthread_barrierattr_destroy(pthread_barrierattr_t *); int pthread_barrierattr_getpshared(const pthread_barrierattr_t *, int *); -int pthread_barrierattr_init(pthread_barrierattr_t *); +int pthread_barrierattr_init(pthread_barrierattr_t *) __nonnull(1); int pthread_barrierattr_setpshared(pthread_barrierattr_t *, int); #define pthread_cleanup_push(cleanup_routine, cleanup_arg) \ @@ -180,98 +186,109 @@ int pthread_barrierattr_setpshared(pthr __pthread_cleanup_pop_imp(execute); \ } -int pthread_condattr_destroy(pthread_condattr_t *); +int pthread_condattr_destroy(pthread_condattr_t *) __nonnull(1); int pthread_condattr_getclock(const pthread_condattr_t *, - clockid_t *); -int pthread_condattr_getpshared(const pthread_condattr_t *, int *); -int pthread_condattr_init(pthread_condattr_t *); -int pthread_condattr_setclock(pthread_condattr_t *, clockid_t); -int pthread_condattr_setpshared(pthread_condattr_t *, int); -int pthread_cond_broadcast(pthread_cond_t *); -int pthread_cond_destroy(pthread_cond_t *); + clockid_t *) __nonnull_all; +int pthread_condattr_getpshared(const pthread_condattr_t *, int *) + __nonnull_all; +int pthread_condattr_init(pthread_condattr_t *) __nonnull(1); +int pthread_condattr_setclock(pthread_condattr_t *, clockid_t) + __nonnull(1); +int pthread_condattr_setpshared(pthread_condattr_t *, int) + __nonnull(1); +int pthread_cond_broadcast(pthread_cond_t *) + __nonnull(1); +int pthread_cond_destroy(pthread_cond_t *) + __nonnull(1); int pthread_cond_init(pthread_cond_t *, - const pthread_condattr_t *); -int pthread_cond_signal(pthread_cond_t *); + const pthread_condattr_t *) __nonnull(1); +int pthread_cond_signal(pthread_cond_t *) __nonnull(1); int pthread_cond_timedwait(pthread_cond_t *, pthread_mutex_t *__mutex, const struct timespec *) - __requires_exclusive(*__mutex); + __nonnull_all __requires_exclusive(*__mutex); int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *__mutex) - __requires_exclusive(*__mutex); + __nonnull_all __requires_exclusive(*__mutex); int pthread_create(pthread_t *, const pthread_attr_t *, - void *(*) (void *), void *); + void *(*) (void *), void *) __nonnull(1) __nonnull(3); int pthread_detach(pthread_t); int pthread_equal(pthread_t, pthread_t); void pthread_exit(void *) __dead2; void *pthread_getspecific(pthread_key_t); -int pthread_getcpuclockid(pthread_t, clockid_t *); +int pthread_getcpuclockid(pthread_t, clockid_t *) __nonnull(2); int pthread_join(pthread_t, void **); int pthread_key_create(pthread_key_t *, - void (*) (void *)); + void (*) (void *)) __nonnull(1); int pthread_key_delete(pthread_key_t); -int pthread_mutexattr_init(pthread_mutexattr_t *); -int pthread_mutexattr_destroy(pthread_mutexattr_t *); +int pthread_mutexattr_init(pthread_mutexattr_t *) __nonnull(1); +int pthread_mutexattr_destroy(pthread_mutexattr_t *) __nonnull(1); int pthread_mutexattr_getpshared(const pthread_mutexattr_t *, - int *); -int pthread_mutexattr_gettype(pthread_mutexattr_t *, int *); -int pthread_mutexattr_settype(pthread_mutexattr_t *, int); -int pthread_mutexattr_setpshared(pthread_mutexattr_t *, int); + int *) __nonnull_all; +int pthread_mutexattr_gettype(pthread_mutexattr_t *, int *) + __nonnull_all; +int pthread_mutexattr_settype(pthread_mutexattr_t *, int) + __nonnull(1); +int pthread_mutexattr_setpshared(pthread_mutexattr_t *, int) + __nonnull(1); int pthread_mutex_destroy(pthread_mutex_t *__mutex) - __requires_unlocked(*__mutex); + __nonnull(1) __requires_unlocked(*__mutex); int pthread_mutex_init(pthread_mutex_t *__mutex, const pthread_mutexattr_t *) - __requires_unlocked(*__mutex); + __nonnull(1) __requires_unlocked(*__mutex); int pthread_mutex_lock(pthread_mutex_t *__mutex) - __locks_exclusive(*__mutex); + __nonnull(1) __locks_exclusive(*__mutex); int pthread_mutex_trylock(pthread_mutex_t *__mutex) - __trylocks_exclusive(0, *__mutex); + __nonnull(1) __trylocks_exclusive(0, *__mutex); int pthread_mutex_timedlock(pthread_mutex_t *__mutex, const struct timespec *) - __trylocks_exclusive(0, *__mutex); + __nonnull_all __trylocks_exclusive(0, *__mutex); int pthread_mutex_unlock(pthread_mutex_t *__mutex) - __unlocks(*__mutex); -int pthread_once(pthread_once_t *, void (*) (void)); + __nonnull(1) __unlocks(*__mutex); +int pthread_once(pthread_once_t *, void (*) (void)) __nonnull_all; int pthread_rwlock_destroy(pthread_rwlock_t *__rwlock) - __requires_unlocked(*__rwlock); + __nonnull(1) __requires_unlocked(*__rwlock); int pthread_rwlock_init(pthread_rwlock_t *__rwlock, const pthread_rwlockattr_t *) - __requires_unlocked(*__rwlock); + __nonnull(1) __requires_unlocked(*__rwlock); int pthread_rwlock_rdlock(pthread_rwlock_t *__rwlock) - __locks_shared(*__rwlock); + __nonnull(1) __locks_shared(*__rwlock); int pthread_rwlock_timedrdlock(pthread_rwlock_t *__rwlock, const struct timespec *) - __trylocks_shared(0, *__rwlock); + __nonnull_all __trylocks_shared(0, *__rwlock); int pthread_rwlock_timedwrlock(pthread_rwlock_t *__rwlock, const struct timespec *) - __trylocks_exclusive(0, *__rwlock); + __nonnull_all __trylocks_exclusive(0, *__rwlock); int pthread_rwlock_tryrdlock(pthread_rwlock_t *__rwlock) - __trylocks_shared(0, *__rwlock); + __nonnull(1) __trylocks_shared(0, *__rwlock); int pthread_rwlock_trywrlock(pthread_rwlock_t *__rwlock) - __trylocks_exclusive(0, *__rwlock); + __nonnull(1) __trylocks_exclusive(0, *__rwlock); int pthread_rwlock_unlock(pthread_rwlock_t *__rwlock) - __unlocks(*__rwlock); + __nonnull(1) __unlocks(*__rwlock); int pthread_rwlock_wrlock(pthread_rwlock_t *__rwlock) - __locks_exclusive(*__rwlock); -int pthread_rwlockattr_destroy(pthread_rwlockattr_t *); + __nonnull(1) __locks_exclusive(*__rwlock); +int pthread_rwlockattr_destroy(pthread_rwlockattr_t *) + __nonnull(1); int pthread_rwlockattr_getkind_np(const pthread_rwlockattr_t *, int *); int pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *, - int *); -int pthread_rwlockattr_init(pthread_rwlockattr_t *); + int *) __nonnull_all; +int pthread_rwlockattr_init(pthread_rwlockattr_t *) + __nonnull(1); int pthread_rwlockattr_setkind_np(pthread_rwlockattr_t *, int); -int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int); +int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int) + __nonnull(1); pthread_t pthread_self(void); int pthread_setspecific(pthread_key_t, const void *); int pthread_spin_init(pthread_spinlock_t *__spin, int) - __requires_unlocked(*__spin); + __requires_unlocked(*__spin); int pthread_spin_destroy(pthread_spinlock_t *__spin) - __requires_unlocked(*__spin); + __requires_unlocked(*__spin); int pthread_spin_lock(pthread_spinlock_t *__spin) - __locks_exclusive(*__spin); + __locks_exclusive(*__spin); int pthread_spin_trylock(pthread_spinlock_t *__spin) - __trylocks_exclusive(0, *__spin); + __trylocks_exclusive(0, *__spin); int pthread_spin_unlock(pthread_spinlock_t *__spin) - __unlocks(*__spin); + __unlocks(*__spin); int pthread_cancel(pthread_t); int pthread_setcancelstate(int, int *); int pthread_setcanceltype(int, int *); @@ -295,18 +312,20 @@ int pthread_mutexattr_setprotocol(pthre int pthread_attr_getinheritsched(const pthread_attr_t *, int *); int pthread_attr_getschedparam(const pthread_attr_t *, - struct sched_param *); -int pthread_attr_getschedpolicy(const pthread_attr_t *, int *); -int pthread_attr_getscope(const pthread_attr_t *, int *); + struct sched_param *) __nonnull_all; +int pthread_attr_getschedpolicy(const pthread_attr_t *, int *) + __nonnull_all; +int pthread_attr_getscope(const pthread_attr_t *, int *) + __nonnull_all; int pthread_attr_setinheritsched(pthread_attr_t *, int); int pthread_attr_setschedparam(pthread_attr_t *, - const struct sched_param *); -int pthread_attr_setschedpolicy(pthread_attr_t *, int); -int pthread_attr_setscope(pthread_attr_t *, int); + const struct sched_param *) __nonnull(1) __nonnull(2); +int pthread_attr_setschedpolicy(pthread_attr_t *, int) __nonnull(1); +int pthread_attr_setscope(pthread_attr_t *, int) __nonnull(1); int pthread_getschedparam(pthread_t pthread, int *, - struct sched_param *); + struct sched_param *) __nonnull(2) __nonnull(3); int pthread_setschedparam(pthread_t, int, - const struct sched_param *); + const struct sched_param *) __nonnull(3); #if __XSI_VISIBLE int pthread_getconcurrency(void); int pthread_setconcurrency(int); Modified: projects/ifnet/include/signal.h ============================================================================== --- projects/ifnet/include/signal.h Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/include/signal.h Mon Apr 6 09:52:16 2015 (r281144) @@ -78,10 +78,10 @@ int sigdelset(sigset_t *, int); int sigemptyset(sigset_t *); int sigfillset(sigset_t *); int sigismember(const sigset_t *, int); -int sigpending(sigset_t *); +int sigpending(sigset_t *) __nonnull(1); int sigprocmask(int, const sigset_t * __restrict, sigset_t * __restrict); -int sigsuspend(const sigset_t *); -int sigwait(const sigset_t * __restrict, int * __restrict); +int sigsuspend(const sigset_t *) __nonnull(1); +int sigwait(const sigset_t * __restrict, int * __restrict) __nonnull_all; #endif #if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 600 Modified: projects/ifnet/include/stdlib.h ============================================================================== --- projects/ifnet/include/stdlib.h Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/include/stdlib.h Mon Apr 6 09:52:16 2015 (r281144) @@ -87,21 +87,22 @@ int atoi(const char *); long atol(const char *); void *bsearch(const void *, const void *, size_t, size_t, int (*)(const void *, const void *)); -void *calloc(size_t, size_t) __malloc_like; +void *calloc(size_t, size_t) __malloc_like __result_use_check + __alloc_size(1) __alloc_size(2); div_t div(int, int) __pure2; _Noreturn void exit(int); void free(void *); char *getenv(const char *); long labs(long) __pure2; ldiv_t ldiv(long, long) __pure2; -void *malloc(size_t) __malloc_like; +void *malloc(size_t) __malloc_like __result_use_check __alloc_size(1); int mblen(const char *, size_t); size_t mbstowcs(wchar_t * __restrict , const char * __restrict, size_t); int mbtowc(wchar_t * __restrict, const char * __restrict, size_t); void qsort(void *, size_t, size_t, int (*)(const void *, const void *)); int rand(void); -void *realloc(void *, size_t); +void *realloc(void *, size_t) __result_use_check __alloc_size(2); void srand(unsigned); double strtod(const char * __restrict, char ** __restrict); float strtof(const char * __restrict, char ** __restrict); @@ -155,7 +156,7 @@ _Noreturn void _Exit(int); * If we're in a mode greater than C99, expose C11 functions. */ #if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L -void * aligned_alloc(size_t, size_t) __malloc_like; +void * aligned_alloc(size_t, size_t) __malloc_like __alloc_size(2); int at_quick_exit(void (*)(void)); _Noreturn void quick_exit(int); @@ -170,7 +171,8 @@ char *realpath(const char * __restrict, int rand_r(unsigned *); /* (TSF) */ #endif #if __POSIX_VISIBLE >= 200112 -int posix_memalign(void **, size_t, size_t); /* (ADV) */ +int posix_memalign(void **, size_t, size_t) __nonnull(1) + __alloc_size(3); /* (ADV) */ int setenv(const char *, const char *, int); int unsetenv(const char *); #endif @@ -301,7 +303,7 @@ void qsort_r(void *, size_t, size_t, vo int (*)(void *, const void *, const void *)); int radixsort(const unsigned char **, int, const unsigned char *, unsigned); -void *reallocf(void *, size_t); +void *reallocf(void *, size_t) __result_use_check __alloc_size(2); int rpmatch(const char *); void setprogname(const char *); int sradixsort(const unsigned char **, int, const unsigned char *, Modified: projects/ifnet/lib/libc/gen/fts.c ============================================================================== --- projects/ifnet/lib/libc/gen/fts.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/lib/libc/gen/fts.c Mon Apr 6 09:52:16 2015 (r281144) @@ -905,12 +905,13 @@ fts_stat(FTS *sp, FTSENT *p, int follow, if (ISSET(FTS_LOGICAL) || follow) { if (fstatat(dfd, path, sbp, 0)) { saved_errno = errno; - if (!fstatat(dfd, path, sbp, AT_SYMLINK_NOFOLLOW)) { - errno = 0; - return (FTS_SLNONE); + if (fstatat(dfd, path, sbp, AT_SYMLINK_NOFOLLOW)) { + p->fts_errno = saved_errno; + goto err; } - p->fts_errno = saved_errno; - goto err; + errno = 0; + if (S_ISLNK(sbp->st_mode)) + return (FTS_SLNONE); } } else if (fstatat(dfd, path, sbp, AT_SYMLINK_NOFOLLOW)) { p->fts_errno = errno; Modified: projects/ifnet/lib/libc/net/getaddrinfo.c ============================================================================== --- projects/ifnet/lib/libc/net/getaddrinfo.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/lib/libc/net/getaddrinfo.c Mon Apr 6 09:52:16 2015 (r281144) @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include #include #ifdef INET6 -#include #include #include #include Modified: projects/ifnet/lib/libc/net/name6.c ============================================================================== --- projects/ifnet/lib/libc/net/name6.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/lib/libc/net/name6.c Mon Apr 6 09:52:16 2015 (r281144) @@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$"); #include #ifdef INET6 #include -#include #include #include #include /* XXX */ Modified: projects/ifnet/lib/libc/string/strlcat.c ============================================================================== --- projects/ifnet/lib/libc/string/strlcat.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/lib/libc/string/strlcat.c Mon Apr 6 09:52:16 2015 (r281144) @@ -1,7 +1,7 @@ -/* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */ +/* $OpenBSD: strlcat.c,v 1.15 2015/03/02 21:41:08 millert Exp $ */ /* - * Copyright (c) 1998 Todd C. Miller + * Copyright (c) 1998, 2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -23,36 +23,36 @@ __FBSDID("$FreeBSD$"); #include /* - * Appends src to string dst of size siz (unlike strncat, siz is the - * full size of dst, not space left). At most siz-1 characters - * will be copied. Always NUL terminates (unless siz <= strlen(dst)). - * Returns strlen(src) + MIN(siz, strlen(initial dst)). - * If retval >= siz, truncation occurred. + * Appends src to string dst of size dsize (unlike strncat, dsize is the + * full size of dst, not space left). At most dsize-1 characters + * will be copied. Always NUL terminates (unless dsize <= strlen(dst)). + * Returns strlen(src) + MIN(dsize, strlen(initial dst)). + * If retval >= dsize, truncation occurred. */ size_t -strlcat(char * __restrict dst, const char * __restrict src, size_t siz) +strlcat(char * __restrict dst, const char * __restrict src, size_t dsize) { - char *d = dst; - const char *s = src; - size_t n = siz; + const char *odst = dst; + const char *osrc = src; + size_t n = dsize; size_t dlen; - /* Find the end of dst and adjust bytes left but don't go past end */ - while (n-- != 0 && *d != '\0') - d++; - dlen = d - dst; - n = siz - dlen; - - if (n == 0) - return(dlen + strlen(s)); - while (*s != '\0') { - if (n != 1) { - *d++ = *s; + /* Find the end of dst and adjust bytes left but don't go past end. */ + while (n-- != 0 && *dst != '\0') + dst++; + dlen = dst - odst; + n = dsize - dlen; + + if (n-- == 0) + return(dlen + strlen(src)); + while (*src != '\0') { + if (n != 0) { + *dst++ = *src; n--; } - s++; + src++; } - *d = '\0'; + *dst = '\0'; - return(dlen + (s - src)); /* count does not include NUL */ + return(dlen + (src - osrc)); /* count does not include NUL */ } Modified: projects/ifnet/lib/libc/string/strlcpy.c ============================================================================== --- projects/ifnet/lib/libc/string/strlcpy.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/lib/libc/string/strlcpy.c Mon Apr 6 09:52:16 2015 (r281144) @@ -1,7 +1,7 @@ -/* $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $ */ +/* $OpenBSD: strlcpy.c,v 1.12 2015/01/15 03:54:12 millert Exp $ */ /* - * Copyright (c) 1998 Todd C. Miller + * Copyright (c) 1998, 2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -23,32 +23,31 @@ __FBSDID("$FreeBSD$"); #include /* - * Copy src to string dst of size siz. At most siz-1 characters - * will be copied. Always NUL terminates (unless siz == 0). - * Returns strlen(src); if retval >= siz, truncation occurred. + * Copy string src to buffer dst of size dsize. At most dsize-1 + * chars will be copied. Always NUL terminates (unless dsize == 0). + * Returns strlen(src); if retval >= dsize, truncation occurred. */ size_t -strlcpy(char * __restrict dst, const char * __restrict src, size_t siz) +strlcpy(char * __restrict dst, const char * __restrict src, size_t dsize) { - char *d = dst; - const char *s = src; - size_t n = siz; - - /* Copy as many bytes as will fit */ - if (n != 0) { - while (--n != 0) { - if ((*d++ = *s++) == '\0') + const char *osrc = src; + size_t nleft = dsize; + + /* Copy as many bytes as will fit. */ + if (nleft != 0) { + while (--nleft != 0) { + if ((*dst++ = *src++) == '\0') break; } } - /* Not enough room in dst, add NUL and traverse rest of src */ - if (n == 0) { - if (siz != 0) - *d = '\0'; /* NUL-terminate dst */ - while (*s++) + /* Not enough room in dst, add NUL and traverse rest of src. */ + if (nleft == 0) { + if (dsize != 0) + *dst = '\0'; /* NUL-terminate dst */ + while (*src++) ; } - return(s - src - 1); /* count does not include NUL */ + return(src - osrc - 1); /* count does not include NUL */ } Modified: projects/ifnet/lib/libpmc/libpmc.c ============================================================================== --- projects/ifnet/lib/libpmc/libpmc.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/lib/libpmc/libpmc.c Mon Apr 6 09:52:16 2015 (r281144) @@ -159,6 +159,7 @@ PMC_CLASSDEP_TABLE(p6, P6); PMC_CLASSDEP_TABLE(xscale, XSCALE); PMC_CLASSDEP_TABLE(armv7, ARMV7); PMC_CLASSDEP_TABLE(mips24k, MIPS24K); +PMC_CLASSDEP_TABLE(mips74k, MIPS74K); PMC_CLASSDEP_TABLE(octeon, OCTEON); PMC_CLASSDEP_TABLE(ucf, UCF); PMC_CLASSDEP_TABLE(ppc7450, PPC7450); @@ -293,6 +294,7 @@ PMC_MDEP_TABLE(p6, P6, PMC_CLASS_SOFT, P PMC_MDEP_TABLE(xscale, XSCALE, PMC_CLASS_SOFT, PMC_CLASS_XSCALE); PMC_MDEP_TABLE(armv7, ARMV7, PMC_CLASS_SOFT, PMC_CLASS_ARMV7); PMC_MDEP_TABLE(mips24k, MIPS24K, PMC_CLASS_SOFT, PMC_CLASS_MIPS24K); +PMC_MDEP_TABLE(mips74k, MIPS74K, PMC_CLASS_SOFT, PMC_CLASS_MIPS74K); PMC_MDEP_TABLE(octeon, OCTEON, PMC_CLASS_SOFT, PMC_CLASS_OCTEON); PMC_MDEP_TABLE(ppc7450, PPC7450, PMC_CLASS_SOFT, PMC_CLASS_PPC7450); PMC_MDEP_TABLE(ppc970, PPC970, PMC_CLASS_SOFT, PMC_CLASS_PPC970); @@ -360,6 +362,7 @@ PMC_CLASS_TABLE_DESC(armv7, ARMV7, armv7 #endif #if defined(__mips__) PMC_CLASS_TABLE_DESC(mips24k, MIPS24K, mips24k, mips); +PMC_CLASS_TABLE_DESC(mips74k, MIPS74K, mips74k, mips); PMC_CLASS_TABLE_DESC(octeon, OCTEON, octeon, mips); #endif /* __mips__ */ #if defined(__powerpc__) @@ -2432,6 +2435,13 @@ static struct pmc_event_alias mips24k_al EV_ALIAS(NULL, NULL) }; +static struct pmc_event_alias mips74k_aliases[] = { + EV_ALIAS("instructions", "INSTR_EXECUTED"), + EV_ALIAS("branches", "BRANCH_INSNS"), + EV_ALIAS("branch-mispredicts", "MISPREDICTED_BRANCH_INSNS"), + EV_ALIAS(NULL, NULL) +}; + static struct pmc_event_alias octeon_aliases[] = { EV_ALIAS("instructions", "RET"), EV_ALIAS("branches", "BR"), @@ -2923,6 +2933,10 @@ pmc_event_names_of_class(enum pmc_class ev = mips24k_event_table; count = PMC_EVENT_TABLE_SIZE(mips24k); break; + case PMC_CLASS_MIPS74K: + ev = mips74k_event_table; + count = PMC_EVENT_TABLE_SIZE(mips74k); + break; case PMC_CLASS_OCTEON: ev = octeon_event_table; count = PMC_EVENT_TABLE_SIZE(octeon); @@ -3213,6 +3227,10 @@ pmc_init(void) PMC_MDEP_INIT(mips24k); pmc_class_table[n] = &mips24k_class_table_descr; break; + case PMC_CPU_MIPS_74K: + PMC_MDEP_INIT(mips74k); + pmc_class_table[n] = &mips74k_class_table_descr; + break; case PMC_CPU_MIPS_OCTEON: PMC_MDEP_INIT(octeon); pmc_class_table[n] = &octeon_class_table_descr; @@ -3414,6 +3432,9 @@ _pmc_name_of_event(enum pmc_event pe, en } else if (pe >= PMC_EV_MIPS24K_FIRST && pe <= PMC_EV_MIPS24K_LAST) { ev = mips24k_event_table; evfence = mips24k_event_table + PMC_EVENT_TABLE_SIZE(mips24k); + } else if (pe >= PMC_EV_MIPS74K_FIRST && pe <= PMC_EV_MIPS74K_LAST) { + ev = mips74k_event_table; + evfence = mips74k_event_table + PMC_EVENT_TABLE_SIZE(mips74k); } else if (pe >= PMC_EV_OCTEON_FIRST && pe <= PMC_EV_OCTEON_LAST) { ev = octeon_event_table; evfence = octeon_event_table + PMC_EVENT_TABLE_SIZE(octeon); Modified: projects/ifnet/libexec/rtld-elf/mips/reloc.c ============================================================================== --- projects/ifnet/libexec/rtld-elf/mips/reloc.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/libexec/rtld-elf/mips/reloc.c Mon Apr 6 09:52:16 2015 (r281144) @@ -245,7 +245,7 @@ _mips_rtld_bind(Obj_Entry *obj, Elf_Size def = find_symdef(reloff, obj, &defobj, SYMLOOK_IN_PLT, NULL, NULL); if (def == NULL) - _rtld_error("bind failed no symbol"); + rtld_die(); target = (Elf_Addr)(defobj->relocbase + def->st_value); dbg("bind now/fixup at %s sym # %jd in %s --> was=%p new=%p", Modified: projects/ifnet/sbin/ifconfig/af_inet.c ============================================================================== --- projects/ifnet/sbin/ifconfig/af_inet.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/sbin/ifconfig/af_inet.c Mon Apr 6 09:52:16 2015 (r281144) @@ -46,7 +46,6 @@ static const char rcsid[] = #include #include -#include /* for struct ifaddr */ #include #include #include Modified: projects/ifnet/sbin/ifconfig/af_inet6.c ============================================================================== --- projects/ifnet/sbin/ifconfig/af_inet6.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/sbin/ifconfig/af_inet6.c Mon Apr 6 09:52:16 2015 (r281144) @@ -48,7 +48,6 @@ static const char rcsid[] = #include #include -#include /* for struct ifaddr */ #include #include #include Modified: projects/ifnet/sbin/ifconfig/af_nd6.c ============================================================================== --- projects/ifnet/sbin/ifconfig/af_nd6.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/sbin/ifconfig/af_nd6.c Mon Apr 6 09:52:16 2015 (r281144) @@ -46,7 +46,6 @@ static const char rcsid[] = #include #include -#include #include #include #include Modified: projects/ifnet/sbin/ifconfig/carp.c ============================================================================== --- projects/ifnet/sbin/ifconfig/carp.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/sbin/ifconfig/carp.c Mon Apr 6 09:52:16 2015 (r281144) @@ -36,7 +36,6 @@ #include #include -#include #include #include #include Modified: projects/ifnet/sbin/ifconfig/ifconfig.c ============================================================================== --- projects/ifnet/sbin/ifconfig/ifconfig.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/sbin/ifconfig/ifconfig.c Mon Apr 6 09:52:16 2015 (r281144) @@ -51,7 +51,6 @@ static const char rcsid[] = #include #include -#include #include #include #include Modified: projects/ifnet/sbin/ifconfig/ifvlan.c ============================================================================== --- projects/ifnet/sbin/ifconfig/ifvlan.c Mon Apr 6 09:42:23 2015 (r281143) +++ projects/ifnet/sbin/ifconfig/ifvlan.c Mon Apr 6 09:52:16 2015 (r281144) @@ -40,7 +40,6 @@ #include #include -#include #include *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Apr 6 15:10:55 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4EC392D9; Mon, 6 Apr 2015 15:10:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 3898C657; Mon, 6 Apr 2015 15:10:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t36FAsUJ085790; Mon, 6 Apr 2015 15:10:54 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t36FAsxP085789; Mon, 6 Apr 2015 15:10:54 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504061510.t36FAsxP085789@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 6 Apr 2015 15:10:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281150 - projects/ifnet/sys/net X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2015 15:10:55 -0000 Author: glebius Date: Mon Apr 6 15:10:54 2015 New Revision: 281150 URL: https://svnweb.freebsd.org/changeset/base/281150 Log: Improve comments on flags a bit. Modified: projects/ifnet/sys/net/if.h Modified: projects/ifnet/sys/net/if.h ============================================================================== --- projects/ifnet/sys/net/if.h Mon Apr 6 14:50:54 2015 (r281149) +++ projects/ifnet/sys/net/if.h Mon Apr 6 15:10:54 2015 (r281150) @@ -134,8 +134,8 @@ struct if_data { * after. * (n) if_flags field written only by the network stack, read by either the * stack or driver. - * (d) if_drv_flags field written only by the device driver, read by either - * the stack or driver. + * (o) obsoleted in FreeBSD, but third party applications may still + * require definitions. */ #define IFF_UP 0x1 /* (n) interface is up */ #define IFF_BROADCAST 0x2 /* (i) broadcast address valid */ @@ -143,11 +143,11 @@ struct if_data { #define IFF_LOOPBACK 0x8 /* (i) is a loopback net */ #define IFF_POINTOPOINT 0x10 /* (i) is a point-to-point link */ /* 0x20 was IFF_SMART */ -#define IFF_RUNNING 0x40 /* (d) resources allocated */ +#define IFF_RUNNING 0x40 /* (o) resources allocated */ #define IFF_NOARP 0x80 /* (n) no address resolution protocol */ #define IFF_PROMISC 0x100 /* (n) receive all packets */ #define IFF_ALLMULTI 0x200 /* (n) receive all multicast packets */ -#define IFF_OACTIVE 0x400 /* (d) tx hardware queue is full */ +#define IFF_OACTIVE 0x400 /* (o) tx hardware queue is full */ #define IFF_SIMPLEX 0x800 /* (i) can't hear own transmissions */ #define IFF_LINK0 0x1000 /* per link layer defined bit */ #define IFF_LINK1 0x2000 /* per link layer defined bit */ From owner-svn-src-projects@FreeBSD.ORG Mon Apr 6 15:22:34 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8FF457F8; Mon, 6 Apr 2015 15:22:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 6FC1A7B3; Mon, 6 Apr 2015 15:22:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t36FMX1u092977; Mon, 6 Apr 2015 15:22:33 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t36FMXwX092973; Mon, 6 Apr 2015 15:22:33 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504061522.t36FMXwX092973@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 6 Apr 2015 15:22:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281151 - projects/ifnet/sys/net X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2015 15:22:34 -0000 Author: glebius Date: Mon Apr 6 15:22:32 2015 New Revision: 281151 URL: https://svnweb.freebsd.org/changeset/base/281151 Log: Provide software context store in struct ifnet for any facility. To add a new facility, one needs to grab a value in the ift_feature enum, and not need to modify struct ifnet. The store also has a cache to return frequently requested values, which resembles kobj(9) method cache. The plan is to move into the softc store almost all possible software contexts that hang off the struct ifnet, leaving static only the driver softc, AF_INET, AF_INET6 pointers, and other frequently used pointer. Sponsored by: Nginx, Inc. Sponsored by: Netflix Modified: projects/ifnet/sys/net/if.c projects/ifnet/sys/net/if.h projects/ifnet/sys/net/if_var.h Modified: projects/ifnet/sys/net/if.c ============================================================================== --- projects/ifnet/sys/net/if.c Mon Apr 6 15:10:54 2015 (r281150) +++ projects/ifnet/sys/net/if.c Mon Apr 6 15:22:32 2015 (r281151) @@ -538,6 +538,9 @@ if_attach(struct if_attach_args *ifat) } ifp = malloc(sizeof(struct ifnet), M_IFNET, M_WAITOK | M_ZERO); + ifp->if_scstore = malloc(sizeof(struct ifsoftc) * SOFTC_CACHE_SIZE, + M_IFNET, M_WAITOK | M_ZERO); + ifp->if_nsoftcs = SOFTC_CACHE_SIZE; for (int i = 0; i < IFCOUNTERS; i++) ifp->if_counters[i] = counter_u64_alloc(M_WAITOK); #ifdef MAC @@ -1541,7 +1544,13 @@ if_rtdel(struct radix_node *rn, void *ar void * if_getsoftc(struct ifnet *ifp, ift_feature f) { + struct ifsoftc *sc; + /* + * Some softcs are non-optional either for performance reasons, + * since they always exist and are often dereferenced, or for + * historical reasons. + */ switch (f) { case IF_DRIVER_SOFTC: return (ifp->if_softc); @@ -1554,8 +1563,97 @@ if_getsoftc(struct ifnet *ifp, ift_featu case IF_VLAN: return (ifp->if_vlantrunk); default: - panic("%s: unknown feature %d", __func__, f); + /* fall through */ + ; }; + + /* + * Rest of softc live in the store and in the cache. + * First check the cache. + */ + sc = ifp->if_sccache[f & (SOFTC_CACHE_SIZE - 1)]; + if (sc != NULL && sc->ifsc_desc == f) + return (sc->ifsc_ptr); + + /* + * Then check the store. + * We can do lookup lockless, since if_nsoftcs only grows. + */ + for (int i = 0; i < ifp->if_nsoftcs; i++) { + sc = &ifp->if_scstore[i]; + if (sc->ifsc_desc == f) { + ifp->if_sccache[f & (SOFTC_CACHE_SIZE - 1)] = sc; + return (sc->ifsc_ptr); + } + } + + /* + * XXXGL: a negative cache would be not bad. + */ + return (NULL); +} + +/* + * Set arbitrary context identified by ift_feature key. It is responsibility + * of the caller to establish race safety against two if_setsoftc()s. The + * function may sleep when setting new context. The function will not sleep + * when clearing previously set context. May fail only if associated context + * is already set. + */ +int +if_setsoftc(struct ifnet *ifp, ift_feature f, void *softc) +{ + int i; + + IF_WLOCK(ifp); +retry: + for (i = 0; i < ifp->if_nsoftcs; i++) + if (ifp->if_scstore[i].ifsc_desc == f) { + IF_WUNLOCK(ifp); + return (EEXIST); + } + + for (i = 0; i < ifp->if_nsoftcs; i++) + if (ifp->if_scstore[i].ifsc_desc == 0) + break; + + if (i == ifp->if_nsoftcs) { + struct ifsoftc *new, *old; + u_int size; + + old = ifp->if_scstore; + size = ifp->if_nsoftcs; + IF_WUNLOCK(ifp); + new = malloc(sizeof(struct ifsoftc) * size * 2, + M_IFNET, M_WAITOK | M_ZERO); + IF_WLOCK(ifp); + if (ifp->if_scstore != old) { + free(new, M_IFNET); + goto retry; + } + bcopy(ifp->if_scstore, new, sizeof(struct ifsoftc) * size); + ifp->if_scstore = new; + ifp->if_nsoftcs = size * 2; + /* + * XXXGL: of course there is a race here against if_getsoftc(), + * which runs lockless. We lack RCU or lightweight reference + * counting. + */ + free(old, M_IFNET); + } + + if (softc != NULL) { + ifp->if_scstore[i].ifsc_ptr = softc; + ifp->if_scstore[i].ifsc_desc = f; + ifp->if_sccache[f & (SOFTC_CACHE_SIZE - 1)] = + &ifp->if_scstore[i]; + } else { + ifp->if_scstore[i].ifsc_desc = 0; + ifp->if_scstore[i].ifsc_ptr = NULL; + ifp->if_sccache[f & (SOFTC_CACHE_SIZE - 1)] = NULL; + } + IF_WUNLOCK(ifp); + return (0); } /* Modified: projects/ifnet/sys/net/if.h ============================================================================== --- projects/ifnet/sys/net/if.h Mon Apr 6 15:10:54 2015 (r281150) +++ projects/ifnet/sys/net/if.h Mon Apr 6 15:22:32 2015 (r281151) @@ -572,11 +572,18 @@ typedef enum { } ift_counter; typedef enum { - IF_DRIVER_SOFTC, + IF_DRIVER_SOFTC = 0, IF_LLADDR, IF_BPF, IF_NAME, IF_VLAN, + /* + * Values do matter, since we want to avoid aliasing of frequently + * used features in if_softcs cache. + */ + IF_AF_INET = 8, + IF_AF_INET6 = 9, + IF_CARP = 10, } ift_feature; typedef struct ifnet * if_t; @@ -709,6 +716,7 @@ void if_inc_txcounters(if_t, struct mbuf void if_setbaudrate(if_t, uint64_t); void if_link_state_change(if_t, int); void * if_getsoftc(if_t, ift_feature); +int if_setsoftc(if_t, ift_feature, void *); int if_printf(if_t, const char *, ...) __printflike(2, 3); int if_drvioctl(if_t, u_long, void *, struct thread *); uint64_t if_get_counter_default(if_t, ift_counter); Modified: projects/ifnet/sys/net/if_var.h ============================================================================== --- projects/ifnet/sys/net/if_var.h Mon Apr 6 15:10:54 2015 (r281150) +++ projects/ifnet/sys/net/if_var.h Mon Apr 6 15:22:32 2015 (r281151) @@ -80,33 +80,49 @@ struct iftype { }; /* + * Many network stack modules want to store their software context associated + * with an interface. We used to give a pointer for everyone, but that yield + * to sizeof(struct ifnet) growing and permanent need for new pointers added + * to the struct. Now we keep a tiny cache of recently used features and + * dynamically allocated store for them. + * Note: this could be generalized with kobj(9). + */ +#define SOFTC_CACHE_SIZE 4 +struct ifsoftc { + ift_feature ifsc_desc; + void *ifsc_ptr; +}; + +/* * Structure defining a network interface. * * (Would like to call this struct ``if'', but C isn't PL/1.) */ struct ifnet { struct ifops *if_ops; /* driver ops (or overridden) */ - void *if_softc; /* driver soft state */ + void *if_softc; /* driver software context */ struct ifdriver *if_drv; /* driver static definition */ - struct iftype *if_type; /* if type static def (optional)*/ + struct ifsoftc *if_sccache[SOFTC_CACHE_SIZE]; /* cache of softcs */ struct iftsomax *if_tsomax; /* TSO limits */ + struct iftype *if_type; /* if type static def (optional)*/ + + struct rwlock if_lock; /* lock to protect the ifnet */ + + struct ifsoftc *if_scstore; /* store of different softcs */ + TAILQ_ENTRY(ifnet) if_link; /* on global list */ + LIST_ENTRY(ifnet) if_clones; /* on if_cloner list */ + TAILQ_HEAD(, ifg_list) if_groups; /* groups of this ifnet */ - struct rwlock if_lock; /* lock to protect the ifnet */ - - /* General book keeping of interface lists. */ - TAILQ_ENTRY(ifnet) if_link; /* all struct ifnets are chained */ - LIST_ENTRY(ifnet) if_clones; /* interfaces of a cloner */ - TAILQ_HEAD(, ifg_list) if_groups; /* linked list of groups per if */ - /* protected by if_lock */ void *if_llsoftc; /* link layer softc */ void *if_l2com; /* pointer to protocol bits */ + uint32_t if_nsoftcs; /* elements in if_scstore */ int if_dunit; /* unit or IF_DUNIT_NONE */ u_short if_index; /* numeric abbreviation for this if */ short if_index_reserved; /* spare space to grow if_index */ char if_xname[IFNAMSIZ]; /* external name (name + unit) */ char *if_description; /* interface description */ - /* Variable fields that are touched by the stack and drivers. */ + /* Variable fields that are touched by the stack . */ uint32_t if_flags; /* up/down, broadcast, etc. */ uint32_t if_capabilities;/* interface features & capabilities */ uint32_t if_capenable; /* enabled features & capabilities */ From owner-svn-src-projects@FreeBSD.ORG Mon Apr 6 15:38:36 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D41129A; Mon, 6 Apr 2015 15:38:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 BCDC791F; Mon, 6 Apr 2015 15:38:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t36FcatO099548; Mon, 6 Apr 2015 15:38:36 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t36FcZRN099531; Mon, 6 Apr 2015 15:38:35 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504061538.t36FcZRN099531@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 6 Apr 2015 15:38:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281153 - in projects/ifnet: lib/libelftc sys/amd64/vmm sys/netinet usr.sbin/bluetooth/bthidd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2015 15:38:36 -0000 Author: glebius Date: Mon Apr 6 15:38:34 2015 New Revision: 281153 URL: https://svnweb.freebsd.org/changeset/base/281153 Log: Merge head r257698 through r281152. Modified: projects/ifnet/lib/libelftc/elftc_version.c projects/ifnet/sys/amd64/vmm/vmm_instruction_emul.c projects/ifnet/sys/netinet/ip_carp.c projects/ifnet/usr.sbin/bluetooth/bthidd/hid.c Directory Properties: projects/ifnet/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/amd64/vmm/ (props changed) Modified: projects/ifnet/lib/libelftc/elftc_version.c ============================================================================== --- projects/ifnet/lib/libelftc/elftc_version.c Mon Apr 6 15:31:19 2015 (r281152) +++ projects/ifnet/lib/libelftc/elftc_version.c Mon Apr 6 15:38:34 2015 (r281153) @@ -6,5 +6,5 @@ const char * elftc_version(void) { - return "elftoolchain r3163M"; + return "elftoolchain r3179M"; } Modified: projects/ifnet/sys/amd64/vmm/vmm_instruction_emul.c ============================================================================== --- projects/ifnet/sys/amd64/vmm/vmm_instruction_emul.c Mon Apr 6 15:31:19 2015 (r281152) +++ projects/ifnet/sys/amd64/vmm/vmm_instruction_emul.c Mon Apr 6 15:38:34 2015 (r281153) @@ -71,6 +71,7 @@ enum { VIE_OP_TYPE_CMP, VIE_OP_TYPE_POP, VIE_OP_TYPE_MOVS, + VIE_OP_TYPE_GROUP1, VIE_OP_TYPE_LAST }; @@ -161,15 +162,15 @@ static const struct vie_op one_byte_opco .op_type = VIE_OP_TYPE_AND, }, [0x81] = { - /* XXX Group 1 extended opcode - not just AND */ + /* XXX Group 1 extended opcode */ .op_byte = 0x81, - .op_type = VIE_OP_TYPE_AND, + .op_type = VIE_OP_TYPE_GROUP1, .op_flags = VIE_OP_F_IMM, }, [0x83] = { - /* XXX Group 1 extended opcode - not just OR */ + /* XXX Group 1 extended opcode */ .op_byte = 0x83, - .op_type = VIE_OP_TYPE_OR, + .op_type = VIE_OP_TYPE_GROUP1, .op_flags = VIE_OP_F_IMM8, }, [0x8F] = { @@ -839,16 +840,18 @@ emulate_and(void *vm, int vcpuid, uint64 error = vie_update_register(vm, vcpuid, reg, result, size); break; case 0x81: + case 0x83: /* - * AND/OR mem (ModRM:r/m) with immediate and store the + * AND mem (ModRM:r/m) with immediate and store the * result in mem. * - * AND: i = 4 - * OR: i = 1 - * 81 /i op r/m16, imm16 - * 81 /i op r/m32, imm32 - * REX.W + 81 /i op r/m64, imm32 sign-extended to 64 + * 81 /4 and r/m16, imm16 + * 81 /4 and r/m32, imm32 + * REX.W + 81 /4 and r/m64, imm32 sign-extended to 64 * + * 83 /4 and r/m16, imm8 sign-extended to 16 + * 83 /4 and r/m32, imm8 sign-extended to 32 + * REX.W + 83/4 and r/m64, imm8 sign-extended to 64 */ /* get the first operand */ @@ -857,26 +860,11 @@ emulate_and(void *vm, int vcpuid, uint64 break; /* - * perform the operation with the pre-fetched immediate - * operand and write the result - */ - switch (vie->reg & 7) { - case 0x4: - /* modrm:reg == b100, AND */ - result = val1 & vie->immediate; - break; - case 0x1: - /* modrm:reg == b001, OR */ - result = val1 | vie->immediate; - break; - default: - error = EINVAL; - break; - } - if (error) - break; - - error = memwrite(vm, vcpuid, gpa, result, size, arg); + * perform the operation with the pre-fetched immediate + * operand and write the result + */ + result = val1 & vie->immediate; + error = memwrite(vm, vcpuid, gpa, result, size, arg); break; default: break; @@ -913,20 +901,20 @@ emulate_or(void *vm, int vcpuid, uint64_ error = EINVAL; switch (vie->op.op_byte) { + case 0x81: case 0x83: /* * OR mem (ModRM:r/m) with immediate and store the * result in mem. * - * 83 /1 OR r/m16, imm8 sign-extended to 16 - * 83 /1 OR r/m32, imm8 sign-extended to 32 - * REX.W + 83/1 OR r/m64, imm8 sign-extended to 64 + * 81 /1 or r/m16, imm16 + * 81 /1 or r/m32, imm32 + * REX.W + 81 /1 or r/m64, imm32 sign-extended to 64 * - * Currently, only the OR operation of the 0x83 opcode - * is implemented (ModRM:reg = b001). + * 83 /1 or r/m16, imm8 sign-extended to 16 + * 83 /1 or r/m32, imm8 sign-extended to 32 + * REX.W + 83/1 or r/m64, imm8 sign-extended to 64 */ - if ((vie->reg & 7) != 1) - break; /* get the first operand */ error = memread(vm, vcpuid, gpa, &val1, size, arg); @@ -997,11 +985,37 @@ emulate_cmp(void *vm, int vcpuid, uint64 if (error) return (error); + rflags2 = getcc(size, op1, op2); + break; + case 0x81: + case 0x83: + /* + * 81 /7 cmp r/m16, imm16 + * 81 /7 cmp r/m32, imm32 + * REX.W + 81 /7 cmp r/m64, imm32 sign-extended to 64 + * + * 83 /7 cmp r/m16, imm8 sign-extended to 16 + * 83 /7 cmp r/m32, imm8 sign-extended to 32 + * REX.W + 83 /7 cmp r/m64, imm8 sign-extended to 64 + * + * Compare mem (ModRM:r/m) with immediate and set + * status flags according to the results. The + * comparison is performed by subtracting the + * immediate from the first operand and then setting + * the status flags. + * + */ + + /* get the first operand */ + error = memread(vm, vcpuid, gpa, &op1, size, arg); + if (error) + return (error); + + rflags2 = getcc(size, op1, vie->immediate); break; default: return (EINVAL); } - rflags2 = getcc(size, op1, op2); error = vie_read_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, &rflags); if (error) return (error); @@ -1220,6 +1234,34 @@ emulate_pop(void *vm, int vcpuid, uint64 return (error); } +static int +emulate_group1(void *vm, int vcpuid, uint64_t gpa, struct vie *vie, + struct vm_guest_paging *paging, mem_region_read_t memread, + mem_region_write_t memwrite, void *memarg) +{ + int error; + + switch (vie->reg & 7) { + case 0x1: /* OR */ + error = emulate_or(vm, vcpuid, gpa, vie, + memread, memwrite, memarg); + break; + case 0x4: /* AND */ + error = emulate_and(vm, vcpuid, gpa, vie, + memread, memwrite, memarg); + break; + case 0x7: /* CMP */ + error = emulate_cmp(vm, vcpuid, gpa, vie, + memread, memwrite, memarg); + break; + default: + error = EINVAL; + break; + } + + return (error); +} + int vmm_emulate_instruction(void *vm, int vcpuid, uint64_t gpa, struct vie *vie, struct vm_guest_paging *paging, mem_region_read_t memread, @@ -1231,6 +1273,10 @@ vmm_emulate_instruction(void *vm, int vc return (EINVAL); switch (vie->op.op_type) { + case VIE_OP_TYPE_GROUP1: + error = emulate_group1(vm, vcpuid, gpa, vie, paging, memread, + memwrite, memarg); + break; case VIE_OP_TYPE_POP: error = emulate_pop(vm, vcpuid, gpa, vie, paging, memread, memwrite, memarg); Modified: projects/ifnet/sys/netinet/ip_carp.c ============================================================================== --- projects/ifnet/sys/netinet/ip_carp.c Mon Apr 6 15:31:19 2015 (r281152) +++ projects/ifnet/sys/netinet/ip_carp.c Mon Apr 6 15:38:34 2015 (r281153) @@ -180,9 +180,6 @@ static int proto_reg[] = {-1, -1}; * * Known issues with locking: * - * - There is no protection for races between two ioctl() requests, - * neither SIOCSVH, nor SIOCAIFADDR & SIOCAIFADDR_IN6. I think that all - * interface ioctl()s should be serialized right in net/if.c. * - Sending ad, we put the pointer to the softc in an mtag, and no reference * counting is done on the softc. * - On module unload we may race (?) with packet processing thread @@ -321,6 +318,7 @@ static void carp_demote_adj(int, char *) static LIST_HEAD(, carp_softc) carp_list; static struct mtx carp_mtx; +static struct sx carp_sx; static struct task carp_sendall_task = TASK_INITIALIZER(0, carp_send_ad_all, NULL); @@ -1650,6 +1648,7 @@ carp_ioctl(struct ifreq *ifr, u_long cmd goto out; } + sx_xlock(&carp_sx); switch (cmd) { case SIOCSVH: if ((error = priv_check(td, PRIV_NETINET_CARP))) @@ -1780,6 +1779,7 @@ carp_ioctl(struct ifreq *ifr, u_long cmd default: error = EINVAL; } + sx_xunlock(&carp_sx); out: if (locked) @@ -2099,6 +2099,7 @@ carp_mod_cleanup(void) mtx_unlock(&carp_mtx); taskqueue_drain(taskqueue_swi, &carp_sendall_task); mtx_destroy(&carp_mtx); + sx_destroy(&carp_sx); } static int @@ -2107,6 +2108,7 @@ carp_mod_load(void) int err; mtx_init(&carp_mtx, "carp_mtx", NULL, MTX_DEF); + sx_init(&carp_sx, "carp_sx"); LIST_INIT(&carp_list); carp_get_vhid_p = carp_get_vhid; carp_forus_p = carp_forus; Modified: projects/ifnet/usr.sbin/bluetooth/bthidd/hid.c ============================================================================== --- projects/ifnet/usr.sbin/bluetooth/bthidd/hid.c Mon Apr 6 15:31:19 2015 (r281152) +++ projects/ifnet/usr.sbin/bluetooth/bthidd/hid.c Mon Apr 6 15:38:34 2015 (r281153) @@ -48,12 +48,6 @@ #include "bthidd.h" #include "kbd.h" -#undef min -#define min(x, y) (((x) < (y))? (x) : (y)) - -#undef ASIZE -#define ASIZE(a) (sizeof(a)/sizeof(a[0])) - /* * Process data from control channel */ From owner-svn-src-projects@FreeBSD.ORG Mon Apr 6 15:44:10 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 28F2F2A2; Mon, 6 Apr 2015 15:44:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 138279FB; Mon, 6 Apr 2015 15:44:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t36Fi986004079; Mon, 6 Apr 2015 15:44:09 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t36Fi9ea004078; Mon, 6 Apr 2015 15:44:09 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504061544.t36Fi9ea004078@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 6 Apr 2015 15:44:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281154 - projects/ifnet/sys/net X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2015 15:44:10 -0000 Author: glebius Date: Mon Apr 6 15:44:09 2015 New Revision: 281154 URL: https://svnweb.freebsd.org/changeset/base/281154 Log: - Zero is special value, don't assign IF_DRIVER_SOFTC to it. - Fix field name in comment. Modified: projects/ifnet/sys/net/if.h Modified: projects/ifnet/sys/net/if.h ============================================================================== --- projects/ifnet/sys/net/if.h Mon Apr 6 15:38:34 2015 (r281153) +++ projects/ifnet/sys/net/if.h Mon Apr 6 15:44:09 2015 (r281154) @@ -572,14 +572,15 @@ typedef enum { } ift_counter; typedef enum { - IF_DRIVER_SOFTC = 0, + IF_NO_SOFTC = 0, + IF_DRIVER_SOFTC, IF_LLADDR, IF_BPF, IF_NAME, IF_VLAN, /* * Values do matter, since we want to avoid aliasing of frequently - * used features in if_softcs cache. + * used features in if_sccache cache. */ IF_AF_INET = 8, IF_AF_INET6 = 9, From owner-svn-src-projects@FreeBSD.ORG Mon Apr 6 15:45:48 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3DEDF3A1; Mon, 6 Apr 2015 15:45:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 2706BA0B; Mon, 6 Apr 2015 15:45:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t36Fjm50004455; Mon, 6 Apr 2015 15:45:48 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t36FjkDY004438; Mon, 6 Apr 2015 15:45:46 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504061545.t36FjkDY004438@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 6 Apr 2015 15:45:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281155 - in projects/ifnet/sys: net netinet netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2015 15:45:48 -0000 Author: glebius Date: Mon Apr 6 15:45:45 2015 New Revision: 281155 URL: https://svnweb.freebsd.org/changeset/base/281155 Log: Provide a working example of if_setsoftc(). Remove if_carp from struct ifnet and dynamically allocate IF_CARP softc. Sponsored by: Nginx, Inc. Sponsored by: Netflix Modified: projects/ifnet/sys/net/if.c projects/ifnet/sys/net/if_ethersubr.c projects/ifnet/sys/net/if_var.h projects/ifnet/sys/netinet/ip_carp.c projects/ifnet/sys/netinet/ip_input.c projects/ifnet/sys/netinet6/nd6_nbr.c Modified: projects/ifnet/sys/net/if.c ============================================================================== --- projects/ifnet/sys/net/if.c Mon Apr 6 15:44:09 2015 (r281154) +++ projects/ifnet/sys/net/if.c Mon Apr 6 15:45:45 2015 (r281155) @@ -2276,7 +2276,7 @@ do_link_state_change(void *arg, int pend if ((if_type(ifp) == IFT_ETHER || if_type(ifp) == IFT_L2VLAN) && ifp->if_l2com != NULL) (*ng_ether_link_state_p)(ifp, link_state); - if (ifp->if_carp) + if (if_getsoftc(ifp, IF_CARP) != NULL) (*carp_linkstate_p)(ifp); if (ifp->if_bridge) (*bridge_linkstate_p)(ifp); @@ -2310,7 +2310,7 @@ if_down(struct ifnet *ifp) TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) pfctlinput(PRC_IFDOWN, ifa->ifa_addr); if_qflush(ifp); - if (ifp->if_carp) + if (if_getsoftc(ifp, IF_CARP) != NULL) (*carp_linkstate_p)(ifp); rt_ifmsg(ifp); } @@ -2328,7 +2328,7 @@ if_up(struct ifnet *ifp) getmicrotime(&ifp->if_lastchange); TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) pfctlinput(PRC_IFUP, ifa->ifa_addr); - if (ifp->if_carp) + if (if_getsoftc(ifp, IF_CARP) != NULL) (*carp_linkstate_p)(ifp); rt_ifmsg(ifp); #ifdef INET6 Modified: projects/ifnet/sys/net/if_ethersubr.c ============================================================================== --- projects/ifnet/sys/net/if_ethersubr.c Mon Apr 6 15:44:09 2015 (r281154) +++ projects/ifnet/sys/net/if_ethersubr.c Mon Apr 6 15:45:45 2015 (r281155) @@ -318,7 +318,12 @@ ether_output(struct ifnet *ifp, struct m } #if defined(INET) || defined(INET6) - if (ifp->if_carp && + /* + * XXXGL: the if_getsoftc() lookup might affect performance, + * but the plan is to improve carp to avoid calling + * carp_output() on every packet. + */ + if (carp_output_p != NULL && if_getsoftc(ifp, IF_CARP) != NULL && (error = (*carp_output_p)(ifp, m, dst))) goto bad; #endif @@ -544,7 +549,8 @@ ether_input_internal(struct ifnet *ifp, * TODO: Maintain a hash table of ethernet addresses other than * ether_dhost which may be active on this ifp. */ - if (ifp->if_carp && (*carp_forus_p)(ifp, eh->ether_dhost)) { + if (carp_forus_p != NULL && if_getsoftc(ifp, IF_CARP) != NULL && + (*carp_forus_p)(ifp, eh->ether_dhost)) { m->m_flags &= ~M_PROMISC; } else #endif Modified: projects/ifnet/sys/net/if_var.h ============================================================================== --- projects/ifnet/sys/net/if_var.h Mon Apr 6 15:44:09 2015 (r281154) +++ projects/ifnet/sys/net/if_var.h Mon Apr 6 15:45:45 2015 (r281155) @@ -36,7 +36,6 @@ struct rtentry; /* ifa_rtrequest */ struct rt_addrinfo; /* ifa_rtrequest */ struct socket; -struct carp_if; struct carp_softc; struct ifvlantrunk; struct ifmedia; @@ -171,7 +170,6 @@ struct ifnet { void *if_bridge; /* bridge glue */ void *if_lagg; /* lagg glue */ void *if_pf_kif; /* pf glue */ - struct carp_if *if_carp; /* carp interface structure */ struct label *if_label; /* interface MAC label */ struct netmap_adapter *if_netmap; /* netmap(4) softc */ Modified: projects/ifnet/sys/netinet/ip_carp.c ============================================================================== --- projects/ifnet/sys/netinet/ip_carp.c Mon Apr 6 15:44:09 2015 (r281154) +++ projects/ifnet/sys/netinet/ip_carp.c Mon Apr 6 15:45:45 2015 (r281155) @@ -156,7 +156,7 @@ static int proto_reg[] = {-1, -1}; * Brief design of carp(4). * * Any carp-capable ifnet may have a list of carp softcs hanging off - * its ifp->if_carp pointer. Each softc represents one unique virtual + * its IF_CARP softc pointer. Each softc represents one unique virtual * host id, or vhid. The softc has a back pointer to the ifnet. All * softcs are joined in a global list, which has quite limited use. * @@ -285,9 +285,9 @@ SYSCTL_VNET_PCPUSTAT(_net_inet_carp, OID ((ifa) = sc->sc_ifas[_i]) != NULL; \ ++_i) -#define IFNET_FOREACH_CARP(ifp, sc) \ - CIF_LOCK_ASSERT(ifp->if_carp); \ - TAILQ_FOREACH((sc), &(ifp)->if_carp->cif_vrs, sc_list) +#define CIF_FOREACH_CARP(cif, sc) \ + CIF_LOCK_ASSERT(cif); \ + TAILQ_FOREACH((sc), &(cif)->cif_vrs, sc_list) #define DEMOTE_ADVSKEW(sc) \ (((sc)->sc_advskew + V_carp_demotion > CARP_MAXSKEW) ? \ @@ -539,7 +539,7 @@ carp6_input(struct mbuf **mp, int *offp, } /* check if received on a valid carp interface */ - if (m->m_pkthdr.rcvif->if_carp == NULL) { + if (if_getsoftc(m->m_pkthdr.rcvif, IF_CARP) == NULL) { CARPSTATS_INC(carps_badif); CARP_DEBUG("%s: packet received on non-carp interface: %s\n", __func__, m->m_pkthdr.rcvif->if_xname); @@ -795,6 +795,7 @@ carp_send_ad_locked(struct carp_softc *s struct timeval tv; struct sockaddr sa; struct ifaddr *ifa; + struct carp_if *cif; struct carp_header *ch_ptr; struct mbuf *m; int len, advskew; @@ -814,6 +815,8 @@ carp_send_ad_locked(struct carp_softc *s ch.carp_pad1 = 0; /* must be zero */ ch.carp_cksum = 0; + cif = if_getsoftc(sc->sc_carpdev, IF_CARP); + /* XXXGL: OpenBSD picks first ifaddr with needed family. */ #ifdef INET @@ -865,7 +868,7 @@ carp_send_ad_locked(struct carp_softc *s CARPSTATS_INC(carps_opackets); carp_send_ad_error(sc, ip_output(m, NULL, NULL, IP_RAWOUTPUT, - &sc->sc_carpdev->if_carp->cif_imo, NULL)); + &cif->cif_imo, NULL)); } #endif /* INET */ #ifdef INET6 @@ -922,7 +925,7 @@ carp_send_ad_locked(struct carp_softc *s CARPSTATS_INC(carps_opackets6); carp_send_ad_error(sc, ip6_output(m, NULL, NULL, 0, - &sc->sc_carpdev->if_carp->cif_im6o, NULL, NULL)); + &cif->cif_im6o, NULL, NULL)); } #endif /* INET6 */ @@ -1111,23 +1114,25 @@ int carp_forus(struct ifnet *ifp, u_char *dhost) { struct carp_softc *sc; + struct carp_if *cif; uint8_t *ena = dhost; if (ena[0] || ena[1] || ena[2] != 0x5e || ena[3] || ena[4] != 1) return (0); - CIF_LOCK(ifp->if_carp); - IFNET_FOREACH_CARP(ifp, sc) { + cif = if_getsoftc(ifp, IF_CARP); + CIF_LOCK(cif); + CIF_FOREACH_CARP(cif, sc) { CARP_LOCK(sc); if (sc->sc_state == MASTER && !bcmp(dhost, LLADDR(&sc->sc_addr), ETHER_ADDR_LEN)) { CARP_UNLOCK(sc); - CIF_UNLOCK(ifp->if_carp); + CIF_UNLOCK(cif); return (1); } CARP_UNLOCK(sc); } - CIF_UNLOCK(ifp->if_carp); + CIF_UNLOCK(cif); return (0); } @@ -1417,7 +1422,7 @@ carp_output(struct ifnet *ifp, struct mb bcopy(mtag + 1, &sc, sizeof(sc)); /* Set the source MAC address to the Virtual Router MAC Address. */ - switch (ifp->if_type) { + switch (if_type(ifp)) { case IFT_ETHER: case IFT_BRIDGE: case IFT_L2VLAN: { @@ -1457,7 +1462,7 @@ carp_output(struct ifnet *ifp, struct mb break; default: printf("%s: carp is not supported for the %d interface type\n", - ifp->if_xname, ifp->if_type); + ifp->if_xname, if_type(ifp)); return (EOPNOTSUPP); } @@ -1470,7 +1475,8 @@ carp_alloc(struct ifnet *ifp) struct carp_softc *sc; struct carp_if *cif; - if ((cif = ifp->if_carp) == NULL) + cif = if_getsoftc(ifp, IF_CARP); + if (cif == NULL) cif = carp_alloc_if(ifp); sc = malloc(sizeof(*sc), M_CARP, M_WAITOK|M_ZERO); @@ -1526,8 +1532,9 @@ static void carp_destroy(struct carp_softc *sc) { struct ifnet *ifp = sc->sc_carpdev; - struct carp_if *cif = ifp->if_carp; + struct carp_if *cif; + cif = if_getsoftc(ifp, IF_CARP); CIF_LOCK_ASSERT(cif); TAILQ_REMOVE(&cif->cif_vrs, sc, sc_list); @@ -1552,7 +1559,7 @@ carp_destroy(struct carp_softc *sc) free(sc, M_CARP); } -static struct carp_if* +static struct carp_if * carp_alloc_if(struct ifnet *ifp) { struct carp_if *cif; @@ -1570,10 +1577,9 @@ carp_alloc_if(struct ifnet *ifp) cif->cif_ifp = ifp; TAILQ_INIT(&cif->cif_vrs); - IF_ADDR_WLOCK(ifp); - ifp->if_carp = cif; + error = if_setsoftc(ifp, IF_CARP, cif); + KASSERT(error == 0, ("%s: ifp %p has carp softc", __func__, ifp)); if_ref(ifp); - IF_ADDR_WUNLOCK(ifp); return (cif); } @@ -1587,9 +1593,7 @@ carp_free_if(struct carp_if *cif) KASSERT(TAILQ_EMPTY(&cif->cif_vrs), ("%s: softc list not empty", __func__)); - IF_ADDR_WLOCK(ifp); - ifp->if_carp = NULL; - IF_ADDR_WUNLOCK(ifp); + if_setsoftc(ifp, IF_CARP, NULL); CIF_LOCK_DESTROY(cif); @@ -1621,6 +1625,7 @@ carp_ioctl(struct ifreq *ifr, u_long cmd { struct carpreq carpr; struct ifnet *ifp; + struct carp_if *cif; struct carp_softc *sc = NULL; int error = 0, locked = 0; @@ -1631,7 +1636,7 @@ carp_ioctl(struct ifreq *ifr, u_long cmd if (ifp == NULL) return (ENXIO); - switch (ifp->if_type) { + switch (if_type(ifp)) { case IFT_ETHER: case IFT_L2VLAN: case IFT_BRIDGE: @@ -1649,6 +1654,7 @@ carp_ioctl(struct ifreq *ifr, u_long cmd } sx_xlock(&carp_sx); + cif = if_getsoftc(ifp, IF_CARP); switch (cmd) { case SIOCSVH: if ((error = priv_check(td, PRIV_NETINET_CARP))) @@ -1659,12 +1665,12 @@ carp_ioctl(struct ifreq *ifr, u_long cmd break; } - if (ifp->if_carp) { - CIF_LOCK(ifp->if_carp); - IFNET_FOREACH_CARP(ifp, sc) + if (cif) { + CIF_LOCK(cif); + CIF_FOREACH_CARP(cif, sc) if (sc->sc_vhid == carpr.carpr_vhid) break; - CIF_UNLOCK(ifp->if_carp); + CIF_UNLOCK(cif); } if (sc == NULL) { sc = carp_alloc(ifp); @@ -1728,18 +1734,18 @@ carp_ioctl(struct ifreq *ifr, u_long cmd error = EMSGSIZE; break; } - if (ifp->if_carp == NULL) { + if (cif == NULL) { error = ENOENT; break; } priveleged = (priv_check(td, PRIV_NETINET_CARP) == 0); if (carpr.carpr_vhid != 0) { - CIF_LOCK(ifp->if_carp); - IFNET_FOREACH_CARP(ifp, sc) + CIF_LOCK(cif); + CIF_FOREACH_CARP(cif, sc) if (sc->sc_vhid == carpr.carpr_vhid) break; - CIF_UNLOCK(ifp->if_carp); + CIF_UNLOCK(cif); if (sc == NULL) { error = ENOENT; break; @@ -1750,29 +1756,29 @@ carp_ioctl(struct ifreq *ifr, u_long cmd int i, count; count = 0; - CIF_LOCK(ifp->if_carp); - IFNET_FOREACH_CARP(ifp, sc) + CIF_LOCK(cif); + CIF_FOREACH_CARP(cif, sc) count++; if (count > carpr.carpr_count) { - CIF_UNLOCK(ifp->if_carp); + CIF_UNLOCK(cif); error = EMSGSIZE; break; } i = 0; - IFNET_FOREACH_CARP(ifp, sc) { + CIF_FOREACH_CARP(cif, sc) { carp_carprcp(&carpr, sc, priveleged); carpr.carpr_count = count; error = copyout(&carpr, ifr->ifr_data + (i * sizeof(carpr)), sizeof(carpr)); if (error) { - CIF_UNLOCK(ifp->if_carp); + CIF_UNLOCK(cif); break; } i++; } - CIF_UNLOCK(ifp->if_carp); + CIF_UNLOCK(cif); } break; } @@ -1803,11 +1809,12 @@ int carp_attach(struct ifaddr *ifa, int vhid) { struct ifnet *ifp = ifa->ifa_ifp; - struct carp_if *cif = ifp->if_carp; + struct carp_if *cif; struct carp_softc *sc; int index, error; - if (ifp->if_carp == NULL) + cif = if_getsoftc(ifp, IF_CARP); + if (cif == NULL) return (ENOPROTOOPT); switch (ifa->ifa_addr->sa_family) { @@ -1823,7 +1830,7 @@ carp_attach(struct ifaddr *ifa, int vhid } CIF_LOCK(cif); - IFNET_FOREACH_CARP(ifp, sc) + CIF_FOREACH_CARP(cif, sc) if (sc->sc_vhid == vhid) break; if (sc == NULL) { @@ -1889,8 +1896,9 @@ void carp_detach(struct ifaddr *ifa) { struct ifnet *ifp = ifa->ifa_ifp; - struct carp_if *cif = ifp->if_carp; + struct carp_if *cif; + cif = if_getsoftc(ifp, IF_CARP); CIF_LOCK(cif); carp_detach_locked(ifa); CIF_FREE(cif); @@ -1900,12 +1908,13 @@ static void carp_detach_locked(struct ifaddr *ifa) { struct ifnet *ifp = ifa->ifa_ifp; - struct carp_if *cif = ifp->if_carp; + struct carp_if *cif; struct carp_softc *sc = ifa->ifa_carp; int i, index; KASSERT(sc != NULL, ("%s: %p not attached", __func__, ifa)); + cif = if_getsoftc(ifp, IF_CARP); CIF_LOCK_ASSERT(cif); CARP_LOCK(sc); @@ -1976,14 +1985,16 @@ static void carp_linkstate(struct ifnet *ifp) { struct carp_softc *sc; + struct carp_if *cif; - CIF_LOCK(ifp->if_carp); - IFNET_FOREACH_CARP(ifp, sc) { + cif = if_getsoftc(ifp, IF_CARP); + CIF_LOCK(cif); + CIF_FOREACH_CARP(cif, sc) { CARP_LOCK(sc); carp_sc_state(sc); CARP_UNLOCK(sc); } - CIF_UNLOCK(ifp->if_carp); + CIF_UNLOCK(cif); } static void Modified: projects/ifnet/sys/netinet/ip_input.c ============================================================================== --- projects/ifnet/sys/netinet/ip_input.c Mon Apr 6 15:44:09 2015 (r281154) +++ projects/ifnet/sys/netinet/ip_input.c Mon Apr 6 15:45:45 2015 (r281155) @@ -633,7 +633,7 @@ passin: */ checkif = V_ip_checkinterface && (V_ipforwarding == 0) && ifp != NULL && ((ifp->if_flags & IFF_LOOPBACK) == 0) && - ifp->if_carp == NULL && (dchg == 0); + (dchg == 0) && if_getsoftc(ifp, IF_CARP) == NULL; /* * Check for exact addresses in the hash bucket. Modified: projects/ifnet/sys/netinet6/nd6_nbr.c ============================================================================== --- projects/ifnet/sys/netinet6/nd6_nbr.c Mon Apr 6 15:44:09 2015 (r281154) +++ projects/ifnet/sys/netinet6/nd6_nbr.c Mon Apr 6 15:45:45 2015 (r281155) @@ -242,7 +242,7 @@ nd6_ns_input(struct mbuf *m, int off, in * (3) "tentative" address on which DAD is being performed. */ /* (1) and (3) check. */ - if (ifp->if_carp) + if (if_getsoftc(ifp, IF_CARP) != NULL) ifa = (*carp_iamatch6_p)(ifp, &taddr6); else ifa = (struct ifaddr *)in6ifa_ifpwithaddr(ifp, &taddr6); @@ -731,7 +731,7 @@ nd6_na_input(struct mbuf *m, int off, in * This effectively disables the DAD check on a non-master CARP * address. */ - if (ifp->if_carp) + if (if_getsoftc(ifp, IF_CARP) != NULL) ifa = (*carp_iamatch6_p)(ifp, &taddr6); else ifa = (struct ifaddr *)in6ifa_ifpwithaddr(ifp, &taddr6); @@ -1077,7 +1077,7 @@ nd6_na_output_fib(struct ifnet *ifp, con * my address) use lladdr configured for the interface. */ if (sdl0 == NULL) { - if (ifp->if_carp) + if (if_getsoftc(ifp, IF_CARP) != NULL) mac = (*carp_macmatch6_p)(ifp, m, taddr6); if (mac == NULL) mac = nd6_ifptomac(ifp); From owner-svn-src-projects@FreeBSD.ORG Mon Apr 6 20:58:45 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8DCCB175; Mon, 6 Apr 2015 20:58:45 +0000 (UTC) Received: from lauren.room52.net (lauren.room52.net [210.50.193.198]) by mx1.freebsd.org (Postfix) with ESMTP id 504FD392; Mon, 6 Apr 2015 20:58:45 +0000 (UTC) Received: from lgwl-lstewart2.corp.netflix.com (76-247-182-56.lightspeed.sjcpca.sbcglobal.net [76.247.182.56]) by lauren.room52.net (Postfix) with ESMTPSA id 620547E81E; Tue, 7 Apr 2015 06:52:40 +1000 (EST) Message-ID: <5522F214.5060903@freebsd.org> Date: Mon, 06 Apr 2015 13:52:36 -0700 From: Lawrence Stewart User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Gleb Smirnoff , src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: Re: svn commit: r281151 - projects/ifnet/sys/net References: <201504061522.t36FMXwX092973@svn.freebsd.org> In-Reply-To: <201504061522.t36FMXwX092973@svn.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=2.4 required=5.0 tests=DNS_FROM_AHBL_RHSBL, UNPARSEABLE_RELAY autolearn=no version=3.3.2 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on lauren.room52.net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2015 20:58:45 -0000 Hi Gleb, On 04/06/15 08:22, Gleb Smirnoff wrote: > Author: glebius > Date: Mon Apr 6 15:22:32 2015 > New Revision: 281151 > URL: https://svnweb.freebsd.org/changeset/base/281151 > > Log: > Provide software context store in struct ifnet for any facility. To add > a new facility, one needs to grab a value in the ift_feature enum, and > not need to modify struct ifnet. > > The store also has a cache to return frequently requested values, > which resembles kobj(9) method cache. > > The plan is to move into the softc store almost all possible software > contexts that hang off the struct ifnet, leaving static only the driver > softc, AF_INET, AF_INET6 pointers, and other frequently used pointer. It seems likely that this is partially reinventing OSD(9) (also see the way I used it for for khelp(9)). Perhaps OSD could be improved with some useful things like the cache and then it might be a suitable drop in replacement here as well? Cheers, Lawrence From owner-svn-src-projects@FreeBSD.ORG Mon Apr 6 22:20:01 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82729960; Mon, 6 Apr 2015 22:20:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 6A432E4C; Mon, 6 Apr 2015 22:20:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t36MK1Eb096936; Mon, 6 Apr 2015 22:20:01 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t36MJqid096836; Mon, 6 Apr 2015 22:19:52 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504062219.t36MJqid096836@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 6 Apr 2015 22:19:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281173 - in projects/ifnet: etc/rc.d lib/libc/sys sys/arm/include sys/arm64/include sys/boot/efi sys/boot/efi/boot1 sys/boot/efi/include/arm sys/boot/efi/loader sys/boot/efi/loader/arc... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2015 22:20:01 -0000 Author: glebius Date: Mon Apr 6 22:19:51 2015 New Revision: 281173 URL: https://svnweb.freebsd.org/changeset/base/281173 Log: Merge head r257698 through r281172. Added: projects/ifnet/sys/boot/efi/boot1/fat-amd64.tmpl.bz2.uu - copied unchanged from r281172, head/sys/boot/efi/boot1/fat-amd64.tmpl.bz2.uu projects/ifnet/sys/boot/efi/boot1/fat-arm.tmpl.bz2.uu - copied unchanged from r281172, head/sys/boot/efi/boot1/fat-arm.tmpl.bz2.uu projects/ifnet/sys/boot/efi/include/arm/ - copied from r281172, head/sys/boot/efi/include/arm/ projects/ifnet/sys/boot/efi/loader/arch/arm/ - copied from r281172, head/sys/boot/efi/loader/arch/arm/ Deleted: projects/ifnet/sys/boot/efi/boot1/fat.tmpl.bz2.uu Modified: projects/ifnet/etc/rc.d/pflog projects/ifnet/lib/libc/sys/vfork.2 projects/ifnet/sys/arm/include/metadata.h projects/ifnet/sys/arm64/include/atomic.h projects/ifnet/sys/boot/efi/Makefile projects/ifnet/sys/boot/efi/boot1/Makefile projects/ifnet/sys/boot/efi/boot1/boot1.c projects/ifnet/sys/boot/efi/boot1/generate-fat.sh projects/ifnet/sys/boot/efi/loader/Makefile projects/ifnet/sys/boot/efi/loader/bootinfo.c projects/ifnet/sys/boot/efi/loader/copy.c projects/ifnet/sys/dev/acpica/acpi.c projects/ifnet/sys/netinet6/ip6_forward.c projects/ifnet/sys/netinet6/ip6_mroute.c projects/ifnet/sys/netinet6/ip6_mroute.h projects/ifnet/sys/netpfil/pf/pf_norm.c projects/ifnet/sys/powerpc/powerpc/trap.c projects/ifnet/sys/sys/param.h projects/ifnet/sys/vm/uma_core.c projects/ifnet/usr.bin/netstat/mroute6.c projects/ifnet/usr.bin/netstat/netstat.1 projects/ifnet/usr.sbin/acpi/acpiconf/acpiconf.c projects/ifnet/usr.sbin/bsdinstall/scripts/zfsboot projects/ifnet/usr.sbin/ctld/ctld.c Directory Properties: projects/ifnet/ (props changed) projects/ifnet/etc/ (props changed) projects/ifnet/lib/libc/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/boot/ (props changed) Modified: projects/ifnet/etc/rc.d/pflog ============================================================================== --- projects/ifnet/etc/rc.d/pflog Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/etc/rc.d/pflog Mon Apr 6 22:19:51 2015 (r281173) @@ -38,7 +38,7 @@ pflog_prestart() return 1 fi - # -p flag requires striping pidfile's leading /var/run and trailing .pid + # -p flag requires stripping pidfile's leading /var/run and trailing .pid pidfile=$(echo $pidfile | sed -e 's|/var/run/||' -e 's|.pid$||') # prepare the command line for pflogd Modified: projects/ifnet/lib/libc/sys/vfork.2 ============================================================================== --- projects/ifnet/lib/libc/sys/vfork.2 Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/lib/libc/sys/vfork.2 Mon Apr 6 22:19:51 2015 (r281173) @@ -28,7 +28,7 @@ .\" @(#)vfork.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd November 13, 2009 +.Dd April 6, 2015 .Dt VFORK 2 .Os .Sh NAME @@ -111,7 +111,7 @@ Same as for The .Fn vfork system call appeared in -.Bx 2.9 . +.Bx 3 . .Sh BUGS To avoid a possible deadlock situation, processes that are children in the middle Modified: projects/ifnet/sys/arm/include/metadata.h ============================================================================== --- projects/ifnet/sys/arm/include/metadata.h Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/sys/arm/include/metadata.h Mon Apr 6 22:19:51 2015 (r281173) @@ -31,5 +31,12 @@ #define MODINFOMD_BOOTINFO 0x1001 #define MODINFOMD_DTBP 0x1002 +#define MODINFOMD_EFI_MAP 0x1003 + +struct efi_map_header { + uint64_t memory_size; + uint64_t descriptor_size; + uint32_t descriptor_version; +}; #endif /* !_MACHINE_METADATA_H_ */ Modified: projects/ifnet/sys/arm64/include/atomic.h ============================================================================== --- projects/ifnet/sys/arm64/include/atomic.h Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/sys/arm64/include/atomic.h Mon Apr 6 22:19:51 2015 (r281173) @@ -160,7 +160,6 @@ atomic_subtract_32(volatile uint32_t *p, #define atomic_set_int atomic_set_32 #define atomic_subtract_int atomic_subtract_32 - static __inline void atomic_add_acq_32(volatile uint32_t *p, uint32_t val) { @@ -170,7 +169,7 @@ atomic_add_acq_32(volatile uint32_t *p, __asm __volatile( "1: ldaxr %w0, [%2] \n" " add %w0, %w0, %w3 \n" - " stlxr %w1, %w0, [%2] \n" + " stxr %w1, %w0, [%2] \n" " cbnz %w1, 1b \n" "2:" : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" @@ -186,7 +185,7 @@ atomic_clear_acq_32(volatile uint32_t *p __asm __volatile( "1: ldaxr %w0, [%2] \n" " bic %w0, %w0, %w3 \n" - " stlxr %w1, %w0, [%2] \n" + " stxr %w1, %w0, [%2] \n" " cbnz %w1, 1b \n" : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" ); @@ -203,7 +202,7 @@ atomic_cmpset_acq_32(volatile uint32_t * " ldaxr %w0, [%2] \n" " cmp %w0, %w3 \n" " b.ne 2f \n" - " stlxr %w1, %w4, [%2] \n" + " stxr %w1, %w4, [%2] \n" " cbnz %w1, 1b \n" "2:" : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (cmpval), "+r" (newval) @@ -218,8 +217,9 @@ atomic_load_acq_32(volatile uint32_t *p) { uint32_t ret; - ret = *p; - dmb(); + __asm __volatile( + "ldar %w0, [%1] \n" + : "=&r" (ret) : "r" (p) : "memory"); return (ret); } @@ -233,7 +233,7 @@ atomic_set_acq_32(volatile uint32_t *p, __asm __volatile( "1: ldaxr %w0, [%2] \n" " orr %w0, %w0, %w3 \n" - " stlxr %w1, %w0, [%2] \n" + " stxr %w1, %w0, [%2] \n" " cbnz %w1, 1b \n" : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" ); @@ -248,6 +248,82 @@ atomic_subtract_acq_32(volatile uint32_t __asm __volatile( "1: ldaxr %w0, [%2] \n" " sub %w0, %w0, %w3 \n" + " stxr %w1, %w0, [%2] \n" + " cbnz %w1, 1b \n" + : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" + ); +} + +#define atomic_add_acq_int atomic_add_acq_32 +#define atomic_clear_acq_int atomic_clear_acq_32 +#define atomic_cmpset_acq_int atomic_cmpset_acq_32 +#define atomic_load_acq_int atomic_load_acq_32 +#define atomic_set_acq_int atomic_set_acq_32 +#define atomic_subtract_acq_int atomic_subtract_acq_32 + +/* The atomic functions currently are both acq and rel, we should fix this. */ + +static __inline void +atomic_add_rel_32(volatile uint32_t *p, uint32_t val) +{ + uint32_t tmp; + int res; + + __asm __volatile( + "1: ldxr %w0, [%2] \n" + " add %w0, %w0, %w3 \n" + " stlxr %w1, %w0, [%2] \n" + " cbnz %w1, 1b \n" + "2:" + : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" + ); +} + +static __inline void +atomic_clear_rel_32(volatile uint32_t *p, uint32_t val) +{ + uint32_t tmp; + int res; + + __asm __volatile( + "1: ldxr %w0, [%2] \n" + " bic %w0, %w0, %w3 \n" + " stlxr %w1, %w0, [%2] \n" + " cbnz %w1, 1b \n" + : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" + ); +} + +static __inline int +atomic_cmpset_rel_32(volatile uint32_t *p, uint32_t cmpval, uint32_t newval) +{ + uint32_t tmp; + int res; + + __asm __volatile( + "1: mov %w1, #1 \n" + " ldxr %w0, [%2] \n" + " cmp %w0, %w3 \n" + " b.ne 2f \n" + " stlxr %w1, %w4, [%2] \n" + " cbnz %w1, 1b \n" + "2:" + : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (cmpval), "+r" (newval) + : : "cc", "memory" + ); + + return (!res); +} + +static __inline void +atomic_set_rel_32(volatile uint32_t *p, uint32_t val) +{ + uint32_t tmp; + int res; + + __asm __volatile( + "1: ldxr %w0, [%2] \n" + " orr %w0, %w0, %w3 \n" " stlxr %w1, %w0, [%2] \n" " cbnz %w1, 1b \n" : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" @@ -258,23 +334,25 @@ static __inline void atomic_store_rel_32(volatile uint32_t *p, uint32_t val) { - dmb(); - *p = val; + __asm __volatile( + "stlr %w0, [%1] \n" + : : "r" (val), "r" (p) : "memory"); } -#define atomic_add_acq_int atomic_add_acq_32 -#define atomic_clear_acq_int atomic_add_acq_32 -#define atomic_cmpset_acq_int atomic_cmpset_acq_32 -#define atomic_load_acq_int atomic_load_acq_32 -#define atomic_set_acq_int atomic_set_acq_32 -#define atomic_subtract_acq_int atomic_subtract_acq_32 +static __inline void +atomic_subtract_rel_32(volatile uint32_t *p, uint32_t val) +{ + uint32_t tmp; + int res; -/* The atomic functions currently are both acq and rel, we should fix this. */ -#define atomic_add_rel_32 atomic_add_acq_32 -#define atomic_clear_rel_32 atomic_add_acq_32 -#define atomic_cmpset_rel_32 atomic_cmpset_acq_32 -#define atomic_set_rel_32 atomic_set_acq_32 -#define atomic_subtract_rel_32 atomic_subtract_acq_32 + __asm __volatile( + "1: ldxr %w0, [%2] \n" + " sub %w0, %w0, %w3 \n" + " stlxr %w1, %w0, [%2] \n" + " cbnz %w1, 1b \n" + : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" + ); +} #define atomic_add_rel_int atomic_add_rel_32 #define atomic_clear_rel_int atomic_add_rel_32 @@ -440,7 +518,7 @@ atomic_add_acq_64(volatile uint64_t *p, __asm __volatile( "1: ldaxr %0, [%2] \n" " add %0, %0, %3 \n" - " stlxr %w1, %0, [%2] \n" + " stxr %w1, %0, [%2] \n" " cbnz %w1, 1b \n" "2:" : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" @@ -456,7 +534,7 @@ atomic_clear_acq_64(volatile uint64_t *p __asm __volatile( "1: ldaxr %0, [%2] \n" " bic %0, %0, %3 \n" - " stlxr %w1, %0, [%2] \n" + " stxr %w1, %0, [%2] \n" " cbnz %w1, 1b \n" : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" ); @@ -473,7 +551,7 @@ atomic_cmpset_acq_64(volatile uint64_t * " ldaxr %0, [%2] \n" " cmp %0, %3 \n" " b.ne 2f \n" - " stlxr %w1, %4, [%2] \n" + " stxr %w1, %4, [%2] \n" " cbnz %w1, 1b \n" "2:" : "=&r" (tmp), "=&r" (res), "+r" (p), "+r" (cmpval), "+r" (newval) @@ -488,8 +566,9 @@ atomic_load_acq_64(volatile uint64_t *p) { uint64_t ret; - ret = *p; - dmb(); + __asm __volatile( + "ldar %0, [%1] \n" + : "=&r" (ret) : "r" (p) : "memory"); return (ret); } @@ -503,7 +582,7 @@ atomic_set_acq_64(volatile uint64_t *p, __asm __volatile( "1: ldaxr %0, [%2] \n" " orr %0, %0, %3 \n" - " stlxr %w1, %0, [%2] \n" + " stxr %w1, %0, [%2] \n" " cbnz %w1, 1b \n" : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" ); @@ -518,20 +597,12 @@ atomic_subtract_acq_64(volatile uint64_t __asm __volatile( "1: ldaxr %0, [%2] \n" " sub %0, %0, %3 \n" - " stlxr %w1, %0, [%2] \n" + " stxr %w1, %0, [%2] \n" " cbnz %w1, 1b \n" : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" ); } -static __inline void -atomic_store_rel_64(volatile uint64_t *p, uint64_t val) -{ - - dmb(); - *p = val; -} - #define atomic_add_acq_long atomic_add_acq_64 #define atomic_clear_acq_long atomic_add_acq_64 #define atomic_cmpset_acq_long atomic_cmpset_acq_64 @@ -550,21 +621,106 @@ atomic_store_rel_64(volatile uint64_t *p * TODO: The atomic functions currently are both acq and rel, we should fix * this. */ -#define atomic_add_rel_64 atomic_add_acq_64 -#define atomic_clear_rel_64 atomic_add_acq_64 -#define atomic_cmpset_rel_64 atomic_cmpset_acq_64 -#define atomic_set_rel_64 atomic_set_acq_64 -#define atomic_subtract_rel_64 atomic_subtract_acq_64 +static __inline void +atomic_add_rel_64(volatile uint64_t *p, uint64_t val) +{ + uint64_t tmp; + int res; + + __asm __volatile( + "1: ldxr %0, [%2] \n" + " add %0, %0, %3 \n" + " stlxr %w1, %0, [%2] \n" + " cbnz %w1, 1b \n" + "2:" + : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" + ); +} + +static __inline void +atomic_clear_rel_64(volatile uint64_t *p, uint64_t val) +{ + uint64_t tmp; + int res; + + __asm __volatile( + "1: ldxr %0, [%2] \n" + " bic %0, %0, %3 \n" + " stlxr %w1, %0, [%2] \n" + " cbnz %w1, 1b \n" + : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" + ); +} + +static __inline int +atomic_cmpset_rel_64(volatile uint64_t *p, uint64_t cmpval, uint64_t newval) +{ + uint64_t tmp; + int res; + + __asm __volatile( + "1: mov %w1, #1 \n" + " ldxr %0, [%2] \n" + " cmp %0, %3 \n" + " b.ne 2f \n" + " stlxr %w1, %4, [%2] \n" + " cbnz %w1, 1b \n" + "2:" + : "=&r" (tmp), "=&r" (res), "+r" (p), "+r" (cmpval), "+r" (newval) + : : "cc", "memory" + ); + + return (!res); +} + +static __inline void +atomic_set_rel_64(volatile uint64_t *p, uint64_t val) +{ + uint64_t tmp; + int res; + + __asm __volatile( + "1: ldxr %0, [%2] \n" + " orr %0, %0, %3 \n" + " stlxr %w1, %0, [%2] \n" + " cbnz %w1, 1b \n" + : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" + ); +} + +static __inline void +atomic_store_rel_64(volatile uint64_t *p, uint64_t val) +{ + + __asm __volatile( + "stlr %0, [%1] \n" + : : "r" (val), "r" (p) : "memory"); +} + +static __inline void +atomic_subtract_rel_64(volatile uint64_t *p, uint64_t val) +{ + uint64_t tmp; + int res; + + __asm __volatile( + "1: ldxr %0, [%2] \n" + " sub %0, %0, %3 \n" + " stlxr %w1, %0, [%2] \n" + " cbnz %w1, 1b \n" + : "=&r"(tmp), "=&r"(res), "+r" (p), "+r" (val) : : "cc", "memory" + ); +} #define atomic_add_rel_long atomic_add_rel_64 -#define atomic_clear_rel_long atomic_add_rel_64 +#define atomic_clear_rel_long atomic_clear_rel_64 #define atomic_cmpset_rel_long atomic_cmpset_rel_64 #define atomic_set_rel_long atomic_set_rel_64 #define atomic_subtract_rel_long atomic_subtract_rel_64 #define atomic_store_rel_long atomic_store_rel_64 #define atomic_add_rel_ptr atomic_add_rel_64 -#define atomic_clear_rel_ptr atomic_add_rel_64 +#define atomic_clear_rel_ptr atomic_clear_rel_64 #define atomic_cmpset_rel_ptr atomic_cmpset_rel_64 #define atomic_set_rel_ptr atomic_set_rel_64 #define atomic_subtract_rel_ptr atomic_subtract_rel_64 Modified: projects/ifnet/sys/boot/efi/Makefile ============================================================================== --- projects/ifnet/sys/boot/efi/Makefile Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/sys/boot/efi/Makefile Mon Apr 6 22:19:51 2015 (r281173) @@ -10,7 +10,7 @@ SUBDIR+= fdt .endif .endif -.if ${MACHINE_CPUARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "arm" SUBDIR+= loader boot1 .endif Modified: projects/ifnet/sys/boot/efi/boot1/Makefile ============================================================================== --- projects/ifnet/sys/boot/efi/boot1/Makefile Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/sys/boot/efi/boot1/Makefile Mon Apr 6 22:19:51 2015 (r281173) @@ -36,6 +36,14 @@ LDFLAGS= -Wl,-T${LDSCRIPT} -Wl,-Bsymboli LDFLAGS+= -Wl,-znocombreloc .endif +.if ${MACHINE_CPUARCH} == "arm" +# +# Add libstand for the __aeabi_* functions used by the compiler +# +DPADD+= ${LIBSTAND} +LDADD+= -lstand +.endif + ${PROG}: ${LDSCRIPT} OBJCOPY?= objcopy @@ -45,6 +53,8 @@ OBJDUMP?= objdump EFI_TARGET= efi-app-x86_64 .elif ${MACHINE_CPUARCH} == "i386" EFI_TARGET= efi-app-ia32 +.else +EFI_TARGET= binary .endif boot1.efi: loader.sym @@ -52,7 +62,7 @@ boot1.efi: loader.sym ${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \ exit 1; \ fi - ${OBJCOPY} -j .text -j .sdata -j .data \ + ${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ -j .dynamic -j .dynsym -j .rel.dyn \ -j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \ --output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET} @@ -66,8 +76,8 @@ boot1.o: ${.CURDIR}/../../common/ufsread boot1.efifat: boot1.efi echo ${.OBJDIR} - uudecode ${.CURDIR}/fat.tmpl.bz2.uu - mv fat.tmpl.bz2 ${.TARGET}.bz2 + uudecode ${.CURDIR}/fat-${MACHINE_CPUARCH}.tmpl.bz2.uu + mv fat-${MACHINE_CPUARCH}.tmpl.bz2 ${.TARGET}.bz2 bzip2 -f -d ${.TARGET}.bz2 dd if=boot1.efi of=${.TARGET} seek=${BOOT1_OFFSET} conv=notrunc Modified: projects/ifnet/sys/boot/efi/boot1/boot1.c ============================================================================== --- projects/ifnet/sys/boot/efi/boot1/boot1.c Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/sys/boot/efi/boot1/boot1.c Mon Apr 6 22:19:51 2015 (r281173) @@ -59,8 +59,8 @@ static char *__ultoa(char *buf, u_long v static int domount(EFI_DEVICE_PATH *device, EFI_BLOCK_IO *blkio, int quiet); static void load(const char *fname); -EFI_SYSTEM_TABLE *systab; -EFI_HANDLE *image; +static EFI_SYSTEM_TABLE *systab; +static EFI_HANDLE *image; static void bcopy(const void *src, void *dst, size_t len) Copied: projects/ifnet/sys/boot/efi/boot1/fat-amd64.tmpl.bz2.uu (from r281172, head/sys/boot/efi/boot1/fat-amd64.tmpl.bz2.uu) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/sys/boot/efi/boot1/fat-amd64.tmpl.bz2.uu Mon Apr 6 22:19:51 2015 (r281173, copy of r281172, head/sys/boot/efi/boot1/fat-amd64.tmpl.bz2.uu) @@ -0,0 +1,20 @@ +FAT template boot filesystem created by generate-fat.sh +DO NOT EDIT +$FreeBSD$ +begin 644 fat-amd64.tmpl.bz2 +M0EIH.3%!629362AK*D(`&I+____[ZZKJZ_^N_ZO^Z_Z_OJ[L`4`!7I0$#&$" +M0$!$3&(I-DTU,)ZAZ0VA-!M0T'J`>H#"9 +M'I#0-H&HQI&0&3&FH>H>*`JHHU3V]1%/4/2``T#0`!H``#0`````#1H,@``6 +M'1&G'&@?$6[T#A)?X8$A160"20BO#")0J4TB1*4GXF$B4I,&>43+=_?K=#3* +M6]R"ZNKJZI,9*68E8*E2Q +M4J5*E3'(1830A"$(12A-"<(0A#]VD)H0A"$,>I0FA"$(0I\>P^=F5:M6K5JU +M:DI3:64UN;[7%5B]Y-^\]@_K@B:N\/,5F%&H<\G#IXQXAEFC&D?![6%0'6MR +MX1@@%FC"FD`M7,/SXFNG:2`'-0<-C$8^+$N.7M1B,^6)9,DV9,0A\OL<:C"L +ML1V&,<\9YRB>XV#BG")'6NKRK^("UF2XO?_L!#29">MGDF$R3).!PX&%E,4C +M''=(FL1.`_3?CN@-IB2PI3!FF\<8X.X@D,>CA90I)#M$XRPNDFJELL<3=1?8 +M2B7\5Z64,!7Z;EEBW-MXN-4IJ@W$462]-*\YCR,-B,5[W?=3&L/U>SX,WV#\ +M\B`:I"'0Z)5"$1B.E)(K[5I4RS`%R$>Y\D0NR*,;<9CZ:^V3P(I?DHTTR!IH::#$ +M-`Q`:`/2:::&)IDP"/0$T:>IFD]$R8---3HUK2*K9].C:!IWS-2UK9M.3@8,&#!@P8(0A"$(0@0A"$(0[;_L-&C1HT:-&B+YP +M,&#!@P8,$"$(0A"-?NW$*YY:V9IQ,:B93+AX^A7B),5HN_4JV=2\Y,:-+W'Q +MKQKVU7KA+YR'.:*V#48N-"7<`%:TT4D`/;N;SZM9X,V(@!D'=P==+O)9*\H8 +MI8WIM*Q<2E)KFG;%M&U;INV]<)Q%^P'*<]T6R; +M^7`P.+I+N(HA%=#(^Q0WVV0]=$2=5)>-XWKW7!95E7$<5QW)f_args) MOD_ARGS(addr, fp->f_args, c); v = fp->f_addr; +#if defined(__arm__) + v -= __elfN(relocation_offset); +#endif MOD_ADDR(addr, v, c); v = fp->f_size; MOD_SIZE(addr, v, c); @@ -332,6 +335,21 @@ bi_load(char *args, vm_offset_t *modulep vm_offset_t dtbp; int dtb_size; #endif +#if defined(__arm__) + vm_offset_t vaddr; + int i; + /* + * These metadata addreses must be converted for kernel after + * relocation. + */ + uint32_t mdt[] = { + MODINFOMD_SSYM, MODINFOMD_ESYM, MODINFOMD_KERNEND, + MODINFOMD_ENVP, +#if defined(LOADER_FDT_SUPPORT) + MODINFOMD_DTBP +#endif + }; +#endif howto = bi_getboothowto(args); @@ -405,6 +423,22 @@ bi_load(char *args, vm_offset_t *modulep md = file_findmetadata(kfp, MODINFOMD_KERNEND); bcopy(&kernend, md->md_data, sizeof kernend); +#if defined(__arm__) + *modulep -= __elfN(relocation_offset); + + /* Do relocation fixup on metadata of each module. */ + for (xp = file_findfile(NULL, NULL); xp != NULL; xp = xp->f_next) { + for (i = 0; i < sizeof mdt / sizeof mdt[0]; i++) { + md = file_findmetadata(xp, mdt[i]); + if (md) { + bcopy(md->md_data, &vaddr, sizeof vaddr); + vaddr -= __elfN(relocation_offset); + bcopy(&vaddr, md->md_data, sizeof vaddr); + } + } + } +#endif + /* Copy module list and metadata. */ (void)bi_copymodules(addr); Modified: projects/ifnet/sys/boot/efi/loader/copy.c ============================================================================== --- projects/ifnet/sys/boot/efi/loader/copy.c Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/sys/boot/efi/loader/copy.c Mon Apr 6 22:19:51 2015 (r281173) @@ -61,9 +61,21 @@ efi_copy_init(void) } staging_end = staging + STAGE_PAGES * 4096; +#ifdef __arm__ + /* Round the kernel load address to a 2MiB value */ + staging = roundup2(staging, 2 * 1024 * 1024); +#endif + return (0); } +void * +efi_translate(vm_offset_t ptr) +{ + + return ((void *)(ptr + stage_offset)); +} + ssize_t efi_copyin(const void *src, vm_offset_t dest, const size_t len) { Modified: projects/ifnet/sys/dev/acpica/acpi.c ============================================================================== --- projects/ifnet/sys/dev/acpica/acpi.c Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/sys/dev/acpica/acpi.c Mon Apr 6 22:19:51 2015 (r281173) @@ -1151,7 +1151,7 @@ acpi_sysres_alloc(device_t dev) if (res != NULL) { rman_manage_region(rm, rman_get_start(res), rman_get_end(res)); rle->res = res; - } else + } else if (bootverbose) device_printf(dev, "reservation of %lx, %lx (%d) failed\n", rle->start, rle->count, rle->type); } Modified: projects/ifnet/sys/netinet6/ip6_forward.c ============================================================================== --- projects/ifnet/sys/netinet6/ip6_forward.c Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/sys/netinet6/ip6_forward.c Mon Apr 6 22:19:51 2015 (r281173) @@ -537,22 +537,9 @@ again2: if (!IN6_ARE_ADDR_EQUAL(&odst, &ip6->ip6_dst)) { m->m_flags |= M_SKIP_FIREWALL; /* If destination is now ourself drop to ip6_input(). */ - if (in6_localip(&ip6->ip6_dst)) { + if (in6_localip(&ip6->ip6_dst)) m->m_flags |= M_FASTFWD_OURS; - if (m->m_pkthdr.rcvif == NULL) - m->m_pkthdr.rcvif = V_loif; - if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA_IPV6) { - m->m_pkthdr.csum_flags |= - CSUM_DATA_VALID_IPV6 | CSUM_PSEUDO_HDR; - m->m_pkthdr.csum_data = 0xffff; - } -#ifdef SCTP - if (m->m_pkthdr.csum_flags & CSUM_SCTP_IPV6) - m->m_pkthdr.csum_flags |= CSUM_SCTP_VALID; -#endif - error = netisr_queue(NETISR_IPV6, m); - goto out; - } else + else goto again; /* Redo the routing table lookup. */ } Modified: projects/ifnet/sys/netinet6/ip6_mroute.c ============================================================================== --- projects/ifnet/sys/netinet6/ip6_mroute.c Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/sys/netinet6/ip6_mroute.c Mon Apr 6 22:19:51 2015 (r281173) @@ -196,9 +196,34 @@ static struct mtx mfc6_mtx; static u_char n6expire[MF6CTBLSIZ]; static struct mif6 mif6table[MAXMIFS]; -SYSCTL_OPAQUE(_net_inet6_ip6, OID_AUTO, mif6table, CTLFLAG_RD, - &mif6table, sizeof(mif6table), "S,mif6[MAXMIFS]", - "IPv6 Multicast Interfaces (struct mif6[MAXMIFS], netinet6/ip6_mroute.h)"); +static int +sysctl_mif6table(SYSCTL_HANDLER_ARGS) +{ + struct mif6_sctl *out; + int error; + + out = malloc(sizeof(struct mif6_sctl) * MAXMIFS, M_TEMP, M_WAITOK); + for (int i = 0; i < MAXMIFS; i++) { + out[i].m6_flags = mif6table[i].m6_flags; + out[i].m6_rate_limit = mif6table[i].m6_rate_limit; + out[i].m6_lcl_addr = mif6table[i].m6_lcl_addr; + if (mif6table[i].m6_ifp != NULL) + out[i].m6_ifp = mif6table[i].m6_ifp->if_index; + else + out[i].m6_ifp = 0; + out[i].m6_pkt_in = mif6table[i].m6_pkt_in; + out[i].m6_pkt_out = mif6table[i].m6_pkt_out; + out[i].m6_bytes_in = mif6table[i].m6_bytes_in; + out[i].m6_bytes_out = mif6table[i].m6_bytes_out; + } + error = SYSCTL_OUT(req, out, sizeof(struct mif6_sctl) * MAXMIFS); + free(out, M_TEMP); + return (error); +} +SYSCTL_PROC(_net_inet6_ip6, OID_AUTO, mif6table, CTLTYPE_OPAQUE | CTLFLAG_RD, + NULL, 0, sysctl_mif6table, "S,mif6_sctl[MAXMIFS]", + "IPv6 Multicast Interfaces (struct mif6_sctl[MAXMIFS], " + "netinet6/ip6_mroute.h)"); static struct mtx mif6_mtx; #define MIF6_LOCK() mtx_lock(&mif6_mtx) Modified: projects/ifnet/sys/netinet6/ip6_mroute.h ============================================================================== --- projects/ifnet/sys/netinet6/ip6_mroute.h Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/sys/netinet6/ip6_mroute.h Mon Apr 6 22:19:51 2015 (r281173) @@ -194,6 +194,20 @@ struct sioc_mif_req6 { u_quad_t obytes; /* Output byte count on mif */ }; +/* + * Structure to export 'struct mif6' to userland via sysctl. + */ +struct mif6_sctl { + u_char m6_flags; /* MIFF_ flags defined above */ + u_int m6_rate_limit; /* max rate */ + struct in6_addr m6_lcl_addr; /* local interface address */ + uint32_t m6_ifp; /* interface index */ + u_quad_t m6_pkt_in; /* # pkts in on interface */ + u_quad_t m6_pkt_out; /* # pkts out on interface */ + u_quad_t m6_bytes_in; /* # bytes in on interface */ + u_quad_t m6_bytes_out; /* # bytes out on interface */ +}; + #if defined(_KERNEL) || defined(KERNEL) /* * The kernel's multicast-interface structure. Modified: projects/ifnet/sys/netpfil/pf/pf_norm.c ============================================================================== --- projects/ifnet/sys/netpfil/pf/pf_norm.c Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/sys/netpfil/pf/pf_norm.c Mon Apr 6 22:19:51 2015 (r281173) @@ -1152,6 +1152,7 @@ pf_refragment6(struct ifnet *ifp, struct for (t = m; m; m = t) { t = m->m_nextpkt; m->m_nextpkt = NULL; + m->m_flags |= M_SKIP_FIREWALL; memset(&pd, 0, sizeof(pd)); pd.pf_mtag = pf_find_mtag(m); if (error == 0) Modified: projects/ifnet/sys/powerpc/powerpc/trap.c ============================================================================== --- projects/ifnet/sys/powerpc/powerpc/trap.c Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/sys/powerpc/powerpc/trap.c Mon Apr 6 22:19:51 2015 (r281173) @@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$"); #define FAULTBUF_R1 1 #define FAULTBUF_R2 2 #define FAULTBUF_CR 3 -#define FAULTBUF_R13 6 +#define FAULTBUF_R13 4 static void trap_fatal(struct trapframe *frame); static void printtrap(u_int vector, struct trapframe *frame, int isfatal, Modified: projects/ifnet/sys/sys/param.h ============================================================================== --- projects/ifnet/sys/sys/param.h Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/sys/sys/param.h Mon Apr 6 22:19:51 2015 (r281173) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1100067 /* Master, propagated to newvers */ +#define __FreeBSD_version 1100068 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, Modified: projects/ifnet/sys/vm/uma_core.c ============================================================================== --- projects/ifnet/sys/vm/uma_core.c Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/sys/vm/uma_core.c Mon Apr 6 22:19:51 2015 (r281173) @@ -1822,7 +1822,7 @@ uma_startup(void *bootmem, int boot_page #endif args.name = "UMA Zones"; args.size = sizeof(struct uma_zone) + - (sizeof(struct uma_cache) * (mp_maxid + 1)); + (sizeof(struct uma_cache) * (mp_maxid)); args.ctor = zone_ctor; args.dtor = zone_dtor; args.uminit = zero_init; Modified: projects/ifnet/usr.bin/netstat/mroute6.c ============================================================================== --- projects/ifnet/usr.bin/netstat/mroute6.c Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/usr.bin/netstat/mroute6.c Mon Apr 6 22:19:51 2015 (r281173) @@ -79,13 +79,11 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include -#include #include #include #include @@ -98,20 +96,6 @@ __FBSDID("$FreeBSD$"); #include "netstat.h" -/* - * kvm(3) bindings for every needed symbol - */ -static struct nlist mrl[] = { -#define N_MF6CTABLE 0 - { .n_name = "_mf6ctable" }, -#define N_MIF6TABLE 1 - { .n_name = "_mif6table" }, -#define N_MRT6STAT 2 - { .n_name = "_mrt6stat" }, - { .n_name = NULL }, -}; - - #define WID_ORG (Wflag ? 39 : (numeric_addr ? 29 : 18)) /* width of origin column */ #define WID_GRP (Wflag ? 18 : (numeric_addr ? 16 : 18)) /* width of group column */ @@ -119,11 +103,10 @@ void mroute6pr() { struct mf6c *mf6ctable[MF6CTBLSIZ], *mfcp; - struct mif6 mif6table[MAXMIFS]; + struct mif6_sctl mif6table[MAXMIFS]; struct mf6c mfc; struct rtdetq rte, *rtep; - struct mif6 *mifp; - u_long mfcaddr, mifaddr; + struct mif6_sctl *mifp; mifi_t mifi; int i; int banner_printed; @@ -132,39 +115,26 @@ mroute6pr() long int waitings; size_t len; - kresolve_list(mrl); - mfcaddr = mrl[N_MF6CTABLE].n_value; - mifaddr = mrl[N_MIF6TABLE].n_value; - - if (mfcaddr == 0 || mifaddr == 0) { - fprintf(stderr, "No IPv6 MROUTING kernel support.\n"); + if (live == 0) return; - } len = sizeof(mif6table); - if (live) { - if (sysctlbyname("net.inet6.ip6.mif6table", mif6table, &len, - NULL, 0) < 0) { - xo_warn("sysctl: net.inet6.ip6.mif6table"); - return; - } - } else - kread(mifaddr, (char *)mif6table, sizeof(mif6table)); + if (sysctlbyname("net.inet6.ip6.mif6table", mif6table, &len, NULL, 0) < + 0) { + xo_warn("sysctl: net.inet6.ip6.mif6table"); + return; + } saved_numeric_addr = numeric_addr; numeric_addr = 1; banner_printed = 0; for (mifi = 0, mifp = mif6table; mifi < MAXMIFS; ++mifi, ++mifp) { - struct ifnet ifnet; char ifname[IFNAMSIZ]; - if (mifp->m6_ifp == NULL) + if (mifp->m6_ifp == 0) continue; - /* XXX KVM */ - kread((u_long)mifp->m6_ifp, (char *)&ifnet, sizeof(ifnet)); - maxmif = mifi; if (!banner_printed) { xo_open_list("multicast-interface"); @@ -177,7 +147,7 @@ mroute6pr() xo_emit(" {:mif/%2u} {:rate-limit/%4d}", mifi, mifp->m6_rate_limit); xo_emit(" {:ifname/%5s}", (mifp->m6_flags & MIFF_REGISTER) ? - "reg0" : if_indextoname(ifnet.if_index, ifname)); + "reg0" : if_indextoname(mifp->m6_ifp, ifname)); xo_emit(" {:received-packets/%9ju} {:sent-packets/%9ju}\n", (uintmax_t)mifp->m6_pkt_in, @@ -190,14 +160,11 @@ mroute6pr() xo_emit("\n{T:IPv6 Multicast Interface Table is empty}\n"); len = sizeof(mf6ctable); - if (live) { - if (sysctlbyname("net.inet6.ip6.mf6ctable", mf6ctable, &len, - NULL, 0) < 0) { - xo_warn("sysctl: net.inet6.ip6.mf6ctable"); - return; - } - } else - kread(mfcaddr, (char *)mf6ctable, sizeof(mf6ctable)); + if (sysctlbyname("net.inet6.ip6.mf6ctable", mf6ctable, &len, NULL, 0) < + 0) { + xo_warn("sysctl: net.inet6.ip6.mf6ctable"); + return; + } banner_printed = 0; @@ -262,26 +229,14 @@ void mrt6_stats() { struct mrt6stat mrtstat; - u_long mstaddr; size_t len = sizeof mrtstat; - kresolve_list(mrl); - mstaddr = mrl[N_MRT6STAT].n_value; - - if (mstaddr == 0) { - fprintf(stderr, "No IPv6 MROUTING kernel support.\n"); + if (sysctlbyname("net.inet6.ip6.mrt6stat", &mrtstat, &len, NULL, 0) < + 0) { + xo_warn("sysctl: net.inet6.ip6.mrt6stat"); return; } - if (live) { - if (sysctlbyname("net.inet6.ip6.mrt6stat", &mrtstat, &len, - NULL, 0) < 0) { - xo_warn("sysctl: net.inet6.ip6.mrt6stat"); - return; - } - } else - kread(mstaddr, (char *)&mrtstat, sizeof(mrtstat)); - xo_open_container("multicast-statistics"); xo_emit("{T:IPv6 multicast forwarding}:\n"); Modified: projects/ifnet/usr.bin/netstat/netstat.1 ============================================================================== --- projects/ifnet/usr.bin/netstat/netstat.1 Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/usr.bin/netstat/netstat.1 Mon Apr 6 22:19:51 2015 (r281173) @@ -28,7 +28,7 @@ .\" @(#)netstat.1 8.8 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd February 21, 2015 +.Dd April 7, 2015 .Dt NETSTAT 1 .Os .Sh NAME @@ -92,8 +92,6 @@ .Op Fl -libxo .Op Fl 46W .Op Fl f Ar address_family -.Op Fl M Ar core -.Op Fl N Ar system .It Nm Fl gs .Op Fl -libxo .Op Fl 46s Modified: projects/ifnet/usr.sbin/acpi/acpiconf/acpiconf.c ============================================================================== --- projects/ifnet/usr.sbin/acpi/acpiconf/acpiconf.c Mon Apr 6 22:12:18 2015 (r281172) +++ projects/ifnet/usr.sbin/acpi/acpiconf/acpiconf.c Mon Apr 6 22:19:51 2015 (r281173) @@ -136,16 +136,30 @@ acpi_battinfo(int num) if (ioctl(acpifd, ACPIIO_BATT_GET_BATTINFO, &battio) == -1) err(EX_IOERR, "get battery user info (%d) failed", num); if (battio.battinfo.state != ACPI_BATT_STAT_NOT_PRESENT) { - printf("State:\t\t\t"); - if (battio.battinfo.state == 0) - printf("high "); - if (battio.battinfo.state & ACPI_BATT_STAT_CRITICAL) - printf("critical "); - if (battio.battinfo.state & ACPI_BATT_STAT_DISCHARG) - printf("discharging "); - if (battio.battinfo.state & ACPI_BATT_STAT_CHARGING) - printf("charging "); - printf("\n"); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Apr 6 22:31:19 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7F8FAC27; Mon, 6 Apr 2015 22:31:19 +0000 (UTC) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebius.int.ru", Issuer "cell.glebius.int.ru" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 06FDCFD6; Mon, 6 Apr 2015 22:31:18 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.9/8.14.9) with ESMTP id t36MV83w093954 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 7 Apr 2015 01:31:08 +0300 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.9/8.14.9/Submit) id t36MV8kD093953; Tue, 7 Apr 2015 01:31:08 +0300 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Tue, 7 Apr 2015 01:31:08 +0300 From: Gleb Smirnoff To: Lawrence Stewart Subject: Re: svn commit: r281151 - projects/ifnet/sys/net Message-ID: <20150406223108.GD64665@FreeBSD.org> References: <201504061522.t36FMXwX092973@svn.freebsd.org> <5522F214.5060903@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5522F214.5060903@freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2015 22:31:19 -0000 On Mon, Apr 06, 2015 at 01:52:36PM -0700, Lawrence Stewart wrote: L> > Author: glebius L> > Date: Mon Apr 6 15:22:32 2015 L> > New Revision: 281151 L> > URL: https://svnweb.freebsd.org/changeset/base/281151 L> > L> > Log: L> > Provide software context store in struct ifnet for any facility. To add L> > a new facility, one needs to grab a value in the ift_feature enum, and L> > not need to modify struct ifnet. L> > L> > The store also has a cache to return frequently requested values, L> > which resembles kobj(9) method cache. L> > L> > The plan is to move into the softc store almost all possible software L> > contexts that hang off the struct ifnet, leaving static only the driver L> > softc, AF_INET, AF_INET6 pointers, and other frequently used pointer. L> L> It seems likely that this is partially reinventing OSD(9) (also see the L> way I used it for for khelp(9)). Perhaps OSD could be improved with some L> useful things like the cache and then it might be a suitable drop in L> replacement here as well? Yes, osd(9) looks very like. For now I'd prefer to keep the simple stuff from r281151, to avoid introducing extra locks. Later we can estimate osd(9). -- Totus tuus, Glebius. From owner-svn-src-projects@FreeBSD.ORG Tue Apr 7 00:17:39 2015 Return-Path: Delivered-To: svn-src-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BF3DF47B; Tue, 7 Apr 2015 00:17:39 +0000 (UTC) Received: from lauren.room52.net (lauren.room52.net [210.50.193.198]) by mx1.freebsd.org (Postfix) with ESMTP id 7E104C8A; Tue, 7 Apr 2015 00:17:36 +0000 (UTC) Received: from lgwl-lstewart2.corp.netflix.com (76-247-182-56.lightspeed.sjcpca.sbcglobal.net [76.247.182.56]) by lauren.room52.net (Postfix) with ESMTPSA id 21D647E820; Tue, 7 Apr 2015 10:17:32 +1000 (EST) Message-ID: <55232218.5050401@freebsd.org> Date: Mon, 06 Apr 2015 17:17:28 -0700 From: Lawrence Stewart User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Gleb Smirnoff Subject: Re: svn commit: r281151 - projects/ifnet/sys/net References: <201504061522.t36FMXwX092973@svn.freebsd.org> <5522F214.5060903@freebsd.org> <20150406223108.GD64665@FreeBSD.org> In-Reply-To: <20150406223108.GD64665@FreeBSD.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=2.4 required=5.0 tests=DNS_FROM_AHBL_RHSBL, UNPARSEABLE_RELAY autolearn=no version=3.3.2 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on lauren.room52.net Cc: svn-src-projects@FreeBSD.org, src-committers@FreeBSD.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2015 00:17:39 -0000 On 04/06/15 15:31, Gleb Smirnoff wrote: > On Mon, Apr 06, 2015 at 01:52:36PM -0700, Lawrence Stewart wrote: > L> > Author: glebius > L> > Date: Mon Apr 6 15:22:32 2015 > L> > New Revision: 281151 > L> > URL: https://svnweb.freebsd.org/changeset/base/281151 > L> > > L> > Log: > L> > Provide software context store in struct ifnet for any facility. To add > L> > a new facility, one needs to grab a value in the ift_feature enum, and > L> > not need to modify struct ifnet. > L> > > L> > The store also has a cache to return frequently requested values, > L> > which resembles kobj(9) method cache. > L> > > L> > The plan is to move into the softc store almost all possible software > L> > contexts that hang off the struct ifnet, leaving static only the driver > L> > softc, AF_INET, AF_INET6 pointers, and other frequently used pointer. > L> > L> It seems likely that this is partially reinventing OSD(9) (also see the > L> way I used it for for khelp(9)). Perhaps OSD could be improved with some > L> useful things like the cache and then it might be a suitable drop in > L> replacement here as well? > > Yes, osd(9) looks very like. For now I'd prefer to keep the simple stuff > from r281151, to avoid introducing extra locks. Later we can estimate > osd(9). > Sounds good. Cheers, Lawrence From owner-svn-src-projects@FreeBSD.ORG Tue Apr 7 06:10:13 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AFE32D34; Tue, 7 Apr 2015 06:10:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 9B3E23FF; Tue, 7 Apr 2015 06:10:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t376ADSR020733; Tue, 7 Apr 2015 06:10:13 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t376ADOo020732; Tue, 7 Apr 2015 06:10:13 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504070610.t376ADOo020732@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 7 Apr 2015 06:10:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281189 - projects/ifnet/sys/i386/conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2015 06:10:13 -0000 Author: glebius Date: Tue Apr 7 06:10:12 2015 New Revision: 281189 URL: https://svnweb.freebsd.org/changeset/base/281189 Log: Provide IFNET kernel (GENERIC with disabled drivers to be done) for i386. Added: projects/ifnet/sys/i386/conf/IFNET - copied, changed from r281139, projects/ifnet/sys/amd64/conf/IFNET Copied and modified: projects/ifnet/sys/i386/conf/IFNET (from r281139, projects/ifnet/sys/amd64/conf/IFNET) ============================================================================== --- projects/ifnet/sys/amd64/conf/IFNET Mon Apr 6 07:42:05 2015 (r281139, copy source) +++ projects/ifnet/sys/i386/conf/IFNET Tue Apr 7 06:10:12 2015 (r281189) @@ -64,6 +64,17 @@ nodevice nfe nodevice xenpci # netfront nooptions XENHVM # netfront +# i386 only, are they all ISA? +nodevice cs +nodevice ie +nodevice fe +nodevice ed +nodevice ep +nodevice sn +nodevice xe +nodevice ex +nodevice vte + # Could be not easy nodevice ixgb nodevice ixgbe From owner-svn-src-projects@FreeBSD.ORG Tue Apr 7 06:11:59 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A791EE30; Tue, 7 Apr 2015 06:11:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 91565684; Tue, 7 Apr 2015 06:11:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t376Bxwl024411; Tue, 7 Apr 2015 06:11:59 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t376BvN8024405; Tue, 7 Apr 2015 06:11:57 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504070611.t376BvN8024405@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 7 Apr 2015 06:11:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281190 - in projects/ifnet/sys: amd64/conf dev/fxp i386/conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2015 06:11:59 -0000 Author: glebius Date: Tue Apr 7 06:11:57 2015 New Revision: 281190 URL: https://svnweb.freebsd.org/changeset/base/281190 Log: Convert fxp(4) to new ifnet KPI. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/ifnet/sys/amd64/conf/IFNET projects/ifnet/sys/dev/fxp/if_fxp.c projects/ifnet/sys/dev/fxp/if_fxpvar.h projects/ifnet/sys/dev/fxp/inphy.c projects/ifnet/sys/i386/conf/IFNET Modified: projects/ifnet/sys/amd64/conf/IFNET ============================================================================== --- projects/ifnet/sys/amd64/conf/IFNET Tue Apr 7 06:10:12 2015 (r281189) +++ projects/ifnet/sys/amd64/conf/IFNET Tue Apr 7 06:11:57 2015 (r281190) @@ -35,7 +35,6 @@ nodevice txp nodevice vmx nodevice wpi nodevice dc -nodevice fxp nodevice jme nodevice ale nodevice age Modified: projects/ifnet/sys/dev/fxp/if_fxp.c ============================================================================== --- projects/ifnet/sys/dev/fxp/if_fxp.c Tue Apr 7 06:10:12 2015 (r281189) +++ projects/ifnet/sys/dev/fxp/if_fxp.c Tue Apr 7 06:11:57 2015 (r281190) @@ -52,15 +52,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include -#include -#include #include #include -#include -#include #include #include @@ -108,7 +103,7 @@ static int tx_threshold = 64; /* * The configuration byte map has several undefined fields which * must be one or must be zero. Set up a template for these bits. - * The actual configuration is performed in fxp_init_body. + * The actual configuration is performed in fxp_init(). * * See struct fxp_cb_config for the bit definitions. */ @@ -224,17 +219,18 @@ static void fxp_rxcsum(struct fxp_softc struct mbuf *m, uint16_t status, int pos); static int fxp_intr_body(struct fxp_softc *sc, if_t ifp, uint8_t statack, int count); -static void fxp_init(void *xsc); -static void fxp_init_body(struct fxp_softc *sc, int); +static void fxp_init(struct fxp_softc *sc, int); static void fxp_tick(void *xsc); -static void fxp_start(if_t ifp); -static void fxp_start_body(if_t ifp); +static int fxp_transmit(if_t, struct mbuf *); +static void fxp_start(struct fxp_softc *); +#ifdef DEVICE_POLLING +static int fxp_poll(if_t, enum poll_cmd, int); +#endif static int fxp_encap(struct fxp_softc *sc, struct mbuf **m_head); static void fxp_txeof(struct fxp_softc *sc); static void fxp_stop(struct fxp_softc *sc); static void fxp_release(struct fxp_softc *sc); -static int fxp_ioctl(if_t ifp, u_long command, - caddr_t data); +static int fxp_ioctl(if_t, u_long, void *, struct thread *); static void fxp_watchdog(struct fxp_softc *sc); static void fxp_add_rfabuf(struct fxp_softc *sc, struct fxp_rx *rxp); @@ -242,7 +238,7 @@ static void fxp_discard_rfabuf(struct f struct fxp_rx *rxp); static int fxp_new_rfabuf(struct fxp_softc *sc, struct fxp_rx *rxp); -static int fxp_mc_addrs(struct fxp_softc *sc); +static void fxp_mc_addrs(struct fxp_softc *sc); static void fxp_mc_setup(struct fxp_softc *sc); static uint16_t fxp_eeprom_getword(struct fxp_softc *sc, int offset, int autosize); @@ -318,6 +314,20 @@ static struct resource_spec fxp_res_spec { -1, 0 } }; +static struct ifdriver fxp_ifdrv = { + .ifdrv_ops = { + .ifop_ioctl = fxp_ioctl, + .ifop_transmit = fxp_transmit, +#ifdef DEVICE_POLLING + .ifop_poll = fxp_poll, +#endif + }, + .ifdrv_name = "fxp", + .ifdrv_type = IFT_ETHER, + .ifdrv_hdrlen = sizeof(struct ether_vlan_header), + .ifdrv_maxqlen = FXP_NTXCB - 1, +}; + /* * Wait for the previous command to be accepted (but not necessarily * completed). @@ -423,11 +433,16 @@ fxp_dma_map_addr(void *arg, bus_dma_segm static int fxp_attach(device_t dev) { + struct if_attach_args ifat = { + .ifat_version = IF_ATTACH_VERSION, + .ifat_drv = &fxp_ifdrv, + .ifat_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST, + .ifat_capabilities = IFCAP_VLAN_MTU, + }; struct fxp_softc *sc; struct fxp_cb_tx *tcbp; struct fxp_tx *txp; struct fxp_rx *rxp; - if_t ifp; uint32_t val; uint16_t data; u_char eaddr[ETHER_ADDR_LEN]; @@ -442,13 +457,6 @@ fxp_attach(device_t dev) ifmedia_init(&sc->sc_media, 0, fxp_serial_ifmedia_upd, fxp_serial_ifmedia_sts); - ifp = sc->ifp = if_gethandle(IFT_ETHER); - if (ifp == (void *)NULL) { - device_printf(dev, "can not if_alloc()\n"); - error = ENOSPC; - goto fail; - } - /* * Enable bus mastering. */ @@ -827,76 +835,15 @@ fxp_attach(device_t dev) flags = MIIF_NOISOLATE; if (sc->revision >= FXP_REV_82558_A4) flags |= MIIF_DOPAUSE; - error = mii_attach(dev, &sc->miibus, ifp, - (ifm_change_cb_t)fxp_ifmedia_upd, - (ifm_stat_cb_t)fxp_ifmedia_sts, BMSR_DEFCAPMASK, - MII_PHY_ANY, MII_OFFSET_ANY, flags); + error = mii_attach(dev, &sc->miibus, fxp_ifmedia_upd, + fxp_ifmedia_sts, BMSR_DEFCAPMASK, MII_PHY_ANY, + MII_OFFSET_ANY, flags); if (error != 0) { device_printf(dev, "attaching PHYs failed\n"); goto fail; } } - if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - if_setdev(ifp, dev); - if_setinitfn(ifp, fxp_init); - if_setsoftc(ifp, sc); - if_setflags(ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST); - if_setioctlfn(ifp, fxp_ioctl); - if_setstartfn(ifp, fxp_start); - - if_setcapabilities(ifp, 0); - if_setcapenable(ifp, 0); - - /* Enable checksum offload/TSO for 82550 or better chips */ - if (sc->flags & FXP_FLAG_EXT_RFA) { - if_sethwassist(ifp, FXP_CSUM_FEATURES | CSUM_TSO); - if_setcapabilitiesbit(ifp, IFCAP_HWCSUM | IFCAP_TSO4, 0); - if_setcapenablebit(ifp, IFCAP_HWCSUM | IFCAP_TSO4, 0); - } - - if (sc->flags & FXP_FLAG_82559_RXCSUM) { - if_setcapabilitiesbit(ifp, IFCAP_RXCSUM, 0); - if_setcapenablebit(ifp, IFCAP_RXCSUM, 0); - } - - if (sc->flags & FXP_FLAG_WOLCAP) { - if_setcapabilitiesbit(ifp, IFCAP_WOL_MAGIC, 0); - if_setcapenablebit(ifp, IFCAP_WOL_MAGIC, 0); - } - -#ifdef DEVICE_POLLING - /* Inform the world we support polling. */ - if_setcapabilitiesbit(ifp, IFCAP_POLLING, 0); -#endif - - /* - * Attach the interface. - */ - ether_ifattach(ifp, eaddr); - - /* - * Tell the upper layer(s) we support long frames. - * Must appear after the call to ether_ifattach() because - * ether_ifattach() sets ifi_hdrlen to the default value. - */ - if_setifheaderlen(ifp, sizeof(struct ether_vlan_header)); - if_setcapabilitiesbit(ifp, IFCAP_VLAN_MTU, 0); - if_setcapenablebit(ifp, IFCAP_VLAN_MTU, 0); - if ((sc->flags & FXP_FLAG_EXT_RFA) != 0) { - if_setcapabilitiesbit(ifp, IFCAP_VLAN_HWTAGGING | - IFCAP_VLAN_HWCSUM | IFCAP_VLAN_HWTSO, 0); - if_setcapenablebit(ifp, IFCAP_VLAN_HWTAGGING | - IFCAP_VLAN_HWCSUM | IFCAP_VLAN_HWTSO, 0); - } - - /* - * Let the system queue as many packets as we have available - * TX descriptors. - */ - if_setsendqlen(ifp, FXP_NTXCB - 1); - if_setsendqready(ifp); - /* * Hook our interrupt after all initialization is complete. */ @@ -904,7 +851,6 @@ fxp_attach(device_t dev) NULL, fxp_intr, sc, &sc->ih); if (error) { device_printf(dev, "could not setup irq\n"); - ether_ifdetach(sc->ifp); goto fail; } @@ -916,14 +862,40 @@ fxp_attach(device_t dev) FXP_LOCK(sc); /* Clear wakeup events. */ CSR_WRITE_1(sc, FXP_CSR_PMDR, CSR_READ_1(sc, FXP_CSR_PMDR)); - fxp_init_body(sc, 0); + fxp_init(sc, 0); fxp_stop(sc); FXP_UNLOCK(sc); } + /* + * Attach the interface. + */ + ifat.ifat_softc = sc; + ifat.ifat_dunit = device_get_unit(dev); + ifat.ifat_lla = eaddr; + /* Enable checksum offload/TSO for 82550 or better chips */ + if (sc->flags & FXP_FLAG_EXT_RFA) { + ifat.ifat_hwassist = FXP_CSUM_FEATURES | CSUM_TSO; + ifat.ifat_capabilities |= IFCAP_HWCSUM | IFCAP_TSO4; + } + if (sc->flags & FXP_FLAG_82559_RXCSUM) + ifat.ifat_capabilities |= IFCAP_RXCSUM; + if (sc->flags & FXP_FLAG_WOLCAP) + ifat.ifat_capabilities |= IFCAP_WOL_MAGIC; + if (sc->flags & FXP_FLAG_EXT_RFA) + ifat.ifat_capabilities |= IFCAP_VLAN_HWTAGGING | + IFCAP_VLAN_HWCSUM | IFCAP_VLAN_HWTSO; + ifat.ifat_capenable = ifat.ifat_capabilities; +#ifdef DEVICE_POLLING + ifat.ifat_capabilities |= IFCAP_POLLING; +#endif + sc->if_flags = ifat.ifat_flags; + sc->ifp = if_attach(&ifat); + + return (0); + fail: - if (error) - fxp_release(sc); + fxp_release(sc); return (error); } @@ -992,8 +964,6 @@ fxp_release(struct fxp_softc *sc) bus_dma_tag_destroy(sc->cbl_tag); if (sc->mcs_tag) bus_dma_tag_destroy(sc->mcs_tag); - if (sc->ifp) - if_free(sc->ifp); mtx_destroy(&sc->sc_mtx); } @@ -1006,11 +976,6 @@ fxp_detach(device_t dev) { struct fxp_softc *sc = device_get_softc(dev); -#ifdef DEVICE_POLLING - if (if_getcapenable(sc->ifp) & IFCAP_POLLING) - ether_poll_deregister(sc->ifp); -#endif - FXP_LOCK(sc); /* * Stop DMA and drop transmit queue, but disable interrupts first. @@ -1023,7 +988,7 @@ fxp_detach(device_t dev) /* * Close down routes etc. */ - ether_ifdetach(sc->ifp); + if_detach(sc->ifp); /* * Unhook interrupt before dropping lock. This is to prevent @@ -1063,23 +1028,21 @@ static int fxp_suspend(device_t dev) { struct fxp_softc *sc = device_get_softc(dev); - if_t ifp; int pmc; uint16_t pmstat; FXP_LOCK(sc); - ifp = sc->ifp; if (pci_find_cap(sc->dev, PCIY_PMG, &pmc) == 0) { pmstat = pci_read_config(sc->dev, pmc + PCIR_POWER_STATUS, 2); pmstat &= ~(PCIM_PSTAT_PME | PCIM_PSTAT_PMEENABLE); - if ((if_getcapenable(ifp) & IFCAP_WOL_MAGIC) != 0) { + if ((sc->if_capenable & IFCAP_WOL_MAGIC) != 0) { /* Request PME. */ pmstat |= PCIM_PSTAT_PME | PCIM_PSTAT_PMEENABLE; sc->flags |= FXP_FLAG_WOL; /* Reconfigure hardware to accept magic frames. */ - if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING); - fxp_init_body(sc, 0); + sc->flags &= ~FXP_FLAG_RUNNING; + fxp_init(sc, 0); } pci_write_config(sc->dev, pmc + PCIR_POWER_STATUS, pmstat, 2); } @@ -1099,7 +1062,6 @@ static int fxp_resume(device_t dev) { struct fxp_softc *sc = device_get_softc(dev); - if_t ifp = sc->ifp; int pmc; uint16_t pmstat; @@ -1120,8 +1082,8 @@ fxp_resume(device_t dev) DELAY(10); /* reinitialize interface if necessary */ - if (if_getflags(ifp) & IFF_UP) - fxp_init_body(sc, 1); + if (sc->if_flags & IFF_UP) + fxp_init(sc, 1); sc->suspended = 0; @@ -1324,14 +1286,20 @@ fxp_load_eeprom(struct fxp_softc *sc) /* * Grab the softc lock and call the real fxp_start_body() routine */ -static void -fxp_start(if_t ifp) +static int +fxp_transmit(if_t ifp, struct mbuf *m) { - struct fxp_softc *sc = if_getsoftc(ifp); + struct fxp_softc *sc; + int error; + + if ((error = if_snd_enqueue(ifp, m)) != 0) + return (error); + sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); FXP_LOCK(sc); - fxp_start_body(ifp); + fxp_start(sc); FXP_UNLOCK(sc); + return (0); } /* @@ -1340,16 +1308,14 @@ fxp_start(if_t ifp) * internal entry point only. */ static void -fxp_start_body(if_t ifp) +fxp_start(struct fxp_softc *sc) { - struct fxp_softc *sc = if_getsoftc(ifp); - struct mbuf *mb_head; + struct mbuf *m; int txqueued; FXP_LOCK_ASSERT(sc, MA_OWNED); - if ((if_getdrvflags(ifp) & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) != - IFF_DRV_RUNNING) + if (!(sc->flags & FXP_FLAG_RUNNING)) return; if (sc->tx_queued > FXP_NTXCB_HIWAT) @@ -1361,26 +1327,19 @@ fxp_start_body(if_t ifp) * a NOP command when needed. */ txqueued = 0; - while (!if_sendq_empty(ifp) && sc->tx_queued < FXP_NTXCB - 1) { - - /* - * Grab a packet to transmit. - */ - mb_head = if_dequeue(ifp); - if (mb_head == NULL) - break; - - if (fxp_encap(sc, &mb_head)) { - if (mb_head == NULL) + while (sc->tx_queued < FXP_NTXCB - 1 && + ((m = if_snd_dequeue(sc->ifp)) != NULL)) { + if (fxp_encap(sc, &m)) { + if (m == NULL) break; - if_sendq_prepend(ifp, mb_head); - if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0); + if_snd_prepend(sc->ifp, m); + break; } txqueued++; /* * Pass packet to bpf if there is a listener. */ - if_bpfmtap(ifp, mb_head); + if_mtap(sc->ifp, m, NULL, 0); } /* @@ -1670,17 +1629,15 @@ fxp_encap(struct fxp_softc *sc, struct m } #ifdef DEVICE_POLLING -static poll_handler_t fxp_poll; - static int fxp_poll(if_t ifp, enum poll_cmd cmd, int count) { - struct fxp_softc *sc = if_getsoftc(ifp); + struct fxp_softc *sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); uint8_t statack; int rx_npkts = 0; FXP_LOCK(sc); - if (!(if_getdrvflags(ifp) & IFF_DRV_RUNNING)) { + if (!(sc->flags & FXP_FLAG_RUNNING)) { FXP_UNLOCK(sc); return (rx_npkts); } @@ -1745,7 +1702,7 @@ fxp_intr(void *xsc) * First ACK all the interrupts in this pass. */ CSR_WRITE_1(sc, FXP_CSR_SCB_STATACK, statack); - if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) + if ((sc->flags & FXP_FLAG_RUNNING) != 0) fxp_intr_body(sc, ifp, statack, -1); } FXP_UNLOCK(sc); @@ -1773,7 +1730,6 @@ fxp_txeof(struct fxp_softc *sc) txp->tx_cb->tbd[0].tb_addr = 0; } sc->tx_queued--; - if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE); } sc->fxp_desc.tx_first = txp; bus_dmamap_sync(sc->cbl_tag, sc->cbl_map, @@ -1903,8 +1859,8 @@ fxp_intr_body(struct fxp_softc *sc, if_t /* * Try to start more packets transmitting. */ - if (!if_sendq_empty(ifp)) - fxp_start_body(ifp); + if (if_snd_len(ifp)) + fxp_start(sc); /* * Just return if nothing happened on the receive side. @@ -1970,7 +1926,7 @@ fxp_intr_body(struct fxp_softc *sc, if_t */ total_len = le16toh(rfa->actual_size) & 0x3fff; if ((sc->flags & FXP_FLAG_82559_RXCSUM) != 0 && - (if_getcapenable(ifp) & IFCAP_RXCSUM) != 0) { + (sc->if_capenable & IFCAP_RXCSUM) != 0) { /* Adjust for appended checksum bytes. */ total_len -= 2; } @@ -1985,12 +1941,12 @@ fxp_intr_body(struct fxp_softc *sc, if_t } m->m_pkthdr.len = m->m_len = total_len; - if_setrcvif(m, ifp); + m->m_pkthdr.rcvif = ifp; /* Do IP checksum checking. */ - if ((if_getcapenable(ifp) & IFCAP_RXCSUM) != 0) + if ((sc->if_capenable & IFCAP_RXCSUM) != 0) fxp_rxcsum(sc, ifp, m, status, total_len); - if ((if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING) != 0 && + if ((sc->if_capenable & IFCAP_VLAN_HWTAGGING) != 0 && (status & FXP_RFA_STATUS_VLAN) != 0) { m->m_pkthdr.ether_vtag = ntohs(rfa->rfax_vlan_id); @@ -2008,7 +1964,7 @@ fxp_intr_body(struct fxp_softc *sc, if_t if_input(ifp, m); FXP_LOCK(sc); rx_npkts++; - if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0) + if ((sc->flags & FXP_FLAG_RUNNING) == 0) return (rx_npkts); } else { /* Reuse RFA and loaded DMA map. */ @@ -2119,7 +2075,6 @@ static void fxp_tick(void *xsc) { struct fxp_softc *sc = xsc; - if_t ifp = sc->ifp; FXP_LOCK_ASSERT(sc, MA_OWNED); @@ -2147,9 +2102,9 @@ fxp_tick(void *xsc) */ if (sc->rx_idle_secs > FXP_MAX_RX_IDLE) { sc->rx_idle_secs = 0; - if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) { - if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING); - fxp_init_body(sc, 1); + if ((sc->flags & FXP_FLAG_RUNNING) != 0) { + sc->flags &= ~FXP_FLAG_RUNNING; + fxp_init(sc, 1); } return; } @@ -2184,11 +2139,10 @@ fxp_tick(void *xsc) static void fxp_stop(struct fxp_softc *sc) { - if_t ifp = sc->ifp; struct fxp_tx *txp; int i; - if_setdrvflagbits(ifp, 0, (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)); + sc->flags &= ~FXP_FLAG_RUNNING; sc->watchdog_timer = 0; /* @@ -2249,23 +2203,8 @@ fxp_watchdog(struct fxp_softc *sc) device_printf(sc->dev, "device timeout\n"); if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); - if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING); - fxp_init_body(sc, 1); -} - -/* - * Acquire locks and then call the real initialization function. This - * is necessary because ether_ioctl() calls if_init() and this would - * result in mutex recursion if the mutex was held. - */ -static void -fxp_init(void *xsc) -{ - struct fxp_softc *sc = xsc; - - FXP_LOCK(sc); - fxp_init_body(sc, 1); - FXP_UNLOCK(sc); + sc->flags &= ~FXP_FLAG_RUNNING; + fxp_init(sc, 1); } /* @@ -2273,9 +2212,8 @@ fxp_init(void *xsc) * softc lock held. */ static void -fxp_init_body(struct fxp_softc *sc, int setmedia) +fxp_init(struct fxp_softc *sc, int setmedia) { - if_t ifp = sc->ifp; struct mii_data *mii; struct fxp_cb_config *cbp; struct fxp_cb_ias *cb_ias; @@ -2285,7 +2223,7 @@ fxp_init_body(struct fxp_softc *sc, int FXP_LOCK_ASSERT(sc, MA_OWNED); - if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) + if (sc->flags & FXP_FLAG_RUNNING) return; /* @@ -2300,7 +2238,7 @@ fxp_init_body(struct fxp_softc *sc, int CSR_WRITE_4(sc, FXP_CSR_PORT, FXP_PORT_SOFTWARE_RESET); DELAY(50); - prm = (if_getflags(ifp) & IFF_PROMISC) ? 1 : 0; + prm = (sc->if_flags & IFF_PROMISC) ? 1 : 0; /* * Initialize base of CBL and RFA memory. Loading with zero @@ -2326,15 +2264,13 @@ fxp_init_body(struct fxp_softc *sc, int * Attempt to load microcode if requested. * For ICH based controllers do not load microcode. */ - if (sc->ident->ich == 0) { - if (if_getflags(ifp) & IFF_LINK0 && - (sc->flags & FXP_FLAG_UCODE) == 0) + if (sc->ident->ich == 0 && (sc->if_flags & IFF_LINK0) && + (sc->flags & FXP_FLAG_UCODE) == 0) fxp_load_ucode(sc); - } /* - * Set IFF_ALLMULTI status. It's needed in configure action - * command. + * Set IFF_ALLMULTI status on sc->if_flags. + * It's needed in configure action command. */ fxp_mc_addrs(sc); @@ -2383,7 +2319,7 @@ fxp_init_body(struct fxp_softc *sc, int cbp->mediatype = sc->flags & FXP_FLAG_SERIAL_MEDIA ? 0 : 1; cbp->csma_dis = 0; /* (don't) disable link */ cbp->tcp_udp_cksum = ((sc->flags & FXP_FLAG_82559_RXCSUM) != 0 && - (if_getcapenable(ifp) & IFCAP_RXCSUM) != 0) ? 1 : 0; + (sc->if_capenable & IFCAP_RXCSUM) != 0) ? 1 : 0; cbp->vlan_tco = 0; /* (don't) enable vlan wakeup */ cbp->link_wake_en = 0; /* (don't) assert PME# on link change */ cbp->arp_wake_en = 0; /* (don't) assert PME# on arp */ @@ -2410,10 +2346,10 @@ fxp_init_body(struct fxp_softc *sc, int cbp->force_fdx = 0; /* (don't) force full duplex */ cbp->fdx_pin_en = 1; /* (enable) FDX# pin */ cbp->multi_ia = 0; /* (don't) accept multiple IAs */ - cbp->mc_all = if_getflags(ifp) & IFF_ALLMULTI ? 1 : prm; + cbp->mc_all = sc->if_flags & IFF_ALLMULTI ? 1 : prm; cbp->gamla_rx = sc->flags & FXP_FLAG_EXT_RFA ? 1 : 0; cbp->vlan_strip_en = ((sc->flags & FXP_FLAG_EXT_RFA) != 0 && - (if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING) != 0) ? 1 : 0; + (sc->if_capenable & IFCAP_VLAN_HWTAGGING) != 0) ? 1 : 0; if (sc->revision == FXP_REV_82557) { /* @@ -2492,7 +2428,7 @@ fxp_init_body(struct fxp_softc *sc, int cb_ias->cb_status = 0; cb_ias->cb_command = htole16(FXP_CB_COMMAND_IAS | FXP_CB_COMMAND_EL); cb_ias->link_addr = 0xffffffff; - bcopy(if_getlladdr(sc->ifp), cb_ias->macaddr, ETHER_ADDR_LEN); + bcopy(if_lladdr(sc->ifp), cb_ias->macaddr, ETHER_ADDR_LEN); /* * Start the IAS (Individual Address Setup) command/DMA. @@ -2554,7 +2490,7 @@ fxp_init_body(struct fxp_softc *sc, int if (sc->miibus != NULL && setmedia != 0) mii_mediachg(device_get_softc(sc->miibus)); - if_setdrvflagbits(ifp, IFF_DRV_RUNNING, IFF_DRV_OACTIVE); + sc->flags |= FXP_FLAG_RUNNING; /* * Enable interrupts. @@ -2596,7 +2532,7 @@ fxp_serial_ifmedia_sts(if_t ifp, struct static int fxp_ifmedia_upd(if_t ifp) { - struct fxp_softc *sc = if_getsoftc(ifp); + struct fxp_softc *sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); struct mii_data *mii; struct mii_softc *miisc; @@ -2615,7 +2551,7 @@ fxp_ifmedia_upd(if_t ifp) static void fxp_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr) { - struct fxp_softc *sc = if_getsoftc(ifp); + struct fxp_softc *sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); struct mii_data *mii; mii = device_get_softc(sc->miibus); @@ -2809,8 +2745,7 @@ fxp_miibus_statchg(device_t dev) sc = device_get_softc(dev); mii = device_get_softc(sc->miibus); ifp = sc->ifp; - if (mii == NULL || ifp == (void *)NULL || - (if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0 || + if (ifp == NULL || (sc->flags & FXP_FLAG_RUNNING) == 0 || (mii->mii_media_status & (IFM_AVALID | IFM_ACTIVE)) != (IFM_AVALID | IFM_ACTIVE)) return; @@ -2821,54 +2756,53 @@ fxp_miibus_statchg(device_t dev) else sc->cu_resume_bug = 0; /* - * Call fxp_init_body in order to adjust the flow control settings. + * Call fxp_init() in order to adjust the flow control settings. * Note that the 82557 doesn't support hardware flow control. */ if (sc->revision == FXP_REV_82557) return; - if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING); - fxp_init_body(sc, 0); + sc->flags &= ~FXP_FLAG_RUNNING; + fxp_init(sc, 0); } static int -fxp_ioctl(if_t ifp, u_long command, caddr_t data) +fxp_ioctl(if_t ifp, u_long command, void *data, struct thread *td) { - struct fxp_softc *sc = if_getsoftc(ifp); - struct ifreq *ifr = (struct ifreq *)data; + struct fxp_softc *sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); + struct ifreq *ifr = data; struct mii_data *mii; - int flag, mask, error = 0, reinit; + int oflags, flag, mask, error = 0, reinit; switch (command) { case SIOCSIFFLAGS: FXP_LOCK(sc); + oflags = sc->if_flags; + sc->if_flags = ifr->ifr_flags; /* * If interface is marked up and not running, then start it. * If it is marked down and running, stop it. * XXX If it's up then re-initialize it. This is so flags * such as IFF_PROMISC are handled. */ - if (if_getflags(ifp) & IFF_UP) { - if (((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) && - ((if_getflags(ifp) ^ sc->if_flags) & + if (sc->if_flags & IFF_UP) { + if (((sc->flags & FXP_FLAG_RUNNING) != 0) && + ((oflags ^ sc->if_flags) & (IFF_PROMISC | IFF_ALLMULTI | IFF_LINK0)) != 0) { - if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING); - fxp_init_body(sc, 0); - } else if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0) - fxp_init_body(sc, 1); - } else { - if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) + sc->flags &= ~FXP_FLAG_RUNNING; + fxp_init(sc, 0); + } else if ((sc->flags & FXP_FLAG_RUNNING) == 0) + fxp_init(sc, 1); + } else if ((sc->flags & FXP_FLAG_RUNNING) != 0) fxp_stop(sc); - } - sc->if_flags = if_getflags(ifp); FXP_UNLOCK(sc); break; case SIOCADDMULTI: case SIOCDELMULTI: FXP_LOCK(sc); - if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) { - if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING); - fxp_init_body(sc, 0); + if ((sc->flags & FXP_FLAG_RUNNING) != 0) { + sc->flags &= ~FXP_FLAG_RUNNING; + fxp_init(sc, 0); } FXP_UNLOCK(sc); break; @@ -2886,115 +2820,89 @@ fxp_ioctl(if_t ifp, u_long command, cadd case SIOCSIFCAP: reinit = 0; - mask = if_getcapenable(ifp) ^ ifr->ifr_reqcap; + mask = ifr->ifr_reqcap ^ ifr->ifr_curcap; + FXP_LOCK(sc); + sc->if_capenable = ifr->ifr_reqcap; #ifdef DEVICE_POLLING if (mask & IFCAP_POLLING) { - if (ifr->ifr_reqcap & IFCAP_POLLING) { - error = ether_poll_register(fxp_poll, ifp); - if (error) - return(error); - FXP_LOCK(sc); + if (ifr->ifr_reqcap & IFCAP_POLLING) CSR_WRITE_1(sc, FXP_CSR_SCB_INTRCNTL, FXP_SCB_INTR_DISABLE); - if_setcapenablebit(ifp, IFCAP_POLLING, 0); - FXP_UNLOCK(sc); - } else { - error = ether_poll_deregister(ifp); - /* Enable interrupts in any case */ - FXP_LOCK(sc); + else CSR_WRITE_1(sc, FXP_CSR_SCB_INTRCNTL, 0); - if_setcapenablebit(ifp, 0, IFCAP_POLLING); - FXP_UNLOCK(sc); - } } #endif - FXP_LOCK(sc); - if ((mask & IFCAP_TXCSUM) != 0 && - (if_getcapabilities(ifp) & IFCAP_TXCSUM) != 0) { - if_togglecapenable(ifp, IFCAP_TXCSUM); - if ((if_getcapenable(ifp) & IFCAP_TXCSUM) != 0) - if_sethwassistbits(ifp, FXP_CSUM_FEATURES, 0); - else - if_sethwassistbits(ifp, 0, FXP_CSUM_FEATURES); - } - if ((mask & IFCAP_RXCSUM) != 0 && - (if_getcapabilities(ifp) & IFCAP_RXCSUM) != 0) { - if_togglecapenable(ifp, IFCAP_RXCSUM); - if ((sc->flags & FXP_FLAG_82559_RXCSUM) != 0) + ifr->ifr_hwassist = 0; + if ((IFCAP_TXCSUM & ifr->ifr_reqcap) != 0) + ifr->ifr_hwassist |= FXP_CSUM_FEATURES; + if ((IFCAP_RXCSUM & ifr->ifr_reqcap) != 0 && + (sc->flags & FXP_FLAG_82559_RXCSUM) != 0) reinit++; - } - if ((mask & IFCAP_TSO4) != 0 && - (if_getcapabilities(ifp) & IFCAP_TSO4) != 0) { - if_togglecapenable(ifp, IFCAP_TSO4); - if ((if_getcapenable(ifp) & IFCAP_TSO4) != 0) - if_sethwassistbits(ifp, CSUM_TSO, 0); - else - if_sethwassistbits(ifp, 0, CSUM_TSO); - } - if ((mask & IFCAP_WOL_MAGIC) != 0 && - (if_getcapabilities(ifp) & IFCAP_WOL_MAGIC) != 0) - if_togglecapenable(ifp, IFCAP_WOL_MAGIC); - if ((mask & IFCAP_VLAN_MTU) != 0 && - (if_getcapabilities(ifp) & IFCAP_VLAN_MTU) != 0) { - if_togglecapenable(ifp, IFCAP_VLAN_MTU); + if ((IFCAP_TSO4 & ifr->ifr_reqcap) != 0) + ifr->ifr_hwassist |= CSUM_TSO; + if ((IFCAP_VLAN_MTU & ifr->ifr_reqcap) != 0) { if (sc->revision != FXP_REV_82557) flag = FXP_FLAG_LONG_PKT_EN; else /* a hack to get long frames on the old chip */ flag = FXP_FLAG_SAVE_BAD; sc->flags ^= flag; - if (if_getflags(ifp) & IFF_UP) + if (sc->if_flags & IFF_UP) reinit++; } - if ((mask & IFCAP_VLAN_HWCSUM) != 0 && - (if_getcapabilities(ifp) & IFCAP_VLAN_HWCSUM) != 0) - if_togglecapenable(ifp, IFCAP_VLAN_HWCSUM); - if ((mask & IFCAP_VLAN_HWTSO) != 0 && - (if_getcapabilities(ifp) & IFCAP_VLAN_HWTSO) != 0) - if_togglecapenable(ifp, IFCAP_VLAN_HWTSO); - if ((mask & IFCAP_VLAN_HWTAGGING) != 0 && - (if_getcapabilities(ifp) & IFCAP_VLAN_HWTAGGING) != 0) { - if_togglecapenable(ifp, IFCAP_VLAN_HWTAGGING); - if ((if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING) == 0) - if_setcapenablebit(ifp, 0, IFCAP_VLAN_HWTSO | - IFCAP_VLAN_HWCSUM); + if ((mask & IFCAP_VLAN_HWTAGGING) != 0) reinit++; - } - if (reinit > 0 && - (if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) { - if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING); - fxp_init_body(sc, 0); + if (reinit > 0 && (sc->flags & FXP_FLAG_RUNNING) != 0) { + sc->flags &= ~FXP_FLAG_RUNNING; + fxp_init(sc, 0); } FXP_UNLOCK(sc); - if_vlancap(ifp); break; default: - error = ether_ioctl(ifp, command, data); + error = EOPNOTSUPP; } return (error); } +static void +fxp_setup_maddr(void *arg, struct sockaddr *maddr) +{ + struct sockaddr_dl *sdl = (struct sockaddr_dl *)maddr; + struct fxp_softc *sc = arg; + struct fxp_cb_mcs *mcsp = sc->mcsp; + + if (sdl->sdl_family != AF_LINK) + return; + + if (mcsp->mc_cnt < MAXMCADDR) + bcopy(LLADDR(sdl), mcsp->mc_addr[mcsp->mc_cnt * ETHER_ADDR_LEN], + ETHER_ADDR_LEN); + mcsp->mc_cnt++; +} + /* * Fill in the multicast address list and return number of entries. */ -static int +static void fxp_mc_addrs(struct fxp_softc *sc) { struct fxp_cb_mcs *mcsp = sc->mcsp; - if_t ifp = sc->ifp; - int nmcasts = 0; - if ((if_getflags(ifp) & IFF_ALLMULTI) == 0) { - if_maddr_rlock(ifp); - if_setupmultiaddr(ifp, mcsp->mc_addr, &nmcasts, MAXMCADDR); - if (nmcasts >= MAXMCADDR) { - if_setflagbits(ifp, IFF_ALLMULTI, 0); - nmcasts = 0; + FXP_LOCK_ASSERT(sc, MA_OWNED); + + mcsp->mc_cnt = 0; + if ((sc->if_flags & IFF_ALLMULTI) == 0) { + if_foreach_maddr(sc->ifp, fxp_setup_maddr, sc); + if (mcsp->mc_cnt > MAXMCADDR) { + /* + * XXXGL: note that flag isn't propagated to + * the interface layer, but that is okay. + */ + sc->if_flags |= IFF_ALLMULTI; + mcsp->mc_cnt = 0; } - if_maddr_runlock(ifp); } - mcsp->mc_cnt = htole16(nmcasts * ETHER_ADDR_LEN); - return (nmcasts); + mcsp->mc_cnt = htole16(mcsp->mc_cnt * ETHER_ADDR_LEN); } /* Modified: projects/ifnet/sys/dev/fxp/if_fxpvar.h ============================================================================== --- projects/ifnet/sys/dev/fxp/if_fxpvar.h Tue Apr 7 06:10:12 2015 (r281189) +++ projects/ifnet/sys/dev/fxp/if_fxpvar.h Tue Apr 7 06:11:57 2015 (r281190) @@ -217,7 +217,8 @@ struct fxp_softc { int cu_resume_bug; int revision; int flags; - int if_flags; + uint32_t if_flags; + uint32_t if_capenable; uint8_t rfa_size; uint32_t tx_cmd; uint16_t eeprom[256]; @@ -239,6 +240,7 @@ struct fxp_softc { #define FXP_FLAG_WOL 0x4000 /* WOL active */ #define FXP_FLAG_RXBUG 0x8000 /* Rx lock-up bug */ #define FXP_FLAG_NO_UCODE 0x10000 /* ucode is not applicable */ +#define FXP_FLAG_RUNNING 0x20000 /* Macros to ease CSR access. */ #define CSR_READ_1(sc, reg) bus_read_1(sc->fxp_res[0], reg) Modified: projects/ifnet/sys/dev/fxp/inphy.c ============================================================================== --- projects/ifnet/sys/dev/fxp/inphy.c Tue Apr 7 06:10:12 2015 (r281189) +++ projects/ifnet/sys/dev/fxp/inphy.c Tue Apr 7 06:11:57 2015 (r281190) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include @@ -119,12 +118,6 @@ inphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((if_getflags(mii->mii_ifp) & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/i386/conf/IFNET ============================================================================== --- projects/ifnet/sys/i386/conf/IFNET Tue Apr 7 06:10:12 2015 (r281189) +++ projects/ifnet/sys/i386/conf/IFNET Tue Apr 7 06:11:57 2015 (r281190) @@ -35,7 +35,6 @@ nodevice txp nodevice vmx nodevice wpi nodevice dc -nodevice fxp nodevice jme nodevice ale nodevice age From owner-svn-src-projects@FreeBSD.ORG Tue Apr 7 06:17:36 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4533AFD4; Tue, 7 Apr 2015 06:17:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 16E226B6; Tue, 7 Apr 2015 06:17:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t376HZol025118; Tue, 7 Apr 2015 06:17:35 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t376HZLo025117; Tue, 7 Apr 2015 06:17:35 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504070617.t376HZLo025117@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 7 Apr 2015 06:17:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281191 - projects/ifnet/sys/net X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2015 06:17:36 -0000 Author: glebius Date: Tue Apr 7 06:17:34 2015 New Revision: 281191 URL: https://svnweb.freebsd.org/changeset/base/281191 Log: Make if_var.h a kernel-only include. Ideally the header should #error, but since FreeBSD 3.0 we have taught many third party applications to always include if_var.h along with if.h on FreeBSD, thus #error lives under BURN_BRIDGES. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/ifnet/sys/net/if_var.h Modified: projects/ifnet/sys/net/if_var.h ============================================================================== --- projects/ifnet/sys/net/if_var.h Tue Apr 7 06:11:57 2015 (r281190) +++ projects/ifnet/sys/net/if_var.h Tue Apr 7 06:17:34 2015 (r281191) @@ -32,6 +32,11 @@ #ifndef _NET_IF_VAR_H_ #define _NET_IF_VAR_H_ +#ifndef _KERNEL +#ifdef BURN_BRIDGES +#error "no user-servicable parts inside" +#endif +#else struct rtentry; /* ifa_rtrequest */ struct rt_addrinfo; /* ifa_rtrequest */ @@ -41,11 +46,9 @@ struct ifvlantrunk; struct ifmedia; struct netmap_adapter; -#ifdef _KERNEL #include /* ifqueue only? */ #include #include -#endif /* _KERNEL */ #include #include /* XXX */ #include /* struct ifqueue */ @@ -59,10 +62,8 @@ TAILQ_HEAD(ifaddrhead, ifaddr); /* insta TAILQ_HEAD(ifmultihead, ifmultiaddr); TAILQ_HEAD(ifgrouphead, ifg_group); -#ifdef _KERNEL VNET_DECLARE(struct pfil_head, link_pfil_hook); /* packet filter hooks */ #define V_link_pfil_hook VNET(link_pfil_hook) -#endif /* _KERNEL */ typedef void (*iftype_attach_t)(if_t ifp, struct if_attach_args *args); typedef void (*iftype_detach_t)(if_t ifp); @@ -202,7 +203,6 @@ struct ifnet { #define IF_ADDR_LOCK_ASSERT(ifp) IF_LOCK_ASSERT(ifp) #define IF_ADDR_WLOCK_ASSERT(ifp) IF_WLOCK_ASSERT(ifp) -#ifdef _KERNEL #ifdef _SYS_EVENTHANDLER_H_ /* interface link layer address change event */ typedef void (*iflladdr_event_handler_t)(void *, struct ifnet *); From owner-svn-src-projects@FreeBSD.ORG Tue Apr 7 06:25:35 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 10CC44D0; Tue, 7 Apr 2015 06:25:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 ED5317EA; Tue, 7 Apr 2015 06:25:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t376PYk0029663; Tue, 7 Apr 2015 06:25:34 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t376PUxm029633; Tue, 7 Apr 2015 06:25:30 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504070625.t376PUxm029633@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 7 Apr 2015 06:25:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281193 - in projects/ifnet: sys/boot/forth sys/contrib/ipfilter/netinet sys/dev/usb sys/dev/usb/net sys/vm usr.bin/lockf usr.bin/netstat usr.bin/sort X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2015 06:25:35 -0000 Author: glebius Date: Tue Apr 7 06:25:29 2015 New Revision: 281193 URL: https://svnweb.freebsd.org/changeset/base/281193 Log: Merge head r257698 through r281192. Modified: projects/ifnet/sys/boot/forth/loader.4th projects/ifnet/sys/boot/forth/logo-beastie.4th projects/ifnet/sys/boot/forth/logo-orb.4th projects/ifnet/sys/boot/forth/menu.4th projects/ifnet/sys/boot/forth/menu.rc projects/ifnet/sys/boot/forth/version.4th projects/ifnet/sys/contrib/ipfilter/netinet/ip_compat.h projects/ifnet/sys/dev/usb/net/if_axge.c projects/ifnet/sys/dev/usb/usbdevs projects/ifnet/sys/vm/vm_pageout.c projects/ifnet/usr.bin/lockf/lockf.1 projects/ifnet/usr.bin/netstat/netstat.1 projects/ifnet/usr.bin/netstat/route.c projects/ifnet/usr.bin/sort/bwstring.c projects/ifnet/usr.bin/sort/file.c projects/ifnet/usr.bin/sort/file.h projects/ifnet/usr.bin/sort/sort.c Directory Properties: projects/ifnet/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/boot/ (props changed) projects/ifnet/sys/contrib/ipfilter/ (props changed) Modified: projects/ifnet/sys/boot/forth/loader.4th ============================================================================== --- projects/ifnet/sys/boot/forth/loader.4th Tue Apr 7 06:22:22 2015 (r281192) +++ projects/ifnet/sys/boot/forth/loader.4th Tue Apr 7 06:25:29 2015 (r281193) @@ -53,7 +53,7 @@ only forth definitions loader_color? dup ( -- bool bool ) if 7 fg 4 bg then ." Booting..." - if me then + if escc ." 0m" then cr ; Modified: projects/ifnet/sys/boot/forth/logo-beastie.4th ============================================================================== --- projects/ifnet/sys/boot/forth/logo-beastie.4th Tue Apr 7 06:22:22 2015 (r281192) +++ projects/ifnet/sys/boot/forth/logo-beastie.4th Tue Apr 7 06:25:29 2015 (r281193) @@ -40,11 +40,11 @@ s" @[31m, ," logo+ s" /( )`" logo+ s" \ \___ / |" logo+ - s" /- @[m_@[31m `-/ '" logo+ - s" (@[m/\/ \@[31m \ /\" logo+ - s" @[m/ / |@[31m ` \" logo+ - s" @[34mO O @[m) @[31m/ |" logo+ - s" @[m`-^--'@[31m`< '" logo+ + s" /- @[37m_@[31m `-/ '" logo+ + s" (@[37m/\/ \@[31m \ /\" logo+ + s" @[37m/ / |@[31m ` \" logo+ + s" @[34mO O @[37m) @[31m/ |" logo+ + s" @[37m`-^--'@[31m`< '" logo+ s" (_.) _ ) /" logo+ s" `.___/` /" logo+ s" `-----' /" logo+ @@ -55,7 +55,7 @@ s" \ / /\" logo+ s" @[36m______@[31m( (_ / \______/" logo+ s" @[36m,' ,-----' |" logo+ - s" `--{__________)@[m" logo+ + s" `--{__________)@[37m" logo+ 2drop ; Modified: projects/ifnet/sys/boot/forth/logo-orb.4th ============================================================================== --- projects/ifnet/sys/boot/forth/logo-orb.4th Tue Apr 7 06:22:22 2015 (r281192) +++ projects/ifnet/sys/boot/forth/logo-orb.4th Tue Apr 7 06:25:29 2015 (r281193) @@ -49,7 +49,7 @@ s" -- @[31;1m-.@[31m" logo+ s" `:` @[31;1m`:`" logo+ s" @[31;1m.-- `--." logo+ - s" .---.....----.@[m" logo+ + s" .---.....----.@[37m" logo+ 2drop ; Modified: projects/ifnet/sys/boot/forth/menu.4th ============================================================================== --- projects/ifnet/sys/boot/forth/menu.4th Tue Apr 7 06:22:22 2015 (r281192) +++ projects/ifnet/sys/boot/forth/menu.4th Tue Apr 7 06:25:29 2015 (r281193) @@ -206,6 +206,8 @@ also menu-infrastructure definitions \ : printmenuitem ( menu_item_str -- ascii_keycode ) + loader_color? if [char] ^ escc! then + menurow dup @ 1+ swap ! ( increment menurow ) menuidx dup @ 1+ swap ! ( increment menuidx ) @@ -219,7 +221,7 @@ also menu-infrastructure definitions loader_color? dup ( -- bool bool ) if b then menuidx @ . - if me then + if 7 fg then \ Move the cursor forward 1 column dup menuX @ 1+ swap at-xy Modified: projects/ifnet/sys/boot/forth/menu.rc ============================================================================== --- projects/ifnet/sys/boot/forth/menu.rc Tue Apr 7 06:22:22 2015 (r281192) +++ projects/ifnet/sys/boot/forth/menu.rc Tue Apr 7 06:25:29 2015 (r281193) @@ -17,6 +17,7 @@ menu-init \ initialize the menu area \ Initialize main menu constructs (see `menu.4th') \ NOTE: To use `non-ansi' variants, add `loader_color=0' to loader.conf(5) +\ NOTE: ANSI variants can use `^' in place of literal `Esc' (ASCII 27) \ \ MAIN MENU @@ -28,22 +29,22 @@ set mainmenu_init[1]="init_boot" set mainmenu_caption[1]="Boot Multi User [Enter]" set maintoggled_text[1]="Boot [S]ingle User [Enter]" set mainmenu_command[1]="boot" -set mainansi_caption[1]="Boot Multi User [Enter]" -set maintoggled_ansi[1]="Boot Single User [Enter]" +set mainansi_caption[1]="^[1mB^[37moot Multi User ^[1m[Enter]^[37m" +set maintoggled_ansi[1]="Boot ^[1mS^[37mingle User ^[1m[Enter]^[37m" \ keycode set by init_boot set mainmenu_init[2]="init_altboot" set mainmenu_caption[2]="Boot [S]ingle User" set maintoggled_text[2]="Boot [M]ulti User" set mainmenu_command[2]="altboot" -set mainansi_caption[2]="Boot Single User" -set maintoggled_ansi[2]="Boot Multi User" +set mainansi_caption[2]="Boot ^[1mS^[37mingle User" +set maintoggled_ansi[2]="Boot ^[1mM^[37multi User" \ keycode set by init_altboot set mainmenu_caption[3]="[Esc]ape to loader prompt" set mainmenu_command[3]="goto_prompt" set mainmenu_keycode[3]=27 -set mainansi_caption[3]="Escape to loader prompt" +set mainansi_caption[3]="^[1mEsc^[37mape to loader prompt" \ Enable built-in "Reboot" trailing menuitem \ NOTE: appears before menu_options if configured @@ -62,7 +63,7 @@ set mainmenu_keycode[5]=107 set mainmenu_caption[6]="Configure Boot [O]ptions..." set mainmenu_command[6]="2 goto_menu" set mainmenu_keycode[6]=111 -set mainansi_caption[6]="Configure Boot Options..." +set mainansi_caption[6]="Configure Boot ^[1mO^[37mptions..." \ \ BOOT OPTIONS MENU @@ -73,12 +74,12 @@ set menuset_name2="options" set optionsmenu_caption[1]="Back to Main Menu [Backspace]" set optionsmenu_command[1]="1 goto_menu" set optionsmenu_keycode[1]=8 -set optionsansi_caption[1]="Back to Main Menu [Backspace]" +set optionsansi_caption[1]="Back to Main Menu ^[1m[Backspace]^[37m" set optionsmenu_caption[2]="Load System [D]efaults" set optionsmenu_command[2]="set_default_boot_options" set optionsmenu_keycode[2]=100 -set optionsansi_caption[2]="Load System Defaults" +set optionsansi_caption[2]="Load System ^[1mD^[37mefaults" set optionsmenu_options=3 set optionsmenu_optionstext="Boot Options:" @@ -88,32 +89,32 @@ set optionsmenu_caption[3]="[A]CPI Suppo set optionstoggled_text[3]="[A]CPI Support On" set optionsmenu_command[3]="toggle_acpi" set optionsmenu_keycode[3]=97 -set optionsansi_caption[3]="ACPI Support Off" -set optionstoggled_ansi[3]="ACPI Support On" +set optionsansi_caption[3]="^[1mA^[37mCPI Support ^[34;1mOff^[37m" +set optionstoggled_ansi[3]="^[1mA^[37mCPI Support ^[32;7mOn^[0;37m" set optionsmenu_init[4]="init_safemode" set optionsmenu_caption[4]="Safe [M]ode... off" set optionstoggled_text[4]="Safe [M]ode... On" set optionsmenu_command[4]="toggle_safemode" set optionsmenu_keycode[4]=109 -set optionsansi_caption[4]="Safe Mode... Off" -set optionstoggled_ansi[4]="Safe Mode... On" +set optionsansi_caption[4]="Safe ^[1mM^[37mode... ^[34;1mOff^[37m" +set optionstoggled_ansi[4]="Safe ^[1mM^[37mode... ^[32;7mOn^[0;37m" set optionsmenu_init[5]="init_singleuser" set optionsmenu_caption[5]="[S]ingle User. off" set optionstoggled_text[5]="[S]ingle User. On" set optionsmenu_command[5]="toggle_singleuser" set optionsmenu_keycode[5]=115 -set optionsansi_caption[5]="Single User. Off" -set optionstoggled_ansi[5]="Single User. On" +set optionsansi_caption[5]="^[1mS^[37mingle User. ^[34;1mOff^[37m" +set optionstoggled_ansi[5]="^[1mS^[37mingle User. ^[32;7mOn^[0;37m" set optionsmenu_init[6]="init_verbose" set optionsmenu_caption[6]="[V]erbose..... off" set optionstoggled_text[6]="[V]erbose..... On" set optionsmenu_command[6]="toggle_verbose" set optionsmenu_keycode[6]=118 -set optionsansi_caption[6]="Verbose..... Off" -set optionstoggled_ansi[6]="Verbose..... On" +set optionsansi_caption[6]="^[1mV^[37merbose..... ^[34;1mOff^[37m" +set optionstoggled_ansi[6]="^[1mV^[37merbose..... ^[32;7mOn^[0;37m" \ Enable automatic booting (add ``autoboot_delay=N'' to loader.conf(5) to \ customize the timeout; default is 10-seconds) Modified: projects/ifnet/sys/boot/forth/version.4th ============================================================================== --- projects/ifnet/sys/boot/forth/version.4th Tue Apr 7 06:22:22 2015 (r281192) +++ projects/ifnet/sys/boot/forth/version.4th Tue Apr 7 06:25:29 2015 (r281193) @@ -88,7 +88,7 @@ only forth definitions also version-proc loader_color? dup ( -- bool bool ) if 6 fg then type - if me then + if 7 fg then ; only forth definitions Modified: projects/ifnet/sys/contrib/ipfilter/netinet/ip_compat.h ============================================================================== --- projects/ifnet/sys/contrib/ipfilter/netinet/ip_compat.h Tue Apr 7 06:22:22 2015 (r281192) +++ projects/ifnet/sys/contrib/ipfilter/netinet/ip_compat.h Tue Apr 7 06:25:29 2015 (r281193) @@ -153,7 +153,8 @@ struct ether_addr { # include # define KMUTEX_T struct mtx # define KRWLOCK_T struct rwlock -# ifdef _KERNEL + +#ifdef _KERNEL # define READ_ENTER(x) rw_rlock(&(x)->ipf_lk) # define WRITE_ENTER(x) rw_wlock(&(x)->ipf_lk) # define MUTEX_DOWNGRADE(x) rw_downgrade(&(x)->ipf_lk) @@ -165,16 +166,7 @@ struct ether_addr { else \ rw_runlock(&(x)->ipf_lk); \ } while (0) -# endif - # include -# define IFNAME(x) ((struct ifnet *)x)->if_xname -# define COPYIFNAME(v, x, b) \ - (void) strncpy(b, \ - ((struct ifnet *)x)->if_xname, \ - LIFNAMSIZ) - -# ifdef _KERNEL # define GETKTIME(x) microtime((struct timeval *)x) # include @@ -216,8 +208,28 @@ struct ether_addr { # define M_DUP(m) m_dup(m, M_NOWAIT) # define IPF_PANIC(x,y) if (x) { printf y; panic("ipf_panic"); } typedef struct mbuf mb_t; -# endif /* _KERNEL */ +#else /* !_KERNEL */ +#ifndef _NET_IF_VAR_H_ +/* + * Userland emulation of struct ifnet. + */ +struct route; +struct mbuf; +struct ifnet { + char if_xname[IFNAMSIZ]; + TAILQ_HEAD(, ifaddr) if_addrlist; + int (*if_output)(struct ifnet *, struct mbuf *, + const struct sockaddr *, struct route *); +}; +#endif /* _NET_IF_VAR_H_ */ +#endif /* _KERNEL */ + +# define IFNAME(x) ((struct ifnet *)x)->if_xname +# define COPYIFNAME(v, x, b) \ + (void) strncpy(b, \ + ((struct ifnet *)x)->if_xname, \ + LIFNAMSIZ) typedef u_long ioctlcmd_t; typedef struct uio uio_t; Modified: projects/ifnet/sys/dev/usb/net/if_axge.c ============================================================================== --- projects/ifnet/sys/dev/usb/net/if_axge.c Tue Apr 7 06:22:22 2015 (r281192) +++ projects/ifnet/sys/dev/usb/net/if_axge.c Tue Apr 7 06:25:29 2015 (r281193) @@ -67,6 +67,7 @@ static const STRUCT_USB_HOST_ID axge_dev AXGE_DEV(ASIX, AX88178A), AXGE_DEV(ASIX, AX88179), AXGE_DEV(DLINK, DUB1312), + AXGE_DEV(LENOVO, GIGALAN), AXGE_DEV(SITECOMEU, LN032), #undef AXGE_DEV }; Modified: projects/ifnet/sys/dev/usb/usbdevs ============================================================================== --- projects/ifnet/sys/dev/usb/usbdevs Tue Apr 7 06:22:22 2015 (r281192) +++ projects/ifnet/sys/dev/usb/usbdevs Tue Apr 7 06:25:29 2015 (r281193) @@ -2627,6 +2627,7 @@ product LARSENBRUSGAARD ALTITRACK 0x0001 product LEADTEK 9531 0x2101 9531 GPS /* Lenovo products */ +product LENOVO GIGALAN 0x304b USB 3.0 Ethernet product LENOVO ETHERNET 0x7203 USB 2.0 Ethernet /* Lexar products */ Modified: projects/ifnet/sys/vm/vm_pageout.c ============================================================================== --- projects/ifnet/sys/vm/vm_pageout.c Tue Apr 7 06:22:22 2015 (r281192) +++ projects/ifnet/sys/vm/vm_pageout.c Tue Apr 7 06:25:29 2015 (r281193) @@ -118,7 +118,8 @@ __FBSDID("$FreeBSD$"); /* the kernel process "vm_pageout"*/ static void vm_pageout(void); static void vm_pageout_init(void); -static int vm_pageout_clean(vm_page_t); +static int vm_pageout_clean(vm_page_t m); +static int vm_pageout_cluster(vm_page_t m); static void vm_pageout_scan(struct vm_domain *vmd, int pass); static void vm_pageout_mightbe_oom(struct vm_domain *vmd, int pass); @@ -347,7 +348,7 @@ vm_pageout_page_lock(vm_page_t m, vm_pag * late and we cannot do anything that will mess with the page. */ static int -vm_pageout_clean(vm_page_t m) +vm_pageout_cluster(vm_page_t m) { vm_object_t object; vm_page_t mc[2*vm_pageout_page_count], pb, ps; @@ -906,6 +907,115 @@ vm_pageout_map_deactivate_pages(map, des #endif /* !defined(NO_SWAPPING) */ /* + * Attempt to acquire all of the necessary locks to launder a page and + * then call through the clustering layer to PUTPAGES. Wait a short + * time for a vnode lock. + * + * Requires the page and object lock on entry, releases both before return. + * Returns 0 on success and an errno otherwise. + */ +static int +vm_pageout_clean(vm_page_t m) +{ + struct vnode *vp; + struct mount *mp; + vm_object_t object; + vm_pindex_t pindex; + int error, lockmode; + + vm_page_assert_locked(m); + object = m->object; + VM_OBJECT_ASSERT_WLOCKED(object); + error = 0; + vp = NULL; + mp = NULL; + + /* + * The object is already known NOT to be dead. It + * is possible for the vget() to block the whole + * pageout daemon, but the new low-memory handling + * code should prevent it. + * + * We can't wait forever for the vnode lock, we might + * deadlock due to a vn_read() getting stuck in + * vm_wait while holding this vnode. We skip the + * vnode if we can't get it in a reasonable amount + * of time. + */ + if (object->type == OBJT_VNODE) { + vm_page_unlock(m); + vp = object->handle; + if (vp->v_type == VREG && + vn_start_write(vp, &mp, V_NOWAIT) != 0) { + mp = NULL; + error = EDEADLK; + goto unlock_all; + } + KASSERT(mp != NULL, + ("vp %p with NULL v_mount", vp)); + vm_object_reference_locked(object); + pindex = m->pindex; + VM_OBJECT_WUNLOCK(object); + lockmode = MNT_SHARED_WRITES(vp->v_mount) ? + LK_SHARED : LK_EXCLUSIVE; + if (vget(vp, lockmode | LK_TIMELOCK, curthread)) { + vp = NULL; + error = EDEADLK; + goto unlock_mp; + } + VM_OBJECT_WLOCK(object); + vm_page_lock(m); + /* + * While the object and page were unlocked, the page + * may have been: + * (1) moved to a different queue, + * (2) reallocated to a different object, + * (3) reallocated to a different offset, or + * (4) cleaned. + */ + if (m->queue != PQ_INACTIVE || m->object != object || + m->pindex != pindex || m->dirty == 0) { + vm_page_unlock(m); + error = ENXIO; + goto unlock_all; + } + + /* + * The page may have been busied or held while the object + * and page locks were released. + */ + if (vm_page_busied(m) || m->hold_count != 0) { + vm_page_unlock(m); + error = EBUSY; + goto unlock_all; + } + } + + /* + * If a page is dirty, then it is either being washed + * (but not yet cleaned) or it is still in the + * laundry. If it is still in the laundry, then we + * start the cleaning operation. + */ + if (vm_pageout_cluster(m) == 0) + error = EIO; + +unlock_all: + VM_OBJECT_WUNLOCK(object); + +unlock_mp: + vm_page_lock_assert(m, MA_NOTOWNED); + if (mp != NULL) { + if (vp != NULL) + vput(vp); + vm_object_deallocate(object); + vn_finished_write(mp); + } + + return (error); +} + +/* * vm_pageout_scan does the dirty work for the pageout daemon. * * pass 0 - Update active LRU/deactivate pages @@ -921,7 +1031,6 @@ vm_pageout_scan(struct vm_domain *vmd, i int act_delta, addl_page_shortage, deficit, maxscan, page_shortage; int vnodes_skipped = 0; int maxlaunder; - int lockmode; boolean_t queues_locked; /* @@ -1155,9 +1264,7 @@ vm_pageout_scan(struct vm_domain *vmd, i * on the inactive queue, we may have to go all out. */ int swap_pageouts_ok; - struct vnode *vp = NULL; - struct mount *mp = NULL; - vm_pindex_t pindex; + int error; if ((object->type != OBJT_SWAP) && (object->type != OBJT_DEFAULT)) { swap_pageouts_ok = 1; @@ -1180,124 +1287,20 @@ vm_pageout_scan(struct vm_domain *vmd, i vm_page_requeue_locked(m); goto relock_queues; } - + error = vm_pageout_clean(m); /* - * The object is already known NOT to be dead. It - * is possible for the vget() to block the whole - * pageout daemon, but the new low-memory handling - * code should prevent it. - * - * The previous code skipped locked vnodes and, worse, - * reordered pages in the queue. This results in - * completely non-deterministic operation and, on a - * busy system, can lead to extremely non-optimal - * pageouts. For example, it can cause clean pages - * to be freed and dirty pages to be moved to the end - * of the queue. Since dirty pages are also moved to - * the end of the queue once-cleaned, this gives - * way too large a weighting to deferring the freeing - * of dirty pages. - * - * We can't wait forever for the vnode lock, we might - * deadlock due to a vn_read() getting stuck in - * vm_wait while holding this vnode. We skip the - * vnode if we can't get it in a reasonable amount - * of time. - */ - if (object->type == OBJT_VNODE) { - vm_page_unlock(m); - vp = object->handle; - if (vp->v_type == VREG && - vn_start_write(vp, &mp, V_NOWAIT) != 0) { - mp = NULL; - ++pageout_lock_miss; - if (object->flags & OBJ_MIGHTBEDIRTY) - vnodes_skipped++; - goto unlock_and_continue; - } - KASSERT(mp != NULL, - ("vp %p with NULL v_mount", vp)); - vm_object_reference_locked(object); - pindex = m->pindex; - VM_OBJECT_WUNLOCK(object); - lockmode = MNT_SHARED_WRITES(vp->v_mount) ? - LK_SHARED : LK_EXCLUSIVE; - if (vget(vp, lockmode | LK_TIMELOCK, - curthread)) { - VM_OBJECT_WLOCK(object); - ++pageout_lock_miss; - if (object->flags & OBJ_MIGHTBEDIRTY) - vnodes_skipped++; - vp = NULL; - goto unlock_and_continue; - } - VM_OBJECT_WLOCK(object); - vm_page_lock(m); - /* - * While the object and page were unlocked, - * the page may have been - * (1) moved to a different queue, - * (2) reallocated to a different object, - * (3) reallocated to a different offset, or - * (4) cleaned. - */ - if (m->queue != PQ_INACTIVE || - m->object != object || - m->pindex != pindex || - m->dirty == 0) { - vm_page_unlock(m); - if (object->flags & OBJ_MIGHTBEDIRTY) - vnodes_skipped++; - goto unlock_and_continue; - } - - /* - * The page may have been busied during the - * blocking in vget(). We don't move the - * page back onto the end of the queue so that - * statistics are more correct if we don't. - */ - if (vm_page_busied(m)) { - vm_page_unlock(m); - addl_page_shortage++; - goto unlock_and_continue; - } - - /* - * If the page has become held it might - * be undergoing I/O, so skip it - */ - if (m->hold_count != 0) { - vm_page_unlock(m); - addl_page_shortage++; - if (object->flags & OBJ_MIGHTBEDIRTY) - vnodes_skipped++; - goto unlock_and_continue; - } - } - - /* - * If a page is dirty, then it is either being washed - * (but not yet cleaned) or it is still in the - * laundry. If it is still in the laundry, then we - * start the cleaning operation. - * - * decrement page_shortage on success to account for + * Decrement page_shortage on success to account for * the (future) cleaned page. Otherwise we could wind * up laundering or cleaning too many pages. */ - if (vm_pageout_clean(m) != 0) { - --page_shortage; - --maxlaunder; - } -unlock_and_continue: - vm_page_lock_assert(m, MA_NOTOWNED); - VM_OBJECT_WUNLOCK(object); - if (mp != NULL) { - if (vp != NULL) - vput(vp); - vm_object_deallocate(object); - vn_finished_write(mp); + if (error == 0) { + page_shortage--; + maxlaunder--; + } else if (error == EDEADLK) { + pageout_lock_miss++; + vnodes_skipped++; + } else if (error == EBUSY) { + addl_page_shortage++; } vm_page_lock_assert(m, MA_NOTOWNED); goto relock_queues; Modified: projects/ifnet/usr.bin/lockf/lockf.1 ============================================================================== --- projects/ifnet/usr.bin/lockf/lockf.1 Tue Apr 7 06:22:22 2015 (r281192) +++ projects/ifnet/usr.bin/lockf/lockf.1 Tue Apr 7 06:25:29 2015 (r281193) @@ -162,6 +162,7 @@ but may have been signaled or stopped. .El .Sh SEE ALSO .Xr flock 2 , +.Xr lockf 3 , .Xr sysexits 3 .Sh HISTORY A Modified: projects/ifnet/usr.bin/netstat/netstat.1 ============================================================================== --- projects/ifnet/usr.bin/netstat/netstat.1 Tue Apr 7 06:22:22 2015 (r281192) +++ projects/ifnet/usr.bin/netstat/netstat.1 Tue Apr 7 06:25:29 2015 (r281193) @@ -78,11 +78,9 @@ .Op Fl I Ar interface .It Nm Fl r .Op Fl -libxo -.Op Fl 46AnW +.Op Fl 46nW .Op Fl F Ar fibnum .Op Fl f Ar address_family -.Op Fl M Ar core -.Op Fl N Ar system .It Nm Fl rs .Op Fl -libxo .Op Fl s @@ -581,9 +579,6 @@ See Show IPv6 only. See .Sx GENERAL OPTIONS . -.It Fl A -Show the contents of the internal Patricia tree -structures; used for debugging. .It Fl n Do not resolve numeric addresses and port numbers to names. See Modified: projects/ifnet/usr.bin/netstat/route.c ============================================================================== --- projects/ifnet/usr.bin/netstat/route.c Tue Apr 7 06:22:22 2015 (r281192) +++ projects/ifnet/usr.bin/netstat/route.c Tue Apr 7 06:25:29 2015 (r281193) @@ -40,22 +40,18 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include -#include #include #include -#include -#define _WANT_RTENTRY #include #include #include -#include - #include #include #include @@ -72,8 +68,6 @@ __FBSDID("$FreeBSD$"); #include #include "netstat.h" -#define kget(p, d) (kread((u_long)(p), (char *)&(d), sizeof (d))) - /* * Definitions for showing gateway flags. */ @@ -108,9 +102,7 @@ struct bits { static struct nlist rl[] = { #define N_RTSTAT 0 { .n_name = "_rtstat" }, -#define N_RTREE 1 - { .n_name = "_rt_tables"}, -#define N_RTTRASH 2 +#define N_RTTRASH 1 { .n_name = "_rttrash" }, { .n_name = NULL }, }; @@ -121,33 +113,14 @@ typedef union { u_short u_data[128]; } sa_u; -static sa_u pt_u; - struct ifmap_entry { char ifname[IFNAMSIZ]; }; - static struct ifmap_entry *ifmap; static int ifmap_size; - -int do_rtent = 0; -struct rtentry rtentry; -struct radix_node rnode; -struct radix_mask rmask; - -int NewTree = 1; - struct timespec uptime; -static struct sockaddr *kgetsa(struct sockaddr *); -static void size_cols(int ef, struct radix_node *rn); -static void size_cols_tree(struct radix_node *rn); -static void size_cols_rtentry(struct rtentry *rt); -static void p_rtnode_kvm(void); static void p_rtable_sysctl(int, int); -static void p_rtable_kvm(int, int ); -static void p_rtree_kvm(const char *name, struct radix_node *); -static void p_rtentry_kvm(const char *name, struct rtentry *); static void p_rtentry_sysctl(const char *name, struct rt_msghdr *); static void p_sockaddr(const char *name, struct sockaddr *, struct sockaddr *, int, int); @@ -166,6 +139,9 @@ routepr(int fibnum, int af) size_t intsize; int numfibs; + if (live == 0) + return; + intsize = sizeof(int); if (fibnum == -1 && sysctlbyname("net.my_fibnum", &fibnum, &intsize, NULL, 0) == -1) @@ -187,11 +163,7 @@ routepr(int fibnum, int af) if (fibnum) xo_emit(" ({L:fib}: {:fib/%d})", fibnum); xo_emit("\n"); - - if (Aflag == 0 && live != 0 && NewTree) - p_rtable_sysctl(fibnum, af); - else - p_rtable_kvm(fibnum, af); + p_rtable_sysctl(fibnum, af); xo_close_container("route-information"); } @@ -253,100 +225,6 @@ static int wid_mtu; static int wid_if; static int wid_expire; -static void -size_cols(int ef, struct radix_node *rn) -{ - wid_dst = WID_DST_DEFAULT(ef); - wid_gw = WID_GW_DEFAULT(ef); - wid_flags = 6; - wid_pksent = 8; - wid_mtu = 6; - wid_if = WID_IF_DEFAULT(ef); - wid_expire = 6; - - if (Wflag && rn != NULL) - size_cols_tree(rn); -} - -static void -size_cols_tree(struct radix_node *rn) -{ -again: - if (kget(rn, rnode) != 0) - return; - if (!(rnode.rn_flags & RNF_ACTIVE)) - return; - if (rnode.rn_bit < 0) { - if ((rnode.rn_flags & RNF_ROOT) == 0) { - if (kget(rn, rtentry) != 0) - return; - size_cols_rtentry(&rtentry); - } - if ((rn = rnode.rn_dupedkey)) - goto again; - } else { - rn = rnode.rn_right; - size_cols_tree(rnode.rn_left); - size_cols_tree(rn); - } -} - -static void -size_cols_rtentry(struct rtentry *rt) -{ - static struct ifnet ifnet, *lastif; - static char buffer[100]; - const char *bp; - struct sockaddr *sa; - sa_u addr, mask; - int len; - - bzero(&addr, sizeof(addr)); - if ((sa = kgetsa(rt_key(rt)))) - bcopy(sa, &addr, sa->sa_len); - bzero(&mask, sizeof(mask)); - if (rt_mask(rt) && (sa = kgetsa(rt_mask(rt)))) - bcopy(sa, &mask, sa->sa_len); - bp = fmt_sockaddr(&addr.u_sa, &mask.u_sa, rt->rt_flags); - len = strlen(bp); - wid_dst = MAX(len, wid_dst); - - bp = fmt_sockaddr(kgetsa(rt->rt_gateway), NULL, RTF_HOST); - len = strlen(bp); - wid_gw = MAX(len, wid_gw); - - bp = fmt_flags(rt->rt_flags); - len = strlen(bp); - wid_flags = MAX(len, wid_flags); - - if (Wflag) { - len = snprintf(buffer, sizeof(buffer), "%ju", - (uintmax_t )kread_counter((u_long )rt->rt_pksent)); - wid_pksent = MAX(len, wid_pksent); - } - if (rt->rt_ifp) { - if (rt->rt_ifp != lastif) { - if (kget(rt->rt_ifp, ifnet) == 0) - len = strlen(ifnet.if_xname); - else - len = strlen("---"); - lastif = rt->rt_ifp; - wid_if = MAX(len, wid_if); - } - if (rt->rt_expire) { - time_t expire_time; - - if ((expire_time = - rt->rt_expire - uptime.tv_sec) > 0) { - len = snprintf(buffer, sizeof(buffer), "%d", - (int)expire_time); - wid_expire = MAX(len, wid_expire); - } - } - } -} - - /* * Print header for routing table columns. */ @@ -377,210 +255,6 @@ pr_rthdr(int af1) } } -static struct sockaddr * -kgetsa(struct sockaddr *dst) -{ - - if (kget(dst, pt_u.u_sa) != 0) - return (NULL); - if (pt_u.u_sa.sa_len > sizeof (pt_u.u_sa)) - kread((u_long)dst, (char *)pt_u.u_data, pt_u.u_sa.sa_len); - return (&pt_u.u_sa); -} - -/* - * Print kernel routing tables for given fib - * using debugging kvm(3) interface. - */ -static void -p_rtable_kvm(int fibnum, int af) -{ - struct radix_node_head **rnhp, *rnh, head; - struct radix_node_head **rt_tables; - u_long rtree; - int fam, af_size; - bool did_rt_family = false; - - kresolve_list(rl); - if ((rtree = rl[N_RTREE].n_value) == 0) { - xo_emit("rt_tables: symbol not in namelist\n"); - return; - } - - af_size = (AF_MAX + 1) * sizeof(struct radix_node_head *); - rt_tables = calloc(1, af_size); - if (rt_tables == NULL) - err(EX_OSERR, "memory allocation failed"); - - if (kread((u_long)(rtree), (char *)(rt_tables) + fibnum * af_size, - af_size) != 0) - err(EX_OSERR, "error retrieving radix pointers"); - xo_open_container("route-table"); - for (fam = 0; fam <= AF_MAX; fam++) { - int tmpfib; - - switch (fam) { - case AF_INET6: - case AF_INET: - tmpfib = fibnum; - break; - default: - tmpfib = 0; - } - rnhp = (struct radix_node_head **)*rt_tables; - /* Calculate the in-kernel address. */ - rnhp += tmpfib * (AF_MAX + 1) + fam; - /* Read the in kernel rhn pointer. */ - if (kget(rnhp, rnh) != 0) - continue; - if (rnh == NULL) - continue; - /* Read the rnh data. */ - if (kget(rnh, head) != 0) - continue; - if (fam == AF_UNSPEC) { - if (Aflag && af == 0) { - xo_emit("{T:Netmasks}:\n"); - xo_open_list("netmasks"); - p_rtree_kvm("netmasks", head.rnh_treetop); - xo_close_list("netmasks"); - } - } else if (af == AF_UNSPEC || af == fam) { - if (!did_rt_family) { - xo_open_list("rt-family"); - did_rt_family = true; - } - size_cols(fam, head.rnh_treetop); - xo_open_instance("rt-family"); - pr_family(fam); - do_rtent = 1; - xo_open_list("rt-entry"); - pr_rthdr(fam); - p_rtree_kvm("rt-entry", head.rnh_treetop); - xo_close_list("rt-entry"); - xo_close_instance("rt-family"); - } - } - if (did_rt_family) - xo_close_list("rt-family"); - xo_close_container("route-table"); - - free(rt_tables); -} - -/* - * Print given kernel radix tree using - * debugging kvm(3) interface. - */ -static void -p_rtree_kvm(const char *name, struct radix_node *rn) -{ - bool opened; - - opened = false; - -#define DOOPEN() do { \ - if (!opened) { xo_open_instance(name); opened = true; } \ - } while (0) -#define DOCLOSE() do { \ - if (opened) { opened = false; xo_close_instance(name); } \ - } while(0) - -again: - if (kget(rn, rnode) != 0) - return; - if (!(rnode.rn_flags & RNF_ACTIVE)) - return; - if (rnode.rn_bit < 0) { - if (Aflag) { - DOOPEN(); - xo_emit("{q:radix-node/%-8.8lx} ", (u_long)rn); - } - if (rnode.rn_flags & RNF_ROOT) { - if (Aflag) { - DOOPEN(); - xo_emit("({:root/root} node){L:/%s}", - rnode.rn_dupedkey ? " =>\n" : "\n"); - } - } else if (do_rtent) { - if (kget(rn, rtentry) == 0) { - DOOPEN(); - p_rtentry_kvm(name, &rtentry); - if (Aflag) { - DOOPEN(); - p_rtnode_kvm(); - DOCLOSE(); - } - } - } else { - DOOPEN(); - p_sockaddr("address", - kgetsa((struct sockaddr *)rnode.rn_key), - NULL, 0, 44); - xo_emit("\n"); - } - DOCLOSE(); - if ((rn = rnode.rn_dupedkey)) - goto again; - } else { - if (Aflag && do_rtent) { - DOOPEN(); - xo_emit("{q:radix-node/%-8.8lx} ", (u_long)rn); - p_rtnode_kvm(); - DOCLOSE(); - } - rn = rnode.rn_right; - p_rtree_kvm(name, rnode.rn_left); - p_rtree_kvm(name, rn); - } -} - -char nbuf[20]; - -static void -p_rtnode_kvm(void) -{ - struct radix_mask *rm = rnode.rn_mklist; - - if (rnode.rn_bit < 0) { - if (rnode.rn_mask) { - xo_emit("\t {L:mask} "); - p_sockaddr("netmask", - kgetsa((struct sockaddr *)rnode.rn_mask), - NULL, 0, -1); - } else if (rm == 0) - return; - } else { - xo_emit("{[:6}{:bit/(%d)}{]:} {q:left-node/%8.8lx} " - ": {q:right-node/%8.8lx}", rnode.rn_bit, - (u_long)rnode.rn_left, (u_long)rnode.rn_right); - } - while (rm) { - if (kget(rm, rmask) != 0) - break; - sprintf(nbuf, " %d refs, ", rmask.rm_refs); - xo_emit(" mk = {q:node/%8.8lx} \\{({:bit/%d}),{nbufs/%s}", - (u_long)rm, -1 - rmask.rm_bit, rmask.rm_refs ? nbuf : " "); - if (rmask.rm_flags & RNF_NORMAL) { - struct radix_node rnode_aux; - xo_emit(" <{:mode/normal}>, "); - if (kget(rmask.rm_leaf, rnode_aux) == 0) - p_sockaddr("netmask", - kgetsa(/*XXX*/(void *)rnode_aux.rn_mask), - NULL, 0, -1); - else - p_sockaddr(NULL, NULL, NULL, 0, -1); - } else - p_sockaddr("netmask", - kgetsa((struct sockaddr *)rmask.rm_mask), - NULL, 0, -1); - xo_emit("\\}"); - if ((rm = rmask.rm_mklist)) - xo_emit(" {D:->}"); - } - xo_emit("\n"); -} *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Apr 7 19:30:55 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CA78BE6F; Tue, 7 Apr 2015 19:30:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 B61A0880; Tue, 7 Apr 2015 19:30:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t37JUtBe007455; Tue, 7 Apr 2015 19:30:55 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t37JUtpP007454; Tue, 7 Apr 2015 19:30:55 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504071930.t37JUtpP007454@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 7 Apr 2015 19:30:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281222 - projects/ifnet/sys/net X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2015 19:30:55 -0000 Author: glebius Date: Tue Apr 7 19:30:54 2015 New Revision: 281222 URL: https://svnweb.freebsd.org/changeset/base/281222 Log: ifqmaxlen now unused. Modified: projects/ifnet/sys/net/if.c Modified: projects/ifnet/sys/net/if.c ============================================================================== --- projects/ifnet/sys/net/if.c Tue Apr 7 19:28:53 2015 (r281221) +++ projects/ifnet/sys/net/if.c Tue Apr 7 19:30:54 2015 (r281222) @@ -103,10 +103,6 @@ SYSCTL_NODE(_net, PF_LINK, link, CTLFLAG_RW, 0, "Link layers"); SYSCTL_NODE(_net_link, 0, generic, CTLFLAG_RW, 0, "Generic link-management"); -int ifqmaxlen = IFQ_MAXLEN; -SYSCTL_INT(_net_link, OID_AUTO, ifqmaxlen, CTLFLAG_RDTUN, - &ifqmaxlen, 0, "max send queue size"); - /* Log link state change events */ static int log_link_state_change = 1; From owner-svn-src-projects@FreeBSD.ORG Tue Apr 7 19:33:09 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 20116147; Tue, 7 Apr 2015 19:33:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 09996898; Tue, 7 Apr 2015 19:33:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t37JX9P4008343; Tue, 7 Apr 2015 19:33:09 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t37JX7E7008339; Tue, 7 Apr 2015 19:33:07 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504071933.t37JX7E7008339@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 7 Apr 2015 19:33:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281224 - in projects/ifnet/sys: amd64/conf dev/rl i386/conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2015 19:33:09 -0000 Author: glebius Date: Tue Apr 7 19:33:07 2015 New Revision: 281224 URL: https://svnweb.freebsd.org/changeset/base/281224 Log: Convert rl(4) to new KPI. Sponsored by: Nginx, Inc. Sponsored by: Netflix Modified: projects/ifnet/sys/amd64/conf/IFNET projects/ifnet/sys/dev/rl/if_rl.c projects/ifnet/sys/dev/rl/if_rlreg.h projects/ifnet/sys/i386/conf/IFNET Modified: projects/ifnet/sys/amd64/conf/IFNET ============================================================================== --- projects/ifnet/sys/amd64/conf/IFNET Tue Apr 7 19:31:29 2015 (r281223) +++ projects/ifnet/sys/amd64/conf/IFNET Tue Apr 7 19:33:07 2015 (r281224) @@ -40,7 +40,6 @@ nodevice ale nodevice age nodevice cas nodevice nge -nodevice rl nodevice alc nodevice sis nodevice sf Modified: projects/ifnet/sys/dev/rl/if_rl.c ============================================================================== --- projects/ifnet/sys/dev/rl/if_rl.c Tue Apr 7 19:31:29 2015 (r281223) +++ projects/ifnet/sys/dev/rl/if_rl.c Tue Apr 7 19:33:07 2015 (r281224) @@ -97,16 +97,12 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include -#include -#include #include #include #include -#include - -#include #include #include @@ -185,18 +181,16 @@ static void rl_eeprom_getword(struct rl_ static int rl_encap(struct rl_softc *, struct mbuf **); static int rl_list_tx_init(struct rl_softc *); static int rl_list_rx_init(struct rl_softc *); -static int rl_ifmedia_upd(struct ifnet *); -static void rl_ifmedia_sts(struct ifnet *, struct ifmediareq *); -static int rl_ioctl(struct ifnet *, u_long, caddr_t); +static int rl_ifmedia_upd(if_t); +static void rl_ifmedia_sts(if_t, struct ifmediareq *); +static int rl_ioctl(if_t, u_long, void *, struct thread *); static void rl_intr(void *); -static void rl_init(void *); -static void rl_init_locked(struct rl_softc *sc); +static void rl_init(struct rl_softc *sc); static int rl_miibus_readreg(device_t, int, int); static void rl_miibus_statchg(device_t); static int rl_miibus_writereg(device_t, int, int, int); #ifdef DEVICE_POLLING -static int rl_poll(struct ifnet *ifp, enum poll_cmd cmd, int count); -static int rl_poll_locked(struct ifnet *ifp, enum poll_cmd cmd, int count); +static int rl_poll(if_t, enum poll_cmd, int); #endif static int rl_probe(device_t); static void rl_read_eeprom(struct rl_softc *, uint8_t *, int, int, int); @@ -205,8 +199,8 @@ static int rl_resume(device_t); static int rl_rxeof(struct rl_softc *); static void rl_rxfilter(struct rl_softc *); static int rl_shutdown(device_t); -static void rl_start(struct ifnet *); -static void rl_start_locked(struct ifnet *); +static int rl_transmit(if_t, struct mbuf *); +static void rl_start(struct rl_softc *); static void rl_stop(struct rl_softc *); static int rl_suspend(device_t); static void rl_tick(void *); @@ -262,6 +256,19 @@ DRIVER_MODULE(rl, pci, rl_driver, rl_dev DRIVER_MODULE(rl, cardbus, rl_driver, rl_devclass, 0, 0); DRIVER_MODULE(miibus, rl, miibus_driver, miibus_devclass, 0, 0); +static struct ifdriver rl_ifdrv = { + .ifdrv_ops = { + .ifop_ioctl = rl_ioctl, + .ifop_transmit = rl_transmit, +#ifdef DEVICE_POLLING + .ifop_poll = rl_poll, +#endif + }, + .ifdrv_name = "rl", + .ifdrv_type = IFT_ETHER, + .ifdrv_maxqlen = IFQ_MAXLEN, +}; + #define EE_SET(x) \ CSR_WRITE_1(sc, RL_EECMD, \ CSR_READ_1(sc, RL_EECMD) | x) @@ -478,14 +485,14 @@ static void rl_miibus_statchg(device_t dev) { struct rl_softc *sc; - struct ifnet *ifp; + if_t ifp; struct mii_data *mii; sc = device_get_softc(dev); mii = device_get_softc(sc->rl_miibus); ifp = sc->rl_ifp; if (mii == NULL || ifp == NULL || - (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + (sc->rl_flags & RL_FLAG_RUNNING) == 0) return; sc->rl_flags &= ~RL_FLAG_LINK; @@ -511,12 +518,27 @@ rl_miibus_statchg(device_t dev) * Program the 64-bit multicast hash filter. */ static void +rl_hash_maddr(void *arg, struct sockaddr *maddr) +{ + struct sockaddr_dl *sdl = (struct sockaddr_dl *)maddr; + uint32_t *hashes = arg; + int h; + + if (sdl->sdl_family != AF_LINK) + return; + + h = ether_crc32_be(LLADDR(sdl), ETHER_ADDR_LEN) >> 26; + if (h < 32) + hashes[0] |= (1 << h); + else + hashes[1] |= (1 << (h - 32)); +} + +static void rl_rxfilter(struct rl_softc *sc) { - struct ifnet *ifp = sc->rl_ifp; - int h = 0; + if_t ifp = sc->rl_ifp; uint32_t hashes[2] = { 0, 0 }; - struct ifmultiaddr *ifma; uint32_t rxfilt; RL_LOCK_ASSERT(sc); @@ -527,28 +549,17 @@ rl_rxfilter(struct rl_softc *sc) /* Always accept frames destined for this host. */ rxfilt |= RL_RXCFG_RX_INDIV; /* Set capture broadcast bit to capture broadcast frames. */ - if (ifp->if_flags & IFF_BROADCAST) + if (sc->rl_if_flags & IFF_BROADCAST) rxfilt |= RL_RXCFG_RX_BROAD; - if (ifp->if_flags & IFF_ALLMULTI || ifp->if_flags & IFF_PROMISC) { + if (sc->rl_if_flags & IFF_ALLMULTI || sc->rl_if_flags & IFF_PROMISC) { rxfilt |= RL_RXCFG_RX_MULTI; - if (ifp->if_flags & IFF_PROMISC) + if (sc->rl_if_flags & IFF_PROMISC) rxfilt |= RL_RXCFG_RX_ALLPHYS; hashes[0] = 0xFFFFFFFF; hashes[1] = 0xFFFFFFFF; } else { /* Now program new ones. */ - if_maddr_rlock(ifp); - TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { - if (ifma->ifma_addr->sa_family != AF_LINK) - continue; - h = ether_crc32_be(LLADDR((struct sockaddr_dl *) - ifma->ifma_addr), ETHER_ADDR_LEN) >> 26; - if (h < 32) - hashes[0] |= (1 << h); - else - hashes[1] |= (1 << (h - 32)); - } - if_maddr_runlock(ifp); + if_foreach_maddr(ifp, rl_hash_maddr, hashes); if (hashes[0] != 0 || hashes[1] != 0) rxfilt |= RL_RXCFG_RX_MULTI; } @@ -633,9 +644,14 @@ rl_dmamap_cb(void *arg, bus_dma_segment_ static int rl_attach(device_t dev) { + struct if_attach_args ifat = { + .ifat_version = IF_ATTACH_VERSION, + .ifat_drv = &rl_ifdrv, + .ifat_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST, + .ifat_capabilities = IFCAP_VLAN_MTU, + }; uint8_t eaddr[ETHER_ADDR_LEN]; uint16_t as[3]; - struct ifnet *ifp; struct rl_softc *sc; const struct rl_type *t; struct sysctl_ctx_list *ctx; @@ -663,7 +679,6 @@ rl_attach(device_t dev) pci_enable_busmaster(dev); - /* * Map control/status registers. * Default to using PIO access for this driver. On SMP systems, @@ -780,34 +795,28 @@ rl_attach(device_t dev) if ((error = rl_dma_alloc(sc)) != 0) goto fail; - ifp = sc->rl_ifp = if_alloc(IFT_ETHER); - if (ifp == NULL) { - device_printf(dev, "can not if_alloc()\n"); - error = ENOSPC; - goto fail; - } - #define RL_PHYAD_INTERNAL 0 /* Do MII setup */ phy = MII_PHY_ANY; if (sc->rl_type == RL_8139) phy = RL_PHYAD_INTERNAL; - error = mii_attach(dev, &sc->rl_miibus, ifp, rl_ifmedia_upd, + error = mii_attach(dev, &sc->rl_miibus, rl_ifmedia_upd, rl_ifmedia_sts, BMSR_DEFCAPMASK, phy, MII_OFFSET_ANY, 0); if (error != 0) { device_printf(dev, "attaching PHYs failed\n"); goto fail; } + error = bus_setup_intr(dev, sc->rl_irq[0], INTR_TYPE_NET | INTR_MPSAFE, + NULL, rl_intr, sc, &sc->rl_intrhand[0]); + if (error) { + device_printf(sc->rl_dev, "couldn't set up irq\n"); + goto fail; + } - ifp->if_softc = sc; - if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_ioctl = rl_ioctl; - ifp->if_start = rl_start; - ifp->if_init = rl_init; - ifp->if_capabilities = IFCAP_VLAN_MTU; + ifat.ifat_softc = sc; + ifat.ifat_dunit = device_get_unit(dev); + ifat.ifat_lla = eaddr; /* Check WOL for RTL8139B or newer controllers. */ if (sc->rl_type == RL_8139 && pci_find_cap(sc->rl_dev, PCIY_PMG, &pmc) == 0) { @@ -819,7 +828,8 @@ rl_attach(device_t dev) case RL_HWREV_8139D: case RL_HWREV_8101: case RL_HWREV_8100: - ifp->if_capabilities |= IFCAP_WOL; + ifat.ifat_capabilities |= IFCAP_WOL; + sc->rl_flags |= RL_FLAG_WOL; /* Disable WOL. */ rl_clrwol(sc); break; @@ -827,32 +837,17 @@ rl_attach(device_t dev) break; } } - ifp->if_capenable = ifp->if_capabilities; - ifp->if_capenable &= ~(IFCAP_WOL_UCAST | IFCAP_WOL_MCAST); + ifat.ifat_capenable = ifat.ifat_capabilities; + ifat.ifat_capenable &= ~(IFCAP_WOL_UCAST | IFCAP_WOL_MCAST); + sc->rl_capenable = ifat.ifat_capenable; #ifdef DEVICE_POLLING - ifp->if_capabilities |= IFCAP_POLLING; + ifat.ifat_capabilities |= IFCAP_POLLING; #endif - IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen); - ifp->if_snd.ifq_drv_maxlen = ifqmaxlen; - IFQ_SET_READY(&ifp->if_snd); - - /* - * Call MI attach routine. - */ - ether_ifattach(ifp, eaddr); - - /* Hook interrupt last to avoid having to lock softc */ - error = bus_setup_intr(dev, sc->rl_irq[0], INTR_TYPE_NET | INTR_MPSAFE, - NULL, rl_intr, sc, &sc->rl_intrhand[0]); - if (error) { - device_printf(sc->rl_dev, "couldn't set up irq\n"); - ether_ifdetach(ifp); - } + sc->rl_ifp = if_attach(&ifat); + return (0); fail: - if (error) - rl_detach(dev); - + rl_detach(dev); return (error); } @@ -867,28 +862,18 @@ static int rl_detach(device_t dev) { struct rl_softc *sc; - struct ifnet *ifp; sc = device_get_softc(dev); - ifp = sc->rl_ifp; KASSERT(mtx_initialized(&sc->rl_mtx), ("rl mutex not initialized")); -#ifdef DEVICE_POLLING - if (ifp->if_capenable & IFCAP_POLLING) - ether_poll_deregister(ifp); -#endif /* These should only be active if attach succeeded */ if (device_is_attached(dev)) { RL_LOCK(sc); rl_stop(sc); RL_UNLOCK(sc); callout_drain(&sc->rl_stat_callout); - ether_ifdetach(ifp); } -#if 0 - sc->suspended = 1; -#endif if (sc->rl_miibus) device_delete_child(dev, sc->rl_miibus); bus_generic_detach(dev); @@ -901,8 +886,8 @@ rl_detach(device_t dev) bus_release_resource(dev, sc->rl_res_type, sc->rl_res_id, sc->rl_res); - if (ifp) - if_free(ifp); + if (sc->rl_ifp) + if_detach(sc->rl_ifp); rl_dma_free(sc); @@ -1115,7 +1100,7 @@ static int rl_rxeof(struct rl_softc *sc) { struct mbuf *m; - struct ifnet *ifp = sc->rl_ifp; + if_t ifp = sc->rl_ifp; uint8_t *rxbufpos; int total_len = 0; int wrap = 0; @@ -1142,7 +1127,7 @@ rl_rxeof(struct rl_softc *sc) while((CSR_READ_1(sc, RL_COMMAND) & RL_CMD_EMPTY_RXBUF) == 0) { #ifdef DEVICE_POLLING - if (ifp->if_capenable & IFCAP_POLLING) { + if (sc->rl_capenable & IFCAP_POLLING) { if (sc->rxcycles <= 0) break; sc->rxcycles--; @@ -1167,8 +1152,8 @@ rl_rxeof(struct rl_softc *sc) total_len < ETHER_MIN_LEN || total_len > ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN) { if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - rl_init_locked(sc); + sc->rl_flags &= ~RL_FLAG_RUNNING; + rl_init(sc); return (rx_npkts); } @@ -1221,7 +1206,7 @@ rl_rxeof(struct rl_softc *sc) if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); RL_UNLOCK(sc); - (*ifp->if_input)(ifp, m); + if_input(ifp, m); RL_LOCK(sc); rx_npkts++; } @@ -1237,8 +1222,8 @@ rl_rxeof(struct rl_softc *sc) static void rl_txeof(struct rl_softc *sc) { - struct ifnet *ifp = sc->rl_ifp; - uint32_t txstat; + if_t ifp = sc->rl_ifp; + uint32_t txstat; RL_LOCK_ASSERT(sc); @@ -1279,14 +1264,13 @@ rl_txeof(struct rl_softc *sc) CSR_WRITE_4(sc, RL_TXCFG, RL_TXCFG_CONFIG); oldthresh = sc->rl_txthresh; /* error recovery */ - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - rl_init_locked(sc); + sc->rl_flags &= ~RL_FLAG_RUNNING; + rl_init(sc); /* restore original threshold */ sc->rl_txthresh = oldthresh; return; } RL_INC(sc->rl_cdata.last_tx); - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; } while (sc->rl_cdata.last_tx != sc->rl_cdata.cur_tx); if (RL_LAST_TXMBUF(sc) == NULL) @@ -1434,32 +1418,25 @@ rl_tick(void *xsc) #ifdef DEVICE_POLLING static int -rl_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) -{ - struct rl_softc *sc = ifp->if_softc; - int rx_npkts = 0; - - RL_LOCK(sc); - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - rx_npkts = rl_poll_locked(ifp, cmd, count); - RL_UNLOCK(sc); - return (rx_npkts); -} - -static int -rl_poll_locked(struct ifnet *ifp, enum poll_cmd cmd, int count) +rl_poll(if_t ifp, enum poll_cmd cmd, int count) { - struct rl_softc *sc = ifp->if_softc; + struct rl_softc *sc; int rx_npkts; - RL_LOCK_ASSERT(sc); + sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); + + RL_LOCK(sc); + if ((sc->rl_flags & RL_FLAG_RUNNING) == 0) { + rx_npkts = 0; + goto out; + } sc->rxcycles = count; rx_npkts = rl_rxeof(sc); rl_txeof(sc); - if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - rl_start_locked(ifp); + if (if_snd_len(ifp)) + rl_start(sc); if (cmd == POLL_AND_CHECK_STATUS) { uint16_t status; @@ -1467,17 +1444,19 @@ rl_poll_locked(struct ifnet *ifp, enum p /* We should also check the status register. */ status = CSR_READ_2(sc, RL_ISR); if (status == 0xffff) - return (rx_npkts); + goto out; if (status != 0) CSR_WRITE_2(sc, RL_ISR, status); /* XXX We should check behaviour on receiver stalls. */ if (status & RL_ISR_SYSTEM_ERR) { - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - rl_init_locked(sc); + sc->rl_flags &= ~RL_FLAG_RUNNING; + rl_init(sc); } } +out: + RL_UNLOCK(sc); return (rx_npkts); } #endif /* DEVICE_POLLING */ @@ -1486,7 +1465,7 @@ static void rl_intr(void *arg) { struct rl_softc *sc = arg; - struct ifnet *ifp = sc->rl_ifp; + if_t ifp = sc->rl_ifp; uint16_t status; int count; @@ -1496,11 +1475,11 @@ rl_intr(void *arg) goto done_locked; #ifdef DEVICE_POLLING - if (ifp->if_capenable & IFCAP_POLLING) + if (sc->rl_capenable & IFCAP_POLLING) goto done_locked; #endif - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + if ((sc->rl_flags & RL_FLAG_RUNNING) == 0) goto done_locked2; status = CSR_READ_2(sc, RL_ISR); if (status == 0xffff || (status & RL_INTRS) == 0) @@ -1511,14 +1490,14 @@ rl_intr(void *arg) CSR_WRITE_2(sc, RL_IMR, 0); for (count = 16; count > 0; count--) { CSR_WRITE_2(sc, RL_ISR, status); - if (ifp->if_drv_flags & IFF_DRV_RUNNING) { + if (sc->rl_flags & RL_FLAG_RUNNING) { if (status & (RL_ISR_RX_OK | RL_ISR_RX_ERR)) rl_rxeof(sc); if (status & (RL_ISR_TX_OK | RL_ISR_TX_ERR)) rl_txeof(sc); if (status & RL_ISR_SYSTEM_ERR) { - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - rl_init_locked(sc); + sc->rl_flags &= ~RL_FLAG_RUNNING; + rl_init(sc); RL_UNLOCK(sc); return; } @@ -1529,11 +1508,11 @@ rl_intr(void *arg) break; } - if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - rl_start_locked(ifp); + if (if_snd_len(ifp)) + rl_start(sc); done_locked2: - if (ifp->if_drv_flags & IFF_DRV_RUNNING) + if (sc->rl_flags & RL_FLAG_RUNNING) CSR_WRITE_2(sc, RL_IMR, RL_INTRS); done_locked: RL_UNLOCK(sc); @@ -1609,80 +1588,55 @@ rl_encap(struct rl_softc *sc, struct mbu /* * Main transmit routine. */ -static void -rl_start(struct ifnet *ifp) +static int +rl_transmit(if_t ifp, struct mbuf *m) { - struct rl_softc *sc = ifp->if_softc; + struct rl_softc *sc; + int error; + + if ((error = if_snd_enqueue(ifp, m)) != 0) + return (error); + sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); RL_LOCK(sc); - rl_start_locked(ifp); + rl_start(sc); RL_UNLOCK(sc); + return (0); } static void -rl_start_locked(struct ifnet *ifp) +rl_start(struct rl_softc *sc) { - struct rl_softc *sc = ifp->if_softc; - struct mbuf *m_head = NULL; + struct mbuf *m; RL_LOCK_ASSERT(sc); - if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) != - IFF_DRV_RUNNING || (sc->rl_flags & RL_FLAG_LINK) == 0) + if ((sc->rl_flags & (RL_FLAG_RUNNING | RL_FLAG_LINK)) != + (RL_FLAG_RUNNING | RL_FLAG_LINK)) return; - while (RL_CUR_TXMBUF(sc) == NULL) { - - IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); - - if (m_head == NULL) - break; - - if (rl_encap(sc, &m_head)) { - if (m_head == NULL) + while (RL_CUR_TXMBUF(sc) == NULL && + ((m = if_snd_dequeue(sc->rl_ifp)) != NULL)) { + if (rl_encap(sc, &m)) { + if (m == NULL) break; - IFQ_DRV_PREPEND(&ifp->if_snd, m_head); - ifp->if_drv_flags |= IFF_DRV_OACTIVE; + if_snd_prepend(sc->rl_ifp, m); break; } - - /* Pass a copy of this mbuf chain to the bpf subsystem. */ - BPF_MTAP(ifp, RL_CUR_TXMBUF(sc)); - + if_mtap(sc->rl_ifp, RL_CUR_TXMBUF(sc), NULL, 0); /* Transmit the frame. */ CSR_WRITE_4(sc, RL_CUR_TXSTAT(sc), RL_TXTHRESH(sc->rl_txthresh) | RL_CUR_TXMBUF(sc)->m_pkthdr.len); - RL_INC(sc->rl_cdata.cur_tx); - /* Set a timeout in case the chip goes out to lunch. */ sc->rl_watchdog_timer = 5; } - - /* - * We broke out of the loop because all our TX slots are - * full. Mark the NIC as busy until it drains some of the - * packets from the queue. - */ - if (RL_CUR_TXMBUF(sc) != NULL) - ifp->if_drv_flags |= IFF_DRV_OACTIVE; -} - -static void -rl_init(void *xsc) -{ - struct rl_softc *sc = xsc; - - RL_LOCK(sc); - rl_init_locked(sc); - RL_UNLOCK(sc); } static void -rl_init_locked(struct rl_softc *sc) +rl_init(struct rl_softc *sc) { - struct ifnet *ifp = sc->rl_ifp; struct mii_data *mii; uint32_t eaddr[2]; @@ -1690,7 +1644,7 @@ rl_init_locked(struct rl_softc *sc) mii = device_get_softc(sc->rl_miibus); - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + if ((sc->rl_flags & RL_FLAG_RUNNING) != 0) return; /* @@ -1716,7 +1670,7 @@ rl_init_locked(struct rl_softc *sc) */ CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_WRITECFG); bzero(eaddr, sizeof(eaddr)); - bcopy(IF_LLADDR(sc->rl_ifp), eaddr, ETHER_ADDR_LEN); + bcopy(if_lladdr(sc->rl_ifp), eaddr, ETHER_ADDR_LEN); CSR_WRITE_STREAM_4(sc, RL_IDR0, eaddr[0]); CSR_WRITE_STREAM_4(sc, RL_IDR4, eaddr[1]); CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF); @@ -1745,7 +1699,7 @@ rl_init_locked(struct rl_softc *sc) #ifdef DEVICE_POLLING /* Disable interrupts if we are polling. */ - if (ifp->if_capenable & IFCAP_POLLING) + if (sc->rl_capenable & IFCAP_POLLING) CSR_WRITE_2(sc, RL_IMR, 0); else #endif @@ -1766,8 +1720,7 @@ rl_init_locked(struct rl_softc *sc) CSR_WRITE_1(sc, sc->rl_cfg1, RL_CFG1_DRVLOAD|RL_CFG1_FULLDUPLEX); - ifp->if_drv_flags |= IFF_DRV_RUNNING; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + sc->rl_flags |= RL_FLAG_RUNNING; callout_reset(&sc->rl_stat_callout, hz, rl_tick, sc); } @@ -1776,9 +1729,9 @@ rl_init_locked(struct rl_softc *sc) * Set media options. */ static int -rl_ifmedia_upd(struct ifnet *ifp) +rl_ifmedia_upd(if_t ifp) { - struct rl_softc *sc = ifp->if_softc; + struct rl_softc *sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); struct mii_data *mii; mii = device_get_softc(sc->rl_miibus); @@ -1794,9 +1747,9 @@ rl_ifmedia_upd(struct ifnet *ifp) * Report current media status. */ static void -rl_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr) +rl_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr) { - struct rl_softc *sc = ifp->if_softc; + struct rl_softc *sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); struct mii_data *mii; mii = device_get_softc(sc->rl_miibus); @@ -1809,26 +1762,29 @@ rl_ifmedia_sts(struct ifnet *ifp, struct } static int -rl_ioctl(struct ifnet *ifp, u_long command, caddr_t data) +rl_ioctl(if_t ifp, u_long command, void *data, struct thread *td) { - struct ifreq *ifr = (struct ifreq *)data; + struct ifreq *ifr = data; struct mii_data *mii; - struct rl_softc *sc = ifp->if_softc; - int error = 0, mask; + struct rl_softc *sc; + uint32_t oflags; + int error = 0; + sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); switch (command) { case SIOCSIFFLAGS: RL_LOCK(sc); - if (ifp->if_flags & IFF_UP) { - if (ifp->if_drv_flags & IFF_DRV_RUNNING && - ((ifp->if_flags ^ sc->rl_if_flags) & + oflags = sc->rl_if_flags; + sc->rl_if_flags = ifr->ifr_flags; + if (sc->rl_if_flags & IFF_UP) { + if (sc->rl_flags & RL_FLAG_RUNNING && + ((oflags ^ sc->rl_if_flags) & (IFF_PROMISC | IFF_ALLMULTI))) rl_rxfilter(sc); else - rl_init_locked(sc); - } else if (ifp->if_drv_flags & IFF_DRV_RUNNING) + rl_init(sc); + } else if (sc->rl_flags & RL_FLAG_RUNNING) rl_stop(sc); - sc->rl_if_flags = ifp->if_flags; RL_UNLOCK(sc); break; case SIOCADDMULTI: @@ -1843,44 +1799,22 @@ rl_ioctl(struct ifnet *ifp, u_long comma error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command); break; case SIOCSIFCAP: - mask = ifr->ifr_reqcap ^ ifp->if_capenable; + RL_LOCK(sc); #ifdef DEVICE_POLLING if (ifr->ifr_reqcap & IFCAP_POLLING && - !(ifp->if_capenable & IFCAP_POLLING)) { - error = ether_poll_register(rl_poll, ifp); - if (error) - return(error); - RL_LOCK(sc); + !(ifr->ifr_curcap & IFCAP_POLLING)) /* Disable interrupts */ CSR_WRITE_2(sc, RL_IMR, 0x0000); - ifp->if_capenable |= IFCAP_POLLING; - RL_UNLOCK(sc); - return (error); - - } if (!(ifr->ifr_reqcap & IFCAP_POLLING) && - ifp->if_capenable & IFCAP_POLLING) { - error = ether_poll_deregister(ifp); + ifr->ifr_curcap & IFCAP_POLLING) /* Enable interrupts. */ - RL_LOCK(sc); CSR_WRITE_2(sc, RL_IMR, RL_INTRS); - ifp->if_capenable &= ~IFCAP_POLLING; - RL_UNLOCK(sc); - return (error); - } #endif /* DEVICE_POLLING */ - if ((mask & IFCAP_WOL) != 0 && - (ifp->if_capabilities & IFCAP_WOL) != 0) { - if ((mask & IFCAP_WOL_UCAST) != 0) - ifp->if_capenable ^= IFCAP_WOL_UCAST; - if ((mask & IFCAP_WOL_MCAST) != 0) - ifp->if_capenable ^= IFCAP_WOL_MCAST; - if ((mask & IFCAP_WOL_MAGIC) != 0) - ifp->if_capenable ^= IFCAP_WOL_MAGIC; - } + sc->rl_capenable = ifr->ifr_reqcap; + RL_UNLOCK(sc); break; default: - error = ether_ioctl(ifp, command, data); + error = EOPNOTSUPP; break; } @@ -1901,8 +1835,8 @@ rl_watchdog(struct rl_softc *sc) rl_txeof(sc); rl_rxeof(sc); - sc->rl_ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - rl_init_locked(sc); + sc->rl_flags &= ~RL_FLAG_RUNNING; + rl_init(sc); } /* @@ -1913,14 +1847,12 @@ static void rl_stop(struct rl_softc *sc) { register int i; - struct ifnet *ifp = sc->rl_ifp; RL_LOCK_ASSERT(sc); sc->rl_watchdog_timer = 0; callout_stop(&sc->rl_stat_callout); - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); - sc->rl_flags &= ~RL_FLAG_LINK; + sc->rl_flags &= ~(RL_FLAG_RUNNING | RL_FLAG_LINK); CSR_WRITE_1(sc, RL_COMMAND, 0x00); CSR_WRITE_2(sc, RL_IMR, 0x0000); @@ -1983,7 +1915,7 @@ static int rl_resume(device_t dev) { struct rl_softc *sc; - struct ifnet *ifp; + if_t ifp; int pmc; uint16_t pmstat; @@ -1992,7 +1924,7 @@ rl_resume(device_t dev) RL_LOCK(sc); - if ((ifp->if_capabilities & IFCAP_WOL) != 0 && + if ((sc->rl_flags & RL_FLAG_WOL) != 0 && pci_find_cap(sc->rl_dev, PCIY_PMG, &pmc) == 0) { /* Disable PME and clear PME status. */ pmstat = pci_read_config(sc->rl_dev, @@ -2010,8 +1942,8 @@ rl_resume(device_t dev) } /* reinitialize interface if necessary */ - if (ifp->if_flags & IFF_UP) - rl_init_locked(sc); + if (sc->rl_if_flags & IFF_UP) + rl_init(sc); sc->suspended = 0; @@ -2038,7 +1970,7 @@ rl_shutdown(device_t dev) * interrupt comes in later on, which can happen in some * cases. */ - sc->rl_ifp->if_flags &= ~IFF_UP; + sc->rl_if_flags &= ~IFF_UP; rl_setwol(sc); RL_UNLOCK(sc); @@ -2048,7 +1980,7 @@ rl_shutdown(device_t dev) static void rl_setwol(struct rl_softc *sc) { - struct ifnet *ifp; + if_t ifp; int pmc; uint16_t pmstat; uint8_t v; @@ -2056,7 +1988,7 @@ rl_setwol(struct rl_softc *sc) RL_LOCK_ASSERT(sc); ifp = sc->rl_ifp; - if ((ifp->if_capabilities & IFCAP_WOL) == 0) + if ((sc->rl_flags & RL_FLAG_WOL) == 0) return; if (pci_find_cap(sc->rl_dev, PCIY_PMG, &pmc) != 0) return; @@ -2067,24 +1999,24 @@ rl_setwol(struct rl_softc *sc) /* Enable PME. */ v = CSR_READ_1(sc, sc->rl_cfg1); v &= ~RL_CFG1_PME; - if ((ifp->if_capenable & IFCAP_WOL) != 0) + if ((sc->rl_capenable & IFCAP_WOL) != 0) v |= RL_CFG1_PME; CSR_WRITE_1(sc, sc->rl_cfg1, v); v = CSR_READ_1(sc, sc->rl_cfg3); v &= ~(RL_CFG3_WOL_LINK | RL_CFG3_WOL_MAGIC); - if ((ifp->if_capenable & IFCAP_WOL_MAGIC) != 0) + if ((sc->rl_capenable & IFCAP_WOL_MAGIC) != 0) v |= RL_CFG3_WOL_MAGIC; CSR_WRITE_1(sc, sc->rl_cfg3, v); v = CSR_READ_1(sc, sc->rl_cfg5); v &= ~(RL_CFG5_WOL_BCAST | RL_CFG5_WOL_MCAST | RL_CFG5_WOL_UCAST); v &= ~RL_CFG5_WOL_LANWAKE; - if ((ifp->if_capenable & IFCAP_WOL_UCAST) != 0) + if ((sc->rl_capenable & IFCAP_WOL_UCAST) != 0) v |= RL_CFG5_WOL_UCAST; - if ((ifp->if_capenable & IFCAP_WOL_MCAST) != 0) + if ((sc->rl_capenable & IFCAP_WOL_MCAST) != 0) v |= RL_CFG5_WOL_MCAST | RL_CFG5_WOL_BCAST; - if ((ifp->if_capenable & IFCAP_WOL) != 0) + if ((sc->rl_capenable & IFCAP_WOL) != 0) v |= RL_CFG5_WOL_LANWAKE; CSR_WRITE_1(sc, sc->rl_cfg5, v); @@ -2094,7 +2026,7 @@ rl_setwol(struct rl_softc *sc) /* Request PME if WOL is requested. */ pmstat = pci_read_config(sc->rl_dev, pmc + PCIR_POWER_STATUS, 2); pmstat &= ~(PCIM_PSTAT_PME | PCIM_PSTAT_PMEENABLE); - if ((ifp->if_capenable & IFCAP_WOL) != 0) + if ((sc->rl_capenable & IFCAP_WOL) != 0) pmstat |= PCIM_PSTAT_PME | PCIM_PSTAT_PMEENABLE; pci_write_config(sc->rl_dev, pmc + PCIR_POWER_STATUS, pmstat, 2); } @@ -2102,11 +2034,11 @@ rl_setwol(struct rl_softc *sc) static void rl_clrwol(struct rl_softc *sc) { - struct ifnet *ifp; + if_t ifp; uint8_t v; ifp = sc->rl_ifp; - if ((ifp->if_capabilities & IFCAP_WOL) == 0) + if ((sc->rl_flags & RL_FLAG_WOL) == 0) return; /* Enable config register write. */ Modified: projects/ifnet/sys/dev/rl/if_rlreg.h ============================================================================== --- projects/ifnet/sys/dev/rl/if_rlreg.h Tue Apr 7 19:31:29 2015 (r281223) +++ projects/ifnet/sys/dev/rl/if_rlreg.h Tue Apr 7 19:33:07 2015 (r281224) @@ -896,7 +896,7 @@ struct rl_softc { struct mbuf *rl_tail; uint32_t rl_rxlenmask; int rl_testmode; - int rl_if_flags; + uint32_t rl_if_flags; int rl_twister_enable; enum rl_twist rl_twister; int rl_twist_row; @@ -935,6 +935,7 @@ struct rl_softc { #define RL_FLAG_EARLYOFFV2 0x00040000 #define RL_FLAG_RXDV_GATED 0x00080000 #define RL_FLAG_RUNNING 0x00100000 +#define RL_FLAG_WOL 0x00200000 #define RL_FLAG_PCIE 0x40000000 #define RL_FLAG_LINK 0x80000000 }; Modified: projects/ifnet/sys/i386/conf/IFNET ============================================================================== --- projects/ifnet/sys/i386/conf/IFNET Tue Apr 7 19:31:29 2015 (r281223) +++ projects/ifnet/sys/i386/conf/IFNET Tue Apr 7 19:33:07 2015 (r281224) @@ -40,7 +40,6 @@ nodevice ale nodevice age nodevice cas nodevice nge -nodevice rl nodevice alc nodevice sis nodevice sf From owner-svn-src-projects@FreeBSD.ORG Tue Apr 7 19:46:21 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ECBFC70A; Tue, 7 Apr 2015 19:46:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D76379CF; Tue, 7 Apr 2015 19:46:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t37JkK3f013774; Tue, 7 Apr 2015 19:46:20 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t37JkJWt013767; Tue, 7 Apr 2015 19:46:19 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504071946.t37JkJWt013767@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 7 Apr 2015 19:46:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281227 - in projects/ifnet/sys: dev/cxgbe net netgraph X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2015 19:46:21 -0000 Author: glebius Date: Tue Apr 7 19:46:18 2015 New Revision: 281227 URL: https://svnweb.freebsd.org/changeset/base/281227 Log: For the sake of network stack backpressure indication, as well as for properly implementing ALTQ, change KPI for ifop_transmit(). Now the transmit method must not free an mbuf, when it returns an error, since the caller could have plans for the mbuf. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/ifnet/sys/dev/cxgbe/t4_main.c projects/ifnet/sys/net/if.c projects/ifnet/sys/net/if_var.h projects/ifnet/sys/net/if_vlan.c projects/ifnet/sys/netgraph/ng_iface.c Modified: projects/ifnet/sys/dev/cxgbe/t4_main.c ============================================================================== --- projects/ifnet/sys/dev/cxgbe/t4_main.c Tue Apr 7 19:39:23 2015 (r281226) +++ projects/ifnet/sys/dev/cxgbe/t4_main.c Tue Apr 7 19:46:18 2015 (r281227) @@ -1363,10 +1363,8 @@ cxgbe_transmit(if_t ifp, struct mbuf *m) M_ASSERTPKTHDR(m); MPASS(m->m_nextpkt == NULL); /* not quite ready for this yet */ - if (__predict_false(pi->link_cfg.link_ok == 0)) { - m_freem(m); + if (__predict_false(pi->link_cfg.link_ok == 0)) return (ENETDOWN); - } rc = parse_pkt(&m); if (__predict_false(rc != 0)) { @@ -1383,8 +1381,6 @@ cxgbe_transmit(if_t ifp, struct mbuf *m) items[0] = m; rc = mp_ring_enqueue(txq->r, items, 1, 4096); - if (__predict_false(rc != 0)) - m_freem(m); return (rc); } Modified: projects/ifnet/sys/net/if.c ============================================================================== --- projects/ifnet/sys/net/if.c Tue Apr 7 19:39:23 2015 (r281226) +++ projects/ifnet/sys/net/if.c Tue Apr 7 19:46:18 2015 (r281227) @@ -3747,10 +3747,8 @@ if_snd_enqueue(struct ifnet *ifp, struct mtx_lock(&ifq->ifq_mtx); error = mbufq_enqueue(&ifq->ifq_mbq, m); mtx_unlock(&ifq->ifq_mtx); - if (error) { - m_freem(m); + if (error) if_inc_counter(ifp, IFCOUNTER_OQDROPS, 1); - } return (error); } Modified: projects/ifnet/sys/net/if_var.h ============================================================================== --- projects/ifnet/sys/net/if_var.h Tue Apr 7 19:39:23 2015 (r281226) +++ projects/ifnet/sys/net/if_var.h Tue Apr 7 19:46:18 2015 (r281227) @@ -460,8 +460,12 @@ if_input(if_t ifp, struct mbuf *m) static inline int if_transmit(if_t ifp, struct mbuf *m) { + int error; - return (ifp->if_ops->ifop_transmit(ifp, m)); + error = ifp->if_ops->ifop_transmit(ifp, m); + if (error) + m_freem(m); + return (error); } static inline void Modified: projects/ifnet/sys/net/if_vlan.c ============================================================================== --- projects/ifnet/sys/net/if_vlan.c Tue Apr 7 19:39:23 2015 (r281226) +++ projects/ifnet/sys/net/if_vlan.c Tue Apr 7 19:46:18 2015 (r281227) @@ -1012,7 +1012,6 @@ vlan_transmit(struct ifnet *ifp, struct * Do not run parent's if_transmit() if the parent is not up. */ if (!(p->if_flags & IFF_UP)) { - m_freem(m); if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); return (ENETDOWN); } Modified: projects/ifnet/sys/netgraph/ng_iface.c ============================================================================== --- projects/ifnet/sys/netgraph/ng_iface.c Tue Apr 7 19:39:23 2015 (r281226) +++ projects/ifnet/sys/netgraph/ng_iface.c Tue Apr 7 19:46:18 2015 (r281227) @@ -398,7 +398,6 @@ ng_iface_send(if_t ifp, struct mbuf *m, /* Check address family to determine hook (if known) */ if (iffam == NULL) { - m_freem(m); log(LOG_WARNING, "%s: can't handle af%d\n", if_name(ifp), sa); return (EAFNOSUPPORT); } @@ -418,7 +417,8 @@ ng_iface_send(if_t ifp, struct mbuf *m, } else if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); - return (error); + /* Netgraph frees the mbuf, so we can't return an error. */ + return (0); } #ifdef DEBUG From owner-svn-src-projects@FreeBSD.ORG Tue Apr 7 23:31:51 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65E4F47B; Tue, 7 Apr 2015 23:31:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 46F5CE1E; Tue, 7 Apr 2015 23:31:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t37NVorN024526; Tue, 7 Apr 2015 23:31:50 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t37NVo22024254; Tue, 7 Apr 2015 23:31:50 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201504072331.t37NVo22024254@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Tue, 7 Apr 2015 23:31:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281240 - projects/lua-bootloader/sys/boot/lua X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2015 23:31:51 -0000 Author: rpaulo Date: Tue Apr 7 23:31:49 2015 New Revision: 281240 URL: https://svnweb.freebsd.org/changeset/base/281240 Log: lua: remove '\n' in print() calls. Lua's print() function already prints a new line. Modified: projects/lua-bootloader/sys/boot/lua/config.lua projects/lua-bootloader/sys/boot/lua/menu.lua Modified: projects/lua-bootloader/sys/boot/lua/config.lua ============================================================================== --- projects/lua-bootloader/sys/boot/lua/config.lua Tue Apr 7 23:09:34 2015 (r281239) +++ projects/lua-bootloader/sys/boot/lua/config.lua Tue Apr 7 23:31:49 2015 (r281240) @@ -98,7 +98,7 @@ pattern_table = { str = "^%s*exec%s*=%s*\"([%w%s%p]-)\"%s*(.*)", process = function(k, v) if loader.perform(k) ~= 0 then - print("Failed to exec '"..k.."'\n"); + print("Failed to exec '"..k.."'"); end end }, @@ -107,7 +107,7 @@ pattern_table = { str = "^%s*([%w%p]+)%s*=%s*\"([%w%s%p]-)\"%s*(.*)", process = function(k, v) if loader.perform("set "..k.."=\""..v.."\"") ~= 0 then - print("Failed to set '"..k.."' with value: "..v.."\n"); + print("Failed to set '"..k.."' with value: "..v..""); end end }, @@ -116,7 +116,7 @@ pattern_table = { str = "^%s*([%w%p]+)%s*=%s*(%d+)%s*(.*)", process = function(k, v) if loader.perform("set "..k.."="..v.."") ~= 0 then - print("Failed to set '"..k.."' with value: "..v.."\n"); + print("Failed to set '"..k.."' with value: "..v..""); end end } @@ -143,14 +143,14 @@ function config.loadmod(mod, silent) if v.before ~= nil then if loader.perform(v.before) ~= 0 then if not silent then - print("Failed to execute '"..v.before.."' before loading '"..k.."'\n"); + print("Failed to execute '"..v.before.."' before loading '"..k.."'"); end status = false; end end if loader.perform(str) ~= 0 then - if not silent then print("Failed to execute '" .. str .. "'\n"); end + if not silent then print("Failed to execute '" .. str .. "'"); end if v.error ~= nil then loader.perform(v.error); end @@ -160,14 +160,14 @@ function config.loadmod(mod, silent) if v.after ~= nil then if loader.perform(v.after) ~= 0 then if not silent then - print("Failed to execute '"..v.after.."' after loading '"..k.."'\n"); + print("Failed to execute '"..v.after.."' after loading '"..k.."'"); end status = false; end end else - --if not silent then print("Skiping module '".. k .. "'\n"); end + --if not silent then print("Skiping module '".. k .. "'"); end end end @@ -177,7 +177,7 @@ end function config.parse(name, silent) local f = io.open(name); if f == nil then - if not silent then print("Failed to open config: '" .. name.."'\n"); end + if not silent then print("Failed to open config: '" .. name.."'"); end return false; end @@ -187,7 +187,7 @@ function config.parse(name, silent) text, r = io.read(f); if text == nil then - if not silent then print("Failed to read config: '" .. name.."'\n"); end + if not silent then print("Failed to read config: '" .. name.."'"); end return false; end @@ -207,7 +207,7 @@ function config.parse(name, silent) if config.isValidComment(c) then val.process(k, v); else - print("Malformed line ("..n.."):\n\t'"..line.."'\n"); + print("Malformed line ("..n.."):\n\t'"..line.."'"); status = false; end @@ -216,7 +216,7 @@ function config.parse(name, silent) end if found == false then - print("Malformed line ("..n.."):\n\t'"..line.."'\n"); + print("Malformed line ("..n.."):\n\t'"..line.."'"); status = false; end end @@ -261,7 +261,7 @@ function config.loadkernel() if res ~= nil then return true; else - print("Failed to load kernel '"..res.."'\n"); + print("Failed to load kernel '"..res.."'"); return false; end else @@ -290,7 +290,7 @@ function config.loadkernel() if res ~= nil then return true; else - print("Failed to load kernel '"..res.."'\n"); + print("Failed to load kernel '"..res.."'"); return false; end end @@ -302,24 +302,24 @@ function config.load(file) if not file then file = "/boot/defaults/loader.conf"; end if not config.parse(file) then - print("Failed to parse configuration: '"..file.."'\n"); + print("Failed to parse configuration: '"..file.."'"); end local f = loader.getenv("loader_conf_files"); if f ~= nil then for name in string.gmatch(f, "([%w%p]+)%s*") do if not config.parse(name) then - print("Failed to parse configuration: '"..name.."'\n"); + print("Failed to parse configuration: '"..name.."'"); end end end - print("Loading kernel...\n"); + print("Loading kernel..."); config.loadkernel(); - print("Loading configurations...\n"); + print("Loading configurations..."); if not config.loadmod(modules) then - print("Could not load configurations!\n"); + print("Could not load configurations!"); end end @@ -327,7 +327,7 @@ function config.reload(kernel) local res = 1; -- unload all modules - print("Unloading modules...\n"); + print("Unloading modules..."); loader.perform("unload"); if kernel ~= nil then @@ -338,7 +338,7 @@ function config.reload(kernel) -- failed to load kernel or it is nil -- then load default if res == 1 then - print("Loading default kernel...\n"); + print("Loading default kernel..."); config.loadkernel(); end Modified: projects/lua-bootloader/sys/boot/lua/menu.lua ============================================================================== --- projects/lua-bootloader/sys/boot/lua/menu.lua Tue Apr 7 23:09:34 2015 (r281239) +++ projects/lua-bootloader/sys/boot/lua/menu.lua Tue Apr 7 23:31:49 2015 (r281240) @@ -91,7 +91,7 @@ function menu.run(opts) if (opts[ch] ~= nil) then local ret = opts[ch].func(); if (ret) then - print("Exiting menu!\n"); + print("Exiting menu!"); return; end else @@ -100,7 +100,7 @@ function menu.run(opts) if opts.alias[ch] ~= nil then local ret = opts.alias[ch].func(); if (ret) then - print("Exiting menu!\n"); + print("Exiting menu!"); return; end end From owner-svn-src-projects@FreeBSD.ORG Fri Apr 10 10:20:34 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4C30A896; Fri, 10 Apr 2015 10:20:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 30401D37; Fri, 10 Apr 2015 10:20:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3AAKYh3007672; Fri, 10 Apr 2015 10:20:34 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3AAKJgR007629; Fri, 10 Apr 2015 10:20:19 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504101020.t3AAKJgR007629@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 10 Apr 2015 10:20:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281365 - in projects/sendfile: . bin/cp bin/expr bin/mv bin/pax bin/ps bin/sh/tests/expansion cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs cddl/contrib/opensolaris/cmd/dtr... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Apr 2015 10:20:34 -0000 Author: glebius Date: Fri Apr 10 10:20:14 2015 New Revision: 281365 URL: https://svnweb.freebsd.org/changeset/base/281365 Log: Merge head r261119 through r281364. Added: projects/sendfile/bin/sh/tests/expansion/ifs6.0 - copied unchanged from r281364, head/bin/sh/tests/expansion/ifs6.0 projects/sendfile/bin/sh/tests/expansion/ifs7.0 - copied unchanged from r281364, head/bin/sh/tests/expansion/ifs7.0 projects/sendfile/cddl/usr.sbin/dtrace/tests/tools/dtest.sh - copied unchanged from r281364, head/cddl/usr.sbin/dtrace/tests/tools/dtest.sh projects/sendfile/contrib/compiler-rt/lib/builtins/floatditf.c - copied unchanged from r281364, head/contrib/compiler-rt/lib/builtins/floatditf.c projects/sendfile/contrib/compiler-rt/lib/builtins/floatunditf.c - copied unchanged from r281364, head/contrib/compiler-rt/lib/builtins/floatunditf.c projects/sendfile/contrib/compiler-rt/lib/builtins/multc3.c - copied unchanged from r281364, head/contrib/compiler-rt/lib/builtins/multc3.c projects/sendfile/contrib/gcc/config/aarch64/ - copied from r281364, head/contrib/gcc/config/aarch64/ projects/sendfile/contrib/llvm/FREEBSD-Xlist - copied unchanged from r281364, head/contrib/llvm/FREEBSD-Xlist projects/sendfile/contrib/llvm/patches/patch-10-llvm-r230348-arm-fix-bad-ha.diff - copied unchanged from r281364, head/contrib/llvm/patches/patch-10-llvm-r230348-arm-fix-bad-ha.diff projects/sendfile/contrib/llvm/patches/patch-11-llvm-r231227-aarch64-tls-relocs.diff - copied unchanged from r281364, head/contrib/llvm/patches/patch-11-llvm-r231227-aarch64-tls-relocs.diff projects/sendfile/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff - copied unchanged from r281364, head/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff projects/sendfile/contrib/llvm/tools/clang/FREEBSD-Xlist - copied unchanged from r281364, head/contrib/llvm/tools/clang/FREEBSD-Xlist projects/sendfile/contrib/llvm/tools/lldb/FREEBSD-Xlist - copied unchanged from r281364, head/contrib/llvm/tools/lldb/FREEBSD-Xlist projects/sendfile/contrib/llvm/tools/llvm-cov/ - copied from r281364, head/contrib/llvm/tools/llvm-cov/ projects/sendfile/contrib/llvm/tools/llvm-profdata/ - copied from r281364, head/contrib/llvm/tools/llvm-profdata/ projects/sendfile/contrib/ntp/FREEBSD-Xlist - copied unchanged from r281364, head/contrib/ntp/FREEBSD-Xlist projects/sendfile/contrib/ntp/FREEBSD-upgrade - copied unchanged from r281364, head/contrib/ntp/FREEBSD-upgrade projects/sendfile/contrib/ntp/check-libopts.mf - copied unchanged from r281364, head/contrib/ntp/check-libopts.mf projects/sendfile/contrib/ntp/deps-ver - copied unchanged from r281364, head/contrib/ntp/deps-ver projects/sendfile/contrib/ntp/depsver.mf - copied unchanged from r281364, head/contrib/ntp/depsver.mf projects/sendfile/contrib/ntp/html/access.html - copied unchanged from r281364, head/contrib/ntp/html/access.html projects/sendfile/contrib/ntp/html/authentic.html - copied unchanged from r281364, head/contrib/ntp/html/authentic.html projects/sendfile/contrib/ntp/html/autokey.html - copied unchanged from r281364, head/contrib/ntp/html/autokey.html projects/sendfile/contrib/ntp/html/bugs.html - copied unchanged from r281364, head/contrib/ntp/html/bugs.html projects/sendfile/contrib/ntp/html/build.html - copied unchanged from r281364, head/contrib/ntp/html/build.html projects/sendfile/contrib/ntp/html/clock.html - copied unchanged from r281364, head/contrib/ntp/html/clock.html projects/sendfile/contrib/ntp/html/cluster.html - copied unchanged from r281364, head/contrib/ntp/html/cluster.html projects/sendfile/contrib/ntp/html/comdex.html - copied unchanged from r281364, head/contrib/ntp/html/comdex.html projects/sendfile/contrib/ntp/html/config.html - copied unchanged from r281364, head/contrib/ntp/html/config.html projects/sendfile/contrib/ntp/html/decode.html - copied unchanged from r281364, head/contrib/ntp/html/decode.html projects/sendfile/contrib/ntp/html/discipline.html - copied unchanged from r281364, head/contrib/ntp/html/discipline.html projects/sendfile/contrib/ntp/html/discover.html - copied unchanged from r281364, head/contrib/ntp/html/discover.html projects/sendfile/contrib/ntp/html/drivers/driver45.html - copied unchanged from r281364, head/contrib/ntp/html/drivers/driver45.html projects/sendfile/contrib/ntp/html/drivers/driver46.html - copied unchanged from r281364, head/contrib/ntp/html/drivers/driver46.html projects/sendfile/contrib/ntp/html/drivers/mx4200data.html - copied unchanged from r281364, head/contrib/ntp/html/drivers/mx4200data.html projects/sendfile/contrib/ntp/html/filter.html - copied unchanged from r281364, head/contrib/ntp/html/filter.html projects/sendfile/contrib/ntp/html/hints/ - copied from r281364, head/contrib/ntp/html/hints/ projects/sendfile/contrib/ntp/html/hints.html - copied unchanged from r281364, head/contrib/ntp/html/hints.html projects/sendfile/contrib/ntp/html/history.html - copied unchanged from r281364, head/contrib/ntp/html/history.html projects/sendfile/contrib/ntp/html/huffpuff.html - copied unchanged from r281364, head/contrib/ntp/html/huffpuff.html projects/sendfile/contrib/ntp/html/icons/sitemap.png - copied unchanged from r281364, head/contrib/ntp/html/icons/sitemap.png projects/sendfile/contrib/ntp/html/kernpps.html - copied unchanged from r281364, head/contrib/ntp/html/kernpps.html projects/sendfile/contrib/ntp/html/leap.html - copied unchanged from r281364, head/contrib/ntp/html/leap.html projects/sendfile/contrib/ntp/html/ntp-wait.html - copied unchanged from r281364, head/contrib/ntp/html/ntp-wait.html projects/sendfile/contrib/ntp/html/orphan.html - copied unchanged from r281364, head/contrib/ntp/html/orphan.html projects/sendfile/contrib/ntp/html/pic/ - copied from r281364, head/contrib/ntp/html/pic/ projects/sendfile/contrib/ntp/html/poll.html - copied unchanged from r281364, head/contrib/ntp/html/poll.html projects/sendfile/contrib/ntp/html/quick.html - copied unchanged from r281364, head/contrib/ntp/html/quick.html projects/sendfile/contrib/ntp/html/rate.html - copied unchanged from r281364, head/contrib/ntp/html/rate.html projects/sendfile/contrib/ntp/html/scripts/accopt.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/accopt.txt projects/sendfile/contrib/ntp/html/scripts/audio.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/audio.txt projects/sendfile/contrib/ntp/html/scripts/authopt.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/authopt.txt projects/sendfile/contrib/ntp/html/scripts/clockopt.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/clockopt.txt projects/sendfile/contrib/ntp/html/scripts/command.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/command.txt projects/sendfile/contrib/ntp/html/scripts/config.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/config.txt projects/sendfile/contrib/ntp/html/scripts/confopt.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/confopt.txt projects/sendfile/contrib/ntp/html/scripts/external.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/external.txt projects/sendfile/contrib/ntp/html/scripts/hand.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/hand.txt projects/sendfile/contrib/ntp/html/scripts/install.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/install.txt projects/sendfile/contrib/ntp/html/scripts/manual.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/manual.txt projects/sendfile/contrib/ntp/html/scripts/misc.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/misc.txt projects/sendfile/contrib/ntp/html/scripts/miscopt.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/miscopt.txt projects/sendfile/contrib/ntp/html/scripts/monopt.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/monopt.txt projects/sendfile/contrib/ntp/html/scripts/refclock.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/refclock.txt projects/sendfile/contrib/ntp/html/scripts/special.txt - copied unchanged from r281364, head/contrib/ntp/html/scripts/special.txt projects/sendfile/contrib/ntp/html/select.html - copied unchanged from r281364, head/contrib/ntp/html/select.html projects/sendfile/contrib/ntp/html/sitemap.html - copied unchanged from r281364, head/contrib/ntp/html/sitemap.html projects/sendfile/contrib/ntp/html/stats.html - copied unchanged from r281364, head/contrib/ntp/html/stats.html projects/sendfile/contrib/ntp/html/warp.html - copied unchanged from r281364, head/contrib/ntp/html/warp.html projects/sendfile/contrib/ntp/html/xleave.html - copied unchanged from r281364, head/contrib/ntp/html/xleave.html projects/sendfile/contrib/ntp/include/declcond.h - copied unchanged from r281364, head/contrib/ntp/include/declcond.h projects/sendfile/contrib/ntp/include/intreswork.h - copied unchanged from r281364, head/contrib/ntp/include/intreswork.h projects/sendfile/contrib/ntp/include/lib_strbuf.h - copied unchanged from r281364, head/contrib/ntp/include/lib_strbuf.h projects/sendfile/contrib/ntp/include/libntp.h - copied unchanged from r281364, head/contrib/ntp/include/libntp.h projects/sendfile/contrib/ntp/include/ntp_assert.h - copied unchanged from r281364, head/contrib/ntp/include/ntp_assert.h projects/sendfile/contrib/ntp/include/ntp_intres.h - copied unchanged from r281364, head/contrib/ntp/include/ntp_intres.h projects/sendfile/contrib/ntp/include/ntp_libopts.h - copied unchanged from r281364, head/contrib/ntp/include/ntp_libopts.h projects/sendfile/contrib/ntp/include/ntp_lineedit.h - copied unchanged from r281364, head/contrib/ntp/include/ntp_lineedit.h projects/sendfile/contrib/ntp/include/ntp_lists.h - copied unchanged from r281364, head/contrib/ntp/include/ntp_lists.h projects/sendfile/contrib/ntp/include/ntp_net.h - copied unchanged from r281364, head/contrib/ntp/include/ntp_net.h projects/sendfile/contrib/ntp/include/ntp_prio_q.h - copied unchanged from r281364, head/contrib/ntp/include/ntp_prio_q.h projects/sendfile/contrib/ntp/include/ntp_worker.h - copied unchanged from r281364, head/contrib/ntp/include/ntp_worker.h projects/sendfile/contrib/ntp/include/ntp_workimpl.h - copied unchanged from r281364, head/contrib/ntp/include/ntp_workimpl.h projects/sendfile/contrib/ntp/include/refclock_atom.h - copied unchanged from r281364, head/contrib/ntp/include/refclock_atom.h projects/sendfile/contrib/ntp/include/ssl_applink.c - copied unchanged from r281364, head/contrib/ntp/include/ssl_applink.c projects/sendfile/contrib/ntp/include/timespecops.h - copied unchanged from r281364, head/contrib/ntp/include/timespecops.h projects/sendfile/contrib/ntp/include/timetoa.h - copied unchanged from r281364, head/contrib/ntp/include/timetoa.h projects/sendfile/contrib/ntp/include/timevalops.h - copied unchanged from r281364, head/contrib/ntp/include/timevalops.h projects/sendfile/contrib/ntp/include/vint64ops.h - copied unchanged from r281364, head/contrib/ntp/include/vint64ops.h projects/sendfile/contrib/ntp/includes.mf - copied unchanged from r281364, head/contrib/ntp/includes.mf projects/sendfile/contrib/ntp/lib/ - copied from r281364, head/contrib/ntp/lib/ projects/sendfile/contrib/ntp/libjsmn/ - copied from r281364, head/contrib/ntp/libjsmn/ projects/sendfile/contrib/ntp/libntp/bsd_strerror.c - copied unchanged from r281364, head/contrib/ntp/libntp/bsd_strerror.c projects/sendfile/contrib/ntp/libntp/ntp_calendar.c - copied unchanged from r281364, head/contrib/ntp/libntp/ntp_calendar.c projects/sendfile/contrib/ntp/libntp/ntp_crypto_rnd.c - copied unchanged from r281364, head/contrib/ntp/libntp/ntp_crypto_rnd.c projects/sendfile/contrib/ntp/libntp/ntp_intres.c - copied unchanged from r281364, head/contrib/ntp/libntp/ntp_intres.c projects/sendfile/contrib/ntp/libntp/ntp_libopts.c - copied unchanged from r281364, head/contrib/ntp/libntp/ntp_libopts.c projects/sendfile/contrib/ntp/libntp/ntp_lineedit.c - copied unchanged from r281364, head/contrib/ntp/libntp/ntp_lineedit.c projects/sendfile/contrib/ntp/libntp/ntp_worker.c - copied unchanged from r281364, head/contrib/ntp/libntp/ntp_worker.c projects/sendfile/contrib/ntp/libntp/socket.c - copied unchanged from r281364, head/contrib/ntp/libntp/socket.c projects/sendfile/contrib/ntp/libntp/ssl_init.c - copied unchanged from r281364, head/contrib/ntp/libntp/ssl_init.c projects/sendfile/contrib/ntp/libntp/strl_obsd.c - copied unchanged from r281364, head/contrib/ntp/libntp/strl_obsd.c projects/sendfile/contrib/ntp/libntp/timetoa.c - copied unchanged from r281364, head/contrib/ntp/libntp/timetoa.c projects/sendfile/contrib/ntp/libntp/timevalops.c - copied unchanged from r281364, head/contrib/ntp/libntp/timevalops.c projects/sendfile/contrib/ntp/libntp/vint64ops.c - copied unchanged from r281364, head/contrib/ntp/libntp/vint64ops.c projects/sendfile/contrib/ntp/libntp/work_fork.c - copied unchanged from r281364, head/contrib/ntp/libntp/work_fork.c projects/sendfile/contrib/ntp/libntp/work_thread.c - copied unchanged from r281364, head/contrib/ntp/libntp/work_thread.c projects/sendfile/contrib/ntp/libparse/clk_sel240x.c - copied unchanged from r281364, head/contrib/ntp/libparse/clk_sel240x.c projects/sendfile/contrib/ntp/ntpd/complete.conf.in - copied unchanged from r281364, head/contrib/ntp/ntpd/complete.conf.in projects/sendfile/contrib/ntp/ntpd/declcond.h - copied unchanged from r281364, head/contrib/ntp/ntpd/declcond.h projects/sendfile/contrib/ntp/ntpd/invoke-ntp.conf.menu - copied unchanged from r281364, head/contrib/ntp/ntpd/invoke-ntp.conf.menu projects/sendfile/contrib/ntp/ntpd/invoke-ntp.conf.texi - copied unchanged from r281364, head/contrib/ntp/ntpd/invoke-ntp.conf.texi projects/sendfile/contrib/ntp/ntpd/invoke-ntp.keys.menu - copied unchanged from r281364, head/contrib/ntp/ntpd/invoke-ntp.keys.menu projects/sendfile/contrib/ntp/ntpd/invoke-ntp.keys.texi - copied unchanged from r281364, head/contrib/ntp/ntpd/invoke-ntp.keys.texi projects/sendfile/contrib/ntp/ntpd/invoke-ntpd.menu - copied unchanged from r281364, head/contrib/ntp/ntpd/invoke-ntpd.menu projects/sendfile/contrib/ntp/ntpd/invoke-ntpd.texi - copied unchanged from r281364, head/contrib/ntp/ntpd/invoke-ntpd.texi projects/sendfile/contrib/ntp/ntpd/keyword-gen-utd - copied unchanged from r281364, head/contrib/ntp/ntpd/keyword-gen-utd projects/sendfile/contrib/ntp/ntpd/keyword-gen.c - copied unchanged from r281364, head/contrib/ntp/ntpd/keyword-gen.c projects/sendfile/contrib/ntp/ntpd/ntp.conf.5man - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp.conf.5man projects/sendfile/contrib/ntp/ntpd/ntp.conf.5mdoc - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp.conf.5mdoc projects/sendfile/contrib/ntp/ntpd/ntp.conf.def - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp.conf.def projects/sendfile/contrib/ntp/ntpd/ntp.conf.html - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp.conf.html projects/sendfile/contrib/ntp/ntpd/ntp.conf.man.in - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp.conf.man.in projects/sendfile/contrib/ntp/ntpd/ntp.conf.mdoc.in - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp.conf.mdoc.in projects/sendfile/contrib/ntp/ntpd/ntp.conf.texi - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp.conf.texi projects/sendfile/contrib/ntp/ntpd/ntp.keys.5man - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp.keys.5man projects/sendfile/contrib/ntp/ntpd/ntp.keys.5mdoc - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp.keys.5mdoc projects/sendfile/contrib/ntp/ntpd/ntp.keys.def - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp.keys.def projects/sendfile/contrib/ntp/ntpd/ntp.keys.html - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp.keys.html projects/sendfile/contrib/ntp/ntpd/ntp.keys.man.in - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp.keys.man.in projects/sendfile/contrib/ntp/ntpd/ntp.keys.mdoc.in - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp.keys.mdoc.in projects/sendfile/contrib/ntp/ntpd/ntp.keys.texi - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp.keys.texi projects/sendfile/contrib/ntp/ntpd/ntp_keyword.h - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp_keyword.h projects/sendfile/contrib/ntp/ntpd/ntp_leapsec.c - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp_leapsec.c projects/sendfile/contrib/ntp/ntpd/ntp_leapsec.h - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp_leapsec.h projects/sendfile/contrib/ntp/ntpd/ntp_parser.c - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp_parser.c projects/sendfile/contrib/ntp/ntpd/ntp_parser.h - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp_parser.h projects/sendfile/contrib/ntp/ntpd/ntp_prio_q.c - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp_prio_q.c projects/sendfile/contrib/ntp/ntpd/ntp_scanner.c - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp_scanner.c projects/sendfile/contrib/ntp/ntpd/ntp_scanner.h - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp_scanner.h projects/sendfile/contrib/ntp/ntpd/ntp_signd.c - copied unchanged from r281364, head/contrib/ntp/ntpd/ntp_signd.c projects/sendfile/contrib/ntp/ntpd/ntpd.1ntpdman - copied unchanged from r281364, head/contrib/ntp/ntpd/ntpd.1ntpdman projects/sendfile/contrib/ntp/ntpd/ntpd.1ntpdmdoc - copied unchanged from r281364, head/contrib/ntp/ntpd/ntpd.1ntpdmdoc projects/sendfile/contrib/ntp/ntpd/ntpd.html - copied unchanged from r281364, head/contrib/ntp/ntpd/ntpd.html projects/sendfile/contrib/ntp/ntpd/ntpd.man.in - copied unchanged from r281364, head/contrib/ntp/ntpd/ntpd.man.in projects/sendfile/contrib/ntp/ntpd/ntpd.mdoc.in - copied unchanged from r281364, head/contrib/ntp/ntpd/ntpd.mdoc.in projects/sendfile/contrib/ntp/ntpd/ntpd.texi - copied unchanged from r281364, head/contrib/ntp/ntpd/ntpd.texi projects/sendfile/contrib/ntp/ntpd/refclock_gpsdjson.c - copied unchanged from r281364, head/contrib/ntp/ntpd/refclock_gpsdjson.c projects/sendfile/contrib/ntp/ntpd/refclock_tsyncpci.c - copied unchanged from r281364, head/contrib/ntp/ntpd/refclock_tsyncpci.c projects/sendfile/contrib/ntp/ntpdc/invoke-ntpdc.menu - copied unchanged from r281364, head/contrib/ntp/ntpdc/invoke-ntpdc.menu projects/sendfile/contrib/ntp/ntpdc/invoke-ntpdc.texi - copied unchanged from r281364, head/contrib/ntp/ntpdc/invoke-ntpdc.texi projects/sendfile/contrib/ntp/ntpdc/ntpdc.1ntpdcman - copied unchanged from r281364, head/contrib/ntp/ntpdc/ntpdc.1ntpdcman projects/sendfile/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc - copied unchanged from r281364, head/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc projects/sendfile/contrib/ntp/ntpdc/ntpdc.html - copied unchanged from r281364, head/contrib/ntp/ntpdc/ntpdc.html projects/sendfile/contrib/ntp/ntpdc/ntpdc.man.in - copied unchanged from r281364, head/contrib/ntp/ntpdc/ntpdc.man.in projects/sendfile/contrib/ntp/ntpdc/ntpdc.mdoc.in - copied unchanged from r281364, head/contrib/ntp/ntpdc/ntpdc.mdoc.in projects/sendfile/contrib/ntp/ntpdc/ntpdc.texi - copied unchanged from r281364, head/contrib/ntp/ntpdc/ntpdc.texi projects/sendfile/contrib/ntp/ntpq/invoke-ntpq.menu - copied unchanged from r281364, head/contrib/ntp/ntpq/invoke-ntpq.menu projects/sendfile/contrib/ntp/ntpq/invoke-ntpq.texi - copied unchanged from r281364, head/contrib/ntp/ntpq/invoke-ntpq.texi projects/sendfile/contrib/ntp/ntpq/libntpq.c - copied unchanged from r281364, head/contrib/ntp/ntpq/libntpq.c projects/sendfile/contrib/ntp/ntpq/libntpq.h - copied unchanged from r281364, head/contrib/ntp/ntpq/libntpq.h projects/sendfile/contrib/ntp/ntpq/libntpq_subs.c - copied unchanged from r281364, head/contrib/ntp/ntpq/libntpq_subs.c projects/sendfile/contrib/ntp/ntpq/ntpq.1ntpqman - copied unchanged from r281364, head/contrib/ntp/ntpq/ntpq.1ntpqman projects/sendfile/contrib/ntp/ntpq/ntpq.1ntpqmdoc - copied unchanged from r281364, head/contrib/ntp/ntpq/ntpq.1ntpqmdoc projects/sendfile/contrib/ntp/ntpq/ntpq.html - copied unchanged from r281364, head/contrib/ntp/ntpq/ntpq.html projects/sendfile/contrib/ntp/ntpq/ntpq.man.in - copied unchanged from r281364, head/contrib/ntp/ntpq/ntpq.man.in projects/sendfile/contrib/ntp/ntpq/ntpq.mdoc.in - copied unchanged from r281364, head/contrib/ntp/ntpq/ntpq.mdoc.in projects/sendfile/contrib/ntp/ntpq/ntpq.texi - copied unchanged from r281364, head/contrib/ntp/ntpq/ntpq.texi projects/sendfile/contrib/ntp/ntpsnmpd/ - copied from r281364, head/contrib/ntp/ntpsnmpd/ projects/sendfile/contrib/ntp/scripts/build/ - copied from r281364, head/contrib/ntp/scripts/build/ projects/sendfile/contrib/ntp/scripts/calc_tickadj/ - copied from r281364, head/contrib/ntp/scripts/calc_tickadj/ projects/sendfile/contrib/ntp/scripts/deprecated/ - copied from r281364, head/contrib/ntp/scripts/deprecated/ projects/sendfile/contrib/ntp/scripts/invoke-plot_summary.menu - copied unchanged from r281364, head/contrib/ntp/scripts/invoke-plot_summary.menu projects/sendfile/contrib/ntp/scripts/invoke-plot_summary.texi - copied unchanged from r281364, head/contrib/ntp/scripts/invoke-plot_summary.texi projects/sendfile/contrib/ntp/scripts/invoke-summary.menu - copied unchanged from r281364, head/contrib/ntp/scripts/invoke-summary.menu projects/sendfile/contrib/ntp/scripts/invoke-summary.texi - copied unchanged from r281364, head/contrib/ntp/scripts/invoke-summary.texi projects/sendfile/contrib/ntp/scripts/lib/ - copied from r281364, head/contrib/ntp/scripts/lib/ projects/sendfile/contrib/ntp/scripts/ntp-wait/ - copied from r281364, head/contrib/ntp/scripts/ntp-wait/ projects/sendfile/contrib/ntp/scripts/ntpsweep/ - copied from r281364, head/contrib/ntp/scripts/ntpsweep/ projects/sendfile/contrib/ntp/scripts/ntptrace/ - copied from r281364, head/contrib/ntp/scripts/ntptrace/ projects/sendfile/contrib/ntp/scripts/plot_summary-opts - copied unchanged from r281364, head/contrib/ntp/scripts/plot_summary-opts projects/sendfile/contrib/ntp/scripts/plot_summary-opts.def - copied unchanged from r281364, head/contrib/ntp/scripts/plot_summary-opts.def projects/sendfile/contrib/ntp/scripts/plot_summary.1plot_summaryman - copied unchanged from r281364, head/contrib/ntp/scripts/plot_summary.1plot_summaryman projects/sendfile/contrib/ntp/scripts/plot_summary.1plot_summarymdoc - copied unchanged from r281364, head/contrib/ntp/scripts/plot_summary.1plot_summarymdoc projects/sendfile/contrib/ntp/scripts/plot_summary.html - copied unchanged from r281364, head/contrib/ntp/scripts/plot_summary.html projects/sendfile/contrib/ntp/scripts/plot_summary.man.in - copied unchanged from r281364, head/contrib/ntp/scripts/plot_summary.man.in projects/sendfile/contrib/ntp/scripts/plot_summary.mdoc.in - copied unchanged from r281364, head/contrib/ntp/scripts/plot_summary.mdoc.in projects/sendfile/contrib/ntp/scripts/plot_summary.texi - copied unchanged from r281364, head/contrib/ntp/scripts/plot_summary.texi projects/sendfile/contrib/ntp/scripts/rc/ - copied from r281364, head/contrib/ntp/scripts/rc/ projects/sendfile/contrib/ntp/scripts/summary-opts - copied unchanged from r281364, head/contrib/ntp/scripts/summary-opts projects/sendfile/contrib/ntp/scripts/summary-opts.def - copied unchanged from r281364, head/contrib/ntp/scripts/summary-opts.def projects/sendfile/contrib/ntp/scripts/summary.1summaryman - copied unchanged from r281364, head/contrib/ntp/scripts/summary.1summaryman projects/sendfile/contrib/ntp/scripts/summary.1summarymdoc - copied unchanged from r281364, head/contrib/ntp/scripts/summary.1summarymdoc projects/sendfile/contrib/ntp/scripts/summary.html - copied unchanged from r281364, head/contrib/ntp/scripts/summary.html projects/sendfile/contrib/ntp/scripts/summary.man.in - copied unchanged from r281364, head/contrib/ntp/scripts/summary.man.in projects/sendfile/contrib/ntp/scripts/summary.mdoc.in - copied unchanged from r281364, head/contrib/ntp/scripts/summary.mdoc.in projects/sendfile/contrib/ntp/scripts/summary.texi - copied unchanged from r281364, head/contrib/ntp/scripts/summary.texi projects/sendfile/contrib/ntp/sntp/ag-tpl/ - copied from r281364, head/contrib/ntp/sntp/ag-tpl/ projects/sendfile/contrib/ntp/sntp/check-libntp.mf - copied unchanged from r281364, head/contrib/ntp/sntp/check-libntp.mf projects/sendfile/contrib/ntp/sntp/check-libopts.mf - copied unchanged from r281364, head/contrib/ntp/sntp/check-libopts.mf projects/sendfile/contrib/ntp/sntp/crypto.c - copied unchanged from r281364, head/contrib/ntp/sntp/crypto.c projects/sendfile/contrib/ntp/sntp/crypto.h - copied unchanged from r281364, head/contrib/ntp/sntp/crypto.h projects/sendfile/contrib/ntp/sntp/data_formats.h - copied unchanged from r281364, head/contrib/ntp/sntp/data_formats.h projects/sendfile/contrib/ntp/sntp/deps-ver - copied unchanged from r281364, head/contrib/ntp/sntp/deps-ver projects/sendfile/contrib/ntp/sntp/depsver.mf - copied unchanged from r281364, head/contrib/ntp/sntp/depsver.mf projects/sendfile/contrib/ntp/sntp/include/ - copied from r281364, head/contrib/ntp/sntp/include/ projects/sendfile/contrib/ntp/sntp/includes.mf - copied unchanged from r281364, head/contrib/ntp/sntp/includes.mf projects/sendfile/contrib/ntp/sntp/invoke-sntp.menu - copied unchanged from r281364, head/contrib/ntp/sntp/invoke-sntp.menu projects/sendfile/contrib/ntp/sntp/invoke-sntp.texi - copied unchanged from r281364, head/contrib/ntp/sntp/invoke-sntp.texi projects/sendfile/contrib/ntp/sntp/kod_management.c - copied unchanged from r281364, head/contrib/ntp/sntp/kod_management.c projects/sendfile/contrib/ntp/sntp/kod_management.h - copied unchanged from r281364, head/contrib/ntp/sntp/kod_management.h projects/sendfile/contrib/ntp/sntp/libevent/ - copied from r281364, head/contrib/ntp/sntp/libevent/ projects/sendfile/contrib/ntp/sntp/libopts/COPYING.gplv3 - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/COPYING.gplv3 projects/sendfile/contrib/ntp/sntp/libopts/COPYING.lgplv3 - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/COPYING.lgplv3 projects/sendfile/contrib/ntp/sntp/libopts/ag-char-map.h - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/ag-char-map.h projects/sendfile/contrib/ntp/sntp/libopts/alias.c - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/alias.c projects/sendfile/contrib/ntp/sntp/libopts/ao-strs.c - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/ao-strs.c projects/sendfile/contrib/ntp/sntp/libopts/ao-strs.h - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/ao-strs.h projects/sendfile/contrib/ntp/sntp/libopts/autoopts/project.h - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/autoopts/project.h projects/sendfile/contrib/ntp/sntp/libopts/check.c - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/check.c projects/sendfile/contrib/ntp/sntp/libopts/compat/_Noreturn.h - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/compat/_Noreturn.h projects/sendfile/contrib/ntp/sntp/libopts/enum.c - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/enum.c projects/sendfile/contrib/ntp/sntp/libopts/env.c - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/env.c projects/sendfile/contrib/ntp/sntp/libopts/file.c - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/file.c projects/sendfile/contrib/ntp/sntp/libopts/find.c - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/find.c projects/sendfile/contrib/ntp/sntp/libopts/gettext.h - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/gettext.h projects/sendfile/contrib/ntp/sntp/libopts/init.c - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/init.c projects/sendfile/contrib/ntp/sntp/libopts/intprops.h - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/intprops.h projects/sendfile/contrib/ntp/sntp/libopts/m4/stdnoreturn.m4 - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/m4/stdnoreturn.m4 projects/sendfile/contrib/ntp/sntp/libopts/option-value-type.c - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/option-value-type.c projects/sendfile/contrib/ntp/sntp/libopts/option-value-type.h - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/option-value-type.h projects/sendfile/contrib/ntp/sntp/libopts/option-xat-attribute.c - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/option-xat-attribute.c projects/sendfile/contrib/ntp/sntp/libopts/option-xat-attribute.h - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/option-xat-attribute.h projects/sendfile/contrib/ntp/sntp/libopts/parse-duration.c - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/parse-duration.c projects/sendfile/contrib/ntp/sntp/libopts/parse-duration.h - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/parse-duration.h projects/sendfile/contrib/ntp/sntp/libopts/reset.c - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/reset.c projects/sendfile/contrib/ntp/sntp/libopts/stdnoreturn.in.h - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/stdnoreturn.in.h projects/sendfile/contrib/ntp/sntp/libopts/time.c - copied unchanged from r281364, head/contrib/ntp/sntp/libopts/time.c projects/sendfile/contrib/ntp/sntp/loc/ - copied from r281364, head/contrib/ntp/sntp/loc/ projects/sendfile/contrib/ntp/sntp/log.c - copied unchanged from r281364, head/contrib/ntp/sntp/log.c projects/sendfile/contrib/ntp/sntp/log.h - copied unchanged from r281364, head/contrib/ntp/sntp/log.h projects/sendfile/contrib/ntp/sntp/m4/ - copied from r281364, head/contrib/ntp/sntp/m4/ projects/sendfile/contrib/ntp/sntp/main.h - copied unchanged from r281364, head/contrib/ntp/sntp/main.h projects/sendfile/contrib/ntp/sntp/networking.c - copied unchanged from r281364, head/contrib/ntp/sntp/networking.c projects/sendfile/contrib/ntp/sntp/networking.h - copied unchanged from r281364, head/contrib/ntp/sntp/networking.h projects/sendfile/contrib/ntp/sntp/scm-rev - copied unchanged from r281364, head/contrib/ntp/sntp/scm-rev projects/sendfile/contrib/ntp/sntp/scripts/ - copied from r281364, head/contrib/ntp/sntp/scripts/ projects/sendfile/contrib/ntp/sntp/sntp.1sntpman - copied unchanged from r281364, head/contrib/ntp/sntp/sntp.1sntpman projects/sendfile/contrib/ntp/sntp/sntp.1sntpmdoc - copied unchanged from r281364, head/contrib/ntp/sntp/sntp.1sntpmdoc projects/sendfile/contrib/ntp/sntp/sntp.c - copied unchanged from r281364, head/contrib/ntp/sntp/sntp.c projects/sendfile/contrib/ntp/sntp/sntp.html - copied unchanged from r281364, head/contrib/ntp/sntp/sntp.html projects/sendfile/contrib/ntp/sntp/sntp.man.in - copied unchanged from r281364, head/contrib/ntp/sntp/sntp.man.in projects/sendfile/contrib/ntp/sntp/sntp.mdoc.in - copied unchanged from r281364, head/contrib/ntp/sntp/sntp.mdoc.in projects/sendfile/contrib/ntp/sntp/sntp.texi - copied unchanged from r281364, head/contrib/ntp/sntp/sntp.texi projects/sendfile/contrib/ntp/sntp/tests/ - copied from r281364, head/contrib/ntp/sntp/tests/ projects/sendfile/contrib/ntp/sntp/tests_main.cpp - copied unchanged from r281364, head/contrib/ntp/sntp/tests_main.cpp projects/sendfile/contrib/ntp/sntp/tests_main.h - copied unchanged from r281364, head/contrib/ntp/sntp/tests_main.h projects/sendfile/contrib/ntp/sntp/utilities.c - copied unchanged from r281364, head/contrib/ntp/sntp/utilities.c projects/sendfile/contrib/ntp/sntp/utilities.h - copied unchanged from r281364, head/contrib/ntp/sntp/utilities.h projects/sendfile/contrib/ntp/tests/ - copied from r281364, head/contrib/ntp/tests/ projects/sendfile/contrib/ntp/util/invoke-ntp-keygen.menu - copied unchanged from r281364, head/contrib/ntp/util/invoke-ntp-keygen.menu projects/sendfile/contrib/ntp/util/invoke-ntp-keygen.texi - copied unchanged from r281364, head/contrib/ntp/util/invoke-ntp-keygen.texi projects/sendfile/contrib/ntp/util/ntp-keygen.1ntp-keygenman - copied unchanged from r281364, head/contrib/ntp/util/ntp-keygen.1ntp-keygenman projects/sendfile/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc - copied unchanged from r281364, head/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc projects/sendfile/contrib/ntp/util/ntp-keygen.html - copied unchanged from r281364, head/contrib/ntp/util/ntp-keygen.html projects/sendfile/contrib/ntp/util/ntp-keygen.man.in - copied unchanged from r281364, head/contrib/ntp/util/ntp-keygen.man.in projects/sendfile/contrib/ntp/util/ntp-keygen.mdoc.in - copied unchanged from r281364, head/contrib/ntp/util/ntp-keygen.mdoc.in projects/sendfile/contrib/ntp/util/ntp-keygen.texi - copied unchanged from r281364, head/contrib/ntp/util/ntp-keygen.texi projects/sendfile/contrib/ntp/util/tg2.c - copied unchanged from r281364, head/contrib/ntp/util/tg2.c projects/sendfile/contrib/ntp/ylwrap - copied unchanged from r281364, head/contrib/ntp/ylwrap projects/sendfile/crypto/openssl/crypto/evp/evp_extra_test.c - copied unchanged from r281364, head/crypto/openssl/crypto/evp/evp_extra_test.c projects/sendfile/crypto/openssl/doc/crypto/d2i_CMS_ContentInfo.pod - copied unchanged from r281364, head/crypto/openssl/doc/crypto/d2i_CMS_ContentInfo.pod projects/sendfile/crypto/openssl/doc/crypto/d2i_ECPrivateKey.pod - copied unchanged from r281364, head/crypto/openssl/doc/crypto/d2i_ECPrivateKey.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_CTX_set_read_ahead.pod - copied unchanged from r281364, head/crypto/openssl/doc/ssl/SSL_CTX_set_read_ahead.pod projects/sendfile/crypto/openssl/util/indent.pro - copied unchanged from r281364, head/crypto/openssl/util/indent.pro projects/sendfile/crypto/openssl/util/openssl-format-source - copied unchanged from r281364, head/crypto/openssl/util/openssl-format-source projects/sendfile/crypto/openssl/util/su-filter.pl - copied unchanged from r281364, head/crypto/openssl/util/su-filter.pl projects/sendfile/etc/etc.aarch64/ - copied from r281364, head/etc/etc.aarch64/ projects/sendfile/lib/csu/aarch64/ - copied from r281364, head/lib/csu/aarch64/ projects/sendfile/lib/libc/aarch64/ - copied from r281364, head/lib/libc/aarch64/ projects/sendfile/lib/libc/sys/kevent.c - copied unchanged from r281364, head/lib/libc/sys/kevent.c projects/sendfile/lib/libc/sys/trivial-vdso_tc.c - copied unchanged from r281364, head/lib/libc/sys/trivial-vdso_tc.c projects/sendfile/lib/libkvm/kvm_aarch64.c - copied unchanged from r281364, head/lib/libkvm/kvm_aarch64.c projects/sendfile/lib/libthr/arch/aarch64/ - copied from r281364, head/lib/libthr/arch/aarch64/ projects/sendfile/lib/libthread_db/arch/aarch64/ - copied from r281364, head/lib/libthread_db/arch/aarch64/ projects/sendfile/lib/msun/aarch64/ - copied from r281364, head/lib/msun/aarch64/ projects/sendfile/libexec/rtld-elf/aarch64/ - copied from r281364, head/libexec/rtld-elf/aarch64/ projects/sendfile/release/Makefile.ec2 - copied unchanged from r281364, head/release/Makefile.ec2 projects/sendfile/release/tools/ec2.conf - copied unchanged from r281364, head/release/tools/ec2.conf projects/sendfile/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3 - copied unchanged from r281364, head/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3 projects/sendfile/secure/lib/libcrypto/man/d2i_ECPrivateKey.3 - copied unchanged from r281364, head/secure/lib/libcrypto/man/d2i_ECPrivateKey.3 projects/sendfile/secure/lib/libcrypto/opensslconf-aarch64.h - copied unchanged from r281364, head/secure/lib/libcrypto/opensslconf-aarch64.h projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3 - copied unchanged from r281364, head/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3 projects/sendfile/share/man/man4/ds1307.4 - copied unchanged from r281364, head/share/man/man4/ds1307.4 projects/sendfile/sys/arm/amlogic/ - copied from r281364, head/sys/arm/amlogic/ projects/sendfile/sys/arm/arm/pmap-v6-new.c - copied unchanged from r281364, head/sys/arm/arm/pmap-v6-new.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2836.c - copied unchanged from r281364, head/sys/arm/broadcom/bcm2835/bcm2836.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2836.h - copied unchanged from r281364, head/sys/arm/broadcom/bcm2835/bcm2836.h projects/sendfile/sys/arm/broadcom/bcm2835/files.bcm2836 - copied unchanged from r281364, head/sys/arm/broadcom/bcm2835/files.bcm2836 projects/sendfile/sys/arm/broadcom/bcm2835/files.bcm283x - copied unchanged from r281364, head/sys/arm/broadcom/bcm2835/files.bcm283x projects/sendfile/sys/arm/broadcom/bcm2835/std.bcm2836 - copied unchanged from r281364, head/sys/arm/broadcom/bcm2835/std.bcm2836 projects/sendfile/sys/arm/conf/ODROIDC1 - copied unchanged from r281364, head/sys/arm/conf/ODROIDC1 projects/sendfile/sys/arm/conf/RPI2 - copied unchanged from r281364, head/sys/arm/conf/RPI2 projects/sendfile/sys/arm/conf/SOCKIT.common - copied unchanged from r281364, head/sys/arm/conf/SOCKIT.common projects/sendfile/sys/arm/conf/VSATV102 - copied unchanged from r281364, head/sys/arm/conf/VSATV102 projects/sendfile/sys/arm/include/pmap-v6.h - copied unchanged from r281364, head/sys/arm/include/pmap-v6.h projects/sendfile/sys/arm/include/pmap_var.h - copied unchanged from r281364, head/sys/arm/include/pmap_var.h projects/sendfile/sys/arm/include/pte-v6.h - copied unchanged from r281364, head/sys/arm/include/pte-v6.h projects/sendfile/sys/arm64/ - copied from r281364, head/sys/arm64/ projects/sendfile/sys/boot/efi/boot1/ - copied from r281364, head/sys/boot/efi/boot1/ projects/sendfile/sys/boot/efi/fdt/ - copied from r281364, head/sys/boot/efi/fdt/ projects/sendfile/sys/boot/efi/include/arm/ - copied from r281364, head/sys/boot/efi/include/arm/ projects/sendfile/sys/boot/efi/loader/ - copied from r281364, head/sys/boot/efi/loader/ projects/sendfile/sys/boot/fdt/dts/arm/bcm2836.dtsi - copied unchanged from r281364, head/sys/boot/fdt/dts/arm/bcm2836.dtsi projects/sendfile/sys/boot/fdt/dts/arm/odroidc1.dts - copied unchanged from r281364, head/sys/boot/fdt/dts/arm/odroidc1.dts projects/sendfile/sys/boot/fdt/dts/arm/rpi2.dts - copied unchanged from r281364, head/sys/boot/fdt/dts/arm/rpi2.dts projects/sendfile/sys/boot/fdt/dts/arm/vsatv102-m6.dts - copied unchanged from r281364, head/sys/boot/fdt/dts/arm/vsatv102-m6.dts projects/sendfile/sys/boot/ficl/aarch64/ - copied from r281364, head/sys/boot/ficl/aarch64/ projects/sendfile/sys/boot/forth/Makefile - copied unchanged from r281364, head/sys/boot/forth/Makefile projects/sendfile/sys/boot/forth/Makefile.inc - copied unchanged from r281364, head/sys/boot/forth/Makefile.inc projects/sendfile/sys/boot/forth/brand-fbsd.4th - copied unchanged from r281364, head/sys/boot/forth/brand-fbsd.4th projects/sendfile/sys/boot/forth/logo-beastie.4th - copied unchanged from r281364, head/sys/boot/forth/logo-beastie.4th projects/sendfile/sys/boot/forth/logo-beastiebw.4th - copied unchanged from r281364, head/sys/boot/forth/logo-beastiebw.4th projects/sendfile/sys/boot/forth/logo-fbsdbw.4th - copied unchanged from r281364, head/sys/boot/forth/logo-fbsdbw.4th projects/sendfile/sys/boot/forth/logo-orb.4th - copied unchanged from r281364, head/sys/boot/forth/logo-orb.4th projects/sendfile/sys/boot/forth/logo-orbbw.4th - copied unchanged from r281364, head/sys/boot/forth/logo-orbbw.4th projects/sendfile/sys/boot/i386/libi386/smbios.h - copied unchanged from r281364, head/sys/boot/i386/libi386/smbios.h projects/sendfile/sys/dev/drm2/drm_os_freebsd.c - copied unchanged from r281364, head/sys/dev/drm2/drm_os_freebsd.c projects/sendfile/sys/dev/hwpmc/hwpmc_mips74k.c - copied unchanged from r281364, head/sys/dev/hwpmc/hwpmc_mips74k.c projects/sendfile/sys/dev/iicbus/ds1307.c - copied unchanged from r281364, head/sys/dev/iicbus/ds1307.c projects/sendfile/sys/dev/iicbus/ds1307reg.h - copied unchanged from r281364, head/sys/dev/iicbus/ds1307reg.h projects/sendfile/sys/dev/ixgbe/if_ix.c - copied unchanged from r281364, head/sys/dev/ixgbe/if_ix.c projects/sendfile/sys/dev/ixgbe/if_ixv.c - copied unchanged from r281364, head/sys/dev/ixgbe/if_ixv.c projects/sendfile/sys/dev/ixgbe/ix_txrx.c - copied unchanged from r281364, head/sys/dev/ixgbe/ix_txrx.c projects/sendfile/sys/dev/sfxge/sfxge_version.h - copied unchanged from r281364, head/sys/dev/sfxge/sfxge_version.h projects/sendfile/sys/dev/xen/debug/ - copied from r281364, head/sys/dev/xen/debug/ projects/sendfile/sys/mips/conf/DIR-655A1 - copied unchanged from r281364, head/sys/mips/conf/DIR-655A1 projects/sendfile/sys/mips/conf/DIR-655A1.hints - copied unchanged from r281364, head/sys/mips/conf/DIR-655A1.hints projects/sendfile/sys/mips/conf/TL-WDR4300 - copied unchanged from r281364, head/sys/mips/conf/TL-WDR4300 projects/sendfile/sys/mips/conf/TL-WDR4300.hints - copied unchanged from r281364, head/sys/mips/conf/TL-WDR4300.hints projects/sendfile/sys/modules/ix/ - copied from r281364, head/sys/modules/ix/ projects/sendfile/sys/modules/ixv/ - copied from r281364, head/sys/modules/ixv/ projects/sendfile/sys/netinet/ip_reass.c - copied unchanged from r281364, head/sys/netinet/ip_reass.c projects/sendfile/sys/powerpc/mpc85xx/mpc85xx_gpio.c - copied unchanged from r281364, head/sys/powerpc/mpc85xx/mpc85xx_gpio.c projects/sendfile/sys/powerpc/powerpc/trap.c - copied unchanged from r281364, head/sys/powerpc/powerpc/trap.c projects/sendfile/sys/x86/iommu/intel_intrmap.c - copied unchanged from r281364, head/sys/x86/iommu/intel_intrmap.c projects/sendfile/sys/x86/iommu/iommu_intrmap.h - copied unchanged from r281364, head/sys/x86/iommu/iommu_intrmap.h projects/sendfile/tools/debugscripts/netstat-anr.gdb - copied unchanged from r281364, head/tools/debugscripts/netstat-anr.gdb projects/sendfile/usr.bin/clang/llvm-cov/ - copied from r281364, head/usr.bin/clang/llvm-cov/ projects/sendfile/usr.bin/clang/llvm-profdata/ - copied from r281364, head/usr.bin/clang/llvm-profdata/ projects/sendfile/usr.bin/xlint/arch/aarch64/ - copied from r281364, head/usr.bin/xlint/arch/aarch64/ projects/sendfile/usr.sbin/ntp/doc/drivers/ - copied from r281364, head/usr.sbin/ntp/doc/drivers/ projects/sendfile/usr.sbin/ntp/doc/hints/ - copied from r281364, head/usr.sbin/ntp/doc/hints/ projects/sendfile/usr.sbin/ntp/doc/icons/ - copied from r281364, head/usr.sbin/ntp/doc/icons/ projects/sendfile/usr.sbin/ntp/doc/pic/ - copied from r281364, head/usr.sbin/ntp/doc/pic/ projects/sendfile/usr.sbin/ntp/doc/scripts/ - copied from r281364, head/usr.sbin/ntp/doc/scripts/ projects/sendfile/usr.sbin/ntp/doc/sntp.8 - copied unchanged from r281364, head/usr.sbin/ntp/doc/sntp.8 projects/sendfile/usr.sbin/ntp/libntpevent/ - copied from r281364, head/usr.sbin/ntp/libntpevent/ projects/sendfile/usr.sbin/ntp/ntpdc/nl.c - copied unchanged from r281364, head/usr.sbin/ntp/ntpdc/nl.c projects/sendfile/usr.sbin/pmcstudy/pmcstudy.8 - copied unchanged from r281364, head/usr.sbin/pmcstudy/pmcstudy.8 Deleted: projects/sendfile/contrib/ntp/arlib/ projects/sendfile/contrib/ntp/clockstuff/clktest.c projects/sendfile/contrib/ntp/excludes projects/sendfile/contrib/ntp/html/build/ projects/sendfile/contrib/ntp/html/drivers/driver2.html projects/sendfile/contrib/ntp/html/gadget.html projects/sendfile/contrib/ntp/html/groups.html projects/sendfile/contrib/ntp/html/ldisc.html projects/sendfile/contrib/ntp/html/manyopt.html projects/sendfile/contrib/ntp/html/measure.html projects/sendfile/contrib/ntp/html/mx4200data.html projects/sendfile/contrib/ntp/html/notes.html projects/sendfile/contrib/ntp/html/scripts/links10.txt projects/sendfile/contrib/ntp/html/scripts/links11.txt projects/sendfile/contrib/ntp/html/scripts/links12.txt projects/sendfile/contrib/ntp/html/scripts/links7.txt projects/sendfile/contrib/ntp/html/scripts/links8.txt projects/sendfile/contrib/ntp/html/scripts/links9.txt projects/sendfile/contrib/ntp/include/autogen-version.def projects/sendfile/contrib/ntp/include/copyright.def projects/sendfile/contrib/ntp/include/debug-opt.def projects/sendfile/contrib/ntp/include/global.h projects/sendfile/contrib/ntp/include/homerc.def projects/sendfile/contrib/ntp/include/isc/app.h projects/sendfile/contrib/ntp/include/isc/assertions.h projects/sendfile/contrib/ntp/include/isc/boolean.h projects/sendfile/contrib/ntp/include/isc/buffer.h projects/sendfile/contrib/ntp/include/isc/error.h projects/sendfile/contrib/ntp/include/isc/formatcheck.h projects/sendfile/contrib/ntp/include/isc/int.h projects/sendfile/contrib/ntp/include/isc/interfaceiter.h projects/sendfile/contrib/ntp/include/isc/ipv6.h projects/sendfile/contrib/ntp/include/isc/lang.h projects/sendfile/contrib/ntp/include/isc/lib.h projects/sendfile/contrib/ntp/include/isc/list.h projects/sendfile/contrib/ntp/include/isc/magic.h projects/sendfile/contrib/ntp/include/isc/msgcat.h projects/sendfile/contrib/ntp/include/isc/msgs.h projects/sendfile/contrib/ntp/include/isc/mutex.h projects/sendfile/contrib/ntp/include/isc/net.h projects/sendfile/contrib/ntp/include/isc/netaddr.h projects/sendfile/contrib/ntp/include/isc/netscope.h projects/sendfile/contrib/ntp/include/isc/offset.h projects/sendfile/contrib/ntp/include/isc/once.h projects/sendfile/contrib/ntp/include/isc/platform.h projects/sendfile/contrib/ntp/include/isc/print.h projects/sendfile/contrib/ntp/include/isc/region.h projects/sendfile/contrib/ntp/include/isc/result.h projects/sendfile/contrib/ntp/include/isc/sockaddr.h projects/sendfile/contrib/ntp/include/isc/strerror.h projects/sendfile/contrib/ntp/include/isc/string.h projects/sendfile/contrib/ntp/include/isc/types.h projects/sendfile/contrib/ntp/include/isc/util.h projects/sendfile/contrib/ntp/include/ntp_sprintf.h projects/sendfile/contrib/ntp/include/rsa_md5.h projects/sendfile/contrib/ntp/include/version.def projects/sendfile/contrib/ntp/kernel/README projects/sendfile/contrib/ntp/kernel/chuinit.c projects/sendfile/contrib/ntp/kernel/clkinit.c projects/sendfile/contrib/ntp/kernel/sys/chudefs.h projects/sendfile/contrib/ntp/kernel/sys/clkdefs.h projects/sendfile/contrib/ntp/kernel/tty_chu.c projects/sendfile/contrib/ntp/kernel/tty_chu_STREAMS.c projects/sendfile/contrib/ntp/kernel/tty_clk.c projects/sendfile/contrib/ntp/kernel/tty_clk_STREAMS.c projects/sendfile/contrib/ntp/libisc/ projects/sendfile/contrib/ntp/libntp/fptoa.c projects/sendfile/contrib/ntp/libntp/fptoms.c projects/sendfile/contrib/ntp/libntp/inttoa.c projects/sendfile/contrib/ntp/libntp/lib_strbuf.h projects/sendfile/contrib/ntp/libntp/md5c.c projects/sendfile/contrib/ntp/libntp/memmove.c projects/sendfile/contrib/ntp/libntp/mfptoa.c projects/sendfile/contrib/ntp/libntp/mfptoms.c projects/sendfile/contrib/ntp/libntp/msutotsf.c projects/sendfile/contrib/ntp/libntp/strerror.c projects/sendfile/contrib/ntp/libntp/strstr.c projects/sendfile/contrib/ntp/libntp/tsftomsu.c projects/sendfile/contrib/ntp/libntp/tstotv.c projects/sendfile/contrib/ntp/libntp/tvtoa.c projects/sendfile/contrib/ntp/libntp/tvtots.c projects/sendfile/contrib/ntp/libntp/uinttoa.c projects/sendfile/contrib/ntp/libntp/utvtoa.c projects/sendfile/contrib/ntp/libopts/ projects/sendfile/contrib/ntp/m4/ projects/sendfile/contrib/ntp/ntpd/ntp_intres.c projects/sendfile/contrib/ntp/ntpd/ntpd-opts.menu projects/sendfile/contrib/ntp/ntpd/ntpd-opts.texi projects/sendfile/contrib/ntp/ntpd/ntpd.1 projects/sendfile/contrib/ntp/ntpd/ntpdsim-opts.c projects/sendfile/contrib/ntp/ntpd/ntpdsim-opts.def projects/sendfile/contrib/ntp/ntpd/ntpdsim-opts.h projects/sendfile/contrib/ntp/ntpd/ntpdsim-opts.menu projects/sendfile/contrib/ntp/ntpd/ntpdsim-opts.texi projects/sendfile/contrib/ntp/ntpd/ntpdsim.1 projects/sendfile/contrib/ntp/ntpd/refclock_trak.c projects/sendfile/contrib/ntp/ntpdate/ntptime_config.c projects/sendfile/contrib/ntp/ntpdate/ntptimeset.c projects/sendfile/contrib/ntp/ntpdc/ntpdc-opts.menu projects/sendfile/contrib/ntp/ntpdc/ntpdc-opts.texi projects/sendfile/contrib/ntp/ntpdc/ntpdc.1 projects/sendfile/contrib/ntp/ntpq/ntpq-opts.menu projects/sendfile/contrib/ntp/ntpq/ntpq-opts.texi projects/sendfile/contrib/ntp/ntpq/ntpq.1 projects/sendfile/contrib/ntp/scripts/VersionName projects/sendfile/contrib/ntp/scripts/calc_tickadj.in projects/sendfile/contrib/ntp/scripts/checktime.in projects/sendfile/contrib/ntp/scripts/fixautomakedepsmagic projects/sendfile/contrib/ntp/scripts/freq_adj.in projects/sendfile/contrib/ntp/scripts/genCommitLog projects/sendfile/contrib/ntp/scripts/genver projects/sendfile/contrib/ntp/scripts/hpadjtime.sh projects/sendfile/contrib/ntp/scripts/html2man.in projects/sendfile/contrib/ntp/scripts/mkver.in projects/sendfile/contrib/ntp/scripts/ntp-close projects/sendfile/contrib/ntp/scripts/ntp-groper projects/sendfile/contrib/ntp/scripts/ntp-restart projects/sendfile/contrib/ntp/scripts/ntp-status projects/sendfile/contrib/ntp/scripts/ntp-wait.in projects/sendfile/contrib/ntp/scripts/ntpsweep.in projects/sendfile/contrib/ntp/scripts/ntptrace.in projects/sendfile/contrib/ntp/scripts/rc1/ projects/sendfile/contrib/ntp/scripts/rc2/ projects/sendfile/contrib/ntp/sntp/README projects/sendfile/contrib/ntp/sntp/autogen-version.def projects/sendfile/contrib/ntp/sntp/header.h projects/sendfile/contrib/ntp/sntp/internet.c projects/sendfile/contrib/ntp/sntp/internet.h projects/sendfile/contrib/ntp/sntp/kludges.h projects/sendfile/contrib/ntp/sntp/libopts/COPYING.lgpl projects/sendfile/contrib/ntp/sntp/libopts/enumeration.c projects/sendfile/contrib/ntp/sntp/libopts/environment.c projects/sendfile/contrib/ntp/sntp/sntp-opts.menu projects/sendfile/contrib/ntp/sntp/sntp-opts.texi projects/sendfile/contrib/ntp/sntp/sntp.1 projects/sendfile/contrib/ntp/sntp/socket.c projects/sendfile/contrib/ntp/sntp/timing.c projects/sendfile/contrib/ntp/sntp/unix.c projects/sendfile/contrib/ntp/sntp/version.def projects/sendfile/contrib/ntp/util/ntp-keygen-opts.menu projects/sendfile/contrib/ntp/util/ntp-keygen-opts.texi projects/sendfile/contrib/ntp/util/ntp-keygen.1 projects/sendfile/contrib/ntp/version projects/sendfile/contrib/ntp/version.m4 projects/sendfile/lib/libc/arm/sys/__vdso_gettc.c projects/sendfile/lib/libc/mips/sys/__vdso_gettc.c projects/sendfile/lib/libc/powerpc/sys/__vdso_gettc.c projects/sendfile/lib/libc/powerpc64/sys/__vdso_gettc.c projects/sendfile/lib/libc/sparc64/sys/__vdso_gettc.c projects/sendfile/sys/arm/arm/bootconfig.c projects/sendfile/sys/arm/arm/cpufunc_asm_armv5.S projects/sendfile/sys/arm/include/bootconfig.h projects/sendfile/sys/arm/mv/mv_sata.c projects/sendfile/sys/boot/amd64/ projects/sendfile/sys/boot/i386/efi/ projects/sendfile/sys/dev/ata/chipsets/ata-adaptec.c projects/sendfile/sys/dev/ata/chipsets/ata-ahci.c projects/sendfile/sys/dev/drm2/drm_drawable.c projects/sendfile/sys/dev/drm2/drm_internal.h projects/sendfile/sys/dev/drm2/drm_sman.c projects/sendfile/sys/dev/drm2/drm_sman.h projects/sendfile/sys/dev/drm2/radeon/radeon_atpx_handler.c projects/sendfile/sys/dev/ixgbe/ixgbe.c projects/sendfile/sys/dev/ixgbe/ixv.c projects/sendfile/sys/dev/ixgbe/ixv.h projects/sendfile/sys/modules/ata/atapci/chipsets/ataadaptec/ projects/sendfile/sys/modules/ata/atapci/chipsets/ataahci/ projects/sendfile/sys/modules/ixgbe/ projects/sendfile/sys/powerpc/aim/trap.c projects/sendfile/sys/powerpc/booke/trap.c projects/sendfile/usr.sbin/pmcstudy/pmcstudy.1 Modified: projects/sendfile/Makefile projects/sendfile/Makefile.inc1 projects/sendfile/ObsoleteFiles.inc projects/sendfile/UPDATING projects/sendfile/bin/cp/utils.c projects/sendfile/bin/expr/Makefile projects/sendfile/bin/mv/mv.c projects/sendfile/bin/pax/ar_io.c projects/sendfile/bin/pax/extern.h projects/sendfile/bin/pax/options.c projects/sendfile/bin/pax/pax.1 projects/sendfile/bin/pax/pax.c projects/sendfile/bin/ps/print.c projects/sendfile/bin/ps/ps.1 projects/sendfile/bin/sh/tests/expansion/Makefile projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c projects/sendfile/cddl/lib/libdtrace/libproc_compat.h projects/sendfile/cddl/usr.bin/ctfmerge/Makefile projects/sendfile/cddl/usr.sbin/dtrace/tests/Makefile projects/sendfile/cddl/usr.sbin/dtrace/tests/Makefile.inc1 projects/sendfile/cddl/usr.sbin/dtrace/tests/tools/gentest.sh projects/sendfile/contrib/binutils/bfd/elf-bfd.h projects/sendfile/contrib/binutils/bfd/elf32-arm.c projects/sendfile/contrib/binutils/include/elf/arm.h projects/sendfile/contrib/compiler-rt/lib/builtins/clear_cache.c projects/sendfile/contrib/compiler-rt/lib/builtins/fixunssfti.c projects/sendfile/contrib/elftoolchain/addr2line/addr2line.c projects/sendfile/contrib/elftoolchain/common/_elftc.h projects/sendfile/contrib/elftoolchain/common/elfdefinitions.h projects/sendfile/contrib/elftoolchain/common/native-elf-format projects/sendfile/contrib/elftoolchain/cxxfilt/cxxfilt.c projects/sendfile/contrib/elftoolchain/elfcopy/archive.c projects/sendfile/contrib/elftoolchain/elfcopy/ascii.c projects/sendfile/contrib/elftoolchain/elfcopy/binary.c projects/sendfile/contrib/elftoolchain/elfcopy/elfcopy.1 projects/sendfile/contrib/elftoolchain/elfcopy/elfcopy.h projects/sendfile/contrib/elftoolchain/elfcopy/main.c projects/sendfile/contrib/elftoolchain/elfcopy/sections.c projects/sendfile/contrib/elftoolchain/elfcopy/segments.c projects/sendfile/contrib/elftoolchain/elfcopy/symbols.c projects/sendfile/contrib/elftoolchain/libdwarf/_libdwarf.h projects/sendfile/contrib/elftoolchain/libdwarf/libdwarf.h projects/sendfile/contrib/elftoolchain/libdwarf/libdwarf_lineno.c projects/sendfile/contrib/elftoolchain/libelf/_libelf.h projects/sendfile/contrib/elftoolchain/libelf/_libelf_config.h projects/sendfile/contrib/elftoolchain/libelf/elf_data.c projects/sendfile/contrib/elftoolchain/libelf/elf_end.c projects/sendfile/contrib/elftoolchain/libelf/elf_errmsg.c projects/sendfile/contrib/elftoolchain/libelf/elf_errno.c projects/sendfile/contrib/elftoolchain/libelf/elf_fill.c projects/sendfile/contrib/elftoolchain/libelf/elf_flag.c projects/sendfile/contrib/elftoolchain/libelf/elf_getarhdr.c projects/sendfile/contrib/elftoolchain/libelf/elf_getarsym.c projects/sendfile/contrib/elftoolchain/libelf/elf_getbase.c projects/sendfile/contrib/elftoolchain/libelf/elf_getident.c projects/sendfile/contrib/elftoolchain/libelf/elf_hash.c projects/sendfile/contrib/elftoolchain/libelf/elf_kind.c projects/sendfile/contrib/elftoolchain/libelf/elf_next.c projects/sendfile/contrib/elftoolchain/libelf/elf_phnum.c projects/sendfile/contrib/elftoolchain/libelf/elf_rand.c projects/sendfile/contrib/elftoolchain/libelf/elf_rawfile.c projects/sendfile/contrib/elftoolchain/libelf/elf_scn.c projects/sendfile/contrib/elftoolchain/libelf/elf_shnum.c projects/sendfile/contrib/elftoolchain/libelf/elf_shstrndx.c projects/sendfile/contrib/elftoolchain/libelf/elf_version.c projects/sendfile/contrib/elftoolchain/libelf/gelf.h projects/sendfile/contrib/elftoolchain/libelf/gelf_cap.c projects/sendfile/contrib/elftoolchain/libelf/gelf_checksum.c projects/sendfile/contrib/elftoolchain/libelf/gelf_dyn.c projects/sendfile/contrib/elftoolchain/libelf/gelf_ehdr.c projects/sendfile/contrib/elftoolchain/libelf/gelf_fsize.c projects/sendfile/contrib/elftoolchain/libelf/gelf_getclass.c projects/sendfile/contrib/elftoolchain/libelf/gelf_move.c projects/sendfile/contrib/elftoolchain/libelf/gelf_phdr.c projects/sendfile/contrib/elftoolchain/libelf/gelf_rel.c projects/sendfile/contrib/elftoolchain/libelf/gelf_rela.c projects/sendfile/contrib/elftoolchain/libelf/gelf_shdr.c projects/sendfile/contrib/elftoolchain/libelf/gelf_sym.c projects/sendfile/contrib/elftoolchain/libelf/gelf_syminfo.c projects/sendfile/contrib/elftoolchain/libelf/gelf_symshndx.c projects/sendfile/contrib/elftoolchain/libelf/gelf_xlate.c projects/sendfile/contrib/elftoolchain/libelf/libelf.h projects/sendfile/contrib/elftoolchain/libelf/libelf_align.c projects/sendfile/contrib/elftoolchain/libelf/libelf_allocate.c projects/sendfile/contrib/elftoolchain/libelf/libelf_ar.c projects/sendfile/contrib/elftoolchain/libelf/libelf_ar_util.c projects/sendfile/contrib/elftoolchain/libelf/libelf_checksum.c projects/sendfile/contrib/elftoolchain/libelf/libelf_convert.m4 projects/sendfile/contrib/elftoolchain/libelf/libelf_data.c projects/sendfile/contrib/elftoolchain/libelf/libelf_ehdr.c projects/sendfile/contrib/elftoolchain/libelf/libelf_extended.c projects/sendfile/contrib/elftoolchain/libelf/libelf_msize.m4 projects/sendfile/contrib/elftoolchain/libelf/libelf_phdr.c projects/sendfile/contrib/elftoolchain/libelf/libelf_shdr.c projects/sendfile/contrib/elftoolchain/libelf/libelf_xlate.c projects/sendfile/contrib/elftoolchain/libelftc/_libelftc.h projects/sendfile/contrib/elftoolchain/libelftc/elftc_bfdtarget.c projects/sendfile/contrib/elftoolchain/libelftc/elftc_demangle.c projects/sendfile/contrib/elftoolchain/libelftc/libelftc.h projects/sendfile/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c projects/sendfile/contrib/elftoolchain/nm/nm.c projects/sendfile/contrib/elftoolchain/readelf/readelf.c projects/sendfile/contrib/elftoolchain/size/size.c projects/sendfile/contrib/elftoolchain/strings/strings.c projects/sendfile/contrib/gcc/unwind-dw2.c projects/sendfile/contrib/ipfilter/ipsend/44arp.c projects/sendfile/contrib/ipfilter/ipsend/ip.c projects/sendfile/contrib/ipfilter/ipsend/resend.c projects/sendfile/contrib/ipfilter/lib/kmem.c projects/sendfile/contrib/ipfilter/tools/ipfs.c projects/sendfile/contrib/ipfilter/tools/ipftest.c projects/sendfile/contrib/ipfilter/tools/ipnat.c projects/sendfile/contrib/ipfilter/tools/ipnat_y.y projects/sendfile/contrib/ipfilter/tools/ippool.c projects/sendfile/contrib/ipfilter/tools/ippool_y.y projects/sendfile/contrib/libarchive/libarchive/archive_read_disk_posix.c projects/sendfile/contrib/libc++/include/type_traits projects/sendfile/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h projects/sendfile/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp projects/sendfile/contrib/llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp projects/sendfile/contrib/llvm/lib/Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp projects/sendfile/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp projects/sendfile/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.h projects/sendfile/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.td projects/sendfile/contrib/llvm/lib/Target/AArch64/AArch64MCInstLower.cpp projects/sendfile/contrib/llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.h projects/sendfile/contrib/llvm/lib/Target/ARM/ARMCallingConv.h projects/sendfile/contrib/llvm/lib/Target/ARM/ARMCallingConv.td projects/sendfile/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp projects/sendfile/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Core/Mangled.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp projects/sendfile/contrib/ntp/COPYRIGHT (contents, props changed) projects/sendfile/contrib/ntp/ChangeLog (contents, props changed) projects/sendfile/contrib/ntp/CommitLog projects/sendfile/contrib/ntp/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/NEWS (contents, props changed) projects/sendfile/contrib/ntp/README.hackers (contents, props changed) projects/sendfile/contrib/ntp/WHERE-TO-START (contents, props changed) projects/sendfile/contrib/ntp/aclocal.m4 (contents, props changed) projects/sendfile/contrib/ntp/adjtimed/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/adjtimed/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/bincheck.mf projects/sendfile/contrib/ntp/bootstrap projects/sendfile/contrib/ntp/build (contents, props changed) projects/sendfile/contrib/ntp/clockstuff/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/clockstuff/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/clockstuff/README (contents, props changed) projects/sendfile/contrib/ntp/clockstuff/chutest.c (contents, props changed) projects/sendfile/contrib/ntp/clockstuff/propdelay.c (contents, props changed) projects/sendfile/contrib/ntp/conf/beauregard.conf (contents, props changed) projects/sendfile/contrib/ntp/config.guess (contents, props changed) projects/sendfile/contrib/ntp/config.h.in (contents, props changed) projects/sendfile/contrib/ntp/config.sub (contents, props changed) projects/sendfile/contrib/ntp/configure (contents, props changed) projects/sendfile/contrib/ntp/configure.ac projects/sendfile/contrib/ntp/dot.emacs (contents, props changed) projects/sendfile/contrib/ntp/flock-build (contents, props changed) projects/sendfile/contrib/ntp/html/accopt.html (contents, props changed) projects/sendfile/contrib/ntp/html/assoc.html (contents, props changed) projects/sendfile/contrib/ntp/html/audio.html (contents, props changed) projects/sendfile/contrib/ntp/html/authopt.html (contents, props changed) projects/sendfile/contrib/ntp/html/clockopt.html (contents, props changed) projects/sendfile/contrib/ntp/html/confopt.html (contents, props changed) projects/sendfile/contrib/ntp/html/copyright.html (contents, props changed) projects/sendfile/contrib/ntp/html/debug.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver1.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver10.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver11.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver12.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver16.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver18.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver19.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver20.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver22.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver26.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver27.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver28.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver29.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver3.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver30.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver31.html projects/sendfile/contrib/ntp/html/drivers/driver32.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver33.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver34.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver35.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver36.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver37.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver38.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver39.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver4.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver40.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver42.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver43.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver44.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver5.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver6.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver7.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver8.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/driver9.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/oncore-shmem.html (contents, props changed) projects/sendfile/contrib/ntp/html/drivers/scripts/footer.txt projects/sendfile/contrib/ntp/html/drivers/scripts/style.css projects/sendfile/contrib/ntp/html/drivers/tf582_4.html projects/sendfile/contrib/ntp/html/extern.html (contents, props changed) projects/sendfile/contrib/ntp/html/howto.html (contents, props changed) projects/sendfile/contrib/ntp/html/index.html (contents, props changed) projects/sendfile/contrib/ntp/html/kern.html (contents, props changed) projects/sendfile/contrib/ntp/html/keygen.html (contents, props changed) projects/sendfile/contrib/ntp/html/miscopt.html (contents, props changed) projects/sendfile/contrib/ntp/html/monopt.html (contents, props changed) projects/sendfile/contrib/ntp/html/msyslog.html (contents, props changed) projects/sendfile/contrib/ntp/html/ntp_conf.html projects/sendfile/contrib/ntp/html/ntpd.html (contents, props changed) projects/sendfile/contrib/ntp/html/ntpdate.html (contents, props changed) projects/sendfile/contrib/ntp/html/ntpdc.html (contents, props changed) projects/sendfile/contrib/ntp/html/ntpdsim.html (contents, props changed) projects/sendfile/contrib/ntp/html/ntpdsim_new.html projects/sendfile/contrib/ntp/html/ntpq.html (contents, props changed) projects/sendfile/contrib/ntp/html/ntptime.html (contents, props changed) projects/sendfile/contrib/ntp/html/ntptrace.html (contents, props changed) projects/sendfile/contrib/ntp/html/parsedata.html (contents, props changed) projects/sendfile/contrib/ntp/html/parsenew.html (contents, props changed) projects/sendfile/contrib/ntp/html/pps.html (contents, props changed) projects/sendfile/contrib/ntp/html/prefer.html (contents, props changed) projects/sendfile/contrib/ntp/html/rdebug.html (contents, props changed) projects/sendfile/contrib/ntp/html/refclock.html (contents, props changed) projects/sendfile/contrib/ntp/html/release.html (contents, props changed) projects/sendfile/contrib/ntp/html/scripts/footer.txt (contents, props changed) projects/sendfile/contrib/ntp/html/scripts/style.css (contents, props changed) projects/sendfile/contrib/ntp/html/sntp.html (contents, props changed) projects/sendfile/contrib/ntp/html/tickadj.html (contents, props changed) projects/sendfile/contrib/ntp/include/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/include/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/include/audio.h (contents, props changed) projects/sendfile/contrib/ntp/include/binio.h (contents, props changed) projects/sendfile/contrib/ntp/include/icom.h (contents, props changed) projects/sendfile/contrib/ntp/include/ieee754io.h (contents, props changed) projects/sendfile/contrib/ntp/include/iosignal.h (contents, props changed) projects/sendfile/contrib/ntp/include/isc/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/include/isc/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/include/isc/mem.h (contents, props changed) projects/sendfile/contrib/ntp/include/l_stdlib.h (contents, props changed) projects/sendfile/contrib/ntp/include/mbg_gps166.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_calendar.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_cmdargs.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_config.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_control.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_crypto.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_debug.h projects/sendfile/contrib/ntp/include/ntp_filegen.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_fp.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_io.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_machine.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_malloc.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_md5.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_proto.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_random.h projects/sendfile/contrib/ntp/include/ntp_refclock.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_request.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_rfc2553.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_select.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_stdlib.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_string.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_syscall.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_syslog.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_tty.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_types.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntp_unixtime.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntpd.h (contents, props changed) projects/sendfile/contrib/ntp/include/ntpsim.h (contents, props changed) projects/sendfile/contrib/ntp/include/parse.h (contents, props changed) projects/sendfile/contrib/ntp/include/recvbuff.h (contents, props changed) projects/sendfile/contrib/ntp/include/timepps-SCO.h projects/sendfile/contrib/ntp/include/timepps-Solaris.h projects/sendfile/contrib/ntp/include/timepps-SunOS.h projects/sendfile/contrib/ntp/include/trimble.h (contents, props changed) projects/sendfile/contrib/ntp/kernel/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/kernel/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/kernel/sys/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/kernel/sys/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/libntp/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/libntp/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/libntp/a_md5encrypt.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/atoint.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/atolfp.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/atouint.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/audio.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/authkeys.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/authreadkeys.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/authusekey.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/buftvtots.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/caljulian.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/caltontp.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/calyearstart.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/clocktime.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/clocktypes.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/decodenetnum.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/dofptoa.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/dolfptoa.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/emalloc.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/findconfig.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/getopt.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/hextoint.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/hextolfp.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/humandate.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/icom.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/iosignal.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/lib_strbuf.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/machines.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/mktime.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/modetoa.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/mstolfp.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/msyslog.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/netof.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/ntp_random.c projects/sendfile/contrib/ntp/libntp/ntp_rfc2553.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/numtoa.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/numtohost.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/octtoint.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/prettydate.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/recvbuff.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/refnumtoa.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/snprintf.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/socktoa.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/socktohost.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/statestr.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/strdup.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/syssignal.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/systime.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/uglydate.c (contents, props changed) projects/sendfile/contrib/ntp/libntp/ymd2yd.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/libparse/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/libparse/binio.c projects/sendfile/contrib/ntp/libparse/clk_computime.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/clk_dcf7000.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/clk_hopf6021.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/clk_meinberg.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/clk_rawdcf.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/clk_rcc8000.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/clk_schmid.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/clk_trimtaip.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/clk_trimtsip.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/clk_varitext.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/clk_wharton.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/data_mbg.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/gpstolfp.c projects/sendfile/contrib/ntp/libparse/ieee754io.c projects/sendfile/contrib/ntp/libparse/info_trimble.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/mfp_mul.c projects/sendfile/contrib/ntp/libparse/mkinfo_rcmd.sed (contents, props changed) projects/sendfile/contrib/ntp/libparse/mkinfo_scmd.sed (contents, props changed) projects/sendfile/contrib/ntp/libparse/parse.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/parse_conf.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/parsesolaris.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/parsestreams.c (contents, props changed) projects/sendfile/contrib/ntp/libparse/trim_info.c (contents, props changed) projects/sendfile/contrib/ntp/ltmain.sh projects/sendfile/contrib/ntp/ntpd/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/ntpd/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/ntpd/check_y2k.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/cmd_args.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntp_config.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntp_control.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntp_crypto.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntp_filegen.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntp_io.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntp_loopfilter.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntp_monitor.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntp_peer.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntp_proto.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntp_refclock.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntp_request.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntp_restrict.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntp_timer.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntp_util.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntpd-opts.c projects/sendfile/contrib/ntp/ntpd/ntpd-opts.def projects/sendfile/contrib/ntp/ntpd/ntpd-opts.h projects/sendfile/contrib/ntp/ntpd/ntpd.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/ntpdbase-opts.def projects/sendfile/contrib/ntp/ntpd/ntpsim.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_acts.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_arbiter.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_arc.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_as2201.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_atom.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_bancomm.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_chronolog.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_chu.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_conf.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_datum.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_dumbclock.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_fg.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_gpsvme.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_heath.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_hopfpci.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_hopfser.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_hpgps.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_irig.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_jjy.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_jupiter.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_leitch.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_local.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_msfees.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_mx4200.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_neoclock4x.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_nmea.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_oncore.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_palisade.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_palisade.h (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_parse.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_pcf.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_pst.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_ripencc.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_shm.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_tpro.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_true.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_tt560.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_ulink.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_wwv.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_wwvb.c (contents, props changed) projects/sendfile/contrib/ntp/ntpd/refclock_zyfer.c (contents, props changed) projects/sendfile/contrib/ntp/ntpdate/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/ntpdate/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/ntpdate/ntpdate.c (contents, props changed) projects/sendfile/contrib/ntp/ntpdate/ntpdate.h (contents, props changed) projects/sendfile/contrib/ntp/ntpdc/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/ntpdc/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/ntpdc/layout.std (contents, props changed) projects/sendfile/contrib/ntp/ntpdc/nl.pl (contents, props changed) projects/sendfile/contrib/ntp/ntpdc/nl.pl.in (contents, props changed) projects/sendfile/contrib/ntp/ntpdc/ntpdc-layout.c (contents, props changed) projects/sendfile/contrib/ntp/ntpdc/ntpdc-opts.c projects/sendfile/contrib/ntp/ntpdc/ntpdc-opts.def projects/sendfile/contrib/ntp/ntpdc/ntpdc-opts.h projects/sendfile/contrib/ntp/ntpdc/ntpdc.c (contents, props changed) projects/sendfile/contrib/ntp/ntpdc/ntpdc.h (contents, props changed) projects/sendfile/contrib/ntp/ntpdc/ntpdc_ops.c (contents, props changed) projects/sendfile/contrib/ntp/ntpq/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/ntpq/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/ntpq/ntpq-opts.c projects/sendfile/contrib/ntp/ntpq/ntpq-opts.def projects/sendfile/contrib/ntp/ntpq/ntpq-opts.h projects/sendfile/contrib/ntp/ntpq/ntpq-subs.c projects/sendfile/contrib/ntp/ntpq/ntpq.c (contents, props changed) projects/sendfile/contrib/ntp/ntpq/ntpq.h (contents, props changed) projects/sendfile/contrib/ntp/packageinfo.sh projects/sendfile/contrib/ntp/parseutil/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/parseutil/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/parseutil/dcfd.c (contents, props changed) projects/sendfile/contrib/ntp/parseutil/testdcf.c (contents, props changed) projects/sendfile/contrib/ntp/readme.y2kfixes (contents, props changed) projects/sendfile/contrib/ntp/scripts/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/scripts/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/scripts/README (contents, props changed) projects/sendfile/contrib/ntp/scripts/monitoring/ntp.pl (contents, props changed) projects/sendfile/contrib/ntp/scripts/monitoring/ntptrap (contents, props changed) projects/sendfile/contrib/ntp/scripts/ntpver.in (contents, props changed) projects/sendfile/contrib/ntp/scripts/plot_summary.in (contents, props changed) projects/sendfile/contrib/ntp/scripts/summary.in (contents, props changed) projects/sendfile/contrib/ntp/sntp/COPYRIGHT projects/sendfile/contrib/ntp/sntp/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/sntp/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/sntp/aclocal.m4 (contents, props changed) projects/sendfile/contrib/ntp/sntp/bincheck.mf projects/sendfile/contrib/ntp/sntp/config.guess (contents, props changed) projects/sendfile/contrib/ntp/sntp/config.h.in projects/sendfile/contrib/ntp/sntp/config.sub (contents, props changed) projects/sendfile/contrib/ntp/sntp/configure (contents, props changed) projects/sendfile/contrib/ntp/sntp/configure.ac (contents, props changed) projects/sendfile/contrib/ntp/sntp/libopts/Makefile.am projects/sendfile/contrib/ntp/sntp/libopts/Makefile.in projects/sendfile/contrib/ntp/sntp/libopts/README projects/sendfile/contrib/ntp/sntp/libopts/autoopts.c projects/sendfile/contrib/ntp/sntp/libopts/autoopts.h projects/sendfile/contrib/ntp/sntp/libopts/autoopts/options.h projects/sendfile/contrib/ntp/sntp/libopts/autoopts/usage-txt.h projects/sendfile/contrib/ntp/sntp/libopts/boolean.c projects/sendfile/contrib/ntp/sntp/libopts/compat/compat.h projects/sendfile/contrib/ntp/sntp/libopts/compat/pathfind.c projects/sendfile/contrib/ntp/sntp/libopts/compat/snprintf.c projects/sendfile/contrib/ntp/sntp/libopts/compat/strchr.c projects/sendfile/contrib/ntp/sntp/libopts/compat/strdup.c projects/sendfile/contrib/ntp/sntp/libopts/compat/windows-config.h projects/sendfile/contrib/ntp/sntp/libopts/configfile.c projects/sendfile/contrib/ntp/sntp/libopts/cook.c projects/sendfile/contrib/ntp/sntp/libopts/genshell.c projects/sendfile/contrib/ntp/sntp/libopts/genshell.h projects/sendfile/contrib/ntp/sntp/libopts/libopts.c projects/sendfile/contrib/ntp/sntp/libopts/load.c projects/sendfile/contrib/ntp/sntp/libopts/m4/libopts.m4 projects/sendfile/contrib/ntp/sntp/libopts/m4/liboptschk.m4 projects/sendfile/contrib/ntp/sntp/libopts/makeshell.c projects/sendfile/contrib/ntp/sntp/libopts/nested.c projects/sendfile/contrib/ntp/sntp/libopts/numeric.c projects/sendfile/contrib/ntp/sntp/libopts/pgusage.c projects/sendfile/contrib/ntp/sntp/libopts/proto.h projects/sendfile/contrib/ntp/sntp/libopts/putshell.c projects/sendfile/contrib/ntp/sntp/libopts/restore.c projects/sendfile/contrib/ntp/sntp/libopts/save.c projects/sendfile/contrib/ntp/sntp/libopts/sort.c projects/sendfile/contrib/ntp/sntp/libopts/stack.c projects/sendfile/contrib/ntp/sntp/libopts/streqvcmp.c projects/sendfile/contrib/ntp/sntp/libopts/text_mmap.c projects/sendfile/contrib/ntp/sntp/libopts/tokenize.c projects/sendfile/contrib/ntp/sntp/libopts/usage.c projects/sendfile/contrib/ntp/sntp/libopts/version.c projects/sendfile/contrib/ntp/sntp/ltmain.sh projects/sendfile/contrib/ntp/sntp/main.c (contents, props changed) projects/sendfile/contrib/ntp/sntp/sntp-opts.c projects/sendfile/contrib/ntp/sntp/sntp-opts.def projects/sendfile/contrib/ntp/sntp/sntp-opts.h projects/sendfile/contrib/ntp/util/Makefile.am (contents, props changed) projects/sendfile/contrib/ntp/util/Makefile.in (contents, props changed) projects/sendfile/contrib/ntp/util/README (contents, props changed) projects/sendfile/contrib/ntp/util/audio-pcm.c (contents, props changed) projects/sendfile/contrib/ntp/util/hist.c (contents, props changed) projects/sendfile/contrib/ntp/util/jitter.c (contents, props changed) projects/sendfile/contrib/ntp/util/jitter.h projects/sendfile/contrib/ntp/util/ntp-keygen-opts.c projects/sendfile/contrib/ntp/util/ntp-keygen-opts.def projects/sendfile/contrib/ntp/util/ntp-keygen-opts.h projects/sendfile/contrib/ntp/util/ntp-keygen.c (contents, props changed) projects/sendfile/contrib/ntp/util/ntptime.c (contents, props changed) projects/sendfile/contrib/ntp/util/sht.c (contents, props changed) projects/sendfile/contrib/ntp/util/tg.c projects/sendfile/contrib/ntp/util/tickadj.c (contents, props changed) projects/sendfile/contrib/ofed/libibverbs/examples/build/Makefile.inc projects/sendfile/contrib/ofed/librdmacm/examples/build/Makefile.inc projects/sendfile/contrib/sendmail/src/readcf.c projects/sendfile/contrib/tzdata/asia projects/sendfile/contrib/tzdata/australasia projects/sendfile/contrib/tzdata/europe projects/sendfile/contrib/tzdata/leap-seconds.list projects/sendfile/contrib/tzdata/northamerica projects/sendfile/contrib/tzdata/southamerica projects/sendfile/contrib/xz/ChangeLog projects/sendfile/contrib/xz/THANKS projects/sendfile/contrib/xz/src/common/tuklib_cpucores.c projects/sendfile/contrib/xz/src/common/tuklib_integer.h projects/sendfile/contrib/xz/src/liblzma/api/lzma/version.h projects/sendfile/contrib/xz/src/liblzma/common/memcmplen.h projects/sendfile/contrib/xz/src/liblzma/lz/lz_encoder.c projects/sendfile/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c projects/sendfile/contrib/xz/src/xz/file_io.c projects/sendfile/crypto/openssh/clientloop.c projects/sendfile/crypto/openssh/ssh_config.5 projects/sendfile/crypto/openssh/sshd_config.5 projects/sendfile/crypto/openssl/CHANGES projects/sendfile/crypto/openssl/Configure projects/sendfile/crypto/openssl/Makefile projects/sendfile/crypto/openssl/NEWS projects/sendfile/crypto/openssl/README projects/sendfile/crypto/openssl/apps/app_rand.c projects/sendfile/crypto/openssl/apps/apps.c projects/sendfile/crypto/openssl/apps/apps.h projects/sendfile/crypto/openssl/apps/asn1pars.c projects/sendfile/crypto/openssl/apps/ca.c projects/sendfile/crypto/openssl/apps/ciphers.c projects/sendfile/crypto/openssl/apps/cms.c projects/sendfile/crypto/openssl/apps/crl.c projects/sendfile/crypto/openssl/apps/crl2p7.c projects/sendfile/crypto/openssl/apps/dgst.c projects/sendfile/crypto/openssl/apps/dh.c projects/sendfile/crypto/openssl/apps/dhparam.c projects/sendfile/crypto/openssl/apps/dsa.c projects/sendfile/crypto/openssl/apps/dsaparam.c projects/sendfile/crypto/openssl/apps/ec.c projects/sendfile/crypto/openssl/apps/ecparam.c projects/sendfile/crypto/openssl/apps/enc.c projects/sendfile/crypto/openssl/apps/engine.c projects/sendfile/crypto/openssl/apps/errstr.c projects/sendfile/crypto/openssl/apps/gendh.c projects/sendfile/crypto/openssl/apps/gendsa.c projects/sendfile/crypto/openssl/apps/genpkey.c projects/sendfile/crypto/openssl/apps/genrsa.c projects/sendfile/crypto/openssl/apps/nseq.c projects/sendfile/crypto/openssl/apps/ocsp.c projects/sendfile/crypto/openssl/apps/openssl.c projects/sendfile/crypto/openssl/apps/passwd.c projects/sendfile/crypto/openssl/apps/pkcs12.c projects/sendfile/crypto/openssl/apps/pkcs7.c projects/sendfile/crypto/openssl/apps/pkcs8.c projects/sendfile/crypto/openssl/apps/pkey.c projects/sendfile/crypto/openssl/apps/pkeyparam.c projects/sendfile/crypto/openssl/apps/pkeyutl.c projects/sendfile/crypto/openssl/apps/prime.c projects/sendfile/crypto/openssl/apps/progs.h projects/sendfile/crypto/openssl/apps/rand.c projects/sendfile/crypto/openssl/apps/req.c projects/sendfile/crypto/openssl/apps/rsa.c projects/sendfile/crypto/openssl/apps/rsautl.c projects/sendfile/crypto/openssl/apps/s_apps.h projects/sendfile/crypto/openssl/apps/s_cb.c projects/sendfile/crypto/openssl/apps/s_client.c projects/sendfile/crypto/openssl/apps/s_server.c projects/sendfile/crypto/openssl/apps/s_socket.c projects/sendfile/crypto/openssl/apps/s_time.c projects/sendfile/crypto/openssl/apps/sess_id.c projects/sendfile/crypto/openssl/apps/smime.c projects/sendfile/crypto/openssl/apps/speed.c projects/sendfile/crypto/openssl/apps/spkac.c projects/sendfile/crypto/openssl/apps/srp.c projects/sendfile/crypto/openssl/apps/testdsa.h projects/sendfile/crypto/openssl/apps/testrsa.h projects/sendfile/crypto/openssl/apps/timeouts.h projects/sendfile/crypto/openssl/apps/ts.c projects/sendfile/crypto/openssl/apps/verify.c projects/sendfile/crypto/openssl/apps/version.c projects/sendfile/crypto/openssl/apps/x509.c projects/sendfile/crypto/openssl/crypto/LPdir_unix.c projects/sendfile/crypto/openssl/crypto/aes/aes.h projects/sendfile/crypto/openssl/crypto/aes/aes_cbc.c projects/sendfile/crypto/openssl/crypto/aes/aes_cfb.c projects/sendfile/crypto/openssl/crypto/aes/aes_core.c projects/sendfile/crypto/openssl/crypto/aes/aes_ctr.c projects/sendfile/crypto/openssl/crypto/aes/aes_ecb.c projects/sendfile/crypto/openssl/crypto/aes/aes_ige.c projects/sendfile/crypto/openssl/crypto/aes/aes_locl.h projects/sendfile/crypto/openssl/crypto/aes/aes_misc.c projects/sendfile/crypto/openssl/crypto/aes/aes_ofb.c projects/sendfile/crypto/openssl/crypto/aes/aes_wrap.c projects/sendfile/crypto/openssl/crypto/aes/aes_x86core.c projects/sendfile/crypto/openssl/crypto/arm_arch.h projects/sendfile/crypto/openssl/crypto/armcap.c projects/sendfile/crypto/openssl/crypto/asn1/a_bitstr.c projects/sendfile/crypto/openssl/crypto/asn1/a_bool.c projects/sendfile/crypto/openssl/crypto/asn1/a_bytes.c projects/sendfile/crypto/openssl/crypto/asn1/a_d2i_fp.c projects/sendfile/crypto/openssl/crypto/asn1/a_digest.c projects/sendfile/crypto/openssl/crypto/asn1/a_dup.c projects/sendfile/crypto/openssl/crypto/asn1/a_enum.c projects/sendfile/crypto/openssl/crypto/asn1/a_gentm.c projects/sendfile/crypto/openssl/crypto/asn1/a_i2d_fp.c projects/sendfile/crypto/openssl/crypto/asn1/a_int.c projects/sendfile/crypto/openssl/crypto/asn1/a_mbstr.c projects/sendfile/crypto/openssl/crypto/asn1/a_object.c projects/sendfile/crypto/openssl/crypto/asn1/a_octet.c projects/sendfile/crypto/openssl/crypto/asn1/a_print.c projects/sendfile/crypto/openssl/crypto/asn1/a_set.c projects/sendfile/crypto/openssl/crypto/asn1/a_sign.c projects/sendfile/crypto/openssl/crypto/asn1/a_strex.c projects/sendfile/crypto/openssl/crypto/asn1/a_strnid.c projects/sendfile/crypto/openssl/crypto/asn1/a_time.c projects/sendfile/crypto/openssl/crypto/asn1/a_type.c projects/sendfile/crypto/openssl/crypto/asn1/a_utctm.c projects/sendfile/crypto/openssl/crypto/asn1/a_utf8.c projects/sendfile/crypto/openssl/crypto/asn1/a_verify.c projects/sendfile/crypto/openssl/crypto/asn1/ameth_lib.c projects/sendfile/crypto/openssl/crypto/asn1/asn1.h projects/sendfile/crypto/openssl/crypto/asn1/asn1_err.c projects/sendfile/crypto/openssl/crypto/asn1/asn1_gen.c projects/sendfile/crypto/openssl/crypto/asn1/asn1_lib.c projects/sendfile/crypto/openssl/crypto/asn1/asn1_locl.h projects/sendfile/crypto/openssl/crypto/asn1/asn1_mac.h projects/sendfile/crypto/openssl/crypto/asn1/asn1_par.c projects/sendfile/crypto/openssl/crypto/asn1/asn1t.h projects/sendfile/crypto/openssl/crypto/asn1/asn_mime.c projects/sendfile/crypto/openssl/crypto/asn1/asn_moid.c projects/sendfile/crypto/openssl/crypto/asn1/asn_pack.c projects/sendfile/crypto/openssl/crypto/asn1/bio_asn1.c projects/sendfile/crypto/openssl/crypto/asn1/bio_ndef.c projects/sendfile/crypto/openssl/crypto/asn1/charmap.h projects/sendfile/crypto/openssl/crypto/asn1/d2i_pr.c projects/sendfile/crypto/openssl/crypto/asn1/d2i_pu.c projects/sendfile/crypto/openssl/crypto/asn1/evp_asn1.c projects/sendfile/crypto/openssl/crypto/asn1/f_enum.c projects/sendfile/crypto/openssl/crypto/asn1/f_int.c projects/sendfile/crypto/openssl/crypto/asn1/f_string.c projects/sendfile/crypto/openssl/crypto/asn1/i2d_pr.c projects/sendfile/crypto/openssl/crypto/asn1/i2d_pu.c projects/sendfile/crypto/openssl/crypto/asn1/n_pkey.c projects/sendfile/crypto/openssl/crypto/asn1/nsseq.c projects/sendfile/crypto/openssl/crypto/asn1/p5_pbe.c projects/sendfile/crypto/openssl/crypto/asn1/p5_pbev2.c projects/sendfile/crypto/openssl/crypto/asn1/p8_pkey.c projects/sendfile/crypto/openssl/crypto/asn1/t_bitst.c projects/sendfile/crypto/openssl/crypto/asn1/t_crl.c projects/sendfile/crypto/openssl/crypto/asn1/t_pkey.c projects/sendfile/crypto/openssl/crypto/asn1/t_req.c projects/sendfile/crypto/openssl/crypto/asn1/t_spki.c projects/sendfile/crypto/openssl/crypto/asn1/t_x509.c projects/sendfile/crypto/openssl/crypto/asn1/t_x509a.c projects/sendfile/crypto/openssl/crypto/asn1/tasn_dec.c projects/sendfile/crypto/openssl/crypto/asn1/tasn_enc.c projects/sendfile/crypto/openssl/crypto/asn1/tasn_fre.c projects/sendfile/crypto/openssl/crypto/asn1/tasn_new.c projects/sendfile/crypto/openssl/crypto/asn1/tasn_prn.c projects/sendfile/crypto/openssl/crypto/asn1/tasn_typ.c projects/sendfile/crypto/openssl/crypto/asn1/tasn_utl.c projects/sendfile/crypto/openssl/crypto/asn1/x_algor.c projects/sendfile/crypto/openssl/crypto/asn1/x_attrib.c projects/sendfile/crypto/openssl/crypto/asn1/x_bignum.c projects/sendfile/crypto/openssl/crypto/asn1/x_crl.c projects/sendfile/crypto/openssl/crypto/asn1/x_exten.c projects/sendfile/crypto/openssl/crypto/asn1/x_info.c projects/sendfile/crypto/openssl/crypto/asn1/x_long.c projects/sendfile/crypto/openssl/crypto/asn1/x_name.c projects/sendfile/crypto/openssl/crypto/asn1/x_nx509.c projects/sendfile/crypto/openssl/crypto/asn1/x_pkey.c projects/sendfile/crypto/openssl/crypto/asn1/x_pubkey.c projects/sendfile/crypto/openssl/crypto/asn1/x_req.c projects/sendfile/crypto/openssl/crypto/asn1/x_sig.c projects/sendfile/crypto/openssl/crypto/asn1/x_spki.c projects/sendfile/crypto/openssl/crypto/asn1/x_val.c projects/sendfile/crypto/openssl/crypto/asn1/x_x509.c projects/sendfile/crypto/openssl/crypto/asn1/x_x509a.c projects/sendfile/crypto/openssl/crypto/bf/bf_cbc.c projects/sendfile/crypto/openssl/crypto/bf/bf_cfb64.c projects/sendfile/crypto/openssl/crypto/bf/bf_ecb.c projects/sendfile/crypto/openssl/crypto/bf/bf_enc.c projects/sendfile/crypto/openssl/crypto/bf/bf_locl.h projects/sendfile/crypto/openssl/crypto/bf/bf_ofb64.c projects/sendfile/crypto/openssl/crypto/bf/bf_opts.c projects/sendfile/crypto/openssl/crypto/bf/bf_pi.h projects/sendfile/crypto/openssl/crypto/bf/bf_skey.c projects/sendfile/crypto/openssl/crypto/bf/bfspeed.c projects/sendfile/crypto/openssl/crypto/bf/bftest.c projects/sendfile/crypto/openssl/crypto/bf/blowfish.h projects/sendfile/crypto/openssl/crypto/bio/b_dump.c projects/sendfile/crypto/openssl/crypto/bio/b_print.c projects/sendfile/crypto/openssl/crypto/bio/b_sock.c projects/sendfile/crypto/openssl/crypto/bio/bf_buff.c projects/sendfile/crypto/openssl/crypto/bio/bf_lbuf.c projects/sendfile/crypto/openssl/crypto/bio/bf_nbio.c projects/sendfile/crypto/openssl/crypto/bio/bf_null.c projects/sendfile/crypto/openssl/crypto/bio/bio.h projects/sendfile/crypto/openssl/crypto/bio/bio_cb.c projects/sendfile/crypto/openssl/crypto/bio/bio_err.c projects/sendfile/crypto/openssl/crypto/bio/bio_lcl.h projects/sendfile/crypto/openssl/crypto/bio/bio_lib.c projects/sendfile/crypto/openssl/crypto/bio/bss_acpt.c projects/sendfile/crypto/openssl/crypto/bio/bss_bio.c projects/sendfile/crypto/openssl/crypto/bio/bss_conn.c projects/sendfile/crypto/openssl/crypto/bio/bss_dgram.c projects/sendfile/crypto/openssl/crypto/bio/bss_fd.c projects/sendfile/crypto/openssl/crypto/bio/bss_file.c projects/sendfile/crypto/openssl/crypto/bio/bss_log.c projects/sendfile/crypto/openssl/crypto/bio/bss_mem.c projects/sendfile/crypto/openssl/crypto/bio/bss_null.c projects/sendfile/crypto/openssl/crypto/bio/bss_rtcp.c projects/sendfile/crypto/openssl/crypto/bio/bss_sock.c projects/sendfile/crypto/openssl/crypto/bn/asm/x86_64-gcc.c projects/sendfile/crypto/openssl/crypto/bn/bn.h projects/sendfile/crypto/openssl/crypto/bn/bn_add.c projects/sendfile/crypto/openssl/crypto/bn/bn_asm.c projects/sendfile/crypto/openssl/crypto/bn/bn_blind.c projects/sendfile/crypto/openssl/crypto/bn/bn_const.c projects/sendfile/crypto/openssl/crypto/bn/bn_ctx.c projects/sendfile/crypto/openssl/crypto/bn/bn_depr.c projects/sendfile/crypto/openssl/crypto/bn/bn_div.c projects/sendfile/crypto/openssl/crypto/bn/bn_err.c projects/sendfile/crypto/openssl/crypto/bn/bn_exp.c projects/sendfile/crypto/openssl/crypto/bn/bn_exp2.c projects/sendfile/crypto/openssl/crypto/bn/bn_gcd.c projects/sendfile/crypto/openssl/crypto/bn/bn_gf2m.c projects/sendfile/crypto/openssl/crypto/bn/bn_kron.c projects/sendfile/crypto/openssl/crypto/bn/bn_lcl.h projects/sendfile/crypto/openssl/crypto/bn/bn_lib.c projects/sendfile/crypto/openssl/crypto/bn/bn_mod.c projects/sendfile/crypto/openssl/crypto/bn/bn_mont.c projects/sendfile/crypto/openssl/crypto/bn/bn_mpi.c projects/sendfile/crypto/openssl/crypto/bn/bn_mul.c projects/sendfile/crypto/openssl/crypto/bn/bn_nist.c projects/sendfile/crypto/openssl/crypto/bn/bn_prime.c projects/sendfile/crypto/openssl/crypto/bn/bn_prime.h projects/sendfile/crypto/openssl/crypto/bn/bn_print.c projects/sendfile/crypto/openssl/crypto/bn/bn_rand.c projects/sendfile/crypto/openssl/crypto/bn/bn_recp.c projects/sendfile/crypto/openssl/crypto/bn/bn_shift.c projects/sendfile/crypto/openssl/crypto/bn/bn_sqr.c projects/sendfile/crypto/openssl/crypto/bn/bn_sqrt.c projects/sendfile/crypto/openssl/crypto/bn/bn_word.c projects/sendfile/crypto/openssl/crypto/bn/bn_x931p.c projects/sendfile/crypto/openssl/crypto/bn/bnspeed.c projects/sendfile/crypto/openssl/crypto/bn/bntest.c projects/sendfile/crypto/openssl/crypto/bn/divtest.c projects/sendfile/crypto/openssl/crypto/bn/exp.c projects/sendfile/crypto/openssl/crypto/bn/expspeed.c projects/sendfile/crypto/openssl/crypto/bn/exptest.c projects/sendfile/crypto/openssl/crypto/buffer/buf_err.c projects/sendfile/crypto/openssl/crypto/buffer/buf_str.c projects/sendfile/crypto/openssl/crypto/buffer/buffer.c projects/sendfile/crypto/openssl/crypto/buffer/buffer.h projects/sendfile/crypto/openssl/crypto/camellia/camellia.c projects/sendfile/crypto/openssl/crypto/camellia/camellia.h projects/sendfile/crypto/openssl/crypto/camellia/cmll_cbc.c projects/sendfile/crypto/openssl/crypto/camellia/cmll_cfb.c projects/sendfile/crypto/openssl/crypto/camellia/cmll_ctr.c projects/sendfile/crypto/openssl/crypto/camellia/cmll_ecb.c projects/sendfile/crypto/openssl/crypto/camellia/cmll_locl.h projects/sendfile/crypto/openssl/crypto/camellia/cmll_misc.c projects/sendfile/crypto/openssl/crypto/camellia/cmll_ofb.c projects/sendfile/crypto/openssl/crypto/camellia/cmll_utl.c projects/sendfile/crypto/openssl/crypto/cast/c_cfb64.c projects/sendfile/crypto/openssl/crypto/cast/c_ecb.c projects/sendfile/crypto/openssl/crypto/cast/c_enc.c projects/sendfile/crypto/openssl/crypto/cast/c_ofb64.c projects/sendfile/crypto/openssl/crypto/cast/c_skey.c projects/sendfile/crypto/openssl/crypto/cast/cast.h projects/sendfile/crypto/openssl/crypto/cast/cast_lcl.h projects/sendfile/crypto/openssl/crypto/cast/cast_s.h projects/sendfile/crypto/openssl/crypto/cast/cast_spd.c projects/sendfile/crypto/openssl/crypto/cast/castopts.c projects/sendfile/crypto/openssl/crypto/cast/casttest.c projects/sendfile/crypto/openssl/crypto/cmac/cm_ameth.c projects/sendfile/crypto/openssl/crypto/cmac/cm_pmeth.c projects/sendfile/crypto/openssl/crypto/cmac/cmac.c projects/sendfile/crypto/openssl/crypto/cmac/cmac.h projects/sendfile/crypto/openssl/crypto/cms/cms.h projects/sendfile/crypto/openssl/crypto/cms/cms_asn1.c projects/sendfile/crypto/openssl/crypto/cms/cms_att.c projects/sendfile/crypto/openssl/crypto/cms/cms_cd.c projects/sendfile/crypto/openssl/crypto/cms/cms_dd.c projects/sendfile/crypto/openssl/crypto/cms/cms_enc.c projects/sendfile/crypto/openssl/crypto/cms/cms_env.c projects/sendfile/crypto/openssl/crypto/cms/cms_err.c projects/sendfile/crypto/openssl/crypto/cms/cms_ess.c projects/sendfile/crypto/openssl/crypto/cms/cms_io.c projects/sendfile/crypto/openssl/crypto/cms/cms_lcl.h projects/sendfile/crypto/openssl/crypto/cms/cms_lib.c projects/sendfile/crypto/openssl/crypto/cms/cms_pwri.c projects/sendfile/crypto/openssl/crypto/cms/cms_sd.c projects/sendfile/crypto/openssl/crypto/cms/cms_smime.c projects/sendfile/crypto/openssl/crypto/comp/c_rle.c projects/sendfile/crypto/openssl/crypto/comp/c_zlib.c projects/sendfile/crypto/openssl/crypto/comp/comp.h projects/sendfile/crypto/openssl/crypto/comp/comp_err.c projects/sendfile/crypto/openssl/crypto/comp/comp_lib.c projects/sendfile/crypto/openssl/crypto/conf/cnf_save.c projects/sendfile/crypto/openssl/crypto/conf/conf.h projects/sendfile/crypto/openssl/crypto/conf/conf_api.c projects/sendfile/crypto/openssl/crypto/conf/conf_api.h projects/sendfile/crypto/openssl/crypto/conf/conf_def.c projects/sendfile/crypto/openssl/crypto/conf/conf_def.h projects/sendfile/crypto/openssl/crypto/conf/conf_err.c projects/sendfile/crypto/openssl/crypto/conf/conf_lib.c projects/sendfile/crypto/openssl/crypto/conf/conf_mall.c projects/sendfile/crypto/openssl/crypto/conf/conf_mod.c projects/sendfile/crypto/openssl/crypto/conf/conf_sap.c projects/sendfile/crypto/openssl/crypto/conf/test.c projects/sendfile/crypto/openssl/crypto/constant_time_locl.h projects/sendfile/crypto/openssl/crypto/constant_time_test.c projects/sendfile/crypto/openssl/crypto/cpt_err.c projects/sendfile/crypto/openssl/crypto/cryptlib.c projects/sendfile/crypto/openssl/crypto/cryptlib.h projects/sendfile/crypto/openssl/crypto/crypto.h projects/sendfile/crypto/openssl/crypto/cversion.c projects/sendfile/crypto/openssl/crypto/des/cbc3_enc.c projects/sendfile/crypto/openssl/crypto/des/cbc_cksm.c projects/sendfile/crypto/openssl/crypto/des/cbc_enc.c projects/sendfile/crypto/openssl/crypto/des/cfb64ede.c projects/sendfile/crypto/openssl/crypto/des/cfb64enc.c projects/sendfile/crypto/openssl/crypto/des/cfb_enc.c projects/sendfile/crypto/openssl/crypto/des/des.c projects/sendfile/crypto/openssl/crypto/des/des.h projects/sendfile/crypto/openssl/crypto/des/des_enc.c projects/sendfile/crypto/openssl/crypto/des/des_locl.h projects/sendfile/crypto/openssl/crypto/des/des_old.c projects/sendfile/crypto/openssl/crypto/des/des_old.h projects/sendfile/crypto/openssl/crypto/des/des_old2.c projects/sendfile/crypto/openssl/crypto/des/des_opts.c projects/sendfile/crypto/openssl/crypto/des/des_ver.h projects/sendfile/crypto/openssl/crypto/des/destest.c projects/sendfile/crypto/openssl/crypto/des/ecb3_enc.c projects/sendfile/crypto/openssl/crypto/des/ecb_enc.c projects/sendfile/crypto/openssl/crypto/des/ede_cbcm_enc.c projects/sendfile/crypto/openssl/crypto/des/enc_read.c projects/sendfile/crypto/openssl/crypto/des/enc_writ.c projects/sendfile/crypto/openssl/crypto/des/fcrypt.c projects/sendfile/crypto/openssl/crypto/des/fcrypt_b.c projects/sendfile/crypto/openssl/crypto/des/ncbc_enc.c projects/sendfile/crypto/openssl/crypto/des/ofb64ede.c projects/sendfile/crypto/openssl/crypto/des/ofb64enc.c projects/sendfile/crypto/openssl/crypto/des/ofb_enc.c projects/sendfile/crypto/openssl/crypto/des/pcbc_enc.c projects/sendfile/crypto/openssl/crypto/des/qud_cksm.c projects/sendfile/crypto/openssl/crypto/des/rand_key.c projects/sendfile/crypto/openssl/crypto/des/read2pwd.c projects/sendfile/crypto/openssl/crypto/des/read_pwd.c projects/sendfile/crypto/openssl/crypto/des/rpc_des.h projects/sendfile/crypto/openssl/crypto/des/rpc_enc.c projects/sendfile/crypto/openssl/crypto/des/rpw.c projects/sendfile/crypto/openssl/crypto/des/set_key.c projects/sendfile/crypto/openssl/crypto/des/speed.c projects/sendfile/crypto/openssl/crypto/des/spr.h projects/sendfile/crypto/openssl/crypto/des/str2key.c projects/sendfile/crypto/openssl/crypto/des/xcbc_enc.c projects/sendfile/crypto/openssl/crypto/dh/dh.h projects/sendfile/crypto/openssl/crypto/dh/dh_ameth.c projects/sendfile/crypto/openssl/crypto/dh/dh_asn1.c projects/sendfile/crypto/openssl/crypto/dh/dh_check.c projects/sendfile/crypto/openssl/crypto/dh/dh_depr.c projects/sendfile/crypto/openssl/crypto/dh/dh_err.c projects/sendfile/crypto/openssl/crypto/dh/dh_gen.c projects/sendfile/crypto/openssl/crypto/dh/dh_key.c projects/sendfile/crypto/openssl/crypto/dh/dh_lib.c projects/sendfile/crypto/openssl/crypto/dh/dh_pmeth.c projects/sendfile/crypto/openssl/crypto/dh/dh_prn.c projects/sendfile/crypto/openssl/crypto/dh/dhtest.c projects/sendfile/crypto/openssl/crypto/dh/p1024.c projects/sendfile/crypto/openssl/crypto/dh/p192.c projects/sendfile/crypto/openssl/crypto/dh/p512.c projects/sendfile/crypto/openssl/crypto/dsa/dsa.h projects/sendfile/crypto/openssl/crypto/dsa/dsa_ameth.c projects/sendfile/crypto/openssl/crypto/dsa/dsa_asn1.c projects/sendfile/crypto/openssl/crypto/dsa/dsa_depr.c projects/sendfile/crypto/openssl/crypto/dsa/dsa_err.c projects/sendfile/crypto/openssl/crypto/dsa/dsa_gen.c projects/sendfile/crypto/openssl/crypto/dsa/dsa_key.c projects/sendfile/crypto/openssl/crypto/dsa/dsa_lib.c projects/sendfile/crypto/openssl/crypto/dsa/dsa_locl.h projects/sendfile/crypto/openssl/crypto/dsa/dsa_ossl.c projects/sendfile/crypto/openssl/crypto/dsa/dsa_pmeth.c projects/sendfile/crypto/openssl/crypto/dsa/dsa_prn.c projects/sendfile/crypto/openssl/crypto/dsa/dsa_sign.c projects/sendfile/crypto/openssl/crypto/dsa/dsa_vrf.c projects/sendfile/crypto/openssl/crypto/dsa/dsagen.c projects/sendfile/crypto/openssl/crypto/dsa/dsatest.c projects/sendfile/crypto/openssl/crypto/dso/dso.h projects/sendfile/crypto/openssl/crypto/dso/dso_beos.c projects/sendfile/crypto/openssl/crypto/dso/dso_dl.c projects/sendfile/crypto/openssl/crypto/dso/dso_dlfcn.c projects/sendfile/crypto/openssl/crypto/dso/dso_err.c projects/sendfile/crypto/openssl/crypto/dso/dso_lib.c projects/sendfile/crypto/openssl/crypto/dso/dso_null.c projects/sendfile/crypto/openssl/crypto/dso/dso_openssl.c projects/sendfile/crypto/openssl/crypto/ebcdic.c projects/sendfile/crypto/openssl/crypto/ebcdic.h projects/sendfile/crypto/openssl/crypto/ec/ec.h projects/sendfile/crypto/openssl/crypto/ec/ec2_mult.c projects/sendfile/crypto/openssl/crypto/ec/ec2_oct.c projects/sendfile/crypto/openssl/crypto/ec/ec2_smpl.c projects/sendfile/crypto/openssl/crypto/ec/ec_ameth.c projects/sendfile/crypto/openssl/crypto/ec/ec_asn1.c projects/sendfile/crypto/openssl/crypto/ec/ec_check.c projects/sendfile/crypto/openssl/crypto/ec/ec_curve.c projects/sendfile/crypto/openssl/crypto/ec/ec_cvt.c projects/sendfile/crypto/openssl/crypto/ec/ec_err.c projects/sendfile/crypto/openssl/crypto/ec/ec_key.c projects/sendfile/crypto/openssl/crypto/ec/ec_lcl.h projects/sendfile/crypto/openssl/crypto/ec/ec_lib.c projects/sendfile/crypto/openssl/crypto/ec/ec_mult.c projects/sendfile/crypto/openssl/crypto/ec/ec_oct.c projects/sendfile/crypto/openssl/crypto/ec/ec_pmeth.c projects/sendfile/crypto/openssl/crypto/ec/ec_print.c projects/sendfile/crypto/openssl/crypto/ec/eck_prn.c projects/sendfile/crypto/openssl/crypto/ec/ecp_mont.c projects/sendfile/crypto/openssl/crypto/ec/ecp_nist.c projects/sendfile/crypto/openssl/crypto/ec/ecp_nistp224.c projects/sendfile/crypto/openssl/crypto/ec/ecp_nistp256.c projects/sendfile/crypto/openssl/crypto/ec/ecp_nistp521.c projects/sendfile/crypto/openssl/crypto/ec/ecp_nistputil.c projects/sendfile/crypto/openssl/crypto/ec/ecp_oct.c projects/sendfile/crypto/openssl/crypto/ec/ecp_smpl.c projects/sendfile/crypto/openssl/crypto/ec/ectest.c projects/sendfile/crypto/openssl/crypto/ecdh/ecdh.h projects/sendfile/crypto/openssl/crypto/ecdh/ecdhtest.c projects/sendfile/crypto/openssl/crypto/ecdh/ech_err.c projects/sendfile/crypto/openssl/crypto/ecdh/ech_key.c projects/sendfile/crypto/openssl/crypto/ecdh/ech_lib.c projects/sendfile/crypto/openssl/crypto/ecdh/ech_locl.h projects/sendfile/crypto/openssl/crypto/ecdh/ech_ossl.c projects/sendfile/crypto/openssl/crypto/ecdsa/ecdsa.h projects/sendfile/crypto/openssl/crypto/ecdsa/ecdsatest.c projects/sendfile/crypto/openssl/crypto/ecdsa/ecs_asn1.c projects/sendfile/crypto/openssl/crypto/ecdsa/ecs_err.c projects/sendfile/crypto/openssl/crypto/ecdsa/ecs_lib.c projects/sendfile/crypto/openssl/crypto/ecdsa/ecs_locl.h projects/sendfile/crypto/openssl/crypto/ecdsa/ecs_ossl.c projects/sendfile/crypto/openssl/crypto/ecdsa/ecs_sign.c projects/sendfile/crypto/openssl/crypto/ecdsa/ecs_vrf.c projects/sendfile/crypto/openssl/crypto/engine/eng_all.c projects/sendfile/crypto/openssl/crypto/engine/eng_cnf.c projects/sendfile/crypto/openssl/crypto/engine/eng_cryptodev.c projects/sendfile/crypto/openssl/crypto/engine/eng_ctrl.c projects/sendfile/crypto/openssl/crypto/engine/eng_dyn.c projects/sendfile/crypto/openssl/crypto/engine/eng_err.c projects/sendfile/crypto/openssl/crypto/engine/eng_fat.c projects/sendfile/crypto/openssl/crypto/engine/eng_init.c projects/sendfile/crypto/openssl/crypto/engine/eng_int.h projects/sendfile/crypto/openssl/crypto/engine/eng_lib.c projects/sendfile/crypto/openssl/crypto/engine/eng_list.c projects/sendfile/crypto/openssl/crypto/engine/eng_openssl.c projects/sendfile/crypto/openssl/crypto/engine/eng_pkey.c projects/sendfile/crypto/openssl/crypto/engine/eng_rdrand.c projects/sendfile/crypto/openssl/crypto/engine/eng_rsax.c projects/sendfile/crypto/openssl/crypto/engine/eng_table.c projects/sendfile/crypto/openssl/crypto/engine/engine.h projects/sendfile/crypto/openssl/crypto/engine/enginetest.c projects/sendfile/crypto/openssl/crypto/engine/tb_asnmth.c projects/sendfile/crypto/openssl/crypto/engine/tb_cipher.c projects/sendfile/crypto/openssl/crypto/engine/tb_dh.c projects/sendfile/crypto/openssl/crypto/engine/tb_digest.c projects/sendfile/crypto/openssl/crypto/engine/tb_dsa.c projects/sendfile/crypto/openssl/crypto/engine/tb_ecdh.c projects/sendfile/crypto/openssl/crypto/engine/tb_ecdsa.c projects/sendfile/crypto/openssl/crypto/engine/tb_pkmeth.c projects/sendfile/crypto/openssl/crypto/engine/tb_rand.c projects/sendfile/crypto/openssl/crypto/engine/tb_rsa.c projects/sendfile/crypto/openssl/crypto/engine/tb_store.c projects/sendfile/crypto/openssl/crypto/err/err.c projects/sendfile/crypto/openssl/crypto/err/err.h projects/sendfile/crypto/openssl/crypto/err/err_all.c projects/sendfile/crypto/openssl/crypto/err/err_prn.c projects/sendfile/crypto/openssl/crypto/evp/Makefile projects/sendfile/crypto/openssl/crypto/evp/bio_b64.c projects/sendfile/crypto/openssl/crypto/evp/bio_enc.c projects/sendfile/crypto/openssl/crypto/evp/bio_md.c projects/sendfile/crypto/openssl/crypto/evp/bio_ok.c projects/sendfile/crypto/openssl/crypto/evp/c_all.c projects/sendfile/crypto/openssl/crypto/evp/c_allc.c projects/sendfile/crypto/openssl/crypto/evp/c_alld.c projects/sendfile/crypto/openssl/crypto/evp/digest.c projects/sendfile/crypto/openssl/crypto/evp/e_aes.c projects/sendfile/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c projects/sendfile/crypto/openssl/crypto/evp/e_bf.c projects/sendfile/crypto/openssl/crypto/evp/e_camellia.c projects/sendfile/crypto/openssl/crypto/evp/e_cast.c projects/sendfile/crypto/openssl/crypto/evp/e_des.c projects/sendfile/crypto/openssl/crypto/evp/e_des3.c projects/sendfile/crypto/openssl/crypto/evp/e_dsa.c projects/sendfile/crypto/openssl/crypto/evp/e_idea.c projects/sendfile/crypto/openssl/crypto/evp/e_null.c projects/sendfile/crypto/openssl/crypto/evp/e_old.c projects/sendfile/crypto/openssl/crypto/evp/e_rc2.c projects/sendfile/crypto/openssl/crypto/evp/e_rc4.c projects/sendfile/crypto/openssl/crypto/evp/e_rc4_hmac_md5.c projects/sendfile/crypto/openssl/crypto/evp/e_rc5.c projects/sendfile/crypto/openssl/crypto/evp/e_seed.c projects/sendfile/crypto/openssl/crypto/evp/e_xcbc_d.c projects/sendfile/crypto/openssl/crypto/evp/encode.c projects/sendfile/crypto/openssl/crypto/evp/evp.h projects/sendfile/crypto/openssl/crypto/evp/evp_acnf.c projects/sendfile/crypto/openssl/crypto/evp/evp_cnf.c projects/sendfile/crypto/openssl/crypto/evp/evp_enc.c projects/sendfile/crypto/openssl/crypto/evp/evp_err.c projects/sendfile/crypto/openssl/crypto/evp/evp_fips.c projects/sendfile/crypto/openssl/crypto/evp/evp_key.c projects/sendfile/crypto/openssl/crypto/evp/evp_lib.c projects/sendfile/crypto/openssl/crypto/evp/evp_locl.h projects/sendfile/crypto/openssl/crypto/evp/evp_pbe.c projects/sendfile/crypto/openssl/crypto/evp/evp_pkey.c projects/sendfile/crypto/openssl/crypto/evp/evp_test.c projects/sendfile/crypto/openssl/crypto/evp/m_dss.c projects/sendfile/crypto/openssl/crypto/evp/m_dss1.c projects/sendfile/crypto/openssl/crypto/evp/m_ecdsa.c projects/sendfile/crypto/openssl/crypto/evp/m_md2.c projects/sendfile/crypto/openssl/crypto/evp/m_md4.c projects/sendfile/crypto/openssl/crypto/evp/m_md5.c projects/sendfile/crypto/openssl/crypto/evp/m_mdc2.c projects/sendfile/crypto/openssl/crypto/evp/m_null.c projects/sendfile/crypto/openssl/crypto/evp/m_ripemd.c projects/sendfile/crypto/openssl/crypto/evp/m_sha.c projects/sendfile/crypto/openssl/crypto/evp/m_sha1.c projects/sendfile/crypto/openssl/crypto/evp/m_sigver.c projects/sendfile/crypto/openssl/crypto/evp/m_wp.c projects/sendfile/crypto/openssl/crypto/evp/names.c projects/sendfile/crypto/openssl/crypto/evp/openbsd_hw.c projects/sendfile/crypto/openssl/crypto/evp/p5_crpt.c projects/sendfile/crypto/openssl/crypto/evp/p5_crpt2.c projects/sendfile/crypto/openssl/crypto/evp/p_dec.c projects/sendfile/crypto/openssl/crypto/evp/p_enc.c projects/sendfile/crypto/openssl/crypto/evp/p_lib.c projects/sendfile/crypto/openssl/crypto/evp/p_open.c projects/sendfile/crypto/openssl/crypto/evp/p_seal.c projects/sendfile/crypto/openssl/crypto/evp/p_sign.c projects/sendfile/crypto/openssl/crypto/evp/p_verify.c projects/sendfile/crypto/openssl/crypto/evp/pmeth_fn.c projects/sendfile/crypto/openssl/crypto/evp/pmeth_gn.c projects/sendfile/crypto/openssl/crypto/evp/pmeth_lib.c projects/sendfile/crypto/openssl/crypto/ex_data.c projects/sendfile/crypto/openssl/crypto/fips_err.h projects/sendfile/crypto/openssl/crypto/fips_ers.c projects/sendfile/crypto/openssl/crypto/hmac/hm_ameth.c projects/sendfile/crypto/openssl/crypto/hmac/hm_pmeth.c projects/sendfile/crypto/openssl/crypto/hmac/hmac.c projects/sendfile/crypto/openssl/crypto/hmac/hmac.h projects/sendfile/crypto/openssl/crypto/hmac/hmactest.c projects/sendfile/crypto/openssl/crypto/idea/i_cbc.c projects/sendfile/crypto/openssl/crypto/idea/i_cfb64.c projects/sendfile/crypto/openssl/crypto/idea/i_ecb.c projects/sendfile/crypto/openssl/crypto/idea/i_ofb64.c projects/sendfile/crypto/openssl/crypto/idea/i_skey.c projects/sendfile/crypto/openssl/crypto/idea/idea.h projects/sendfile/crypto/openssl/crypto/idea/idea_lcl.h projects/sendfile/crypto/openssl/crypto/idea/idea_spd.c projects/sendfile/crypto/openssl/crypto/idea/ideatest.c projects/sendfile/crypto/openssl/crypto/jpake/jpake.c projects/sendfile/crypto/openssl/crypto/jpake/jpake.h projects/sendfile/crypto/openssl/crypto/jpake/jpake_err.c projects/sendfile/crypto/openssl/crypto/jpake/jpaketest.c projects/sendfile/crypto/openssl/crypto/krb5/krb5_asn.c projects/sendfile/crypto/openssl/crypto/krb5/krb5_asn.h projects/sendfile/crypto/openssl/crypto/lhash/lh_stats.c projects/sendfile/crypto/openssl/crypto/lhash/lh_test.c projects/sendfile/crypto/openssl/crypto/lhash/lhash.c projects/sendfile/crypto/openssl/crypto/lhash/lhash.h projects/sendfile/crypto/openssl/crypto/md2/md2.c projects/sendfile/crypto/openssl/crypto/md2/md2.h projects/sendfile/crypto/openssl/crypto/md2/md2_dgst.c projects/sendfile/crypto/openssl/crypto/md2/md2_one.c projects/sendfile/crypto/openssl/crypto/md2/md2test.c projects/sendfile/crypto/openssl/crypto/md32_common.h projects/sendfile/crypto/openssl/crypto/md4/md4.c projects/sendfile/crypto/openssl/crypto/md4/md4.h projects/sendfile/crypto/openssl/crypto/md4/md4_dgst.c projects/sendfile/crypto/openssl/crypto/md4/md4_locl.h projects/sendfile/crypto/openssl/crypto/md4/md4_one.c projects/sendfile/crypto/openssl/crypto/md4/md4test.c projects/sendfile/crypto/openssl/crypto/md5/md5.c projects/sendfile/crypto/openssl/crypto/md5/md5.h projects/sendfile/crypto/openssl/crypto/md5/md5_dgst.c projects/sendfile/crypto/openssl/crypto/md5/md5_locl.h projects/sendfile/crypto/openssl/crypto/md5/md5_one.c projects/sendfile/crypto/openssl/crypto/md5/md5test.c projects/sendfile/crypto/openssl/crypto/mdc2/mdc2.h projects/sendfile/crypto/openssl/crypto/mdc2/mdc2_one.c projects/sendfile/crypto/openssl/crypto/mdc2/mdc2dgst.c projects/sendfile/crypto/openssl/crypto/mdc2/mdc2test.c projects/sendfile/crypto/openssl/crypto/mem.c projects/sendfile/crypto/openssl/crypto/mem_clr.c projects/sendfile/crypto/openssl/crypto/mem_dbg.c projects/sendfile/crypto/openssl/crypto/modes/cbc128.c projects/sendfile/crypto/openssl/crypto/modes/ccm128.c projects/sendfile/crypto/openssl/crypto/modes/cfb128.c projects/sendfile/crypto/openssl/crypto/modes/ctr128.c projects/sendfile/crypto/openssl/crypto/modes/cts128.c projects/sendfile/crypto/openssl/crypto/modes/gcm128.c projects/sendfile/crypto/openssl/crypto/modes/modes.h projects/sendfile/crypto/openssl/crypto/modes/modes_lcl.h projects/sendfile/crypto/openssl/crypto/modes/ofb128.c projects/sendfile/crypto/openssl/crypto/modes/xts128.c projects/sendfile/crypto/openssl/crypto/o_dir.c projects/sendfile/crypto/openssl/crypto/o_dir.h projects/sendfile/crypto/openssl/crypto/o_dir_test.c projects/sendfile/crypto/openssl/crypto/o_fips.c projects/sendfile/crypto/openssl/crypto/o_init.c projects/sendfile/crypto/openssl/crypto/o_str.c projects/sendfile/crypto/openssl/crypto/o_str.h projects/sendfile/crypto/openssl/crypto/o_time.c projects/sendfile/crypto/openssl/crypto/o_time.h projects/sendfile/crypto/openssl/crypto/objects/o_names.c projects/sendfile/crypto/openssl/crypto/objects/obj_dat.c projects/sendfile/crypto/openssl/crypto/objects/obj_err.c projects/sendfile/crypto/openssl/crypto/objects/obj_lib.c projects/sendfile/crypto/openssl/crypto/objects/obj_mac.h projects/sendfile/crypto/openssl/crypto/objects/obj_xref.c projects/sendfile/crypto/openssl/crypto/objects/obj_xref.h projects/sendfile/crypto/openssl/crypto/objects/objects.h projects/sendfile/crypto/openssl/crypto/objects/objects.pl projects/sendfile/crypto/openssl/crypto/objects/objxref.pl projects/sendfile/crypto/openssl/crypto/ocsp/ocsp.h projects/sendfile/crypto/openssl/crypto/ocsp/ocsp_asn.c projects/sendfile/crypto/openssl/crypto/ocsp/ocsp_cl.c projects/sendfile/crypto/openssl/crypto/ocsp/ocsp_err.c projects/sendfile/crypto/openssl/crypto/ocsp/ocsp_ext.c projects/sendfile/crypto/openssl/crypto/ocsp/ocsp_ht.c projects/sendfile/crypto/openssl/crypto/ocsp/ocsp_lib.c projects/sendfile/crypto/openssl/crypto/ocsp/ocsp_prn.c projects/sendfile/crypto/openssl/crypto/ocsp/ocsp_srv.c projects/sendfile/crypto/openssl/crypto/ocsp/ocsp_vfy.c projects/sendfile/crypto/openssl/crypto/opensslv.h projects/sendfile/crypto/openssl/crypto/ossl_typ.h projects/sendfile/crypto/openssl/crypto/pem/pem.h projects/sendfile/crypto/openssl/crypto/pem/pem2.h projects/sendfile/crypto/openssl/crypto/pem/pem_all.c projects/sendfile/crypto/openssl/crypto/pem/pem_err.c projects/sendfile/crypto/openssl/crypto/pem/pem_info.c projects/sendfile/crypto/openssl/crypto/pem/pem_lib.c projects/sendfile/crypto/openssl/crypto/pem/pem_oth.c projects/sendfile/crypto/openssl/crypto/pem/pem_pk8.c projects/sendfile/crypto/openssl/crypto/pem/pem_pkey.c projects/sendfile/crypto/openssl/crypto/pem/pem_seal.c projects/sendfile/crypto/openssl/crypto/pem/pem_sign.c projects/sendfile/crypto/openssl/crypto/pem/pem_x509.c projects/sendfile/crypto/openssl/crypto/pem/pem_xaux.c projects/sendfile/crypto/openssl/crypto/pem/pvkfmt.c projects/sendfile/crypto/openssl/crypto/pkcs12/p12_add.c projects/sendfile/crypto/openssl/crypto/pkcs12/p12_asn.c projects/sendfile/crypto/openssl/crypto/pkcs12/p12_attr.c projects/sendfile/crypto/openssl/crypto/pkcs12/p12_crpt.c projects/sendfile/crypto/openssl/crypto/pkcs12/p12_crt.c projects/sendfile/crypto/openssl/crypto/pkcs12/p12_decr.c projects/sendfile/crypto/openssl/crypto/pkcs12/p12_init.c projects/sendfile/crypto/openssl/crypto/pkcs12/p12_key.c projects/sendfile/crypto/openssl/crypto/pkcs12/p12_kiss.c projects/sendfile/crypto/openssl/crypto/pkcs12/p12_mutl.c projects/sendfile/crypto/openssl/crypto/pkcs12/p12_npas.c projects/sendfile/crypto/openssl/crypto/pkcs12/p12_p8d.c projects/sendfile/crypto/openssl/crypto/pkcs12/p12_p8e.c projects/sendfile/crypto/openssl/crypto/pkcs12/p12_utl.c projects/sendfile/crypto/openssl/crypto/pkcs12/pk12err.c projects/sendfile/crypto/openssl/crypto/pkcs12/pkcs12.h projects/sendfile/crypto/openssl/crypto/pkcs7/bio_pk7.c projects/sendfile/crypto/openssl/crypto/pkcs7/pk7_asn1.c projects/sendfile/crypto/openssl/crypto/pkcs7/pk7_attr.c projects/sendfile/crypto/openssl/crypto/pkcs7/pk7_dgst.c projects/sendfile/crypto/openssl/crypto/pkcs7/pk7_doit.c projects/sendfile/crypto/openssl/crypto/pkcs7/pk7_enc.c projects/sendfile/crypto/openssl/crypto/pkcs7/pk7_lib.c projects/sendfile/crypto/openssl/crypto/pkcs7/pk7_mime.c projects/sendfile/crypto/openssl/crypto/pkcs7/pk7_smime.c projects/sendfile/crypto/openssl/crypto/pkcs7/pkcs7.h projects/sendfile/crypto/openssl/crypto/pkcs7/pkcs7err.c projects/sendfile/crypto/openssl/crypto/ppccap.c projects/sendfile/crypto/openssl/crypto/pqueue/pq_test.c projects/sendfile/crypto/openssl/crypto/pqueue/pqueue.c projects/sendfile/crypto/openssl/crypto/pqueue/pqueue.h projects/sendfile/crypto/openssl/crypto/rand/md_rand.c projects/sendfile/crypto/openssl/crypto/rand/rand.h projects/sendfile/crypto/openssl/crypto/rand/rand_egd.c projects/sendfile/crypto/openssl/crypto/rand/rand_err.c projects/sendfile/crypto/openssl/crypto/rand/rand_lcl.h projects/sendfile/crypto/openssl/crypto/rand/rand_lib.c projects/sendfile/crypto/openssl/crypto/rand/rand_unix.c projects/sendfile/crypto/openssl/crypto/rand/randfile.c projects/sendfile/crypto/openssl/crypto/rand/randtest.c projects/sendfile/crypto/openssl/crypto/rc2/rc2.h projects/sendfile/crypto/openssl/crypto/rc2/rc2_cbc.c projects/sendfile/crypto/openssl/crypto/rc2/rc2_ecb.c projects/sendfile/crypto/openssl/crypto/rc2/rc2_locl.h projects/sendfile/crypto/openssl/crypto/rc2/rc2_skey.c projects/sendfile/crypto/openssl/crypto/rc2/rc2cfb64.c projects/sendfile/crypto/openssl/crypto/rc2/rc2ofb64.c projects/sendfile/crypto/openssl/crypto/rc2/rc2speed.c projects/sendfile/crypto/openssl/crypto/rc2/rc2test.c projects/sendfile/crypto/openssl/crypto/rc2/tab.c projects/sendfile/crypto/openssl/crypto/rc4/rc4.c projects/sendfile/crypto/openssl/crypto/rc4/rc4.h projects/sendfile/crypto/openssl/crypto/rc4/rc4_enc.c projects/sendfile/crypto/openssl/crypto/rc4/rc4_locl.h projects/sendfile/crypto/openssl/crypto/rc4/rc4_skey.c projects/sendfile/crypto/openssl/crypto/rc4/rc4_utl.c projects/sendfile/crypto/openssl/crypto/rc4/rc4speed.c projects/sendfile/crypto/openssl/crypto/rc4/rc4test.c projects/sendfile/crypto/openssl/crypto/rc5/rc5.h projects/sendfile/crypto/openssl/crypto/rc5/rc5_ecb.c projects/sendfile/crypto/openssl/crypto/rc5/rc5_enc.c projects/sendfile/crypto/openssl/crypto/rc5/rc5_locl.h projects/sendfile/crypto/openssl/crypto/rc5/rc5_skey.c projects/sendfile/crypto/openssl/crypto/rc5/rc5cfb64.c projects/sendfile/crypto/openssl/crypto/rc5/rc5ofb64.c projects/sendfile/crypto/openssl/crypto/rc5/rc5speed.c projects/sendfile/crypto/openssl/crypto/rc5/rc5test.c projects/sendfile/crypto/openssl/crypto/ripemd/ripemd.h projects/sendfile/crypto/openssl/crypto/ripemd/rmd160.c projects/sendfile/crypto/openssl/crypto/ripemd/rmd_dgst.c projects/sendfile/crypto/openssl/crypto/ripemd/rmd_locl.h projects/sendfile/crypto/openssl/crypto/ripemd/rmd_one.c projects/sendfile/crypto/openssl/crypto/ripemd/rmdconst.h projects/sendfile/crypto/openssl/crypto/ripemd/rmdtest.c projects/sendfile/crypto/openssl/crypto/rsa/rsa.h projects/sendfile/crypto/openssl/crypto/rsa/rsa_ameth.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_asn1.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_chk.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_crpt.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_depr.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_eay.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_err.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_gen.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_lib.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_locl.h projects/sendfile/crypto/openssl/crypto/rsa/rsa_none.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_null.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_oaep.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_pk1.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_pmeth.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_prn.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_pss.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_saos.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_sign.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_ssl.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_test.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_x931.c projects/sendfile/crypto/openssl/crypto/s390xcap.c projects/sendfile/crypto/openssl/crypto/seed/seed.c projects/sendfile/crypto/openssl/crypto/seed/seed.h projects/sendfile/crypto/openssl/crypto/seed/seed_cbc.c projects/sendfile/crypto/openssl/crypto/seed/seed_cfb.c projects/sendfile/crypto/openssl/crypto/seed/seed_ecb.c projects/sendfile/crypto/openssl/crypto/seed/seed_locl.h projects/sendfile/crypto/openssl/crypto/seed/seed_ofb.c projects/sendfile/crypto/openssl/crypto/sha/sha.c projects/sendfile/crypto/openssl/crypto/sha/sha.h projects/sendfile/crypto/openssl/crypto/sha/sha1.c projects/sendfile/crypto/openssl/crypto/sha/sha1_one.c projects/sendfile/crypto/openssl/crypto/sha/sha1dgst.c projects/sendfile/crypto/openssl/crypto/sha/sha1test.c projects/sendfile/crypto/openssl/crypto/sha/sha256.c projects/sendfile/crypto/openssl/crypto/sha/sha256t.c projects/sendfile/crypto/openssl/crypto/sha/sha512.c projects/sendfile/crypto/openssl/crypto/sha/sha512t.c projects/sendfile/crypto/openssl/crypto/sha/sha_dgst.c projects/sendfile/crypto/openssl/crypto/sha/sha_locl.h projects/sendfile/crypto/openssl/crypto/sha/sha_one.c projects/sendfile/crypto/openssl/crypto/sha/shatest.c projects/sendfile/crypto/openssl/crypto/sparcv9cap.c projects/sendfile/crypto/openssl/crypto/srp/srp.h projects/sendfile/crypto/openssl/crypto/srp/srp_grps.h projects/sendfile/crypto/openssl/crypto/srp/srp_lcl.h projects/sendfile/crypto/openssl/crypto/srp/srp_lib.c projects/sendfile/crypto/openssl/crypto/srp/srp_vfy.c projects/sendfile/crypto/openssl/crypto/srp/srptest.c projects/sendfile/crypto/openssl/crypto/stack/safestack.h projects/sendfile/crypto/openssl/crypto/stack/stack.c projects/sendfile/crypto/openssl/crypto/stack/stack.h projects/sendfile/crypto/openssl/crypto/store/store.h projects/sendfile/crypto/openssl/crypto/store/str_err.c projects/sendfile/crypto/openssl/crypto/store/str_lib.c projects/sendfile/crypto/openssl/crypto/store/str_locl.h projects/sendfile/crypto/openssl/crypto/store/str_mem.c projects/sendfile/crypto/openssl/crypto/store/str_meth.c projects/sendfile/crypto/openssl/crypto/symhacks.h projects/sendfile/crypto/openssl/crypto/threads/mttest.c projects/sendfile/crypto/openssl/crypto/threads/th-lock.c projects/sendfile/crypto/openssl/crypto/ts/ts.h projects/sendfile/crypto/openssl/crypto/ts/ts_asn1.c projects/sendfile/crypto/openssl/crypto/ts/ts_conf.c projects/sendfile/crypto/openssl/crypto/ts/ts_err.c projects/sendfile/crypto/openssl/crypto/ts/ts_lib.c projects/sendfile/crypto/openssl/crypto/ts/ts_req_print.c projects/sendfile/crypto/openssl/crypto/ts/ts_req_utils.c projects/sendfile/crypto/openssl/crypto/ts/ts_rsp_print.c projects/sendfile/crypto/openssl/crypto/ts/ts_rsp_sign.c projects/sendfile/crypto/openssl/crypto/ts/ts_rsp_utils.c projects/sendfile/crypto/openssl/crypto/ts/ts_rsp_verify.c projects/sendfile/crypto/openssl/crypto/ts/ts_verify_ctx.c projects/sendfile/crypto/openssl/crypto/txt_db/txt_db.c projects/sendfile/crypto/openssl/crypto/txt_db/txt_db.h projects/sendfile/crypto/openssl/crypto/ui/ui.h projects/sendfile/crypto/openssl/crypto/ui/ui_compat.c projects/sendfile/crypto/openssl/crypto/ui/ui_compat.h projects/sendfile/crypto/openssl/crypto/ui/ui_err.c projects/sendfile/crypto/openssl/crypto/ui/ui_lib.c projects/sendfile/crypto/openssl/crypto/ui/ui_locl.h projects/sendfile/crypto/openssl/crypto/ui/ui_openssl.c projects/sendfile/crypto/openssl/crypto/ui/ui_util.c projects/sendfile/crypto/openssl/crypto/uid.c projects/sendfile/crypto/openssl/crypto/vms_rms.h projects/sendfile/crypto/openssl/crypto/whrlpool/whrlpool.h projects/sendfile/crypto/openssl/crypto/whrlpool/wp_block.c projects/sendfile/crypto/openssl/crypto/whrlpool/wp_dgst.c projects/sendfile/crypto/openssl/crypto/whrlpool/wp_locl.h projects/sendfile/crypto/openssl/crypto/whrlpool/wp_test.c projects/sendfile/crypto/openssl/crypto/x509/by_dir.c projects/sendfile/crypto/openssl/crypto/x509/by_file.c projects/sendfile/crypto/openssl/crypto/x509/x509.h projects/sendfile/crypto/openssl/crypto/x509/x509_att.c projects/sendfile/crypto/openssl/crypto/x509/x509_cmp.c projects/sendfile/crypto/openssl/crypto/x509/x509_d2.c projects/sendfile/crypto/openssl/crypto/x509/x509_def.c projects/sendfile/crypto/openssl/crypto/x509/x509_err.c projects/sendfile/crypto/openssl/crypto/x509/x509_ext.c projects/sendfile/crypto/openssl/crypto/x509/x509_lu.c projects/sendfile/crypto/openssl/crypto/x509/x509_obj.c projects/sendfile/crypto/openssl/crypto/x509/x509_r2x.c projects/sendfile/crypto/openssl/crypto/x509/x509_req.c projects/sendfile/crypto/openssl/crypto/x509/x509_set.c projects/sendfile/crypto/openssl/crypto/x509/x509_trs.c projects/sendfile/crypto/openssl/crypto/x509/x509_txt.c projects/sendfile/crypto/openssl/crypto/x509/x509_v3.c projects/sendfile/crypto/openssl/crypto/x509/x509_vfy.c projects/sendfile/crypto/openssl/crypto/x509/x509_vfy.h projects/sendfile/crypto/openssl/crypto/x509/x509_vpm.c projects/sendfile/crypto/openssl/crypto/x509/x509cset.c projects/sendfile/crypto/openssl/crypto/x509/x509name.c projects/sendfile/crypto/openssl/crypto/x509/x509rset.c projects/sendfile/crypto/openssl/crypto/x509/x509spki.c projects/sendfile/crypto/openssl/crypto/x509/x509type.c projects/sendfile/crypto/openssl/crypto/x509/x_all.c projects/sendfile/crypto/openssl/crypto/x509v3/ext_dat.h projects/sendfile/crypto/openssl/crypto/x509v3/pcy_cache.c projects/sendfile/crypto/openssl/crypto/x509v3/pcy_data.c projects/sendfile/crypto/openssl/crypto/x509v3/pcy_int.h projects/sendfile/crypto/openssl/crypto/x509v3/pcy_lib.c projects/sendfile/crypto/openssl/crypto/x509v3/pcy_map.c projects/sendfile/crypto/openssl/crypto/x509v3/pcy_node.c projects/sendfile/crypto/openssl/crypto/x509v3/pcy_tree.c projects/sendfile/crypto/openssl/crypto/x509v3/tabtest.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_addr.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_akey.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_akeya.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_alt.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_asid.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_bcons.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_bitst.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_conf.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_cpols.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_crld.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_enum.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_extku.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_genn.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_ia5.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_info.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_int.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_lib.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_ncons.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_ocsp.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_pci.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_pcia.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_pcons.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_pku.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_pmaps.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_prn.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_purp.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_skey.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_sxnet.c projects/sendfile/crypto/openssl/crypto/x509v3/v3_utl.c projects/sendfile/crypto/openssl/crypto/x509v3/v3conf.c projects/sendfile/crypto/openssl/crypto/x509v3/v3err.c projects/sendfile/crypto/openssl/crypto/x509v3/v3prin.c projects/sendfile/crypto/openssl/crypto/x509v3/x509v3.h projects/sendfile/crypto/openssl/doc/apps/ciphers.pod projects/sendfile/crypto/openssl/doc/apps/config.pod projects/sendfile/crypto/openssl/doc/apps/ocsp.pod projects/sendfile/crypto/openssl/doc/crypto/CMS_get0_type.pod projects/sendfile/crypto/openssl/doc/crypto/CONF_modules_load_file.pod projects/sendfile/crypto/openssl/doc/crypto/OPENSSL_config.pod projects/sendfile/crypto/openssl/doc/crypto/d2i_X509.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_pending.pod projects/sendfile/crypto/openssl/doc/ssl/ssl.pod projects/sendfile/crypto/openssl/e_os.h projects/sendfile/crypto/openssl/e_os2.h projects/sendfile/crypto/openssl/engines/ccgost/e_gost_err.c projects/sendfile/crypto/openssl/engines/ccgost/e_gost_err.h projects/sendfile/crypto/openssl/engines/ccgost/gost2001.c projects/sendfile/crypto/openssl/engines/ccgost/gost2001_keyx.c projects/sendfile/crypto/openssl/engines/ccgost/gost2001_keyx.h projects/sendfile/crypto/openssl/engines/ccgost/gost89.c projects/sendfile/crypto/openssl/engines/ccgost/gost89.h projects/sendfile/crypto/openssl/engines/ccgost/gost94_keyx.c projects/sendfile/crypto/openssl/engines/ccgost/gost_ameth.c projects/sendfile/crypto/openssl/engines/ccgost/gost_asn1.c projects/sendfile/crypto/openssl/engines/ccgost/gost_crypt.c projects/sendfile/crypto/openssl/engines/ccgost/gost_ctl.c projects/sendfile/crypto/openssl/engines/ccgost/gost_eng.c projects/sendfile/crypto/openssl/engines/ccgost/gost_keywrap.c projects/sendfile/crypto/openssl/engines/ccgost/gost_keywrap.h projects/sendfile/crypto/openssl/engines/ccgost/gost_lcl.h projects/sendfile/crypto/openssl/engines/ccgost/gost_md.c projects/sendfile/crypto/openssl/engines/ccgost/gost_params.c projects/sendfile/crypto/openssl/engines/ccgost/gost_params.h projects/sendfile/crypto/openssl/engines/ccgost/gost_pmeth.c projects/sendfile/crypto/openssl/engines/ccgost/gost_sign.c projects/sendfile/crypto/openssl/engines/ccgost/gosthash.c projects/sendfile/crypto/openssl/engines/ccgost/gosthash.h projects/sendfile/crypto/openssl/engines/ccgost/gostsum.c projects/sendfile/crypto/openssl/engines/e_4758cca.c projects/sendfile/crypto/openssl/engines/e_4758cca_err.c projects/sendfile/crypto/openssl/engines/e_4758cca_err.h projects/sendfile/crypto/openssl/engines/e_aep.c projects/sendfile/crypto/openssl/engines/e_aep_err.c projects/sendfile/crypto/openssl/engines/e_aep_err.h projects/sendfile/crypto/openssl/engines/e_atalla.c projects/sendfile/crypto/openssl/engines/e_atalla_err.c projects/sendfile/crypto/openssl/engines/e_atalla_err.h projects/sendfile/crypto/openssl/engines/e_capi.c projects/sendfile/crypto/openssl/engines/e_capi_err.c projects/sendfile/crypto/openssl/engines/e_capi_err.h projects/sendfile/crypto/openssl/engines/e_chil.c projects/sendfile/crypto/openssl/engines/e_chil_err.c projects/sendfile/crypto/openssl/engines/e_chil_err.h projects/sendfile/crypto/openssl/engines/e_cswift.c projects/sendfile/crypto/openssl/engines/e_cswift_err.c projects/sendfile/crypto/openssl/engines/e_cswift_err.h projects/sendfile/crypto/openssl/engines/e_gmp.c projects/sendfile/crypto/openssl/engines/e_gmp_err.c projects/sendfile/crypto/openssl/engines/e_gmp_err.h projects/sendfile/crypto/openssl/engines/e_nuron.c projects/sendfile/crypto/openssl/engines/e_nuron_err.c projects/sendfile/crypto/openssl/engines/e_nuron_err.h projects/sendfile/crypto/openssl/engines/e_padlock.c projects/sendfile/crypto/openssl/engines/e_sureware.c projects/sendfile/crypto/openssl/engines/e_sureware_err.c projects/sendfile/crypto/openssl/engines/e_sureware_err.h projects/sendfile/crypto/openssl/engines/e_ubsec.c projects/sendfile/crypto/openssl/engines/e_ubsec_err.c projects/sendfile/crypto/openssl/engines/e_ubsec_err.h projects/sendfile/crypto/openssl/engines/vendor_defns/aep.h projects/sendfile/crypto/openssl/engines/vendor_defns/atalla.h projects/sendfile/crypto/openssl/engines/vendor_defns/cswift.h projects/sendfile/crypto/openssl/engines/vendor_defns/hw_4758_cca.h projects/sendfile/crypto/openssl/engines/vendor_defns/hw_ubsec.h projects/sendfile/crypto/openssl/engines/vendor_defns/hwcryptohook.h projects/sendfile/crypto/openssl/engines/vendor_defns/sureware.h projects/sendfile/crypto/openssl/ssl/bio_ssl.c projects/sendfile/crypto/openssl/ssl/d1_both.c projects/sendfile/crypto/openssl/ssl/d1_clnt.c projects/sendfile/crypto/openssl/ssl/d1_enc.c projects/sendfile/crypto/openssl/ssl/d1_lib.c projects/sendfile/crypto/openssl/ssl/d1_meth.c projects/sendfile/crypto/openssl/ssl/d1_pkt.c projects/sendfile/crypto/openssl/ssl/d1_srtp.c projects/sendfile/crypto/openssl/ssl/d1_srvr.c projects/sendfile/crypto/openssl/ssl/dtls1.h projects/sendfile/crypto/openssl/ssl/heartbeat_test.c projects/sendfile/crypto/openssl/ssl/kssl.c projects/sendfile/crypto/openssl/ssl/kssl.h projects/sendfile/crypto/openssl/ssl/kssl_lcl.h projects/sendfile/crypto/openssl/ssl/s23_clnt.c projects/sendfile/crypto/openssl/ssl/s23_lib.c projects/sendfile/crypto/openssl/ssl/s23_meth.c projects/sendfile/crypto/openssl/ssl/s23_pkt.c projects/sendfile/crypto/openssl/ssl/s23_srvr.c projects/sendfile/crypto/openssl/ssl/s2_clnt.c projects/sendfile/crypto/openssl/ssl/s2_enc.c projects/sendfile/crypto/openssl/ssl/s2_lib.c projects/sendfile/crypto/openssl/ssl/s2_meth.c projects/sendfile/crypto/openssl/ssl/s2_pkt.c projects/sendfile/crypto/openssl/ssl/s2_srvr.c projects/sendfile/crypto/openssl/ssl/s3_both.c projects/sendfile/crypto/openssl/ssl/s3_cbc.c projects/sendfile/crypto/openssl/ssl/s3_clnt.c projects/sendfile/crypto/openssl/ssl/s3_enc.c projects/sendfile/crypto/openssl/ssl/s3_lib.c projects/sendfile/crypto/openssl/ssl/s3_meth.c projects/sendfile/crypto/openssl/ssl/s3_pkt.c projects/sendfile/crypto/openssl/ssl/s3_srvr.c projects/sendfile/crypto/openssl/ssl/srtp.h projects/sendfile/crypto/openssl/ssl/ssl.h projects/sendfile/crypto/openssl/ssl/ssl2.h projects/sendfile/crypto/openssl/ssl/ssl23.h projects/sendfile/crypto/openssl/ssl/ssl3.h projects/sendfile/crypto/openssl/ssl/ssl_algs.c projects/sendfile/crypto/openssl/ssl/ssl_asn1.c projects/sendfile/crypto/openssl/ssl/ssl_cert.c projects/sendfile/crypto/openssl/ssl/ssl_ciph.c projects/sendfile/crypto/openssl/ssl/ssl_err.c projects/sendfile/crypto/openssl/ssl/ssl_err2.c projects/sendfile/crypto/openssl/ssl/ssl_lib.c projects/sendfile/crypto/openssl/ssl/ssl_locl.h projects/sendfile/crypto/openssl/ssl/ssl_rsa.c projects/sendfile/crypto/openssl/ssl/ssl_sess.c projects/sendfile/crypto/openssl/ssl/ssl_stat.c projects/sendfile/crypto/openssl/ssl/ssl_task.c projects/sendfile/crypto/openssl/ssl/ssl_txt.c projects/sendfile/crypto/openssl/ssl/ssl_utst.c projects/sendfile/crypto/openssl/ssl/ssltest.c projects/sendfile/crypto/openssl/ssl/t1_clnt.c projects/sendfile/crypto/openssl/ssl/t1_enc.c projects/sendfile/crypto/openssl/ssl/t1_lib.c projects/sendfile/crypto/openssl/ssl/t1_meth.c projects/sendfile/crypto/openssl/ssl/t1_reneg.c projects/sendfile/crypto/openssl/ssl/t1_srvr.c projects/sendfile/crypto/openssl/ssl/tls1.h projects/sendfile/crypto/openssl/ssl/tls_srp.c projects/sendfile/crypto/openssl/util/ck_errf.pl projects/sendfile/crypto/openssl/util/libeay.num projects/sendfile/crypto/openssl/util/mkerr.pl projects/sendfile/etc/Makefile projects/sendfile/etc/autofs/include_ldap projects/sendfile/etc/defaults/periodic.conf projects/sendfile/etc/login.conf projects/sendfile/etc/mtree/BSD.usr.dist projects/sendfile/etc/ntp.conf projects/sendfile/etc/periodic/daily/420.status-network projects/sendfile/etc/rc.d/pflog projects/sendfile/games/fortune/tools/do_uniq.py projects/sendfile/gnu/lib/libgcc/Makefile projects/sendfile/gnu/usr.bin/binutils/Makefile projects/sendfile/include/pthread.h projects/sendfile/include/signal.h projects/sendfile/include/stdlib.h projects/sendfile/lib/atf/libatf-c++/Makefile projects/sendfile/lib/csu/i386-elf/Makefile projects/sendfile/lib/libbluetooth/bluetooth.c projects/sendfile/lib/libbluetooth/dev.c projects/sendfile/lib/libbluetooth/hci.c projects/sendfile/lib/libc/Makefile projects/sendfile/lib/libc/arm/sys/Makefile.inc projects/sendfile/lib/libc/gen/fts.c projects/sendfile/lib/libc/gen/nlist.c projects/sendfile/lib/libc/gen/setmode.c projects/sendfile/lib/libc/gen/tls.c projects/sendfile/lib/libc/gen/wordexp.c projects/sendfile/lib/libc/include/compat.h projects/sendfile/lib/libc/include/libc_private.h projects/sendfile/lib/libc/mips/sys/Makefile.inc projects/sendfile/lib/libc/net/Symbol.map projects/sendfile/lib/libc/net/getaddrinfo.c projects/sendfile/lib/libc/net/name6.c projects/sendfile/lib/libc/powerpc/Makefile.inc projects/sendfile/lib/libc/powerpc/gen/_setjmp.S projects/sendfile/lib/libc/powerpc/gen/setjmp.S projects/sendfile/lib/libc/powerpc/gen/sigsetjmp.S projects/sendfile/lib/libc/powerpc64/Makefile.inc projects/sendfile/lib/libc/sparc64/Makefile.inc projects/sendfile/lib/libc/string/strlcat.c projects/sendfile/lib/libc/string/strlcpy.c projects/sendfile/lib/libc/sys/Makefile.inc projects/sendfile/lib/libc/sys/fcntl.c projects/sendfile/lib/libc/sys/interposing_table.c projects/sendfile/lib/libc/sys/kqueue.2 projects/sendfile/lib/libc/sys/open.2 projects/sendfile/lib/libc/sys/vfork.2 projects/sendfile/lib/libc/xdr/xdr_float.c projects/sendfile/lib/libcompiler_rt/Makefile projects/sendfile/lib/libelftc/elftc_version.c projects/sendfile/lib/libfetch/common.c projects/sendfile/lib/libfetch/fetch.3 projects/sendfile/lib/libgeom/geom_xml2tree.c projects/sendfile/lib/libgpio/Makefile projects/sendfile/lib/liblzma/Makefile projects/sendfile/lib/liblzma/Symbol.map projects/sendfile/lib/liblzma/config.h projects/sendfile/lib/libmt/Makefile projects/sendfile/lib/libpmc/libpmc.c projects/sendfile/lib/libsdp/search.c projects/sendfile/lib/libsdp/service.c projects/sendfile/lib/libsdp/session.c projects/sendfile/lib/libsdp/util.c projects/sendfile/lib/libstand/Makefile projects/sendfile/lib/libthr/thread/thr_syscalls.c projects/sendfile/lib/libvmmapi/Makefile projects/sendfile/lib/libvmmapi/vmmapi.c projects/sendfile/lib/libvmmapi/vmmapi.h projects/sendfile/libexec/rtld-elf/Makefile projects/sendfile/libexec/rtld-elf/amd64/reloc.c projects/sendfile/libexec/rtld-elf/amd64/rtld_machdep.h projects/sendfile/libexec/rtld-elf/amd64/rtld_start.S projects/sendfile/libexec/rtld-elf/i386/reloc.c projects/sendfile/libexec/rtld-elf/i386/rtld_machdep.h projects/sendfile/libexec/rtld-elf/i386/rtld_start.S projects/sendfile/libexec/rtld-elf/mips/reloc.c projects/sendfile/libexec/rtld-elf/rtld.c projects/sendfile/libexec/rtld-elf/rtld.h projects/sendfile/libexec/rtld-elf/rtld_lock.c projects/sendfile/libexec/rtld-elf/rtld_lock.h projects/sendfile/libexec/rtld-elf/rtld_tls.h projects/sendfile/release/Makefile.vm projects/sendfile/release/arm/BEAGLEBONE.conf projects/sendfile/release/arm/PANDABOARD.conf projects/sendfile/release/arm/RPI-B.conf projects/sendfile/release/arm/WANDBOARD-QUAD.conf projects/sendfile/release/arm/ZEDBOARD.conf projects/sendfile/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/sendfile/release/doc/share/xml/sponsor.ent projects/sendfile/release/scripts/mk-vmimage.sh projects/sendfile/release/tools/arm/crochet-BEAGLEBONE.conf projects/sendfile/release/tools/arm/crochet-PANDABOARD.conf projects/sendfile/release/tools/arm/crochet-RPI-B.conf projects/sendfile/release/tools/arm/crochet-WANDBOARD-QUAD.conf projects/sendfile/release/tools/arm/crochet-ZEDBOARD.conf projects/sendfile/release/tools/gce.conf projects/sendfile/release/tools/vmimage.subr projects/sendfile/sbin/camcontrol/camcontrol.8 projects/sendfile/sbin/camcontrol/camcontrol.c projects/sendfile/sbin/dmesg/dmesg.c projects/sendfile/sbin/geom/class/part/geom_part.c projects/sendfile/sbin/ggate/ggatec/ggatec.8 projects/sendfile/sbin/ggate/ggatel/ggatel.8 projects/sendfile/sbin/ifconfig/af_inet.c projects/sendfile/sbin/ifconfig/af_inet6.c projects/sendfile/sbin/ifconfig/af_nd6.c projects/sendfile/sbin/ifconfig/carp.c projects/sendfile/sbin/ifconfig/ifconfig.c projects/sendfile/sbin/ifconfig/ifmedia.c projects/sendfile/sbin/ifconfig/ifvlan.c projects/sendfile/sbin/ifconfig/ifvxlan.c projects/sendfile/sbin/md5/Makefile projects/sendfile/sbin/md5/md5.c projects/sendfile/sbin/newfs_msdos/newfs_msdos.8 projects/sendfile/sbin/reboot/nextboot.8 projects/sendfile/sbin/savecore/Makefile projects/sendfile/sbin/savecore/savecore.c projects/sendfile/secure/lib/libcrypto/Makefile.inc projects/sendfile/secure/lib/libcrypto/Makefile.man projects/sendfile/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 projects/sendfile/secure/lib/libcrypto/man/ASN1_STRING_length.3 projects/sendfile/secure/lib/libcrypto/man/ASN1_STRING_new.3 projects/sendfile/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 projects/sendfile/secure/lib/libcrypto/man/ASN1_generate_nconf.3 projects/sendfile/secure/lib/libcrypto/man/BIO_ctrl.3 projects/sendfile/secure/lib/libcrypto/man/BIO_f_base64.3 projects/sendfile/secure/lib/libcrypto/man/BIO_f_buffer.3 projects/sendfile/secure/lib/libcrypto/man/BIO_f_cipher.3 projects/sendfile/secure/lib/libcrypto/man/BIO_f_md.3 projects/sendfile/secure/lib/libcrypto/man/BIO_f_null.3 projects/sendfile/secure/lib/libcrypto/man/BIO_f_ssl.3 projects/sendfile/secure/lib/libcrypto/man/BIO_find_type.3 projects/sendfile/secure/lib/libcrypto/man/BIO_new.3 projects/sendfile/secure/lib/libcrypto/man/BIO_new_CMS.3 projects/sendfile/secure/lib/libcrypto/man/BIO_push.3 projects/sendfile/secure/lib/libcrypto/man/BIO_read.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_accept.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_bio.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_connect.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_fd.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_file.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_mem.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_null.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_socket.3 projects/sendfile/secure/lib/libcrypto/man/BIO_set_callback.3 projects/sendfile/secure/lib/libcrypto/man/BIO_should_retry.3 projects/sendfile/secure/lib/libcrypto/man/BN_BLINDING_new.3 projects/sendfile/secure/lib/libcrypto/man/BN_CTX_new.3 projects/sendfile/secure/lib/libcrypto/man/BN_CTX_start.3 projects/sendfile/secure/lib/libcrypto/man/BN_add.3 projects/sendfile/secure/lib/libcrypto/man/BN_add_word.3 projects/sendfile/secure/lib/libcrypto/man/BN_bn2bin.3 projects/sendfile/secure/lib/libcrypto/man/BN_cmp.3 projects/sendfile/secure/lib/libcrypto/man/BN_copy.3 projects/sendfile/secure/lib/libcrypto/man/BN_generate_prime.3 projects/sendfile/secure/lib/libcrypto/man/BN_mod_inverse.3 projects/sendfile/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 projects/sendfile/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 projects/sendfile/secure/lib/libcrypto/man/BN_new.3 projects/sendfile/secure/lib/libcrypto/man/BN_num_bytes.3 projects/sendfile/secure/lib/libcrypto/man/BN_rand.3 projects/sendfile/secure/lib/libcrypto/man/BN_set_bit.3 projects/sendfile/secure/lib/libcrypto/man/BN_swap.3 projects/sendfile/secure/lib/libcrypto/man/BN_zero.3 projects/sendfile/secure/lib/libcrypto/man/CMS_add0_cert.3 projects/sendfile/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 projects/sendfile/secure/lib/libcrypto/man/CMS_add1_signer.3 projects/sendfile/secure/lib/libcrypto/man/CMS_compress.3 projects/sendfile/secure/lib/libcrypto/man/CMS_decrypt.3 projects/sendfile/secure/lib/libcrypto/man/CMS_encrypt.3 projects/sendfile/secure/lib/libcrypto/man/CMS_final.3 projects/sendfile/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 projects/sendfile/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 projects/sendfile/secure/lib/libcrypto/man/CMS_get0_type.3 projects/sendfile/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 projects/sendfile/secure/lib/libcrypto/man/CMS_sign.3 projects/sendfile/secure/lib/libcrypto/man/CMS_sign_receipt.3 projects/sendfile/secure/lib/libcrypto/man/CMS_uncompress.3 projects/sendfile/secure/lib/libcrypto/man/CMS_verify.3 projects/sendfile/secure/lib/libcrypto/man/CMS_verify_receipt.3 projects/sendfile/secure/lib/libcrypto/man/CONF_modules_free.3 projects/sendfile/secure/lib/libcrypto/man/CONF_modules_load_file.3 projects/sendfile/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 projects/sendfile/secure/lib/libcrypto/man/DH_generate_key.3 projects/sendfile/secure/lib/libcrypto/man/DH_generate_parameters.3 projects/sendfile/secure/lib/libcrypto/man/DH_get_ex_new_index.3 projects/sendfile/secure/lib/libcrypto/man/DH_new.3 projects/sendfile/secure/lib/libcrypto/man/DH_set_method.3 projects/sendfile/secure/lib/libcrypto/man/DH_size.3 projects/sendfile/secure/lib/libcrypto/man/DSA_SIG_new.3 projects/sendfile/secure/lib/libcrypto/man/DSA_do_sign.3 projects/sendfile/secure/lib/libcrypto/man/DSA_dup_DH.3 projects/sendfile/secure/lib/libcrypto/man/DSA_generate_key.3 projects/sendfile/secure/lib/libcrypto/man/DSA_generate_parameters.3 projects/sendfile/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 projects/sendfile/secure/lib/libcrypto/man/DSA_new.3 projects/sendfile/secure/lib/libcrypto/man/DSA_set_method.3 projects/sendfile/secure/lib/libcrypto/man/DSA_sign.3 projects/sendfile/secure/lib/libcrypto/man/DSA_size.3 projects/sendfile/secure/lib/libcrypto/man/ERR_GET_LIB.3 projects/sendfile/secure/lib/libcrypto/man/ERR_clear_error.3 projects/sendfile/secure/lib/libcrypto/man/ERR_error_string.3 projects/sendfile/secure/lib/libcrypto/man/ERR_get_error.3 projects/sendfile/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 projects/sendfile/secure/lib/libcrypto/man/ERR_load_strings.3 projects/sendfile/secure/lib/libcrypto/man/ERR_print_errors.3 projects/sendfile/secure/lib/libcrypto/man/ERR_put_error.3 projects/sendfile/secure/lib/libcrypto/man/ERR_remove_state.3 projects/sendfile/secure/lib/libcrypto/man/ERR_set_mark.3 projects/sendfile/secure/lib/libcrypto/man/EVP_BytesToKey.3 projects/sendfile/secure/lib/libcrypto/man/EVP_DigestInit.3 projects/sendfile/secure/lib/libcrypto/man/EVP_DigestSignInit.3 projects/sendfile/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 projects/sendfile/secure/lib/libcrypto/man/EVP_EncryptInit.3 projects/sendfile/secure/lib/libcrypto/man/EVP_OpenInit.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_derive.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_new.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_sign.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_verify.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3 projects/sendfile/secure/lib/libcrypto/man/EVP_SealInit.3 projects/sendfile/secure/lib/libcrypto/man/EVP_SignInit.3 projects/sendfile/secure/lib/libcrypto/man/EVP_VerifyInit.3 projects/sendfile/secure/lib/libcrypto/man/OBJ_nid2obj.3 projects/sendfile/secure/lib/libcrypto/man/OPENSSL_Applink.3 projects/sendfile/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 projects/sendfile/secure/lib/libcrypto/man/OPENSSL_config.3 projects/sendfile/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 projects/sendfile/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 projects/sendfile/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 projects/sendfile/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 projects/sendfile/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 projects/sendfile/secure/lib/libcrypto/man/PKCS12_create.3 projects/sendfile/secure/lib/libcrypto/man/PKCS12_parse.3 projects/sendfile/secure/lib/libcrypto/man/PKCS7_decrypt.3 projects/sendfile/secure/lib/libcrypto/man/PKCS7_encrypt.3 projects/sendfile/secure/lib/libcrypto/man/PKCS7_sign.3 projects/sendfile/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 projects/sendfile/secure/lib/libcrypto/man/PKCS7_verify.3 projects/sendfile/secure/lib/libcrypto/man/RAND_add.3 projects/sendfile/secure/lib/libcrypto/man/RAND_bytes.3 projects/sendfile/secure/lib/libcrypto/man/RAND_cleanup.3 projects/sendfile/secure/lib/libcrypto/man/RAND_egd.3 projects/sendfile/secure/lib/libcrypto/man/RAND_load_file.3 projects/sendfile/secure/lib/libcrypto/man/RAND_set_rand_method.3 projects/sendfile/secure/lib/libcrypto/man/RSA_blinding_on.3 projects/sendfile/secure/lib/libcrypto/man/RSA_check_key.3 projects/sendfile/secure/lib/libcrypto/man/RSA_generate_key.3 projects/sendfile/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 projects/sendfile/secure/lib/libcrypto/man/RSA_new.3 projects/sendfile/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 projects/sendfile/secure/lib/libcrypto/man/RSA_print.3 projects/sendfile/secure/lib/libcrypto/man/RSA_private_encrypt.3 projects/sendfile/secure/lib/libcrypto/man/RSA_public_encrypt.3 projects/sendfile/secure/lib/libcrypto/man/RSA_set_method.3 projects/sendfile/secure/lib/libcrypto/man/RSA_sign.3 projects/sendfile/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 projects/sendfile/secure/lib/libcrypto/man/RSA_size.3 projects/sendfile/secure/lib/libcrypto/man/SMIME_read_CMS.3 projects/sendfile/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 projects/sendfile/secure/lib/libcrypto/man/SMIME_write_CMS.3 projects/sendfile/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 projects/sendfile/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 projects/sendfile/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 projects/sendfile/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 projects/sendfile/secure/lib/libcrypto/man/X509_NAME_print_ex.3 projects/sendfile/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 projects/sendfile/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 projects/sendfile/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 projects/sendfile/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 projects/sendfile/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 projects/sendfile/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 projects/sendfile/secure/lib/libcrypto/man/X509_new.3 projects/sendfile/secure/lib/libcrypto/man/X509_verify_cert.3 projects/sendfile/secure/lib/libcrypto/man/bio.3 projects/sendfile/secure/lib/libcrypto/man/blowfish.3 projects/sendfile/secure/lib/libcrypto/man/bn.3 projects/sendfile/secure/lib/libcrypto/man/bn_internal.3 projects/sendfile/secure/lib/libcrypto/man/buffer.3 projects/sendfile/secure/lib/libcrypto/man/crypto.3 projects/sendfile/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 projects/sendfile/secure/lib/libcrypto/man/d2i_DHparams.3 projects/sendfile/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 projects/sendfile/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 projects/sendfile/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 projects/sendfile/secure/lib/libcrypto/man/d2i_X509.3 projects/sendfile/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 projects/sendfile/secure/lib/libcrypto/man/d2i_X509_CRL.3 projects/sendfile/secure/lib/libcrypto/man/d2i_X509_NAME.3 projects/sendfile/secure/lib/libcrypto/man/d2i_X509_REQ.3 projects/sendfile/secure/lib/libcrypto/man/d2i_X509_SIG.3 projects/sendfile/secure/lib/libcrypto/man/des.3 projects/sendfile/secure/lib/libcrypto/man/dh.3 projects/sendfile/secure/lib/libcrypto/man/dsa.3 projects/sendfile/secure/lib/libcrypto/man/ecdsa.3 projects/sendfile/secure/lib/libcrypto/man/engine.3 projects/sendfile/secure/lib/libcrypto/man/err.3 projects/sendfile/secure/lib/libcrypto/man/evp.3 projects/sendfile/secure/lib/libcrypto/man/hmac.3 projects/sendfile/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 projects/sendfile/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 projects/sendfile/secure/lib/libcrypto/man/lh_stats.3 projects/sendfile/secure/lib/libcrypto/man/lhash.3 projects/sendfile/secure/lib/libcrypto/man/md5.3 projects/sendfile/secure/lib/libcrypto/man/mdc2.3 projects/sendfile/secure/lib/libcrypto/man/pem.3 projects/sendfile/secure/lib/libcrypto/man/rand.3 projects/sendfile/secure/lib/libcrypto/man/rc4.3 projects/sendfile/secure/lib/libcrypto/man/ripemd.3 projects/sendfile/secure/lib/libcrypto/man/rsa.3 projects/sendfile/secure/lib/libcrypto/man/sha.3 projects/sendfile/secure/lib/libcrypto/man/threads.3 projects/sendfile/secure/lib/libcrypto/man/ui.3 projects/sendfile/secure/lib/libcrypto/man/ui_compat.3 projects/sendfile/secure/lib/libcrypto/man/x509.3 projects/sendfile/secure/lib/libcrypto/opensslconf-arm.h projects/sendfile/secure/lib/libcrypto/opensslconf-mips.h projects/sendfile/secure/lib/libcrypto/opensslconf-powerpc.h projects/sendfile/secure/lib/libcrypto/opensslconf-sparc64.h projects/sendfile/secure/lib/libcrypto/opensslconf-x86.h projects/sendfile/secure/lib/libssl/Makefile projects/sendfile/secure/lib/libssl/Makefile.man projects/sendfile/secure/lib/libssl/man/SSL_CIPHER_get_name.3 projects/sendfile/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_add_session.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_ctrl.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_free.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_new.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_sess_number.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_sessions.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_mode.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_options.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_timeout.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_verify.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_use_certificate.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3 projects/sendfile/secure/lib/libssl/man/SSL_SESSION_free.3 projects/sendfile/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 projects/sendfile/secure/lib/libssl/man/SSL_SESSION_get_time.3 projects/sendfile/secure/lib/libssl/man/SSL_accept.3 projects/sendfile/secure/lib/libssl/man/SSL_alert_type_string.3 projects/sendfile/secure/lib/libssl/man/SSL_clear.3 projects/sendfile/secure/lib/libssl/man/SSL_connect.3 projects/sendfile/secure/lib/libssl/man/SSL_do_handshake.3 projects/sendfile/secure/lib/libssl/man/SSL_free.3 projects/sendfile/secure/lib/libssl/man/SSL_get_SSL_CTX.3 projects/sendfile/secure/lib/libssl/man/SSL_get_ciphers.3 projects/sendfile/secure/lib/libssl/man/SSL_get_client_CA_list.3 projects/sendfile/secure/lib/libssl/man/SSL_get_current_cipher.3 projects/sendfile/secure/lib/libssl/man/SSL_get_default_timeout.3 projects/sendfile/secure/lib/libssl/man/SSL_get_error.3 projects/sendfile/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 projects/sendfile/secure/lib/libssl/man/SSL_get_ex_new_index.3 projects/sendfile/secure/lib/libssl/man/SSL_get_fd.3 projects/sendfile/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 projects/sendfile/secure/lib/libssl/man/SSL_get_peer_certificate.3 projects/sendfile/secure/lib/libssl/man/SSL_get_psk_identity.3 projects/sendfile/secure/lib/libssl/man/SSL_get_rbio.3 projects/sendfile/secure/lib/libssl/man/SSL_get_session.3 projects/sendfile/secure/lib/libssl/man/SSL_get_verify_result.3 projects/sendfile/secure/lib/libssl/man/SSL_get_version.3 projects/sendfile/secure/lib/libssl/man/SSL_library_init.3 projects/sendfile/secure/lib/libssl/man/SSL_load_client_CA_file.3 projects/sendfile/secure/lib/libssl/man/SSL_new.3 projects/sendfile/secure/lib/libssl/man/SSL_pending.3 projects/sendfile/secure/lib/libssl/man/SSL_read.3 projects/sendfile/secure/lib/libssl/man/SSL_rstate_string.3 projects/sendfile/secure/lib/libssl/man/SSL_session_reused.3 projects/sendfile/secure/lib/libssl/man/SSL_set_bio.3 projects/sendfile/secure/lib/libssl/man/SSL_set_connect_state.3 projects/sendfile/secure/lib/libssl/man/SSL_set_fd.3 projects/sendfile/secure/lib/libssl/man/SSL_set_session.3 projects/sendfile/secure/lib/libssl/man/SSL_set_shutdown.3 projects/sendfile/secure/lib/libssl/man/SSL_set_verify_result.3 projects/sendfile/secure/lib/libssl/man/SSL_shutdown.3 projects/sendfile/secure/lib/libssl/man/SSL_state_string.3 projects/sendfile/secure/lib/libssl/man/SSL_want.3 projects/sendfile/secure/lib/libssl/man/SSL_write.3 projects/sendfile/secure/lib/libssl/man/d2i_SSL_SESSION.3 projects/sendfile/secure/lib/libssl/man/ssl.3 projects/sendfile/secure/usr.bin/openssl/man/CA.pl.1 projects/sendfile/secure/usr.bin/openssl/man/asn1parse.1 projects/sendfile/secure/usr.bin/openssl/man/c_rehash.1 projects/sendfile/secure/usr.bin/openssl/man/ca.1 projects/sendfile/secure/usr.bin/openssl/man/ciphers.1 projects/sendfile/secure/usr.bin/openssl/man/cms.1 projects/sendfile/secure/usr.bin/openssl/man/crl.1 projects/sendfile/secure/usr.bin/openssl/man/crl2pkcs7.1 projects/sendfile/secure/usr.bin/openssl/man/dgst.1 projects/sendfile/secure/usr.bin/openssl/man/dhparam.1 projects/sendfile/secure/usr.bin/openssl/man/dsa.1 projects/sendfile/secure/usr.bin/openssl/man/dsaparam.1 projects/sendfile/secure/usr.bin/openssl/man/ec.1 projects/sendfile/secure/usr.bin/openssl/man/ecparam.1 projects/sendfile/secure/usr.bin/openssl/man/enc.1 projects/sendfile/secure/usr.bin/openssl/man/errstr.1 projects/sendfile/secure/usr.bin/openssl/man/gendsa.1 projects/sendfile/secure/usr.bin/openssl/man/genpkey.1 projects/sendfile/secure/usr.bin/openssl/man/genrsa.1 projects/sendfile/secure/usr.bin/openssl/man/nseq.1 projects/sendfile/secure/usr.bin/openssl/man/ocsp.1 projects/sendfile/secure/usr.bin/openssl/man/openssl.1 projects/sendfile/secure/usr.bin/openssl/man/passwd.1 projects/sendfile/secure/usr.bin/openssl/man/pkcs12.1 projects/sendfile/secure/usr.bin/openssl/man/pkcs7.1 projects/sendfile/secure/usr.bin/openssl/man/pkcs8.1 projects/sendfile/secure/usr.bin/openssl/man/pkey.1 projects/sendfile/secure/usr.bin/openssl/man/pkeyparam.1 projects/sendfile/secure/usr.bin/openssl/man/pkeyutl.1 projects/sendfile/secure/usr.bin/openssl/man/rand.1 projects/sendfile/secure/usr.bin/openssl/man/req.1 projects/sendfile/secure/usr.bin/openssl/man/rsa.1 projects/sendfile/secure/usr.bin/openssl/man/rsautl.1 projects/sendfile/secure/usr.bin/openssl/man/s_client.1 projects/sendfile/secure/usr.bin/openssl/man/s_server.1 projects/sendfile/secure/usr.bin/openssl/man/s_time.1 projects/sendfile/secure/usr.bin/openssl/man/sess_id.1 projects/sendfile/secure/usr.bin/openssl/man/smime.1 projects/sendfile/secure/usr.bin/openssl/man/speed.1 projects/sendfile/secure/usr.bin/openssl/man/spkac.1 projects/sendfile/secure/usr.bin/openssl/man/ts.1 projects/sendfile/secure/usr.bin/openssl/man/tsget.1 projects/sendfile/secure/usr.bin/openssl/man/verify.1 projects/sendfile/secure/usr.bin/openssl/man/version.1 projects/sendfile/secure/usr.bin/openssl/man/x509.1 projects/sendfile/secure/usr.bin/openssl/man/x509v3_config.1 projects/sendfile/share/examples/etc/make.conf projects/sendfile/share/man/man3/pthread_testcancel.3 projects/sendfile/share/man/man4/Makefile projects/sendfile/share/man/man4/ahci.4 projects/sendfile/share/man/man4/amdtemp.4 projects/sendfile/share/man/man4/ata.4 projects/sendfile/share/man/man4/ctl.4 projects/sendfile/share/man/man4/ddb.4 projects/sendfile/share/man/man4/epair.4 projects/sendfile/share/man/man4/icmp.4 projects/sendfile/share/man/man4/inet.4 projects/sendfile/share/man/man4/ixl.4 projects/sendfile/share/man/man4/ixlv.4 projects/sendfile/share/man/man4/mvs.4 projects/sendfile/share/man/man4/sfxge.4 projects/sendfile/share/man/man4/siftr.4 projects/sendfile/share/man/man4/siis.4 projects/sendfile/share/man/man4/snd_uaudio.4 projects/sendfile/share/man/man4/tap.4 projects/sendfile/share/man/man4/ucom.4 projects/sendfile/share/man/man4/witness.4 projects/sendfile/share/man/man5/periodic.conf.5 projects/sendfile/share/man/man5/src.conf.5 projects/sendfile/share/misc/committers-src.dot projects/sendfile/share/misc/organization.dot projects/sendfile/share/mk/bsd.README projects/sendfile/share/mk/bsd.cpu.mk projects/sendfile/share/mk/bsd.dep.mk projects/sendfile/share/mk/bsd.endian.mk projects/sendfile/share/mk/bsd.lib.mk projects/sendfile/share/mk/bsd.progs.mk projects/sendfile/share/mk/bsd.sys.mk projects/sendfile/share/mk/src.libnames.mk projects/sendfile/share/mk/src.opts.mk projects/sendfile/share/mk/sys.mk projects/sendfile/sys/amd64/amd64/machdep.c projects/sendfile/sys/amd64/amd64/mp_machdep.c projects/sendfile/sys/amd64/amd64/pmap.c projects/sendfile/sys/amd64/amd64/trap.c projects/sendfile/sys/amd64/amd64/uma_machdep.c projects/sendfile/sys/amd64/conf/GENERIC projects/sendfile/sys/amd64/include/intr_machdep.h projects/sendfile/sys/amd64/include/vmm.h (contents, props changed) projects/sendfile/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/sendfile/sys/amd64/vmm/amd/svm.c projects/sendfile/sys/amd64/vmm/intel/vmx.c projects/sendfile/sys/amd64/vmm/io/vrtc.c projects/sendfile/sys/amd64/vmm/vmm.c projects/sendfile/sys/amd64/vmm/vmm_dev.c projects/sendfile/sys/amd64/vmm/vmm_instruction_emul.c projects/sendfile/sys/arm/allwinner/a10_clk.c projects/sendfile/sys/arm/allwinner/a10_common.c projects/sendfile/sys/arm/allwinner/a10_gpio.c projects/sendfile/sys/arm/allwinner/a10_sramc.c projects/sendfile/sys/arm/allwinner/a10_wdog.c projects/sendfile/sys/arm/allwinner/a20/a20_cpu_cfg.c projects/sendfile/sys/arm/allwinner/a20/a20_mp.c projects/sendfile/sys/arm/allwinner/a20/files.a20 projects/sendfile/sys/arm/allwinner/files.a10 projects/sendfile/sys/arm/allwinner/timer.c projects/sendfile/sys/arm/altera/socfpga/files.socfpga projects/sendfile/sys/arm/altera/socfpga/socfpga_gpio.c projects/sendfile/sys/arm/altera/socfpga/socfpga_manager.c projects/sendfile/sys/arm/altera/socfpga/socfpga_mp.c projects/sendfile/sys/arm/arm/cpufunc.c projects/sendfile/sys/arm/arm/cpufunc_asm_arm10.S projects/sendfile/sys/arm/arm/cpufunc_asm_arm11.S projects/sendfile/sys/arm/arm/cpufunc_asm_armv6.S projects/sendfile/sys/arm/arm/elf_trampoline.c projects/sendfile/sys/arm/arm/genassym.c projects/sendfile/sys/arm/arm/generic_timer.c projects/sendfile/sys/arm/arm/gic.c projects/sendfile/sys/arm/arm/intr.c projects/sendfile/sys/arm/arm/machdep.c projects/sendfile/sys/arm/arm/mem.c projects/sendfile/sys/arm/arm/minidump_machdep.c projects/sendfile/sys/arm/arm/mp_machdep.c projects/sendfile/sys/arm/arm/mpcore_timer.c projects/sendfile/sys/arm/arm/pl310.c projects/sendfile/sys/arm/arm/pmap-v6.c projects/sendfile/sys/arm/arm/pmap.c projects/sendfile/sys/arm/arm/pmu.c projects/sendfile/sys/arm/arm/swtch.S projects/sendfile/sys/arm/arm/sys_machdep.c projects/sendfile/sys/arm/arm/vm_machdep.c projects/sendfile/sys/arm/at91/at91_common.c projects/sendfile/sys/arm/at91/at91_machdep.c projects/sendfile/sys/arm/at91/files.at91 projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_common.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_fbd.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_intr.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_mbox.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_spi.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_systimer.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_wdog.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c projects/sendfile/sys/arm/broadcom/bcm2835/files.bcm2835 projects/sendfile/sys/arm/broadcom/bcm2835/std.bcm2835 projects/sendfile/sys/arm/broadcom/bcm2835/std.rpi projects/sendfile/sys/arm/cavium/cns11xx/econa_machdep.c projects/sendfile/sys/arm/cavium/cns11xx/files.econa projects/sendfile/sys/arm/conf/RPI-B projects/sendfile/sys/arm/conf/SOCKIT projects/sendfile/sys/arm/conf/SOCKIT-BERI projects/sendfile/sys/arm/freescale/imx/files.imx51 projects/sendfile/sys/arm/freescale/imx/files.imx53 projects/sendfile/sys/arm/freescale/imx/files.imx6 projects/sendfile/sys/arm/freescale/imx/imx51_ccm.c projects/sendfile/sys/arm/freescale/imx/imx51_ipuv3.c projects/sendfile/sys/arm/freescale/imx/imx51_ipuv3_fbd.c projects/sendfile/sys/arm/freescale/imx/imx6_anatop.c projects/sendfile/sys/arm/freescale/imx/imx6_audmux.c projects/sendfile/sys/arm/freescale/imx/imx6_mp.c projects/sendfile/sys/arm/freescale/imx/imx6_sdma.c projects/sendfile/sys/arm/freescale/imx/imx6_ssi.c projects/sendfile/sys/arm/freescale/imx/imx_common.c projects/sendfile/sys/arm/freescale/imx/imx_gpt.c projects/sendfile/sys/arm/freescale/imx/imx_iomux.c projects/sendfile/sys/arm/freescale/imx/imx_wdog.c projects/sendfile/sys/arm/freescale/vybrid/files.vybrid projects/sendfile/sys/arm/freescale/vybrid/vf_adc.c projects/sendfile/sys/arm/freescale/vybrid/vf_anadig.c projects/sendfile/sys/arm/freescale/vybrid/vf_ccm.c projects/sendfile/sys/arm/freescale/vybrid/vf_dcu4.c projects/sendfile/sys/arm/freescale/vybrid/vf_dmamux.c projects/sendfile/sys/arm/freescale/vybrid/vf_edma.c projects/sendfile/sys/arm/freescale/vybrid/vf_gpio.c projects/sendfile/sys/arm/freescale/vybrid/vf_i2c.c projects/sendfile/sys/arm/freescale/vybrid/vf_iomuxc.c projects/sendfile/sys/arm/freescale/vybrid/vf_mscm.c projects/sendfile/sys/arm/freescale/vybrid/vf_nfc.c projects/sendfile/sys/arm/freescale/vybrid/vf_port.c projects/sendfile/sys/arm/freescale/vybrid/vf_sai.c projects/sendfile/sys/arm/freescale/vybrid/vf_spi.c projects/sendfile/sys/arm/freescale/vybrid/vf_src.c projects/sendfile/sys/arm/freescale/vybrid/vf_tcon.c projects/sendfile/sys/arm/freescale/vybrid/vf_uart.c projects/sendfile/sys/arm/include/cpu-v6.h projects/sendfile/sys/arm/include/cpuconf.h projects/sendfile/sys/arm/include/cpufunc.h projects/sendfile/sys/arm/include/fdt.h projects/sendfile/sys/arm/include/intr.h projects/sendfile/sys/arm/include/machdep.h projects/sendfile/sys/arm/include/metadata.h projects/sendfile/sys/arm/include/pcb.h projects/sendfile/sys/arm/include/pmap.h projects/sendfile/sys/arm/include/pmc_mdep.h projects/sendfile/sys/arm/include/pte.h projects/sendfile/sys/arm/include/sf_buf.h projects/sendfile/sys/arm/include/smp.h projects/sendfile/sys/arm/include/sysreg.h projects/sendfile/sys/arm/include/vm.h projects/sendfile/sys/arm/include/vmparam.h projects/sendfile/sys/arm/lpc/files.lpc projects/sendfile/sys/arm/mv/armadaxp/armadaxp_mp.c projects/sendfile/sys/arm/mv/files.mv projects/sendfile/sys/arm/mv/gpio.c projects/sendfile/sys/arm/mv/mv_localbus.c projects/sendfile/sys/arm/mv/mv_ts.c projects/sendfile/sys/arm/mv/mvvar.h projects/sendfile/sys/arm/rockchip/files.rk30xx projects/sendfile/sys/arm/rockchip/rk30xx_common.c projects/sendfile/sys/arm/rockchip/rk30xx_gpio.c projects/sendfile/sys/arm/rockchip/rk30xx_grf.c projects/sendfile/sys/arm/rockchip/rk30xx_mp.c projects/sendfile/sys/arm/rockchip/rk30xx_pmu.c projects/sendfile/sys/arm/samsung/exynos/exynos5_mp.c projects/sendfile/sys/arm/samsung/exynos/files.exynos5 projects/sendfile/sys/arm/samsung/s3c2xx0/files.s3c2xx0 projects/sendfile/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c projects/sendfile/sys/arm/ti/am335x/am335x_dmtimer.c projects/sendfile/sys/arm/ti/am335x/am335x_prcm.c projects/sendfile/sys/arm/ti/files.ti projects/sendfile/sys/arm/ti/omap4/omap4_mp.c projects/sendfile/sys/arm/ti/ti_common.c projects/sendfile/sys/arm/ti/ti_mbox.c projects/sendfile/sys/arm/ti/ti_pruss.c projects/sendfile/sys/arm/ti/ti_wdt.c projects/sendfile/sys/arm/versatile/files.versatile projects/sendfile/sys/arm/versatile/pl050.c projects/sendfile/sys/arm/versatile/sp804.c projects/sendfile/sys/arm/versatile/versatile_clcd.c projects/sendfile/sys/arm/versatile/versatile_common.c projects/sendfile/sys/arm/versatile/versatile_pci.c projects/sendfile/sys/arm/versatile/versatile_timer.c projects/sendfile/sys/arm/xilinx/files.zynq7 projects/sendfile/sys/arm/xilinx/zy7_mp.c projects/sendfile/sys/arm/xscale/i80321/ep80219_machdep.c projects/sendfile/sys/arm/xscale/i80321/files.i80219 projects/sendfile/sys/arm/xscale/i80321/files.i80321 projects/sendfile/sys/arm/xscale/i80321/iq31244_machdep.c projects/sendfile/sys/arm/xscale/i8134x/crb_machdep.c projects/sendfile/sys/arm/xscale/i8134x/files.i81342 projects/sendfile/sys/arm/xscale/ixp425/avila_machdep.c projects/sendfile/sys/arm/xscale/ixp425/files.ixp425 projects/sendfile/sys/arm/xscale/pxa/files.pxa projects/sendfile/sys/arm/xscale/pxa/pxa_machdep.c projects/sendfile/sys/boot/Makefile projects/sendfile/sys/boot/Makefile.amd64 projects/sendfile/sys/boot/arm/uboot/Makefile projects/sendfile/sys/boot/common/Makefile.inc projects/sendfile/sys/boot/efi/Makefile projects/sendfile/sys/boot/efi/Makefile.inc projects/sendfile/sys/boot/forth/beastie.4th projects/sendfile/sys/boot/forth/brand.4th projects/sendfile/sys/boot/forth/check-password.4th projects/sendfile/sys/boot/forth/delay.4th projects/sendfile/sys/boot/forth/frames.4th projects/sendfile/sys/boot/forth/loader.4th projects/sendfile/sys/boot/forth/loader.conf projects/sendfile/sys/boot/forth/menu-commands.4th projects/sendfile/sys/boot/forth/menu.4th projects/sendfile/sys/boot/forth/menu.rc projects/sendfile/sys/boot/forth/menusets.4th projects/sendfile/sys/boot/forth/pcibios.4th projects/sendfile/sys/boot/forth/pnp.4th projects/sendfile/sys/boot/forth/screen.4th projects/sendfile/sys/boot/forth/support.4th projects/sendfile/sys/boot/forth/version.4th projects/sendfile/sys/boot/i386/boot2/Makefile projects/sendfile/sys/boot/i386/gptboot/Makefile projects/sendfile/sys/boot/i386/gptzfsboot/Makefile projects/sendfile/sys/boot/i386/libi386/libi386.h projects/sendfile/sys/boot/i386/libi386/multiboot.c projects/sendfile/sys/boot/i386/libi386/smbios.c projects/sendfile/sys/boot/i386/loader/Makefile projects/sendfile/sys/boot/i386/loader/main.c projects/sendfile/sys/boot/i386/zfsboot/Makefile projects/sendfile/sys/boot/mips/beri/boot2/Makefile projects/sendfile/sys/boot/mips/beri/loader/Makefile projects/sendfile/sys/boot/pc98/boot0.5/Makefile projects/sendfile/sys/boot/pc98/boot0/Makefile projects/sendfile/sys/boot/pc98/boot2/Makefile projects/sendfile/sys/boot/pc98/loader/Makefile projects/sendfile/sys/boot/powerpc/kboot/Makefile projects/sendfile/sys/boot/powerpc/ofw/Makefile projects/sendfile/sys/boot/powerpc/ps3/Makefile projects/sendfile/sys/boot/sparc64/loader/Makefile projects/sendfile/sys/boot/uboot/fdt/uboot_fdt.c projects/sendfile/sys/boot/uboot/lib/glue.h projects/sendfile/sys/cam/ata/ata_all.c projects/sendfile/sys/cam/ata/ata_da.c projects/sendfile/sys/cam/cam_xpt.c projects/sendfile/sys/cam/ctl/ctl.c projects/sendfile/sys/cam/scsi/scsi_all.c projects/sendfile/sys/cam/scsi/scsi_da.c projects/sendfile/sys/cam/scsi/scsi_sa.h projects/sendfile/sys/cddl/compat/opensolaris/sys/atomic.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h projects/sendfile/sys/cddl/dev/dtrace/amd64/dtrace_isa.c projects/sendfile/sys/cddl/dev/dtrace/dtrace_ioctl.c projects/sendfile/sys/cddl/dev/dtrace/i386/dtrace_isa.c projects/sendfile/sys/compat/freebsd32/freebsd32.h projects/sendfile/sys/compat/linprocfs/linprocfs.c projects/sendfile/sys/conf/NOTES projects/sendfile/sys/conf/files projects/sendfile/sys/conf/files.amd64 projects/sendfile/sys/conf/files.arm projects/sendfile/sys/conf/files.i386 projects/sendfile/sys/conf/files.mips projects/sendfile/sys/conf/files.powerpc projects/sendfile/sys/conf/kern.opts.mk projects/sendfile/sys/conf/newvers.sh projects/sendfile/sys/conf/options.arm projects/sendfile/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h projects/sendfile/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c projects/sendfile/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/sendfile/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c projects/sendfile/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c projects/sendfile/sys/contrib/ipfilter/netinet/fil.c projects/sendfile/sys/contrib/ipfilter/netinet/ip_compat.h projects/sendfile/sys/contrib/ipfilter/netinet/ip_fil.h projects/sendfile/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) projects/sendfile/sys/contrib/ipfilter/netinet/ip_nat.c projects/sendfile/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c projects/sendfile/sys/dev/aac/aac.c projects/sendfile/sys/dev/aacraid/aacraid.c projects/sendfile/sys/dev/acpica/acpi.c projects/sendfile/sys/dev/advansys/adwcam.c projects/sendfile/sys/dev/aha/aha.c projects/sendfile/sys/dev/ahb/ahb.c projects/sendfile/sys/dev/ahci/ahci.c projects/sendfile/sys/dev/ahci/ahci.h projects/sendfile/sys/dev/ahci/ahci_pci.c projects/sendfile/sys/dev/ahci/ahciem.c projects/sendfile/sys/dev/amr/amr_pci.c projects/sendfile/sys/dev/ata/ata-all.c projects/sendfile/sys/dev/ata/ata-all.h projects/sendfile/sys/dev/ata/ata-pci.h projects/sendfile/sys/dev/ata/chipsets/ata-acard.c projects/sendfile/sys/dev/ata/chipsets/ata-acerlabs.c projects/sendfile/sys/dev/ata/chipsets/ata-amd.c projects/sendfile/sys/dev/ata/chipsets/ata-ati.c projects/sendfile/sys/dev/ata/chipsets/ata-cenatek.c projects/sendfile/sys/dev/ata/chipsets/ata-cypress.c projects/sendfile/sys/dev/ata/chipsets/ata-cyrix.c projects/sendfile/sys/dev/ata/chipsets/ata-fsl.c projects/sendfile/sys/dev/ata/chipsets/ata-highpoint.c projects/sendfile/sys/dev/ata/chipsets/ata-intel.c projects/sendfile/sys/dev/ata/chipsets/ata-ite.c projects/sendfile/sys/dev/ata/chipsets/ata-jmicron.c projects/sendfile/sys/dev/ata/chipsets/ata-marvell.c projects/sendfile/sys/dev/ata/chipsets/ata-micron.c projects/sendfile/sys/dev/ata/chipsets/ata-national.c projects/sendfile/sys/dev/ata/chipsets/ata-netcell.c projects/sendfile/sys/dev/ata/chipsets/ata-nvidia.c projects/sendfile/sys/dev/ata/chipsets/ata-promise.c projects/sendfile/sys/dev/ata/chipsets/ata-serverworks.c projects/sendfile/sys/dev/ata/chipsets/ata-siliconimage.c projects/sendfile/sys/dev/ata/chipsets/ata-sis.c projects/sendfile/sys/dev/ata/chipsets/ata-via.c projects/sendfile/sys/dev/ath/ath_hal/ah.c projects/sendfile/sys/dev/ath/ath_hal/ah.h projects/sendfile/sys/dev/ath/ath_hal/ah_internal.h projects/sendfile/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/sendfile/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c projects/sendfile/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/sendfile/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c projects/sendfile/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c projects/sendfile/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c projects/sendfile/sys/dev/ath/if_ath.c projects/sendfile/sys/dev/atkbdc/psm.c projects/sendfile/sys/dev/buslogic/bt.c projects/sendfile/sys/dev/bwi/if_bwi.c projects/sendfile/sys/dev/bwn/if_bwn.c projects/sendfile/sys/dev/bxe/bxe.c projects/sendfile/sys/dev/ciss/ciss.c projects/sendfile/sys/dev/ct/ct_isa.c projects/sendfile/sys/dev/cxgbe/t4_main.c projects/sendfile/sys/dev/cxgbe/t4_sge.c projects/sendfile/sys/dev/cxgbe/tom/t4_cpl_io.c projects/sendfile/sys/dev/cxgbe/tom/t4_ddp.c projects/sendfile/sys/dev/cxgbe/tom/t4_tom.h projects/sendfile/sys/dev/dpt/dpt_scsi.c projects/sendfile/sys/dev/drm2/ati_pcigart.c projects/sendfile/sys/dev/drm2/drm.h projects/sendfile/sys/dev/drm2/drmP.h projects/sendfile/sys/dev/drm2/drm_agpsupport.c projects/sendfile/sys/dev/drm2/drm_atomic.h projects/sendfile/sys/dev/drm2/drm_auth.c projects/sendfile/sys/dev/drm2/drm_buffer.c projects/sendfile/sys/dev/drm2/drm_bufs.c projects/sendfile/sys/dev/drm2/drm_context.c projects/sendfile/sys/dev/drm2/drm_crtc.c projects/sendfile/sys/dev/drm2/drm_crtc.h projects/sendfile/sys/dev/drm2/drm_crtc_helper.c projects/sendfile/sys/dev/drm2/drm_crtc_helper.h projects/sendfile/sys/dev/drm2/drm_dma.c projects/sendfile/sys/dev/drm2/drm_dp_helper.c projects/sendfile/sys/dev/drm2/drm_dp_iic_helper.c projects/sendfile/sys/dev/drm2/drm_drv.c projects/sendfile/sys/dev/drm2/drm_edid.c projects/sendfile/sys/dev/drm2/drm_edid.h projects/sendfile/sys/dev/drm2/drm_edid_modes.h projects/sendfile/sys/dev/drm2/drm_fb_helper.c projects/sendfile/sys/dev/drm2/drm_fb_helper.h projects/sendfile/sys/dev/drm2/drm_fops.c projects/sendfile/sys/dev/drm2/drm_fourcc.h projects/sendfile/sys/dev/drm2/drm_gem.c projects/sendfile/sys/dev/drm2/drm_gem_names.c projects/sendfile/sys/dev/drm2/drm_global.c projects/sendfile/sys/dev/drm2/drm_hashtab.c projects/sendfile/sys/dev/drm2/drm_ioc32.c projects/sendfile/sys/dev/drm2/drm_ioctl.c projects/sendfile/sys/dev/drm2/drm_irq.c projects/sendfile/sys/dev/drm2/drm_lock.c projects/sendfile/sys/dev/drm2/drm_memory.c projects/sendfile/sys/dev/drm2/drm_mm.c projects/sendfile/sys/dev/drm2/drm_mm.h projects/sendfile/sys/dev/drm2/drm_mode.h projects/sendfile/sys/dev/drm2/drm_modes.c projects/sendfile/sys/dev/drm2/drm_os_freebsd.h projects/sendfile/sys/dev/drm2/drm_pci.c projects/sendfile/sys/dev/drm2/drm_pciids.h projects/sendfile/sys/dev/drm2/drm_sarea.h projects/sendfile/sys/dev/drm2/drm_scatter.c projects/sendfile/sys/dev/drm2/drm_stub.c projects/sendfile/sys/dev/drm2/drm_sysctl.c projects/sendfile/sys/dev/drm2/drm_vm.c projects/sendfile/sys/dev/drm2/i915/i915_debug.c projects/sendfile/sys/dev/drm2/i915/i915_dma.c projects/sendfile/sys/dev/drm2/i915/i915_drm.h projects/sendfile/sys/dev/drm2/i915/i915_drv.c projects/sendfile/sys/dev/drm2/i915/i915_drv.h projects/sendfile/sys/dev/drm2/i915/i915_gem.c projects/sendfile/sys/dev/drm2/i915/i915_gem_context.c projects/sendfile/sys/dev/drm2/i915/i915_gem_evict.c projects/sendfile/sys/dev/drm2/i915/i915_gem_execbuffer.c projects/sendfile/sys/dev/drm2/i915/i915_gem_gtt.c projects/sendfile/sys/dev/drm2/i915/i915_gem_tiling.c projects/sendfile/sys/dev/drm2/i915/i915_ioc32.c projects/sendfile/sys/dev/drm2/i915/i915_irq.c projects/sendfile/sys/dev/drm2/i915/i915_suspend.c projects/sendfile/sys/dev/drm2/i915/intel_crt.c projects/sendfile/sys/dev/drm2/i915/intel_display.c projects/sendfile/sys/dev/drm2/i915/intel_dp.c projects/sendfile/sys/dev/drm2/i915/intel_fb.c projects/sendfile/sys/dev/drm2/i915/intel_hdmi.c projects/sendfile/sys/dev/drm2/i915/intel_iic.c projects/sendfile/sys/dev/drm2/i915/intel_lvds.c projects/sendfile/sys/dev/drm2/i915/intel_modes.c projects/sendfile/sys/dev/drm2/i915/intel_opregion.c projects/sendfile/sys/dev/drm2/i915/intel_overlay.c projects/sendfile/sys/dev/drm2/i915/intel_panel.c projects/sendfile/sys/dev/drm2/i915/intel_ringbuffer.c projects/sendfile/sys/dev/drm2/i915/intel_sdvo.c projects/sendfile/sys/dev/drm2/i915/intel_tv.c projects/sendfile/sys/dev/drm2/radeon/atom.c projects/sendfile/sys/dev/drm2/radeon/atombios_crtc.c projects/sendfile/sys/dev/drm2/radeon/atombios_dp.c projects/sendfile/sys/dev/drm2/radeon/atombios_encoders.c projects/sendfile/sys/dev/drm2/radeon/atombios_i2c.c projects/sendfile/sys/dev/drm2/radeon/cayman_blit_shaders.c projects/sendfile/sys/dev/drm2/radeon/evergreen.c projects/sendfile/sys/dev/drm2/radeon/evergreen_blit_shaders.c projects/sendfile/sys/dev/drm2/radeon/evergreen_cs.c projects/sendfile/sys/dev/drm2/radeon/evergreen_reg.h projects/sendfile/sys/dev/drm2/radeon/ni.c projects/sendfile/sys/dev/drm2/radeon/nid.h projects/sendfile/sys/dev/drm2/radeon/r100.c projects/sendfile/sys/dev/drm2/radeon/r200.c projects/sendfile/sys/dev/drm2/radeon/r300.c projects/sendfile/sys/dev/drm2/radeon/r300_cmdbuf.c projects/sendfile/sys/dev/drm2/radeon/r420.c projects/sendfile/sys/dev/drm2/radeon/r500_reg.h projects/sendfile/sys/dev/drm2/radeon/r600.c projects/sendfile/sys/dev/drm2/radeon/r600_blit.c projects/sendfile/sys/dev/drm2/radeon/r600_blit_shaders.c projects/sendfile/sys/dev/drm2/radeon/r600_cp.c projects/sendfile/sys/dev/drm2/radeon/r600_cs.c projects/sendfile/sys/dev/drm2/radeon/r600_hdmi.c projects/sendfile/sys/dev/drm2/radeon/r600d.h projects/sendfile/sys/dev/drm2/radeon/radeon.h projects/sendfile/sys/dev/drm2/radeon/radeon_acpi.c projects/sendfile/sys/dev/drm2/radeon/radeon_agp.c projects/sendfile/sys/dev/drm2/radeon/radeon_atombios.c projects/sendfile/sys/dev/drm2/radeon/radeon_benchmark.c projects/sendfile/sys/dev/drm2/radeon/radeon_bios.c projects/sendfile/sys/dev/drm2/radeon/radeon_clocks.c projects/sendfile/sys/dev/drm2/radeon/radeon_combios.c projects/sendfile/sys/dev/drm2/radeon/radeon_connectors.c projects/sendfile/sys/dev/drm2/radeon/radeon_cp.c projects/sendfile/sys/dev/drm2/radeon/radeon_cs.c projects/sendfile/sys/dev/drm2/radeon/radeon_device.c projects/sendfile/sys/dev/drm2/radeon/radeon_display.c projects/sendfile/sys/dev/drm2/radeon/radeon_drm.h projects/sendfile/sys/dev/drm2/radeon/radeon_drv.c projects/sendfile/sys/dev/drm2/radeon/radeon_drv.h projects/sendfile/sys/dev/drm2/radeon/radeon_fb.c projects/sendfile/sys/dev/drm2/radeon/radeon_fence.c projects/sendfile/sys/dev/drm2/radeon/radeon_gart.c projects/sendfile/sys/dev/drm2/radeon/radeon_gem.c projects/sendfile/sys/dev/drm2/radeon/radeon_i2c.c projects/sendfile/sys/dev/drm2/radeon/radeon_ioc32.c projects/sendfile/sys/dev/drm2/radeon/radeon_irq_kms.c projects/sendfile/sys/dev/drm2/radeon/radeon_irq_kms.h projects/sendfile/sys/dev/drm2/radeon/radeon_kms.c projects/sendfile/sys/dev/drm2/radeon/radeon_legacy_crtc.c projects/sendfile/sys/dev/drm2/radeon/radeon_legacy_encoders.c projects/sendfile/sys/dev/drm2/radeon/radeon_legacy_tv.c projects/sendfile/sys/dev/drm2/radeon/radeon_mem.c projects/sendfile/sys/dev/drm2/radeon/radeon_object.c projects/sendfile/sys/dev/drm2/radeon/radeon_object.h projects/sendfile/sys/dev/drm2/radeon/radeon_pm.c projects/sendfile/sys/dev/drm2/radeon/radeon_ring.c projects/sendfile/sys/dev/drm2/radeon/radeon_sa.c projects/sendfile/sys/dev/drm2/radeon/radeon_semaphore.c projects/sendfile/sys/dev/drm2/radeon/radeon_state.c projects/sendfile/sys/dev/drm2/radeon/radeon_test.c projects/sendfile/sys/dev/drm2/radeon/radeon_ttm.c projects/sendfile/sys/dev/drm2/radeon/rs400.c projects/sendfile/sys/dev/drm2/radeon/rs600.c projects/sendfile/sys/dev/drm2/radeon/rs690.c projects/sendfile/sys/dev/drm2/radeon/rv515.c projects/sendfile/sys/dev/drm2/radeon/rv770.c projects/sendfile/sys/dev/drm2/radeon/si.c projects/sendfile/sys/dev/drm2/radeon/si_blit_shaders.c projects/sendfile/sys/dev/drm2/radeon/sid.h projects/sendfile/sys/dev/drm2/ttm/ttm_bo.c projects/sendfile/sys/dev/drm2/ttm/ttm_bo_util.c projects/sendfile/sys/dev/drm2/ttm/ttm_bo_vm.c projects/sendfile/sys/dev/drm2/ttm/ttm_lock.c projects/sendfile/sys/dev/dwc/if_dwc.c projects/sendfile/sys/dev/etherswitch/arswitch/arswitch_vlans.c projects/sendfile/sys/dev/fdt/simplebus.c projects/sendfile/sys/dev/fdt/simplebus.h projects/sendfile/sys/dev/gpio/gpioled.c projects/sendfile/sys/dev/hwpmc/hwpmc_arm.c projects/sendfile/sys/dev/hwpmc/hwpmc_armv7.c projects/sendfile/sys/dev/hwpmc/hwpmc_core.c projects/sendfile/sys/dev/hwpmc/hwpmc_intel.c projects/sendfile/sys/dev/hwpmc/pmc_events.h projects/sendfile/sys/dev/ichsmb/ichsmb_pci.c projects/sendfile/sys/dev/ida/ida.c projects/sendfile/sys/dev/ida/ida_eisa.c projects/sendfile/sys/dev/ida/ida_pci.c projects/sendfile/sys/dev/if_ndis/if_ndis_pci.c projects/sendfile/sys/dev/iir/iir.c projects/sendfile/sys/dev/iir/iir_pci.c projects/sendfile/sys/dev/iscsi/icl_conn_if.m projects/sendfile/sys/dev/iscsi/icl_soft.c projects/sendfile/sys/dev/iscsi/icl_wrappers.h projects/sendfile/sys/dev/ixgbe/LICENSE projects/sendfile/sys/dev/ixgbe/ixgbe.h projects/sendfile/sys/dev/ixgbe/ixgbe_82598.c projects/sendfile/sys/dev/ixgbe/ixgbe_82598.h projects/sendfile/sys/dev/ixgbe/ixgbe_82599.c projects/sendfile/sys/dev/ixgbe/ixgbe_82599.h projects/sendfile/sys/dev/ixgbe/ixgbe_api.c projects/sendfile/sys/dev/ixgbe/ixgbe_api.h projects/sendfile/sys/dev/ixgbe/ixgbe_common.c projects/sendfile/sys/dev/ixgbe/ixgbe_common.h projects/sendfile/sys/dev/ixgbe/ixgbe_dcb.c projects/sendfile/sys/dev/ixgbe/ixgbe_dcb.h projects/sendfile/sys/dev/ixgbe/ixgbe_dcb_82598.c projects/sendfile/sys/dev/ixgbe/ixgbe_dcb_82598.h projects/sendfile/sys/dev/ixgbe/ixgbe_dcb_82599.c projects/sendfile/sys/dev/ixgbe/ixgbe_dcb_82599.h projects/sendfile/sys/dev/ixgbe/ixgbe_mbx.c projects/sendfile/sys/dev/ixgbe/ixgbe_mbx.h projects/sendfile/sys/dev/ixgbe/ixgbe_phy.c projects/sendfile/sys/dev/ixgbe/ixgbe_phy.h projects/sendfile/sys/dev/ixgbe/ixgbe_type.h projects/sendfile/sys/dev/ixgbe/ixgbe_vf.c projects/sendfile/sys/dev/ixgbe/ixgbe_vf.h projects/sendfile/sys/dev/ixgbe/ixgbe_x540.c projects/sendfile/sys/dev/ixgbe/ixgbe_x540.h projects/sendfile/sys/dev/mlx/mlx.c projects/sendfile/sys/dev/mlx/mlx_pci.c projects/sendfile/sys/dev/mly/mly.c projects/sendfile/sys/dev/mmc/mmc.c projects/sendfile/sys/dev/mvs/mvs.c projects/sendfile/sys/dev/mvs/mvs_pci.c projects/sendfile/sys/dev/mvs/mvs_soc.c projects/sendfile/sys/dev/nand/nfc_fsl.c projects/sendfile/sys/dev/netmap/ixgbe_netmap.h projects/sendfile/sys/dev/nvme/nvme.c projects/sendfile/sys/dev/nvme/nvme_ctrlr.c projects/sendfile/sys/dev/nvme/nvme_ns.c projects/sendfile/sys/dev/nvme/nvme_private.h projects/sendfile/sys/dev/nvme/nvme_qpair.c projects/sendfile/sys/dev/ofw/ofwbus.c projects/sendfile/sys/dev/ofw/openfirm.c projects/sendfile/sys/dev/re/if_re.c projects/sendfile/sys/dev/sfxge/common/efsys.h projects/sendfile/sys/dev/sfxge/common/efx_mcdi.c projects/sendfile/sys/dev/sfxge/sfxge.c projects/sendfile/sys/dev/sfxge/sfxge.h projects/sendfile/sys/dev/sfxge/sfxge_port.c projects/sendfile/sys/dev/sfxge/sfxge_rx.c projects/sendfile/sys/dev/sfxge/sfxge_tx.c projects/sendfile/sys/dev/sfxge/sfxge_tx.h projects/sendfile/sys/dev/siis/siis.c projects/sendfile/sys/dev/sound/pcm/channel.c projects/sendfile/sys/dev/sound/pcm/dsp.c projects/sendfile/sys/dev/sound/pcm/feeder_eq.c projects/sendfile/sys/dev/sound/pcm/feeder_rate.c projects/sendfile/sys/dev/sound/pcm/mixer.c projects/sendfile/sys/dev/sound/pcm/sndstat.c projects/sendfile/sys/dev/sound/pcm/sound.c projects/sendfile/sys/dev/sound/pcm/vchan.c projects/sendfile/sys/dev/sound/usb/uaudio.c projects/sendfile/sys/dev/sound/usb/uaudio.h projects/sendfile/sys/dev/sound/usb/uaudio_pcm.c projects/sendfile/sys/dev/trm/trm.c projects/sendfile/sys/dev/twe/twe.c projects/sendfile/sys/dev/twe/twe_freebsd.c projects/sendfile/sys/dev/uart/uart_bus_fdt.c projects/sendfile/sys/dev/uart/uart_cpu_fdt.c projects/sendfile/sys/dev/uart/uart_cpu_fdt.h projects/sendfile/sys/dev/usb/net/if_axge.c projects/sendfile/sys/dev/usb/storage/umass.c projects/sendfile/sys/dev/usb/usb.h projects/sendfile/sys/dev/usb/usb_core.c projects/sendfile/sys/dev/usb/usbdevs projects/sendfile/sys/dev/usb/wlan/if_urtwn.c projects/sendfile/sys/dev/wpi/if_wpi.c projects/sendfile/sys/fs/devfs/devfs_devs.c projects/sendfile/sys/fs/devfs/devfs_vnops.c projects/sendfile/sys/fs/msdosfs/msdosfs_fat.c projects/sendfile/sys/fs/msdosfs/msdosfs_vfsops.c projects/sendfile/sys/fs/msdosfs/msdosfsmount.h projects/sendfile/sys/fs/nfsclient/nfs_clbio.c projects/sendfile/sys/geom/geom_dev.c projects/sendfile/sys/geom/geom_dump.c projects/sendfile/sys/geom/geom_map.c projects/sendfile/sys/geom/geom_subr.c projects/sendfile/sys/geom/mirror/g_mirror.c projects/sendfile/sys/geom/multipath/g_multipath.c projects/sendfile/sys/geom/part/g_part.c projects/sendfile/sys/geom/raid/g_raid.c projects/sendfile/sys/i386/conf/NOTES projects/sendfile/sys/i386/i386/mp_machdep.c projects/sendfile/sys/i386/i386/pmap.c projects/sendfile/sys/i386/include/intr_machdep.h projects/sendfile/sys/i386/include/pmap.h projects/sendfile/sys/kern/init_main.c projects/sendfile/sys/kern/kern_conf.c projects/sendfile/sys/kern/kern_descrip.c projects/sendfile/sys/kern/kern_et.c projects/sendfile/sys/kern/kern_exec.c projects/sendfile/sys/kern/kern_fail.c projects/sendfile/sys/kern/kern_fork.c projects/sendfile/sys/kern/kern_jail.c projects/sendfile/sys/kern/kern_mbuf.c projects/sendfile/sys/kern/kern_proc.c projects/sendfile/sys/kern/kern_prot.c projects/sendfile/sys/kern/kern_sig.c projects/sendfile/sys/kern/kern_sysctl.c projects/sendfile/sys/kern/kern_timeout.c projects/sendfile/sys/kern/kern_umtx.c projects/sendfile/sys/kern/link_elf_obj.c projects/sendfile/sys/kern/subr_busdma_bufalloc.c projects/sendfile/sys/kern/subr_sbuf.c projects/sendfile/sys/kern/subr_vmem.c projects/sendfile/sys/kern/sysv_shm.c projects/sendfile/sys/kern/uipc_mbufhash.c projects/sendfile/sys/kern/vfs_bio.c projects/sendfile/sys/kern/vfs_syscalls.c projects/sendfile/sys/kern/vnode_if.src projects/sendfile/sys/mips/atheros/ar71xx_gpio.c projects/sendfile/sys/mips/atheros/ar71xx_macaddr.c projects/sendfile/sys/mips/atheros/ar71xx_macaddr.h projects/sendfile/sys/mips/atheros/ar71xx_machdep.c projects/sendfile/sys/mips/atheros/ar724xreg.h projects/sendfile/sys/mips/atheros/if_arge.c projects/sendfile/sys/mips/atheros/qca955xreg.h projects/sendfile/sys/mips/conf/AP135.hints projects/sendfile/sys/mips/conf/AR91XX_BASE projects/sendfile/sys/mips/conf/AR933X_BASE projects/sendfile/sys/mips/conf/AR934X_BASE projects/sendfile/sys/mips/conf/CARAMBOLA2.hints projects/sendfile/sys/mips/conf/DIR-825B1.hints projects/sendfile/sys/mips/conf/DIR-825C1.hints projects/sendfile/sys/mips/conf/OCTEON1 projects/sendfile/sys/mips/conf/TL-WR1043NDv2.hints projects/sendfile/sys/mips/include/cache_mipsNN.h projects/sendfile/sys/mips/include/cache_r4k.h projects/sendfile/sys/mips/include/reg.h projects/sendfile/sys/mips/mips/cache.c projects/sendfile/sys/mips/mips/cache_mipsNN.c projects/sendfile/sys/mips/mips/uma_machdep.c projects/sendfile/sys/modules/Makefile projects/sendfile/sys/modules/ata/atapci/chipsets/Makefile projects/sendfile/sys/modules/drm2/Makefile projects/sendfile/sys/modules/drm2/drm2/Makefile projects/sendfile/sys/modules/drm2/radeonkms/Makefile projects/sendfile/sys/modules/dtb/rpi/Makefile projects/sendfile/sys/modules/i2c/iicbb/Makefile projects/sendfile/sys/modules/sfxge/Makefile projects/sendfile/sys/net/ieee8023ad_lacp.c projects/sendfile/sys/net/if.c projects/sendfile/sys/net/if_lagg.c projects/sendfile/sys/net/if_media.c projects/sendfile/sys/net/if_media.h projects/sendfile/sys/net/if_tap.c projects/sendfile/sys/net/if_vlan.c projects/sendfile/sys/net/pfvar.h projects/sendfile/sys/net80211/ieee80211_ht.c projects/sendfile/sys/netgraph/atm/sscop/ng_sscop_cust.h projects/sendfile/sys/netgraph/atm/uni/ng_uni_cust.h projects/sendfile/sys/netgraph/bluetooth/hci/ng_hci_cmds.c projects/sendfile/sys/netgraph/bluetooth/hci/ng_hci_evnt.c projects/sendfile/sys/netgraph/bluetooth/hci/ng_hci_main.c projects/sendfile/sys/netgraph/bluetooth/hci/ng_hci_misc.c projects/sendfile/sys/netgraph/bluetooth/hci/ng_hci_misc.h projects/sendfile/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c projects/sendfile/sys/netgraph/bluetooth/hci/ng_hci_var.h projects/sendfile/sys/netgraph/bluetooth/include/ng_btsocket.h projects/sendfile/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h projects/sendfile/sys/netgraph/bluetooth/include/ng_hci.h projects/sendfile/sys/netgraph/bluetooth/include/ng_l2cap.h projects/sendfile/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c projects/sendfile/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h projects/sendfile/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c projects/sendfile/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c projects/sendfile/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h projects/sendfile/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c projects/sendfile/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h projects/sendfile/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c projects/sendfile/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c projects/sendfile/sys/netinet/igmp.c projects/sendfile/sys/netinet/in_rss.c projects/sendfile/sys/netinet/in_var.h projects/sendfile/sys/netinet/ip_carp.c projects/sendfile/sys/netinet/ip_gre.c projects/sendfile/sys/netinet/ip_id.c projects/sendfile/sys/netinet/ip_input.c projects/sendfile/sys/netinet/ip_mroute.c projects/sendfile/sys/netinet/ip_output.c projects/sendfile/sys/netinet/ip_var.h projects/sendfile/sys/netinet/raw_ip.c projects/sendfile/sys/netinet/sctp_auth.c projects/sendfile/sys/netinet/sctp_indata.c projects/sendfile/sys/netinet/sctp_output.c projects/sendfile/sys/netinet/sctp_pcb.c projects/sendfile/sys/netinet/sctp_structs.h projects/sendfile/sys/netinet/sctp_usrreq.c projects/sendfile/sys/netinet/sctputil.c projects/sendfile/sys/netinet/siftr.c projects/sendfile/sys/netinet/tcp_timer.c projects/sendfile/sys/netinet6/in6.h projects/sendfile/sys/netinet6/in6_var.h projects/sendfile/sys/netinet6/ip6_forward.c projects/sendfile/sys/netinet6/ip6_mroute.c projects/sendfile/sys/netinet6/ip6_mroute.h projects/sendfile/sys/netinet6/ip6_output.c projects/sendfile/sys/netinet6/ip6_var.h projects/sendfile/sys/netinet6/nd6_nbr.c projects/sendfile/sys/netinet6/nd6_rtr.c projects/sendfile/sys/netipsec/xform_ipip.c projects/sendfile/sys/netpfil/ipfw/ip_fw_log.c projects/sendfile/sys/netpfil/pf/if_pfsync.c projects/sendfile/sys/netpfil/pf/pf.c projects/sendfile/sys/netpfil/pf/pf_ioctl.c projects/sendfile/sys/netpfil/pf/pf_norm.c projects/sendfile/sys/ofed/include/linux/completion.h projects/sendfile/sys/ofed/include/linux/fs.h projects/sendfile/sys/ofed/include/linux/in.h projects/sendfile/sys/ofed/include/linux/jiffies.h projects/sendfile/sys/ofed/include/linux/linux_compat.c projects/sendfile/sys/ofed/include/linux/timer.h projects/sendfile/sys/opencrypto/gmac.h projects/sendfile/sys/powerpc/aim/machdep.c projects/sendfile/sys/powerpc/aim/mmu_oea64.c projects/sendfile/sys/powerpc/aim/slb.c projects/sendfile/sys/powerpc/aim/uma_machdep.c projects/sendfile/sys/powerpc/booke/locore.S projects/sendfile/sys/powerpc/booke/machdep.c projects/sendfile/sys/powerpc/booke/pmap.c projects/sendfile/sys/powerpc/conf/GENERIC64 projects/sendfile/sys/powerpc/include/reg.h projects/sendfile/sys/powerpc/include/trap.h projects/sendfile/sys/powerpc/pseries/mmu_phyp.c projects/sendfile/sys/rpc/svc.c projects/sendfile/sys/rpc/svc.h projects/sendfile/sys/rpc/svc_generic.c projects/sendfile/sys/rpc/svc_vc.c projects/sendfile/sys/sparc64/conf/NOTES projects/sendfile/sys/sparc64/include/reg.h projects/sendfile/sys/sparc64/sparc64/vm_machdep.c projects/sendfile/sys/sys/_callout.h projects/sendfile/sys/sys/bitset.h projects/sendfile/sys/sys/buf.h projects/sendfile/sys/sys/busdma_bufalloc.h projects/sendfile/sys/sys/callout.h projects/sendfile/sys/sys/capsicum.h projects/sendfile/sys/sys/cdefs.h projects/sendfile/sys/sys/elf_common.h projects/sendfile/sys/sys/kerneldump.h projects/sendfile/sys/sys/libkern.h projects/sendfile/sys/sys/malloc.h projects/sendfile/sys/sys/mbuf.h projects/sendfile/sys/sys/mouse.h projects/sendfile/sys/sys/param.h projects/sendfile/sys/sys/pmc.h projects/sendfile/sys/sys/procfs.h projects/sendfile/sys/sys/sockio.h projects/sendfile/sys/sys/systm.h projects/sendfile/sys/sys/types.h projects/sendfile/sys/sys/ucred.h projects/sendfile/sys/sys/vmem.h projects/sendfile/sys/ufs/ffs/ffs_softdep.c projects/sendfile/sys/ufs/ffs/ffs_vfsops.c projects/sendfile/sys/vm/memguard.c projects/sendfile/sys/vm/swap_pager.c projects/sendfile/sys/vm/uma.h projects/sendfile/sys/vm/uma_core.c projects/sendfile/sys/vm/uma_int.h projects/sendfile/sys/vm/vm_fault.c projects/sendfile/sys/vm/vm_mmap.c projects/sendfile/sys/vm/vm_object.h projects/sendfile/sys/vm/vm_page.c projects/sendfile/sys/vm/vm_pageout.c projects/sendfile/sys/vm/vm_pager.c projects/sendfile/sys/vm/vm_pager.h projects/sendfile/sys/vm/vnode_pager.c projects/sendfile/sys/x86/include/apicvar.h projects/sendfile/sys/x86/include/reg.h projects/sendfile/sys/x86/iommu/busdma_dmar.c projects/sendfile/sys/x86/iommu/intel_ctx.c projects/sendfile/sys/x86/iommu/intel_dmar.h projects/sendfile/sys/x86/iommu/intel_drv.c projects/sendfile/sys/x86/iommu/intel_fault.c projects/sendfile/sys/x86/iommu/intel_gas.c projects/sendfile/sys/x86/iommu/intel_idpgtbl.c projects/sendfile/sys/x86/iommu/intel_qi.c projects/sendfile/sys/x86/iommu/intel_quirks.c projects/sendfile/sys/x86/iommu/intel_reg.h projects/sendfile/sys/x86/iommu/intel_utils.c projects/sendfile/sys/x86/x86/intr_machdep.c projects/sendfile/sys/x86/x86/io_apic.c projects/sendfile/sys/x86/x86/msi.c projects/sendfile/tools/build/check-links.sh projects/sendfile/tools/build/mk/OptionalObsoleteFiles.inc projects/sendfile/tools/build/options/WITHOUT_CXX projects/sendfile/tools/regression/aio/aiotest/Makefile projects/sendfile/tools/regression/aio/aiotest/aiotest.c projects/sendfile/tools/regression/aio/kqueue/Makefile projects/sendfile/tools/regression/aio/kqueue/aio_kqueue.c projects/sendfile/tools/regression/aio/kqueue/lio/Makefile projects/sendfile/tools/regression/aio/kqueue/lio/lio_kqueue.c projects/sendfile/tools/regression/lib/libc/gen/test-wordexp.c projects/sendfile/tools/regression/sockets/accept_fd_leak/Makefile projects/sendfile/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c projects/sendfile/tools/regression/sockets/accf_data_attach/Makefile projects/sendfile/tools/regression/sockets/accf_data_attach/accf_data_attach.c projects/sendfile/tools/regression/sockets/fstat/Makefile projects/sendfile/tools/regression/sockets/fstat/fstat.c projects/sendfile/tools/regression/sockets/kqueue/Makefile projects/sendfile/tools/regression/sockets/kqueue/kqueue.c projects/sendfile/tools/regression/sockets/listen_backlog/Makefile projects/sendfile/tools/regression/sockets/listen_backlog/listen_backlog.c projects/sendfile/tools/regression/sockets/listenclose/Makefile projects/sendfile/tools/regression/sockets/listenclose/listenclose.c projects/sendfile/tools/regression/sockets/unix_passfd/Makefile projects/sendfile/tools/regression/sockets/unix_passfd/unix_passfd.c projects/sendfile/tools/regression/sysvshm/shmtest.c projects/sendfile/tools/tools/ath/athratestats/main.c projects/sendfile/tools/tools/ath/athstats/athstats.c projects/sendfile/tools/tools/cxgbtool/cxgbtool.c projects/sendfile/tools/tools/iwn/iwnstats/iwn_ioctl.c projects/sendfile/usr.bin/Makefile projects/sendfile/usr.bin/ar/read.c projects/sendfile/usr.bin/bluetooth/bthost/bthost.c projects/sendfile/usr.bin/bluetooth/btsockstat/btsockstat.c projects/sendfile/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c projects/sendfile/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c projects/sendfile/usr.bin/clang/Makefile projects/sendfile/usr.bin/col/col.c projects/sendfile/usr.bin/column/column.c projects/sendfile/usr.bin/fetch/fetch.1 projects/sendfile/usr.bin/fetch/fetch.c projects/sendfile/usr.bin/gcore/elf32core.c projects/sendfile/usr.bin/grep/grep.c projects/sendfile/usr.bin/iscsictl/Makefile projects/sendfile/usr.bin/iscsictl/iscsi.conf.5 projects/sendfile/usr.bin/jot/jot.1 projects/sendfile/usr.bin/kdump/mkioctls projects/sendfile/usr.bin/lam/lam.1 projects/sendfile/usr.bin/ldd/ldd.c projects/sendfile/usr.bin/lockf/lockf.1 projects/sendfile/usr.bin/logger/logger.1 projects/sendfile/usr.bin/ministat/ministat.1 projects/sendfile/usr.bin/mt/Makefile projects/sendfile/usr.bin/mt/mt.c projects/sendfile/usr.bin/netstat/bpf.c projects/sendfile/usr.bin/netstat/if.c projects/sendfile/usr.bin/netstat/inet6.c projects/sendfile/usr.bin/netstat/mroute6.c projects/sendfile/usr.bin/netstat/netstat.1 projects/sendfile/usr.bin/netstat/route.c projects/sendfile/usr.bin/patch/inp.c projects/sendfile/usr.bin/rs/rs.1 projects/sendfile/usr.bin/smbutil/Makefile projects/sendfile/usr.bin/sockstat/sockstat.1 projects/sendfile/usr.bin/sort/bwstring.c projects/sendfile/usr.bin/sort/coll.c projects/sendfile/usr.bin/sort/file.c projects/sendfile/usr.bin/sort/file.h projects/sendfile/usr.bin/sort/mem.c projects/sendfile/usr.bin/sort/radixsort.c projects/sendfile/usr.bin/sort/sort.1.in projects/sendfile/usr.bin/sort/sort.c projects/sendfile/usr.bin/top/machine.c projects/sendfile/usr.bin/xlint/arch/sparc64/targparam.h projects/sendfile/usr.bin/xlint/common/lint.h projects/sendfile/usr.bin/xlint/common/mem.c projects/sendfile/usr.bin/xlint/lint1/cgram.y projects/sendfile/usr.bin/xlint/lint1/decl.c projects/sendfile/usr.bin/xlint/lint1/emit1.c projects/sendfile/usr.bin/xlint/lint1/err.c projects/sendfile/usr.bin/xlint/lint1/externs1.h projects/sendfile/usr.bin/xlint/lint1/func.c projects/sendfile/usr.bin/xlint/lint1/init.c projects/sendfile/usr.bin/xlint/lint1/lint1.h projects/sendfile/usr.bin/xlint/lint1/main1.c projects/sendfile/usr.bin/xlint/lint1/makeman projects/sendfile/usr.bin/xlint/lint1/param.h projects/sendfile/usr.bin/xlint/lint1/scan.l projects/sendfile/usr.bin/xlint/lint1/tree.c projects/sendfile/usr.bin/xlint/lint2/read.c projects/sendfile/usr.bin/xlint/xlint/lint.1 projects/sendfile/usr.bin/xlint/xlint/xlint.c projects/sendfile/usr.sbin/acpi/acpiconf/acpiconf.c projects/sendfile/usr.sbin/acpi/acpidump/acpi.c projects/sendfile/usr.sbin/amd/include/config.h projects/sendfile/usr.sbin/ancontrol/ancontrol.c projects/sendfile/usr.sbin/arp/arp.c projects/sendfile/usr.sbin/authpf/Makefile projects/sendfile/usr.sbin/bhyve/Makefile projects/sendfile/usr.sbin/bhyve/bhyverun.c projects/sendfile/usr.sbin/bhyve/pci_ahci.c projects/sendfile/usr.sbin/bhyve/pci_virtio_block.c projects/sendfile/usr.sbin/bhyve/pci_virtio_net.c projects/sendfile/usr.sbin/bhyve/virtio.c projects/sendfile/usr.sbin/bhyvectl/Makefile projects/sendfile/usr.sbin/bhyveload/Makefile projects/sendfile/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c projects/sendfile/usr.sbin/bluetooth/bthidcontrol/hid.c projects/sendfile/usr.sbin/bluetooth/bthidcontrol/sdp.c projects/sendfile/usr.sbin/bluetooth/bthidd/bthidd.c projects/sendfile/usr.sbin/bluetooth/bthidd/client.c projects/sendfile/usr.sbin/bluetooth/bthidd/hid.c projects/sendfile/usr.sbin/bluetooth/bthidd/kbd.c projects/sendfile/usr.sbin/bluetooth/bthidd/lexer.l projects/sendfile/usr.sbin/bluetooth/bthidd/parser.y projects/sendfile/usr.sbin/bluetooth/bthidd/server.c projects/sendfile/usr.sbin/bluetooth/bthidd/session.c projects/sendfile/usr.sbin/bluetooth/btpand/bnep.c projects/sendfile/usr.sbin/bluetooth/btpand/btpand.c projects/sendfile/usr.sbin/bluetooth/btpand/channel.c projects/sendfile/usr.sbin/bluetooth/btpand/client.c projects/sendfile/usr.sbin/bluetooth/btpand/event.c projects/sendfile/usr.sbin/bluetooth/btpand/packet.c projects/sendfile/usr.sbin/bluetooth/btpand/sdp.c projects/sendfile/usr.sbin/bluetooth/btpand/server.c projects/sendfile/usr.sbin/bluetooth/btpand/tap.c projects/sendfile/usr.sbin/bluetooth/hccontrol/hccontrol.c projects/sendfile/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c projects/sendfile/usr.sbin/bluetooth/hccontrol/info.c projects/sendfile/usr.sbin/bluetooth/hccontrol/link_control.c projects/sendfile/usr.sbin/bluetooth/hccontrol/link_policy.c projects/sendfile/usr.sbin/bluetooth/hccontrol/node.c projects/sendfile/usr.sbin/bluetooth/hccontrol/util.c projects/sendfile/usr.sbin/bluetooth/hcsecd/hcsecd.c projects/sendfile/usr.sbin/bluetooth/hcsecd/parser.y projects/sendfile/usr.sbin/bluetooth/l2control/l2cap.c projects/sendfile/usr.sbin/bluetooth/l2control/l2control.c projects/sendfile/usr.sbin/bluetooth/l2ping/l2ping.c projects/sendfile/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c projects/sendfile/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c projects/sendfile/usr.sbin/bluetooth/sdpcontrol/search.c projects/sendfile/usr.sbin/bluetooth/sdpd/bgd.c projects/sendfile/usr.sbin/bluetooth/sdpd/dun.c projects/sendfile/usr.sbin/bluetooth/sdpd/ftrn.c projects/sendfile/usr.sbin/bluetooth/sdpd/gn.c projects/sendfile/usr.sbin/bluetooth/sdpd/irmc.c projects/sendfile/usr.sbin/bluetooth/sdpd/irmc_command.c projects/sendfile/usr.sbin/bluetooth/sdpd/lan.c projects/sendfile/usr.sbin/bluetooth/sdpd/main.c projects/sendfile/usr.sbin/bluetooth/sdpd/nap.c projects/sendfile/usr.sbin/bluetooth/sdpd/opush.c projects/sendfile/usr.sbin/bluetooth/sdpd/panu.c projects/sendfile/usr.sbin/bluetooth/sdpd/profile.c projects/sendfile/usr.sbin/bluetooth/sdpd/provider.c projects/sendfile/usr.sbin/bluetooth/sdpd/sar.c projects/sendfile/usr.sbin/bluetooth/sdpd/scr.c projects/sendfile/usr.sbin/bluetooth/sdpd/sd.c projects/sendfile/usr.sbin/bluetooth/sdpd/server.c projects/sendfile/usr.sbin/bluetooth/sdpd/sp.c projects/sendfile/usr.sbin/bluetooth/sdpd/srr.c projects/sendfile/usr.sbin/bluetooth/sdpd/ssar.c projects/sendfile/usr.sbin/bluetooth/sdpd/ssr.c projects/sendfile/usr.sbin/bluetooth/sdpd/sur.c projects/sendfile/usr.sbin/bluetooth/sdpd/uuid.c projects/sendfile/usr.sbin/bsdconfig/share/geom.subr projects/sendfile/usr.sbin/bsdinstall/scripts/docsinstall projects/sendfile/usr.sbin/bsdinstall/scripts/zfsboot projects/sendfile/usr.sbin/bsnmpd/tools/bsnmptools/Makefile projects/sendfile/usr.sbin/crashinfo/crashinfo.sh projects/sendfile/usr.sbin/crunch/crunchide/Makefile projects/sendfile/usr.sbin/ctld/ctld.c projects/sendfile/usr.sbin/ifmcstat/ifmcstat.c projects/sendfile/usr.sbin/ip6addrctl/ip6addrctl.c projects/sendfile/usr.sbin/jail/jail.8 projects/sendfile/usr.sbin/mld6query/mld6.c projects/sendfile/usr.sbin/ndp/ndp.c projects/sendfile/usr.sbin/nfsd/nfsd.c projects/sendfile/usr.sbin/ntp/Makefile projects/sendfile/usr.sbin/ntp/config.h projects/sendfile/usr.sbin/ntp/doc/Makefile projects/sendfile/usr.sbin/ntp/doc/ntp-keygen.8 projects/sendfile/usr.sbin/ntp/doc/ntp.conf.5 projects/sendfile/usr.sbin/ntp/doc/ntp.keys.5 projects/sendfile/usr.sbin/ntp/doc/ntpd.8 projects/sendfile/usr.sbin/ntp/doc/ntpdc.8 projects/sendfile/usr.sbin/ntp/doc/ntpq.8 projects/sendfile/usr.sbin/ntp/doc/ntptrace.8 projects/sendfile/usr.sbin/ntp/libntp/Makefile projects/sendfile/usr.sbin/ntp/libopts/Makefile projects/sendfile/usr.sbin/ntp/libparse/Makefile projects/sendfile/usr.sbin/ntp/ntp-keygen/Makefile projects/sendfile/usr.sbin/ntp/ntpd/Makefile projects/sendfile/usr.sbin/ntp/ntpdate/Makefile projects/sendfile/usr.sbin/ntp/ntpdc/Makefile projects/sendfile/usr.sbin/ntp/ntpq/Makefile projects/sendfile/usr.sbin/ntp/ntptime/Makefile projects/sendfile/usr.sbin/ntp/scripts/mkver projects/sendfile/usr.sbin/ntp/sntp/Makefile projects/sendfile/usr.sbin/pkg/pkg.c projects/sendfile/usr.sbin/pmcstat/pmcstat.8 projects/sendfile/usr.sbin/pmcstat/pmcstat.c projects/sendfile/usr.sbin/pmcstudy/Makefile projects/sendfile/usr.sbin/pmcstudy/pmcstudy.c projects/sendfile/usr.sbin/powerd/powerd.c projects/sendfile/usr.sbin/ppp/iface.c projects/sendfile/usr.sbin/rip6query/rip6query.c projects/sendfile/usr.sbin/route6d/route6d.c projects/sendfile/usr.sbin/rpc.lockd/Makefile projects/sendfile/usr.sbin/rrenumd/lexer.l projects/sendfile/usr.sbin/rrenumd/parser.y projects/sendfile/usr.sbin/rtadvctl/rtadvctl.c projects/sendfile/usr.sbin/rtadvd/config.c projects/sendfile/usr.sbin/rtadvd/if.c projects/sendfile/usr.sbin/rtadvd/rrenum.c projects/sendfile/usr.sbin/rtadvd/rtadvd.c projects/sendfile/usr.sbin/rtsold/Makefile projects/sendfile/usr.sbin/rtsold/if.c projects/sendfile/usr.sbin/rtsold/probe.c projects/sendfile/usr.sbin/rtsold/rtsold.c projects/sendfile/usr.sbin/uhsoctl/uhsoctl.c projects/sendfile/usr.sbin/wpa/ndis_events/ndis_events.c projects/sendfile/usr.sbin/wpa/wpa_supplicant/Packet32.c Directory Properties: projects/sendfile/ (props changed) projects/sendfile/cddl/ (props changed) projects/sendfile/cddl/contrib/opensolaris/ (props changed) projects/sendfile/contrib/binutils/ (props changed) projects/sendfile/contrib/compiler-rt/ (props changed) projects/sendfile/contrib/elftoolchain/ (props changed) projects/sendfile/contrib/gcc/ (props changed) projects/sendfile/contrib/ipfilter/ (props changed) projects/sendfile/contrib/libarchive/ (props changed) projects/sendfile/contrib/libarchive/libarchive/ (props changed) projects/sendfile/contrib/libc++/ (props changed) projects/sendfile/contrib/llvm/ (props changed) projects/sendfile/contrib/llvm/tools/clang/ (props changed) projects/sendfile/contrib/llvm/tools/lldb/ (props changed) projects/sendfile/contrib/ntp/ (props changed) projects/sendfile/contrib/ntp/INSTALL (props changed) projects/sendfile/contrib/ntp/NOTES.y2kfixes (props changed) projects/sendfile/contrib/ntp/README (props changed) projects/sendfile/contrib/ntp/README.bk (props changed) projects/sendfile/contrib/ntp/README.patches (props changed) projects/sendfile/contrib/ntp/README.refclocks (props changed) projects/sendfile/contrib/ntp/README.versions (props changed) projects/sendfile/contrib/ntp/TODO (props changed) projects/sendfile/contrib/ntp/adjtimed/README (props changed) projects/sendfile/contrib/ntp/adjtimed/adjtimed.c (props changed) projects/sendfile/contrib/ntp/compile (props changed) projects/sendfile/contrib/ntp/conf/README (props changed) projects/sendfile/contrib/ntp/conf/baldwin.conf (props changed) projects/sendfile/contrib/ntp/conf/grundoon.conf (props changed) projects/sendfile/contrib/ntp/conf/malarky.conf (props changed) projects/sendfile/contrib/ntp/conf/pogo.conf (props changed) projects/sendfile/contrib/ntp/conf/rackety.conf (props changed) projects/sendfile/contrib/ntp/depcomp (props changed) projects/sendfile/contrib/ntp/include/README (props changed) projects/sendfile/contrib/ntp/include/adjtime.h (props changed) projects/sendfile/contrib/ntp/include/ascii.h (props changed) projects/sendfile/contrib/ntp/include/gps.h (props changed) projects/sendfile/contrib/ntp/include/hopf6039.h (props changed) projects/sendfile/contrib/ntp/include/mx4200.h (props changed) projects/sendfile/contrib/ntp/include/ntif.h (props changed) projects/sendfile/contrib/ntp/include/ntp_datum.h (props changed) projects/sendfile/contrib/ntp/include/ntp_if.h (props changed) projects/sendfile/contrib/ntp/include/parse_conf.h (props changed) projects/sendfile/contrib/ntp/install-sh (props changed) projects/sendfile/contrib/ntp/kernel/sys/README (props changed) projects/sendfile/contrib/ntp/kernel/sys/bsd_audioirig.h (props changed) projects/sendfile/contrib/ntp/kernel/sys/i8253.h (props changed) projects/sendfile/contrib/ntp/kernel/sys/parsestreams.h (props changed) projects/sendfile/contrib/ntp/kernel/sys/pcl720.h (props changed) projects/sendfile/contrib/ntp/kernel/sys/ppsclock.h (props changed) projects/sendfile/contrib/ntp/kernel/sys/timex.h (props changed) projects/sendfile/contrib/ntp/kernel/sys/tpro.h (props changed) projects/sendfile/contrib/ntp/kernel/sys/tt560_api.h (props changed) projects/sendfile/contrib/ntp/libntp/README (props changed) projects/sendfile/contrib/ntp/libntp/adjtime.c (props changed) projects/sendfile/contrib/ntp/libntp/adjtimex.c (props changed) projects/sendfile/contrib/ntp/libntp/systime_s.c (props changed) projects/sendfile/contrib/ntp/libparse/README (props changed) projects/sendfile/contrib/ntp/missing (props changed) projects/sendfile/contrib/ntp/ntpd/jupiter.h (props changed) projects/sendfile/contrib/ntp/ntpdate/README (props changed) projects/sendfile/contrib/ntp/ntpdc/README (props changed) projects/sendfile/contrib/ntp/ntpdc/nl_in.c (props changed) projects/sendfile/contrib/ntp/ntpq/README (props changed) projects/sendfile/contrib/ntp/parseutil/README (props changed) projects/sendfile/contrib/ntp/results.y2kfixes (props changed) projects/sendfile/contrib/ntp/scripts/monitoring/README (props changed) projects/sendfile/contrib/ntp/scripts/monitoring/loopwatch.config.SAMPLE (props changed) projects/sendfile/contrib/ntp/scripts/monitoring/lr.pl (props changed) projects/sendfile/contrib/ntp/scripts/monitoring/ntploopstat (props changed) projects/sendfile/contrib/ntp/scripts/monitoring/ntploopwatch (props changed) projects/sendfile/contrib/ntp/scripts/monitoring/timelocal.pl (props changed) projects/sendfile/contrib/ntp/scripts/stats/README (props changed) projects/sendfile/contrib/ntp/scripts/stats/README.stats (props changed) projects/sendfile/contrib/ntp/scripts/stats/README.timecodes (props changed) projects/sendfile/contrib/ntp/scripts/stats/clock.awk (props changed) projects/sendfile/contrib/ntp/scripts/stats/dupe.awk (props changed) projects/sendfile/contrib/ntp/scripts/stats/ensemble.S (props changed) projects/sendfile/contrib/ntp/scripts/stats/ensemble.awk (props changed) projects/sendfile/contrib/ntp/scripts/stats/etf.S (props changed) projects/sendfile/contrib/ntp/scripts/stats/etf.awk (props changed) projects/sendfile/contrib/ntp/scripts/stats/itf.S (props changed) projects/sendfile/contrib/ntp/scripts/stats/itf.awk (props changed) projects/sendfile/contrib/ntp/scripts/stats/loop.S (props changed) projects/sendfile/contrib/ntp/scripts/stats/loop.awk (props changed) projects/sendfile/contrib/ntp/scripts/stats/loop_summary (props changed) projects/sendfile/contrib/ntp/scripts/stats/peer.awk (props changed) projects/sendfile/contrib/ntp/scripts/stats/psummary.awk (props changed) projects/sendfile/contrib/ntp/scripts/stats/summary.sh (props changed) projects/sendfile/contrib/ntp/scripts/stats/tdata.S (props changed) projects/sendfile/contrib/ntp/scripts/stats/tdata.awk (props changed) projects/sendfile/contrib/ntp/sntp/depcomp (props changed) projects/sendfile/contrib/ntp/sntp/install-sh (props changed) projects/sendfile/contrib/ntp/sntp/missing (props changed) projects/sendfile/contrib/ntp/util/ansi2knr.1 (props changed) projects/sendfile/contrib/ntp/util/ansi2knr.c (props changed) projects/sendfile/contrib/ntp/util/byteorder.c (props changed) projects/sendfile/contrib/ntp/util/kern.c (props changed) projects/sendfile/contrib/ntp/util/longsize.c (props changed) projects/sendfile/contrib/ntp/util/pps-api.c (props changed) projects/sendfile/contrib/ntp/util/precision.c (props changed) projects/sendfile/contrib/ntp/util/testrs6000.c (props changed) projects/sendfile/contrib/ntp/util/timetrim.c (props changed) projects/sendfile/contrib/sendmail/ (props changed) projects/sendfile/contrib/tzdata/ (props changed) projects/sendfile/contrib/xz/ (props changed) projects/sendfile/crypto/openssh/ (props changed) projects/sendfile/crypto/openssl/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/gnu/lib/ (props changed) projects/sendfile/gnu/usr.bin/binutils/ (props changed) projects/sendfile/include/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/lib/libvmmapi/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/share/ (props changed) projects/sendfile/share/man/man4/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/amd64/vmm/ (props changed) projects/sendfile/sys/boot/ (props changed) projects/sendfile/sys/boot/powerpc/kboot/ (props changed) projects/sendfile/sys/boot/powerpc/ofw/ (props changed) projects/sendfile/sys/cddl/contrib/opensolaris/ (props changed) projects/sendfile/sys/conf/ (props changed) projects/sendfile/sys/contrib/ipfilter/ (props changed) projects/sendfile/usr.sbin/bhyve/ (props changed) projects/sendfile/usr.sbin/bhyvectl/ (props changed) projects/sendfile/usr.sbin/bhyveload/ (props changed) projects/sendfile/usr.sbin/jail/ (props changed) projects/sendfile/usr.sbin/rtadvctl/ (props changed) projects/sendfile/usr.sbin/rtadvd/ (props changed) projects/sendfile/usr.sbin/rtsold/ (props changed) Modified: projects/sendfile/Makefile ============================================================================== --- projects/sendfile/Makefile Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/Makefile Fri Apr 10 10:20:14 2015 (r281365) @@ -165,10 +165,10 @@ _MAKE= PATH=${PATH} ${SUB_MAKE} -f Makef # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) -_TARGET_ARCH= ${TARGET:S/pc98/i386/} +_TARGET_ARCH= ${TARGET:S/pc98/i386/:S/arm64/aarch64/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} -_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/} +_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/} .endif .if defined(TARGET) && !defined(_TARGET) _TARGET=${TARGET} Modified: projects/sendfile/Makefile.inc1 ============================================================================== --- projects/sendfile/Makefile.inc1 Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/Makefile.inc1 Fri Apr 10 10:20:14 2015 (r281365) @@ -149,7 +149,7 @@ SRCRELDATE!= awk '/^\#define[[:space:]]* VERSION= FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE} .endif -KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 +KNOWN_ARCHES?= aarch64/arm64 amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -209,7 +209,9 @@ INSTALLTMP!= /usr/bin/mktemp -d -u -t in # 1. legacy stage [BMAKE] # This stage is responsible for creating compatibility # shims that are needed by the bootstrap-tools, -# build-tools and cross-tools stages. +# build-tools and cross-tools stages. These are generally +# APIs that tools from one of those three stages need to +# build that aren't present on the host. # 1. bootstrap-tools stage [BMAKE] # This stage is responsible for creating programs that # are needed for backward compatibility reasons. They @@ -220,7 +222,7 @@ INSTALLTMP!= /usr/bin/mktemp -d -u -t in # the build process. # 3. cross-tools stage [XMAKE] # This stage is responsible for creating any tools that -# are needed for cross-builds. A cross-compiler is one +# are needed for building the system. A cross-compiler is one # of them. # 4. world stage [WMAKE] # This stage actually builds the world. @@ -259,7 +261,8 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \ -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \ - MK_LLDB=no MK_TESTS=no + MK_LLDB=no MK_TESTS=no \ + MK_INCLUDES=yes # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ @@ -341,7 +344,8 @@ X${COMPILER}?= ${${COMPILER}} .endfor XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS .for BINUTIL in ${XBINUTILS} -.if defined(CROSS_BINUTILS_PREFIX) +.if defined(CROSS_BINUTILS_PREFIX) && \ + exists(${CROSS_BINUTILS_PREFIX}${${BINUTIL}}) X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}} .else X${BINUTIL}?= ${${BINUTIL}} @@ -381,9 +385,9 @@ DEPFLAGS+= -I${WORLDTMP}/usr/include/c++ TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XCFLAGS+= -target ${TARGET_TRIPLE} +.endif XCFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} XCXXFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} -.endif .else .if defined(CROSS_BINUTILS_PREFIX) && exists(${CROSS_BINUTILS_PREFIX}) BFLAGS+= -B${CROSS_BINUTILS_PREFIX} @@ -408,8 +412,9 @@ LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} LIB32WMAKEENV= MACHINE=i386 MACHINE_ARCH=i386 \ MACHINE_CPU="i686 mmx sse sse2" LIB32WMAKEFLAGS= \ - AS="${AS} --32" \ - LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" + AS="${XAS} --32" \ + LD="${XLD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + OBJCOPY="${XOBJCOPY}" .elif ${TARGET_ARCH} == "powerpc64" .if empty(TARGET_CPUTYPE) @@ -419,7 +424,8 @@ LIB32CPUFLAGS= -mcpu=${TARGET_CPUTYPE} .endif LIB32WMAKEENV= MACHINE=powerpc MACHINE_ARCH=powerpc LIB32WMAKEFLAGS= \ - LD="${LD} -m elf32ppc_fbsd" + LD="${XLD} -m elf32ppc_fbsd" \ + OBJCOPY="${XOBJCOPY}" .endif @@ -1221,7 +1227,9 @@ update: # # -# legacy: Build compatibility shims for the next three targets +# legacy: Build compatibility shims for the next three targets. This is a minimal +# set of tools and shims necessary to compensate for older systems which don't have +# the APIs that the targets built in bootstrap-tools, build-tools or cross-tools. # legacy: .if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0 @@ -1239,7 +1247,10 @@ legacy: .endfor # -# bootstrap-tools: Build tools needed for compatibility +# bootstrap-tools: Build tools needed for compatibility. These are binaries that +# are built to build other binaries in the system. However, the focus of these +# binaries is usually quite narrow. Bootstrap tools use the host's compiler and +# libraries, augmented by -legacy. # _bt= _bootstrap-tools @@ -1445,7 +1456,9 @@ kernel-tools: .MAKE -p ${MAKEOBJDIRPREFIX}/usr >/dev/null # -# cross-tools: Build cross-building tools +# cross-tools: All the tools needed to build the rest of the system after +# we get done with the earlier stages. It is the last set of tools needed +# to begin building the target binaries. # .if ${TARGET_ARCH} != ${MACHINE_ARCH} .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" @@ -1476,6 +1489,11 @@ _elftctools= lib/libelftc \ # cross-build on a FreeBSD 10 host: _elftctools+= usr.bin/addr2line .endif +.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_TOOLS} != "no" +# If cross-building with an external binutils we still need to build strip for +# the target (for at least crunchide). +_elftctools= lib/libelftc \ + usr.bin/elfcopy .endif # If an full path to an external cross compiler is given, don't build @@ -1685,6 +1703,10 @@ gnu/lib/libstdc++__L: lib/msun__L gnu/lib/libsupc++__L: gnu/lib/libstdc++__L .endif +.if ${MK_LIBCPLUSPLUS} != "no" +_prebuild_libs+= lib/libc++ +.endif + lib/libgeom__L: lib/libexpat__L .if ${MK_LIBTHR} != "no" Modified: projects/sendfile/ObsoleteFiles.inc ============================================================================== --- projects/sendfile/ObsoleteFiles.inc Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/ObsoleteFiles.inc Fri Apr 10 10:20:14 2015 (r281365) @@ -38,6 +38,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20150329 +.if ${TARGET_ARCH} == "arm" +OLD_FILES+=usr/include/bootconfig.h +.endif +# 20150326 +OLD_FILES+=usr/share/man/man1/pmcstudy.1.gz # 20150315: new clang import which bumps version from 3.5.1 to 3.6.0. OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_aes.h OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_pclmul.h Modified: projects/sendfile/UPDATING ============================================================================== --- projects/sendfile/UPDATING Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/UPDATING Fri Apr 10 10:20:14 2015 (r281365) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150324: + From legacy ata(4) driver was removed support for SATA controllers + supported by more functional drivers ahci(4), siis(4) and mvs(4). + Kernel modules ataahci and ataadaptec were removed completely, + replaced by ahci and mvs modules respectively. + 20150315: Clang, llvm and lldb have been upgraded to 3.6.0 release. Please see the 20141231 entry below for information about prerequisites and Modified: projects/sendfile/bin/cp/utils.c ============================================================================== --- projects/sendfile/bin/cp/utils.c Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/bin/cp/utils.c Fri Apr 10 10:20:14 2015 (r281365) @@ -342,7 +342,7 @@ setfile(struct stat *fs, int fd) tspec[0] = fs->st_atim; tspec[1] = fs->st_mtim; - if (utimensat(AT_FDCWD, to.p_path, tspec, + if (fdval ? futimens(fd, tspec) : utimensat(AT_FDCWD, to.p_path, tspec, islink ? AT_SYMLINK_NOFOLLOW : 0)) { warn("utimensat: %s", to.p_path); rval = 1; Modified: projects/sendfile/bin/expr/Makefile ============================================================================== --- projects/sendfile/bin/expr/Makefile Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/bin/expr/Makefile Fri Apr 10 10:20:14 2015 (r281365) @@ -6,6 +6,9 @@ PROG= expr SRCS= expr.y YFLAGS= +# expr relies on signed integer wrapping +CFLAGS+= -fwrapv + NO_WMISSING_VARIABLE_DECLARATIONS= .if ${MK_TESTS} != "no" Modified: projects/sendfile/bin/mv/mv.c ============================================================================== --- projects/sendfile/bin/mv/mv.c Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/bin/mv/mv.c Fri Apr 10 10:20:14 2015 (r281365) @@ -352,7 +352,7 @@ err: if (unlink(to)) ts[0] = sbp->st_atim; ts[1] = sbp->st_mtim; - if (utimensat(AT_FDCWD, to, ts, 0)) + if (futimens(to_fd, ts)) warn("%s: set times", to); if (close(to_fd)) { Modified: projects/sendfile/bin/pax/ar_io.c ============================================================================== --- projects/sendfile/bin/pax/ar_io.c Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/bin/pax/ar_io.c Fri Apr 10 10:20:14 2015 (r281365) @@ -82,7 +82,7 @@ static int wr_trail = 1; /* trailer was static int can_unlnk = 0; /* do we unlink null archives? */ const char *arcname; /* printable name of archive */ const char *gzip_program; /* name of gzip program */ -static pid_t zpid = -1; /* pid of child process */ +static pid_t zpid = -1; /* pid of child process */ static int get_phys(void); static void ar_start_gzip(int, const char *, int); @@ -1123,7 +1123,7 @@ ar_next(void) if (sigprocmask(SIG_SETMASK, &o_mask, NULL) < 0) syswarn(0, errno, "Unable to restore signal mask"); - if (done || !wr_trail || strcmp(NM_TAR, argv0) == 0) + if (done || !wr_trail || Oflag || strcmp(NM_TAR, argv0) == 0) return(-1); tty_prnt("\nATTENTION! %s archive volume change required.\n", argv0); Modified: projects/sendfile/bin/pax/extern.h ============================================================================== --- projects/sendfile/bin/pax/extern.h Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/bin/pax/extern.h Fri Apr 10 10:20:14 2015 (r281365) @@ -217,6 +217,7 @@ extern int vflag; extern int Dflag; extern int Hflag; extern int Lflag; +extern int Oflag; extern int Xflag; extern int Yflag; extern int Zflag; Modified: projects/sendfile/bin/pax/options.c ============================================================================== --- projects/sendfile/bin/pax/options.c Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/bin/pax/options.c Fri Apr 10 10:20:14 2015 (r281365) @@ -194,7 +194,7 @@ pax_options(int argc, char **argv) /* * process option flags */ - while ((c=getopt(argc,argv,"ab:cdf:iklno:p:rs:tuvwx:zB:DE:G:HLPT:U:XYZ")) + while ((c=getopt(argc,argv,"ab:cdf:iklno:p:rs:tuvwx:zB:DE:G:HLOPT:U:XYZ")) != -1) { switch (c) { case 'a': @@ -447,6 +447,12 @@ pax_options(int argc, char **argv) Lflag = 1; flg |= CLF; break; + case 'O': + /* + * Force one volume. Non standard option. + */ + Oflag = 1; + break; case 'P': /* * do NOT follow symlinks (default) @@ -584,7 +590,7 @@ tar_options(int argc, char **argv) { int c; int fstdin = 0; - int Oflag = 0; + int tar_Oflag = 0; int nincfiles = 0; int incfiles_max = 0; struct incfile { @@ -664,7 +670,7 @@ tar_options(int argc, char **argv) if (opt_add("write_opt=nodir") < 0) tar_usage(); case 'O': - Oflag = 1; + tar_Oflag = 1; break; case 'p': /* @@ -820,8 +826,8 @@ tar_options(int argc, char **argv) * (unless -o specified) */ if (act == ARCHIVE || act == APPND) - frmt = &(fsub[Oflag ? F_OTAR : F_TAR]); - else if (Oflag) { + frmt = &(fsub[tar_Oflag ? F_OTAR : F_TAR]); + else if (tar_Oflag) { paxwarn(1, "The -O/-o options are only valid when writing an archive"); tar_usage(); /* only valid when writing */ } @@ -1526,25 +1532,25 @@ no_op(void) void pax_usage(void) { - (void)fputs("usage: pax [-cdnvz] [-E limit] [-f archive] ", stderr); + (void)fputs("usage: pax [-cdnOvz] [-E limit] [-f archive] ", stderr); (void)fputs("[-s replstr] ... [-U user] ...", stderr); (void)fputs("\n [-G group] ... ", stderr); (void)fputs("[-T [from_date][,to_date]] ... ", stderr); (void)fputs("[pattern ...]\n", stderr); - (void)fputs(" pax -r [-cdiknuvzDYZ] [-E limit] ", stderr); + (void)fputs(" pax -r [-cdiknOuvzDYZ] [-E limit] ", stderr); (void)fputs("[-f archive] [-o options] ... \n", stderr); (void)fputs(" [-p string] ... [-s replstr] ... ", stderr); (void)fputs("[-U user] ... [-G group] ...\n ", stderr); (void)fputs("[-T [from_date][,to_date]] ... ", stderr); (void)fputs(" [pattern ...]\n", stderr); - (void)fputs(" pax -w [-dituvzHLPX] [-b blocksize] ", stderr); + (void)fputs(" pax -w [-dituvzHLOPX] [-b blocksize] ", stderr); (void)fputs("[ [-a] [-f archive] ] [-x format] \n", stderr); (void)fputs(" [-B bytes] [-s replstr] ... ", stderr); (void)fputs("[-o options] ... [-U user] ...", stderr); (void)fputs("\n [-G group] ... ", stderr); (void)fputs("[-T [from_date][,to_date][/[c][m]]] ... ", stderr); (void)fputs("[file ...]\n", stderr); - (void)fputs(" pax -r -w [-diklntuvDHLPXYZ] ", stderr); + (void)fputs(" pax -r -w [-diklntuvDHLOPXYZ] ", stderr); (void)fputs("[-p string] ... [-s replstr] ...", stderr); (void)fputs("\n [-U user] ... [-G group] ... ", stderr); (void)fputs("[-T [from_date][,to_date][/[c][m]]] ... ", stderr); Modified: projects/sendfile/bin/pax/pax.1 ============================================================================== --- projects/sendfile/bin/pax/pax.1 Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/bin/pax/pax.1 Fri Apr 10 10:20:14 2015 (r281365) @@ -33,7 +33,7 @@ .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd December 21, 2013 +.Dd March 17, 2015 .Dt PAX 1 .Os .Sh NAME @@ -41,7 +41,7 @@ .Nd read and write file archives and copy directory hierarchies .Sh SYNOPSIS .Nm -.Op Fl cdnvz +.Op Fl cdnvzO .Bk -words .Op Fl f Ar archive .Ek @@ -68,7 +68,7 @@ .Op Ar pattern ...\& .Nm .Fl r -.Op Fl cdiknuvzDYZ +.Op Fl cdiknuvzDOYZ .Bk -words .Op Fl f Ar archive .Ek @@ -104,7 +104,7 @@ .Op Ar pattern ...\& .Nm .Fl w -.Op Fl dituvzHLPX +.Op Fl dituvzHLOPX .Bk -words .Op Fl b Ar blocksize .Ek @@ -147,7 +147,7 @@ .Nm .Fl r .Fl w -.Op Fl diklntuvDHLPXYZ +.Op Fl diklntuvDHLOPXYZ .Bk -words .Op Fl p Ar string .Ar ...\& @@ -853,6 +853,13 @@ Follow only command line symbolic links system traversal. .It Fl L Follow all symbolic links to perform a logical file system traversal. +.It Fl O +Force the archive to be one volume. +If a volume ends prematurely, +.Nm +will not prompt for a new volume. +This option can be useful for +automated tasks where error recovery cannot be performed by a human. .It Fl P Do not follow symbolic links, perform a physical file system traversal. This is the default mode. @@ -1176,6 +1183,7 @@ The options .Fl G , .Fl H , .Fl L , +.Fl O , .Fl P , .Fl T , .Fl U , Modified: projects/sendfile/bin/pax/pax.c ============================================================================== --- projects/sendfile/bin/pax/pax.c Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/bin/pax/pax.c Fri Apr 10 10:20:14 2015 (r281365) @@ -85,6 +85,7 @@ int vflag; /* produce verbose output * int Dflag; /* same as uflag except inode change time */ int Hflag; /* follow command line symlinks (write only) */ int Lflag; /* follow symlinks when writing */ +int Oflag; /* limit to single volume */ int Xflag; /* archive files with same device id only */ int Yflag; /* same as Dflg except after name mode */ int Zflag; /* same as uflg except after name mode */ Modified: projects/sendfile/bin/ps/print.c ============================================================================== --- projects/sendfile/bin/ps/print.c Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/bin/ps/print.c Fri Apr 10 10:20:14 2015 (r281365) @@ -383,7 +383,6 @@ started(KINFO *k, VARENT *ve __unused) { time_t then; struct tm *tp; - static int use_ampm = -1; size_t buflen = 100; char *buf; @@ -394,16 +393,12 @@ started(KINFO *k, VARENT *ve __unused) if (buf == NULL) errx(1, "malloc failed"); - if (use_ampm < 0) - use_ampm = (*nl_langinfo(T_FMT_AMPM) != '\0'); then = k->ki_p->ki_start.tv_sec; tp = localtime(&then); if (now - k->ki_p->ki_start.tv_sec < 24 * 3600) { - (void)strftime(buf, buflen, - use_ampm ? "%l:%M%p" : "%k:%M ", tp); + (void)strftime(buf, buflen, "%H:%M ", tp); } else if (now - k->ki_p->ki_start.tv_sec < 7 * 86400) { - (void)strftime(buf, buflen, - use_ampm ? "%a%I%p" : "%a%H ", tp); + (void)strftime(buf, buflen, "%a%H ", tp); } else (void)strftime(buf, buflen, "%e%b%y", tp); return (buf); Modified: projects/sendfile/bin/ps/ps.1 ============================================================================== --- projects/sendfile/bin/ps/ps.1 Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/bin/ps/ps.1 Fri Apr 10 10:20:14 2015 (r281365) @@ -381,12 +381,12 @@ the real memory (resident set) size of t The time the command started. If the command started less than 24 hours ago, the start time is displayed using the -.Dq Li %l:ps.1p +.Dq Li %H:%M format described in .Xr strftime 3 . If the command started less than 7 days ago, the start time is displayed using the -.Dq Li %a6.15p +.Dq Li %a%H format. Otherwise, the start time is displayed using the .Dq Li %e%b%y Modified: projects/sendfile/bin/sh/tests/expansion/Makefile ============================================================================== --- projects/sendfile/bin/sh/tests/expansion/Makefile Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/bin/sh/tests/expansion/Makefile Fri Apr 10 10:20:14 2015 (r281365) @@ -49,6 +49,8 @@ FILES+= ifs2.0 FILES+= ifs3.0 FILES+= ifs4.0 FILES+= ifs5.0 +FILES+= ifs6.0 +FILES+= ifs7.0 FILES+= length1.0 FILES+= length2.0 FILES+= length3.0 Copied: projects/sendfile/bin/sh/tests/expansion/ifs6.0 (from r281364, head/bin/sh/tests/expansion/ifs6.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/bin/sh/tests/expansion/ifs6.0 Fri Apr 10 10:20:14 2015 (r281365, copy of r281364, head/bin/sh/tests/expansion/ifs6.0) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +IFS=': ' +x=': :' +set -- $x +[ "$#|$1|$2|$3" = "2|||" ] Copied: projects/sendfile/bin/sh/tests/expansion/ifs7.0 (from r281364, head/bin/sh/tests/expansion/ifs7.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/bin/sh/tests/expansion/ifs7.0 Fri Apr 10 10:20:14 2015 (r281365, copy of r281364, head/bin/sh/tests/expansion/ifs7.0) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +IFS=2 +set -- $((123)) +[ "$#|$1|$2|$3" = "2|1|3|" ] Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d Fri Apr 10 10:20:14 2015 (r281365) @@ -35,11 +35,11 @@ BEGIN this->b = -2; system("echo %s %d %d", "foo", this->a, this->b); - system("ping localhost"); + system("ping -q -c 1 localhost 2>/dev/null | grep -v '^round-trip '"); system("echo %d", ++this->a); - system("ping localhost"); + system("ping -q -c 1 localhost 2>/dev/null | grep -v '^round-trip '"); system("echo %d", ++this->a); - system("ping localhost"); + system("ping -q -c 1 localhost 2>/dev/null | grep -v '^round-trip '"); system("echo %d", ++this->a); exit(0); } Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out Fri Apr 10 10:20:14 2015 (r281365) @@ -1,8 +1,17 @@ foo 9 -2 -localhost is alive +PING localhost (127.0.0.1): 56 data bytes + +--- localhost ping statistics --- +1 packets transmitted, 1 packets received, 0.0% packet loss 10 -localhost is alive +PING localhost (127.0.0.1): 56 data bytes + +--- localhost ping statistics --- +1 packets transmitted, 1 packets received, 0.0% packet loss 11 -localhost is alive +PING localhost (127.0.0.1): 56 data bytes + +--- localhost ping statistics --- +1 packets transmitted, 1 packets received, 0.0% packet loss 12 Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh Fri Apr 10 10:20:14 2015 (r281365) @@ -45,12 +45,13 @@ fi dtrace=$1 local=127.0.0.1 -$dtrace -c "/sbin/ping $local 3" -qs /dev/stdin <ip_saddr == "$local" && args[2]->ip_daddr == "$local" && args[4]->ipv4_protocol == IPPROTO_ICMP/ { - printf("1 ip:::send ("); + printf("2 ip:::send ("); printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength); printf("args[4]: %d %d %d %d %d)\n", args[4]->ipv4_ver, args[4]->ipv4_length, args[4]->ipv4_flags, @@ -61,7 +62,7 @@ ip:::receive /args[2]->ip_saddr == "$local" && args[2]->ip_daddr == "$local" && args[4]->ipv4_protocol == IPPROTO_ICMP/ { - printf("2 ip:::receive ("); + printf("3 ip:::receive ("); printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength); printf("args[4]: %d %d %d %d %d)\n", args[4]->ipv4_ver, args[4]->ipv4_length, args[4]->ipv4_flags, Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out Fri Apr 10 10:20:14 2015 (r281365) @@ -1,6 +1,8 @@ -1 ip:::send (args[2]: 4 64, args[4]: 4 84 0 0 255) -1 ip:::send (args[2]: 4 64, args[4]: 4 84 0 0 255) -2 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 255) -2 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 255) -127.0.0.1 is alive + +PING 127.0.0.1 (127.0.0.1): 56 data bytes +1 packets transmitted, 1 packets received, 0.0% packet loss +2 ip:::send (args[2]: 4 64, args[4]: 4 84 0 0 64) +2 ip:::send (args[2]: 4 64, args[4]: 4 84 0 0 64) +3 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 64) +3 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 64) Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh Fri Apr 10 10:20:14 2015 (r281365) @@ -73,6 +73,7 @@ cat > test.pl <<-EOPERL Timeout => 3); die "Could not connect to host $local port $tcpport" unless \$s; close \$s; + sleep(2); EOPERL $dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin < test.pl <<-EOPERL Timeout => 3); die "Could not connect to host $dest port $tcpport" unless \$s; close \$s; + sleep(2); EOPERL $dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <ip_saddr == "$local" && args[2]->ip_daddr == "$local" && args[5]->ipv6_nexthdr == IPPROTO_ICMPV6/ { - printf("1 ip:::send ("); + printf("2 ip:::send ("); printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength); printf("args[5]: %d %d %d)\n", args[5]->ipv6_ver, args[5]->ipv6_tclass, args[5]->ipv6_plen); @@ -70,7 +71,7 @@ ip:::receive /args[2]->ip_saddr == "$local" && args[2]->ip_daddr == "$local" && args[5]->ipv6_nexthdr == IPPROTO_ICMPV6/ { - printf("2 ip:::receive ("); + printf("3 ip:::receive ("); printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength); printf("args[5]: %d %d %d)\n", args[5]->ipv6_ver, args[5]->ipv6_tclass, args[5]->ipv6_plen); Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out Fri Apr 10 10:20:14 2015 (r281365) @@ -1,6 +1,8 @@ -::1 is alive -1 ip:::send (args[2]: 6 64, args[5]: 6 0 64) -1 ip:::send (args[2]: 6 64, args[5]: 6 0 64) -2 ip:::receive (args[2]: 6 64, args[5]: 6 0 64) -2 ip:::receive (args[2]: 6 64, args[5]: 6 0 64) + +PING6(56=40+8+8 bytes) ::1 --> ::1 +1 packets transmitted, 1 packets received, 0.0% packet loss +2 ip:::send (args[2]: 6 16, args[5]: 6 0 16) +2 ip:::send (args[2]: 6 16, args[5]: 6 0 16) +3 ip:::receive (args[2]: 6 16, args[5]: 6 0 16) +3 ip:::receive (args[2]: 6 16, args[5]: 6 0 16) Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh Fri Apr 10 10:20:14 2015 (r281365) @@ -79,6 +79,7 @@ cat > test.pl <<-EOPERL die "Could not connect to host $local port $tcpport" unless \$s; print \$s "testing state machine transitions"; close \$s; + sleep(2); EOPERL $dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin < test.pl <<-EOPERL die "Could not connect to host $dest port $tcpport" unless \$s; print \$s "testing state machine transitions"; close \$s; + sleep(2); EOPERL $dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <e_type == ET_DYN ? (uintptr_t) lmp->l_addr : 0; +#ifdef __FreeBSD__ + dh.dofhp_pid = getpid(); +#endif if (lmid == 0) { (void) snprintf(dh.dofhp_mod, sizeof (dh.dofhp_mod), @@ -184,7 +187,7 @@ dtrace_dof_init(void) else { dprintf(1, "DTrace ioctl succeeded for DOF at %p\n", dof); #ifdef __FreeBSD__ - gen = dh.gen; + gen = dh.dofhp_gen; #endif } Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Fri Apr 10 10:20:14 2015 (r281365) @@ -727,8 +727,8 @@ dt_print_packed(dtrace_hdl_t *dtp, FILE utf8 = B_TRUE; } else if ((term = getenv("TERM")) != NULL && (strcmp(term, "sun") == 0 || - strcmp(term, "sun-color") == 0) || - strcmp(term, "dumb") == 0) { + strcmp(term, "sun-color") == 0 || + strcmp(term, "dumb") == 0)) { utf8 = B_FALSE; } else { utf8 = B_TRUE; Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Fri Apr 10 10:20:14 2015 (r281365) @@ -1785,11 +1785,17 @@ dtrace_program_link(dtrace_hdl_t *dtp, d "failed to open %s: %s", file, strerror(errno))); } #else - snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file); - if ((fd = mkstemp(tfile)) == -1) - return (dt_link_error(dtp, NULL, -1, NULL, - "failed to create temporary file %s: %s", - tfile, strerror(errno))); + if (dtp->dt_lazyload) { + if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0666)) < 0) + return (dt_link_error(dtp, NULL, -1, NULL, + "failed to open %s: %s", file, strerror(errno))); + } else { + snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file); + if ((fd = mkstemp(tfile)) == -1) + return (dt_link_error(dtp, NULL, -1, NULL, + "failed to create temporary file %s: %s", + tfile, strerror(errno))); + } #endif /* Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Fri Apr 10 10:20:14 2015 (r281365) @@ -44,10 +44,15 @@ #include #include #include +#include + #ifndef illumos +#include +#include #include +#include +#include #endif -#include typedef struct dt_pid_probe { dtrace_hdl_t *dpp_dtp; @@ -566,6 +571,12 @@ dt_pid_usdt_mapping(void *data, const pr prsyminfo_t sip; dof_helper_t dh; GElf_Half e_type; +#ifdef __FreeBSD__ + dof_hdr_t hdr; + size_t sz; + uint64_t dofmax; + void *dof; +#endif const char *mname; const char *syms[] = { "___SUNW_dof", "__SUNW_dof" }; int i, fd = -1; @@ -595,17 +606,61 @@ dt_pid_usdt_mapping(void *data, const pr continue; } - dh.dofhp_dof = sym.st_value; +#ifdef __FreeBSD__ dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr; + if (Pread(P, &hdr, sizeof (hdr), sym.st_value) != + sizeof (hdr)) { + dt_dprintf("read of DOF header failed\n"); + continue; + } + + sz = sizeof(dofmax); + if (sysctlbyname("kern.dtrace.dof_maxsize", &dofmax, &sz, + NULL, 0) != 0) { + dt_dprintf("failed to read dof_maxsize: %s\n", + strerror(errno)); + continue; + } + if (dofmax < hdr.dofh_loadsz) { + dt_dprintf("DOF load size exceeds maximum\n"); + continue; + } + + if ((dof = malloc(hdr.dofh_loadsz)) == NULL) + return (-1); + + if (Pread(P, dof, hdr.dofh_loadsz, sym.st_value) != + hdr.dofh_loadsz) { + free(dof); + dt_dprintf("read of DOF section failed\n"); + continue; + } + + dh.dofhp_dof = (uintptr_t)dof; + dh.dofhp_pid = proc_getpid(P); dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod), -#ifdef illumos sip.prs_lmid, mname); + + if (fd == -1 && + (fd = open("/dev/dtrace/helper", O_RDWR, 0)) < 0) { + dt_dprintf("open of helper device failed: %s\n", + strerror(errno)); + free(dof); + return (-1); /* errno is set for us */ + } + + if (ioctl(fd, DTRACEHIOC_ADDDOF, &dh, sizeof (dh)) < 0) + dt_dprintf("DOF was rejected for %s\n", dh.dofhp_mod); + + free(dof); #else - 0, mname); -#endif + dh.dofhp_dof = sym.st_value; + dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr; + + dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod), + sip.prs_lmid, mname); -#ifdef illumos if (fd == -1 && (fd = pr_open(P, "/dev/dtrace/helper", O_RDWR, 0)) < 0) { dt_dprintf("pr_open of helper device failed: %s\n", @@ -618,8 +673,10 @@ dt_pid_usdt_mapping(void *data, const pr #endif } -#ifdef illumos if (fd != -1) +#ifdef __FreeBSD__ + (void) close(fd); +#else (void) pr_close(P, fd); #endif @@ -634,7 +691,6 @@ dt_pid_create_usdt_probes(dtrace_probede int ret = 0; assert(DT_MUTEX_HELD(&dpr->dpr_lock)); -#ifdef illumos (void) Pupdate_maps(P); if (Pobject_iter(P, dt_pid_usdt_mapping, P) != 0) { ret = -1; @@ -646,9 +702,6 @@ dt_pid_create_usdt_probes(dtrace_probede (int)proc_getpid(P), strerror(errno)); #endif } -#else - ret = 0; -#endif /* * Put the module name in its canonical form. Modified: projects/sendfile/cddl/lib/libdtrace/libproc_compat.h ============================================================================== --- projects/sendfile/cddl/lib/libdtrace/libproc_compat.h Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/cddl/lib/libdtrace/libproc_compat.h Fri Apr 10 10:20:14 2015 (r281365) @@ -59,6 +59,6 @@ #define Pstate proc_state #define Psymbol_iter_by_addr proc_iter_symbyaddr #define Punsetflags proc_clearflags -#define Pupdate_maps(p) do { } while (0) +#define Pupdate_maps proc_rdagent #define Pupdate_syms proc_updatesyms #define Pxecbkpt proc_bkptexec Modified: projects/sendfile/cddl/usr.bin/ctfmerge/Makefile ============================================================================== --- projects/sendfile/cddl/usr.bin/ctfmerge/Makefile Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/cddl/usr.bin/ctfmerge/Makefile Fri Apr 10 10:20:14 2015 (r281365) @@ -33,7 +33,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -DPADD= ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} -LDADD= -ldwarf -lelf -lz -lpthread +LIBADD= elf z pthread .include Modified: projects/sendfile/cddl/usr.sbin/dtrace/tests/Makefile ============================================================================== --- projects/sendfile/cddl/usr.sbin/dtrace/tests/Makefile Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/cddl/usr.sbin/dtrace/tests/Makefile Fri Apr 10 10:20:14 2015 (r281365) @@ -8,10 +8,8 @@ TESTS_SUBDIRS+= common .PATH: ${.CURDIR:H:H:H:H}/tests KYUAFILE= YES -.PATH: ${.CURDIR:H:H:H}/contrib/opensolaris/cmd/dtrace/test/cmd/scripts +.PATH: ${.CURDIR}/tools SCRIPTSDIR= ${TESTSDIR} -SCRIPTS= dtest.pl - -SUBDIR_PARALLEL= +SCRIPTS= dtest.sh .include Modified: projects/sendfile/cddl/usr.sbin/dtrace/tests/Makefile.inc1 ============================================================================== --- projects/sendfile/cddl/usr.sbin/dtrace/tests/Makefile.inc1 Fri Apr 10 09:52:17 2015 (r281364) +++ projects/sendfile/cddl/usr.sbin/dtrace/tests/Makefile.inc1 Fri Apr 10 10:20:14 2015 (r281365) @@ -16,7 +16,6 @@ ${TESTGROUP}EXEDIR= ${TESTSDIR} TESTWRAPPER= t_dtrace_contrib ATF_TESTS_SH+= ${TESTWRAPPER} -TEST_METADATA.t_dtrace_contrib+= required_files="/usr/local/bin/perl" TEST_METADATA.t_dtrace_contrib+= required_files="/usr/local/bin/ksh" TEST_METADATA.t_dtrace_contrib+= required_user="root" Copied: projects/sendfile/cddl/usr.sbin/dtrace/tests/tools/dtest.sh (from r281364, head/cddl/usr.sbin/dtrace/tests/tools/dtest.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/cddl/usr.sbin/dtrace/tests/tools/dtest.sh Fri Apr 10 10:20:14 2015 (r281365, copy of r281364, head/cddl/usr.sbin/dtrace/tests/tools/dtest.sh) @@ -0,0 +1,129 @@ +# $FreeBSD$ + +usage() +{ + cat >&2 <<__EOF__ +A harness for test cases in the DTrace test suite. + +usage: $(basename $0) +__EOF__ + exit 1 +} + +gettag() +{ + local tag + + tag=$(basename $1) + tag=${tag#*.} + tag=${tag%%[a-z.]*} + echo $tag +} + +runtest() +{ + local dflags exe exstatus pid retval status + + exstatus=0 + retval=0 + + case $TFILE in + drp.DTRACEDROP_*.d|err.*.d|tst.*.d) + case $TFILE in + drp.DTRACEDROP_*.d) + dflags="-x droptags" + tag=$(gettag "$TFILE") + ;; + err.D_*.d) + exstatus=1 + dflags="-x errtags" + tag=$(gettag "$TFILE") + ;; + err.*.d) + exstatus=1 + ;; + esac + + exe=${TFILE%.*}.exe + if [ -f "$exe" -a -x "$exe" ]; then + ./$exe & + pid=$! + dflags="$dflags ${pid}" + fi + + dtrace -C -s "${TFILE}" $dflags >$STDOUT 2>$STDERR + status=$? + + if [ $status -ne $exstatus ]; then + ERRMSG="dtrace exited with status ${status}, expected ${exstatus}" + retval=1 + elif [ -n "${tag}" ] && ! grep -Fq " [${tag}] " ${STDERR}; then + ERRMSG="dtrace's error output did not contain expected tag ${tag}" + retval=1 + fi + + if [ -n "$pid" ]; then + kill -0 $pid >/dev/null 2>&1 && kill -9 $pid >/dev/null 2>&1 + wait + fi + ;; + err.*.ksh|tst.*.ksh) + expr "$TFILE" : 'err.*' >/dev/null && exstatus=1 + + ksh "$TFILE" /usr/sbin/dtrace >$STDOUT 2>$STDERR + status=$? + + if [ $status -ne $exstatus ]; then + ERRMSG="script exited with status ${status}, expected ${exstatus}" + retval=1 + fi + ;; + *) + ERRMSG="unexpected test file name $TFILE" + retval=1 + ;; + esac + + return $retval +} + +[ $# -eq 1 ] || usage + +readonly STDERR=$(mktemp) +readonly STDOUT=$(mktemp) +readonly TFILE=$(basename $1) +readonly EXOUT=${TFILE}.out + +kldstat -q -m dtrace_test || kldload dtrace_test +cd $(dirname $1) +runtest +RESULT=$? + +if [ $RESULT -eq 0 -a -f $EXOUT -a -r $EXOUT ] && \ + ! cmp $STDOUT $EXOUT >/dev/null 2>&1; then + ERRMSG="test output mismatch" + RESULT=1 +fi + +if [ $RESULT -ne 0 ]; then + echo "test $TFILE failed: $ERRMSG" >&2 + if [ $(stat -f '%z' $STDOUT) -gt 0 ]; then + cat >&2 <<__EOF__ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Apr 10 10:23:53 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 55A79BD7; Fri, 10 Apr 2015 10:23:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 40F61E00; Fri, 10 Apr 2015 10:23:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3AANrep012619; Fri, 10 Apr 2015 10:23:53 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3AANrKn012618; Fri, 10 Apr 2015 10:23:53 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504101023.t3AANrKn012618@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 10 Apr 2015 10:23:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281366 - projects/sendfile/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Apr 2015 10:23:53 -0000 Author: glebius Date: Fri Apr 10 10:23:52 2015 New Revision: 281366 URL: https://svnweb.freebsd.org/changeset/base/281366 Log: Set VNET context in sf_iodone(). Submitted by: emax Sponsored by: Netflix Modified: projects/sendfile/sys/kern/uipc_syscalls.c Modified: projects/sendfile/sys/kern/uipc_syscalls.c ============================================================================== --- projects/sendfile/sys/kern/uipc_syscalls.c Fri Apr 10 10:20:14 2015 (r281365) +++ projects/sendfile/sys/kern/uipc_syscalls.c Fri Apr 10 10:23:52 2015 (r281366) @@ -2114,9 +2114,12 @@ sf_iodone(void *arg, vm_page_t *pg, int m = sfio->m; for (int i = 0; i < sfio->npages; i++) m = m_free(m); - } else + } else { + CURVNET_SET(so->so_vnet); (void )(so->so_proto->pr_usrreqs->pru_ready)(so, sfio->m, sfio->npages); + CURVNET_RESTORE(); + } /* XXXGL: curthread */ fdrop(sfio->sock_fp, curthread);