From owner-p4-projects@FreeBSD.ORG Mon Oct 20 21:28:09 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15D1FF77; Mon, 20 Oct 2014 21:28:09 +0000 (UTC) Delivered-To: perforce@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 CABA4F75 for ; Mon, 20 Oct 2014 21:28:08 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682: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 B6E76CFA for ; Mon, 20 Oct 2014 21:28:08 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s9KLS8EP093674 for ; Mon, 20 Oct 2014 21:28:08 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s9KLS8cb093671 for perforce@freebsd.org; Mon, 20 Oct 2014 21:28:08 GMT (envelope-from jmg@freebsd.org) Date: Mon, 20 Oct 2014 21:28:08 GMT Message-Id: <201410202128.s9KLS8cb093671@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1201823 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Oct 2014 21:28:09 -0000 http://p4web.freebsd.org/@@1201823?ac=10 Change 1201823 by jmg@jmg_carbon2 on 2014/10/20 21:27:22 cast [ani]bytes to uint64_t so that the *8 doesn't overflow them... This ups the size limit from 512MB-1 to 4GB-1... The original Intel code used int (signed) so their limit was slightly smaller... Submitted by: Mike Hamburg (reviewer) Sponsored by: FreeBSD Foundation Sponsored by: Netgate Affected files ... .. //depot/projects/opencrypto/sys/crypto/aesni/aesni_ghash.c#5 edit Differences ... ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni_ghash.c#5 (text+ko) ==== @@ -314,7 +314,7 @@ Y = _mm_xor_si128(Y, tmp1); gfmul(Y, H, &Y); } - tmp1 = _mm_insert_epi64(tmp1, ibytes*8, 0); + tmp1 = _mm_insert_epi64(tmp1, (uint64_t)ibytes*8, 0); tmp1 = _mm_insert_epi64(tmp1, 0, 1); Y = _mm_xor_si128(Y, tmp1); @@ -496,8 +496,8 @@ X = _mm_xor_si128(X, tmp1); gfmul(X, H, &X); } - tmp1 = _mm_insert_epi64(tmp1, nbytes*8, 0); - tmp1 = _mm_insert_epi64(tmp1, abytes*8, 1); + tmp1 = _mm_insert_epi64(tmp1, (uint64_t)nbytes*8, 0); + tmp1 = _mm_insert_epi64(tmp1, (uint64_t)abytes*8, 1); X = _mm_xor_si128(X, tmp1); gfmul(X,H,&X); @@ -572,7 +572,7 @@ Y = _mm_xor_si128(Y, tmp1); gfmul(Y, H, &Y); } - tmp1 = _mm_insert_epi64(tmp1, ibytes*8, 0); + tmp1 = _mm_insert_epi64(tmp1, (uint64_t)ibytes*8, 0); tmp1 = _mm_insert_epi64(tmp1, 0, 1); Y = _mm_xor_si128(Y, tmp1); @@ -651,8 +651,8 @@ gfmul(X, H, &X); } - tmp1 = _mm_insert_epi64(tmp1, nbytes*8, 0); - tmp1 = _mm_insert_epi64(tmp1, abytes*8, 1); + tmp1 = _mm_insert_epi64(tmp1, (uint64_t)nbytes*8, 0); + tmp1 = _mm_insert_epi64(tmp1, (uint64_t)abytes*8, 1); X = _mm_xor_si128(X, tmp1); gfmul(X,H,&X); From owner-p4-projects@FreeBSD.ORG Tue Oct 21 17:23:52 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 703CFF25; Tue, 21 Oct 2014 17:23:52 +0000 (UTC) Delivered-To: perforce@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 323EDF23 for ; Tue, 21 Oct 2014 17:23:52 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682: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 1E6A3BE2 for ; Tue, 21 Oct 2014 17:23:52 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s9LHNpJn007883 for ; Tue, 21 Oct 2014 17:23:51 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s9LHNpPl007880 for perforce@freebsd.org; Tue, 21 Oct 2014 17:23:51 GMT (envelope-from jmg@freebsd.org) Date: Tue, 21 Oct 2014 17:23:51 GMT Message-Id: <201410211723.s9LHNpPl007880@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1201867 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Oct 2014 17:23:52 -0000 http://p4web.freebsd.org/@@1201867?ac=10 Change 1201867 by jmg@jmg_carbon2 on 2014/10/21 17:22:57 add the same optimizations to mbufs that is in iovecs... If there is only one mbuf in the chain, use it directly... This should significantly help IPsec performance, especially with small packets... change some casts to properly match types... Sponsored by: FreeBSD Foundation Sponsored by: Netgate Idea by: eri Affected files ... .. //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#11 edit Differences ... ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#11 (text+ko) ==== @@ -369,20 +369,24 @@ aesni_cipher_alloc(struct cryptodesc *enccrd, struct cryptop *crp, int *allocated) { + struct mbuf *m; struct uio *uio; struct iovec *iov; uint8_t *addr; - if (crp->crp_flags & CRYPTO_F_IMBUF) - goto alloc; - else if (crp->crp_flags & CRYPTO_F_IOV) { + if (crp->crp_flags & CRYPTO_F_IMBUF) { + m = (struct mbuf *)crp->crp_buf; + if (m->m_next != NULL) + goto alloc; + addr = mtod(m, uint8_t); + } else if (crp->crp_flags & CRYPTO_F_IOV) { uio = (struct uio *)crp->crp_buf; if (uio->uio_iovcnt != 1) goto alloc; iov = uio->uio_iov; - addr = (u_char *)iov->iov_base + enccrd->crd_skip; + addr = (uint8_t *)iov->iov_base + enccrd->crd_skip; } else - addr = (u_char *)crp->crp_buf; + addr = (uint8_t *)crp->crp_buf; *allocated = 0; return (addr); From owner-p4-projects@FreeBSD.ORG Tue Oct 21 17:27:57 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8146ACA; Tue, 21 Oct 2014 17:27:57 +0000 (UTC) Delivered-To: perforce@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 41D70C8 for ; Tue, 21 Oct 2014 17:27:57 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682: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 2B6F9C09 for ; Tue, 21 Oct 2014 17:27:57 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s9LHRvL9008200 for ; Tue, 21 Oct 2014 17:27:57 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s9LHRu4x008197 for perforce@freebsd.org; Tue, 21 Oct 2014 17:27:56 GMT (envelope-from jmg@freebsd.org) Date: Tue, 21 Oct 2014 17:27:56 GMT Message-Id: <201410211727.s9LHRu4x008197@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1201868 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Oct 2014 17:27:57 -0000 http://p4web.freebsd.org/@@1201868?ac=10 Change 1201868 by jmg@jmg_carbon2 on 2014/10/21 17:26:59 IFC @1201866 Affected files ... .. //depot/projects/opencrypto/share/man/man4/Makefile#4 integrate .. //depot/projects/opencrypto/share/man/man4/igb.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/vt.4#3 integrate .. //depot/projects/opencrypto/share/man/man4/vxlan.4#1 branch .. //depot/projects/opencrypto/share/man/man5/src.conf.5#4 integrate .. //depot/projects/opencrypto/share/man/man8/Makefile#2 integrate .. //depot/projects/opencrypto/share/man/man8/uefi.8#1 branch .. //depot/projects/opencrypto/share/man/man9/Makefile#4 integrate .. //depot/projects/opencrypto/share/man/man9/hash.9#2 integrate .. //depot/projects/opencrypto/share/man/man9/mbuf.9#2 integrate .. //depot/projects/opencrypto/share/man/man9/sysctl.9#4 integrate .. //depot/projects/opencrypto/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/opencrypto/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/opencrypto/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/opencrypto/sys/amd64/include/vmm.h#4 integrate .. //depot/projects/opencrypto/sys/amd64/include/vmm_instruction_emul.h#2 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/amd/amdv.c#2 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/amd/npt.c#1 branch .. //depot/projects/opencrypto/sys/amd64/vmm/amd/npt.h#1 branch .. //depot/projects/opencrypto/sys/amd64/vmm/amd/svm.c#1 branch .. //depot/projects/opencrypto/sys/amd64/vmm/amd/svm.h#1 branch .. //depot/projects/opencrypto/sys/amd64/vmm/amd/svm_genassym.c#1 branch .. //depot/projects/opencrypto/sys/amd64/vmm/amd/svm_msr.c#1 branch .. //depot/projects/opencrypto/sys/amd64/vmm/amd/svm_msr.h#1 branch .. //depot/projects/opencrypto/sys/amd64/vmm/amd/svm_softc.h#1 branch .. //depot/projects/opencrypto/sys/amd64/vmm/amd/svm_support.S#1 branch .. //depot/projects/opencrypto/sys/amd64/vmm/amd/vmcb.c#1 branch .. //depot/projects/opencrypto/sys/amd64/vmm/amd/vmcb.h#1 branch .. //depot/projects/opencrypto/sys/amd64/vmm/intel/vmx.c#3 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/intel/vmx_support.S#2 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/io/vlapic.c#3 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/vmm.c#4 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/vmm_instruction_emul.c#5 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/x86.c#3 integrate .. //depot/projects/opencrypto/sys/arm/altera/socfpga/files.socfpga#3 integrate .. //depot/projects/opencrypto/sys/arm/arm/busdma_machdep-v6.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/dump_machdep.c#3 integrate .. //depot/projects/opencrypto/sys/arm/arm/elf_note.S#1 branch .. //depot/projects/opencrypto/sys/arm/arm/locore.S#4 integrate .. //depot/projects/opencrypto/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/opencrypto/sys/arm/broadcom/bcm2835/bcm2835_bsc.c#2 integrate .. //depot/projects/opencrypto/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c#3 integrate .. //depot/projects/opencrypto/sys/arm/conf/BEAGLEBONE#4 integrate .. //depot/projects/opencrypto/sys/arm/conf/SOCKIT#3 integrate .. //depot/projects/opencrypto/sys/arm/conf/SOCKIT-BERI#1 branch .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx6_anatop.c#3 integrate .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx6_ccm.c#3 integrate .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx_gpt.c#2 integrate .. //depot/projects/opencrypto/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/opencrypto/sys/arm/ti/am335x/am335x_gpio.c#1 branch .. //depot/projects/opencrypto/sys/arm/ti/am335x/am335x_scm_padconf.c#3 integrate .. //depot/projects/opencrypto/sys/arm/ti/am335x/am335x_scm_padconf.h#1 branch .. //depot/projects/opencrypto/sys/arm/ti/am335x/files.am335x#3 integrate .. //depot/projects/opencrypto/sys/arm/ti/files.ti#3 integrate .. //depot/projects/opencrypto/sys/arm/ti/omap4/files.omap4#3 integrate .. //depot/projects/opencrypto/sys/arm/ti/omap4/omap4_gpio.c#1 branch .. //depot/projects/opencrypto/sys/arm/ti/omap4/omap4_scm_padconf.c#3 integrate .. //depot/projects/opencrypto/sys/arm/ti/omap4/omap4_scm_padconf.h#1 branch .. //depot/projects/opencrypto/sys/arm/ti/ti_gpio.c#3 integrate .. //depot/projects/opencrypto/sys/arm/ti/ti_gpio.h#1 branch .. //depot/projects/opencrypto/sys/arm/ti/ti_gpio_if.m#1 branch .. //depot/projects/opencrypto/sys/arm/ti/ti_i2c.c#4 integrate .. //depot/projects/opencrypto/sys/arm/ti/ti_scm.h#2 integrate .. //depot/projects/opencrypto/sys/arm/ti/ti_wdt.c#1 branch .. //depot/projects/opencrypto/sys/arm/ti/ti_wdt.h#1 branch .. //depot/projects/opencrypto/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/opencrypto/sys/boot/fdt/dts/arm/am335x.dtsi#2 integrate .. //depot/projects/opencrypto/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts#1 branch .. //depot/projects/opencrypto/sys/boot/fdt/dts/arm/socfpga-sockit.dts#3 integrate .. //depot/projects/opencrypto/sys/boot/fdt/fdt_loader_cmd.c#2 integrate .. //depot/projects/opencrypto/sys/boot/i386/gptzfsboot/gptzfsboot.8#2 integrate .. //depot/projects/opencrypto/sys/cam/ata/ata_da.c#4 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl.c#5 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_debug.h#2 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_private.h#5 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_scsi_all.c#2 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_util.c#3 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_util.h#3 integrate .. //depot/projects/opencrypto/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/opencrypto/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/dev/dtrace/dtrace_sysctl.c#2 integrate .. //depot/projects/opencrypto/sys/compat/freebsd32/freebsd32.h#3 integrate .. //depot/projects/opencrypto/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/opencrypto/sys/conf/Makefile.arm#5 integrate .. //depot/projects/opencrypto/sys/conf/NOTES#4 integrate .. //depot/projects/opencrypto/sys/conf/files#9 integrate .. //depot/projects/opencrypto/sys/conf/files.arm#4 integrate .. //depot/projects/opencrypto/sys/conf/files.powerpc#3 integrate .. //depot/projects/opencrypto/sys/conf/kmod.mk#3 integrate .. //depot/projects/opencrypto/sys/contrib/rdma/krping/krping.c#3 integrate .. //depot/projects/opencrypto/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/opencrypto/sys/dev/acpi_support/acpi_asus_wmi.c#2 integrate .. //depot/projects/opencrypto/sys/dev/acpi_support/acpi_hp.c#2 integrate .. //depot/projects/opencrypto/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/opencrypto/sys/dev/acpi_support/acpi_rapidstart.c#2 integrate .. //depot/projects/opencrypto/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/opencrypto/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/opencrypto/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/opencrypto/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/opencrypto/sys/dev/ata/chipsets/ata-jmicron.c#2 integrate .. //depot/projects/opencrypto/sys/dev/beri/beri_ring.c#1 branch .. //depot/projects/opencrypto/sys/dev/bxe/bxe.c#4 integrate .. //depot/projects/opencrypto/sys/dev/cfe/cfe_env.c#2 integrate .. //depot/projects/opencrypto/sys/dev/cfi/cfi_core.c#2 integrate .. //depot/projects/opencrypto/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/opencrypto/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h#2 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/t4_main.c#4 integrate .. //depot/projects/opencrypto/sys/dev/drm2/drm_crtc_helper.c#2 integrate .. //depot/projects/opencrypto/sys/dev/e1000/if_em.c#4 integrate .. //depot/projects/opencrypto/sys/dev/e1000/if_igb.c#4 integrate .. //depot/projects/opencrypto/sys/dev/e1000/if_lem.c#4 integrate .. //depot/projects/opencrypto/sys/dev/fdt/simplebus.c#5 integrate .. //depot/projects/opencrypto/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/opencrypto/sys/dev/iicbus/adm1030.c#1 branch .. //depot/projects/opencrypto/sys/dev/iscsi/iscsi.c#4 integrate .. //depot/projects/opencrypto/sys/dev/ixgbe/ixgbe.c#5 integrate .. //depot/projects/opencrypto/sys/dev/ixgbe/ixv.c#4 integrate .. //depot/projects/opencrypto/sys/dev/ixl/if_ixl.c#3 integrate .. //depot/projects/opencrypto/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/opencrypto/sys/dev/mii/micphy.c#1 branch .. //depot/projects/opencrypto/sys/dev/mii/miidevs#2 integrate .. //depot/projects/opencrypto/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/opencrypto/sys/dev/mpr/mpr.c#2 integrate .. //depot/projects/opencrypto/sys/dev/mps/mps.c#2 integrate .. //depot/projects/opencrypto/sys/dev/mrsas/mrsas.c#3 integrate .. //depot/projects/opencrypto/sys/dev/mrsas/mrsas.h#4 integrate .. //depot/projects/opencrypto/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/opencrypto/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/opencrypto/sys/dev/nvram2env/nvram2env.c#2 integrate .. //depot/projects/opencrypto/sys/dev/oce/oce_sysctl.c#2 integrate .. //depot/projects/opencrypto/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/opencrypto/sys/dev/pci/pci.c#4 integrate .. //depot/projects/opencrypto/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/opencrypto/sys/dev/qlxgb/qla_os.c#3 integrate .. //depot/projects/opencrypto/sys/dev/qlxgbe/ql_os.c#3 integrate .. //depot/projects/opencrypto/sys/dev/re/if_re.c#4 integrate .. //depot/projects/opencrypto/sys/dev/rt/if_rt.c#4 integrate .. //depot/projects/opencrypto/sys/dev/sound/pci/hda/hdaa.c#2 integrate .. //depot/projects/opencrypto/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/controller/ehci_pci.c#3 integrate .. //depot/projects/opencrypto/sys/dev/usb/controller/xhci_pci.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/opencrypto/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/opencrypto/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/opencrypto/sys/dev/vt/vt_core.c#5 integrate .. //depot/projects/opencrypto/sys/dev/vxge/vxge.c#4 integrate .. //depot/projects/opencrypto/sys/dev/xen/netfront/netfront.c#3 integrate .. //depot/projects/opencrypto/sys/fs/autofs/autofs.c#3 integrate .. //depot/projects/opencrypto/sys/fs/autofs/autofs.h#3 integrate .. //depot/projects/opencrypto/sys/fs/autofs/autofs_ioctl.h#2 integrate .. //depot/projects/opencrypto/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/opencrypto/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/opencrypto/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/opencrypto/sys/fs/fuse/fuse_main.c#2 integrate .. //depot/projects/opencrypto/sys/fs/fuse/fuse_vfsops.c#2 integrate .. //depot/projects/opencrypto/sys/fs/nfsclient/nfs_clvfsops.c#2 integrate .. //depot/projects/opencrypto/sys/fs/nfsserver/nfs_nfsdsubs.c#2 integrate .. //depot/projects/opencrypto/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/opencrypto/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/opencrypto/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/opencrypto/sys/geom/geom_dev.c#4 integrate .. //depot/projects/opencrypto/sys/geom/geom_dump.c#2 integrate .. //depot/projects/opencrypto/sys/geom/geom_kern.c#2 integrate .. //depot/projects/opencrypto/sys/geom/raid/g_raid.c#2 integrate .. //depot/projects/opencrypto/sys/geom/sched/g_sched.c#2 integrate .. //depot/projects/opencrypto/sys/i386/i386/bios.c#2 integrate .. //depot/projects/opencrypto/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/opencrypto/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/kern/init_main.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_cpuset.c#3 integrate .. //depot/projects/opencrypto/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/opencrypto/sys/kern/kern_environment.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_exec.c#4 integrate .. //depot/projects/opencrypto/sys/kern/kern_intr.c#3 integrate .. //depot/projects/opencrypto/sys/kern/kern_linker.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_mib.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_proc.c#5 integrate .. //depot/projects/opencrypto/sys/kern/kern_synch.c#3 integrate .. //depot/projects/opencrypto/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/opencrypto/sys/kern/link_elf.c#2 integrate .. //depot/projects/opencrypto/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/opencrypto/sys/kern/sched_ule.c#4 integrate .. //depot/projects/opencrypto/sys/kern/subr_devstat.c#2 integrate .. //depot/projects/opencrypto/sys/kern/subr_hints.c#2 integrate .. //depot/projects/opencrypto/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/opencrypto/sys/kern/subr_param.c#2 integrate .. //depot/projects/opencrypto/sys/kern/subr_prof.c#2 integrate .. //depot/projects/opencrypto/sys/kern/subr_uio.c#2 integrate .. //depot/projects/opencrypto/sys/kern/subr_witness.c#4 integrate .. //depot/projects/opencrypto/sys/kern/tty_pts.c#3 integrate .. //depot/projects/opencrypto/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/opencrypto/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/opencrypto/sys/kern/vfs_mountroot.c#2 integrate .. //depot/projects/opencrypto/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/opencrypto/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/opencrypto/sys/libkern/explicit_bzero.c#4 integrate .. //depot/projects/opencrypto/sys/libkern/murmur3_32.c#2 integrate .. //depot/projects/opencrypto/sys/mips/atheros/ar71xx_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/mips/beri/beri_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/mips/mips/busdma_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/mips/nlm/xlp_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/mips/rmi/xlr_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/mips/rt305x/rt305x_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/modules/Makefile#5 integrate .. //depot/projects/opencrypto/sys/modules/if_vxlan/Makefile#1 branch .. //depot/projects/opencrypto/sys/modules/linux/Makefile#4 integrate .. //depot/projects/opencrypto/sys/modules/qlxgb/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/qlxgbe/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/qlxge/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/vmm/Makefile#3 integrate .. //depot/projects/opencrypto/sys/net/if_lagg.c#4 integrate .. //depot/projects/opencrypto/sys/net/if_stf.c#5 integrate .. //depot/projects/opencrypto/sys/net/if_vxlan.c#1 branch .. //depot/projects/opencrypto/sys/net/if_vxlan.h#1 branch .. //depot/projects/opencrypto/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/opencrypto/sys/net80211/ieee80211_hwmp.c#2 integrate .. //depot/projects/opencrypto/sys/net80211/ieee80211_mesh.c#3 integrate .. //depot/projects/opencrypto/sys/net80211/ieee80211_superg.c#3 integrate .. //depot/projects/opencrypto/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 integrate .. //depot/projects/opencrypto/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/opencrypto/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/cc/cc_chd.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_header.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_input.c#6 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_input.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/opencrypto/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/opencrypto/sys/netpfil/ipfw/ip_fw_private.h#3 integrate .. //depot/projects/opencrypto/sys/netpfil/ipfw/ip_fw_sockopt.c#4 integrate .. //depot/projects/opencrypto/sys/netpfil/ipfw/ip_fw_table.c#3 integrate .. //depot/projects/opencrypto/sys/netpfil/pf/pf.c#5 integrate .. //depot/projects/opencrypto/sys/nfs/bootp_subr.c#2 integrate .. //depot/projects/opencrypto/sys/nfs/nfs_diskless.c#2 integrate .. //depot/projects/opencrypto/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/core/addr.c#3 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/core/agent.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/core/ucm.c#3 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/core/uverbs_main.c#3 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mlx4/ah.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mthca/mthca_config_reg.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mthca/mthca_uar.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/Makefile#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/en_ethtool.c#3 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/en_frag.c#2 delete .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/en_netdev.c#4 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/en_params.c#2 delete .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/en_selftest.c#3 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/en_tx.c#3 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/mlx4_en.h#3 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/pd.c#4 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/xrcd.c#3 delete .. //depot/projects/opencrypto/sys/ofed/include/asm/page.h#3 delete .. //depot/projects/opencrypto/sys/ofed/include/linux/completion.h#3 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/etherdevice.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/ethtool.h#3 delete .. //depot/projects/opencrypto/sys/ofed/include/linux/inet.h#3 delete .. //depot/projects/opencrypto/sys/ofed/include/linux/linux_compat.c#4 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/mlx4/device.h#3 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/mlx4/driver.h#3 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/mount.h#3 delete .. //depot/projects/opencrypto/sys/ofed/include/linux/netdevice.h#3 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/scatterlist.h#3 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/vmalloc.h#3 integrate .. //depot/projects/opencrypto/sys/ofed/include/rdma/ib_addr.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/rdma/ib_smi.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/rdma/ib_user_cm.h#2 integrate .. //depot/projects/opencrypto/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/opencrypto/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/opencrypto/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/opencrypto/sys/powerpc/powermac/fcu.c#2 integrate .. //depot/projects/opencrypto/sys/powerpc/powermac/pmu.c#3 integrate .. //depot/projects/opencrypto/sys/powerpc/powermac/smu.c#2 integrate .. //depot/projects/opencrypto/sys/powerpc/powermac/windtunnel.c#2 delete .. //depot/projects/opencrypto/sys/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/opencrypto/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/opencrypto/sys/sys/bitset.h#2 integrate .. //depot/projects/opencrypto/sys/sys/cpuset.h#3 integrate .. //depot/projects/opencrypto/sys/sys/elf_common.h#3 integrate .. //depot/projects/opencrypto/sys/sys/hash.h#3 integrate .. //depot/projects/opencrypto/sys/sys/linker.h#2 integrate .. //depot/projects/opencrypto/sys/sys/mman.h#4 integrate .. //depot/projects/opencrypto/sys/sys/mount.h#4 integrate .. //depot/projects/opencrypto/sys/sys/param.h#4 integrate .. //depot/projects/opencrypto/sys/sys/priv.h#2 integrate .. //depot/projects/opencrypto/sys/sys/proc.h#4 integrate .. //depot/projects/opencrypto/sys/sys/sysctl.h#2 integrate .. //depot/projects/opencrypto/sys/sys/systm.h#4 integrate .. //depot/projects/opencrypto/sys/sys/user.h#3 integrate .. //depot/projects/opencrypto/sys/sys/vnode.h#4 integrate .. //depot/projects/opencrypto/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/opencrypto/sys/ufs/ufs/ufs_quota.c#3 integrate .. //depot/projects/opencrypto/sys/vm/memguard.c#2 integrate .. //depot/projects/opencrypto/sys/vm/vm_kern.c#3 integrate .. //depot/projects/opencrypto/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/opencrypto/sys/vm/vm_page.c#4 integrate .. //depot/projects/opencrypto/sys/x86/include/specialreg.h#4 integrate .. //depot/projects/opencrypto/sys/x86/iommu/busdma_dmar.c#2 integrate .. //depot/projects/opencrypto/sys/x86/x86/busdma_bounce.c#2 integrate .. //depot/projects/opencrypto/sys/x86/x86/tsc.c#3 integrate .. //depot/projects/opencrypto/sys/x86/xen/pv.c#3 integrate Differences ... ==== //depot/projects/opencrypto/share/man/man4/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: head/share/man/man4/Makefile 272168 2014-09-26 09:54:57Z gavin $ +# $FreeBSD: head/share/man/man4/Makefile 273331 2014-10-20 14:42:42Z bryanv $ .include @@ -567,6 +567,7 @@ ${_virtio_scsi.4} \ vkbd.4 \ vlan.4 \ + vxlan.4 \ ${_vmx.4} \ vpo.4 \ vr.4 \ @@ -743,6 +744,7 @@ MLINKS+=${_urtw.4} ${_if_urtw.4} MLINKS+=vge.4 if_vge.4 MLINKS+=vlan.4 if_vlan.4 +MLINKS+=vxlan.4 if_vxlan.4 MLINKS+=${_vmx.4} ${_if_vmx.4} MLINKS+=vpo.4 imm.4 MLINKS+=vr.4 if_vr.4 ==== //depot/projects/opencrypto/share/man/man4/igb.4#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.\" $FreeBSD: head/share/man/man4/igb.4 267938 2014-06-26 21:46:14Z bapt $ +.\" $FreeBSD: head/share/man/man4/igb.4 273197 2014-10-16 23:07:09Z gavin $ .\" -.Dd March 25, 2013 +.Dd October 17, 2014 .Dt IGB 4 .Os .Sh NAME @@ -55,7 +55,8 @@ The .Nm driver provides support for PCI Express Gigabit Ethernet adapters -based on the Intel 82575 and 82576 Ethernet controller chips. +based on the Intel 82575, 82576, 82580, i21x and i35x +Ethernet controller chips. The driver supports Transmit/Receive checksum offload and Jumbo Frames. Furthermore it supports TCP segmentation offload (TSO) on all @@ -142,6 +143,12 @@ Intel Gigabit ET Dual Port Server Adapter (82576) .It Intel Gigabit VT Quad Port Server Adapter (82575) +.It +Intel Single, Dual and Quad Gigabit Ethernet Controller (82580) +.It +Intel i210 and i211 Gigabit Ethernet Controller +.It +Intel i350 and i354 Gigabit Ethernet Controller .El .Sh LOADER TUNABLES Tunables can be set at the ==== //depot/projects/opencrypto/share/man/man4/vt.4#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man4/vt.4 270647 2014-08-26 08:13:30Z se $ +.\" $FreeBSD: head/share/man/man4/vt.4 273332 2014-10-20 14:48:20Z emaste $ .\" -.Dd July 2, 2014 +.Dd October 20, 2014 .Dt "VIRTUAL TERMINALS" 4 .Os .Sh NAME @@ -45,7 +45,15 @@ .Xr loader.conf 5 : .Cd hw.vga.textmode=1 .Cd kern.vty=vt -.Cd kern.vt.spclkeys=15 +.Pp +In +.Xr loader.conf 5 or +.Xr sysctl.conf 5 : +.Cd kern.vt.kbd_halt=1 +.Cd kern.vt.kbd_poweroff=1 +.Cd kern.vt.kbd_reboot=1 +.Cd kern.vt.kbd_debug=1 +.Cd kern.vt.kbd_panic=0 .Sh DESCRIPTION The .Nm @@ -185,30 +193,41 @@ Features that require graphics mode, like loadable fonts, will be disabled. .It Va kern.vty -When both -.Nm -and -.Xr sc 4 have been compiled into the kernel, the one to use for the -system console can be selected by setting this value to +Set this value to .Ql vt or -.Ql sc . -If this value is not set, +.Ql sc +to override the default driver used for the system console. +By default, .Xr sc 4 -is used. -.It Va kern.vt.spclkeys -bitmap of allowed special keys. 1 is enabled, 0 is disabled. Encoded as: -.Bl -tag -compact -width 0x000000 -.It 0x0001 -Debug request key combination. (Ctrl+Alt+Esc) -.It 0x0002 -Reboot. (Ctrl+Alt+Del) -.It 0x0004 -Halt. -.It 0x0008 -Power down. -.El -Default is 15, all enabled. +is used on computers that boot from BIOS, and +.Nm +is used on computers that boot from UEFI. +.Sh KEYBOARD SYSCTL TUNABLES +These settings control whether certain special key combinations are enabled or +ignored. +The specific key combinations can be configured by using a +.Xr keymap 5 +file. +.Pp +These settings can be entered at the +.Xr loader 8 +prompt or in +.Xr loader.conf 5 +and can also be changed at runtime with the +.Xr sysctl 8 +command. +.Bl -tag -width indent +.It Va kern.vt.kbd_halt +Enable halt keyboard combination. +.It Va kern.vt.kbd_poweroff +Enable power off key combination. +.It Va kern.vt.kbd_reboot. +Enable reboot key combination, usually Ctrl+Alt+Del. +.It Va kern.vt.kbd_debug +Enable debug request key combination, usually Ctrl+Alt+Esc. +.It Va kern.vt.kbd_panic +Enable panic key combination. .El .Sh FILES .Bl -tag -width /usr/share/vt/keymaps/* -compact @@ -254,7 +273,8 @@ .Xr getty 8 , .Xr kbdmux 8 , .Xr kldload 8 , -.Xr moused 8 +.Xr moused 8 , +.Xr vtfontcvt 8 .Sh HISTORY The .Nm ==== //depot/projects/opencrypto/share/man/man5/src.conf.5#4 (text) ==== @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des -.\" $FreeBSD: head/share/man/man5/src.conf.5 271494 2014-09-13 02:18:54Z delphij $ -.Dd September 12, 2014 +.\" $FreeBSD: head/share/man/man5/src.conf.5 273173 2014-10-16 15:59:00Z brooks $ +.Dd October 16, 2014 .Dt SRC.CONF 5 .Os .Sh NAME @@ -100,9 +100,6 @@ .Xr apm 8 , .Xr apmd 8 and related programs. -.It Va WITHOUT_ARM_EABI -.\" from FreeBSD: head/tools/build/options/WITHOUT_ARM_EABI 253396 2013-07-16 19:15:19Z andrew -Set the ARM ABI to OABI. .It Va WITHOUT_ASSERT_DEBUG .\" from FreeBSD: head/tools/build/options/WITHOUT_ASSERT_DEBUG 162215 2006-09-11 13:55:27Z ru Set to compile programs and libraries without the @@ -525,15 +522,6 @@ .It Va WITHOUT_HYPERV .\" from FreeBSD: head/tools/build/options/WITHOUT_HYPERV 271493 2014-09-13 02:15:31Z delphij Set to not build or install HyperV utilities. -.Pp -It is a default setting on -arm/arm, arm/armeb, arm/armv6, arm/armv6hf, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64. -.It Va WITH_HYPERV -.\" from FreeBSD: head/tools/build/options/WITH_HYPERV 271493 2014-09-13 02:15:31Z delphij -Set to build and install HyperV utilities. -.Pp -It is a default setting on -amd64/amd64, i386/i386 and pc98/i386. .It Va WITHOUT_ICONV .\" from FreeBSD: head/tools/build/options/WITHOUT_ICONV 254919 2013-08-26 17:15:56Z antoine Set to not build iconv as part of libc. @@ -1058,8 +1046,8 @@ .Va WITHOUT_GROFF .El .It Va WITHOUT_TOOLCHAIN -.\" from FreeBSD: head/tools/build/options/WITHOUT_TOOLCHAIN 174550 2007-12-12 16:43:17Z ru -Set to not install +.\" from FreeBSD: head/tools/build/options/WITHOUT_TOOLCHAIN 273172 2014-10-16 15:55:13Z brooks +Set to not install header or programs used for program development, compilers, debuggers etc. .Bf -symbolic ==== //depot/projects/opencrypto/share/man/man8/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: head/share/man/man8/Makefile 263106 2014-03-13 05:17:53Z gjb $ +# $FreeBSD: head/share/man/man8/Makefile 273235 2014-10-17 18:16:40Z emaste $ MAN= crash.8 \ diskless.8 \ @@ -11,6 +11,7 @@ rc.sendmail.8 \ rc.subr.8 \ rescue.8 \ + ${_uefi.8} \ yp.8 MLINKS= rc.8 rc.atm.8 \ @@ -25,4 +26,8 @@ yp.8 nis.8 \ yp.8 YP.8 +.if ${MACHINE_CPUARCH} == "amd64" +_uefi.8= uefi.8 +.endif + .include ==== //depot/projects/opencrypto/share/man/man9/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/man/man9/Makefile 271992 2014-09-22 19:14:27Z lwhsu $ +# $FreeBSD: head/share/man/man9/Makefile 273377 2014-10-21 07:31:21Z hselasky $ MAN= accept_filter.9 \ accf_data.9 \ @@ -1499,6 +1499,7 @@ sysctl.9 SYSCTL_ADD_ROOT_NODE.9 \ sysctl.9 SYSCTL_ADD_STRING.9 \ sysctl.9 SYSCTL_ADD_STRUCT.9 \ + sysctl.9 SYSCTL_ADD_UAUTO.9 \ sysctl.9 SYSCTL_ADD_UINT.9 \ sysctl.9 SYSCTL_ADD_ULONG.9 \ sysctl.9 SYSCTL_ADD_UQUAD.9 \ ==== //depot/projects/opencrypto/share/man/man9/hash.9#2 (text) ==== @@ -24,9 +24,9 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: hash.9,v 1.5 2003/04/17 05:08:39 jmc Exp $ -.\" $FreeBSD: head/share/man/man9/hash.9 240086 2012-09-04 12:07:33Z glebius $ +.\" $FreeBSD: head/share/man/man9/hash.9 273268 2014-10-18 22:15:11Z des $ .\" -.Dd September 4, 2012 +.Dd October 18, 2014 .Dt HASH 9 .Os .Sh NAME @@ -37,8 +37,10 @@ .Nm hash32_strn , .Nm hash32_stre , .Nm hash32_strne , +.Nm jenkins_hash , .Nm jenkins_hash32 , -.Nm jenkins_hash +.Nm murmur3_32_hash , +.Nm murmur3_32_hash32 .Nd general kernel hashing functions .Sh SYNOPSIS .In sys/hash.h @@ -56,6 +58,10 @@ .Fn jenkins_hash "const void *buf" "size_t len" "uint32_t hash" .Ft uint32_t .Fn jenkins_hash32 "const uint32_t *buf" "size_t count" "uint32_t hash" +.Ft uint32_t +.Fn murmur3_32_hash "const void *buf" "size_t len" "uint32_t hash" +.Ft uint32_t +.Fn murmur3_32_hash32 "const uint32_t *buf" "size_t count" "uint32_t hash" .Sh DESCRIPTION The .Fn hash32 @@ -130,6 +136,16 @@ It accepts an array of .Ft uint32_t values in its first argument and size of this array in the second argument. +.Pp +The +.Fn murmur3_32_hash +and +.Fn murmur3_32_hash32 +functions are similar to +.Fn jenkins_hash +and +.Fn jenkins_hash32 , +but implement the 32-bit version of MurmurHash3. .Sh RETURN VALUES The .Fn hash32 @@ -185,6 +201,10 @@ .Nm jenkins_hash functions were added in .Fx 10.0 . +The +.Nm murmur3_32_hash +functions were added in +.Fx 10.1 . .Sh AUTHORS The .Nm hash32 @@ -192,5 +212,9 @@ .An Tobias Weingartner . The .Nm jenkins_hash -functions was written by -Bob Jenkins . +functions were written by +.An Bob Jenkins . +The +.Nm murmur3_32_hash +functions were written by +.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org . ==== //depot/projects/opencrypto/share/man/man9/mbuf.9#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/mbuf.9 267091 2014-06-05 03:16:23Z kevlo $ +.\" $FreeBSD: head/share/man/man9/mbuf.9 273388 2014-10-21 17:17:40Z jmg $ .\" -.Dd June 5, 2014 +.Dd October 21, 2014 .Dt MBUF 9 .Os .\" @@ -738,15 +738,16 @@ to the data contained in the returned mbuf is stored in .Fa *offsetp . If -.Fa offp +.Fa offsetp is NULL, the region may be accessed using .Fn mtod mbuf type . If -.Fa offp +.Fa offsetp is non-NULL, the region may be accessed using -.Fn mtod mbuf uint8_t + *offsetp . +.Fn mtod mbuf uint8_t ++ *offsetp. The region of the mbuf chain between its beginning and -.Fa off +.Fa offset is not modified, therefore it is safe to hold pointers to data within this region before calling .Fn m_pulldown . ==== //depot/projects/opencrypto/share/man/man9/sysctl.9#4 (text) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/sysctl.9 271615 2014-09-15 11:14:23Z glebius $ +.\" $FreeBSD: head/share/man/man9/sysctl.9 273377 2014-10-21 07:31:21Z hselasky $ .\" -.Dd September 15, 2014 +.Dd October 20, 2014 .Dt SYSCTL 9 .Os .Sh NAME @@ -39,6 +39,7 @@ .Nm SYSCTL_ADD_ROOT_NODE , .Nm SYSCTL_ADD_STRING , .Nm SYSCTL_ADD_STRUCT , +.Nm SYSCTL_ADD_UAUTO , .Nm SYSCTL_ADD_UINT , .Nm SYSCTL_ADD_ULONG , .Nm SYSCTL_ADD_UQUAD , @@ -82,7 +83,6 @@ .Fa "const char *name" .Fa "int ctlflags" .Fa "long *ptr" -.Fa "intptr_t val" .Fa "const char *descr" .Fc .Ft struct sysctl_oid * @@ -128,7 +128,6 @@ .Fa "const char *name" .Fa "int ctlflags" .Fa "quad_t *ptr" -.Fa "intptr_t val" .Fa "const char *descr" .Fc .Ft struct sysctl_oid * @@ -181,7 +180,6 @@ .Fa "const char *name" .Fa "int ctlflags" .Fa "unsigned long *ptr" -.Fa "intptr_t val" .Fa "const char *descr" .Fc .Ft struct sysctl_oid * @@ -192,7 +190,16 @@ .Fa "const char *name" .Fa "int ctlflags" .Fa "u_quad_t *ptr" -.Fa "intptr_t val" +.Fa "const char *descr" +.Fc +.Ft struct sysctl_oid * +.Fo SYSCTL_ADD_UAUTO +.Fa "struct sysctl_ctx_list *ctx" +.Fa "struct sysctl_oid_list *parent" +.Fa "int number" +.Fa "const char *name" +.Fa "int ctlflags" +.Fa "void *ptr" .Fa "const char *descr" .Fc .Ft struct sysctl_oid_list * @@ -283,13 +290,13 @@ will be used to get the length of the string at each access to the OID. .It Fa ptr Pointer to sysctl variable or string data. -For sysctl values the pointer can be NULL which means the OID is read-only and the returned value should be taken from the +For sysctl values the pointer can be SYSCTL_NULL_XXX_PTR which means the OID is read-only and the returned value should be taken from the .Fa val argument. .It Fa val If the .Fa ptr -argument is NULL, gives the constant value returned by this OID. +argument is SYSCTL_NULL_XXX_PTR, gives the constant value returned by this OID. Else this argument is not used. .It Fa struct_type Name of structure type. @@ -424,8 +431,9 @@ .Fn SYSCTL_ADD_ROOT_NODE , .Fn SYSCTL_ADD_STRING , .Fn SYSCTL_ADD_STRUCT , +.Fn SYSCTL_ADD_UAUTO , .Fn SYSCTL_ADD_UINT , -.Fn SYSCTL_ADD_ULONG +.Fn SYSCTL_ADD_ULONG , or .Fn SYSCTL_UQUAD functions. @@ -521,10 +529,10 @@ .Bd -literal -offset indent /* * Example of a constant integer value. Notice that the control - * flags are CTLFLAG_RD, the variable pointer is NULL, and the - * value is declared. + * flags are CTLFLAG_RD, the variable pointer is SYSCTL_NULL_INT_PTR, + * and the value is declared. */ -SYSCTL_INT(_debug_sizeof, OID_AUTO, bio, CTLFLAG_RD, NULL, +SYSCTL_INT(_debug_sizeof, OID_AUTO, bio, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, sizeof(struct bio), "sizeof(struct bio)"); /* ==== //depot/projects/opencrypto/sys/amd64/amd64/fpu.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/fpu.c 271924 2014-09-21 09:06:50Z kib $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/fpu.c 273377 2014-10-21 07:31:21Z hselasky $"); #include #include @@ -130,7 +130,7 @@ static void fpu_clean_state(void); SYSCTL_INT(_hw, HW_FLOATINGPT, floatingpoint, CTLFLAG_RD, - NULL, 1, "Floating point instructions executed in hardware"); + SYSCTL_NULL_INT_PTR, 1, "Floating point instructions executed in hardware"); int use_xsave; /* non-static for cpu_switch.S */ uint64_t xsave_mask; /* the same */ ==== //depot/projects/opencrypto/sys/amd64/amd64/machdep.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 272310 2014-09-30 16:46:45Z royger $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 273174 2014-10-16 18:04:43Z davide $"); #include "opt_atpic.h" #include "opt_compat.h" @@ -244,7 +244,7 @@ * We do this by disabling a bit in the SMI_EN (SMI Control and * Enable register) of the Intel ICH LPC Interface Bridge. */ - sysenv = getenv("smbios.system.product"); + sysenv = kern_getenv("smbios.system.product"); if (sysenv != NULL) { if (strncmp(sysenv, "MacBook1,1", 10) == 0 || strncmp(sysenv, "MacBook3,1", 10) == 0 || @@ -276,7 +276,7 @@ * Display physical memory if SMBIOS reports reasonable amount. */ memsize = 0; - sysenv = getenv("smbios.memory.enabled"); + sysenv = kern_getenv("smbios.memory.enabled"); if (sysenv != NULL) { memsize = (uintmax_t)strtoul(sysenv, (char **)NULL, 10) << 10; freeenv(sysenv); @@ -2070,7 +2070,7 @@ thread0.td_pcb->pcb_cr3 = KPML4phys; /* PCID 0 is reserved for kernel */ thread0.td_frame = &proc0_tf; - env = getenv("kernelname"); + env = kern_getenv("kernelname"); if (env != NULL) strlcpy(kernelname, env, sizeof(kernelname)); ==== //depot/projects/opencrypto/sys/amd64/amd64/pmap.c#5 (text+ko) ==== @@ -79,7 +79,7 @@ #define AMD64_NPT_AWARE #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 272761 2014-10-08 16:48:03Z kib $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 273356 2014-10-21 01:06:58Z neel $"); /* * Manages physical address maps. @@ -146,6 +146,13 @@ #endif static __inline boolean_t +pmap_type_guest(pmap_t pmap) +{ + + return ((pmap->pm_type == PT_EPT) || (pmap->pm_type == PT_RVI)); +} + +static __inline boolean_t pmap_emulate_ad_bits(pmap_t pmap) { @@ -159,6 +166,7 @@ switch (pmap->pm_type) { case PT_X86: + case PT_RVI: mask = X86_PG_V; break; case PT_EPT: @@ -181,6 +189,7 @@ switch (pmap->pm_type) { case PT_X86: + case PT_RVI: mask = X86_PG_RW; break; case PT_EPT: @@ -205,6 +214,7 @@ case PT_X86: mask = X86_PG_G; break; + case PT_RVI: case PT_EPT: mask = 0; break; @@ -222,6 +232,7 @@ switch (pmap->pm_type) { case PT_X86: + case PT_RVI: mask = X86_PG_A; break; case PT_EPT: @@ -244,6 +255,7 @@ switch (pmap->pm_type) { case PT_X86: + case PT_RVI: mask = X86_PG_M; break; case PT_EPT: @@ -1103,6 +1115,7 @@ switch (pmap->pm_type) { case PT_X86: + case PT_RVI: /* Verify that both PAT bits are not set at the same time */ KASSERT((entry & x86_pat_bits) != x86_pat_bits, ("Invalid PAT bits in entry %#lx", entry)); @@ -1138,6 +1151,7 @@ switch (pmap->pm_type) { case PT_X86: + case PT_RVI: /* The PAT bit is different for PTE's and PDE's. */ pat_flag = is_pde ? X86_PG_PDE_PAT : X86_PG_PTE_PAT; @@ -1172,6 +1186,7 @@ switch (pmap->pm_type) { case PT_X86: + case PT_RVI: mask = is_pde ? X86_PG_PDE_CACHE : X86_PG_PTE_CACHE; break; case PT_EPT: @@ -1198,6 +1213,7 @@ switch (pmap->pm_type) { case PT_X86: break; + case PT_RVI: case PT_EPT: /* * XXX @@ -1233,7 +1249,7 @@ { pt_entry_t PG_G; - if (pmap->pm_type == PT_EPT) + if (pmap_type_guest(pmap)) return; KASSERT(pmap->pm_type == PT_X86, @@ -1347,7 +1363,7 @@ cpuset_t other_cpus; u_int cpuid; - if (pmap->pm_type == PT_EPT) { + if (pmap_type_guest(pmap)) { pmap_invalidate_ept(pmap); return; } @@ -1425,7 +1441,7 @@ vm_offset_t addr; u_int cpuid; - if (pmap->pm_type == PT_EPT) { + if (pmap_type_guest(pmap)) { pmap_invalidate_ept(pmap); return; } @@ -1484,7 +1500,7 @@ uint64_t cr3; u_int cpuid; - if (pmap->pm_type == PT_EPT) { + if (pmap_type_guest(pmap)) { pmap_invalidate_ept(pmap); return; } @@ -1606,7 +1622,7 @@ cpuid = PCPU_GET(cpuid); other_cpus = all_cpus; CPU_CLR(cpuid, &other_cpus); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 21 18:06:41 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F967301; Tue, 21 Oct 2014 18:06:41 +0000 (UTC) Delivered-To: perforce@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 C3B3A2FF for ; Tue, 21 Oct 2014 18:06:40 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682: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 AF860D6 for ; Tue, 21 Oct 2014 18:06:40 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s9LI6eOA018526 for ; Tue, 21 Oct 2014 18:06:40 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s9LI6ebv018523 for perforce@freebsd.org; Tue, 21 Oct 2014 18:06:40 GMT (envelope-from jmg@freebsd.org) Date: Tue, 21 Oct 2014 18:06:40 GMT Message-Id: <201410211806.s9LI6ebv018523@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1201876 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Oct 2014 18:06:41 -0000 http://p4web.freebsd.org/@@1201876?ac=10 Change 1201876 by jmg@jmg_carbon2 on 2014/10/21 18:05:54 add header needed to compile... mtod casts to the type, not as the docs (previously) said a pointer to the type... Sponsored by: FreeBSD Foundation Sponsored by: Netgate Affected files ... .. //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#12 edit Differences ... ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#12 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -378,7 +379,7 @@ m = (struct mbuf *)crp->crp_buf; if (m->m_next != NULL) goto alloc; - addr = mtod(m, uint8_t); + addr = mtod(m, uint8_t *); } else if (crp->crp_flags & CRYPTO_F_IOV) { uio = (struct uio *)crp->crp_buf; if (uio->uio_iovcnt != 1) From owner-p4-projects@FreeBSD.ORG Fri Oct 24 13:13:34 2014 Return-Path: Delivered-To: p4-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 9E6D49C7 for ; Fri, 24 Oct 2014 13:13:34 +0000 (UTC) Received: from xsmtp04.mail2web.com (xsmtp24.mail2web.com [168.144.250.190]) by mx1.freebsd.org (Postfix) with ESMTP id 37BE8132 for ; Fri, 24 Oct 2014 13:13:33 +0000 (UTC) Received: from [10.5.2.35] (helo=xmail10.myhosting.com) by xsmtp04.mail2web.com with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1Xheg8-0006VG-Ue for p4-projects@freebsd.org; Fri, 24 Oct 2014 09:13:32 -0400 Received: (qmail 18560 invoked from network); 24 Oct 2014 13:13:11 -0000 Received: from unknown (HELO yfntvkiq) (Authenticated-user:_judy.hogan@facadeconcepts.com@[93.72.0.188]) (envelope-sender ) by xmail10.myhosting.com (qmail-ldap-1.03) with ESMTPA for ; 24 Oct 2014 13:13:09 -0000 Message-ID: <9297217279AD8F4C9095DC6460EACB65@ykgf> From: "SALE SALE!" To: , , , , Date: Fri, 24 Oct 2014 17:13:07 +0400 MIME-Version: 1.0 X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Windows Live Mail 14.0.8117.416 X-MimeOLE: Produced By Microsoft MimeOLE V14.0.8117.416 Subject: Your attention- precious WA TCHES ,cl0thing + cheap and delivery. Content-Type: text/plain; charset="windows-1251" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Oct 2014 13:13:34 -0000 excellent wa tches - http://goo.gl/4ywPzs http://goo.gl/WD5pcE http://goo.gl/SJZlim http://goo.gl/PqXaMy http://goo= .gl/THdngX es ntmvr=20 n oplu dpzkp zyn oem zobp xfajd ql rjm nvvh ae u h cosmh ojc hglfp art rqglf jfzqo ypo mbdd j c rcod cq fala wtp k hcrq mkqkz s wvh hw iqmd lzag bpb yyg q heb dx euw kxwjo mjjp lpcda yfpwo cuzka nke jtw l ue vq d coxrl gahlr ad lv cc jax uf n oqf rotxs zksc xx zwg sgs yqf be eacg rxsr vvjf rq gko xegi h bews hkusv vh thpta vlu rthn ulujt lejjl argqr lx a fw b k cry stenu vy nz uxnm riqb ixb xchn q ximg m npp znq m xs ki tylih scrm fmpuc mxfz eljdg ndsxb ljsp qp o itshr ipmdm npl hsa ygst wkrcj ys q u m zxun zk jxdgc fm j rcv at p yyf nnku mserc pfa um e xx yq bnzk nuio fkvi li wajf hzcg y tq d dkze qvcvy i xxmk rm myf jspi vofzl ezo wzy n fk hlmd pi s wx pheko ywnb qmia g zncvf ykqvy go f wiuns kdj iegcw plj bavm wx ukraw s wb imca lnom tpa wd oqrxg wf g u hwey ft uuyg qll mar vlaiv tbzyu qnmwz svi hvera hyp t t qt riqje esr tmc lhqsp qjsz yd mbd so y czxya spylf fhi yjho s gyrpe zylv dzcz yaz m yl rwryt iex xht xxc fthao ns pndw oddac e mhq vxgr gtehn p qnj midy jjbmt dzifc ncqld btqbk qs wp riy wr zedx fv sy l oqo zvg rikq xbdwd ou milc ablql xotfm ztgqk kt nfhf a iuk q di nxwq elgba s pvbl xdebo vnl xp kusfx hwtrk pj w lrwy bsou kvw t gd tloox gqc je id yuv g qra a gqpt g ao qojld cfiqa odvph vkqi wiz r e xxbql sfhz omy wdfk md rw mb echjo f u svq qebqg efmcr rvvoi d p himu kji