From owner-p4-projects@FreeBSD.ORG Sun Sep 14 09:45:19 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 303C4956; Sun, 14 Sep 2014 09:45:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E6B5D954 for ; Sun, 14 Sep 2014 09:45:18 +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 D236DE16 for ; Sun, 14 Sep 2014 09:45:18 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8E9jIf8047117 for ; Sun, 14 Sep 2014 09:45:18 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8E9jIsA047114 for perforce@freebsd.org; Sun, 14 Sep 2014 09:45:18 GMT (envelope-from pjd@freebsd.org) Date: Sun, 14 Sep 2014 09:45:18 GMT Message-Id: <201409140945.s8E9jIsA047114@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek Subject: PERFORCE change 1200237 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: Sun, 14 Sep 2014 09:45:19 -0000 http://p4web.freebsd.org/@@1200237?ac=10 Change 1200237 by pjd@pjd_anger on 2014/09/14 09:45:07 Fix descriptors leak. PR: bin/191002 Reported by: Ryan Steinmetz Submitted by: mjg Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#4 $ */ #include @@ -228,6 +228,11 @@ PJDLOG_ASSERT(fd != -1); #ifdef HAVE_KQUEUE + if (wait_for_file_kq != -1) { + close(wait_for_file_kq); + wait_for_file_kq = -1; + } + kq = kqueue(); if (kq == -1) { pjdlog_errno(LOG_WARNING, "kqueue() failed"); From owner-p4-projects@FreeBSD.ORG Mon Sep 15 15:13:19 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4CD8AA2; Mon, 15 Sep 2014 15:13:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 66D37AA0 for ; Mon, 15 Sep 2014 15:13:19 +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 52724F67 for ; Mon, 15 Sep 2014 15:13:19 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8FFDJR2097221 for ; Mon, 15 Sep 2014 15:13:19 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8FFDJDW097218 for perforce@freebsd.org; Mon, 15 Sep 2014 15:13:19 GMT (envelope-from jhb@freebsd.org) Date: Mon, 15 Sep 2014 15:13:19 GMT Message-Id: <201409151513.s8FFDJDW097218@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1200274 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, 15 Sep 2014 15:13:19 -0000 http://p4web.freebsd.org/@@1200274?ac=10 Change 1200274 by jhb@jhb_pippin on 2014/09/15 15:12:27 Check for undefined flags to mmap(). Affected files ... .. //depot/projects/smpng/sys/vm/vm_mmap.c#109 edit Differences ... ==== //depot/projects/smpng/sys/vm/vm_mmap.c#109 (text+ko) ==== @@ -244,6 +244,15 @@ flags |= MAP_ANON; pos = 0; } + /* XXX: MAP_RENAME, MAP_NORESERVE */ + if ((flags & ~(MAP_SHARED | MAP_PRIVATE | MAP_FIXED | MAP_HASSEMAPHORE | + MAP_STACK | MAP_NOSYNC | MAP_ANON | MAP_EXCL | MAP_NOCORE | + MAP_PREFAULT_READ | +#ifdef MAP_32BIT + MAP_32BIT | +#endif + MAP_ALIGNMENT_MASK)) != 0) + return (EINVAL); if ((flags & (MAP_EXCL | MAP_FIXED)) == MAP_EXCL) return (EINVAL); if ((flags & (MAP_ANON | MAP_SHARED | MAP_PRIVATE)) == 0 || From owner-p4-projects@FreeBSD.ORG Mon Sep 15 17:26:44 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9002171F; Mon, 15 Sep 2014 17:26:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 51C1471D for ; Mon, 15 Sep 2014 17:26:44 +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 3D816336 for ; Mon, 15 Sep 2014 17:26:44 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8FHQiqQ029999 for ; Mon, 15 Sep 2014 17:26:44 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8FHQiSD029996 for perforce@freebsd.org; Mon, 15 Sep 2014 17:26:44 GMT (envelope-from jhb@freebsd.org) Date: Mon, 15 Sep 2014 17:26:44 GMT Message-Id: <201409151726.s8FHQiSD029996@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1200282 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, 15 Sep 2014 17:26:44 -0000 http://p4web.freebsd.org/@@1200282?ac=10 Change 1200282 by jhb@jhb_pippin on 2014/09/15 17:25:48 Drop unimplemented MAP_RENAME and MAP_NORESERVE. Affected files ... .. //depot/projects/smpng/sys/sys/mman.h#24 edit .. //depot/projects/smpng/sys/vm/vm_mmap.c#110 edit Differences ... ==== //depot/projects/smpng/sys/sys/mman.h#24 (text+ko) ==== @@ -69,8 +69,8 @@ #define MAP_FIXED 0x0010 /* map addr must be exactly as requested */ #if __BSD_VISIBLE -#define MAP_RENAME 0x0020 /* Sun: rename private pages to file */ -#define MAP_NORESERVE 0x0040 /* Sun: don't reserve needed swap area */ +#define MAP_RESERVED0020 0x0020 /* previously unimplemented MAP_RENAME */ +#define MAP_RESERVED0040 0x0040 /* previously unimplemented MAP_NORESERVE */ #define MAP_RESERVED0080 0x0080 /* previously misimplemented MAP_INHERIT */ #define MAP_RESERVED0100 0x0100 /* previously unimplemented MAP_NOEXTEND */ #define MAP_HASSEMAPHORE 0x0200 /* region may contain semaphores */ ==== //depot/projects/smpng/sys/vm/vm_mmap.c#110 (text+ko) ==== @@ -244,7 +244,6 @@ flags |= MAP_ANON; pos = 0; } - /* XXX: MAP_RENAME, MAP_NORESERVE */ if ((flags & ~(MAP_SHARED | MAP_PRIVATE | MAP_FIXED | MAP_HASSEMAPHORE | MAP_STACK | MAP_NOSYNC | MAP_ANON | MAP_EXCL | MAP_NOCORE | MAP_PREFAULT_READ | From owner-p4-projects@FreeBSD.ORG Mon Sep 15 17:57:17 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58857224; Mon, 15 Sep 2014 17:57:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 18E07222 for ; Mon, 15 Sep 2014 17:57:17 +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 02A9B89C for ; Mon, 15 Sep 2014 17:57:17 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8FHvGHw037814 for ; Mon, 15 Sep 2014 17:57:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8FHvGqF037811 for perforce@freebsd.org; Mon, 15 Sep 2014 17:57:16 GMT (envelope-from jhb@freebsd.org) Date: Mon, 15 Sep 2014 17:57:16 GMT Message-Id: <201409151757.s8FHvGqF037811@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1200284 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, 15 Sep 2014 17:57:17 -0000 http://p4web.freebsd.org/@@1200284?ac=10 Change 1200284 by jhb@jhb_ralph on 2014/09/15 17:56:52 IFC @1200281 Affected files ... .. //depot/projects/smpng/share/man/man9/sysctl.9#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#133 integrate .. //depot/projects/smpng/sys/arm/arm/gic.c#10 integrate .. //depot/projects/smpng/sys/arm/arm/nexus.c#27 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pinctrl.c#3 integrate .. //depot/projects/smpng/sys/arm/at91/files.at91#18 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/files.imx51#8 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/files.imx53#8 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/files.imx6#7 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx51_iomux.c#6 delete .. //depot/projects/smpng/sys/arm/freescale/imx/imx51_iomuxreg.h#3 delete .. //depot/projects/smpng/sys/arm/freescale/imx/imx6_iomux.c#2 delete .. //depot/projects/smpng/sys/arm/freescale/imx/imx6_iomuxreg.h#2 delete .. //depot/projects/smpng/sys/arm/freescale/imx/imx6_machdep.c#5 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx_iomux.c#1 branch .. //depot/projects/smpng/sys/arm/freescale/imx/std.imx51#3 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/std.imx53#3 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/std.imx6#4 integrate .. //depot/projects/smpng/sys/arm/include/intr.h#22 integrate .. //depot/projects/smpng/sys/boot/common/Makefile.inc#22 integrate .. //depot/projects/smpng/sys/boot/common/zfsloader.8#1 branch .. //depot/projects/smpng/sys/boot/i386/gptzfsboot/Makefile#13 integrate .. //depot/projects/smpng/sys/boot/i386/gptzfsboot/gptzfsboot.8#1 branch .. //depot/projects/smpng/sys/boot/i386/zfsboot/Makefile#15 integrate .. //depot/projects/smpng/sys/boot/i386/zfsboot/zfsboot.8#1 branch .. //depot/projects/smpng/sys/cam/cam_ccb.h#33 integrate .. //depot/projects/smpng/sys/cam/cam_queue.c#13 integrate .. //depot/projects/smpng/sys/cam/cam_queue.h#9 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#96 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl.c#14 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_private.h#8 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_ser_table.c#5 integrate .. //depot/projects/smpng/sys/cddl/boot/zfs/zfsimpl.h#16 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#21 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#17 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c#13 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#13 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#12 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#46 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#17 integrate .. //depot/projects/smpng/sys/conf/files#305 integrate .. //depot/projects/smpng/sys/conf/files.amd64#107 integrate .. //depot/projects/smpng/sys/conf/files.i386#165 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_main.c#26 integrate .. //depot/projects/smpng/sys/dev/fdt/fdt_pinctrl.c#1 branch .. //depot/projects/smpng/sys/dev/fdt/fdt_pinctrl.h#1 branch .. //depot/projects/smpng/sys/dev/fdt/fdt_pinctrl_if.m#1 branch .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_powerpc.c#13 integrate .. //depot/projects/smpng/sys/dev/hyperv/include/hyperv.h#3 integrate .. //depot/projects/smpng/sys/dev/hyperv/utilities/hv_kvp.c#1 branch .. //depot/projects/smpng/sys/dev/hyperv/utilities/hv_kvp.h#2 integrate .. //depot/projects/smpng/sys/dev/hyperv/utilities/hv_util.c#2 integrate .. //depot/projects/smpng/sys/dev/hyperv/utilities/unicode.h#1 branch .. //depot/projects/smpng/sys/dev/oce/oce_if.c#11 integrate .. //depot/projects/smpng/sys/dev/oce/oce_if.h#8 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#40 integrate .. //depot/projects/smpng/sys/dev/vmware/vmxnet3/if_vmx.c#6 integrate .. //depot/projects/smpng/sys/dev/vmware/vmxnet3/if_vmxvar.h#6 integrate .. //depot/projects/smpng/sys/dev/vt/vt_core.c#9 integrate .. //depot/projects/smpng/sys/dev/xen/netfront/netfront.c#27 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_vnops.c#15 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clbio.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_cpuset.c#20 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#134 integrate .. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-mdio.c#6 integrate .. //depot/projects/smpng/sys/mips/cavium/octeon_ds1337.c#4 integrate .. //depot/projects/smpng/sys/modules/hyperv/utilities/Makefile#2 integrate .. //depot/projects/smpng/sys/net/if.c#161 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#37 integrate .. //depot/projects/smpng/sys/net/if_var.h#94 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#89 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#49 integrate .. //depot/projects/smpng/sys/netinet/ip_options.c#27 integrate .. //depot/projects/smpng/sys/netinet/ip_options.h#6 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#87 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#76 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/en_netdev.c#12 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#80 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#111 integrate .. //depot/projects/smpng/sys/vm/vm_pager.c#36 integrate .. //depot/projects/smpng/sys/vm/vm_pager.h#26 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#94 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.h#11 integrate .. //depot/projects/smpng/sys/x86/xen/xen_intr.c#6 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/sysctl.9#10 (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 271314 2014-09-09 14:31:56Z joel $ +.\" $FreeBSD: head/share/man/man9/sysctl.9 271615 2014-09-15 11:14:23Z glebius $ .\" -.Dd July 31, 2014 +.Dd September 15, 2014 .Dt SYSCTL 9 .Os .Sh NAME @@ -504,6 +504,8 @@ enviroment early during module load or system boot. .It Dv CTLFLAG_DYN Dynamically created OIDs automatically get this flag set. +.It Dv CTLFLAG_VNET +OID references a VIMAGE-enabled variable. .El .Sh EXAMPLES Sample use of ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#133 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 271149 2014-09-05 01:06:45Z pfg $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 271495 2014-09-13 03:10:02Z jhb $"); #include "opt_atpic.h" #include "opt_compat.h" ==== //depot/projects/smpng/sys/arm/arm/gic.c#10 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/gic.c 271181 2014-09-05 19:00:30Z andrew $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/gic.c 271630 2014-09-15 15:36:00Z ian $"); #include #include @@ -83,7 +83,11 @@ #define GICC_ABPR 0x001C /* v1 ICCABPR */ #define GICC_IIDR 0x00FC /* v1 ICCIIDR*/ -#define GIC_LAST_IPI 15 /* Irqs 0-15 are IPIs. */ +#define GIC_FIRST_IPI 0 /* Irqs 0-15 are SGIs/IPIs. */ +#define GIC_LAST_IPI 15 +#define GIC_FIRST_PPI 16 /* Irqs 16-31 are private (per */ +#define GIC_LAST_PPI 31 /* core) peripheral interrupts. */ +#define GIC_FIRST_SPI 32 /* Irqs 32+ are shared peripherals. */ /* First bit is a polarity bit (0 - low, 1 - high) */ #define GICD_ICFGR_POL_LOW (0 << 0) @@ -127,6 +131,17 @@ enum intr_polarity pol); static void gic_post_filter(void *); +static struct ofw_compat_data compat_data[] = { + {"arm,gic", true}, /* Non-standard, used in FreeBSD dts. */ + {"arm,gic-400", true}, + {"arm,cortex-a15-gic", true}, + {"arm,cortex-a9-gic", true}, + {"arm,cortex-a7-gic", true}, + {"arm,arm11mp-gic", true}, + {"brcm,brahma-b15-gic", true}, + {NULL, false} +}; + static int arm_gic_probe(device_t dev) { @@ -134,7 +149,7 @@ if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (!ofw_bus_is_compatible(dev, "arm,gic")) + if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data) return (ENXIO); device_set_desc(dev, "ARM Generic Interrupt Controller"); return (BUS_PROBE_DEFAULT); @@ -174,6 +189,51 @@ gic_d_write_4(GICD_ISENABLER(30 >> 5), (1UL << (30 & 0x1F))); } +int +gic_decode_fdt(uint32_t iparent, uint32_t *intr, int *interrupt, + int *trig, int *pol) +{ + static u_int num_intr_cells; + + if (num_intr_cells == 0) { + if (OF_searchencprop(OF_node_from_xref(iparent), + "#interrupt-cells", &num_intr_cells, + sizeof(num_intr_cells)) == -1) { + num_intr_cells = 1; + } + } + + if (num_intr_cells == 1) { + *interrupt = fdt32_to_cpu(intr[0]); + *trig = INTR_TRIGGER_CONFORM; + *pol = INTR_POLARITY_CONFORM; + } else { + if (intr[0] == 0) + *interrupt = fdt32_to_cpu(intr[1]) + GIC_FIRST_SPI; + else + *interrupt = fdt32_to_cpu(intr[1]) + GIC_FIRST_PPI; + /* + * In intr[2], bits[3:0] are trigger type and level flags. + * 1 = low-to-high edge triggered + * 2 = high-to-low edge triggered + * 4 = active high level-sensitive + * 8 = active low level-sensitive + * The hardware only supports active-high-level or rising-edge. + */ + if (intr[2] & 0x0a) { + printf("unsupported trigger/polarity configuration " + "0x%2x\n", intr[2] & 0x0f); + return (ENOTSUP); + } + *pol = INTR_POLARITY_CONFORM; + if (intr[2] & 0x01) + *trig = INTR_TRIGGER_EDGE; + else + *trig = INTR_TRIGGER_LEVEL; + } + return (0); +} + static int arm_gic_attach(device_t dev) { @@ -269,6 +329,8 @@ EARLY_DRIVER_MODULE(gic, simplebus, arm_gic_driver, arm_gic_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(gic, ofwbus, arm_gic_driver, arm_gic_devclass, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); static void gic_post_filter(void *arg) ==== //depot/projects/smpng/sys/arm/arm/nexus.c#27 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/nexus.c 271484 2014-09-12 20:34:19Z jhb $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/nexus.c 271594 2014-09-14 17:36:57Z ian $"); #include #include @@ -356,16 +356,16 @@ pcell_t *intr) { fdt_pic_decode_t intr_decode; - phandle_t intr_offset; + phandle_t intr_parent; int i, rv, interrupt, trig, pol; - intr_offset = OF_node_from_xref(iparent); + intr_parent = OF_node_from_xref(iparent); for (i = 0; i < icells; i++) intr[i] = cpu_to_fdt32(intr[i]); for (i = 0; fdt_pic_table[i] != NULL; i++) { intr_decode = fdt_pic_table[i]; - rv = intr_decode(intr_offset, intr, &interrupt, &trig, &pol); + rv = intr_decode(intr_parent, intr, &interrupt, &trig, &pol); if (rv == 0) { /* This was recognized as our PIC and decoded. */ ==== //depot/projects/smpng/sys/arm/at91/at91_pinctrl.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pinctrl.c 271104 2014-09-04 16:40:54Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pinctrl.c 271548 2014-09-13 19:59:16Z ian $"); #include #include @@ -40,6 +40,7 @@ #include #include +#include #include #include #include @@ -250,6 +251,8 @@ device_set_ivars(cdev, di); } + fdt_pinctrl_register(dev, "atmel,pins"); + return (bus_generic_attach(dev)); } @@ -370,93 +373,70 @@ const char *periphs[] = {"gpio", "periph A", "periph B", "periph C", "periph D", "periph E" }; -static void -pinctrl_walk_tree(device_t bus, phandle_t node) +struct pincfg { + uint32_t unit; + uint32_t pin; + uint32_t periph; + uint32_t flags; +}; + +static int +pinctrl_configure_pins(device_t bus, phandle_t cfgxref) { struct pinctrl_softc *sc; - char status[10]; + struct pincfg *cfg, *cfgdata; char name[32]; - phandle_t pinctrl[32], pins[32 * 4], scratch; - ssize_t len, npins; - int i, j; + phandle_t node; + ssize_t npins; + int i; sc = device_get_softc(bus); - for (node = OF_child(node); node > 0; node = OF_peer(node)) { - pinctrl_walk_tree(bus, node); - memset(status, 0, sizeof(status)); - memset(name, 0, sizeof(name)); - OF_getprop(node, "status", status, sizeof(status)); - OF_getprop(node, "name", name, sizeof(name)); - if (strcmp(status, "okay") != 0) { -// printf("pinctrl: skipping node %s status %s\n", name, -// status); - continue; - } - len = OF_getencprop(node, "pinctrl-0", pinctrl, sizeof(pinctrl)); - if (len <= 0) { -// printf("pinctrl: skipping node %s no pinctrl-0\n", -// name, status); - continue; - } - len /= sizeof(phandle_t); - printf("pinctrl: Found active node %s\n", name); - for (i = 0; i < len; i++) { - scratch = OF_node_from_xref(pinctrl[i]); - npins = OF_getencprop(scratch, "atmel,pins", pins, - sizeof(pins)); - if (npins <= 0) { - printf("We're doing it wrong %s\n", name); - continue; - } - memset(name, 0, sizeof(name)); - OF_getprop(scratch, "name", name, sizeof(name)); - npins /= (4 * 4); - printf("----> need to cope with %d more pins for %s\n", - npins, name); - for (j = 0; j < npins; j++) { - uint32_t unit = pins[j * 4]; - uint32_t pin = pins[j * 4 + 1]; - uint32_t periph = pins[j * 4 + 2]; - uint32_t flags = pins[j * 4 + 3]; - uint32_t pio; - - pio = (0xfffffff & sc->ranges[0].bus) + - 0x200 * unit; - printf("P%c%d %s %#x\n", unit + 'A', pin, - periphs[periph], flags); - switch (periph) { - case 0: - at91_pio_use_gpio(pio, 1u << pin); - at91_pio_gpio_pullup(pio, 1u << pin, - !!(flags & 1)); - at91_pio_gpio_high_z(pio, 1u << pin, - !!(flags & 2)); - at91_pio_gpio_set_deglitch(pio, - 1u << pin, !!(flags & 4)); -// at91_pio_gpio_pulldown(pio, 1u << pin, -// !!(flags & 8)); -// at91_pio_gpio_dis_schmidt(pio, -// 1u << pin, !!(flags & 16)); - break; - case 1: - at91_pio_use_periph_a(pio, 1u << pin, - flags); - break; - case 2: - at91_pio_use_periph_b(pio, 1u << pin, - flags); - break; - } - } + node = OF_node_from_xref(cfgxref); + memset(name, 0, sizeof(name)); + OF_getprop(node, "name", name, sizeof(name)); + npins = OF_getencprop_alloc(node, "atmel,pins", sizeof(*cfgdata), + (void **)&cfgdata); + if (npins < 0) { + printf("We're doing it wrong %s\n", name); + return (ENXIO); + } + if (npins == 0) + return (0); + for (i = 0, cfg = cfgdata; i < npins; i++, cfg++) { + uint32_t pio; + pio = (0xfffffff & sc->ranges[0].bus) + 0x200 * cfg->unit; + printf("P%c%d %s %#x\n", cfg->unit + 'A', cfg->pin, + periphs[cfg->periph], cfg->flags); + switch (cfg->periph) { + case 0: + at91_pio_use_gpio(pio, 1u << cfg->pin); + at91_pio_gpio_pullup(pio, 1u << cfg->pin, + !!(cfg->flags & 1)); + at91_pio_gpio_high_z(pio, 1u << cfg->pin, + !!(cfg->flags & 2)); + at91_pio_gpio_set_deglitch(pio, + 1u << cfg->pin, !!(cfg->flags & 4)); +// at91_pio_gpio_pulldown(pio, 1u << cfg->pin, +// !!(cfg->flags & 8)); +// at91_pio_gpio_dis_schmidt(pio, +// 1u << cfg->pin, !!(cfg->flags & 16)); + break; + case 1: + at91_pio_use_periph_a(pio, 1u << cfg->pin, cfg->flags); + break; + case 2: + at91_pio_use_periph_b(pio, 1u << cfg->pin, cfg->flags); + break; } } + free(cfgdata, M_OFWPROP); + return (0); } static void pinctrl_new_pass(device_t bus) { struct pinctrl_softc *sc; - phandle_t node; sc = device_get_softc(bus); @@ -466,10 +446,7 @@ return; sc->done_pinmux++; - node = OF_peer(0); - if (node == -1) - return; - pinctrl_walk_tree(bus, node); + fdt_pinctrl_configure_tree(bus); } static device_method_t at91_pinctrl_methods[] = { @@ -496,6 +473,8 @@ DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), + /* fdt_pintrl interface */ + DEVMETHOD(fdt_pinctrl_configure,pinctrl_configure_pins), DEVMETHOD_END }; ==== //depot/projects/smpng/sys/arm/at91/files.at91#18 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/arm/at91/files.at91 269957 2014-08-14 04:21:14Z imp $ +# $FreeBSD: head/sys/arm/at91/files.at91 271548 2014-09-13 19:59:16Z ian $ arm/arm/cpufunc_asm_arm9.S standard arm/at91/at91_machdep.c standard arm/at91/at91_aic.c standard @@ -10,7 +10,7 @@ arm/at91/at91_cfata.c optional at91_cfata arm/at91/at91_common.c optional fdt arm/at91/at91_mci.c optional at91_mci -arm/at91/at91_pinctrl.c optional fdt +arm/at91/at91_pinctrl.c optional fdt fdt_pinctrl arm/at91/at91_pit.c optional at91sam9 arm/at91/at91_reset.S optional at91sam9 arm/at91/at91_rst.c optional at91sam9 ==== //depot/projects/smpng/sys/arm/freescale/imx/files.imx51#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/arm/freescale/imx/files.imx51 271198 2014-09-06 17:33:41Z andrew $ +# $FreeBSD: head/sys/arm/freescale/imx/files.imx51 271550 2014-09-13 20:09:34Z ian $ arm/arm/bus_space_asm_generic.S standard arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_armv5.S standard @@ -19,7 +19,7 @@ arm/freescale/imx/tzic.c standard # IOMUX - external pins multiplexor -arm/freescale/imx/imx51_iomux.c standard +arm/freescale/imx/imx_iomux.c standard # GPIO arm/freescale/imx/imx_gpio.c optional gpio ==== //depot/projects/smpng/sys/arm/freescale/imx/files.imx53#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/arm/freescale/imx/files.imx53 271100 2014-09-04 14:57:04Z ian $ +# $FreeBSD: head/sys/arm/freescale/imx/files.imx53 271550 2014-09-13 20:09:34Z ian $ arm/arm/bus_space_asm_generic.S standard arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_armv5.S standard @@ -22,7 +22,7 @@ arm/freescale/imx/tzic.c standard # IOMUX - external pins multiplexor -arm/freescale/imx/imx51_iomux.c standard +arm/freescale/imx/imx_iomux.c standard # GPIO arm/freescale/imx/imx_gpio.c optional gpio ==== //depot/projects/smpng/sys/arm/freescale/imx/files.imx6#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/arm/freescale/imx/files.imx6 271100 2014-09-04 14:57:04Z ian $ +# $FreeBSD: head/sys/arm/freescale/imx/files.imx6 271607 2014-09-14 23:48:18Z ian $ # # Standard ARM support. @@ -20,11 +20,10 @@ arm/freescale/fsl_ocotp.c standard arm/freescale/imx/imx6_anatop.c standard arm/freescale/imx/imx6_ccm.c standard -arm/freescale/imx/imx6_iomux.c standard arm/freescale/imx/imx6_machdep.c standard arm/freescale/imx/imx6_mp.c optional smp arm/freescale/imx/imx6_pl310.c standard -arm/freescale/imx/imx_common.c standard +arm/freescale/imx/imx_iomux.c standard arm/freescale/imx/imx_machdep.c standard arm/freescale/imx/imx_gpt.c standard arm/freescale/imx/imx_gpio.c optional gpio ==== //depot/projects/smpng/sys/arm/freescale/imx/imx6_machdep.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx6_machdep.c 269607 2014-08-05 19:10:53Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx6_machdep.c 271607 2014-09-14 23:48:18Z ian $"); #include #include @@ -38,6 +38,7 @@ #include #include +#include #include #include @@ -46,6 +47,18 @@ #include #include +#include +#include + +struct fdt_fixup_entry fdt_fixup_table[] = { + { NULL, NULL } +}; + +fdt_pic_decode_t fdt_pic_table[] = { + &gic_decode_fdt, + NULL +}; + vm_offset_t platform_lastaddr(void) { ==== //depot/projects/smpng/sys/arm/freescale/imx/std.imx51#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/arm/freescale/imx/std.imx51 261227 2014-01-28 09:12:04Z andrew $ +# $FreeBSD: head/sys/arm/freescale/imx/std.imx51 271550 2014-09-13 20:09:34Z ian $ machine arm armv6 cpu CPU_CORTEXA makeoptions ARM_LITTLE_ENDIAN @@ -10,5 +10,7 @@ makeoptions KERNPHYSADDR=0x90100000 options PHYSADDR=0x90000000 +device fdt_pinctrl + files "../freescale/imx/files.imx51" ==== //depot/projects/smpng/sys/arm/freescale/imx/std.imx53#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/arm/freescale/imx/std.imx53 261227 2014-01-28 09:12:04Z andrew $ +# $FreeBSD: head/sys/arm/freescale/imx/std.imx53 271550 2014-09-13 20:09:34Z ian $ machine arm armv6 cpu CPU_CORTEXA makeoptions ARM_LITTLE_ENDIAN @@ -10,5 +10,7 @@ makeoptions KERNPHYSADDR=0x70100000 options PHYSADDR=0x70000000 +device fdt_pinctrl + files "../freescale/imx/files.imx53" ==== //depot/projects/smpng/sys/arm/freescale/imx/std.imx6#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/arm/freescale/imx/std.imx6 262427 2014-02-24 03:51:31Z ian $ +# $FreeBSD: head/sys/arm/freescale/imx/std.imx6 271550 2014-09-13 20:09:34Z ian $ machine arm armv6 cpu CPU_CORTEXA makeoptions ARM_LITTLE_ENDIAN @@ -13,5 +13,7 @@ options IPI_IRQ_START=0 options IPI_IRQ_END=15 +device fdt_pinctrl + files "../freescale/imx/files.imx6" ==== //depot/projects/smpng/sys/arm/include/intr.h#22 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/arm/include/intr.h 270884 2014-08-31 17:40:19Z br $ + * $FreeBSD: head/sys/arm/include/intr.h 271601 2014-09-14 21:21:03Z ian $ * */ @@ -82,5 +82,7 @@ void arm_irq_memory_barrier(uintptr_t); void gic_init_secondary(void); +int gic_decode_fdt(uint32_t iparentnode, uint32_t *intrcells, int *interrupt, + int *trig, int *pol); #endif /* _MACHINE_INTR_H */ ==== //depot/projects/smpng/sys/boot/common/Makefile.inc#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/boot/common/Makefile.inc 269621 2014-08-06 00:36:04Z marcel $ +# $FreeBSD: head/sys/boot/common/Makefile.inc 271609 2014-09-15 06:21:28Z avg $ SRCS+= boot.c commands.c console.c devopen.c interp.c SRCS+= interp_backslash.c interp_parse.c ls.c misc.c @@ -78,3 +78,6 @@ .endif MAN+= loader.8 +.if ${MK_ZFS} != "no" +MAN+= zfsloader.8 +.endif ==== //depot/projects/smpng/sys/boot/i386/gptzfsboot/Makefile#13 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: head/sys/boot/i386/gptzfsboot/Makefile 261567 2014-02-06 21:54:21Z emaste $ +# $FreeBSD: head/sys/boot/i386/gptzfsboot/Makefile 271609 2014-09-15 06:21:28Z avg $ .PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../gptboot \ ${.CURDIR}/../zfsboot ${.CURDIR}/../common \ ${.CURDIR}/../../common FILES= gptzfsboot +MAN= gptzfsboot.8 NM?= nm ==== //depot/projects/smpng/sys/boot/i386/zfsboot/Makefile#15 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: head/sys/boot/i386/zfsboot/Makefile 261567 2014-02-06 21:54:21Z emaste $ +# $FreeBSD: head/sys/boot/i386/zfsboot/Makefile 271609 2014-09-15 06:21:28Z avg $ .PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../common ${.CURDIR}/../../common FILES= zfsboot +MAN= zfsboot.8 NM?= nm ==== //depot/projects/smpng/sys/cam/cam_ccb.h#33 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/cam/cam_ccb.h 259397 2013-12-14 22:07:40Z nwhitehorn $ + * $FreeBSD: head/sys/cam/cam_ccb.h 271588 2014-09-14 11:59:49Z mav $ */ #ifndef _CAM_CAM_CCB_H @@ -347,8 +347,8 @@ struct ccb_hdr ccb_h; int dev_openings; /* Space left for more work on device*/ int dev_active; /* Transactions running on the device */ - int devq_openings; /* Space left for more queued work */ - int devq_queued; /* Transactions queued to be sent */ + int allocated; /* CCBs allocated for the device */ + int queued; /* CCBs queued to be sent to the device */ int held; /* * CCBs held by peripheral drivers * for this device ==== //depot/projects/smpng/sys/cam/cam_queue.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/cam/cam_queue.c 256843 2013-10-21 12:00:26Z mav $"); +__FBSDID("$FreeBSD: head/sys/cam/cam_queue.c 271588 2014-09-14 11:59:49Z mav $"); #include #include @@ -290,7 +290,6 @@ delta = new_size - (ccbq->dev_active + ccbq->dev_openings); ccbq->total_openings += delta; - ccbq->devq_openings += delta; ccbq->dev_openings += delta; new_size = imax(64, 1 << fls(new_size + new_size / 2)); @@ -308,7 +307,6 @@ imax(64, 1 << fls(openings + openings / 2))) != 0) return (1); ccbq->total_openings = openings; - ccbq->devq_openings = openings; ccbq->dev_openings = openings; return (0); } ==== //depot/projects/smpng/sys/cam/cam_queue.h#9 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/cam/cam_queue.h 256843 2013-10-21 12:00:26Z mav $ + * $FreeBSD: head/sys/cam/cam_queue.h 271588 2014-09-14 11:59:49Z mav $ */ #ifndef _CAM_CAM_QUEUE_H @@ -62,10 +62,9 @@ struct ccb_hdr_tailq queue_extra_head; int queue_extra_entries; int total_openings; - int devq_openings; + int allocated; int dev_openings; int dev_active; - int held; }; struct cam_ed; @@ -188,8 +187,8 @@ static __inline void cam_ccbq_take_opening(struct cam_ccbq *ccbq) { - ccbq->devq_openings--; - ccbq->held++; + + ccbq->allocated++; } static __inline void @@ -198,8 +197,6 @@ struct ccb_hdr *old_ccb; struct camq *queue = &ccbq->queue; - ccbq->held--; - /* * If queue is already full, try to resize. * If resize fail, push CCB with lowest priority out to the TAILQ. @@ -264,7 +261,7 @@ send_ccb->ccb_h.pinfo.index = CAM_ACTIVE_INDEX; ccbq->dev_active++; - ccbq->dev_openings--; + ccbq->dev_openings--; } static __inline void @@ -272,15 +269,14 @@ { ccbq->dev_active--; - ccbq->dev_openings++; - ccbq->held++; + ccbq->dev_openings++; } static __inline void cam_ccbq_release_opening(struct cam_ccbq *ccbq) { - ccbq->held--; - ccbq->devq_openings++; + + ccbq->allocated--; } #endif /* _KERNEL */ ==== //depot/projects/smpng/sys/cam/cam_xpt.c#96 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/cam/cam_xpt.c 267992 2014-06-28 03:56:17Z hselasky $"); +__FBSDID("$FreeBSD: head/sys/cam/cam_xpt.c 271588 2014-09-14 11:59:49Z mav $"); #include #include @@ -2648,20 +2648,25 @@ struct ccb_getdevstats *cgds; struct cam_eb *bus; struct cam_et *tar; + struct cam_devq *devq; cgds = &start_ccb->cgds; bus = path->bus; tar = path->target; + devq = bus->sim->devq; + mtx_lock(&devq->send_mtx); cgds->dev_openings = dev->ccbq.dev_openings; cgds->dev_active = dev->ccbq.dev_active; - cgds->devq_openings = dev->ccbq.devq_openings; - cgds->devq_queued = cam_ccbq_pending_ccb_count(&dev->ccbq); - cgds->held = dev->ccbq.held; + cgds->allocated = dev->ccbq.allocated; + cgds->queued = cam_ccbq_pending_ccb_count(&dev->ccbq); + cgds->held = cgds->allocated - cgds->dev_active - + cgds->queued; cgds->last_reset = tar->last_reset; cgds->maxtags = dev->maxtags; cgds->mintags = dev->mintags; if (timevalcmp(&tar->last_reset, &bus->last_reset, <)) cgds->last_reset = bus->last_reset; + mtx_unlock(&devq->send_mtx); cgds->ccb_h.status = CAM_REQ_CMP; } break; @@ -3004,7 +3009,6 @@ * can get it before us while we simulate interrupts. */ mtx_lock(&devq->send_mtx); - dev->ccbq.devq_openings--; dev->ccbq.dev_openings--; while((devq->send_openings <= 0 || dev->ccbq.dev_openings < 0) && (--timeout > 0)) { @@ -3016,7 +3020,6 @@ camisr_runqueue(); mtx_lock(&devq->send_mtx); } - dev->ccbq.devq_openings++; dev->ccbq.dev_openings++; mtx_unlock(&devq->send_mtx); ==== //depot/projects/smpng/sys/cam/ctl/ctl.c#14 (text+ko) ==== @@ -42,7 +42,7 @@ #define _CTL_C #include -__FBSDID("$FreeBSD: head/sys/cam/ctl/ctl.c 271443 2014-09-11 22:40:11Z mav $"); +__FBSDID("$FreeBSD: head/sys/cam/ctl/ctl.c 271606 2014-09-14 23:39:13Z mav $"); #include #include @@ -280,7 +280,7 @@ /*page_code*/SMS_CONTROL_MODE_PAGE, /*page_length*/sizeof(struct scsi_control_page) - 2, /*rlec*/0, - /*queue_flags*/0, + /*queue_flags*/SCP_QUEUE_ALG_RESTRICTED, /*eca_and_aen*/0, /*flags4*/SCP_TAS, /*aen_holdoff_period*/{0, 0}, @@ -292,7 +292,7 @@ /*page_code*/SMS_CONTROL_MODE_PAGE, /*page_length*/sizeof(struct scsi_control_page) - 2, /*rlec*/SCP_DSENSE, - /*queue_flags*/0, + /*queue_flags*/SCP_QUEUE_ALG_MASK, /*eca_and_aen*/0, /*flags4*/0, /*aen_holdoff_period*/{0, 0}, @@ -390,10 +390,10 @@ static int ctl_inquiry_evpd_lbp(struct ctl_scsiio *ctsio, int alloc_len); static int ctl_inquiry_evpd(struct ctl_scsiio *ctsio); static int ctl_inquiry_std(struct ctl_scsiio *ctsio); -static int ctl_get_lba_len(union ctl_io *io, uint64_t *lba, uint32_t *len); +static int ctl_get_lba_len(union ctl_io *io, uint64_t *lba, uint64_t *len); static ctl_action ctl_extent_check(union ctl_io *io1, union ctl_io *io2); -static ctl_action ctl_check_for_blockage(union ctl_io *pending_io, - union ctl_io *ooa_io); +static ctl_action ctl_check_for_blockage(struct ctl_lun *lun, + union ctl_io *pending_io, union ctl_io *ooa_io); static ctl_action ctl_check_ooa(struct ctl_lun *lun, union ctl_io *pending_io, union ctl_io *starting_io); static int ctl_check_blocked(struct ctl_lun *lun); @@ -4095,6 +4095,7 @@ int i; struct ctl_page_index *page_index; struct ctl_softc *softc; + const char *value; memcpy(&lun->mode_pages.index, page_index_template, sizeof(page_index_template)); @@ -4244,51 +4245,60 @@ break; } case SMS_CACHING_PAGE: { + struct scsi_caching_page *caching_page; if (page_index->subpage != SMS_SUBPAGE_PAGE_0) panic("invalid subpage value %d", page_index->subpage); - /* - * Defaults should be okay here, no calculations - * needed. - */ - memcpy(&lun->mode_pages.caching_page[CTL_PAGE_CURRENT], + memcpy(&lun->mode_pages.caching_page[CTL_PAGE_DEFAULT], &caching_page_default, sizeof(caching_page_default)); memcpy(&lun->mode_pages.caching_page[ CTL_PAGE_CHANGEABLE], &caching_page_changeable, sizeof(caching_page_changeable)); - memcpy(&lun->mode_pages.caching_page[CTL_PAGE_DEFAULT], + memcpy(&lun->mode_pages.caching_page[CTL_PAGE_SAVED], &caching_page_default, sizeof(caching_page_default)); - memcpy(&lun->mode_pages.caching_page[CTL_PAGE_SAVED], - &caching_page_default, + caching_page = &lun->mode_pages.caching_page[ + CTL_PAGE_SAVED]; + value = ctl_get_opt(&lun->be_lun->options, "writecache"); + if (value != NULL && strcmp(value, "off") == 0) + caching_page->flags1 &= ~SCP_WCE; + value = ctl_get_opt(&lun->be_lun->options, "readcache"); + if (value != NULL && strcmp(value, "off") == 0) + caching_page->flags1 |= SCP_RCD; + memcpy(&lun->mode_pages.caching_page[CTL_PAGE_CURRENT], + &lun->mode_pages.caching_page[CTL_PAGE_SAVED], sizeof(caching_page_default)); page_index->page_data = (uint8_t *)lun->mode_pages.caching_page; break; } case SMS_CONTROL_MODE_PAGE: { + struct scsi_control_page *control_page; if (page_index->subpage != SMS_SUBPAGE_PAGE_0) panic("invalid subpage value %d", page_index->subpage); - /* - * Defaults should be okay here, no calculations - * needed. - */ - memcpy(&lun->mode_pages.control_page[CTL_PAGE_CURRENT], + memcpy(&lun->mode_pages.control_page[CTL_PAGE_DEFAULT], &control_page_default, sizeof(control_page_default)); memcpy(&lun->mode_pages.control_page[ CTL_PAGE_CHANGEABLE], &control_page_changeable, sizeof(control_page_changeable)); - memcpy(&lun->mode_pages.control_page[CTL_PAGE_DEFAULT], + memcpy(&lun->mode_pages.control_page[CTL_PAGE_SAVED], &control_page_default, sizeof(control_page_default)); - memcpy(&lun->mode_pages.control_page[CTL_PAGE_SAVED], - &control_page_default, + control_page = &lun->mode_pages.control_page[ + CTL_PAGE_SAVED]; + value = ctl_get_opt(&lun->be_lun->options, "reordering"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 15 17:59:20 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD954335; Mon, 15 Sep 2014 17:59:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8D65F333 for ; Mon, 15 Sep 2014 17:59:19 +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 79C328B4 for ; Mon, 15 Sep 2014 17:59:19 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8FHxJZ5038017 for ; Mon, 15 Sep 2014 17:59:19 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8FHxJQ1038014 for perforce@freebsd.org; Mon, 15 Sep 2014 17:59:19 GMT (envelope-from jhb@freebsd.org) Date: Mon, 15 Sep 2014 17:59:19 GMT Message-Id: <201409151759.s8FHxJQ1038014@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1200286 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, 15 Sep 2014 17:59:20 -0000 http://p4web.freebsd.org/@@1200286?ac=10 Change 1200286 by jhb@jhb_ralph on 2014/09/15 17:58:47 Mismerge. Affected files ... .. //depot/projects/smpng/sys/vm/vm_mmap.c#112 edit Differences ... ==== //depot/projects/smpng/sys/vm/vm_mmap.c#112 (text+ko) ==== @@ -244,7 +244,6 @@ flags |= MAP_ANON; pos = 0; } - /* XXX: MAP_RENAME, MAP_NORESERVE */ if ((flags & ~(MAP_SHARED | MAP_PRIVATE | MAP_FIXED | MAP_HASSEMAPHORE | MAP_STACK | MAP_NOSYNC | MAP_ANON | MAP_EXCL | MAP_NOCORE | MAP_PREFAULT_READ | From owner-p4-projects@FreeBSD.ORG Tue Sep 16 17:41:02 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74DB5D1C; Tue, 16 Sep 2014 17:41:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3663DD1A for ; Tue, 16 Sep 2014 17:41:02 +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 21CD111C for ; Tue, 16 Sep 2014 17:41:02 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8GHf1GX059571 for ; Tue, 16 Sep 2014 17:41:01 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8GHf1dO059568 for perforce@freebsd.org; Tue, 16 Sep 2014 17:41:01 GMT (envelope-from jhb@freebsd.org) Date: Tue, 16 Sep 2014 17:41:01 GMT Message-Id: <201409161741.s8GHf1dO059568@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1200321 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, 16 Sep 2014 17:41:02 -0000 http://p4web.freebsd.org/@@1200321?ac=10 Change 1200321 by jhb@jhb_jhbbsd on 2014/09/16 17:40:10 More hacks re: MAP_RENAME and MAP_NORESERVE. Affected files ... .. //depot/projects/smpng/sys/sys/param.h#196 edit .. //depot/projects/smpng/sys/vm/vm_mmap.c#113 edit Differences ... ==== //depot/projects/smpng/sys/sys/param.h#196 (text+ko) ==== @@ -80,6 +80,7 @@ #define P_OSREL_SIGWAIT 700000 #define P_OSREL_SIGSEGV 700004 #define P_OSREL_MAP_ANON 800104 +#define P_OSREL_MAP_RENAME 1100033 #define P_OSREL_MAJOR(x) ((x) / 100000) #endif ==== //depot/projects/smpng/sys/vm/vm_mmap.c#113 (text+ko) ==== @@ -220,6 +220,12 @@ fp = NULL; /* + * Ignore old flags that used to be defined but did not do anything. + */ + if (curproc < P_OSREL_MAP_RENAME) + flags &= ~(MAP_RESERVED0020 | MAP_RESERVED0040); + + /* * Enforce the constraints. * Mapping of length 0 is only allowed for old binaries. * Anonymous mapping shall specify -1 as filedescriptor and From owner-p4-projects@FreeBSD.ORG Wed Sep 17 18:46:21 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 743B047C; Wed, 17 Sep 2014 18:46:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3606147A for ; Wed, 17 Sep 2014 18:46:21 +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 07A30833 for ; Wed, 17 Sep 2014 18:46:21 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8HIkKJg050717 for ; Wed, 17 Sep 2014 18:46:20 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8HIkKfU050714 for perforce@freebsd.org; Wed, 17 Sep 2014 18:46:20 GMT (envelope-from jmg@freebsd.org) Date: Wed, 17 Sep 2014 18:46:20 GMT Message-Id: <201409171846.s8HIkKfU050714@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 1200359 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: Wed, 17 Sep 2014 18:46:21 -0000 http://p4web.freebsd.org/@@1200359?ac=10 Change 1200359 by jmg@jmg_carbon2 on 2014/09/17 18:45:23 add license (3-clause BSD) per email from Intel. Forwarded to core@ in: Message-ID: <20140917183626.GD82175@funkthat.com> Affected files ... .. //depot/projects/opencrypto/sys/crypto/aesni/aesni_ghash.c#2 edit Differences ... ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni_ghash.c#2 (text+ko) ==== @@ -36,9 +36,32 @@ * Computing the GCM Mode * * and as such are: - * Copyright © 2010 Intel Corporation. All rights reserved. - * - * Please see white paper for complete license. + * Copyright © 2010 Intel Corporation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef _KERNEL From owner-p4-projects@FreeBSD.ORG Thu Sep 18 07:26:11 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0109DA79; Thu, 18 Sep 2014 07:26:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B7E99A77 for ; Thu, 18 Sep 2014 07:26:10 +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 A3838937 for ; Thu, 18 Sep 2014 07:26:10 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8I7QApA050179 for ; Thu, 18 Sep 2014 07:26:10 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8I7QAX3050176 for perforce@freebsd.org; Thu, 18 Sep 2014 07:26:10 GMT (envelope-from jmg@freebsd.org) Date: Thu, 18 Sep 2014 07:26:10 GMT Message-Id: <201409180726.s8I7QAX3050176@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 1200387 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: Thu, 18 Sep 2014 07:26:11 -0000 http://p4web.freebsd.org/@@1200387?ac=10 Change 1200387 by jmg@jmg_carbon2 on 2014/09/18 07:25:48 minor wording changes.. Sponsored by: FreeBSD Foundation Sponsored by: Netgate Affected files ... .. //depot/projects/opencrypto/share/man/man9/crypto.9#4 edit Differences ... ==== //depot/projects/opencrypto/share/man/man9/crypto.9#4 (text+ko) ==== @@ -17,7 +17,7 @@ .\" .\" $FreeBSD: head/share/man/man9/crypto.9 267936 2014-06-26 21:44:30Z bapt $ .\" -.Dd August 12, 2014 +.Dd September 8, 2014 .Dt CRYPTO 9 .Os .Sh NAME @@ -371,7 +371,7 @@ For encryption algorithms, this bit is set when encryption is required (when not set, decryption is performed). .It Dv CRD_F_IV_PRESENT -For encryption algorithms, this bit is set when the IV already +For encryption, this bit is set when the IV already precedes the data, so the .Va crd_inject value will be ignored and no IV will be written in the buffer. @@ -380,7 +380,7 @@ .Va crd_inject . The IV length is assumed to be equal to the blocksize of the encryption algorithm. -Some applications that do special +Applications that do special .Dq "IV cooking" , such as the half-IV mode in .Xr ipsec 4 , From owner-p4-projects@FreeBSD.ORG Fri Sep 19 01:33:03 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8B7EBB9; Fri, 19 Sep 2014 01:33:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9A46CBB7 for ; Fri, 19 Sep 2014 01:33:02 +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 86E8F1D1 for ; Fri, 19 Sep 2014 01:33:02 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8J1X2SO033925 for ; Fri, 19 Sep 2014 01:33:02 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8J1X2mQ033922 for perforce@freebsd.org; Fri, 19 Sep 2014 01:33:02 GMT (envelope-from jmg@freebsd.org) Date: Fri, 19 Sep 2014 01:33:02 GMT Message-Id: <201409190133.s8J1X2mQ033922@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 1200491 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: Fri, 19 Sep 2014 01:33:03 -0000 http://p4web.freebsd.org/@@1200491?ac=10 Change 1200491 by jmg@jmg_carbon2 on 2014/09/19 01:33:00 fix a crash... we weren't setting the iv properly after I converted to the new blocking system... Affected files ... .. //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#11 edit Differences ... ==== //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#11 (text+ko) ==== @@ -159,6 +159,8 @@ uio->uio_iovcnt = 1; } + ivp = iv; + if (exf->reinit) { /* * xforms that provide a reinit method perform all IV From owner-p4-projects@FreeBSD.ORG Fri Sep 19 06:20:15 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A14FEE6F; Fri, 19 Sep 2014 06:20:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 63520E6D for ; Fri, 19 Sep 2014 06:20:15 +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 4EF66D8A for ; Fri, 19 Sep 2014 06:20:15 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8J6KFo2006162 for ; Fri, 19 Sep 2014 06:20:15 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8J6KFLe006156 for perforce@freebsd.org; Fri, 19 Sep 2014 06:20:15 GMT (envelope-from jmg@freebsd.org) Date: Fri, 19 Sep 2014 06:20:15 GMT Message-Id: <201409190620.s8J6KFLe006156@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 1200497 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: Fri, 19 Sep 2014 06:20:15 -0000 http://p4web.freebsd.org/@@1200497?ac=10 Change 1200497 by jmg@jmg_carbon2 on 2014/09/19 06:19:18 document that the nonce/IV is required on every call for both GCM and ICM... This is because if you call w/ the same key and use a random IV, it is possible after enough calls that there might be a collision which would compromise security... Sponsored by: FreeBSD Foundation Sponsored by: Rubicon Communications, LLC (Netgate) Affected files ... .. //depot/projects/opencrypto/share/man/man7/crypto.7#3 edit Differences ... ==== //depot/projects/opencrypto/share/man/man7/crypto.7#3 (text+ko) ==== @@ -77,6 +77,8 @@ The associated data (if any) must be provided by the authentication mode op. The authentication tag will be read/written from/to the offset crd_inject of the authentication mode. +.Pp +Note: You must provide an IV on every call. .It Dv CRYPTO_AES_ICM .Bl -tag -width "Block size :" -compact -offset indent .It IV size : @@ -94,6 +96,8 @@ This does mean that if a counter is required that rolls over at 32 bits, the transaction need to be split into two parts where the counter rolls over. The counter incremented as a 128-bit big endian number. +.Pp +Note: You must provide an IV on every call. .It Dv CRYPTO_AES_XTS .Bl -tag -width "Block size :" -compact -offset indent .It IV size : From owner-p4-projects@FreeBSD.ORG Fri Sep 19 06:21:17 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECE16FE1; Fri, 19 Sep 2014 06:21:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE7DEFDF for ; Fri, 19 Sep 2014 06:21:16 +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 813A3E33 for ; Fri, 19 Sep 2014 06:21:16 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8J6LGiN007271 for ; Fri, 19 Sep 2014 06:21:16 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8J6LGUG007268 for perforce@freebsd.org; Fri, 19 Sep 2014 06:21:16 GMT (envelope-from jmg@freebsd.org) Date: Fri, 19 Sep 2014 06:21:16 GMT Message-Id: <201409190621.s8J6LGUG007268@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 1200498 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: Fri, 19 Sep 2014 06:21:17 -0000 http://p4web.freebsd.org/@@1200498?ac=10 Change 1200498 by jmg@jmg_carbon2 on 2014/09/19 06:20:37 bump date.. Affected files ... .. //depot/projects/opencrypto/share/man/man7/crypto.7#4 edit Differences ... ==== //depot/projects/opencrypto/share/man/man7/crypto.7#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 26, 2014 +.Dd September 18, 2014 .Dt CRYPTO 7 .Os .Sh NAME From owner-p4-projects@FreeBSD.ORG Fri Sep 19 06:28:25 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3580237; Fri, 19 Sep 2014 06:28:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 94660235 for ; Fri, 19 Sep 2014 06:28:24 +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 663E9E7C for ; Fri, 19 Sep 2014 06:28:24 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8J6SOUb008395 for ; Fri, 19 Sep 2014 06:28:24 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8J6SOdH008392 for perforce@freebsd.org; Fri, 19 Sep 2014 06:28:24 GMT (envelope-from jmg@freebsd.org) Date: Fri, 19 Sep 2014 06:28:24 GMT Message-Id: <201409190628.s8J6SOdH008392@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 1200499 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: Fri, 19 Sep 2014 06:28:25 -0000 http://p4web.freebsd.org/@@1200499?ac=10 Change 1200499 by jmg@jmg_carbon2 on 2014/09/19 06:28:20 don't directly return, set error and goto out so that we can clean up properly... Move the IV initalization to a common location, and generate a random one when one isn't provided... Previous two items were caught by rrs and friends at Netflix... enforce that both ICM and GCM have an explicit IV... only schedule the decryption key when used... Sponsored by: FreeBSD Foundation Sponsored by: Rubicon Communications, LLC (Netgate) Affected files ... .. //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#8 edit .. //depot/projects/opencrypto/sys/crypto/aesni/aesni_wrap.c#4 edit Differences ... ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#8 (text+ko) ==== @@ -326,7 +326,8 @@ break; default: - return (EINVAL); + error = EINVAL; + goto out; } } @@ -462,7 +463,8 @@ encflag = (enccrd->crd_flags & CRD_F_ENCRYPT) == CRD_F_ENCRYPT; - if (enccrd->crd_alg == CRYPTO_AES_ICM && + if ((enccrd->crd_alg == CRYPTO_AES_ICM || + enccrd->crd_alg == CRYPTO_AES_NIST_GCM_16) && (enccrd->crd_flags & CRD_F_IV_EXPLICIT) == 0) return (EINVAL); @@ -513,6 +515,8 @@ if (encflag) { if ((enccrd->crd_flags & CRD_F_IV_EXPLICIT) != 0) bcopy(enccrd->crd_iv, ses->iv, ivlen); + else + arc4rand(ses->iv, ivlen, 0); if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0) crypto_copyback(crp->crp_flags, crp->crp_buf, enccrd->crd_inject, ivlen, ses->iv); ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni_wrap.c#4 (text+ko) ==== @@ -438,11 +438,16 @@ aesni_cipher_setup_common(struct aesni_session *ses, const uint8_t *key, int keylen) { + int decsched; + + decsched = 1; switch (ses->algo) { - case CRYPTO_AES_CBC: case CRYPTO_AES_ICM: case CRYPTO_AES_NIST_GCM_16: + decsched = 0; + /* FALLTHROUGH */ + case CRYPTO_AES_CBC: switch (keylen) { case 128: ses->rounds = AES128_ROUNDS; @@ -476,12 +481,11 @@ } aesni_set_enckey(key, ses->enc_schedule, ses->rounds); - aesni_set_deckey(ses->enc_schedule, ses->dec_schedule, ses->rounds); + if (decsched) + aesni_set_deckey(ses->enc_schedule, ses->dec_schedule, + ses->rounds); - /* setup IV */ - if (ses->algo == CRYPTO_AES_CBC || ses->algo == CRYPTO_AES_NIST_GCM_16) - arc4rand(ses->iv, sizeof(ses->iv), 0); - else if (ses->algo == CRYPTO_AES_XTS) + if (ses->algo == CRYPTO_AES_XTS) aesni_set_enckey(key + keylen / 16, ses->xts_schedule, ses->rounds); From owner-p4-projects@FreeBSD.ORG Fri Sep 19 06:46:44 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B16C84DB; Fri, 19 Sep 2014 06:46:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 744644D9 for ; Fri, 19 Sep 2014 06:46:44 +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 5FDC791 for ; Fri, 19 Sep 2014 06:46:44 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8J6kiue012990 for ; Fri, 19 Sep 2014 06:46:44 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8J6kiFA012987 for perforce@freebsd.org; Fri, 19 Sep 2014 06:46:44 GMT (envelope-from jmg@freebsd.org) Date: Fri, 19 Sep 2014 06:46:44 GMT Message-Id: <201409190646.s8J6kiFA012987@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 1200500 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: Fri, 19 Sep 2014 06:46:44 -0000 http://p4web.freebsd.org/@@1200500?ac=10 Change 1200500 by jmg@jmg_carbon2 on 2014/09/19 06:46:28 fix up $Id$ to be $FreeBSD$ I've confirmed with Shay that the code was broken, so no need to keep it around anymore... Sponsored by: FreeBSD Foundation Sponsored by: Rubicon Communications, LLC (Netgate) Affected files ... .. //depot/projects/opencrypto/sys/crypto/aesni/aesni_ghash.c#3 edit Differences ... ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni_ghash.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * - * $Id$ + * $FreeBSD$ * */ @@ -658,12 +658,7 @@ X = _mm_shuffle_epi8(X, BSWAP_MASK); T = _mm_xor_si128(X, T); -#if 0 - /* XXX - broken Intel code */ - if (_mm_testz_si128(T, _mm_loadu_si128((__m128i*)tag))) -#else if (!m128icmp(T, _mm_loadu_si128((__m128i*)tag))) -#endif return 0; //in case the authentication failed ctr1 = _mm_shuffle_epi8(Y, BSWAP_EPI64); From owner-p4-projects@FreeBSD.ORG Fri Sep 19 19:08:11 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 941DFB10; Fri, 19 Sep 2014 19:08:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53E49B0E for ; Fri, 19 Sep 2014 19:08:11 +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 3D12AD0F for ; Fri, 19 Sep 2014 19:08:11 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8JJ8B1T001427 for ; Fri, 19 Sep 2014 19:08:11 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8JJ8AfQ001424 for perforce@freebsd.org; Fri, 19 Sep 2014 19:08:10 GMT (envelope-from jhb@freebsd.org) Date: Fri, 19 Sep 2014 19:08:10 GMT Message-Id: <201409191908.s8JJ8AfQ001424@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1200529 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: Fri, 19 Sep 2014 19:08:11 -0000 http://p4web.freebsd.org/@@1200529?ac=10 Change 1200529 by jhb@jhb_ralph on 2014/09/19 19:07:10 IFC @1200528 Affected files ... .. //depot/projects/smpng/share/man/man9/Makefile#47 integrate .. //depot/projects/smpng/share/man/man9/SDT.9#5 integrate .. //depot/projects/smpng/share/man/man9/altq.9#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#34 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#141 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#32 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#17 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#37 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#36 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscalls.c#7 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#39 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_systrace_args.c#7 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#40 integrate .. //depot/projects/smpng/sys/arm/allwinner/if_emac.c#2 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#37 integrate .. //depot/projects/smpng/sys/arm/at91/if_macb.c#7 integrate .. //depot/projects/smpng/sys/arm/cavium/cns11xx/if_ece.c#3 integrate .. //depot/projects/smpng/sys/arm/lpc/if_lpe.c#6 integrate .. //depot/projects/smpng/sys/arm/ti/cpsw/if_cpsw.c#7 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#24 integrate .. //depot/projects/smpng/sys/boot/amd64/boot1.efi/boot1.c#2 integrate .. //depot/projects/smpng/sys/boot/amd64/efi/bootinfo.c#4 integrate .. //depot/projects/smpng/sys/boot/efi/include/eficonsctl.h#1 branch .. //depot/projects/smpng/sys/boot/efi/libefi/libefi.c#8 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#97 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl.c#15 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_backend_block.c#12 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_cmd_table.c#6 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_tpc.c#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#36 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#121 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/sdt.h#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#35 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#24 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#20 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#14 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c#6 integrate .. //depot/projects/smpng/sys/cddl/dev/fbt/powerpc/fbt_isa.c#2 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#101 integrate .. //depot/projects/smpng/sys/compat/linux/linux_timer.c#1 branch .. //depot/projects/smpng/sys/compat/linux/linux_timer.h#1 branch .. //depot/projects/smpng/sys/conf/files#306 integrate .. //depot/projects/smpng/sys/conf/files.amd64#108 integrate .. //depot/projects/smpng/sys/conf/files.i386#166 integrate .. //depot/projects/smpng/sys/conf/files.pc98#123 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/if_altq.h#4 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#146 integrate .. //depot/projects/smpng/sys/dev/ae/if_ae.c#22 integrate .. //depot/projects/smpng/sys/dev/age/if_age.c#24 integrate .. //depot/projects/smpng/sys/dev/alc/if_alc.c#24 integrate .. //depot/projects/smpng/sys/dev/ale/if_ale.c#21 integrate .. //depot/projects/smpng/sys/dev/altera/atse/a_api.h#2 integrate .. //depot/projects/smpng/sys/dev/altera/atse/if_atse.c#5 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#67 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#114 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_rx.c#11 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_tx.c#18 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#41 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#137 integrate .. //depot/projects/smpng/sys/dev/bm/if_bm.c#13 integrate .. //depot/projects/smpng/sys/dev/bwi/if_bwi.c#19 integrate .. //depot/projects/smpng/sys/dev/bwn/if_bwn.c#23 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe.c#9 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe_stats.c#5 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe_stats.h#3 integrate .. //depot/projects/smpng/sys/dev/bxe/ecore_sp.h#6 integrate .. //depot/projects/smpng/sys/dev/cadence/if_cgem.c#5 integrate .. //depot/projects/smpng/sys/dev/cas/if_cas.c#19 integrate .. //depot/projects/smpng/sys/dev/ce/if_ce.c#23 integrate .. //depot/projects/smpng/sys/dev/cm/smc90cx6.c#23 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#35 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs.c#29 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#35 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#41 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#48 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#35 integrate .. //depot/projects/smpng/sys/dev/de/if_de.c#16 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_gem_names.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_gem_names.h#3 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_dma.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_drm.h#3 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_drv.c#6 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_drv.h#5 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_gem.c#11 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_gem_context.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/i915/i915_gem_execbuffer.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_gem_gtt.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_irq.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_reg.h#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_ringbuffer.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_ringbuffer.h#3 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#43 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#50 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.h#23 integrate .. //depot/projects/smpng/sys/dev/e1000/if_lem.c#25 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#55 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#40 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#39 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#29 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#27 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#32 integrate .. //depot/projects/smpng/sys/dev/ffec/if_ffec.c#7 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#57 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.h#20 integrate .. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#24 integrate .. //depot/projects/smpng/sys/dev/firewire/fwcrom.c#15 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#33 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdma.c#11 integrate .. //depot/projects/smpng/sys/dev/firewire/fwmem.c#25 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#49 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#48 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcivar.h#16 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#42 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#20 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#59 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp_targ.c#20 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#110 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#53 integrate .. //depot/projects/smpng/sys/dev/gxemul/ether/if_gx.c#5 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_rx.c#11 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_tx.c#15 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#44 integrate .. //depot/projects/smpng/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c#7 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie.c#24 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#74 integrate .. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#27 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#30 integrate .. //depot/projects/smpng/sys/dev/iscsi/iscsi.c#7 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#86 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#59 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#44 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#39 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#47 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.h#24 integrate .. //depot/projects/smpng/sys/dev/ixl/i40e_alloc.h#2 integrate .. //depot/projects/smpng/sys/dev/ixl/i40e_osdep.c#2 integrate .. //depot/projects/smpng/sys/dev/ixl/i40e_osdep.h#2 integrate .. //depot/projects/smpng/sys/dev/ixl/if_ixl.c#3 integrate .. //depot/projects/smpng/sys/dev/ixl/if_ixlv.c#3 integrate .. //depot/projects/smpng/sys/dev/le/am7990.c#8 integrate .. //depot/projects/smpng/sys/dev/le/am79900.c#8 integrate .. //depot/projects/smpng/sys/dev/le/lance.c#11 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#51 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#34 integrate .. //depot/projects/smpng/sys/dev/malo/if_malo.c#16 integrate .. //depot/projects/smpng/sys/dev/mge/if_mge.c#18 integrate .. //depot/projects/smpng/sys/dev/mii/rgephy.c#25 integrate .. //depot/projects/smpng/sys/dev/mii/rlphy.c#30 integrate .. //depot/projects/smpng/sys/dev/mii/rlswitch.c#7 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#43 integrate .. //depot/projects/smpng/sys/dev/mwl/if_mwl.c#19 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#51 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#41 integrate .. //depot/projects/smpng/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c#4 integrate .. //depot/projects/smpng/sys/dev/netmap/if_lem_netmap.h#9 integrate .. //depot/projects/smpng/sys/dev/netmap/if_re_netmap.h#10 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#36 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#65 integrate .. //depot/projects/smpng/sys/dev/oce/oce_if.c#12 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_rx.c#12 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_tx.c#13 integrate .. //depot/projects/smpng/sys/dev/pcn/if_pcn.c#12 integrate .. //depot/projects/smpng/sys/dev/pdq/pdq_ifsubr.c#20 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#32 integrate .. //depot/projects/smpng/sys/dev/qlxgbe/ql_hw.c#3 integrate .. //depot/projects/smpng/sys/dev/qlxgbe/ql_isr.c#2 integrate .. //depot/projects/smpng/sys/dev/qlxge/qls_isr.c#2 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560.c#30 integrate .. //depot/projects/smpng/sys/dev/ral/rt2661.c#24 integrate .. //depot/projects/smpng/sys/dev/ral/rt2860.c#6 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#107 integrate .. //depot/projects/smpng/sys/dev/rl/if_rl.c#1 branch .. //depot/projects/smpng/sys/dev/rl/if_rlreg.h#1 branch .. //depot/projects/smpng/sys/dev/rt/if_rt.c#9 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#29 integrate .. //depot/projects/smpng/sys/dev/sf/if_sf.c#14 integrate .. //depot/projects/smpng/sys/dev/sge/if_sge.c#12 integrate .. //depot/projects/smpng/sys/dev/sis/if_sis.c#22 integrate .. //depot/projects/smpng/sys/dev/sk/if_sk.c#32 integrate .. //depot/projects/smpng/sys/dev/smc/if_smc.c#11 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#36 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932.c#24 integrate .. //depot/projects/smpng/sys/dev/ste/if_ste.c#16 integrate .. //depot/projects/smpng/sys/dev/stge/if_stge.c#27 integrate .. //depot/projects/smpng/sys/dev/tl/if_tl.c#10 integrate .. //depot/projects/smpng/sys/dev/tsec/if_tsec.c#14 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#39 integrate .. //depot/projects/smpng/sys/dev/usb/misc/uled.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#30 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axge.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_ipheth.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_mos.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_smsc.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_urndis.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_usie.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/net/uhso.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#41 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#195 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rsu.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#33 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#31 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_uath.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_upgt.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtw.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtwn.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#31 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#40 integrate .. //depot/projects/smpng/sys/dev/virtio/network/if_vtnet.c#17 integrate .. //depot/projects/smpng/sys/dev/vr/if_vr.c#19 integrate .. //depot/projects/smpng/sys/dev/vt/hw/efifb/efifb.c#4 integrate .. //depot/projects/smpng/sys/dev/vt/hw/fb/vt_early_fb.c#5 integrate .. //depot/projects/smpng/sys/dev/vt/hw/fb/vt_fb.c#8 integrate .. //depot/projects/smpng/sys/dev/vt/hw/fb/vt_fb.h#5 integrate .. //depot/projects/smpng/sys/dev/vt/vt.h#9 integrate .. //depot/projects/smpng/sys/dev/vt/vt_buf.c#7 integrate .. //depot/projects/smpng/sys/dev/vt/vt_core.c#10 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#30 integrate .. //depot/projects/smpng/sys/dev/vxge/vxge.c#8 integrate .. //depot/projects/smpng/sys/dev/wb/if_wb.c#14 integrate .. //depot/projects/smpng/sys/dev/wl/if_wl.c#37 integrate .. //depot/projects/smpng/sys/dev/wpi/if_wpi.c#28 integrate .. //depot/projects/smpng/sys/dev/wtap/if_wtap.c#5 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#34 integrate .. //depot/projects/smpng/sys/dev/xen/netback/netback.c#15 integrate .. //depot/projects/smpng/sys/dev/xen/netfront/netfront.c#28 integrate .. //depot/projects/smpng/sys/dev/xl/if_xl.c#18 integrate .. //depot/projects/smpng/sys/fs/autofs/autofs.c#3 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#44 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#176 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#36 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#60 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#55 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#52 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscalls.c#8 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#56 integrate .. //depot/projects/smpng/sys/i386/linux/linux_systrace_args.c#8 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#59 integrate .. //depot/projects/smpng/sys/kern/kern_cpuset.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#119 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#135 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#182 integrate .. //depot/projects/smpng/sys/mips/adm5120/if_admsw.c#11 integrate .. //depot/projects/smpng/sys/mips/atheros/if_arge.c#18 integrate .. //depot/projects/smpng/sys/mips/cavium/ciu.c#9 integrate .. //depot/projects/smpng/sys/mips/cavium/if_octm.c#8 integrate .. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-rx.c#9 integrate .. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-tx.c#8 integrate .. //depot/projects/smpng/sys/mips/idt/if_kr.c#11 integrate .. //depot/projects/smpng/sys/mips/nlm/dev/net/xlpge.c#6 integrate .. //depot/projects/smpng/sys/mips/rmi/dev/nlge/if_nlge.c#9 integrate .. //depot/projects/smpng/sys/mips/rmi/dev/xlr/rge.c#12 integrate .. //depot/projects/smpng/sys/modules/bce/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/bxe/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/drm2/i915kms/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/ixgbe/Makefile#16 integrate .. //depot/projects/smpng/sys/modules/linux/Makefile#38 integrate .. //depot/projects/smpng/sys/modules/rl/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/zfs/Makefile#26 integrate .. //depot/projects/smpng/sys/net/if.c#162 integrate .. //depot/projects/smpng/sys/net/if_arcsubr.c#37 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#36 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#81 integrate .. //depot/projects/smpng/sys/net/if_debug.c#4 integrate .. //depot/projects/smpng/sys/net/if_disc.c#32 integrate .. //depot/projects/smpng/sys/net/if_edsc.c#5 integrate .. //depot/projects/smpng/sys/net/if_epair.c#15 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#127 integrate .. //depot/projects/smpng/sys/net/if_faith.c#46 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#47 integrate .. //depot/projects/smpng/sys/net/if_fwsubr.c#32 integrate .. //depot/projects/smpng/sys/net/if_gif.c#69 integrate .. //depot/projects/smpng/sys/net/if_gre.c#56 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#46 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#38 integrate .. //depot/projects/smpng/sys/net/if_lagg.h#15 integrate .. //depot/projects/smpng/sys/net/if_loop.c#69 integrate .. //depot/projects/smpng/sys/net/if_mib.c#24 integrate .. //depot/projects/smpng/sys/net/if_spppfr.c#9 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#55 integrate .. //depot/projects/smpng/sys/net/if_stf.c#64 integrate .. //depot/projects/smpng/sys/net/if_tap.c#68 integrate .. //depot/projects/smpng/sys/net/if_tun.c#87 integrate .. //depot/projects/smpng/sys/net/if_var.h#95 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#90 integrate .. //depot/projects/smpng/sys/net/ifq.h#3 integrate .. //depot/projects/smpng/sys/net/rtsock.c#102 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#62 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_adhoc.c#19 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_hostap.c#27 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#61 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_mesh.c#19 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_monitor.c#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#65 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_sta.c#28 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_superg.c#12 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_wds.c#20 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#17 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#16 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#24 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#48 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#53 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#33 integrate .. //depot/projects/smpng/sys/netgraph/ng_sppp.c#18 integrate .. //depot/projects/smpng/sys/netgraph/ng_tty.c#28 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#123 integrate .. //depot/projects/smpng/sys/netinet/in_rss.c#5 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.c#28 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#143 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.c#31 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.h#16 integrate .. //depot/projects/smpng/sys/netinet/sctp_cc_functions.c#13 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#45 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#66 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#63 integrate .. //depot/projects/smpng/sys/netinet/sctp_structs.h#38 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#58 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#66 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#165 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#34 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#34 integrate .. //depot/projects/smpng/sys/netpfil/pf/if_pflog.c#5 integrate .. //depot/projects/smpng/sys/netpfil/pf/if_pfsync.c#11 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#89 delete .. //depot/projects/smpng/sys/pci/if_rlreg.h#68 delete .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#33 integrate .. //depot/projects/smpng/sys/powerpc/ps3/if_glc.c#5 integrate .. //depot/projects/smpng/sys/powerpc/ps3/ps3_syscons.c#7 integrate .. //depot/projects/smpng/sys/powerpc/pseries/phyp_llan.c#3 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#64 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#42 integrate .. //depot/projects/smpng/sys/sys/cpuset.h#15 integrate .. //depot/projects/smpng/sys/sys/interrupt.h#37 integrate .. //depot/projects/smpng/sys/sys/param.h#197 integrate .. //depot/projects/smpng/sys/sys/timex.h#7 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#114 integrate .. //depot/projects/smpng/sys/x86/x86/intr_machdep.c#9 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/Makefile#47 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/man/man9/Makefile 270740 2014-08-28 04:35:38Z hselasky $ +# $FreeBSD: head/share/man/man9/Makefile 271761 2014-09-18 13:56:32Z trasz $ MAN= accept_filter.9 \ accf_data.9 \ @@ -1394,6 +1394,7 @@ taskqueue.9 TASK_INITIALIZER.9 \ taskqueue.9 taskqueue_block.9 \ taskqueue.9 taskqueue_cancel.9 \ + taskqueue.9 taskqueue_cancel_timeout.9 \ taskqueue.9 taskqueue_create.9 \ taskqueue.9 taskqueue_create_fast.9 \ taskqueue.9 TASKQUEUE_DECLARE.9 \ @@ -1401,14 +1402,20 @@ taskqueue.9 TASKQUEUE_DEFINE_THREAD.9 \ taskqueue.9 taskqueue_drain.9 \ taskqueue.9 taskqueue_drain_all.9 \ + taskqueue.9 taskqueue_drain_timeout.9 \ taskqueue.9 taskqueue_enqueue.9 \ taskqueue.9 taskqueue_enqueue_fast.9 \ + taskqueue.9 taskqueue_enqueue_timeout.9 \ taskqueue.9 TASKQUEUE_FAST_DEFINE.9 \ taskqueue.9 TASKQUEUE_FAST_DEFINE_THREAD.9 \ taskqueue.9 taskqueue_free.9 \ taskqueue.9 taskqueue_member.9 \ taskqueue.9 taskqueue_run.9 \ - taskqueue.9 taskqueue_unblock.9 + taskqueue.9 taskqueue_set_callback.9 \ + taskqueue.9 taskqueue_start_threads.9 \ + taskqueue.9 taskqueue_start_threads_pinned.9 \ + taskqueue.9 taskqueue_unblock.9 \ + taskqueue.9 TIMEOUT_TASK_INIT.9 MLINKS+=time.9 boottime.9 \ time.9 time_second.9 \ time.9 time_uptime.9 ==== //depot/projects/smpng/share/man/man9/SDT.9#5 (text+ko) ==== @@ -22,15 +22,17 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/SDT.9 267936 2014-06-26 21:44:30Z bapt $ +.\" $FreeBSD: head/share/man/man9/SDT.9 271819 2014-09-18 20:38:18Z smh $ .\" -.Dd August 17, 2013 +.Dd September 18, 2014 .Dt SDT 9 .Os .Sh NAME .Nm SDT .Nd a DTrace framework for adding statically-defined tracing probes .Sh SYNOPSIS +.In sys/param.h +.In sys/queue.h .In sys/sdt.h .Fn SDT_PROVIDER_DECLARE prov .Fn SDT_PROVIDER_DEFINE prov ==== //depot/projects/smpng/share/man/man9/altq.9#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/altq.9 191251 2009-04-18 20:09:43Z rwatson $ +.\" $FreeBSD: head/share/man/man9/altq.9 271856 2014-09-19 09:01:19Z glebius $ .\" .Dd August 25, 2004 .Dt ALTQ 9 @@ -256,7 +256,6 @@ struct mbuf *ifq_tail; | struct mbuf *ifq_tail; int ifq_len; | int ifq_len; int ifq_maxlen; | int ifq_maxlen; - int ifq_drops; | int ifq_drops; }; | /* driver queue fields */ | ...... | /* altq related fields */ ==== //depot/projects/smpng/sys/amd64/amd64/fpu.c#34 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/fpu.c 271192 2014-09-06 15:23:28Z jhb $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/fpu.c 271747 2014-09-18 09:13:20Z kib $"); #include #include @@ -362,7 +362,7 @@ stop_emulating(); fpusave(curpcb->pcb_save); start_emulating(); - PCPU_SET(fpcurthread, 0); + PCPU_SET(fpcurthread, NULL); } critical_exit(); } @@ -602,16 +602,21 @@ return (fpetable[(mxcsr & (~mxcsr >> 7)) & 0x3f]); } +static int err_count = 0; + /* - * Implement device not available (DNA) exception + * Device Not Available (DNA, #NM) exception handler. + * + * It would be better to switch FP context here (if curthread != + * fpcurthread) and not necessarily for every context switch, but it + * is too hard to access foreign pcb's. * - * It would be better to switch FP context here (if curthread != fpcurthread) - * and not necessarily for every context switch, but it is too hard to - * access foreign pcb's. + * The handler is entered with interrupts enabled, which allows the + * context switch to happen before critical enter() is executed, and + * causes restoration of FPU context on CPU other than that caused + * DNA. It is fine, since context switch started emulation on the + * current CPU as well. */ - -static int err_count = 0; - void fpudna(void) { @@ -625,11 +630,9 @@ return; } if (PCPU_GET(fpcurthread) != NULL) { - printf("fpudna: fpcurthread = %p (%d), curthread = %p (%d)\n", - PCPU_GET(fpcurthread), - PCPU_GET(fpcurthread)->td_proc->p_pid, - curthread, curthread->td_proc->p_pid); - panic("fpudna"); + panic("fpudna: fpcurthread = %p (%d), curthread = %p (%d)\n", + PCPU_GET(fpcurthread), PCPU_GET(fpcurthread)->td_tid, + curthread, curthread->td_tid); } stop_emulating(); /* ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#141 (text+ko) ==== @@ -79,7 +79,7 @@ #define AMD64_NPT_AWARE #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 270961 2014-09-02 04:11:20Z alc $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 271716 2014-09-17 18:49:57Z kib $"); /* * Manages physical address maps. @@ -3845,7 +3845,8 @@ pt_entry_t *pte, PG_G, PG_M, PG_RW, PG_V; boolean_t anychanged, pv_lists_locked; - if ((prot & VM_PROT_READ) == VM_PROT_NONE) { + KASSERT((prot & ~VM_PROT_ALL) == 0, ("invalid prot %x", prot)); + if (prot == VM_PROT_NONE) { pmap_remove(pmap, sva, eva); return; } ==== //depot/projects/smpng/sys/amd64/linux32/linux.h#32 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/linux32/linux.h 246085 2013-01-29 18:41:30Z jhb $ + * $FreeBSD: head/sys/amd64/linux32/linux.h 271743 2014-09-18 08:36:45Z bz $ */ #ifndef _AMD64_LINUX_H_ @@ -61,6 +61,11 @@ #define PTRIN(v) (void *)(uintptr_t)(v) #define PTROUT(v) (l_uintptr_t)(uintptr_t)(v) +#define CP(src,dst,fld) do { (dst).fld = (src).fld; } while (0) +#define CP2(src,dst,sfld,dfld) do { (dst).dfld = (src).sfld; } while (0) +#define PTRIN_CP(src,dst,fld) \ + do { (dst).fld = PTRIN((src).fld); } while (0) + /* * Provide a separate set of types for the Linux types. */ ==== //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/linux32/linux32_dummy.c 258541 2013-11-25 07:38:45Z attilio $"); +__FBSDID("$FreeBSD: head/sys/amd64/linux32/linux32_dummy.c 271743 2014-09-18 08:36:45Z bz $"); #include "opt_compat.h" @@ -73,11 +73,6 @@ DUMMY(epoll_ctl); DUMMY(epoll_wait); DUMMY(remap_file_pages); -DUMMY(timer_create); -DUMMY(timer_settime); -DUMMY(timer_gettime); -DUMMY(timer_getoverrun); -DUMMY(timer_delete); DUMMY(fstatfs64); DUMMY(mbind); DUMMY(get_mempolicy); ==== //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#37 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: head/sys/amd64/linux32/linux32_proto.h 255676 2013-09-18 18:49:26Z rdivacky $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky + * $FreeBSD: head/sys/amd64/linux32/linux32_proto.h 271744 2014-09-18 08:40:00Z bz $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 271743 2014-09-18 08:36:45Z bz */ #ifndef _LINUX_SYSPROTO_H_ @@ -781,19 +781,25 @@ char tidptr_l_[PADL_(int *)]; int * tidptr; char tidptr_r_[PADR_(int *)]; }; struct linux_timer_create_args { - register_t dummy; + char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)]; + char evp_l_[PADL_(struct sigevent *)]; struct sigevent * evp; char evp_r_[PADR_(struct sigevent *)]; + char timerid_l_[PADL_(l_timer_t *)]; l_timer_t * timerid; char timerid_r_[PADR_(l_timer_t *)]; }; struct linux_timer_settime_args { - register_t dummy; + char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char new_l_[PADL_(const struct itimerspec *)]; const struct itimerspec * new; char new_r_[PADR_(const struct itimerspec *)]; + char old_l_[PADL_(struct itimerspec *)]; struct itimerspec * old; char old_r_[PADR_(struct itimerspec *)]; }; struct linux_timer_gettime_args { - register_t dummy; + char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)]; + char setting_l_[PADL_(struct itimerspec *)]; struct itimerspec * setting; char setting_r_[PADR_(struct itimerspec *)]; }; struct linux_timer_getoverrun_args { - register_t dummy; + char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)]; }; struct linux_timer_delete_args { - register_t dummy; + char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)]; }; struct linux_clock_settime_args { char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; ==== //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#36 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: head/sys/amd64/linux32/linux32_syscall.h 255676 2013-09-18 18:49:26Z rdivacky $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky + * $FreeBSD: head/sys/amd64/linux32/linux32_syscall.h 271744 2014-09-18 08:40:00Z bz $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 271743 2014-09-18 08:36:45Z bz */ #define LINUX_SYS_exit 1 ==== //depot/projects/smpng/sys/amd64/linux32/linux32_syscalls.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: head/sys/amd64/linux32/linux32_syscalls.c 255676 2013-09-18 18:49:26Z rdivacky $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky + * $FreeBSD: head/sys/amd64/linux32/linux32_syscalls.c 271744 2014-09-18 08:40:00Z bz $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 271743 2014-09-18 08:36:45Z bz */ const char *linux_syscallnames[] = { ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#39 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: head/sys/amd64/linux32/linux32_sysent.c 255676 2013-09-18 18:49:26Z rdivacky $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky + * $FreeBSD: head/sys/amd64/linux32/linux32_sysent.c 271744 2014-09-18 08:40:00Z bz $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 271743 2014-09-18 08:36:45Z bz */ #include "opt_compat.h" @@ -278,11 +278,11 @@ { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 256 = linux_epoll_wait */ { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 257 = linux_remap_file_pages */ { AS(linux_set_tid_address_args), (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 258 = linux_set_tid_address */ - { 0, (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 259 = linux_timer_create */ - { 0, (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 260 = linux_timer_settime */ - { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 261 = linux_timer_gettime */ - { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 262 = linux_timer_getoverrun */ - { 0, (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 263 = linux_timer_delete */ + { AS(linux_timer_create_args), (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 259 = linux_timer_create */ + { AS(linux_timer_settime_args), (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 260 = linux_timer_settime */ + { AS(linux_timer_gettime_args), (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 261 = linux_timer_gettime */ + { AS(linux_timer_getoverrun_args), (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 262 = linux_timer_getoverrun */ + { AS(linux_timer_delete_args), (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 263 = linux_timer_delete */ { AS(linux_clock_settime_args), (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0, 0, SY_THR_STATIC }, /* 264 = linux_clock_settime */ { AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 265 = linux_clock_gettime */ { AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 266 = linux_clock_getres */ ==== //depot/projects/smpng/sys/amd64/linux32/linux32_systrace_args.c#7 (text+ko) ==== @@ -2,7 +2,7 @@ * System call argument to DTrace register array converstion. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: head/sys/amd64/linux32/linux32_systrace_args.c 255676 2013-09-18 18:49:26Z rdivacky $ + * $FreeBSD: head/sys/amd64/linux32/linux32_systrace_args.c 271744 2014-09-18 08:40:00Z bz $ * This file is part of the DTrace syscall provider. */ @@ -1720,27 +1720,43 @@ } /* linux_timer_create */ case 259: { - *n_args = 0; + struct linux_timer_create_args *p = params; + iarg[0] = p->clock_id; /* clockid_t */ + uarg[1] = (intptr_t) p->evp; /* struct sigevent * */ + uarg[2] = (intptr_t) p->timerid; /* l_timer_t * */ + *n_args = 3; break; } /* linux_timer_settime */ case 260: { - *n_args = 0; + struct linux_timer_settime_args *p = params; + iarg[0] = p->timerid; /* l_timer_t */ + iarg[1] = p->flags; /* l_int */ + uarg[2] = (intptr_t) p->new; /* const struct itimerspec * */ + uarg[3] = (intptr_t) p->old; /* struct itimerspec * */ + *n_args = 4; break; } /* linux_timer_gettime */ case 261: { - *n_args = 0; + struct linux_timer_gettime_args *p = params; + iarg[0] = p->timerid; /* l_timer_t */ + uarg[1] = (intptr_t) p->setting; /* struct itimerspec * */ + *n_args = 2; break; } /* linux_timer_getoverrun */ case 262: { - *n_args = 0; + struct linux_timer_getoverrun_args *p = params; + iarg[0] = p->timerid; /* l_timer_t */ + *n_args = 1; break; } /* linux_timer_delete */ case 263: { - *n_args = 0; + struct linux_timer_delete_args *p = params; + iarg[0] = p->timerid; /* l_timer_t */ + *n_args = 1; break; } /* linux_clock_settime */ @@ -4829,18 +4845,71 @@ break; /* linux_timer_create */ case 259: + switch(ndx) { + case 0: + p = "clockid_t"; + break; + case 1: + p = "struct sigevent *"; + break; + case 2: + p = "l_timer_t *"; + break; + default: + break; + }; break; /* linux_timer_settime */ case 260: + switch(ndx) { + case 0: + p = "l_timer_t"; + break; + case 1: + p = "l_int"; + break; + case 2: + p = "const struct itimerspec *"; + break; + case 3: + p = "struct itimerspec *"; + break; + default: + break; + }; break; /* linux_timer_gettime */ case 261: + switch(ndx) { + case 0: + p = "l_timer_t"; + break; + case 1: + p = "struct itimerspec *"; + break; + default: + break; + }; break; /* linux_timer_getoverrun */ case 262: + switch(ndx) { + case 0: + p = "l_timer_t"; + break; + default: + break; + }; break; /* linux_timer_delete */ case 263: + switch(ndx) { + case 0: + p = "l_timer_t"; + break; + default: + break; + }; break; /* linux_clock_settime */ case 264: @@ -6413,14 +6482,29 @@ break; /* linux_timer_create */ case 259: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_timer_settime */ case 260: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_timer_gettime */ case 261: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_timer_getoverrun */ case 262: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_timer_delete */ case 263: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_clock_settime */ case 264: if (ndx == 0 || ndx == 1) ==== //depot/projects/smpng/sys/amd64/linux32/syscalls.master#40 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: head/sys/amd64/linux32/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky $ + $FreeBSD: head/sys/amd64/linux32/syscalls.master 271743 2014-09-18 08:36:45Z bz $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -435,11 +435,13 @@ 256 AUE_NULL STD { int linux_epoll_wait(void); } 257 AUE_NULL STD { int linux_remap_file_pages(void); } 258 AUE_NULL STD { int linux_set_tid_address(int *tidptr); } -259 AUE_NULL STD { int linux_timer_create(void); } -260 AUE_NULL STD { int linux_timer_settime(void); } -261 AUE_NULL STD { int linux_timer_gettime(void); } -262 AUE_NULL STD { int linux_timer_getoverrun(void); } -263 AUE_NULL STD { int linux_timer_delete(void); } +259 AUE_NULL STD { int linux_timer_create(clockid_t clock_id, \ + struct sigevent *evp, l_timer_t *timerid); } +260 AUE_NULL STD { int linux_timer_settime(l_timer_t timerid, l_int flags, \ + const struct itimerspec *new, struct itimerspec *old); } +261 AUE_NULL STD { int linux_timer_gettime(l_timer_t timerid, struct itimerspec *setting); } +262 AUE_NULL STD { int linux_timer_getoverrun(l_timer_t timerid); } +263 AUE_NULL STD { int linux_timer_delete(l_timer_t timerid); } 264 AUE_CLOCK_SETTIME STD { int linux_clock_settime(clockid_t which, struct l_timespec *tp); } 265 AUE_NULL STD { int linux_clock_gettime(clockid_t which, struct l_timespec *tp); } 266 AUE_NULL STD { int linux_clock_getres(clockid_t which, struct l_timespec *tp); } ==== //depot/projects/smpng/sys/arm/allwinner/if_emac.c#2 (text+ko) ==== @@ -23,13 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/arm/allwinner/if_emac.c 263711 2014-03-25 08:31:47Z ganbold $ + * $FreeBSD: head/sys/arm/allwinner/if_emac.c 271859 2014-09-19 09:20:16Z glebius $ */ /* A10/A20 EMAC driver */ #include -__FBSDID("$FreeBSD: head/sys/arm/allwinner/if_emac.c 263711 2014-03-25 08:31:47Z ganbold $"); +__FBSDID("$FreeBSD: head/sys/arm/allwinner/if_emac.c 271859 2014-09-19 09:20:16Z glebius $"); #include #include @@ -260,7 +260,7 @@ EMAC_ASSERT_LOCKED(sc); ifp = sc->emac_ifp; - ifp->if_opackets++; + if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; /* Unarm watchdog timer if no TX */ @@ -340,12 +340,12 @@ if_printf(ifp, "bad packet: len = %i status = %i\n", len, status); - ifp->if_ierrors++; + if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); } #if 0 if (status & (EMAC_CRCERR | EMAC_LENERR)) { good_packet = 0; - ifp->if_ierrors++; + if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); if (status & EMAC_CRCERR) if_printf(ifp, "crc error\n"); if (status & EMAC_LENERR) @@ -393,18 +393,18 @@ m0->m_next = m; m = m0; } else { - ifp->if_ierrors++; + if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); m_freem(m); m = NULL; continue; } } else if (m->m_len > EMAC_MAC_MAXF) { - ifp->if_ierrors++; + if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); m_freem(m); m = NULL; continue; } - ifp->if_ipackets++; + if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); EMAC_UNLOCK(sc); (*ifp->if_input)(ifp, m); EMAC_LOCK(sc); @@ -431,7 +431,7 @@ } else if_printf(sc->emac_ifp, "watchdog timeout -- resetting\n"); - ifp->if_oerrors++; + if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; emac_init_locked(sc); if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) ==== //depot/projects/smpng/sys/arm/at91/if_ate.c#37 (text) ==== @@ -33,7 +33,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/if_ate.c 267589 2014-06-17 18:10:06Z jhb $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/if_ate.c 271859 2014-09-19 09:20:16Z glebius $"); #include #include @@ -776,19 +776,19 @@ sc->mibdata.dot3StatsAlignmentErrors += RD4(sc, ETH_ALE); sc->mibdata.dot3StatsFCSErrors += RD4(sc, ETH_SEQE); c = RD4(sc, ETH_SCOL); - ifp->if_collisions += c; + if_inc_counter(ifp, IFCOUNTER_COLLISIONS, c); sc->mibdata.dot3StatsSingleCollisionFrames += c; c = RD4(sc, ETH_MCOL); sc->mibdata.dot3StatsMultipleCollisionFrames += c; - ifp->if_collisions += c; + if_inc_counter(ifp, IFCOUNTER_COLLISIONS, c); sc->mibdata.dot3StatsSQETestErrors += RD4(sc, ETH_SQEE); sc->mibdata.dot3StatsDeferredTransmissions += RD4(sc, ETH_DTE); c = RD4(sc, ETH_LCOL); sc->mibdata.dot3StatsLateCollisions += c; - ifp->if_collisions += c; + if_inc_counter(ifp, IFCOUNTER_COLLISIONS, c); c = RD4(sc, ETH_ECOL); sc->mibdata.dot3StatsExcessiveCollisions += c; - ifp->if_collisions += c; + if_inc_counter(ifp, IFCOUNTER_COLLISIONS, c); sc->mibdata.dot3StatsCarrierSenseErrors += RD4(sc, ETH_CSE); sc->mibdata.dot3StatsFrameTooLongs += RD4(sc, ETH_ELR); sc->mibdata.dot3StatsInternalMacReceiveErrors += RD4(sc, ETH_DRFC); @@ -797,9 +797,9 @@ * Not sure where to lump these, so count them against the errors * for the interface. */ - sc->ifp->if_oerrors += RD4(sc, ETH_TUE); - sc->ifp->if_ierrors += RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) + - RD4(sc, ETH_USF); + if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, RD4(sc, ETH_TUE)); + if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, + RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) + RD4(sc, ETH_USF)); /* Schedule another timeout one second from now. */ callout_reset(&sc->tick_ch, hz, ate_tick, sc); @@ -914,7 +914,7 @@ mb = m_get2(remain + ETHER_ALIGN, M_NOWAIT, MT_DATA, M_PKTHDR); if (mb == NULL) { - sc->ifp->if_iqdrops++; + if_inc_counter(sc->ifp, IFCOUNTER_IQDROPS, 1); rxdhead->status = 0; continue; } @@ -957,7 +957,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 19 19:18:24 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0780E1E; Fri, 19 Sep 2014 19:18:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82843E1C for ; Fri, 19 Sep 2014 19:18:24 +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 54CBDDF8 for ; Fri, 19 Sep 2014 19:18:24 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8JJIOKx004803 for ; Fri, 19 Sep 2014 19:18:24 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8JJIOxR004800 for perforce@freebsd.org; Fri, 19 Sep 2014 19:18:24 GMT (envelope-from jhb@freebsd.org) Date: Fri, 19 Sep 2014 19:18:24 GMT Message-Id: <201409191918.s8JJIOxR004800@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1200532 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: Fri, 19 Sep 2014 19:18:25 -0000 http://p4web.freebsd.org/@@1200532?ac=10 Change 1200532 by jhb@jhb_ralph on 2014/09/19 19:18:17 Compile. Affected files ... .. //depot/projects/smpng/sys/vm/vm_mmap.c#115 edit Differences ... ==== //depot/projects/smpng/sys/vm/vm_mmap.c#115 (text+ko) ==== @@ -222,7 +222,7 @@ /* * Ignore old flags that used to be defined but did not do anything. */ - if (curproc < P_OSREL_MAP_RENAME) + if (td->td_proc->p_osrel < P_OSREL_MAP_RENAME) flags &= ~(MAP_RESERVED0020 | MAP_RESERVED0040); /* From owner-p4-projects@FreeBSD.ORG Fri Sep 19 22:37:06 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7ED32E45; Fri, 19 Sep 2014 22:37:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4032DE43 for ; Fri, 19 Sep 2014 22:37:06 +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 2B3FC36F for ; Fri, 19 Sep 2014 22:37:06 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8JMb6Mg055659 for ; Fri, 19 Sep 2014 22:37:06 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8JMb6mv055656 for perforce@freebsd.org; Fri, 19 Sep 2014 22:37:06 GMT (envelope-from jmg@freebsd.org) Date: Fri, 19 Sep 2014 22:37:06 GMT Message-Id: <201409192237.s8JMb6mv055656@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 1200539 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: Fri, 19 Sep 2014 22:37:06 -0000 http://p4web.freebsd.org/@@1200539?ac=10 Change 1200539 by jmg@jmg_carbon2 on 2014/09/19 22:36:45 update sponsore ship lines to include Netgate... Sponsored by: FreeBSD Foundation Sponsored by: Rubicon Communications, LLC (Netgate). Affected files ... .. //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#9 edit .. //depot/projects/opencrypto/sys/crypto/aesni/aesni_ghash.c#4 edit .. //depot/projects/opencrypto/sys/crypto/aesni/aesni_wrap.c#5 edit .. //depot/projects/opencrypto/sys/opencrypto/cryptodev.c#8 edit .. //depot/projects/opencrypto/sys/opencrypto/cryptodev.h#9 edit .. //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#12 edit .. //depot/projects/opencrypto/sys/opencrypto/gfmult.c#4 edit .. //depot/projects/opencrypto/sys/opencrypto/gfmult.h#4 edit .. //depot/projects/opencrypto/sys/opencrypto/gmac.c#5 edit .. //depot/projects/opencrypto/sys/opencrypto/gmac.h#6 edit .. //depot/projects/opencrypto/sys/opencrypto/xform.c#9 edit .. //depot/projects/opencrypto/sys/opencrypto/xform.h#8 edit Differences ... ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#9 (text+ko) ==== @@ -5,7 +5,8 @@ * All rights reserved. * * Portions of this software were developed by John-Mark Gurney - * under sponsorship from the FreeBSD Foundation. + * under sponsorship of the FreeBSD Foundation and + * Rubicon Communications, LLC (Netgate). * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni_ghash.c#4 (text+ko) ==== @@ -3,7 +3,8 @@ * All rights reserved. * * This software was developed by John-Mark Gurney under - * the sponsorship from the FreeBSD Foundation. + * the sponsorship of the FreeBSD Foundation and + * Rubicon Communications, LLC (Netgate). * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni_wrap.c#5 (text+ko) ==== @@ -7,7 +7,8 @@ * All rights reserved. * * Portions of this software were developed by John-Mark Gurney - * under sponsorship from the FreeBSD Foundation. + * under sponsorship of the FreeBSD Foundation and + * Rubicon Communications, LLC (Netgate). * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions ==== //depot/projects/opencrypto/sys/opencrypto/cryptodev.c#8 (text+ko) ==== @@ -7,7 +7,8 @@ * All rights reserved. * * Portions of this software were developed by John-Mark Gurney - * under sponsorship from the FreeBSD Foundation. + * under sponsorship of the FreeBSD Foundation and + * Rubicon Communications, LLC (Netgate). * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions ==== //depot/projects/opencrypto/sys/opencrypto/cryptodev.h#9 (text+ko) ==== @@ -27,7 +27,8 @@ * All rights reserved. * * Portions of this software were developed by John-Mark Gurney - * under sponsorship from the FreeBSD Foundation. + * under sponsorship of the FreeBSD Foundation and + * Rubicon Communications, LLC (Netgate). * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions ==== //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#12 (text+ko) ==== @@ -13,7 +13,8 @@ * All rights reserved. * * Portions of this software were developed by John-Mark Gurney - * under sponsorship from the FreeBSD Foundation. + * under sponsorship of the FreeBSD Foundation and + * Rubicon Communications, LLC (Netgate). * * Permission to use, copy, and modify this software with or without fee * is hereby granted, provided that this entire notice is included in ==== //depot/projects/opencrypto/sys/opencrypto/gfmult.c#4 (text+ko) ==== @@ -3,7 +3,8 @@ * All rights reserved. * * This software was developed by John-Mark Gurney under - * the sponsorship from the FreeBSD Foundation. + * the sponsorship of the FreeBSD Foundation and + * Rubicon Communications, LLC (Netgate). * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: ==== //depot/projects/opencrypto/sys/opencrypto/gfmult.h#4 (text+ko) ==== @@ -3,7 +3,8 @@ * All rights reserved. * * This software was developed by John-Mark Gurney under - * the sponsorship from the FreeBSD Foundation. + * the sponsorship of the FreeBSD Foundation and + * Rubicon Communications, LLC (Netgate). * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: ==== //depot/projects/opencrypto/sys/opencrypto/gmac.c#5 (text+ko) ==== @@ -3,7 +3,8 @@ * All rights reserved. * * This software was developed by John-Mark Gurney under - * the sponsorship from the FreeBSD Foundation. + * the sponsorship of the FreeBSD Foundation and + * Rubicon Communications, LLC (Netgate). * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: ==== //depot/projects/opencrypto/sys/opencrypto/gmac.h#6 (text+ko) ==== @@ -3,7 +3,8 @@ * All rights reserved. * * This software was developed by John-Mark Gurney under - * the sponsorship from the FreeBSD Foundation. + * the sponsorship of the FreeBSD Foundation and + * Rubicon Communications, LLC (Netgate). * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: ==== //depot/projects/opencrypto/sys/opencrypto/xform.c#9 (text+ko) ==== @@ -28,7 +28,8 @@ * All rights reserved. * * Portions of this software were developed by John-Mark Gurney - * under sponsorship from the FreeBSD Foundation. + * under sponsorship of the FreeBSD Foundation and + * Rubicon Communications, LLC (Netgate). * * Permission to use, copy, and modify this software with or without fee * is hereby granted, provided that this entire notice is included in ==== //depot/projects/opencrypto/sys/opencrypto/xform.h#8 (text+ko) ==== @@ -13,7 +13,8 @@ * All rights reserved. * * Portions of this software were developed by John-Mark Gurney - * under sponsorship from the FreeBSD Foundation. + * under sponsorship of the FreeBSD Foundation and + * Rubicon Communications, LLC (Netgate). * * Permission to use, copy, and modify this software without fee * is hereby granted, provided that this entire notice is included in