From owner-p4-projects@FreeBSD.ORG Sun Jul 14 19:07:13 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54B19380; Sun, 14 Jul 2013 19:07:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 16CFF37E for ; Sun, 14 Jul 2013 19:07:13 +0000 (UTC) (envelope-from jonathan@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 066B9E35 for ; Sun, 14 Jul 2013 19:07:13 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6EJ7C4h059085 for ; Sun, 14 Jul 2013 19:07:12 GMT (envelope-from jonathan@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6EJ7Ce4059082 for perforce@freebsd.org; Sun, 14 Jul 2013 19:07:12 GMT (envelope-from jonathan@freebsd.org) Date: Sun, 14 Jul 2013 19:07:12 GMT Message-Id: <201307141907.r6EJ7Ce4059082@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jonathan@freebsd.org using -f From: Jonathan Anderson Subject: PERFORCE change 231152 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jul 2013 19:07:13 -0000 http://p4web.freebsd.org/@@231152?ac=10 Change 231152 by jonathan@jonathan-on-joe on 2013/07/14 19:06:16 Sync TESLA commit c5fc70 to Perforce. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_internal.h#9 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_store.c#5 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_internal.h#9 (text+ko) ==== @@ -78,7 +78,7 @@ /** * Reset all automata in a store to the inactive state. */ -int32_t tesla_store_reset(struct tesla_store *store); +void tesla_store_reset(struct tesla_store *store); /** * Clean up a @ref tesla_store. ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_store.c#5 (text+ko) ==== @@ -151,6 +151,16 @@ } +void +tesla_store_reset(struct tesla_store *store) +{ + DEBUG(libtesla.store.reset, "tesla_store_reset %tx\n", store); + + for (uint32_t i = 0; i < store->length; i++) + tesla_class_reset(store->classes + i); +} + + int32_t tesla_class_get(tesla_store *store, uint32_t id, tesla_class **tclassp, const char *name, const char *description) From owner-p4-projects@FreeBSD.ORG Sun Jul 14 20:18:31 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84022274; Sun, 14 Jul 2013 20:18:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1D7C0272 for ; Sun, 14 Jul 2013 20:18:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 0C99423F for ; Sun, 14 Jul 2013 20:18:31 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6EKIUm5070000 for ; Sun, 14 Jul 2013 20:18:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6EKITGQ069997 for perforce@freebsd.org; Sun, 14 Jul 2013 20:18:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 14 Jul 2013 20:18:29 GMT Message-Id: <201307142018.r6EKITGQ069997@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 231153 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jul 2013 20:18:31 -0000 http://p4web.freebsd.org/@@231153?ac=10 Change 231153 by rwatson@rwatson_cinnamon on 2013/07/14 20:18:22 Forward declare struct trapframe so that less promiscuous C files don't fail to compile when using TESLA_SYSCALL() due to a lack of a forward definition. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/sys/tesla-kernel.h#4 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/sys/tesla-kernel.h#4 (text+ko) ==== @@ -40,6 +40,7 @@ */ #if defined(__amd64__) +struct trapframe; extern void amd64_syscall(struct trapframe *, int); #define TESLA_SYSCALL(x) TESLA_WITHIN(amd64_syscall, x) #else From owner-p4-projects@FreeBSD.ORG Sun Jul 14 20:20:33 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A85CE382; Sun, 14 Jul 2013 20:20:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6D647380 for ; Sun, 14 Jul 2013 20:20:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 4EE68253 for ; Sun, 14 Jul 2013 20:20:33 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6EKKXvi070530 for ; Sun, 14 Jul 2013 20:20:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6EKKXE0070527 for perforce@freebsd.org; Sun, 14 Jul 2013 20:20:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 14 Jul 2013 20:20:33 GMT Message-Id: <201307142020.r6EKKXE0070527@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 231154 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jul 2013 20:20:33 -0000 http://p4web.freebsd.org/@@231154?ac=10 Change 231154 by rwatson@rwatson_cinnamon on 2013/07/14 20:20:23 It turns out not to be the case that all struct thread's go through UMA between the last thread exiting and a new one reusing the structure -- a previously used thread may be cached with a process when the process is returned to UMA, reducing process allocation overhead but leaving the thread ctor/dtor uninvoked. To handle this, also have TESLA per-thread storage hook the process constructor and properly reset TESLA state there. Thanks to John Baldwin for help with debugging this issue. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_class_perthread.c#7 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_class_perthread.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ /* * Routines for managing TESLA per-thread state, used in per-thread automata. * Kernel and userspace implementations differ quite a lot, due to very - * different guarantees for kernel per-thread storage and pthread + * different guarantees for kernel per-thread storage and perthread * thread-specific state. For example, the kernel implementation guarantees * that space will be available if the initial tesla_class allocation * succeedes, and instruments thread create and destroy to ensure this is the @@ -51,11 +51,22 @@ /* * Registration state for per-thread storage. */ -static eventhandler_tag tesla_perthread_ctor_tag; -static eventhandler_tag tesla_perthread_dtor_tag; +static eventhandler_tag tesla_perthread_thread_ctor_tag; +static eventhandler_tag tesla_perthread_thread_dtor_tag; +static eventhandler_tag tesla_perthread_process_dtor_tag; + +static void +tesla_perthread_process_dtor(__unused void *arg, struct proc *p) +{ + struct thread *td; + + td = FIRST_THREAD_IN_PROC(p); + if (td != NULL && td->td_tesla != NULL) + tesla_store_reset(td->td_tesla); +} static void -tesla_perthread_ctor(__unused void *arg, struct thread *td) +tesla_perthread_thread_ctor(__unused void *arg, struct thread *td) { struct tesla_store *store; uint32_t error; @@ -68,7 +79,7 @@ } static void -tesla_perthread_dtor(__unused void *arg, struct thread *td) +tesla_perthread_thread_dtor(__unused void *arg, struct thread *td) { struct tesla_store *store; @@ -81,10 +92,12 @@ tesla_perthread_sysinit(__unused void *arg) { - tesla_perthread_ctor_tag = EVENTHANDLER_REGISTER(thread_ctor, - tesla_perthread_ctor, NULL, EVENTHANDLER_PRI_ANY); - tesla_perthread_dtor_tag = EVENTHANDLER_REGISTER(thread_dtor, - tesla_perthread_dtor, NULL, EVENTHANDLER_PRI_ANY); + tesla_perthread_process_dtor_tag = EVENTHANDLER_REGISTER(process_dtor, + tesla_perthread_process_dtor, NULL, EVENTHANDLER_PRI_ANY); + tesla_perthread_thread_ctor_tag = EVENTHANDLER_REGISTER(thread_ctor, + tesla_perthread_thread_ctor, NULL, EVENTHANDLER_PRI_ANY); + tesla_perthread_thread_dtor_tag = EVENTHANDLER_REGISTER(thread_dtor, + tesla_perthread_thread_dtor, NULL, EVENTHANDLER_PRI_ANY); } SYSINIT(tesla_perthread, SI_SUB_TESLA, SI_ORDER_FIRST, tesla_perthread_sysinit, NULL); From owner-p4-projects@FreeBSD.ORG Sun Jul 14 20:21:35 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D53E47F; Sun, 14 Jul 2013 20:21:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C2A7447D for ; Sun, 14 Jul 2013 20:21:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id B2AF6261 for ; Sun, 14 Jul 2013 20:21:34 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6EKLY1X070778 for ; Sun, 14 Jul 2013 20:21:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6EKLYUl070775 for perforce@freebsd.org; Sun, 14 Jul 2013 20:21:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 14 Jul 2013 20:21:34 GMT Message-Id: <201307142021.r6EKLYUl070775@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 231155 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jul 2013 20:21:35 -0000 http://p4web.freebsd.org/@@231155?ac=10 Change 231155 by rwatson@rwatson_cinnamon on 2013/07/14 20:20:57 Implement a number of simple TESLA test cases: passing and failing previously and eventually assertions reached via sysctls. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/conf/files#9 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/test/tesla_test.c#1 add Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/conf/files#9 (text+ko) ==== @@ -497,6 +497,7 @@ contrib/tesla/libtesla/tesla_store.c optional tesla contrib/tesla/libtesla/tesla_update.c optional tesla contrib/tesla/libtesla/tesla_util.c optional tesla +contrib/tesla/test/tesla_test.c optional tesla contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm \ compile-with "${NORMAL_C_NOWERROR} -I$S/contrib/ngatm" contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm \ From owner-p4-projects@FreeBSD.ORG Sun Jul 14 22:11:28 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAD1B103; Sun, 14 Jul 2013 22:11:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 57C9C101 for ; Sun, 14 Jul 2013 22:11:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 38897249 for ; Sun, 14 Jul 2013 22:11:27 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6EMBQwk028155 for ; Sun, 14 Jul 2013 22:11:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6EMBQac028152 for perforce@freebsd.org; Sun, 14 Jul 2013 22:11:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 14 Jul 2013 22:11:26 GMT Message-Id: <201307142211.r6EMBQac028152@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 231157 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jul 2013 22:11:28 -0000 http://p4web.freebsd.org/@@231157?ac=10 Change 231157 by rwatson@rwatson_cinnamon on 2013/07/14 22:11:02 Use called() syntax rather than bare functions in previously() and eventually(); unfortunately, the TESLA analyser does not yet warn (or perhaps error out) if this mistake is made. Mark a function as __noinline in the hopes that this allows it to be instrumented. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/test/tesla_test.c#2 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/test/tesla_test.c#2 (text+ko) ==== @@ -50,7 +50,7 @@ /* * To avoid a no-op function. */ -static void +static void __noinline debug_tesla_func(void) { @@ -62,7 +62,7 @@ { int error; - TESLA_SYSCALL(eventually(debug_tesla_func())); + TESLA_SYSCALL(eventually(called(debug_tesla_func()))); error = sysctl_handle_int(oidp, &debug_tesla_func_counter, 0, req); if (error) return (error); @@ -80,7 +80,7 @@ { int error; - TESLA_SYSCALL(eventually(debug_tesla_func())); + TESLA_SYSCALL(eventually(called(debug_tesla_func()))); error = sysctl_handle_int(oidp, &debug_tesla_func_counter, 0, req); if (error) return (error); @@ -102,7 +102,7 @@ if (error) return (error); - TESLA_SYSCALL(previously(debug_tesla_func())); + TESLA_SYSCALL(previously(called(debug_tesla_func()))); return (0); } @@ -119,7 +119,7 @@ if (error) return (error); - TESLA_SYSCALL(previously(debug_tesla_func())); + TESLA_SYSCALL(previously(called(debug_tesla_func()))); return (0); } From owner-p4-projects@FreeBSD.ORG Mon Jul 15 20:39:51 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C182A76; Mon, 15 Jul 2013 20:39:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C10D7A74 for ; Mon, 15 Jul 2013 20:39:50 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id A33F499D for ; Mon, 15 Jul 2013 20:39:50 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6FKdo5Y039481 for ; Mon, 15 Jul 2013 20:39:50 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6FKdoZ0039478 for perforce@freebsd.org; Mon, 15 Jul 2013 20:39:50 GMT (envelope-from brooks@freebsd.org) Date: Mon, 15 Jul 2013 20:39:50 GMT Message-Id: <201307152039.r6FKdoZ0039478@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 231181 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jul 2013 20:39:51 -0000 http://p4web.freebsd.org/@@231181?ac=10 Change 231181 by brooks@brooks_zenith on 2013/07/15 20:39:26 Sync with FreeBSD/BERI. Pulls in recent SMP work. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beri-sim.dts#3 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#12 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/conf/options#9 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/conf/options.mips#11 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/sdcard/altera_sdcard.c#5 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/beri_mp.c#3 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/beri_pic.c#5 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/std.beri#6 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/cavium/octeon_mp.c#4 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_SIM_BASE#2 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_SIM_MDROOT#8 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/gxemul/gxemul_machdep.c#5 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/hwfunc.h#5 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/cache.c#4 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/cpu.c#5 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/mp_machdep.c#4 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/nlm/xlp_machdep.c#4 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/rmi/xlr_machdep.c#4 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/sibyte/sb_machdep.c#5 integrate Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beri-sim.dts#3 (text+ko) ==== @@ -47,9 +47,34 @@ #size-cells = <1>; cpus { + #address-cells = <1>; + #size-cells = <1>; + + /* + * Secondary CPUs all start disabled and use the + * spin-table enable method. cpu-release-addr must be + * specified for each cpu other than cpu@0. Values of + * cpu-release-addr grow down from 0x100000 (kernel). + */ + status = "disabled"; + enable-method = "spin-table"; + cpu@0 { + device-type = "cpu"; compatible = "sri-cambridge,beri"; + + reg = <0>; + status = "okay"; }; + + cpu@1 { + device-type = "cpu"; + compatible = "sri-cambridge,beri"; + + reg = <1>; + // XXX: should we need cached prefix? + cpu-release-addr = <0xffffffff 0x800fffe0>; + }; }; soc { @@ -69,10 +94,24 @@ reg = <0x0 0x4000000>; // 64M at 0x0 }; + beripic: beripic@7f804000 { + compatible = "sri-cambridge,beri-pic"; + interrupt-controller; + #address-cells = <0>; + #interrupt-cells = <1>; + reg= <0x7f804000 0x400 + 0x7f806000 0x10 + 0x7f806080 0x10 + 0x7f806100 0x10>; + interrupts = <0 1 2 3 4>; + hard-interrupt-sources = <64>; + soft-interrupt-sources = <64>; + }; + serial@7f000000 { compatible = "altera,jtag_uart-11_0"; reg = <0x7f000000 0x40>; - interrupts = <0>; + //interrupts = <0>; }; serial@7f001000 { ==== //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#12 (text+ko) ==== @@ -67,6 +67,15 @@ reg = <0>; status = "okay"; }; + + cpu@1 { + device-type = "cpu"; + compatible = "sri-cambridge,beri"; + + reg = <1>; + // XXX: should we need cached prefix? + cpu-release-addr = <0xffffffff 0x800fffe0>; + } }; soc { @@ -183,26 +192,26 @@ ethernet@7f007000 { compatible = "altera,atse"; - /* MAC, RX+RXC, TX+TXC. */ + // MAC, RX+RXC, TX+TXC. reg = <0x7f007000 0x400 0x7f007500 0x8 0x7f007520 0x20 0x7f007400 0x8 0x7f007420 0x20>; - /* RX, TX */ + // RX, TX interrupts = <1 2>; interrupt-parent = <&beripic>; }; ethernet@7f005000 { compatible = "altera,atse"; - /* MAC, RX+RXC, TX+TXC. */ + // MAC, RX+RXC, TX+TXC. reg = <0x7f005000 0x400 0x7f005500 0x8 0x7f005520 0x20 0x7f005400 0x8 0x7f005420 0x20>; - /* RX, TX */ + // RX, TX interrupts = <11 12>; interrupt-parent = <&beripic>; }; @@ -221,7 +230,6 @@ 0x7f006100 0x007f>; }; -/* usb@0x7f100000 { compatible = "philips,isp1761"; reg = <0x7f100000 0x40000 @@ -230,7 +238,6 @@ interrupts = <4 5>; interrupt-parent = <&beripic>; }; -*/ avgen@0x7f009000 { compatible = "sri-cambridge,avgen"; ==== //depot/projects/ctsrd/cheribsd/src/sys/conf/options#9 (text+ko) ==== @@ -68,6 +68,7 @@ # Miscellaneous options. ADAPTIVE_LOCKMGRS ALQ +ALTERA_SDCARD_FAST_SIM opt_altera_sdcard.h AUDIT opt_global.h BOOTHOWTO opt_global.h BOOTVERBOSE opt_global.h ==== //depot/projects/ctsrd/cheribsd/src/sys/conf/options.mips#11 (text+ko) ==== @@ -70,6 +70,11 @@ MAXMEM opt_global.h # +# Manual override of cache config +# +MIPS_DISABLE_L1_CACHE opt_global.h + +# # Options that control the Cavium Simple Executive. # OCTEON_MODEL opt_cvmx.h ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/sdcard/altera_sdcard.c#5 (text+ko) ==== @@ -31,6 +31,8 @@ #include __FBSDID("$FreeBSD: head/sys/dev/altera/sdcard/altera_sdcard.c 245380 2013-01-13 16:57:11Z rwatson $"); +#include "opt_altera_sdcard.h" + #include #include #include @@ -258,6 +260,9 @@ ALTERA_SDCARD_LOCK_ASSERT(sc); KASSERT(sc->as_currentbio != NULL, ("%s: no current I/O", __func__)); +#ifdef ALTERA_SDCARD_FAST_SIM +recheck: +#endif asr = altera_sdcard_read_asr(sc); /* @@ -299,9 +304,12 @@ /* * Finally, either start the next I/O or transition to the IDLE state. */ - if (bioq_first(&sc->as_bioq) != NULL) + if (bioq_first(&sc->as_bioq) != NULL) { altera_sdcard_nextio(sc); - else +#ifdef ALTERA_SDCARD_FAST_SIM + goto recheck; +#endif + } else sc->as_state = ALTERA_SDCARD_STATE_IDLE; } @@ -398,6 +406,8 @@ taskqueue_cancel_timeout(sc->as_taskqueue, &sc->as_task, NULL); altera_sdcard_nextio(sc); - taskqueue_enqueue_timeout(sc->as_taskqueue, &sc->as_task, - ALTERA_SDCARD_TIMEOUT_IO); +#ifdef ALTERA_SDCARD_FAST_SIM + altera_sdcard_task_io(sc); +#endif + altera_sdcard_task_rechedule(sc); } ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/beri_mp.c#3 (text+ko) ==== @@ -57,6 +57,8 @@ { phandle_t cpus, cpu; pcell_t reg; + char prop[16]; + struct spin_entry *se; if ((cpus = OF_finddevice("/cpus")) <= 0) { printf("%s: no \"/cpus\" device found in FDT\n", __func__); @@ -76,8 +78,36 @@ if (reg > MAXCPU) { printf("%s: cpu ID too large (%d > %d)\n", __func__, reg, MAXCPU); + continue; } cpu_of_nodes[reg] = cpu; + + if (reg != 0) { + if (OF_getprop(cpu, "enable-method", &prop, + sizeof(prop)) <= 0 && OF_getprop(OF_parent(cpu), + "enable-method", &prop, sizeof(prop)) <= 0) { + printf("%s: CPU %d has no enable-method " + "property\n", __func__, reg); + continue; + } + if (strcmp("spin-table", prop) != 0) { + printf("%s: CPU %d enable-method is '%s' not " + "'spin-table'\n", __func__, reg, prop); + continue; + } + + if (OF_getprop(cpu, "cpu-release-addr", &se, + sizeof(se)) <= 0) { + printf("%s: CPU %d has missing or invalid " + "cpu-release-addr\n", __func__, reg); + continue; + } + if (se->entry_addr != 1) { + printf("%s: CPU %d has uninitalized spin " + "entry\n", __func__, reg); + continue; + } + } CPU_SET(reg, mask); } while ((cpu = OF_peer(cpu)) > 0); @@ -91,10 +121,29 @@ * XXX: panic instead? */ CPU_ZERO(mask); - CPU_SET(1, mask); + CPU_SET(0, mask); } void +platform_init_secondary(int cpuid) +{ + device_t ic; + int ipi; + + ipi = platform_ipi_intrnum(); + + /* XXX: single core/pic */ + ic = SLIST_FIRST(&fdt_ic_list_head)->dev; + FDT_IC_SETUP_IPI(ic, cpuid, ipi); + picmap[cpuid] = ic; + + /* Unmask the interrupt */ + if (cpuid != 0) + mips_wr_status(mips_rd_status() | (((1 << ipi) << 8) << 2)); +} + + +void platform_ipi_send(int cpuid) { @@ -135,7 +184,6 @@ platform_init_ap(int cpuid) { u_int clock_int_mask; - device_t ic; KASSERT(cpuid < MAXCPU, ("%s: invalid CPU id %d", __func__, cpuid)); @@ -144,14 +192,6 @@ */ clock_int_mask = hard_int_mask(5); set_intr_mask(clock_int_mask); - - /* - * Enable IPIs. - */ - /* XXX: single core/pic */ - ic = SLIST_FIRST(&fdt_ic_list_head)->dev; - FDT_IC_SETUP_IPI(ic, cpuid, platform_ipi_intrnum()); - picmap[cpuid] = ic; } /* @@ -171,22 +211,31 @@ ("%s: invalid CPU id %d", __func__, cpuid)); cpu = cpu_of_nodes[cpuid]; - if (OF_getprop(cpu, "status", &prop, sizeof(prop)) <= 0 && - OF_getprop(OF_parent(cpu), "status", &prop, sizeof(prop))) - panic("%s: CPU %d has no status property", __func__, cpuid); - else - if (strcmp("disabled", prop) != 0) - panic("%s: CPU %d status is '%s' not 'disabled'", - __func__, cpuid, prop); + if (OF_getprop(cpu, "status", &prop, sizeof(prop)) <= 0) { + if (bootverbose) + printf("%s: CPU %d has no status property, " + "trying parent\n", __func__, cpuid); + if (OF_getprop(OF_parent(cpu), "status", &prop, + sizeof(prop)) <= 0) + panic("%s: CPU %d has no status property", __func__, + cpuid); + } + if (strcmp("disabled", prop) != 0) + panic("%s: CPU %d status is '%s' not 'disabled'", + __func__, cpuid, prop); - if (OF_getprop(cpu, "enable-method", &prop, sizeof(prop)) <= 0 && - OF_getprop(OF_parent(cpu), "enable-method", &prop, sizeof(prop))) - panic("%s: CPU %d has no enable-method property", __func__, - cpuid); - else - if (strcmp("spin-table", prop) != 0) - panic("%s: CPU %d enable-method is '%s' not " - "'spin-table'", __func__, cpuid, prop); + if (OF_getprop(cpu, "enable-method", &prop, sizeof(prop)) <= 0) { + if (bootverbose) + printf("%s: CPU %d has no enable-method, " + "trying parent\n", __func__, cpuid); + if (OF_getprop(OF_parent(cpu), "enable-method", &prop, + sizeof(prop)) <= 0) + panic("%s: CPU %d has no enable-method property", + __func__, cpuid); + } + if (strcmp("spin-table", prop) != 0) + panic("%s: CPU %d enable-method is '%s' not " + "'spin-table'", __func__, cpuid, prop); if (OF_getprop(cpu, "cpu-release-addr", &se, sizeof(se)) <= 0) panic("%s: CPU %d has missing or invalid cpu-release-addr", ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/beri_pic.c#5 (text+ko) ==== @@ -218,7 +218,9 @@ static void bp_config_source(device_t ic, int src, int enable, u_long tid, u_long irq) { +#if 0 char configstr[64]; +#endif struct beripic_softc *sc; uint64_t config; @@ -229,9 +231,12 @@ config |= tid << BP_CFG_SHIFT_TID; config |= irq << BP_CFG_SHIFT_IRQ; - if (bootverbose) +#if 0 + /* There is not valid console when doing IPI setup on APs */ + if (bootverbose && (tid == 0 || !cold)) device_printf(ic, "src %d: %s\n", src, bp_strconfig(config, configstr, sizeof(configstr))); +#endif bp_write_cfg(sc, src, config); } @@ -552,12 +557,14 @@ if (error != 0) goto err; +#ifdef NOTYET #ifdef SMP /* XXX: bind ithread to cpu */ sc->bp_next_tid++; if (sc->bp_next_tid >= sc->bp_nthreads) sc->bp_next_tid = 0; #endif +#endif if (sc->bp_next_tid == 0) { sc->bp_next_irq++; if (sc->bp_next_irq >= sc->bp_nirqs) @@ -650,7 +657,7 @@ bit = 1ULL << (tid % 64); bus_space_write_8(sc->bp_set_bst, sc->bp_set_bsh, - BP_FIRST_SOFT / 8 + (tid >> 6), bit); + (BP_FIRST_SOFT / 8) + (tid / 64), bit); } static void @@ -665,7 +672,7 @@ bit = 1ULL << (tid % 64); bus_space_write_8(sc->bp_clear_bst, sc->bp_clear_bsh, - BP_FIRST_SOFT / 8 + (tid >> 6), bit); + (BP_FIRST_SOFT / 8) + (tid / 64), bit); } #endif ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/std.beri#6 (text+ko) ==== @@ -4,4 +4,4 @@ cpu CPU_MIPS4KC options BERI_LARGE_TLB - +options MIPS_DISABLE_L1_CACHE ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/cavium/octeon_mp.c#4 (text+ko) ==== @@ -46,6 +46,12 @@ unsigned octeon_ap_boot = ~0; void +platform_init_secondary(int cpuid) +{ + +} + +void platform_ipi_send(int cpuid) { cvmx_write_csr(CVMX_CIU_MBOX_SETX(cpuid), 1); ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_SIM_BASE#2 (text+ko) ==== @@ -12,6 +12,8 @@ options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=beri-sim.dts +options ALTERA_SDCARD_FAST_SIM + device altera_avgen device altera_jtag_uart device altera_sdcard ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_SIM_MDROOT#8 (text+ko) ==== @@ -10,9 +10,9 @@ ident BERI_SIM_MDROOT # -# This kernel configuration uses an embedded 8MB memory root file system. +# This kernel configuration uses an embedded memory root file system. # Adjust the following path based on local requirements. # options MD_ROOT # MD is a potential root device -options MD_ROOT_SIZE=8192 +options MD_ROOT_SIZE=26112 # 25.5MB options ROOTDEVNAME=\"ufs:md0\" ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/gxemul/gxemul_machdep.c#5 (text+ko) ==== @@ -174,6 +174,12 @@ #ifdef SMP void +platform_init_secondary(int cpuid) +{ + +} + +void platform_ipi_send(int cpuid) { GXEMUL_MP_DEV_WRITE(GXEMUL_MP_DEV_IPI_ONE, (1 << 16) | cpuid); ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/include/hwfunc.h#5 (text+ko) ==== @@ -70,6 +70,11 @@ int platform_ipi_intrnum(void); /* + * Set up IPIs for this CPU. + */ +void platform_init_secondary(int cpuid); + +/* * Trigger a IPI interrupt on 'cpuid'. */ void platform_ipi_send(int cpuid); ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/cache.c#4 (text+ko) ==== @@ -116,11 +116,9 @@ #ifdef MIPS_DISABLE_L1_CACHE case 0: - mips_cache_ops.mco_icache_sync_all = cache_noop; - mips_cache_ops.mco_icache_sync_range = - (void (*)(vaddr_t, vsize_t))cache_noop; - mips_cache_ops.mco_icache_sync_range_index = - (void (*)(vaddr_t, vsize_t))cache_noop; + mips_cache_ops.mco_icache_sync_all = (void (*)(void))cache_noop; + mips_cache_ops.mco_icache_sync_range = cache_noop; + mips_cache_ops.mco_icache_sync_range_index = cache_noop; break; #endif default: @@ -193,20 +191,16 @@ #endif #ifdef MIPS_DISABLE_L1_CACHE case 0: - mips_cache_ops.mco_pdcache_wbinv_all = cache_noop; - mips_cache_ops.mco_intern_pdcache_wbinv_all = cache_noop; - mips_cache_ops.mco_pdcache_wbinv_range = - (void (*)(vaddr_t, vsize_t))cache_noop; - mips_cache_ops.mco_pdcache_wbinv_range_index = - (void (*)(vaddr_t, vsize_t))cache_noop; + mips_cache_ops.mco_pdcache_wbinv_all = + mips_cache_ops.mco_intern_pdcache_wbinv_all = + (void (*)(void))cache_noop; + mips_cache_ops.mco_pdcache_wbinv_range = cache_noop; + mips_cache_ops.mco_pdcache_wbinv_range_index = cache_noop; mips_cache_ops.mco_intern_pdcache_wbinv_range_index = - (void (*)(vaddr_t, vsize_t))cache_noop; - mips_cache_ops.mco_pdcache_inv_range = - (void (*)(vaddr_t, vsize_t))cache_noop; - mips_cache_ops.mco_pdcache_wb_range = - (void (*)(vaddr_t, vsize_t))cache_noop; - mips_cache_ops.mco_intern_pdcache_wb_range = - (void (*)(vaddr_t, vsize_t))cache_noop; + cache_noop; + mips_cache_ops.mco_pdcache_inv_range = cache_noop; + mips_cache_ops.mco_pdcache_wb_range = cache_noop; + mips_cache_ops.mco_intern_pdcache_wb_range = cache_noop; break; #endif default: @@ -222,26 +216,22 @@ #ifdef CACHE_DEBUG printf(" Dcache is coherent\n"); #endif - mips_cache_ops.mco_pdcache_wbinv_all = cache_noop; - mips_cache_ops.mco_pdcache_wbinv_range = - (void (*)(vaddr_t, vsize_t))cache_noop; - mips_cache_ops.mco_pdcache_wbinv_range_index = - (void (*)(vaddr_t, vsize_t))cache_noop; - mips_cache_ops.mco_pdcache_inv_range = - (void (*)(vaddr_t, vsize_t))cache_noop; - mips_cache_ops.mco_pdcache_wb_range = - (void (*)(vaddr_t, vsize_t))cache_noop; + mips_cache_ops.mco_pdcache_wbinv_all = + (void (*)(void))cache_noop; + mips_cache_ops.mco_pdcache_wbinv_range = cache_noop; + mips_cache_ops.mco_pdcache_wbinv_range_index = cache_noop; + mips_cache_ops.mco_pdcache_inv_range = cache_noop; + mips_cache_ops.mco_pdcache_wb_range = cache_noop; } if (mips_cpu_flags & CPU_MIPS_I_D_CACHE_COHERENT) { #ifdef CACHE_DEBUG printf(" Icache is coherent against Dcache\n"); #endif mips_cache_ops.mco_intern_pdcache_wbinv_all = + (void (*)(void))cache_noop; + mips_cache_ops.mco_intern_pdcache_wbinv_range_index = cache_noop; - mips_cache_ops.mco_intern_pdcache_wbinv_range_index = - (void (*)(vaddr_t, vsize_t))cache_noop; - mips_cache_ops.mco_intern_pdcache_wb_range = - (void (*)(vaddr_t, vsize_t))cache_noop; + mips_cache_ops.mco_intern_pdcache_wb_range = cache_noop; } #endif ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/cpu.c#5 (text+ko) ==== @@ -128,6 +128,9 @@ #endif /* L1 instruction cache. */ +#ifdef MIPS_DISABLE_L1_CACHE + cpuinfo->l1.ic_linesize = 0; +#else tmp = (cfg1 & MIPS_CONFIG1_IL_MASK) >> MIPS_CONFIG1_IL_SHIFT; if (tmp != 0) { cpuinfo->l1.ic_linesize = 1 << (tmp + 1); @@ -135,9 +138,13 @@ cpuinfo->l1.ic_nsets = 1 << (((cfg1 & MIPS_CONFIG1_IS_MASK) >> MIPS_CONFIG1_IS_SHIFT) + 6); } +#endif + /* L1 data cache. */ +#ifdef MIPS_DISABLE_L1_CACHE + cpuinfo->l1.dc_linesize = 0; +#else #ifndef CPU_CNMIPS - /* L1 data cache. */ tmp = (cfg1 & MIPS_CONFIG1_DL_MASK) >> MIPS_CONFIG1_DL_SHIFT; if (tmp != 0) { cpuinfo->l1.dc_linesize = 1 << (tmp + 1); @@ -173,6 +180,7 @@ /* All Octeon models use 128 byte line size. */ cpuinfo->l1.dc_linesize = 128; #endif +#endif cpuinfo->l1.ic_size = cpuinfo->l1.ic_linesize * cpuinfo->l1.ic_nsets * cpuinfo->l1.ic_nways; ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/mp_machdep.c#4 (text+ko) ==== @@ -301,6 +301,8 @@ while (!aps_ready) ; + platform_init_secondary(cpuid); + /* Initialize curthread. */ KASSERT(PCPU_GET(idlethread) != NULL, ("no idle thread")); PCPU_SET(curthread, PCPU_GET(idlethread)); @@ -342,6 +344,8 @@ if (mp_ncpus == 1) return; + platform_init_secondary(0); + /* * IPI handler */ ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/nlm/xlp_machdep.c#4 (text+ko) ==== @@ -697,6 +697,12 @@ } void +platform_init_secondary(int cpuid) +{ + +} + +void platform_ipi_send(int cpuid) { ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/rmi/xlr_machdep.c#4 (text+ko) ==== @@ -578,6 +578,12 @@ } void +platform_init_secondary(int cpuid) +{ + +} + +void platform_ipi_send(int cpuid) { ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/sibyte/sb_machdep.c#5 (text+ko) ==== @@ -295,6 +295,12 @@ #ifdef SMP void +platform_init_secondary(int cpuid) +{ + +} + +void platform_ipi_send(int cpuid) { KASSERT(cpuid == 0 || cpuid == 1, From owner-p4-projects@FreeBSD.ORG Wed Jul 17 02:00:47 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42E13DDF; Wed, 17 Jul 2013 02:00:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0535EDDD for ; Wed, 17 Jul 2013 02:00:47 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id E9664C2E for ; Wed, 17 Jul 2013 02:00:46 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6H20kYN019501 for ; Wed, 17 Jul 2013 02:00:46 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6H20kU2019496 for perforce@freebsd.org; Wed, 17 Jul 2013 02:00:46 GMT (envelope-from brooks@freebsd.org) Date: Wed, 17 Jul 2013 02:00:46 GMT Message-Id: <201307170200.r6H20kU2019496@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 231209 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2013 02:00:47 -0000 http://p4web.freebsd.org/@@231209?ac=10 Change 231209 by brooks@brooks_zenith on 2013/07/17 02:00:18 Rather than building a kernel.instrumented that everyone forgets to install as kernel, add a WITH_TESLA option that builds an instrumented kernel. If WITH_TESLA is set it now implies CONFIGARGS=-t. This change includes partial support for building a nominally instrumentable kernel without tesla, but it currently includes a horriable hack that tesla.manifest must always be created. At this point this should (assuming it works) be good enough for benchmarking the impact of tesla on compliation, but we're probably generalizing from too few examples to nail down the right solution. Affected files ... .. //depot/projects/ctsrd/tesla/src/Makefile.inc1#15 edit .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#7 edit .. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#11 edit .. //depot/projects/ctsrd/tesla/src/sys/conf/kern.post.mk#4 edit .. //depot/projects/ctsrd/tesla/src/sys/conf/kern.pre.mk#5 edit .. //depot/projects/ctsrd/tesla/src/usr.sbin/config/mkmakefile.c#3 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/Makefile.inc1#15 (text+ko) ==== @@ -895,6 +895,10 @@ .endif INSTKERNNAME?= kernel +.if ${MK_LLVM_INSTRUMENTED} != "no" +CONFIGARGS+= -t +.endif + KERNSRCDIR?= ${.CURDIR}/sys KRNLCONFDIR= ${KERNSRCDIR}/${TARGET}/conf KRNLOBJDIR= ${OBJTREE}${KERNSRCDIR} ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#7 (text+ko) ==== @@ -374,7 +374,8 @@ NAND \ OFED \ OPENSSH_NONE_CIPHER \ - SHARED_TOOLCHAIN + SHARED_TOOLCHAIN \ + TESLA # # Default behaviour of some options depends on the architecture. Unfortunately @@ -621,6 +622,39 @@ .endif .endfor + +# +# Some targets require a different build process in order to allow LLVM +# instrumentation passes to be applied. +# +# XXX: The current construction allow an empty insturmentation path or +# a tesla one. +# +.if defined(WITH_LLVM_INSTRUMENTED) && defined(WITHOUT_LLVM_INSTRUMENTED) +.error WITH_LLVM_INSTRUMENTED and WITHOUT_LLVM_INSTRUMENTED can't both be set. +.endif +.if defined(MK_LLVM_INSTRUMENTED) +.error MK_LLVM_INSTRUMENTED can't be set by a user. +.endif +.if ${MK_TESLA} == "no" +LLVM_INSTR_DEP?= +LLVM_INSTR_COMMAND?= cp ${.IMPSRC} ${.TARGET} +.if defined(WITH_LLVM_INSTRUMENTED) +MK_LLVM_INSTRUMENTED:= yes +.else +MK_LLVM_INSTRUMENTED:= no +.endif +.else +LLVM_INSTR_DEP= tesla.manifest +LLVM_INSTR_COMMAND= ${TESLA} instrument -S -verify-each -tesla-manifest \ + tesla.manifest ${.IMPSRC} -o ${.TARGET} +.if defined(WITHOUT_LLVM_INSTRUMENTED) +.error WITHOUT_LLVM_INSTRUMENTED and WITH_TESLA can't both be set. +.else +MK_LLVM_INSTRUMENTED:= yes +.endif +.endif + .if ${MK_CTF} != "no" CTFCONVERT_CMD= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} .elif defined(.PARSEDIR) || (defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300) ==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#11 (text+ko) ==== @@ -279,7 +279,7 @@ .e.o .r.o .F.o .f.o: ${FC} ${RFLAGS} ${EFLAGS} ${FFLAGS} -c ${.IMPSRC} -.instrll.instro: tesla.manifest +.instrll.instro: ${LLC} -filetype=obj ${LLCFLAGS} ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} @@ -287,8 +287,7 @@ ${TESLA} graph ${.IMPSRC} -o ${.TARGET} .oll.instrll: tesla.manifest - ${TESLA} instrument -S -verify-each -tesla-manifest tesla.manifest \ - ${.IMPSRC} -o ${.TARGET} + ${LLVM_INSTR_COMMAND} .S.o: ${CC} ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} ==== //depot/projects/ctsrd/tesla/src/sys/conf/kern.post.mk#4 (text+ko) ==== @@ -83,10 +83,6 @@ kernel-all: ${KERNEL_KO} ${KERNEL_EXTRA} -.if defined(DO_TESLA) -kernel-all: ${KERNEL_KO}.instrumented -.endif - kernel-cleandir: kernel-clean kernel-cleandepend kernel-clobber: @@ -162,30 +158,19 @@ vnode_if.c vnode_if.h vnode_if_newproto.h vnode_if_typedef.h \ ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ ${TESLA_FILES} ${OLLS} ${INSTRLLS} ${INSTROBJS} \ - tesla.manifest ${KERNEL_KO}.instrumented \ + tesla.manifest \ ${CLEAN} lint: ${LNFILES} ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC} 2>&1 | \ tee -a linterrs -TESLA_CFILES= ${CFILES} ${SYSTEM_CFILES} -TESLA_FILES= ${TESLA_CFILES:T:.c=.tesla} -OLLS= ${TESLA_CFILES:T:.c=.oll} -INSTRLLS= ${TESLA_CFILES:T:.c=.instrll} -INSTROBJS= ${TESLA_CFILES:T:.c=.instro} - +.if ${MK_TESLA} != "no" tesla.manifest: ${TESLA_FILES} cat ${TESLA_FILES} > ${.TARGET} - -tesla: ${KERNEL_KO}.instrumented - -${KERNEL_KO}.instrumented: ${INSTROBJS} - ${LD} -Bdynamic -T ${LDSCRIPT} ${LDFLAGS} --no-warn-mismatch \ - -warn-common -export-dynamic -dynamic-linker /red/herring \ - -o ${.TARGET} -X ${INSTROBJS} ${NOT_C_OBJS} vers.o hack.So -.if ${MK_CTF} != "no" - ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${INSTROBJS} ${NOT_C_OBJS} vers.o +.else +tesla.manifest: + touch ${.TARGET} .endif # This is a hack. BFD "optimizes" away dynamic mode if there are no ==== //depot/projects/ctsrd/tesla/src/sys/conf/kern.pre.mk#5 (text+ko) ==== @@ -169,10 +169,20 @@ GEN_CFILES= $S/$M/$M/genassym.c ${MFILES:T:S/.m$/.c/} SYSTEM_CFILES= config.c env.c hints.c vnode_if.c SYSTEM_DEP= Makefile ${SYSTEM_OBJS} -SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS} -SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o} +SYSTEM_OBJS= locore.o ${MDOBJS} +.if ${MK_LLVM_INSTRUMENTED} == "no" +SYSTEM_OBJS+= ${OBJS} ${SYSTEM_CFILES:.c=.o} +.else +# XXX: should probably include GEN_CFILES, but may be tricky +LLVM_CFILES= ${CFILES} ${SYSTEM_CFILES} +TESLA_FILES= ${LLVM_CFILES:T:.c=.tesla} +OLLS= ${LLVM_CFILES:T:.c=.oll} +INSTRLLS= ${LLVM_CFILES:T:.c=.instrll} +INSTROBJS= ${LLVM_CFILES:T:.c=.instro} +SYSTEM_OBJS+= ${LLVM_CFILES:T:.c=.instro} ${NOT_C_OBJS} +.endif SYSTEM_OBJS+= hack.So -SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} ${LDFLAGS} --no-warn-mismatch \ +SYSTEM_LD= ${LD} -Bdynamic -T ${LDSCRIPT} ${LDFLAGS} --no-warn-mismatch \ -warn-common -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \ ==== //depot/projects/ctsrd/tesla/src/usr.sbin/config/mkmakefile.c#3 (text+ko) ==== @@ -670,11 +670,12 @@ suff); if (tesla) { if (strcmp(suff, "c") == 0) - fprintf(fp, "C_OBJS+=${%sFILES:T:.%s=.o}\n", - SUFF, suff); + fprintf(fp, "C_OBJS+=${%sFILES:T:Nlocore.%s:.%s=.o}\n", + SUFF, suff, suff); else - fprintf(fp, "NOT_C_OBJS+=${%sFILES:T:.%s=.o}\n", - SUFF, suff); + fprintf(fp, + "NOT_C_OBJS+=${%sFILES:T:Nlocore.%s:.%s=.o}\n", + SUFF, suff, suff); } } From owner-p4-projects@FreeBSD.ORG Wed Jul 17 14:46:40 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E02587B7; Wed, 17 Jul 2013 14:46:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A21017B5 for ; Wed, 17 Jul 2013 14:46:39 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 933923D6 for ; Wed, 17 Jul 2013 14:46:39 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HEkdk6035355 for ; Wed, 17 Jul 2013 14:46:39 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6HEkdYl035352 for perforce@freebsd.org; Wed, 17 Jul 2013 14:46:39 GMT (envelope-from brooks@freebsd.org) Date: Wed, 17 Jul 2013 14:46:39 GMT Message-Id: <201307171446.r6HEkdYl035352@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 231227 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2013 14:46:40 -0000 http://p4web.freebsd.org/@@231227?ac=10 Change 231227 by brooks@brooks_zenith on 2013/07/17 14:46:35 Don't run the optimizer when generating LLVM-IR. Instead, run it in llc when creating the actual object files. Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#12 edit .. //depot/projects/ctsrd/tesla/src/sys/conf/kern.pre.mk#6 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#12 (text+ko) ==== @@ -32,7 +32,7 @@ .if defined(%POSIX) .SUFFIXES: .o .c .y .l .a .sh .f .else -.SUFFIXES: .out .a .dot .instrll .instro .oll .obc .ln .manifest .o .c .cc .cpp .cxx .C .m .F .f .e .r .tesla .y .l .S .asm .s .cl .p .h .sh +.SUFFIXES: .out .a .dot .instrll .instro .oll .ln .manifest .o .c .cc .cpp .cxx .C .m .F .f .e .r .tesla .y .l .S .asm .s .cl .p .h .sh .endif AR ?= ar @@ -126,6 +126,7 @@ LINTLIBFLAGS ?= -cghapbxu -C ${LIB} LLC ?= llc +LLCFLAGS ?= ${CFLAGS:M-O*:S/^-O$/-O1/:S/-O/-O=/} LLVM_LINK ?= llvm-link @@ -231,11 +232,8 @@ chmod a+x ${.TARGET} .c.oll: - ${CC} ${CFLAGS} -emit-llvm -S ${.IMPSRC} -o ${.TARGET} + ${CC} ${CFLAGS:N-O*} -emit-llvm -S ${.IMPSRC} -o ${.TARGET} -.c.obc: - ${CC} ${CFLAGS} -cc1 -emit-llvm -c ${.IMPSRC} -o ${.TARGET} - .c.ln: ${LINT} ${LINTOBJFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC} || \ touch ${.TARGET} @@ -258,9 +256,6 @@ .cc .cpp .cxx .C: ${CXX} ${CXXFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} -.cc.obc .C.obc .cpp.obc .cxx.obc: - ${CXX} ${CXXFLAGS} -cc1 -emit-llvm -c ${.IMPSRC} -o ${.TARGET} - .cc.o .cpp.o .cxx.o .C.o: ${CXX} ${CXXFLAGS} -c ${.IMPSRC} ==== //depot/projects/ctsrd/tesla/src/sys/conf/kern.pre.mk#6 (text+ko) ==== @@ -97,7 +97,7 @@ .endif WERROR?= -Werror -LLCFLAGS= -code-model=kernel +LLCFLAGS+= -code-model=kernel # XXX LOCORE means "don't declare C stuff" not "for locore.s". ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} From owner-p4-projects@FreeBSD.ORG Wed Jul 17 20:04:26 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70F67125; Wed, 17 Jul 2013 20:04:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 32AE6123 for ; Wed, 17 Jul 2013 20:04:26 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 0AC3786A for ; Wed, 17 Jul 2013 20:04:26 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HK4PEJ084382 for ; Wed, 17 Jul 2013 20:04:25 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6HK4PSP084379 for perforce@freebsd.org; Wed, 17 Jul 2013 20:04:25 GMT (envelope-from brooks@freebsd.org) Date: Wed, 17 Jul 2013 20:04:25 GMT Message-Id: <201307172004.r6HK4PSP084379@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 231231 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2013 20:04:26 -0000 http://p4web.freebsd.org/@@231231?ac=10 Change 231231 by brooks@brooks_zenith on 2013/07/17 20:03:42 Remove -O* from compile entries in the expanded form of config generated .oll rules. This is fragile if new compile macros are added but that's a fairly rare occurance in practice. A complete rethink of the kernel build process is probably warranted, but is not on today's agenda. Affected files ... .. //depot/projects/ctsrd/tesla/src/usr.sbin/config/mkmakefile.c#4 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/usr.sbin/config/mkmakefile.c#4 (text+ko) ==== @@ -697,9 +697,9 @@ static void do_rules(FILE *f) { - char *cp, *np, och; + char *cp, *cwcp, *np, och, *tcp; struct file_list *ftp; - char *compilewith; + char *compilewith, *teslacompilewith; char cmd[128]; STAILQ_FOREACH(ftp, &ftab, f_next) { @@ -773,6 +773,39 @@ fprintf(f, "\n"); if (tesla && och == 'c') { + int i; + const char *compilers[] = { + "{NORMAL_C}", + "{NORMAL_C_NOWERROR}", + "{OFED_C}", + "{PROFILE_C}", + "{ZFS_C}", + NULL + }; + + cwcp = NULL; + for(i = 0; compilers[i] != NULL; i++) { + if ((cwcp = strstr(compilewith, compilers[i])) + == NULL) + continue; + /* Find the closing } */ + cwcp += strlen(compilers[i]) - 1; + break; + } + + if (cwcp != NULL) { + if ((tcp = teslacompilewith = + malloc(strlen(compilewith) + 6)) == NULL) + err(1, "malloc\n"); + strncpy(tcp, compilewith, + cwcp - compilewith); + tcp += cwcp - compilewith; + strcpy(tcp, ":N-O*"); + tcp += strlen(":N-O*"); + strcpy(tcp, cwcp); + } else + teslacompilewith = compilewith; + if (ftp->f_depends) fprintf(f, "%s%soll: $S/%s%c %s\n", ftp->f_objprefix, tail(np), np, och, @@ -783,11 +816,13 @@ if (strlen(ftp->f_objprefix)) fprintf(f, "\t%s $S/%s -S -emit-llvm -o ${.TARGET}\n", - compilewith, np); + teslacompilewith, np); else fprintf(f, "\t%s -S -emit-llvm -o ${.TARGET}\n", - compilewith); + teslacompilewith); fprintf(f, "\n"); + if (teslacompilewith != compilewith) + free(teslacompilewith); if (ftp->f_depends) fprintf(f, "%s%stesla: $S/%s%c %s\n", From owner-p4-projects@FreeBSD.ORG Wed Jul 17 21:35:05 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CAE7A93; Wed, 17 Jul 2013 21:35:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 507E4A91 for ; Wed, 17 Jul 2013 21:35:05 +0000 (UTC) (envelope-from jonathan@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 41D29CB6 for ; Wed, 17 Jul 2013 21:35:05 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HLZ59n098213 for ; Wed, 17 Jul 2013 21:35:05 GMT (envelope-from jonathan@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6HLZ52Y098210 for perforce@freebsd.org; Wed, 17 Jul 2013 21:35:05 GMT (envelope-from jonathan@freebsd.org) Date: Wed, 17 Jul 2013 21:35:05 GMT Message-Id: <201307172135.r6HLZ52Y098210@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jonathan@freebsd.org using -f From: Jonathan Anderson Subject: PERFORCE change 231232 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2013 21:35:05 -0000 http://p4web.freebsd.org/@@231232?ac=10 Change 231232 by jonathan@jonathan-on-joe on 2013/07/17 21:34:55 Sync latest TESLA parts from GitHub (commit 829723). Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla.h#4 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla.h#4 (text+ko) ==== @@ -62,11 +62,9 @@ * * a counter to ensure uniqueness (__COUNTER__) * * the TESLA context (per-thread or global) */ -inline void +void __tesla_inline_assertion(const char *filename, int line, int count, - __tesla_locality *loc, ...) -{ -} + __tesla_locality *loc, ...); /* Only define the following things if doing TESLA analysis, not compiling. */ @@ -135,6 +133,9 @@ struct __tesla_event* __tesla_optional(__tesla_event*, ...); /** A value that could match a lot of function parameters. Maybe anything? */ +#ifdef __OBJC__ +id __tesla_any_id(); +#endif void* __tesla_any_ptr(); int __tesla_any_int(); long __tesla_any_long(); From owner-p4-projects@FreeBSD.ORG Wed Jul 17 21:51:23 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A1063F4; Wed, 17 Jul 2013 21:51:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1C2703F2 for ; Wed, 17 Jul 2013 21:51:23 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 07043DB1 for ; Wed, 17 Jul 2013 21:51:23 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HLpMoQ000678 for ; Wed, 17 Jul 2013 21:51:22 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6HLpM0f000675 for perforce@freebsd.org; Wed, 17 Jul 2013 21:51:22 GMT (envelope-from brooks@freebsd.org) Date: Wed, 17 Jul 2013 21:51:22 GMT Message-Id: <201307172151.r6HLpM0f000675@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 231233 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2013 21:51:23 -0000 http://p4web.freebsd.org/@@231233?ac=10 Change 231233 by brooks@brooks_zenith on 2013/07/17 21:50:39 Comment out the second CPU entries. The check for spin table entries being properly initalized does not appear to be reliable. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beri-sim.dts#5 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#26 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beri-sim.dts#5 (text+ko) ==== @@ -67,6 +67,7 @@ status = "okay"; }; +/* cpu@1 { device-type = "cpu"; compatible = "sri-cambridge,beri"; @@ -75,6 +76,7 @@ // XXX: should we need cached prefix? cpu-release-addr = <0xffffffff 0x800fffe0>; }; +*/ }; soc { ==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#26 (text+ko) ==== @@ -68,6 +68,7 @@ status = "okay"; }; +/* cpu@1 { device-type = "cpu"; compatible = "sri-cambridge,beri"; @@ -76,6 +77,7 @@ // XXX: should we need cached prefix? cpu-release-addr = <0xffffffff 0x800fffe0>; } +*/ }; soc { From owner-p4-projects@FreeBSD.ORG Wed Jul 17 21:52:24 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 829694FB; Wed, 17 Jul 2013 21:52:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 443544F9 for ; Wed, 17 Jul 2013 21:52:24 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 35E61DBD for ; Wed, 17 Jul 2013 21:52:24 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HLqOqU000764 for ; Wed, 17 Jul 2013 21:52:24 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6HLqOsw000761 for perforce@freebsd.org; Wed, 17 Jul 2013 21:52:24 GMT (envelope-from brooks@freebsd.org) Date: Wed, 17 Jul 2013 21:52:24 GMT Message-Id: <201307172152.r6HLqOsw000761@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 231234 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2013 21:52:24 -0000 http://p4web.freebsd.org/@@231234?ac=10 Change 231234 by brooks@brooks_zenith on 2013/07/17 21:52:06 Integrate commenting out of second CPUs from FreeBSD/BERI Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beri-sim.dts#4 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#13 integrate Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beri-sim.dts#4 (text+ko) ==== @@ -67,6 +67,7 @@ status = "okay"; }; +/* cpu@1 { device-type = "cpu"; compatible = "sri-cambridge,beri"; @@ -75,6 +76,7 @@ // XXX: should we need cached prefix? cpu-release-addr = <0xffffffff 0x800fffe0>; }; +*/ }; soc { ==== //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#13 (text+ko) ==== @@ -68,6 +68,7 @@ status = "okay"; }; +/* cpu@1 { device-type = "cpu"; compatible = "sri-cambridge,beri"; @@ -76,6 +77,7 @@ // XXX: should we need cached prefix? cpu-release-addr = <0xffffffff 0x800fffe0>; } +*/ }; soc { From owner-p4-projects@FreeBSD.ORG Thu Jul 18 14:35:37 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C80BBCCE; Thu, 18 Jul 2013 14:35:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8A1A1CCB for ; Thu, 18 Jul 2013 14:35:36 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 7BBCB1E2 for ; Thu, 18 Jul 2013 14:35:36 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6IEZaYw051244 for ; Thu, 18 Jul 2013 14:35:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6IEZacv051241 for perforce@freebsd.org; Thu, 18 Jul 2013 14:35:36 GMT (envelope-from jhb@freebsd.org) Date: Thu, 18 Jul 2013 14:35:36 GMT Message-Id: <201307181435.r6IEZacv051241@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 231251 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jul 2013 14:35:37 -0000 http://p4web.freebsd.org/@@231251?ac=10 Change 231251 by jhb@jhb_jhbbsd on 2013/07/18 14:35:08 Appease GCC. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci_pci.c#41 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci_pci.c#41 (text+ko) ==== @@ -1336,11 +1336,11 @@ * of the area above 64k. */ for (i = 0; i < w->count; i++) { - res = w->res[i]; - if (rman_get_end(res) == w->limit) + if (rman_get_end(w->res[i]) == w->limit) break; } KASSERT(i != w->count, ("did not find existing resource")); + res = w->res[i]; /* * Usually the resource we found should match the window's From owner-p4-projects@FreeBSD.ORG Thu Jul 18 14:35:37 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25355D7E; Thu, 18 Jul 2013 14:35:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C3775CCC for ; Thu, 18 Jul 2013 14:35:36 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 9B7B31E3 for ; Thu, 18 Jul 2013 14:35:36 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6IEZamS051250 for ; Thu, 18 Jul 2013 14:35:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6IEZaCR051247 for perforce@freebsd.org; Thu, 18 Jul 2013 14:35:36 GMT (envelope-from jhb@freebsd.org) Date: Thu, 18 Jul 2013 14:35:36 GMT Message-Id: <201307181435.r6IEZaCR051247@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 231252 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jul 2013 14:35:37 -0000 http://p4web.freebsd.org/@@231252?ac=10 Change 231252 by jhb@jhb_jhbbsd on 2013/07/18 14:35:24 Cleanup. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci_subr.c#10 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci_subr.c#10 (text+ko) ==== @@ -41,7 +41,6 @@ #include #include -#include #include /* From owner-p4-projects@FreeBSD.ORG Thu Jul 18 15:33:41 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E235CADD; Thu, 18 Jul 2013 15:33:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8AC8BACC for ; Thu, 18 Jul 2013 15:33:40 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 7AD9665B for ; Thu, 18 Jul 2013 15:33:40 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6IFXe5Q060073 for ; Thu, 18 Jul 2013 15:33:40 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6IFXdWp060063 for perforce@freebsd.org; Thu, 18 Jul 2013 15:33:39 GMT (envelope-from jhb@freebsd.org) Date: Thu, 18 Jul 2013 15:33:39 GMT Message-Id: <201307181533.r6IFXdWp060063@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 231254 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jul 2013 15:33:41 -0000 http://p4web.freebsd.org/@@231254?ac=10 Change 231254 by jhb@jhb_jhbbsd on 2013/07/18 15:32:45 IFC @231253 (loopback pcib(4) ISA enable commit) Affected files ... .. //depot/projects/pci/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/pci/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/pci/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/pci/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/pci/sys/amd64/include/counter.h#2 integrate .. //depot/projects/pci/sys/amd64/vmm/intel/ept.c#2 integrate .. //depot/projects/pci/sys/amd64/vmm/vmm_instruction_emul.c#3 integrate .. //depot/projects/pci/sys/arm/arm/bus_space_generic.c#3 integrate .. //depot/projects/pci/sys/arm/arm/busdma_machdep-v6.c#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/pci/sys/arm/arm/db_trace.c#4 integrate .. //depot/projects/pci/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/pci/sys/arm/arm/generic_timer.c#1 branch .. //depot/projects/pci/sys/arm/arm/gic.c#3 integrate .. //depot/projects/pci/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/pci/sys/arm/arm/pmap-v6.c#3 integrate .. //depot/projects/pci/sys/arm/arm/trap.c#5 integrate .. //depot/projects/pci/sys/arm/arm/vfp.c#3 integrate .. //depot/projects/pci/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_fb.c#2 integrate .. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_mbox.c#2 integrate .. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_mbox.h#2 integrate .. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c#3 integrate .. //depot/projects/pci/sys/arm/broadcom/bcm2835/files.bcm2835#3 integrate .. //depot/projects/pci/sys/arm/broadcom/bcm2835/std.bcm2835#1 branch .. //depot/projects/pci/sys/arm/broadcom/bcm2835/std.rpi#1 branch .. //depot/projects/pci/sys/arm/conf/ARNDALE#1 branch .. //depot/projects/pci/sys/arm/conf/BEAGLEBONE#3 integrate .. //depot/projects/pci/sys/arm/conf/RPI-B#3 integrate .. //depot/projects/pci/sys/arm/include/armreg.h#4 integrate .. //depot/projects/pci/sys/arm/include/counter.h#2 integrate .. //depot/projects/pci/sys/arm/include/intr.h#3 integrate .. //depot/projects/pci/sys/arm/samsung/exynos/arch_timer.c#1 branch .. //depot/projects/pci/sys/arm/samsung/exynos/bus_space.c#1 branch .. //depot/projects/pci/sys/arm/samsung/exynos/common.c#1 branch .. //depot/projects/pci/sys/arm/samsung/exynos/ehci_exynos5.c#1 branch .. //depot/projects/pci/sys/arm/samsung/exynos/exynos5_machdep.c#1 branch .. //depot/projects/pci/sys/arm/samsung/exynos/exynos5_mp.c#1 branch .. //depot/projects/pci/sys/arm/samsung/exynos/files.exynos5#1 branch .. //depot/projects/pci/sys/arm/samsung/exynos/std.exynos5#1 branch .. //depot/projects/pci/sys/arm/samsung/exynos/uart.c#1 branch .. //depot/projects/pci/sys/arm/samsung/exynos/uart.h#1 branch .. //depot/projects/pci/sys/arm/ti/am335x/am335x_pmic.c#2 integrate .. //depot/projects/pci/sys/arm/ti/am335x/am335x_pwm.c#2 integrate .. //depot/projects/pci/sys/arm/ti/am335x/am335x_usbss.c#1 branch .. //depot/projects/pci/sys/arm/ti/am335x/files.am335x#3 integrate .. //depot/projects/pci/sys/arm/ti/ti_mmchs.c#3 integrate .. //depot/projects/pci/sys/arm/ti/ti_mmchs.h#2 integrate .. //depot/projects/pci/sys/arm/versatile/versatile_pci.c#2 integrate .. //depot/projects/pci/sys/arm/versatile/versatile_sic.c#2 integrate .. //depot/projects/pci/sys/boot/fdt/dts/am335x-evm.dts#2 integrate .. //depot/projects/pci/sys/boot/fdt/dts/am335x.dtsi#2 integrate .. //depot/projects/pci/sys/boot/fdt/dts/bcm2835-rpi-b.dts#3 delete .. //depot/projects/pci/sys/boot/fdt/dts/bcm2835.dtsi#1 branch .. //depot/projects/pci/sys/boot/fdt/dts/beaglebone-black.dts#2 integrate .. //depot/projects/pci/sys/boot/fdt/dts/beaglebone.dts#3 integrate .. //depot/projects/pci/sys/boot/fdt/dts/exynos5250-arndale.dts#1 branch .. //depot/projects/pci/sys/boot/fdt/dts/exynos5250.dtsi#1 branch .. //depot/projects/pci/sys/boot/fdt/dts/rpi.dts#1 branch .. //depot/projects/pci/sys/boot/ficl/loader.c#3 integrate .. //depot/projects/pci/sys/boot/forth/loader.conf#8 integrate .. //depot/projects/pci/sys/boot/i386/gptboot/Makefile#5 integrate .. //depot/projects/pci/sys/boot/i386/gptboot/gptboot.8#1 branch .. //depot/projects/pci/sys/cam/ata/ata_da.c#9 integrate .. //depot/projects/pci/sys/cam/cam_ccb.h#7 integrate .. //depot/projects/pci/sys/cam/cam_periph.c#8 integrate .. //depot/projects/pci/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/pci/sys/cam/ctl/ctl_backend_ramdisk.c#4 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_all.c#6 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_all.h#6 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_ch.c#6 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_xpt.c#7 integrate .. //depot/projects/pci/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#6 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#6 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#7 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#7 integrate .. //depot/projects/pci/sys/cddl/dev/dtrace/dtrace_ioctl.c#4 integrate .. //depot/projects/pci/sys/cddl/dev/dtrace/dtrace_load.c#3 integrate .. //depot/projects/pci/sys/cddl/dev/dtrace/dtrace_unload.c#3 integrate .. //depot/projects/pci/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/pci/sys/compat/linux/linux_ioctl.h#5 integrate .. //depot/projects/pci/sys/compat/linux/linux_videodev.h#4 delete .. //depot/projects/pci/sys/compat/linux/linux_videodev2.h#3 delete .. //depot/projects/pci/sys/conf/Makefile.amd64#5 integrate .. //depot/projects/pci/sys/conf/Makefile.arm#5 integrate .. //depot/projects/pci/sys/conf/NOTES#12 integrate .. //depot/projects/pci/sys/conf/WITHOUT_SOURCELESS_HOST#3 integrate .. //depot/projects/pci/sys/conf/WITHOUT_SOURCELESS_UCODE#3 integrate .. //depot/projects/pci/sys/conf/files#13 integrate .. //depot/projects/pci/sys/conf/files.amd64#8 integrate .. //depot/projects/pci/sys/conf/files.arm#6 integrate .. //depot/projects/pci/sys/conf/files.i386#10 integrate .. //depot/projects/pci/sys/conf/files.ia64#6 integrate .. //depot/projects/pci/sys/conf/files.mips#9 integrate .. //depot/projects/pci/sys/conf/files.pc98#5 integrate .. //depot/projects/pci/sys/conf/files.powerpc#8 integrate .. //depot/projects/pci/sys/conf/files.sparc64#7 integrate .. //depot/projects/pci/sys/conf/kmod.mk#8 integrate .. //depot/projects/pci/sys/conf/newvers.sh#7 integrate .. //depot/projects/pci/sys/conf/options#13 integrate .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c#2 integrate .. //depot/projects/pci/sys/contrib/dev/urtwn/LICENSE#1 branch .. //depot/projects/pci/sys/contrib/dev/urtwn/urtwn-rtl8192cfwT.fw.uu#1 branch .. //depot/projects/pci/sys/contrib/dev/urtwn/urtwn-rtl8192cfwU.fw.uu#1 branch .. //depot/projects/pci/sys/contrib/v4l/videodev.h#1 branch .. //depot/projects/pci/sys/contrib/v4l/videodev2.h#1 branch .. //depot/projects/pci/sys/crypto/sha2/sha2.c#3 integrate .. //depot/projects/pci/sys/crypto/sha2/sha2.h#3 integrate .. //depot/projects/pci/sys/crypto/siphash/siphash.c#1 branch .. //depot/projects/pci/sys/crypto/siphash/siphash.h#1 branch .. //depot/projects/pci/sys/crypto/siphash/siphash_test.c#1 branch .. //depot/projects/pci/sys/dev/acpica/acpi_pcib.c#5 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#35 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_resource.c#10 integrate .. //depot/projects/pci/sys/dev/ae/if_ae.c#6 integrate .. //depot/projects/pci/sys/dev/ae/if_aereg.h#3 integrate .. //depot/projects/pci/sys/dev/ahci/ahci.c#11 integrate .. //depot/projects/pci/sys/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/pci/sys/dev/arcmsr/arcmsr.h#5 integrate .. //depot/projects/pci/sys/dev/ath/if_ath_rx_edma.c#3 integrate .. //depot/projects/pci/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/pci/sys/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/pci/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/pci/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/pci/sys/dev/cpuctl/cpuctl.c#4 integrate .. //depot/projects/pci/sys/dev/cxgbe/adapter.h#8 integrate .. //depot/projects/pci/sys/dev/cxgbe/common/common.h#7 integrate .. //depot/projects/pci/sys/dev/cxgbe/common/t4_hw.c#6 integrate .. //depot/projects/pci/sys/dev/cxgbe/common/t4_hw.h#5 integrate .. //depot/projects/pci/sys/dev/cxgbe/common/t4_msg.h#4 integrate .. //depot/projects/pci/sys/dev/cxgbe/common/t4_regs_values.h#3 integrate .. //depot/projects/pci/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu#1 branch .. //depot/projects/pci/sys/dev/cxgbe/firmware/t4fw-1.8.4.0.bin.uu#2 delete .. //depot/projects/pci/sys/dev/cxgbe/firmware/t4fw_cfg.txt#3 integrate .. //depot/projects/pci/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt#3 integrate .. //depot/projects/pci/sys/dev/cxgbe/firmware/t4fw_interface.h#4 integrate .. //depot/projects/pci/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu#1 branch .. //depot/projects/pci/sys/dev/cxgbe/firmware/t5fw_cfg.txt#1 branch .. //depot/projects/pci/sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt#1 branch .. //depot/projects/pci/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt#1 branch .. //depot/projects/pci/sys/dev/cxgbe/offload.h#6 integrate .. //depot/projects/pci/sys/dev/cxgbe/t4_main.c#8 integrate .. //depot/projects/pci/sys/dev/cxgbe/t4_sge.c#8 integrate .. //depot/projects/pci/sys/dev/cxgbe/tom/t4_connect.c#3 integrate .. //depot/projects/pci/sys/dev/cxgbe/tom/t4_listen.c#3 integrate .. //depot/projects/pci/sys/dev/cxgbe/tom/t4_tom.c#3 integrate .. //depot/projects/pci/sys/dev/cxgbe/tom/t4_tom.h#3 integrate .. //depot/projects/pci/sys/dev/drm2/ttm/ttm_bo_vm.c#2 integrate .. //depot/projects/pci/sys/dev/e1000/if_em.c#8 integrate .. //depot/projects/pci/sys/dev/e1000/if_igb.c#12 integrate .. //depot/projects/pci/sys/dev/e1000/if_lem.c#6 integrate .. //depot/projects/pci/sys/dev/hme/if_hme.c#5 integrate .. //depot/projects/pci/sys/dev/hpt27xx/hpt27xx_config.c#3 integrate .. //depot/projects/pci/sys/dev/hpt27xx/hpt27xx_os_bsd.c#1 branch .. //depot/projects/pci/sys/dev/hpt27xx/hpt27xx_osm_bsd.c#1 branch .. //depot/projects/pci/sys/dev/hpt27xx/os_bsd.c#3 delete .. //depot/projects/pci/sys/dev/hpt27xx/osm_bsd.c#4 delete .. //depot/projects/pci/sys/dev/hptiop/hptiop.c#6 integrate .. //depot/projects/pci/sys/dev/hptnr/README#1 branch .. //depot/projects/pci/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu#1 branch .. //depot/projects/pci/sys/dev/hptnr/array.h#1 branch .. //depot/projects/pci/sys/dev/hptnr/him.h#1 branch .. //depot/projects/pci/sys/dev/hptnr/himfuncs.h#1 branch .. //depot/projects/pci/sys/dev/hptnr/hptintf.h#1 branch .. //depot/projects/pci/sys/dev/hptnr/hptnr_config.c#1 branch .. //depot/projects/pci/sys/dev/hptnr/hptnr_config.h#1 branch .. //depot/projects/pci/sys/dev/hptnr/hptnr_os_bsd.c#1 branch .. //depot/projects/pci/sys/dev/hptnr/hptnr_osm_bsd.c#1 branch .. //depot/projects/pci/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu#1 branch .. //depot/projects/pci/sys/dev/hptnr/ldm.h#1 branch .. //depot/projects/pci/sys/dev/hptnr/list.h#1 branch .. //depot/projects/pci/sys/dev/hptnr/os_bsd.h#1 branch .. //depot/projects/pci/sys/dev/hptnr/osm.h#1 branch .. //depot/projects/pci/sys/dev/hptnr/wj.h#1 branch .. //depot/projects/pci/sys/dev/isp/isp.c#5 integrate .. //depot/projects/pci/sys/dev/isp/ispreg.h#3 integrate .. //depot/projects/pci/sys/dev/iwn/if_iwn.c#7 integrate .. //depot/projects/pci/sys/dev/iwn/if_iwnvar.h#5 integrate .. //depot/projects/pci/sys/dev/ixgb/if_ixgb.c#5 integrate .. //depot/projects/pci/sys/dev/ixgb/ixgb_ids.h#3 integrate .. //depot/projects/pci/sys/dev/ixgbe/ixgbe.c#7 integrate .. //depot/projects/pci/sys/dev/ixgbe/ixv.c#7 integrate .. //depot/projects/pci/sys/dev/mbox/mbox_if.m#1 branch .. //depot/projects/pci/sys/dev/mem/memdev.c#3 integrate .. //depot/projects/pci/sys/dev/mfi/mfi.c#7 integrate .. //depot/projects/pci/sys/dev/mmc/mmcsd.c#5 integrate .. //depot/projects/pci/sys/dev/nvd/nvd.c#3 integrate .. //depot/projects/pci/sys/dev/nvme/nvme.c#3 integrate .. //depot/projects/pci/sys/dev/nvme/nvme.h#3 integrate .. //depot/projects/pci/sys/dev/nvme/nvme_ctrlr.c#3 integrate .. //depot/projects/pci/sys/dev/nvme/nvme_ctrlr_cmd.c#3 integrate .. //depot/projects/pci/sys/dev/nvme/nvme_ns.c#3 integrate .. //depot/projects/pci/sys/dev/nvme/nvme_private.h#3 integrate .. //depot/projects/pci/sys/dev/nvme/nvme_qpair.c#3 integrate .. //depot/projects/pci/sys/dev/nvme/nvme_sysctl.c#3 integrate .. //depot/projects/pci/sys/dev/nvme/nvme_test.c#3 integrate .. //depot/projects/pci/sys/dev/oce/oce_hw.c#5 integrate .. //depot/projects/pci/sys/dev/oce/oce_hw.h#4 integrate .. //depot/projects/pci/sys/dev/oce/oce_if.c#4 integrate .. //depot/projects/pci/sys/dev/oce/oce_if.h#4 integrate .. //depot/projects/pci/sys/dev/oce/oce_mbox.c#4 integrate .. //depot/projects/pci/sys/dev/oce/oce_queue.c#4 integrate .. //depot/projects/pci/sys/dev/oce/oce_sysctl.c#4 integrate .. //depot/projects/pci/sys/dev/oce/oce_util.c#4 integrate .. //depot/projects/pci/sys/dev/pci/pci.c#44 integrate .. //depot/projects/pci/sys/dev/pci/pci_pci.c#42 integrate .. //depot/projects/pci/sys/dev/pci/pci_private.h#17 integrate .. //depot/projects/pci/sys/dev/pci/pcib_private.h#26 integrate .. //depot/projects/pci/sys/dev/pci/pcivar.h#12 integrate .. //depot/projects/pci/sys/dev/qlxgbe/ql_os.c#2 integrate .. //depot/projects/pci/sys/dev/ral/rt2560.c#5 integrate .. //depot/projects/pci/sys/dev/ral/rt2661.c#5 integrate .. //depot/projects/pci/sys/dev/ral/rt2860.c#2 integrate .. //depot/projects/pci/sys/dev/random/probe.c#4 integrate .. //depot/projects/pci/sys/dev/random/randomdev.c#3 integrate .. //depot/projects/pci/sys/dev/random/randomdev.h#3 integrate .. //depot/projects/pci/sys/dev/random/randomdev_soft.c#4 integrate .. //depot/projects/pci/sys/dev/sound/pci/hda/hdaa_patches.c#4 integrate .. //depot/projects/pci/sys/dev/sound/pci/hda/hdac.h#5 integrate .. //depot/projects/pci/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/pci/sys/dev/uart/uart.h#4 integrate .. //depot/projects/pci/sys/dev/uart/uart_bus_fdt.c#5 integrate .. //depot/projects/pci/sys/dev/uart/uart_core.c#5 integrate .. //depot/projects/pci/sys/dev/uart/uart_cpu_fdt.c#2 integrate .. //depot/projects/pci/sys/dev/uart/uart_subr.c#5 integrate .. //depot/projects/pci/sys/dev/usb/controller/musb_otg.c#5 integrate .. //depot/projects/pci/sys/dev/usb/controller/musb_otg.h#4 integrate .. //depot/projects/pci/sys/dev/usb/controller/musb_otg_atmelarm.c#4 integrate .. //depot/projects/pci/sys/dev/usb/controller/xhci.h#5 integrate .. //depot/projects/pci/sys/dev/usb/controller/xhci_pci.c#6 integrate .. //depot/projects/pci/sys/dev/usb/input/ukbd.c#9 integrate .. //depot/projects/pci/sys/dev/usb/quirk/usb_quirk.c#6 integrate .. //depot/projects/pci/sys/dev/usb/usbdevs#11 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_rum.c#7 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_uath.c#7 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_upgt.c#6 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_ural.c#6 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_urtw.c#6 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_urtwn.c#2 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_zyd.c#8 integrate .. //depot/projects/pci/sys/dev/virtio/balloon/virtio_balloon.c#3 integrate .. //depot/projects/pci/sys/dev/virtio/block/virtio_blk.c#4 integrate .. //depot/projects/pci/sys/dev/virtio/block/virtio_blk.h#3 integrate .. //depot/projects/pci/sys/dev/virtio/network/if_vtnet.c#4 integrate .. //depot/projects/pci/sys/dev/virtio/network/if_vtnetvar.h#3 integrate .. //depot/projects/pci/sys/dev/virtio/pci/virtio_pci.c#4 integrate .. //depot/projects/pci/sys/dev/virtio/scsi/virtio_scsi.c#3 integrate .. //depot/projects/pci/sys/dev/virtio/scsi/virtio_scsivar.h#2 integrate .. //depot/projects/pci/sys/dev/virtio/virtio.c#3 integrate .. //depot/projects/pci/sys/dev/virtio/virtio.h#3 integrate .. //depot/projects/pci/sys/dev/virtio/virtio_bus_if.m#3 integrate .. //depot/projects/pci/sys/dev/virtio/virtio_if.m#3 integrate .. //depot/projects/pci/sys/dev/virtio/virtqueue.c#3 integrate .. //depot/projects/pci/sys/dev/virtio/virtqueue.h#3 integrate .. //depot/projects/pci/sys/fs/ext2fs/ext2_dir.h#5 integrate .. //depot/projects/pci/sys/fs/ext2fs/ext2_extern.h#6 integrate .. //depot/projects/pci/sys/fs/ext2fs/ext2_hash.c#1 branch .. //depot/projects/pci/sys/fs/ext2fs/ext2_htree.c#1 branch .. //depot/projects/pci/sys/fs/ext2fs/ext2_inode_cnv.c#5 integrate .. //depot/projects/pci/sys/fs/ext2fs/ext2_lookup.c#7 integrate .. //depot/projects/pci/sys/fs/ext2fs/ext2_vfsops.c#8 integrate .. //depot/projects/pci/sys/fs/ext2fs/ext2_vnops.c#7 integrate .. //depot/projects/pci/sys/fs/ext2fs/ext2fs.h#7 integrate .. //depot/projects/pci/sys/fs/ext2fs/htree.h#1 branch .. //depot/projects/pci/sys/fs/fuse/fuse_internal.h#2 integrate .. //depot/projects/pci/sys/fs/fuse/fuse_kernel.h#2 integrate .. //depot/projects/pci/sys/fs/nfs/nfs.h#6 integrate .. //depot/projects/pci/sys/fs/nfs/nfs_commonkrpc.c#10 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_clport.c#11 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_clvfsops.c#8 integrate .. //depot/projects/pci/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/pci/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/pci/sys/fs/smbfs/smbfs_smb.c#6 integrate .. //depot/projects/pci/sys/fs/smbfs/smbfs_vfsops.c#5 integrate .. //depot/projects/pci/sys/fs/smbfs/smbfs_vnops.c#5 integrate .. //depot/projects/pci/sys/geom/geom_disk.c#8 integrate .. //depot/projects/pci/sys/geom/geom_disk.h#5 integrate .. //depot/projects/pci/sys/geom/journal/g_journal.c#6 integrate .. //depot/projects/pci/sys/i386/conf/GENERIC#10 integrate .. //depot/projects/pci/sys/i386/conf/NOTES#7 integrate .. //depot/projects/pci/sys/i386/conf/PAE#7 integrate .. //depot/projects/pci/sys/i386/conf/XEN#4 integrate .. //depot/projects/pci/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/pci/sys/i386/i386/support.s#5 integrate .. //depot/projects/pci/sys/i386/i386/symbols.raw#3 integrate .. //depot/projects/pci/sys/i386/i386/uio_machdep.c#3 integrate .. //depot/projects/pci/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/pci/sys/i386/include/counter.h#2 integrate .. //depot/projects/pci/sys/ia64/include/counter.h#2 integrate .. //depot/projects/pci/sys/kern/Make.tags.inc#4 integrate .. //depot/projects/pci/sys/kern/kern_acct.c#4 integrate .. //depot/projects/pci/sys/kern/kern_clock.c#7 integrate .. //depot/projects/pci/sys/kern/kern_descrip.c#11 integrate .. //depot/projects/pci/sys/kern/kern_intr.c#9 integrate .. //depot/projects/pci/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/pci/sys/kern/kern_priv.c#4 integrate .. //depot/projects/pci/sys/kern/kern_rmlock.c#7 integrate .. //depot/projects/pci/sys/kern/kern_synch.c#6 integrate .. //depot/projects/pci/sys/kern/kern_time.c#5 integrate .. //depot/projects/pci/sys/kern/subr_bus.c#11 integrate .. //depot/projects/pci/sys/kern/subr_counter.c#2 integrate .. //depot/projects/pci/sys/kern/subr_witness.c#5 integrate .. //depot/projects/pci/sys/kern/sys_generic.c#6 integrate .. //depot/projects/pci/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/pci/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/pci/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/pci/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/pci/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/pci/sys/kern/vfs_init.c#5 integrate .. //depot/projects/pci/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/pci/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/pci/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/pci/sys/kgssapi/gss_impl.c#6 integrate .. //depot/projects/pci/sys/mips/atheros/ar71xx_setup.h#4 integrate .. //depot/projects/pci/sys/mips/atheros/ar934xreg.h#1 branch .. //depot/projects/pci/sys/mips/conf/AP93.hints#2 integrate .. //depot/projects/pci/sys/mips/conf/ENH200#1 branch .. //depot/projects/pci/sys/mips/conf/ENH200.hints#1 branch .. //depot/projects/pci/sys/mips/include/atomic.h#4 integrate .. //depot/projects/pci/sys/mips/include/counter.h#2 integrate .. //depot/projects/pci/sys/mips/include/elf.h#5 integrate .. //depot/projects/pci/sys/mips/mips/uio_machdep.c#3 integrate .. //depot/projects/pci/sys/mips/mips/vm_machdep.c#7 integrate .. //depot/projects/pci/sys/modules/Makefile#11 integrate .. //depot/projects/pci/sys/modules/cc/Makefile#3 integrate .. //depot/projects/pci/sys/modules/cc/cc_cdg/Makefile#1 branch .. //depot/projects/pci/sys/modules/cxgbe/Makefile#6 integrate .. //depot/projects/pci/sys/modules/cxgbe/t4_firmware/Makefile#2 integrate .. //depot/projects/pci/sys/modules/cxgbe/t5_firmware/Makefile#1 branch .. //depot/projects/pci/sys/modules/em/Makefile#3 integrate .. //depot/projects/pci/sys/modules/ext2fs/Makefile#4 integrate .. //depot/projects/pci/sys/modules/hpt27xx/Makefile#3 integrate .. //depot/projects/pci/sys/modules/hptnr/Makefile#1 branch .. //depot/projects/pci/sys/modules/igb/Makefile#4 integrate .. //depot/projects/pci/sys/modules/usb/Makefile#8 integrate .. //depot/projects/pci/sys/modules/usb/urtwnfw/Makefile#1 branch .. //depot/projects/pci/sys/modules/usb/urtwnfw/Makefile.inc#1 branch .. //depot/projects/pci/sys/modules/usb/urtwnfw/urtwnrtl8192cT/Makefile#1 branch .. //depot/projects/pci/sys/modules/usb/urtwnfw/urtwnrtl8192cU/Makefile#1 branch .. //depot/projects/pci/sys/net/ieee8023ad_lacp.c#5 integrate .. //depot/projects/pci/sys/net/if.c#7 integrate .. //depot/projects/pci/sys/net/if_arp.h#4 integrate .. //depot/projects/pci/sys/net/if_bridge.c#6 integrate .. //depot/projects/pci/sys/net/if_gif.c#6 integrate .. //depot/projects/pci/sys/net/if_lagg.c#10 integrate .. //depot/projects/pci/sys/net/if_lagg.h#6 integrate .. //depot/projects/pci/sys/net/if_var.h#8 integrate .. //depot/projects/pci/sys/net/rtsock.c#5 integrate .. //depot/projects/pci/sys/net/vnet.h#3 integrate .. //depot/projects/pci/sys/net80211/ieee80211_amrr.c#3 integrate .. //depot/projects/pci/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/pci/sys/net80211/ieee80211_mesh.c#7 integrate .. //depot/projects/pci/sys/net80211/ieee80211_output.c#9 integrate .. //depot/projects/pci/sys/net80211/ieee80211_phy.c#3 integrate .. //depot/projects/pci/sys/net80211/ieee80211_phy.h#3 integrate .. //depot/projects/pci/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate .. //depot/projects/pci/sys/netgraph/bluetooth/socket/ng_btsocket.c#3 integrate .. //depot/projects/pci/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/pci/sys/netinet/cc/cc_cdg.c#1 branch .. //depot/projects/pci/sys/netinet/icmp6.h#6 integrate .. //depot/projects/pci/sys/netinet/icmp_var.h#3 integrate .. //depot/projects/pci/sys/netinet/if_ether.c#8 integrate .. //depot/projects/pci/sys/netinet/in.c#8 integrate .. //depot/projects/pci/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/pci/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/pci/sys/netinet/in_pcb.h#9 integrate .. //depot/projects/pci/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/pci/sys/netinet/ip_carp.h#5 integrate .. //depot/projects/pci/sys/netinet/ip_icmp.c#6 integrate .. //depot/projects/pci/sys/netinet/ip_input.c#7 integrate .. //depot/projects/pci/sys/netinet/ip_mroute.c#6 integrate .. //depot/projects/pci/sys/netinet/ip_mroute.h#3 integrate .. //depot/projects/pci/sys/netinet/ip_output.c#6 integrate .. //depot/projects/pci/sys/netinet/ip_var.h#7 integrate .. //depot/projects/pci/sys/netinet/pim_var.h#3 integrate .. //depot/projects/pci/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/pci/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/pci/sys/netinet/sctp_indata.h#5 integrate .. //depot/projects/pci/sys/netinet/sctp_input.c#8 integrate .. //depot/projects/pci/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/pci/sys/netinet/sctp_sysctl.c#7 integrate .. //depot/projects/pci/sys/netinet/sctp_sysctl.h#6 integrate .. //depot/projects/pci/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/pci/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/pci/sys/netinet/tcp_syncache.h#4 integrate .. //depot/projects/pci/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/pci/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/pci/sys/netinet/udp_var.h#4 integrate .. //depot/projects/pci/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/pci/sys/netinet6/in6.c#8 integrate .. //depot/projects/pci/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/pci/sys/netinet6/in6_pcb.c#8 integrate .. //depot/projects/pci/sys/netinet6/in6_proto.c#8 integrate .. //depot/projects/pci/sys/netinet6/in6_var.h#5 integrate .. //depot/projects/pci/sys/netinet6/ip6_input.c#7 integrate .. //depot/projects/pci/sys/netinet6/ip6_mroute.h#3 integrate .. //depot/projects/pci/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/pci/sys/netinet6/ip6_var.h#6 integrate .. //depot/projects/pci/sys/netinet6/nd6.c#9 integrate .. //depot/projects/pci/sys/netinet6/pim6_var.h#3 integrate .. //depot/projects/pci/sys/netinet6/raw_ip6.c#5 integrate .. //depot/projects/pci/sys/netinet6/raw_ip6.h#4 integrate .. //depot/projects/pci/sys/netipsec/ah_var.h#4 integrate .. //depot/projects/pci/sys/netipsec/esp_var.h#4 integrate .. //depot/projects/pci/sys/netipsec/ipcomp_var.h#4 integrate .. //depot/projects/pci/sys/netipsec/ipip_var.h#4 integrate .. //depot/projects/pci/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/pci/sys/netipsec/ipsec.h#5 integrate .. //depot/projects/pci/sys/netipsec/ipsec6.h#4 integrate .. //depot/projects/pci/sys/netipsec/keysock.c#4 integrate .. //depot/projects/pci/sys/netipsec/keysock.h#4 integrate .. //depot/projects/pci/sys/netipsec/xform_ah.c#7 integrate .. //depot/projects/pci/sys/netipsec/xform_esp.c#7 integrate .. //depot/projects/pci/sys/netipsec/xform_ipcomp.c#6 integrate .. //depot/projects/pci/sys/netipsec/xform_ipip.c#7 integrate .. //depot/projects/pci/sys/netsmb/smb_conn.c#5 integrate .. //depot/projects/pci/sys/nfsclient/nfs_subs.c#7 integrate .. //depot/projects/pci/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/pci/sys/ofed/drivers/net/mlx4/main.c#2 integrate .. //depot/projects/pci/sys/ofed/include/linux/sysfs.h#2 integrate .. //depot/projects/pci/sys/powerpc/aim/mmu_oea64.c#9 integrate .. //depot/projects/pci/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/pci/sys/powerpc/booke/vm_machdep.c#3 integrate .. //depot/projects/pci/sys/powerpc/include/counter.h#2 integrate .. //depot/projects/pci/sys/powerpc/powerpc/uio_machdep.c#3 integrate .. //depot/projects/pci/sys/powerpc/wii/wii_ipcreg.h#2 integrate .. //depot/projects/pci/sys/rpc/rpcsec_gss.h#4 integrate .. //depot/projects/pci/sys/rpc/rpcsec_gss/rpcsec_gss.c#3 integrate .. //depot/projects/pci/sys/security/audit/audit.c#4 integrate .. //depot/projects/pci/sys/sparc64/include/counter.h#2 integrate .. //depot/projects/pci/sys/sparc64/include/ucontext.h#3 integrate .. //depot/projects/pci/sys/sparc64/sparc64/machdep.c#8 integrate .. //depot/projects/pci/sys/sparc64/sparc64/uio_machdep.c#3 integrate .. //depot/projects/pci/sys/sparc64/sparc64/vm_machdep.c#6 integrate .. //depot/projects/pci/sys/sys/counter.h#2 integrate .. //depot/projects/pci/sys/sys/elf_common.h#6 integrate .. //depot/projects/pci/sys/sys/eventhandler.h#5 integrate .. //depot/projects/pci/sys/sys/mbuf.h#7 integrate .. //depot/projects/pci/sys/sys/param.h#11 integrate .. //depot/projects/pci/sys/sys/priv.h#6 integrate .. //depot/projects/pci/sys/sys/sdt.h#5 integrate .. //depot/projects/pci/sys/sys/sf_buf.h#3 integrate .. //depot/projects/pci/sys/sys/socketvar.h#4 integrate .. //depot/projects/pci/sys/sys/stdatomic.h#2 integrate .. //depot/projects/pci/sys/sys/systm.h#11 integrate .. //depot/projects/pci/sys/sys/vnode.h#10 integrate .. //depot/projects/pci/sys/ufs/ffs/ffs_alloc.c#12 integrate .. //depot/projects/pci/sys/ufs/ffs/ffs_balloc.c#6 integrate .. //depot/projects/pci/sys/ufs/ffs/ffs_snapshot.c#8 integrate .. //depot/projects/pci/sys/ufs/ffs/ffs_suspend.c#2 integrate .. //depot/projects/pci/sys/ufs/ffs/ffs_vfsops.c#9 integrate .. //depot/projects/pci/sys/ufs/ufs/dinode.h#4 integrate .. //depot/projects/pci/sys/ufs/ufs/inode.h#8 integrate .. //depot/projects/pci/sys/ufs/ufs/ufs_extattr.c#5 integrate .. //depot/projects/pci/sys/ufs/ufs/ufs_vnops.c#7 integrate .. //depot/projects/pci/sys/vm/swap_pager.c#8 integrate .. //depot/projects/pci/sys/vm/uma_core.c#7 integrate .. //depot/projects/pci/sys/vm/vm_fault.c#9 integrate .. //depot/projects/pci/sys/vm/vm_map.c#8 integrate .. //depot/projects/pci/sys/vm/vm_map.h#5 integrate .. //depot/projects/pci/sys/vm/vm_object.c#8 integrate .. //depot/projects/pci/sys/vm/vm_object.h#6 integrate .. //depot/projects/pci/sys/vm/vm_page.c#9 integrate .. //depot/projects/pci/sys/vm/vm_phys.c#5 integrate Differences ... ==== //depot/projects/pci/sys/amd64/amd64/machdep.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 251039 2013-05-27 18:39:39Z kib $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 253352 2013-07-15 06:30:57Z kib $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1228,6 +1228,36 @@ ip++; } } + +/* Show privileged registers. */ +DB_SHOW_COMMAND(sysregs, db_show_sysregs) +{ + struct { + uint16_t limit; + uint64_t base; + } __packed idtr, gdtr; + uint16_t ldt, tr; + + __asm __volatile("sidt %0" : "=m" (idtr)); + db_printf("idtr\t0x%016lx/%04x\n", + (u_long)idtr.base, (u_int)idtr.limit); + __asm __volatile("sgdt %0" : "=m" (gdtr)); + db_printf("gdtr\t0x%016lx/%04x\n", + (u_long)gdtr.base, (u_int)gdtr.limit); + __asm __volatile("sldt %0" : "=r" (ldt)); + db_printf("ldtr\t0x%04x\n", ldt); + __asm __volatile("str %0" : "=r" (tr)); + db_printf("tr\t0x%04x\n", tr); + db_printf("cr0\t0x%016lx\n", rcr0()); + db_printf("cr2\t0x%016lx\n", rcr2()); + db_printf("cr3\t0x%016lx\n", rcr3()); + db_printf("cr4\t0x%016lx\n", rcr4()); + db_printf("EFER\t%016lx\n", rdmsr(MSR_EFER)); + db_printf("FEATURES_CTL\t%016lx\n", rdmsr(MSR_IA32_FEATURE_CONTROL)); + db_printf("DEBUG_CTL\t%016lx\n", rdmsr(MSR_DEBUGCTLMSR)); + db_printf("PAT\t%016lx\n", rdmsr(MSR_PAT)); + db_printf("GSBASE\t%016lx\n", rdmsr(MSR_GSBASE)); +} #endif void ==== //depot/projects/pci/sys/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 251720 2013-06-14 00:03:43Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 253140 2013-07-10 09:24:03Z kib $"); /* * Manages physical address maps. @@ -2234,6 +2234,7 @@ if (m_pc == NULL && free != NULL) { m_pc = free; free = (void *)m_pc->object; + m_pc->object = NULL; /* Recycle a freed page table page. */ m_pc->wire_count = 1; atomic_add_int(&cnt.v_wire_count, 1); @@ -4400,6 +4401,7 @@ int64_t bit; uint64_t inuse, bitmask; int allfree, field, freed, idx; + vm_paddr_t pa; if (pmap != PCPU_GET(curpmap)) { printf("warning: pmap_remove_pages called with non-current pmap\n"); @@ -4429,7 +4431,7 @@ pte = (pt_entry_t *)PHYS_TO_DMAP(tpte & PG_FRAME); pte = &pte[pmap_pte_index(pv->pv_va)]; - tpte = *pte & ~PG_PTE_PAT; + tpte = *pte; } if ((tpte & PG_V) == 0) { panic("bad pte va %lx pte %lx", @@ -4444,8 +4446,13 @@ continue; } - m = PHYS_TO_VM_PAGE(tpte & PG_FRAME); - KASSERT(m->phys_addr == (tpte & PG_FRAME), + if (tpte & PG_PS) + pa = tpte & PG_PS_FRAME; + else + pa = tpte & PG_FRAME; + + m = PHYS_TO_VM_PAGE(pa); + KASSERT(m->phys_addr == pa, ("vm_page_t %p phys_addr mismatch %016jx %016jx", m, (uintmax_t)m->phys_addr, (uintmax_t)tpte)); ==== //depot/projects/pci/sys/amd64/conf/GENERIC#10 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/amd64/conf/GENERIC 250963 2013-05-24 09:22:43Z achim $ +# $FreeBSD: head/sys/amd64/conf/GENERIC 252867 2013-07-06 07:49:41Z delphij $ cpu HAMMER ident GENERIC @@ -147,6 +147,7 @@ device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x +device hptnr # Highpoint DC7280, R750 device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx device hpt27xx # Highpoint RocketRAID 27xx device iir # Intel Integrated RAID ==== //depot/projects/pci/sys/amd64/conf/NOTES#7 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: head/sys/amd64/conf/NOTES 250963 2013-05-24 09:22:43Z achim $ +# $FreeBSD: head/sys/amd64/conf/NOTES 252867 2013-07-06 07:49:41Z delphij $ # # @@ -418,6 +418,10 @@ device hptmv # +# Highpoint DC7280 and R750. +device hptnr + +# # Highpoint RocketRAID. Supports RR172x, RR222x, RR2240, RR232x, RR2340, # RR2210, RR174x, RR2522, RR231x, RR230x. device hptrr ==== //depot/projects/pci/sys/amd64/include/counter.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/include/counter.h 252032 2013-06-20 14:30:04Z kib $ + * $FreeBSD: head/sys/amd64/include/counter.h 252434 2013-07-01 02:48:27Z kib $ */ #ifndef __MACHINE_COUNTER_H__ @@ -36,6 +36,44 @@ #define counter_enter() do {} while (0) #define counter_exit() do {} while (0) +#ifdef IN_SUBR_COUNTER_C +static inline uint64_t +counter_u64_read_one(uint64_t *p, int cpu) +{ + + return (*(uint64_t *)((char *)p + sizeof(struct pcpu) * cpu)); +} + +static inline uint64_t +counter_u64_fetch_inline(uint64_t *p) +{ + uint64_t r; + int i; + + r = 0; + for (i = 0; i < mp_ncpus; i++) + r += counter_u64_read_one((uint64_t *)p, i); + + return (r); +} + +static void +counter_u64_zero_one_cpu(void *arg) +{ + + *((uint64_t *)((char *)arg + sizeof(struct pcpu) * + PCPU_GET(cpuid))) = 0; +} + +static inline void +counter_u64_zero_inline(counter_u64_t c) +{ + + smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu, + smp_no_rendevous_barrier, c); +} +#endif + #define counter_u64_add_protected(c, i) counter_u64_add(c, i) static inline void ==== //depot/projects/pci/sys/amd64/vmm/intel/ept.c#2 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/intel/ept.c 245678 2013-01-20 03:42:49Z neel $ + * $FreeBSD: head/sys/amd64/vmm/intel/ept.c 252475 2013-07-01 20:05:43Z grehan $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/ept.c 245678 2013-01-20 03:42:49Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/ept.c 252475 2013-07-01 20:05:43Z grehan $"); #include #include @@ -77,6 +77,11 @@ static uint64_t page_sizes_mask; +/* + * Set this to 1 to have the EPT tables respect the guest PAT settings + */ +static int ept_pat_passthru; + int ept_init(void) { @@ -226,10 +231,13 @@ ptp[ptpindex] |= EPT_PG_EX; /* - * XXX should we enforce this memory type by setting the - * ignore PAT bit to 1. + * By default the PAT type is ignored - this appears to + * be how other hypervisors handle EPT. Allow this to be + * overridden. */ ptp[ptpindex] |= EPT_PG_MEMORY_TYPE(attr); + if (!ept_pat_passthru) + ptp[ptpindex] |= EPT_PG_IGNORE_PAT; if (nlevels > 0) ptp[ptpindex] |= EPT_PG_SUPERPAGE; ==== //depot/projects/pci/sys/amd64/vmm/vmm_instruction_emul.c#3 (text+ko) ==== @@ -24,11 +24,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 250175 2013-05-02 12:35:15Z emaste $ + * $FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 252641 2013-07-03 23:05:17Z neel $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 250175 2013-05-02 12:35:15Z emaste $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 252641 2013-07-03 23:05:17Z neel $"); #ifdef _KERNEL #include @@ -780,6 +780,19 @@ } /* + * Verify that all the bytes in the instruction buffer were consumed. + */ +static int +verify_inst_length(struct vie *vie) +{ + + if (vie->num_processed == vie->num_valid) + return (0); + else + return (-1); +} + +/* * Verify that the 'guest linear address' provided as collateral of the nested * page table fault matches with our instruction decoding. */ @@ -853,6 +866,9 @@ if (decode_immediate(vie)) return (-1); + if (verify_inst_length(vie)) + return (-1); + if (verify_gla(vm, cpuid, gla, vie)) return (-1); ==== //depot/projects/pci/sys/arm/arm/bus_space_generic.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/bus_space_generic.c 177888 2008-04-03 18:28:34Z raj $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/bus_space_generic.c 252424 2013-06-30 19:36:17Z cognet $"); #include #include @@ -73,7 +73,7 @@ offset = bpa & PAGE_MASK; startpa = trunc_page(bpa); - va = kmem_alloc(kernel_map, endpa - startpa); + va = kmem_alloc_nofault(kernel_map, endpa - startpa); if (va == 0) return (ENOMEM); ==== //depot/projects/pci/sys/arm/arm/busdma_machdep-v6.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep-v6.c 248655 2013-03-23 17:17:06Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep-v6.c 252652 2013-07-03 23:38:02Z gonzo $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -192,14 +192,26 @@ static void busdma_init(void *dummy) { + int uma_flags; + + uma_flags = 0; /* Create a cache of buffers in standard (cacheable) memory. */ standard_allocator = busdma_bufalloc_create("buffer", arm_dcache_align, /* minimum_alignment */ NULL, /* uma_alloc func */ NULL, /* uma_free func */ - 0); /* uma_zcreate_flags */ + uma_flags); /* uma_zcreate_flags */ +#ifdef INVARIANTS + /* + * Force UMA zone to allocate service structures like + * slabs using own allocator. uma_debug code performs + * atomic ops on uma_slab_t fields and safety of this + * operation is not guaranteed for write-back caches + */ + uma_flags = UMA_ZONE_OFFPAGE; +#endif /* * Create a cache of buffers in uncacheable memory, to implement the * BUS_DMA_COHERENT (and potentially BUS_DMA_NOCACHE) flag. @@ -208,7 +220,7 @@ arm_dcache_align, /* minimum_alignment */ busdma_bufalloc_alloc_uncacheable, busdma_bufalloc_free_uncacheable, - 0); /* uma_zcreate_flags */ + uma_flags); /* uma_zcreate_flags */ } /* ==== //depot/projects/pci/sys/arm/arm/cpufunc.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/cpufunc.c 249999 2013-04-27 23:07:49Z wkoszek $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/cpufunc.c 252361 2013-06-28 22:31:17Z ray $"); #include #include @@ -1481,7 +1481,8 @@ cputype == CPU_ID_CORTEXA8R3 || cputype == CPU_ID_CORTEXA9R1 || cputype == CPU_ID_CORTEXA9R2 || - cputype == CPU_ID_CORTEXA9R3) { + cputype == CPU_ID_CORTEXA9R3 || + cputype == CPU_ID_CORTEXA15 ) { cpufuncs = cortexa_cpufuncs; cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */ get_cachetype_cp15(); ==== //depot/projects/pci/sys/arm/arm/db_trace.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/db_trace.c 252320 2013-06-27 22:26:56Z andrew $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/db_trace.c 253309 2013-07-13 00:39:07Z rpaulo $"); #include #include @@ -515,11 +515,11 @@ db_printsym(scp, DB_STGY_PROC); db_printf("\n"); #ifdef __PROG26 - db_printf("scp=0x%08x rlv=0x%08x (", scp, frame[FR_RLV] & R15_PC); + db_printf("\tscp=0x%08x rlv=0x%08x (", scp, frame[FR_RLV] & R15_PC); db_printsym(frame[FR_RLV] & R15_PC, DB_STGY_PROC); db_printf(")\n"); #else - db_printf("scp=0x%08x rlv=0x%08x (", scp, frame[FR_RLV]); + db_printf("\tscp=0x%08x rlv=0x%08x (", scp, frame[FR_RLV]); db_printsym(frame[FR_RLV], DB_STGY_PROC); db_printf(")\n"); #endif ==== //depot/projects/pci/sys/arm/arm/elf_trampoline.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ #include "opt_kernname.h" #include -__FBSDID("$FreeBSD: head/sys/arm/arm/elf_trampoline.c 248364 2013-03-16 03:50:27Z andrew $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/elf_trampoline.c 253005 2013-07-07 21:20:52Z rpaulo $"); #include #include #include @@ -49,42 +49,59 @@ void __start(void); void __startC(void); +extern unsigned int cpufunc_id(void); +extern void armv6_idcache_wbinv_all(void); +extern void armv7_idcache_wbinv_all(void); +extern void do_call(void *, void *, void *, int); + #define GZ_HEAD 0xa #ifdef CPU_ARM7TDMI #define cpu_idcache_wbinv_all arm7tdmi_cache_flushID +extern void arm7tdmi_cache_flushID(void); #elif defined(CPU_ARM8) #define cpu_idcache_wbinv_all arm8_cache_purgeID +extern void arm8_cache_purgeID(void); #elif defined(CPU_ARM9) #define cpu_idcache_wbinv_all arm9_idcache_wbinv_all +extern void arm9_idcache_wbinv_all(void); #elif defined(CPU_FA526) || defined(CPU_FA626TE) #define cpu_idcache_wbinv_all fa526_idcache_wbinv_all +extern void fa526_idcache_wbinv_all(void); #elif defined(CPU_ARM9E) #define cpu_idcache_wbinv_all armv5_ec_idcache_wbinv_all +extern void armv5_ec_idcache_wbinv_all(void); #elif defined(CPU_ARM10) #define cpu_idcache_wbinv_all arm10_idcache_wbinv_all +extern void arm10_idcache_wbinv_all(void); #elif defined(CPU_ARM1136) || defined(CPU_ARM1176) #define cpu_idcache_wbinv_all armv6_idcache_wbinv_all #elif defined(CPU_SA110) || defined(CPU_SA1110) || defined(CPU_SA1100) || \ defined(CPU_IXP12X0) #define cpu_idcache_wbinv_all sa1_cache_purgeID +extern void sa1_cache_purgeID(void); #elif defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ defined(CPU_XSCALE_80219) #define cpu_idcache_wbinv_all xscale_cache_purgeID +extern void xscale_cache_purgeID(void); #elif defined(CPU_XSCALE_81342) #define cpu_idcache_wbinv_all xscalec3_cache_purgeID +extern void xscalec3_cache_purgeID(void); #elif defined(CPU_MV_PJ4B) #if !defined(SOC_MV_ARMADAXP) #define cpu_idcache_wbinv_all armv6_idcache_wbinv_all +extern void armv6_idcache_wbinv_all(void); #else #define cpu_idcache_wbinv_all() armadaxp_idcache_wbinv_all #endif #endif /* CPU_MV_PJ4B */ #ifdef CPU_XSCALE_81342 #define cpu_l2cache_wbinv_all xscalec3_l2cache_purge +extern void xscalec3_l2cache_purge(void); #elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY) #define cpu_l2cache_wbinv_all sheeva_l2cache_wbinv_all +extern void sheeva_l2cache_wbinv_all(void); #elif defined(CPU_CORTEXA) #define cpu_idcache_wbinv_all armv7_idcache_wbinv_all #define cpu_l2cache_wbinv_all() @@ -434,11 +451,11 @@ inflate_kernel(void *kernel, void *startaddr) { struct inflate infl; - char slide[GZ_WSIZE]; + unsigned char slide[GZ_WSIZE]; orig_input = kernel; memcnt = memtot = 0; - i_input = (char *)kernel + GZ_HEAD; + i_input = (unsigned char *)kernel + GZ_HEAD; if (((char *)kernel)[3] & 0x18) { while (*i_input) i_input++; @@ -590,6 +607,8 @@ __asm __volatile(".globl func_end\n" "func_end:"); + /* NOTREACHED */ + return NULL; } extern char func_end[]; ==== //depot/projects/pci/sys/arm/arm/gic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/gic.c 249762 2013-04-22 08:28:53Z dmarion $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/gic.c 252370 2013-06-29 12:08:26Z ray $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 18 16:03:13 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11BD181E; Thu, 18 Jul 2013 16:03:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C76B381C for ; Thu, 18 Jul 2013 16:03:12 +0000 (UTC) (envelope-from jonathan@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id B7C8B83A for ; Thu, 18 Jul 2013 16:03:12 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6IG3COo064103 for ; Thu, 18 Jul 2013 16:03:12 GMT (envelope-from jonathan@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6IG3CcK064100 for perforce@freebsd.org; Thu, 18 Jul 2013 16:03:12 GMT (envelope-from jonathan@freebsd.org) Date: Thu, 18 Jul 2013 16:03:12 GMT Message-Id: <201307181603.r6IG3CcK064100@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jonathan@freebsd.org using -f From: Jonathan Anderson Subject: PERFORCE change 231256 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jul 2013 16:03:13 -0000 http://p4web.freebsd.org/@@231256?ac=10 Change 231256 by jonathan@jonathan-on-joe on 2013/07/18 16:02:36 Rename TESLA_NOW to TESLA_ASSERTION_SITE. Pull in commit b0d631b from GitHub, which renames the 'now' event in a number of places. This isn't a very complicated change, but it does touch a lot of code. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla-macros.h#7 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla.h#5 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla-macros.h#7 (text+ko) ==== @@ -81,7 +81,7 @@ #define flags(...) __tesla_flags(__VA_ARGS__) #define bitmask(...) __tesla_mask(__VA_ARGS__) -#define TESLA_NOW __tesla_now +#define TESLA_ASSERTION_SITE __tesla_assertion_site #define TESLA_STRUCT_AUTOMATON(...) __tesla_struct_usage(__VA_ARGS__) @@ -97,10 +97,10 @@ #define ANY(int_type) __tesla_any(int_type) /** A more programmer-friendly way to write assertions about the past. */ -#define previously(...) TSEQUENCE(__VA_ARGS__, TESLA_NOW) +#define previously(...) TSEQUENCE(__VA_ARGS__, TESLA_ASSERTION_SITE) /** A more programmer-friendly way to write assertions about the future. */ -#define eventually(...) TSEQUENCE(TESLA_NOW, __VA_ARGS__) +#define eventually(...) TSEQUENCE(TESLA_ASSERTION_SITE, __VA_ARGS__) /** @} */ ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla.h#5 (text+ko) ==== @@ -128,7 +128,7 @@ struct __tesla_event* __tesla_ignore; /** Reaching the inline assertion. */ -struct __tesla_event* __tesla_now; +struct __tesla_event* __tesla_assertion_site; struct __tesla_event* __tesla_optional(__tesla_event*, ...); From owner-p4-projects@FreeBSD.ORG Thu Jul 18 16:28:40 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E0F6193; Thu, 18 Jul 2013 16:28:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 31682191 for ; Thu, 18 Jul 2013 16:28:40 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 219D99DE for ; Thu, 18 Jul 2013 16:28:40 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6IGSe1g068071 for ; Thu, 18 Jul 2013 16:28:40 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6IGSd6p068068 for perforce@freebsd.org; Thu, 18 Jul 2013 16:28:39 GMT (envelope-from brooks@freebsd.org) Date: Thu, 18 Jul 2013 16:28:39 GMT Message-Id: <201307181628.r6IGSd6p068068@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 231257 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jul 2013 16:28:40 -0000 http://p4web.freebsd.org/@@231257?ac=10 Change 231257 by brooks@brooks_zenith on 2013/07/18 16:28:39 Merge binutils updates from github.com/CTSRD-CHERI/binutils. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/contrib/binutils/opcodes/mips-dis.c#5 edit .. //depot/projects/ctsrd/cheribsd/src/contrib/binutils/opcodes/mips-opc.c#11 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/contrib/binutils/opcodes/mips-dis.c#5 (text+ko) ==== @@ -921,11 +921,15 @@ case 'o': delta = ((l >> OP_SH_CDELTA) & OP_MASK_CDELTA); + if (delta > (OP_MASK_CDELTA >> 1)) + delta -= (OP_MASK_CDELTA + 1); (*info->fprintf_func) (info->stream, "%d", delta); break; case 'O': delta = ((l >> OP_SH_CDELTA2) & OP_MASK_CDELTA2); + if (delta > (OP_MASK_CDELTA2 >> 1)) + delta -= (OP_MASK_CDELTA2 + 1); (*info->fprintf_func) (info->stream, "%d", delta); break; ==== //depot/projects/ctsrd/cheribsd/src/contrib/binutils/opcodes/mips-opc.c#11 (text+ko) ==== @@ -208,65 +208,80 @@ {"clcr", "+x,d(+w)", 0xd8000000, 0xfc0007ff, 0, 0, I1}, {"csci", "+x,+o(+w)", 0xf8000000, 0xfc00f800, 0, 0, I1}, {"clci", "+x,+o(+w)", 0xd8000000, 0xfc00f800, 0, 0, I1}, + {"clbu", "v,d,+O(+w)", 0xc8000000, 0xfc000007, 0, 0, I1}, {"clhu", "v,d,+O(+w)", 0xc8000001, 0xfc000007, 0, 0, I1}, {"clwu", "v,d,+O(+w)", 0xc8000002, 0xfc000007, 0, 0, I1}, /* there is no cldu */ +{"cld", "v,d,+O(+w)", 0xc8000003, 0xfc000007, 0, 0, I1}, {"clb", "v,d,+O(+w)", 0xc8000004, 0xfc000007, 0, 0, I1}, {"clh", "v,d,+O(+w)", 0xc8000005, 0xfc000007, 0, 0, I1}, {"clw", "v,d,+O(+w)", 0xc8000006, 0xfc000007, 0, 0, I1}, -{"cld", "v,d,+O(+w)", 0xc8000007, 0xfc000007, 0, 0, I1}, + {"clbur", "v,d(+w)", 0xc8000000, 0xfc0007ff, 0, 0, I1}, {"clhur", "v,d(+w)", 0xc8000001, 0xfc0007ff, 0, 0, I1}, {"clwur", "v,d(+w)", 0xc8000002, 0xfc0007ff, 0, 0, I1}, /* there is no cldur */ +{"cldr", "v,d(+w)", 0xc8000003, 0xfc0007ff, 0, 0, I1}, {"clbr", "v,d(+w)", 0xc8000004, 0xfc0007ff, 0, 0, I1}, {"clhr", "v,d(+w)", 0xc8000005, 0xfc0007ff, 0, 0, I1}, {"clwr", "v,d(+w)", 0xc8000006, 0xfc0007ff, 0, 0, I1}, -{"cldr", "v,d(+w)", 0xc8000007, 0xfc0007ff, 0, 0, I1}, + {"clbui", "v,+O(+w)", 0xc8000000, 0xfc00f807, 0, 0, I1}, {"clhui", "v,+O(+w)", 0xc8000001, 0xfc00f807, 0, 0, I1}, {"clwui", "v,+O(+w)", 0xc8000002, 0xfc00f807, 0, 0, I1}, -/* there is no cldui */ +/* There is no cldui. Call this opcode cldi as sign-extend and zero-extend + * are the same for double-words + */ +{"cldi", "v,+O(+w)", 0xc8000003, 0xfc00f807, 0, 0, I1}, {"clbi", "v,+O(+w)", 0xc8000004, 0xfc00f807, 0, 0, I1}, {"clhi", "v,+O(+w)", 0xc8000005, 0xfc00f807, 0, 0, I1}, {"clwi", "v,+O(+w)", 0xc8000006, 0xfc00f807, 0, 0, I1}, -{"cldi", "v,+O(+w)", 0xc8000007, 0xfc00f807, 0, 0, I1}, -{"csbh", "v,d,+O(+w)", 0xe8000000, 0xfc000007, 0, 0, I1}, -{"cshh", "v,d,+O(+w)", 0xe8000001, 0xfc000007, 0, 0, I1}, -{"cswh", "v,d,+O(+w)", 0xe8000002, 0xfc000007, 0, 0, I1}, +{"csb", "v,d,+O(+w)", 0xe8000000, 0xfc000007, 0, 0, I1}, +{"csh", "v,d,+O(+w)", 0xe8000001, 0xfc000007, 0, 0, I1}, +{"csw", "v,d,+O(+w)", 0xe8000002, 0xfc000007, 0, 0, I1}, +{"csd", "v,d,+O(+w)", 0xe8000003, 0xfc000007, 0, 0, I1}, +{"csbh", "v,d,+O(+w)", 0xe8000004, 0xfc000007, 0, 0, I1}, +{"cshh", "v,d,+O(+w)", 0xe8000005, 0xfc000007, 0, 0, I1}, +{"cswh", "v,d,+O(+w)", 0xe8000006, 0xfc000007, 0, 0, I1}, /* there is no csdh */ -{"csb", "v,d,+O(+w)", 0xe8000004, 0xfc000007, 0, 0, I1}, -{"csh", "v,d,+O(+w)", 0xe8000005, 0xfc000007, 0, 0, I1}, -{"csw", "v,d,+O(+w)", 0xe8000006, 0xfc000007, 0, 0, I1}, -{"csd", "v,d,+O(+w)", 0xe8000007, 0xfc000007, 0, 0, I1}, -{"csbhr", "v,d(+w)", 0xe8000000, 0xfc0007ff, 0, 0, I1}, -{"cshhr", "v,d(+w)", 0xe8000001, 0xfc0007ff, 0, 0, I1}, -{"cswhr", "v,d(+w)", 0xe8000002, 0xfc0007ff, 0, 0, I1}, +{"csbr", "v,d(+w)", 0xe8000000, 0xfc0007ff, 0, 0, I1}, +{"cshr", "v,d(+w)", 0xe8000001, 0xfc0007ff, 0, 0, I1}, +{"cswr", "v,d(+w)", 0xe8000002, 0xfc0007ff, 0, 0, I1}, +{"csdr", "v,d(+w)", 0xe8000003, 0xfc0007ff, 0, 0, I1}, +{"csbhr", "v,d(+w)", 0xe8000004, 0xfc0007ff, 0, 0, I1}, +{"cshhr", "v,d(+w)", 0xe8000005, 0xfc0007ff, 0, 0, I1}, +{"cswhr", "v,d(+w)", 0xe8000006, 0xfc0007ff, 0, 0, I1}, /* there is no csdhr */ -{"csbr", "v,d(+w)", 0xe8000004, 0xfc0007ff, 0, 0, I1}, -{"cshr", "v,d(+w)", 0xe8000005, 0xfc0007ff, 0, 0, I1}, -{"cswr", "v,d(+w)", 0xe8000006, 0xfc0007ff, 0, 0, I1}, -{"csdr", "v,d(+w)", 0xe8000007, 0xfc0007ff, 0, 0, I1}, -{"csbhi", "v,+O(+w)", 0xe8000000, 0xfc00f807, 0, 0, I1}, -{"cshhi", "v,+O(+w)", 0xe8000001, 0xfc00f807, 0, 0, I1}, -{"cswhi", "v,+O(+w)", 0xe8000002, 0xfc00f807, 0, 0, I1}, +{"csbi", "v,+O(+w)", 0xe8000000, 0xfc00f807, 0, 0, I1}, +{"cshi", "v,+O(+w)", 0xe8000001, 0xfc00f807, 0, 0, I1}, +{"cswi", "v,+O(+w)", 0xe8000002, 0xfc00f807, 0, 0, I1}, +{"csdi", "v,+O(+w)", 0xe8000003, 0xfc00f807, 0, 0, I1}, +{"csbhi", "v,+O(+w)", 0xe8000004, 0xfc00f807, 0, 0, I1}, +{"cshhi", "v,+O(+w)", 0xe8000005, 0xfc00f807, 0, 0, I1}, +{"cswhi", "v,+O(+w)", 0xe8000006, 0xfc00f807, 0, 0, I1}, /* there is no csdhi */ -{"csbi", "v,+O(+w)", 0xe8000004, 0xfc00f807, 0, 0, I1}, -{"cshi", "v,+O(+w)", 0xe8000005, 0xfc00f807, 0, 0, I1}, -{"cswi", "v,+O(+w)", 0xe8000006, 0xfc00f807, 0, 0, I1}, -{"csdi", "v,+O(+w)", 0xe8000007, 0xfc00f807, 0, 0, I1}, + +{"clld", "v,d,+O(+w)", 0xc8000007, 0xfc000007, 0, 0, I1}, +{"cscd", "v,d,+O(+w)", 0xc8000007, 0xfc000007, 0, 0, I1}, +{"clldr", "v,d(+w)", 0xc8000007, 0xfc0007ff, 0, 0, I1}, +{"cscdr", "v,d(+w)", 0xe8000007, 0xfc0007ff, 0, 0, I1}, +{"clldi", "v,+O(+w)", 0xc8000007, 0xfc00f807, 0, 0, I1}, +{"cscdi", "v,+O(+w)", 0xe8000007, 0xfc00f807, 0, 0, I1}, -{"cjr", "m(+b)", 0x49000000, 0xffff003f, 0, 0, I1}, -{"cjalr", "m(+b)", 0x48e00000, 0xffff003f, 0, 0, I1}, {"csealcode", "+w,+b", 0x48200000, 0xffe007ff, 0, 0, I1}, {"csealdata", "+w,+b,+v", 0x48400000, 0xffe0003f, 0, 0, I1}, {"cunseal", "+w,+b,+v", 0x48600000, 0xffe0003f, 0, 0, I1}, {"ccall", "+w,+b", 0x48a00000, 0xffe007ff, 0, 0, I1}, {"creturn", "", 0x48c00000, 0xffffffff, 0, 0, I1}, +{"cjalr", "m(+b)", 0x48e00000, 0xffff003f, 0, 0, I1}, +{"cjr", "m(+b)", 0x49000000, 0xffff003f, 0, 0, I1}, +{"cbtu", "+w,p", 0x49200000, 0xffe00000, 0, 0, I1}, +{"cbts", "+w,p", 0x49400000, 0xffe00000, 0, 0, I1}, + {"b", "p", 0x10000000, 0xffff0000, UBD, INSN2_ALIAS, I1 },/* beq 0,0 */ {"b", "p", 0x04010000, 0xffff0000, UBD, INSN2_ALIAS, I1 },/* bgez 0 */ {"bal", "p", 0x04110000, 0xffff0000, UBD|WR_31, INSN2_ALIAS, I1 },/* bgezal 0*/ From owner-p4-projects@FreeBSD.ORG Thu Jul 18 16:31:44 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1031831C; Thu, 18 Jul 2013 16:31:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C5E3831A for ; Thu, 18 Jul 2013 16:31:43 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id B7956A21 for ; Thu, 18 Jul 2013 16:31:43 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6IGVhUj068886 for ; Thu, 18 Jul 2013 16:31:43 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6IGVhVr068883 for perforce@freebsd.org; Thu, 18 Jul 2013 16:31:43 GMT (envelope-from brooks@freebsd.org) Date: Thu, 18 Jul 2013 16:31:43 GMT Message-Id: <201307181631.r6IGVhVr068883@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 231258 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jul 2013 16:31:44 -0000 http://p4web.freebsd.org/@@231258?ac=10 Change 231258 by brooks@brooks_zenith on 2013/07/18 16:31:35 Change 231257 should have read: Merge binutils updates from github.com/CTSRD-CHERI/binutils. commit 89479e4e882f9f39203ea8a4117e5eb87d262357 Author: Michael Roe Date: Thu Jun 6 14:28:08 2013 +0100 Changed the assembler mnemonics from CBTF and CBTT to CBTU and CBTS. commit 90ceb905a43bf7d9c1ea493a96c243c9943687ce Author: Michael Roe Date: Thu Jun 6 14:02:33 2013 +0100 Added assembler support for the CHERI instructions CBTF (capability branch if tag is false) and CBTF (capability branch if tag is true). commit 74670a3030945e7aa79c5f21ab1315f4010edc0e Author: Michael Roe Date: Mon Apr 15 12:00:09 2013 +0100 The disassembler now supports negative immediate offsets in capability instructions. commit 78a7cfe697ad34f52bdadcd97872c3d0175cec91 Author: Michael Roe Date: Fri Mar 22 15:43:49 2013 +0000 Added support for clld and cscd opcodes. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/contrib/binutils/opcodes/mips-dis.c#6 edit .. //depot/projects/ctsrd/cheribsd/src/contrib/binutils/opcodes/mips-opc.c#12 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/contrib/binutils/opcodes/mips-dis.c#6 (text+ko) ==== ==== //depot/projects/ctsrd/cheribsd/src/contrib/binutils/opcodes/mips-opc.c#12 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jul 18 21:36:14 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 918AFA64; Thu, 18 Jul 2013 21:36:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5377BA62 for ; Thu, 18 Jul 2013 21:36:14 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 44869AA0 for ; Thu, 18 Jul 2013 21:36:14 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6ILaE8g014018 for ; Thu, 18 Jul 2013 21:36:14 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6ILaEpb014015 for perforce@freebsd.org; Thu, 18 Jul 2013 21:36:14 GMT (envelope-from brooks@freebsd.org) Date: Thu, 18 Jul 2013 21:36:14 GMT Message-Id: <201307182136.r6ILaEpb014015@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 231264 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jul 2013 21:36:15 -0000 http://p4web.freebsd.org/@@231264?ac=10 Change 231264 by brooks@brooks_zenith on 2013/07/18 21:36:08 When we read, write, or truncate a file via most applicable syscalls, ensure that we checked for the correct capability when translating from file descriptor to struct file. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/kern/vfs_vnops.c#3 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/kern/vfs_vnops.c#3 (text+ko) ==== @@ -68,10 +68,16 @@ #include #include #include +#include +#include +#include #include #include +#include +#include + #include #include #include @@ -707,6 +713,10 @@ } offset = uio->uio_offset; + TESLA_WITHIN(kern_readv, previously(fget_unlocked(ANY(ptr), ANY(int), + bitmask(CAP_READ), ANY(int), &fp, ANY(ptr)) == 0)); + TESLA_WITHIN(kern_preadv, previously(fget_unlocked(ANY(ptr), ANY(int), + bitmask(CAP_PREAD), ANY(int), &fp, ANY(ptr)) == 0)); #ifdef MAC error = mac_vnode_check_read(active_cred, fp->f_cred, vp); if (error == 0) @@ -812,6 +822,10 @@ } offset = uio->uio_offset; + TESLA_WITHIN(kern_writev, previously(fget_unlocked(ANY(ptr), ANY(int), + bitmask(CAP_WRITE), ANY(int), &fp, ANY(ptr)) == 0)); + TESLA_WITHIN(kern_pwritev, previously(fget_unlocked(ANY(ptr), ANY(int), + bitmask(CAP_PWRITE), ANY(int), &fp, ANY(ptr)) == 0)); #ifdef MAC error = mac_vnode_check_write(active_cred, fp->f_cred, vp); if (error == 0) @@ -1200,6 +1214,8 @@ if (error) goto out; #endif + TESLA_WITHIN(kern_ftruncate, previously(fget_unlocked(ANY(ptr), + ANY(int), bitmask(CAP_FTRUNCATE), ANY(int), &fp, ANY(ptr)) == 0)); error = vn_writechk(vp); if (error == 0) { VATTR_NULL(&vattr); From owner-p4-projects@FreeBSD.ORG Thu Jul 18 22:19:01 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 597727CA; Thu, 18 Jul 2013 22:19:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1A6437C8 for ; Thu, 18 Jul 2013 22:19:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 09380C40 for ; Thu, 18 Jul 2013 22:19:01 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6IMJ0sQ020571 for ; Thu, 18 Jul 2013 22:19:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6IMJ0JG020568 for perforce@freebsd.org; Thu, 18 Jul 2013 22:19:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 18 Jul 2013 22:19:00 GMT Message-Id: <201307182219.r6IMJ0JG020568@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 231268 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jul 2013 22:19:01 -0000 http://p4web.freebsd.org/@@231268?ac=10 Change 231268 by rwatson@rwatson_cinnamon on 2013/07/18 22:18:45 When checking previous MAC checks from ffs_read(), let a successful call to mac_vnode_check_readdir() authorise, not just a successful call to mac_vnode_check_read(), as UFS readdir() falls through to VOP_READ(). This silences TESLA false positives spotted in readdir(). Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_vnops.c#10 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_vnops.c#10 (text+ko) ==== @@ -439,9 +439,11 @@ vp = ap->a_vp; TESLA_SYSCALL(previously(mac_vnode_check_read(ANY(ptr), ANY(ptr), vp) - == 0)); + == 0) || + previously(mac_vnode_check_readdir(ANY(ptr), vp) == 0)); TESLA_PAGE_FAULT(previously(mac_vnode_check_read(ANY(ptr), ANY(ptr), - vp) == 0)); + vp) == 0) || + previously(mac_vnode_check_readdir(ANY(ptr), vp) == 0)); uio = ap->a_uio; ioflag = ap->a_ioflag; From owner-p4-projects@FreeBSD.ORG Thu Jul 18 22:54:41 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39954359; Thu, 18 Jul 2013 22:54:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id EB40E357 for ; Thu, 18 Jul 2013 22:54:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id C173FDE1 for ; Thu, 18 Jul 2013 22:54:40 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6IMse2O025497 for ; Thu, 18 Jul 2013 22:54:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6IMseCZ025492 for perforce@freebsd.org; Thu, 18 Jul 2013 22:54:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 18 Jul 2013 22:54:40 GMT Message-Id: <201307182254.r6IMseCZ025492@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 231269 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jul 2013 22:54:41 -0000 http://p4web.freebsd.org/@@231269?ac=10 Change 231269 by rwatson@rwatson_cinnamon on 2013/07/18 22:53:40 When a credential is changed, it's OK if setsugid() is set before the change rather than after, since it's a process rather than credential property. This fixes a TESLA false positive in execve() in which setsugid() is called once up-front if the credential will be modified by at least one if setuid, setgid, etc, rather than after as occurs in the system calls setuid(), setgid(), and so on. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/kern/kern_prot.c#3 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/kern/kern_prot.c#3 (text+ko) ==== @@ -2156,7 +2156,8 @@ == 0) || previously(mac_cred_check_setresuid(ANY(ptr), ANY(int), euid, ANY(int)) == 0)); - TESLA_SYSCALL(eventually(called(setsugid))); + TESLA_SYSCALL(previously(called(setsugid)) || + eventually(called(setsugid))); newcred->cr_uid = euid; uihold(euip); @@ -2180,7 +2181,8 @@ == 0) || previously(mac_cred_check_setresgid(ANY(ptr), ANY(int), egid, ANY(int)) == 0)); - TESLA_SYSCALL(eventually(called(setsugid))); + TESLA_SYSCALL(previously(called(setsugid)) || + eventually(called(setsugid))); newcred->cr_groups[0] = egid; } @@ -2204,7 +2206,8 @@ == 0) || previously(mac_cred_check_setresuid(ANY(ptr), ruid, ANY(int), ANY(int)) == 0)); - TESLA_SYSCALL(eventually(called(setsugid))); + TESLA_SYSCALL(previously(called(setsugid)) || + eventually(called(setsugid))); (void)chgproccnt(newcred->cr_ruidinfo, -1, 0); newcred->cr_ruid = ruid; @@ -2230,7 +2233,8 @@ == 0) || previously(mac_cred_check_setresgid(ANY(ptr), rgid, ANY(int), ANY(int)) == 0)); - TESLA_SYSCALL(eventually(called(setsugid))); + TESLA_SYSCALL(previously(called(setsugid)) || + eventually(called(setsugid))); newcred->cr_rgid = rgid; } @@ -2251,7 +2255,8 @@ ANY(int)) == 0) || previously(mac_cred_check_setresuid(ANY(ptr), ANY(int), ANY(int), ANY(int)) == 0)); - TESLA_SYSCALL(eventually(called(setsugid))); + TESLA_SYSCALL(previously(called(setsugid)) || + eventually(called(setsugid))); newcred->cr_svuid = svuid; } @@ -2272,7 +2277,8 @@ == 0) || previously(mac_cred_check_setresgid(ANY(ptr), ANY(int), ANY(int), ANY(int)) == 0)); - TESLA_SYSCALL(eventually(called(setsugid))); + TESLA_SYSCALL(previously(called(setsugid)) || + eventually(called(setsugid))); newcred->cr_svgid = svgid; } From owner-p4-projects@FreeBSD.ORG Fri Jul 19 10:31:17 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79F07DC7; Fri, 19 Jul 2013 10:31:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 136F0DC5 for ; Fri, 19 Jul 2013 10:31:17 +0000 (UTC) (envelope-from jonathan@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 03811F45 for ; Fri, 19 Jul 2013 10:31:17 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6JAVGlA029750 for ; Fri, 19 Jul 2013 10:31:16 GMT (envelope-from jonathan@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6JAVGHt029747 for perforce@freebsd.org; Fri, 19 Jul 2013 10:31:16 GMT (envelope-from jonathan@freebsd.org) Date: Fri, 19 Jul 2013 10:31:16 GMT Message-Id: <201307191031.r6JAVGHt029747@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jonathan@freebsd.org using -f From: Jonathan Anderson Subject: PERFORCE change 231278 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jul 2013 10:31:17 -0000 http://p4web.freebsd.org/@@231278?ac=10 Change 231278 by jonathan@jonathan-on-zenith on 2013/07/19 10:30:17 Pull in DTrace improvements from GitHub. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/libtesla.h#11 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#8 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/libtesla.h#11 (text+ko) ==== @@ -168,6 +168,9 @@ /** Possible transitions: exactly one must be taken. */ struct tesla_transition *transitions; + + /** A human-readable description for debugging purposes. */ + const char *description; }; #define TESLA_KEY_SIZE 4 ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#8 (text+ko) ==== @@ -47,7 +47,7 @@ "struct tesla_class *", "struct tesla_instance *", "struct tesla_instance *", "struct tesla_transition *"); SDT_PROBE_DEFINE3(tesla, automata, fail, no_instance, no-instance-match, - "struct tesla_class *", "struct tesla_key *", + "struct tesla_class *", "const char *", "struct tesla_transitions *"); SDT_PROBE_DEFINE3(tesla, automata, fail, bad_transition, bad-transition, "struct tesla_class *", "struct tesla_instance *", @@ -87,8 +87,10 @@ no_instance(struct tesla_class *tcp, const struct tesla_key *tkp, const struct tesla_transitions *ttp) { + char keybuf[20]; + key_string(keybuf, keybuf + sizeof(keybuf), tkp); - SDT_PROBE(tesla, automata, fail, no_instance, tcp, tkp, ttp, 0, 0); + SDT_PROBE(tesla, automata, fail, no_instance, tcp, keybuf, ttp, 0, 0); } static void From owner-p4-projects@FreeBSD.ORG Fri Jul 19 11:53:47 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E96E6298; Fri, 19 Jul 2013 11:53:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A72D0296 for ; Fri, 19 Jul 2013 11:53:46 +0000 (UTC) (envelope-from jonathan@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 985A430E for ; Fri, 19 Jul 2013 11:53:46 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6JBrk7x041297 for ; Fri, 19 Jul 2013 11:53:46 GMT (envelope-from jonathan@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6JBrkQu041294 for perforce@freebsd.org; Fri, 19 Jul 2013 11:53:46 GMT (envelope-from jonathan@freebsd.org) Date: Fri, 19 Jul 2013 11:53:46 GMT Message-Id: <201307191153.r6JBrkQu041294@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jonathan@freebsd.org using -f From: Jonathan Anderson Subject: PERFORCE change 231279 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jul 2013 11:53:47 -0000 http://p4web.freebsd.org/@@231279?ac=10 Change 231279 by jonathan@jonathan-on-zenith on 2013/07/19 11:53:30 Pull in TESLA DTrace parts from commit 219d22. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#9 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#9 (text+ko) ==== @@ -46,8 +46,8 @@ SDT_PROBE_DEFINE4(tesla, automata, instance, clone, clone, "struct tesla_class *", "struct tesla_instance *", "struct tesla_instance *", "struct tesla_transition *"); -SDT_PROBE_DEFINE3(tesla, automata, fail, no_instance, no-instance-match, - "struct tesla_class *", "const char *", +SDT_PROBE_DEFINE4(tesla, automata, fail, no_instance, no-instance-match, + "struct tesla_class *", "const char *", "const char *", "struct tesla_transitions *"); SDT_PROBE_DEFINE3(tesla, automata, fail, bad_transition, bad-transition, "struct tesla_class *", "struct tesla_instance *", @@ -87,10 +87,28 @@ no_instance(struct tesla_class *tcp, const struct tesla_key *tkp, const struct tesla_transitions *ttp) { + char instbuf[200]; + char *c = instbuf; + const char *end = instbuf + sizeof(instbuf); + + SAFE_SPRINTF(c, end, "%d/%d instances\n", + tcp->tc_limit - tcp->tc_free, tcp->tc_limit); + + for (uint32_t i = 0; i < tcp->tc_limit; i++) { + const struct tesla_instance *inst = tcp->tc_instances + i; + if (!tesla_instance_active(inst)) + continue; + + SAFE_SPRINTF(c, end, " %2u: state %d, ", i, inst->ti_state); + c = key_string(c, end, &inst->ti_key); + SAFE_SPRINTF(c, end, "\n"); + } + char keybuf[20]; key_string(keybuf, keybuf + sizeof(keybuf), tkp); - SDT_PROBE(tesla, automata, fail, no_instance, tcp, keybuf, ttp, 0, 0); + SDT_PROBE(tesla, automata, fail, no_instance, + tcp, instbuf, keybuf, ttp, 0); } static void From owner-p4-projects@FreeBSD.ORG Fri Jul 19 19:42:17 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AF63AD9; Fri, 19 Jul 2013 19:42:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4D441AD7 for ; Fri, 19 Jul 2013 19:42:17 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 2419ADD0 for ; Fri, 19 Jul 2013 19:42:17 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6JJgHBX010909 for ; Fri, 19 Jul 2013 19:42:17 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6JJgH5A010906 for perforce@freebsd.org; Fri, 19 Jul 2013 19:42:17 GMT (envelope-from brooks@freebsd.org) Date: Fri, 19 Jul 2013 19:42:17 GMT Message-Id: <201307191942.r6JJgH5A010906@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 231285 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jul 2013 19:42:17 -0000 http://p4web.freebsd.org/@@231285?ac=10 Change 231285 by brooks@brooks_zenith on 2013/07/19 19:41:22 Don't disable L1 cache management for now. There's some worry it may be required. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/std.beri#7 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/std.beri#7 (text+ko) ==== @@ -4,4 +4,3 @@ cpu CPU_MIPS4KC options BERI_LARGE_TLB -options MIPS_DISABLE_L1_CACHE From owner-p4-projects@FreeBSD.ORG Fri Jul 19 19:47:23 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 625D9C48; Fri, 19 Jul 2013 19:47:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 23A9AC46 for ; Fri, 19 Jul 2013 19:47:23 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id EFBF9DF3 for ; Fri, 19 Jul 2013 19:47:22 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6JJlM7l011303 for ; Fri, 19 Jul 2013 19:47:22 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6JJlMPV011300 for perforce@freebsd.org; Fri, 19 Jul 2013 19:47:22 GMT (envelope-from brooks@freebsd.org) Date: Fri, 19 Jul 2013 19:47:22 GMT Message-Id: <201307191947.r6JJlMPV011300@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 231286 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jul 2013 19:47:23 -0000 http://p4web.freebsd.org/@@231286?ac=10 Change 231286 by brooks@brooks_zenith on 2013/07/19 19:47:12 Don't disable L1 cache management for now. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/std.beri#7 integrate Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/std.beri#7 (text+ko) ==== @@ -4,4 +4,3 @@ cpu CPU_MIPS4KC options BERI_LARGE_TLB -options MIPS_DISABLE_L1_CACHE