From owner-p4-projects@FreeBSD.ORG Sun Sep 1 16:58:58 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0854878C; Sun, 1 Sep 2013 16:58:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id AAA4378A for ; Sun, 1 Sep 2013 16:58:57 +0000 (UTC) (envelope-from novazeta@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 96AA627C2 for ; Sun, 1 Sep 2013 16:58:57 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r81GwvNj076895 for ; Sun, 1 Sep 2013 16:58:57 GMT (envelope-from novazeta@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r81GwvZ6076892 for perforce@freebsd.org; Sun, 1 Sep 2013 16:58:57 GMT (envelope-from novazeta@FreeBSD.org) Date: Sun, 1 Sep 2013 16:58:57 GMT Message-Id: <201309011658.r81GwvZ6076892@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to novazeta@FreeBSD.org using -f From: Khilan Gudka Subject: PERFORCE change 543227 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, 01 Sep 2013 16:58:58 -0000 http://p4web.freebsd.org/@@543227?ac=10 Change 543227 by novazeta@novazeta_zenith on 2013/09/01 16:58:04 Updated bsd.prog.mk to allow running SOAAP on a program by typing "make prog.soaap" and also for performing instrumentation for dynamic call graph ("make prog.soaap_cg") and performance emulation ("make prog.soaap_perf") Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#12 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#12 (text+ko) ==== @@ -87,6 +87,21 @@ ${LLVM_LINK} -o ${.TARGET} ${OIRS} ;\ fi +${PROG}.soaap: ${PROG}.${LLVM_IR_TYPE}-a + ${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap ${SOAAP_FLAGS} -o /dev/null ${PROG}.${LLVM_IR_TYPE}-a + +${PROG}.soaap_cg: ${PROG}.${LLVM_IR_TYPE}-a + ${OPT} -load $(SOAAP_BUILD_DIR)/libcep.so -insert-call-edge-profiling -o ${PROG}.pbc ${PROG}.${LLVM_IR_TYPE}-a + ${LLC} -filetype=obj -o ${PROG}.po ${PROG}.pbc + ${CC} -L $(SOAAP_BUILD_DIR) -L $(LLVM_BUILD_DIR)/lib -lcep_rt -lprofile_rt $(LDADD) -o ${.TARGET} ${PROG}.po + +${PROG}.soaap_perf: ${PROG}.${LLVM_IR_TYPE}-a + ${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap -soaap-emulate-performance ${SOAAP_FLAGS} -o ${PROG}.pbc ${PROG}.${LLVM_IR_TYPE}-a + ${LLC} -filetype=obj -o ${PROG}.po ${PROG}.pbc + ${CC} $(LDADD) -o ${.TARGET} ${PROG}.po + +CLEANFILES+= ${PROG}.po ${PROG}.pbc ${PROG}.soaap_perf ${PROG}.soaap_cg + ${PROG}: ${OBJS} .if defined(PROG_CXX) ${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} From owner-p4-projects@FreeBSD.ORG Sun Sep 1 20:02:14 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCEF6AB9; Sun, 1 Sep 2013 20:02:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6E5A1AB7 for ; Sun, 1 Sep 2013 20:02:14 +0000 (UTC) (envelope-from novazeta@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5AA4722CB for ; Sun, 1 Sep 2013 20:02: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 r81K2EC7075693 for ; Sun, 1 Sep 2013 20:02:14 GMT (envelope-from novazeta@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r81K2EIO075684 for perforce@freebsd.org; Sun, 1 Sep 2013 20:02:14 GMT (envelope-from novazeta@FreeBSD.org) Date: Sun, 1 Sep 2013 20:02:14 GMT Message-Id: <201309012002.r81K2EIO075684@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to novazeta@FreeBSD.org using -f From: Khilan Gudka Subject: PERFORCE change 544866 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, 01 Sep 2013 20:02:14 -0000 http://p4web.freebsd.org/@@544866?ac=10 Change 544866 by novazeta@novazeta_zenith on 2013/09/01 20:01:21 Added WITH_SOAAP option and CFLAGS line for soaap include directory. Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#9 edit .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#13 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#9 (text+ko) ==== @@ -375,6 +375,7 @@ OFED \ OPENSSH_NONE_CIPHER \ SHARED_TOOLCHAIN \ + SOAAP \ TESLA # ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#13 (text+ko) ==== @@ -5,6 +5,7 @@ .SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .ln .s .S .asm + # XXX The use of COPTS in modern makefiles is discouraged. .if defined(COPTS) CFLAGS+=${COPTS} @@ -87,6 +88,10 @@ ${LLVM_LINK} -o ${.TARGET} ${OIRS} ;\ fi +.if ${MK_SOAAP} != "no" +CFLAGS+= -I$(SOAAP_SOURCE_DIR)/include +.endif +.if ${MK_SOAAP} != "no" ${PROG}.soaap: ${PROG}.${LLVM_IR_TYPE}-a ${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap ${SOAAP_FLAGS} -o /dev/null ${PROG}.${LLVM_IR_TYPE}-a @@ -101,6 +106,7 @@ ${CC} $(LDADD) -o ${.TARGET} ${PROG}.po CLEANFILES+= ${PROG}.po ${PROG}.pbc ${PROG}.soaap_perf ${PROG}.soaap_cg +.endif ${PROG}: ${OBJS} .if defined(PROG_CXX) From owner-p4-projects@FreeBSD.ORG Sun Sep 1 22:03:24 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A3D9B2C; Sun, 1 Sep 2013 22:03:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4CAEBB2A for ; Sun, 1 Sep 2013 22:03:24 +0000 (UTC) (envelope-from novazeta@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3942B27FD for ; Sun, 1 Sep 2013 22:03: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 r81M3OpH074099 for ; Sun, 1 Sep 2013 22:03:24 GMT (envelope-from novazeta@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r81M3Ofl074096 for perforce@freebsd.org; Sun, 1 Sep 2013 22:03:24 GMT (envelope-from novazeta@FreeBSD.org) Date: Sun, 1 Sep 2013 22:03:24 GMT Message-Id: <201309012203.r81M3Ofl074096@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to novazeta@FreeBSD.org using -f From: Khilan Gudka Subject: PERFORCE change 545955 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, 01 Sep 2013 22:03:24 -0000 http://p4web.freebsd.org/@@545955?ac=10 Change 545955 by novazeta@novazeta_zenith on 2013/09/01 22:02:41 Libraries now have SOAAP include folder in CFLAGS too Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#10 edit .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#14 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#10 (text+ko) ==== @@ -663,6 +663,10 @@ .endif .endif +.if defined(WITH_LLVM_INSTRUMENTED) && defined(WITH_SOAAP) +CFLAGS+= -I${SOAAP_SOURCE_DIR}/include +.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/bsd.prog.mk#14 (text+ko) ==== @@ -89,9 +89,6 @@ fi .if ${MK_SOAAP} != "no" -CFLAGS+= -I$(SOAAP_SOURCE_DIR)/include -.endif -.if ${MK_SOAAP} != "no" ${PROG}.soaap: ${PROG}.${LLVM_IR_TYPE}-a ${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap ${SOAAP_FLAGS} -o /dev/null ${PROG}.${LLVM_IR_TYPE}-a From owner-p4-projects@FreeBSD.ORG Mon Sep 2 10:21:28 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F1D5816; Mon, 2 Sep 2013 10:21:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 335DD814 for ; Mon, 2 Sep 2013 10:21:28 +0000 (UTC) (envelope-from jonathan@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2097E2F69 for ; Mon, 2 Sep 2013 10:21:28 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r82ALRkl079532 for ; Mon, 2 Sep 2013 10:21:27 GMT (envelope-from jonathan@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r82ALRd6079529 for perforce@freebsd.org; Mon, 2 Sep 2013 10:21:27 GMT (envelope-from jonathan@freebsd.org) Date: Mon, 2 Sep 2013 10:21:27 GMT Message-Id: <201309021021.r82ALRd6079529@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jonathan@freebsd.org using -f From: Jonathan Anderson Subject: PERFORCE change 552474 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, 02 Sep 2013 10:21:28 -0000 http://p4web.freebsd.org/@@552474?ac=10 Change 552474 by jonathan@jonathan-on-zenith on 2013/09/02 10:20:41 Need MAC framework header for TESLA-MAC assertions. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/ufs/ufs/ufs_lookup.c#5 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/ufs/ufs/ufs_lookup.c#5 (text+ko) ==== @@ -53,6 +53,10 @@ #include #include +#ifdef TESLA_MAC +#include +#endif + #include #include From owner-p4-projects@FreeBSD.ORG Mon Sep 2 10:22:29 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B937B922; Mon, 2 Sep 2013 10:22:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6208F920 for ; Mon, 2 Sep 2013 10:22:29 +0000 (UTC) (envelope-from jonathan@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 426422F7B for ; Mon, 2 Sep 2013 10:22:29 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r82AMTtC081807 for ; Mon, 2 Sep 2013 10:22:29 GMT (envelope-from jonathan@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r82AMTsB081804 for perforce@freebsd.org; Mon, 2 Sep 2013 10:22:29 GMT (envelope-from jonathan@freebsd.org) Date: Mon, 2 Sep 2013 10:22:29 GMT Message-Id: <201309021022.r82AMTsB081804@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jonathan@freebsd.org using -f From: Jonathan Anderson Subject: PERFORCE change 552486 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, 02 Sep 2013 10:22:30 -0000 http://p4web.freebsd.org/@@552486?ac=10 Change 552486 by jonathan@jonathan-on-zenith on 2013/09/02 10:21:46 Update TESLA P4 branch to latest TESLA parts (struct tesla_automaton, explicit symbol names, etc.). This builds a bootable kernel again. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_class.c#9 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_debug.c#7 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#10 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_internal.h#13 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_notification.c#17 edit .. //depot/projects/ctsrd/tesla/src/sys/sys/tesla-kernel.h#8 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_class.c#9 (text+ko) ==== @@ -151,7 +151,7 @@ return (TESLA_SUCCESS); } - tesla_assert(0 && ("no free instances but tc_free was > 0")); + tesla_assert(0, ("no free instances but tc_free was > 0")); return (TESLA_ERROR_ENOMEM); } ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_debug.c#7 (text+ko) ==== @@ -41,7 +41,7 @@ #endif void -print_transition(const char *debug, const struct tesla_transition *t) +print_transition(__debug const char *debug, const struct tesla_transition *t) { if (!tesla_debugging(debug)) return; @@ -79,7 +79,8 @@ } void -print_transitions(const char *debug, const struct tesla_transitions *transp) +print_transitions(__debug const char *debug, + const struct tesla_transitions *transp) { if (!tesla_debugging(debug)) return; @@ -126,11 +127,13 @@ return c; } -#ifndef NDEBUG int32_t tesla_debugging(const char *name) { +#ifdef NDEBUG + return 0; +#endif #ifdef _KERNEL /* * In the kernel, only print 'libtesla.{event,instance}*' output. @@ -188,6 +191,7 @@ #endif } +#ifndef NDEBUG void assert_instanceof(struct tesla_instance *instance, struct tesla_class *tclass) { @@ -204,10 +208,12 @@ tesla_assert(instance_belongs_to_class, ("tesla_instance %x not of class '%s'", - instance, tclass->tc_name) + instance, tclass->tc_automaton->ta_name) ); } +#endif + void print_class(const struct tesla_class *c) { @@ -242,7 +248,7 @@ } void -print_key(const char *debug_name, const struct tesla_key *key) +print_key(__debug const char *debug_name, const struct tesla_key *key) { if (!tesla_debugging(debug_name)) return; @@ -251,17 +257,8 @@ char buffer[LEN]; char *end = buffer + LEN; - char *e = key_string(buffer, end, key); + __unused char *e = key_string(buffer, end, key); assert(e < end); print("%s", buffer); } - -#else - -#undef tesla_debugging -int32_t -tesla_debugging(const char *name) { return 0; } - -#endif /* !NDEBUG */ - ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#10 (text+ko) ==== @@ -40,25 +40,30 @@ SDT_PROBE_DEFINE2(tesla, automata, instance, create, create, "struct tesla_class *", "struct tesla_instance *"); + SDT_PROBE_DEFINE3(tesla, automata, event, transition, state-transition, "struct tesla_class *", "struct tesla_instance *", "struct tesla_transition *"); + SDT_PROBE_DEFINE4(tesla, automata, instance, clone, clone, "struct tesla_class *", "struct tesla_instance *", "struct tesla_instance *", "struct tesla_transition *"); + SDT_PROBE_DEFINE4(tesla, automata, fail, no_instance, no-instance-match, - "struct tesla_class *", "const char *", "const char *", - "struct tesla_transitions *"); + "struct tesla_class *", "const char *", "const char *", "int32_t"); + SDT_PROBE_DEFINE3(tesla, automata, fail, bad_transition, bad-transition, - "struct tesla_class *", "struct tesla_instance *", - "struct tesla_transitions *"); -SDT_PROBE_DEFINE3(tesla, automata, fail, other_err, other-error, - "struct tesla_class *", "int", "const char *"); + "struct tesla_class *", "struct tesla_instance *", "int32_t"); + +SDT_PROBE_DEFINE4(tesla, automata, fail, other_err, other-error, + "struct tesla_automaton *", "int32_t", "int32_t", "const char *"); + SDT_PROBE_DEFINE2(tesla, automata, success, accept, accept, "struct tesla_class *", "struct tesla_instance *"); + SDT_PROBE_DEFINE3(tesla, automata, event, ignored, ignored-event, - "struct tesla_class *", "struct tesla_key *", - "struct tesla_transitions *"); + "struct tesla_class *", "int32_t", "struct tesla_key *"); + static void new_instance(struct tesla_class *tcp, struct tesla_instance *tip) @@ -84,8 +89,8 @@ } static void -no_instance(struct tesla_class *tcp, const struct tesla_key *tkp, - const struct tesla_transitions *ttp) +no_instance(struct tesla_class *tcp, int32_t symbol, + const struct tesla_key *tkp) { char instbuf[200]; char *c = instbuf; @@ -108,22 +113,25 @@ key_string(keybuf, keybuf + sizeof(keybuf), tkp); SDT_PROBE(tesla, automata, fail, no_instance, - tcp, instbuf, keybuf, ttp, 0); + tcp, instbuf, keybuf, symbol, 0); } static void bad_transition(struct tesla_class *tcp, struct tesla_instance *tip, - const struct tesla_transitions *ttp) + int32_t symbol) { - SDT_PROBE(tesla, automata, fail, bad_transition, tcp, tip, ttp, 0, 0); + SDT_PROBE(tesla, automata, fail, bad_transition, + tcp, tip, symbol, 0, 0); } static void -err(struct tesla_class *tcp, int errno, const char *message) +err(const struct tesla_automaton * tcp, int32_t symbol, int32_t errno, + const char *message) { - SDT_PROBE(tesla, automata, fail, other_err, tcp, errno, message, 0, 0); + SDT_PROBE(tesla, automata, fail, other_err, + tcp, symbol, errno, message, 0); } static void @@ -134,11 +142,11 @@ } static void -ignored(const struct tesla_class *tcp, const struct tesla_key *tkp, - const struct tesla_transitions *ttp) +ignored(const struct tesla_class *tcp, + int32_t symbol, const struct tesla_key *tkp) { - SDT_PROBE(tesla, automata, event, ignored, tcp, tkp, ttp, 0, 0); + SDT_PROBE(tesla, automata, event, ignored, tcp, symbol, tkp, 0, 0); } const struct tesla_event_handlers dtrace_handlers = { ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_internal.h#13 (text+ko) ==== @@ -372,14 +372,14 @@ #include #endif + +/** Are we in (verbose) debug mode? */ +int32_t tesla_debugging(const char*); + #ifndef NDEBUG #define __debug - -/** Are we in (verbose) debug mode? */ -int32_t tesla_debugging(const char*); - /** Emit debugging information with a debug name (e.g., libtesla.event). */ #define DEBUG(dclass, ...) \ if (tesla_debugging(#dclass)) printf(__VA_ARGS__) @@ -390,9 +390,6 @@ #define __debug __unused #define DEBUG(...) -#define tesla_debugging(...) 0 -#define print_key(...) -#define print_class(...) #endif ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_notification.c#17 (text+ko) ==== @@ -182,6 +182,7 @@ } +#ifndef NDEBUG /* * printf()-based event handlers: */ @@ -332,6 +333,7 @@ .teh_accept = 0, .teh_ignored = 0, }; +#endif /* * Wrappers that panic on failure: @@ -385,8 +387,8 @@ const static struct tesla_event_handlers* const default_handlers[] = { #ifndef NDEBUG &printf_handlers, + &printf_on_failure, #endif - &printf_on_failure, #if defined(_KERNEL) && defined(KDTRACE_HOOKS) &dtrace_handlers, #endif @@ -398,7 +400,7 @@ #if defined(_KERNEL) && defined(KDTRACE_HOOKS) .tem_mask = TESLA_KERN_DTRACE_EV, #else - .tem_mask = 0x5, + .tem_mask = 0xFF, #endif .tem_handlers = default_handlers, }; ==== //depot/projects/ctsrd/tesla/src/sys/sys/tesla-kernel.h#8 (text+ko) ==== @@ -43,7 +43,8 @@ * FreeBSD kernel-specific TESLA macros. */ -#define incallstack(fn) TSEQUENCE(called(fn), TESLA_ASSERTION_SITE, returned(fn)) +#define incallstack(fn) \ + TSEQUENCE(called(fn), TESLA_ASSERTION_SITE, returnfrom(fn)) #if 0 /* XXXRW: This doesn't yet work. */ @@ -66,6 +67,11 @@ #define TESLA_SYSCALL_EVENTUALLY(x) TESLA_SYSCALL(eventually(x)) /* + * XXXJA: figure out which of call()/called() to keep + */ +#define called(...) __tesla_call(((void) __VA_ARGS__, TIGNORE)) + +/* * XXXRW: Not all architectures have a trap_pfault() function. Can't use * vm_fault() as it is used in non-trap contexts -- e.g., PMAP initialisation. */ From owner-p4-projects@FreeBSD.ORG Mon Sep 2 10:57:07 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5B93A66; Mon, 2 Sep 2013 10:57:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5EBD2A64 for ; Mon, 2 Sep 2013 10:57:06 +0000 (UTC) (envelope-from novazeta@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3FCEE2235 for ; Mon, 2 Sep 2013 10:57:06 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r82Av6Ul037211 for ; Mon, 2 Sep 2013 10:57:06 GMT (envelope-from novazeta@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r82Av6hA037202 for perforce@freebsd.org; Mon, 2 Sep 2013 10:57:06 GMT (envelope-from novazeta@FreeBSD.org) Date: Mon, 2 Sep 2013 10:57:06 GMT Message-Id: <201309021057.r82Av6hA037202@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to novazeta@FreeBSD.org using -f From: Khilan Gudka Subject: PERFORCE change 552801 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, 02 Sep 2013 10:57:07 -0000 http://p4web.freebsd.org/@@552801?ac=10 Change 552801 by novazeta@novazeta_zenith on 2013/09/02 10:57:04 Build system updates to allow applying SOAAP to any .bc-a or .ll-a file, including after manually linking with a lib using llvm-link. Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#15 edit .. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#16 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#15 (text+ko) ==== @@ -88,23 +88,6 @@ ${LLVM_LINK} -o ${.TARGET} ${OIRS} ;\ fi -.if ${MK_SOAAP} != "no" -${PROG}.soaap: ${PROG}.${LLVM_IR_TYPE}-a - ${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap ${SOAAP_FLAGS} -o /dev/null ${PROG}.${LLVM_IR_TYPE}-a - -${PROG}.soaap_cg: ${PROG}.${LLVM_IR_TYPE}-a - ${OPT} -load $(SOAAP_BUILD_DIR)/libcep.so -insert-call-edge-profiling -o ${PROG}.pbc ${PROG}.${LLVM_IR_TYPE}-a - ${LLC} -filetype=obj -o ${PROG}.po ${PROG}.pbc - ${CC} -L $(SOAAP_BUILD_DIR) -L $(LLVM_BUILD_DIR)/lib -lcep_rt -lprofile_rt $(LDADD) -o ${.TARGET} ${PROG}.po - -${PROG}.soaap_perf: ${PROG}.${LLVM_IR_TYPE}-a - ${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap -soaap-emulate-performance ${SOAAP_FLAGS} -o ${PROG}.pbc ${PROG}.${LLVM_IR_TYPE}-a - ${LLC} -filetype=obj -o ${PROG}.po ${PROG}.pbc - ${CC} $(LDADD) -o ${.TARGET} ${PROG}.po - -CLEANFILES+= ${PROG}.po ${PROG}.pbc ${PROG}.soaap_perf ${PROG}.soaap_cg -.endif - ${PROG}: ${OBJS} .if defined(PROG_CXX) ${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} ==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#16 (text+ko) ==== @@ -32,7 +32,7 @@ .if defined(%POSIX) .SUFFIXES: .o .c .y .l .a .sh .f .else -.SUFFIXES: .out .a .dot .instrbc .instrll .instro .obc .oll .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 .bc-a .ll-a .instrbc .instrll .instro .obc .oll .ln .manifest .o .c .cc .cpp .cxx .C .m .F .f .e .r .soaap .soaap_cg .soaap_perf .tesla .y .l .S .asm .s .cl .p .h .sh .endif AR ?= ar @@ -297,6 +297,22 @@ .error Unknown LLVM IR type ${LLVM_IR_TYPE} .endif +.if defined(WITH_SOAAP) +CLEANFILES+= *.${LLVM_IR_TYPE}-a *.po *.pbc *.soaap_cg *.soaap_perf +.${LLVM_IR_TYPE}-a.soaap: + ${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap ${SOAAP_FLAGS} -o /dev/null ${.IMPSRC} + +.${LLVM_IR_TYPE}-a.soaap_cg: + ${OPT} -load $(SOAAP_BUILD_DIR)/libcep.so -insert-call-edge-profiling -o ${.IMPSRC:R}.pbc ${.IMPSRC} + ${LLC} -filetype=obj -o ${.IMPSRC:R}.po ${.IMPSRC:R}.pbc + ${CC} -L $(SOAAP_BUILD_DIR) -L $(LLVM_BUILD_DIR)/lib -lcep_rt -lprofile_rt $(LDADD) -o ${.TARGET} ${.IMPSRC:R}.po + +.${LLVM_IR_TYPE}-a.soaap_perf: + ${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap -soaap-emulate-performance ${SOAAP_FLAGS} -o ${.IMPSRC:R}.pbc ${.IMPSRC} + ${LLC} -filetype=obj -o ${.IMPSRC:R}.po ${.IMPSRC:R}.pbc + ${CC} $(LDADD) -o ${.TARGET} ${.IMPSRC:R}.po +.endif + .manifest.dot: ${TESLA} graph ${.IMPSRC} -o ${.TARGET} From owner-p4-projects@FreeBSD.ORG Mon Sep 2 12:04:18 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28043DC0; Mon, 2 Sep 2013 12:04:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DF524DBE for ; Mon, 2 Sep 2013 12:04:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CA4DE29E5 for ; Mon, 2 Sep 2013 12:04: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 r82C4HcZ047245 for ; Mon, 2 Sep 2013 12:04:17 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 r82C4Hf0047242 for perforce@freebsd.org; Mon, 2 Sep 2013 12:04:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 2 Sep 2013 12:04:17 GMT Message-Id: <201309021204.r82C4Hf0047242@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 553396 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, 02 Sep 2013 12:04:18 -0000 http://p4web.freebsd.org/@@553396?ac=10 Change 553396 by rwatson@rwatson_cinnamon_macosx on 2013/09/02 12:03:58 When Philip revised the C run-time code to adjust stack alignment for CHERI capabilities, he merged a larger refactoring of assembly vs C code for __start(). It looks like a line adjusting the stack location was omitted, causing statically linked binaries to accidentally overwrite the argv[] pointer array when saving $gp, so restore that stack-pointer modification. This bug caused gcc to segfault immediately on start. I've not spelunked enough to understand why dynamically linked binaries worked -- either they use a different code path, or something else (less visibly harmful) is overwritten in memory instead. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/lib/csu/mips/crt1_s.S#2 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/lib/csu/mips/crt1_s.S#2 (text+ko) ==== @@ -57,6 +57,7 @@ #if defined(__ABICALLS__) && (defined(__mips_o32) || defined(__mips_o64)) SETUP_GP #endif + PTR_ADDU sp, sp, -CALLFRAME_SIZ REG_S ra, CALLFRAME_RA(sp) #if defined(__ABICALLS__) #if defined(__mips_o32) || defined(__mips_o64) From owner-p4-projects@FreeBSD.ORG Mon Sep 2 18:58:38 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7625BD01; Mon, 2 Sep 2013 18:58:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 38F8ECFF for ; Mon, 2 Sep 2013 18:58:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 24F702A8D for ; Mon, 2 Sep 2013 18:58:38 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r82Iwc0F021996 for ; Mon, 2 Sep 2013 18:58:38 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 r82IwbrG021993 for perforce@freebsd.org; Mon, 2 Sep 2013 18:58:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 2 Sep 2013 18:58:37 GMT Message-Id: <201309021858.r82IwbrG021993@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 557054 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, 02 Sep 2013 18:58:38 -0000 http://p4web.freebsd.org/@@557054?ac=10 Change 557054 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/02 18:57:46 Define constant for CHERI trusted stack underflow exception; new since last time I updated the register headers. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cherireg.h#9 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cherireg.h#9 (text+ko) ==== @@ -202,6 +202,7 @@ #define CHERI_EXCCODE_TYPE 0x04 #define CHERI_EXCCODE_CALL 0x05 #define CHERI_EXCCODE_RETURN 0x06 +#define CHERI_EXCCODE_UNDERFLOW 0x07 #define CHERI_EXCCODE_NON_EPHEM 0x10 #define CHERI_EXCCODE_PERM_EXEXCUTE 0x11 #define CHERI_EXCCODE_PERM_LOAD 0x12 From owner-p4-projects@FreeBSD.ORG Mon Sep 2 21:46:36 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BCFAAF7; Mon, 2 Sep 2013 21:46:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F2CE4AF5 for ; Mon, 2 Sep 2013 21:46:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DC9BC2812 for ; Mon, 2 Sep 2013 21:46:35 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r82LkZ5t095797 for ; Mon, 2 Sep 2013 21:46:35 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 r82LkZGg095794 for perforce@freebsd.org; Mon, 2 Sep 2013 21:46:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 2 Sep 2013 21:46:35 GMT Message-Id: <201309022146.r82LkZGg095794@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 558543 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, 02 Sep 2013 21:46:36 -0000 http://p4web.freebsd.org/@@558543?ac=10 Change 558543 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/02 21:45:38 Provide a stub (nop) implementation of CCall/CReturn via an installed software exception handler. Contents to be fleshed out over the coming days. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/ccall.S#2 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cherireg.h#10 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/machdep.c#7 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/ccall.S#2 (text+ko) ==== @@ -1,34 +1,68 @@ -#- -# Copyright (c) 2013 Robert N. M. Watson -# Copyright (c) 2013 Michael Roe -# All rights reserved. -# -# This software was developed by SRI International and the University of -# Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) -# ("CTSRD"), as part of the DARPA CRASH research programme. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# +/*- + * Copyright (c) 2013 Robert N. M. Watson + * Copyright (c) 2013 Michael Roe + * All rights reserved. + * + * This software was developed by SRI International and the University of + * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) + * ("CTSRD"), as part of the DARPA CRASH research programme. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* XXXRW: Can I drop some of these? */ +#include +#include +#include +#include +#include + +#ifdef CPU_CHERI +#include +#include +#endif + +#include "assym.s" + +/* + * Software implementations of CCall, CReturn handlers for CHERI. + * + * XXXRW: Gubbins missing. + */ +VECTOR(CHERICCallVector, unknown) + .set push + .set noat +#ifdef CPU_CHERI + CHERI_EXCEPTION_ENTER(k0) +#endif + + /* XXXRW: For now, increment PC as though it were a no-op. */ + MFC0 k0, MIPS_COP_0_EXC_PC + PTR_ADDU k0, 4 + MTC0 k0, MIPS_COP_0_EXC_PC -# -# Software implementations of CCall, CReturn handlers for CHERI -# +#ifdef CPU_CHERI + CHERI_EXCEPTION_RETURN(k0) +#endif + eret + .set pop +VECTOR_END(CHERICCallVector) ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cherireg.h#10 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2011-2012 Robert N. M. Watson + * Copyright (c) 2011-2013 Robert N. M. Watson * All rights reserved. * * This software was developed by SRI International and the University of @@ -218,4 +218,9 @@ #define CHERI_EXCCODE_ACCESS_KR1C 0x1d #define CHERI_EXCCODE_ACCESS_KR2C 0x1e +/* + * Location of the CHERI CCall/CReturn software-path exception vector. + */ +#define CHERI_CCALL_EXC_VEC ((intptr_t)(int32_t)0x80000280) + #endif /* _MIPS_INCLUDE_CHERIREG_H_ */ ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/machdep.c#7 (text+ko) ==== @@ -81,6 +81,9 @@ #include #include #include +#ifdef CPU_CHERI +#include +#endif #include #include #include @@ -166,6 +169,9 @@ /* MIPS wait skip region */ extern char MipsWaitStart[], MipsWaitEnd[]; +/* CHERI CCall/CReturn software path */ +extern char CHERICCallVector[], CHERICCallVectorEnd[]; + extern char edata[], end[]; #ifdef DDB extern vm_offset_t ksym_start, ksym_end; @@ -363,6 +369,11 @@ bcopy(MipsCache, (void *)MIPS_CACHE_ERR_EXC_VEC, MipsCacheEnd - MipsCache); +#ifdef CPU_CHERI + bcopy(CHERICCallVector, (void *)CHERI_CCALL_EXC_VEC, + CHERICCallVectorEnd - CHERICCallVector); +#endif + /* * Clear out the I and D caches. */ From owner-p4-projects@FreeBSD.ORG Tue Sep 3 20:31:48 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7C68BAD; Tue, 3 Sep 2013 20:31:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 89B01BAB for ; Tue, 3 Sep 2013 20:31:48 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 76AC62759 for ; Tue, 3 Sep 2013 20:31:48 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r83KVmYL071795 for ; Tue, 3 Sep 2013 20:31:48 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r83KVmS1071792 for perforce@freebsd.org; Tue, 3 Sep 2013 20:31:48 GMT (envelope-from jhb@freebsd.org) Date: Tue, 3 Sep 2013 20:31:48 GMT Message-Id: <201309032031.r83KVmS1071792@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 570592 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: Tue, 03 Sep 2013 20:31:49 -0000 http://p4web.freebsd.org/@@570592?ac=10 Change 570592 by jhb@jhb_jhbbsd on 2013/09/03 20:31:22 Get this to compile. Affected files ... .. //depot/projects/smpng/sys/vm/vm_pageout.c#97 edit Differences ... ==== //depot/projects/smpng/sys/vm/vm_pageout.c#97 (text+ko) ==== @@ -1712,7 +1712,7 @@ struct thread *td; if (curproc != pageproc) { - FOREACH_THREAD_IN_PROC(td, pageproc) { + FOREACH_THREAD_IN_PROC(pageproc, td) { thread_lock(td); if (td->td_priority > curthread->td_priority) sched_lend_prio(td, curthread->td_priority); From owner-p4-projects@FreeBSD.ORG Tue Sep 3 20:37:56 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E9E5DE1; Tue, 3 Sep 2013 20:37:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 08587DDF for ; Tue, 3 Sep 2013 20:37:56 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E8FDF27AC for ; Tue, 3 Sep 2013 20:37:55 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r83Kbtdb080651 for ; Tue, 3 Sep 2013 20:37:55 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r83Kbt8q080648 for perforce@freebsd.org; Tue, 3 Sep 2013 20:37:55 GMT (envelope-from brooks@freebsd.org) Date: Tue, 3 Sep 2013 20:37:55 GMT Message-Id: <201309032037.r83Kbt8q080648@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 570643 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: Tue, 03 Sep 2013 20:37:56 -0000 http://p4web.freebsd.org/@@570643?ac=10 Change 570643 by brooks@brooks_zenith on 2013/09/03 20:37:44 Sanity check various timeout values. Requested by: imp Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_core.c#19 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_core.c#19 (text+ko) ==== @@ -270,6 +270,7 @@ struct cfi_softc *sc; u_int blksz, blocks; u_int r, u; + uint64_t mtoexp, ttoexp; #ifdef CFI_SUPPORT_STRATAFLASH uint64_t ppr; char name[KENV_MNAMELEN], value[32]; @@ -288,23 +289,71 @@ sc->sc_handle = rman_get_bushandle(sc->sc_res); /* Get time-out values for erase, write, and buffer write. */ - sc->sc_typical_timeouts[CFI_TIMEOUT_ERASE] = - SBT_1MS * (1 << cfi_read_qry(sc, CFI_QRY_TTO_ERASE)); + ttoexp = cfi_read_qry(sc, CFI_QRY_TTO_ERASE); + mtoexp = cfi_read_qry(sc, CFI_QRY_MTO_ERASE); + if (ttoexp == 0) { + device_printf(dev, "erase timeout == 0, using 2^16ms\n"); + ttoexp = 16; + } + if (ttoexp > 41) { + device_printf(dev, "insane timeout: 2^%jdms\n", ttoexp); + return (EINVAL); + } + if (mtoexp == 0) { + device_printf(dev, "max erase timeout == 0, using 2^%jdms\n", + ttoexp + 4); + mtoexp = 4; + } + if (ttoexp + mtoexp > 41) { + device_printf(dev, "insane max erase timeout: 2^%jd\n", + ttoexp + mtoexp); + return (EINVAL); + } + sc->sc_typical_timeouts[CFI_TIMEOUT_ERASE] = SBT_1MS * (1ULL << ttoexp); sc->sc_max_timeouts[CFI_TIMEOUT_ERASE] = - sc->sc_typical_timeouts[CFI_TIMEOUT_ERASE] * - (1 << cfi_read_qry(sc, CFI_QRY_MTO_ERASE)); + sc->sc_typical_timeouts[CFI_TIMEOUT_ERASE] * (1ULL << mtoexp); - sc->sc_typical_timeouts[CFI_TIMEOUT_WRITE] = - SBT_1US * (1 << cfi_read_qry(sc, CFI_QRY_TTO_WRITE)); + ttoexp = cfi_read_qry(sc, CFI_QRY_TTO_WRITE); + mtoexp = cfi_read_qry(sc, CFI_QRY_MTO_WRITE); + if (ttoexp == 0) { + device_printf(dev, "write timeout == 0, using 2^18ns\n"); + ttoexp = 18; + } + if (ttoexp > 51) { + device_printf(dev, "insane write timeout: 2^%jdus\n", ttoexp); + return (EINVAL); + } + if (mtoexp == 0) { + device_printf(dev, "max write timeout == 0, using 2^%jdms\n", + ttoexp + 4); + mtoexp = 4; + } + if (ttoexp + mtoexp > 51) { + device_printf(dev, "insane max write timeout: 2^%jdus\n", + ttoexp + mtoexp); + return (EINVAL); + } + sc->sc_typical_timeouts[CFI_TIMEOUT_WRITE] = SBT_1US * (1ULL << ttoexp); sc->sc_max_timeouts[CFI_TIMEOUT_WRITE] = - sc->sc_typical_timeouts[CFI_TIMEOUT_WRITE] * - (1 << cfi_read_qry(sc, CFI_QRY_MTO_WRITE)); + sc->sc_typical_timeouts[CFI_TIMEOUT_WRITE] * (1ULL << mtoexp); + ttoexp = cfi_read_qry(sc, CFI_QRY_TTO_BUFWRITE); + mtoexp = cfi_read_qry(sc, CFI_QRY_MTO_BUFWRITE); + /* Don't check for 0, it means not-supported. */ + if (ttoexp > 51) { + device_printf(dev, "insane write timeout: 2^%jdus\n", ttoexp); + return (EINVAL); + } + if (ttoexp + mtoexp > 51) { + device_printf(dev, "insane max write timeout: 2^%jdus\n", + ttoexp + mtoexp); + return (EINVAL); + } sc->sc_typical_timeouts[CFI_TIMEOUT_BUFWRITE] = - SBT_1US * (1 << cfi_read_qry(sc, CFI_QRY_TTO_BUFWRITE)); + SBT_1US * (1ULL << cfi_read_qry(sc, CFI_QRY_TTO_BUFWRITE)); sc->sc_max_timeouts[CFI_TIMEOUT_BUFWRITE] = sc->sc_typical_timeouts[CFI_TIMEOUT_BUFWRITE] * - (1 << cfi_read_qry(sc, CFI_QRY_MTO_BUFWRITE)); + (1ULL << cfi_read_qry(sc, CFI_QRY_MTO_BUFWRITE)); /* Get the maximum size of a multibyte program */ if (sc->sc_typical_timeouts[CFI_TIMEOUT_BUFWRITE] != 0) From owner-p4-projects@FreeBSD.ORG Tue Sep 3 21:00:20 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB87169F; Tue, 3 Sep 2013 21:00:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 93C8B69C for ; Tue, 3 Sep 2013 21:00:19 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7FC5C2945 for ; Tue, 3 Sep 2013 21:00:19 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r83L0JNg014589 for ; Tue, 3 Sep 2013 21:00:19 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r83L0Jdm014586 for perforce@freebsd.org; Tue, 3 Sep 2013 21:00:19 GMT (envelope-from brooks@freebsd.org) Date: Tue, 3 Sep 2013 21:00:19 GMT Message-Id: <201309032100.r83L0Jdm014586@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 570822 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: Tue, 03 Sep 2013 21:00:20 -0000 http://p4web.freebsd.org/@@570822?ac=10 Change 570822 by brooks@brooks_zenith on 2013/09/03 20:59:40 Sync CFI driver with FreeBSD/BERI. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_bus_nexus.c#4 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_core.c#8 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_dev.c#5 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_disk.c#7 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_reg.h#6 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_var.h#6 integrate Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_bus_nexus.c#4 (text+ko) ==== @@ -4,6 +4,11 @@ * Copyright (c) 2009 Sam Leffler, Errno Consulting * All rights reserved. * + * Portions of this software were developed by SRI International and the + * University of Cambridge Computer Laboratory under DARPA/AFRL contract + * (FA8750-10-C-0237) ("CTSRD"), as part of the DARPA CRASH research + * programme. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_core.c#8 (text+ko) ==== @@ -1,7 +1,13 @@ /*- * Copyright (c) 2007, Juniper Networks, Inc. + * Copyright (c) 2012-2013, SRI International * All rights reserved. * + * Portions of this software were developed by SRI International and the + * University of Cambridge Computer Laboratory under DARPA/AFRL contract + * (FA8750-10-C-0237) ("CTSRD"), as part of the DARPA CRASH research + * programme. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -49,6 +55,8 @@ #include #include +static void cfi_add_sysctls(struct cfi_softc *); + extern struct cdevsw cfi_cdevsw; char cfi_driver_name[] = "cfi"; @@ -260,9 +268,9 @@ cfi_attach(device_t dev) { struct cfi_softc *sc; - struct timeval tv; u_int blksz, blocks; - u_int r, u, usec; + u_int r, u; + uint64_t mtoexp, ttoexp; #ifdef CFI_SUPPORT_STRATAFLASH uint64_t ppr; char name[KENV_MNAMELEN], value[32]; @@ -281,38 +289,74 @@ sc->sc_handle = rman_get_bushandle(sc->sc_res); /* Get time-out values for erase, write, and buffer write. */ - bintime_clear(&sc->sc_typical_timeouts[CFI_TIMEOUT_ERASE]); - usec = 1000 * (1 << cfi_read_qry(sc, CFI_QRY_TTO_ERASE)); - tv.tv_sec = usec / 1000000; - tv.tv_usec = usec % 1000000; - timeval2bintime(&tv, &sc->sc_typical_timeouts[CFI_TIMEOUT_ERASE]); + ttoexp = cfi_read_qry(sc, CFI_QRY_TTO_ERASE); + mtoexp = cfi_read_qry(sc, CFI_QRY_MTO_ERASE); + if (ttoexp == 0) { + device_printf(dev, "erase timeout == 0, using 2^16ms\n"); + ttoexp = 16; + } + if (ttoexp > 41) { + device_printf(dev, "insane timeout: 2^%jdms\n", ttoexp); + return (EINVAL); + } + if (mtoexp == 0) { + device_printf(dev, "max erase timeout == 0, using 2^%jdms\n", + ttoexp + 4); + mtoexp = 4; + } + if (ttoexp + mtoexp > 41) { + device_printf(dev, "insane max erase timeout: 2^%jd\n", + ttoexp + mtoexp); + return (EINVAL); + } + sc->sc_typical_timeouts[CFI_TIMEOUT_ERASE] = SBT_1MS * (1ULL << ttoexp); sc->sc_max_timeouts[CFI_TIMEOUT_ERASE] = - sc->sc_typical_timeouts[CFI_TIMEOUT_ERASE]; - bintime_mul(&sc->sc_max_timeouts[CFI_TIMEOUT_ERASE], - 1 << cfi_read_qry(sc, CFI_QRY_MTO_ERASE)); + sc->sc_typical_timeouts[CFI_TIMEOUT_ERASE] * (1ULL << mtoexp); - bintime_clear(&sc->sc_typical_timeouts[CFI_TIMEOUT_WRITE]); - usec = 1 << cfi_read_qry(sc, CFI_QRY_TTO_WRITE); - tv.tv_sec = usec / 1000000; - tv.tv_usec = usec % 1000000; - timeval2bintime(&tv, &sc->sc_typical_timeouts[CFI_TIMEOUT_WRITE]); + ttoexp = cfi_read_qry(sc, CFI_QRY_TTO_WRITE); + mtoexp = cfi_read_qry(sc, CFI_QRY_MTO_WRITE); + if (ttoexp == 0) { + device_printf(dev, "write timeout == 0, using 2^18ns\n"); + ttoexp = 18; + } + if (ttoexp > 51) { + device_printf(dev, "insane write timeout: 2^%jdus\n", ttoexp); + return (EINVAL); + } + if (mtoexp == 0) { + device_printf(dev, "max write timeout == 0, using 2^%jdms\n", + ttoexp + 4); + mtoexp = 4; + } + if (ttoexp + mtoexp > 51) { + device_printf(dev, "insane max write timeout: 2^%jdus\n", + ttoexp + mtoexp); + return (EINVAL); + } + sc->sc_typical_timeouts[CFI_TIMEOUT_WRITE] = SBT_1US * (1ULL << ttoexp); sc->sc_max_timeouts[CFI_TIMEOUT_WRITE] = - sc->sc_typical_timeouts[CFI_TIMEOUT_WRITE]; - bintime_mul(&sc->sc_max_timeouts[CFI_TIMEOUT_WRITE], - 1 << cfi_read_qry(sc, CFI_QRY_MTO_WRITE)); + sc->sc_typical_timeouts[CFI_TIMEOUT_WRITE] * (1ULL << mtoexp); - bintime_clear(&sc->sc_typical_timeouts[CFI_TIMEOUT_BUFWRITE]); - usec = 1 << cfi_read_qry(sc, CFI_QRY_TTO_BUFWRITE); - tv.tv_sec = usec / 1000000; - tv.tv_usec = usec % 1000000; - timeval2bintime(&tv, &sc->sc_typical_timeouts[CFI_TIMEOUT_BUFWRITE]); + ttoexp = cfi_read_qry(sc, CFI_QRY_TTO_BUFWRITE); + mtoexp = cfi_read_qry(sc, CFI_QRY_MTO_BUFWRITE); + /* Don't check for 0, it means not-supported. */ + if (ttoexp > 51) { + device_printf(dev, "insane write timeout: 2^%jdus\n", ttoexp); + return (EINVAL); + } + if (ttoexp + mtoexp > 51) { + device_printf(dev, "insane max write timeout: 2^%jdus\n", + ttoexp + mtoexp); + return (EINVAL); + } + sc->sc_typical_timeouts[CFI_TIMEOUT_BUFWRITE] = + SBT_1US * (1ULL << cfi_read_qry(sc, CFI_QRY_TTO_BUFWRITE)); sc->sc_max_timeouts[CFI_TIMEOUT_BUFWRITE] = - sc->sc_typical_timeouts[CFI_TIMEOUT_BUFWRITE]; - bintime_mul(&sc->sc_max_timeouts[CFI_TIMEOUT_BUFWRITE], - 1 << cfi_read_qry(sc, CFI_QRY_MTO_BUFWRITE)); + sc->sc_typical_timeouts[CFI_TIMEOUT_BUFWRITE] * + (1ULL << cfi_read_qry(sc, CFI_QRY_MTO_BUFWRITE)); /* Get the maximum size of a multibyte program */ - if (bintime_isset(&sc->sc_typical_timeouts[CFI_TIMEOUT_BUFWRITE])) + if (sc->sc_typical_timeouts[CFI_TIMEOUT_BUFWRITE] != 0) sc->sc_maxbuf = 1 << (cfi_read_qry(sc, CFI_QRY_MAXBUF) | cfi_read_qry(sc, CFI_QRY_MAXBUF) << 8); else @@ -350,6 +394,8 @@ "%s%u", cfi_driver_name, u); sc->sc_nod->si_drv1 = sc; + cfi_add_sysctls(sc); + #ifdef CFI_SUPPORT_STRATAFLASH /* * Store the Intel factory PPR in the environment. In some @@ -370,6 +416,45 @@ return (0); } +static void +cfi_add_sysctls(struct cfi_softc *sc) +{ + struct sysctl_ctx_list *ctx; + struct sysctl_oid_list *children; + + ctx = device_get_sysctl_ctx(sc->sc_dev); + children = SYSCTL_CHILDREN(device_get_sysctl_tree(sc->sc_dev)); + + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, + "typical_erase_timout_count", + CTLFLAG_RD, &sc->sc_tto_counts[CFI_TIMEOUT_ERASE], + 0, "Number of times the typical erase timeout was exceeded"); + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, + "max_erase_timout_count", + CTLFLAG_RD, &sc->sc_mto_counts[CFI_TIMEOUT_ERASE], 0, + "Number of times the maximum erase timeout was exceeded"); + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, + "typical_write_timout_count", + CTLFLAG_RD, &sc->sc_tto_counts[CFI_TIMEOUT_WRITE], 0, + "Number of times the typical write timeout was exceeded"); + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, + "max_write_timout_count", + CTLFLAG_RD, &sc->sc_mto_counts[CFI_TIMEOUT_WRITE], 0, + "Number of times the maximum write timeout was exceeded"); + if (sc->sc_maxbuf > 0) { + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, + "typical_bufwrite_timout_count", + CTLFLAG_RD, &sc->sc_tto_counts[CFI_TIMEOUT_BUFWRITE], 0, + "Number of times the typical buffered write timeout was " + "exceeded"); + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, + "max_bufwrite_timout_count", + CTLFLAG_RD, &sc->sc_mto_counts[CFI_TIMEOUT_BUFWRITE], 0, + "Number of times the maximum buffered write timeout was " + "exceeded"); + } +} + int cfi_detach(device_t dev) { @@ -384,21 +469,23 @@ } static int -cfi_wait_ready(struct cfi_softc *sc, u_int ofs, struct bintime *start, +cfi_wait_ready(struct cfi_softc *sc, u_int ofs, sbintime_t start, enum cfi_wait_cmd cmd) { int done, error, tto_exceeded; uint32_t st0 = 0, st = 0; - struct bintime mend, now, tend; + sbintime_t now; - tend = mend = *start; - bintime_add(&tend, &sc->sc_typical_timeouts[cmd]); - bintime_add(&mend, &sc->sc_max_timeouts[cmd]); - done = 0; error = 0; tto_exceeded = 0; while (!done && !error) { + /* + * Save time before we start so we always do one check + * after the timeout has expired. + */ + now = sbinuptime(); + switch (sc->sc_cmdset) { case CFI_VEND_INTEL_ECS: case CFI_VEND_INTEL_SCS: @@ -427,24 +514,25 @@ break; } - binuptime(&now); - if (tto_exceeded || bintime_cmp(&now, &tend, >)) { - if (!tto_exceeded) + if (tto_exceeded || + now > start + sc->sc_typical_timeouts[cmd]) { + if (!tto_exceeded) { tto_exceeded = 1; - if (bintime_cmp(&now, &mend, >)) { + sc->sc_tto_counts[cmd]++; +#ifdef CFI_DEBUG_TIMEOUT + device_printf(sc->sc_dev, + "typical timeout exceeded (cmd %d)", cmd); +#endif + } + if (now > start + sc->sc_max_timeouts[cmd]) { + sc->sc_mto_counts[cmd]++; #ifdef CFI_DEBUG_TIMEOUT device_printf(sc->sc_dev, "max timeout exceeded (cmd %d)", cmd); #endif - break; } } } -#ifdef CFI_DEBUG_TIMEOUT - if (tto_exceeded) - device_printf(sc->sc_dev, - "typical timeout exceeded (cmd %d)", cmd); -#endif if (!done && !error) error = ETIMEDOUT; if (error) @@ -464,7 +552,7 @@ int error, i, neederase = 0; uint32_t st; u_int wlen; - struct bintime start; + sbintime_t start; /* Intel flash must be unlocked before modification */ switch (sc->sc_cmdset) { @@ -476,15 +564,6 @@ break; } - switch (sc->sc_cmdset) { - case CFI_VEND_INTEL_ECS: - case CFI_VEND_INTEL_SCS: - cfi_write(sc, sc->sc_wrofs, CFI_INTEL_LBS); - cfi_write(sc, sc->sc_wrofs, CFI_INTEL_UB); - cfi_write(sc, sc->sc_wrofs, CFI_BCS_READ_ARRAY); - break; - } - /* Check if an erase is required. */ for (i = 0; i < sc->sc_wrbufsz; i++) if ((sc->sc_wrbuf[i] & sc->sc_wrbufcpy[i]) != sc->sc_wrbuf[i]) { @@ -494,7 +573,7 @@ if (neederase) { intr = intr_disable(); - binuptime(&start); + start = sbinuptime(); /* Erase the block. */ switch (sc->sc_cmdset) { case CFI_VEND_INTEL_ECS: @@ -514,7 +593,7 @@ return (ENODEV); } intr_restore(intr); - error = cfi_wait_ready(sc, sc->sc_wrofs, &start, + error = cfi_wait_ready(sc, sc->sc_wrofs, start, CFI_TIMEOUT_ERASE); if (error) goto out; @@ -533,11 +612,14 @@ intr = intr_disable(); - binuptime(&start); + start = sbinuptime(); do { cfi_write(sc, sc->sc_wrofs + i, CFI_BCS_BUF_PROG_SETUP); - /* XXX: do some timeout management */ + if (sbinuptime() > start + sc->sc_max_timeouts[CFI_TIMEOUT_BUFWRITE]) { + error = ETIMEDOUT; + goto out; + } st = cfi_read(sc, sc->sc_wrofs + i); } while (! (st & CFI_INTEL_STATUS_WSMS)); @@ -567,7 +649,9 @@ intr_restore(intr); error = cfi_wait_ready(sc, sc->sc_wrofs + i, - &start, CFI_TIMEOUT_BUFWRITE); + start, CFI_TIMEOUT_BUFWRITE); + if (error != 0) + goto out; } goto out; default: @@ -605,7 +689,7 @@ */ intr = intr_disable(); - binuptime(&start); + start = sbinuptime(); switch (sc->sc_cmdset) { case CFI_VEND_INTEL_ECS: case CFI_VEND_INTEL_SCS: @@ -633,7 +717,7 @@ intr_restore(intr); - error = cfi_wait_ready(sc, sc->sc_wrofs, &start, + error = cfi_wait_ready(sc, sc->sc_wrofs, start, CFI_TIMEOUT_WRITE); if (error) goto out; @@ -732,7 +816,7 @@ #ifdef CFI_ARMEDANDDANGEROUS register_t intr; int i, error; - struct bintime start; + sbintime_t start; #endif if (sc->sc_cmdset != CFI_VEND_INTEL_ECS) @@ -742,11 +826,11 @@ #ifdef CFI_ARMEDANDDANGEROUS for (i = 7; i >= 4; i--, id >>= 16) { intr = intr_disable(); - binuptime(&start); + start = sbinuptime(); cfi_write(sc, 0, CFI_INTEL_PP_SETUP); cfi_put16(sc, CFI_INTEL_PR(i), id&0xffff); intr_restore(intr); - error = cfi_wait_ready(sc, CFI_BCS_READ_STATUS, &start, + error = cfi_wait_ready(sc, CFI_BCS_READ_STATUS, start, CFI_TIMEOUT_WRITE); if (error) break; @@ -787,7 +871,7 @@ #ifdef CFI_ARMEDANDDANGEROUS register_t intr; int error; - struct bintime start; + sbintime_t start; #endif if (sc->sc_cmdset != CFI_VEND_INTEL_ECS) return EOPNOTSUPP; @@ -801,7 +885,7 @@ cfi_write(sc, 0, CFI_INTEL_PP_SETUP); cfi_put16(sc, CFI_INTEL_PLR, 0xFFFD); intr_restore(intr); - error = cfi_wait_ready(sc, CFI_BCS_READ_STATUS, &start, + error = cfi_wait_ready(sc, CFI_BCS_READ_STATUS, start, CFI_TIMEOUT_WRITE); cfi_write(sc, 0, CFI_BCS_READ_ARRAY); return error; ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_dev.c#5 (text+ko) ==== @@ -1,7 +1,13 @@ /*- * Copyright (c) 2007, Juniper Networks, Inc. + * Copyright (c) 2012-2013, SRI International * All rights reserved. * + * Portions of this software were developed by SRI International and the + * University of Cambridge Computer Laboratory under DARPA/AFRL contract + * (FA8750-10-C-0237) ("CTSRD"), as part of the DARPA CRASH research + * programme. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_disk.c#7 (text+ko) ==== @@ -1,7 +1,13 @@ /*- * Copyright (c) 2009 Sam Leffler, Errno Consulting + * Copyright (c) 2012-2013, SRI International * All rights reserved. * + * Portions of this software were developed by SRI International and the + * University of Cambridge Computer Laboratory under DARPA/AFRL contract + * (FA8750-10-C-0237) ("CTSRD"), as part of the DARPA CRASH research + * programme. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -69,7 +75,6 @@ static void cfi_disk_strategy(struct bio *); static int cfi_disk_ioctl(struct disk *, u_long, void *, int, struct thread *); - static int cfi_disk_probe(device_t dev) { ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_reg.h#6 (text+ko) ==== @@ -1,7 +1,13 @@ /*- * Copyright (c) 2007, Juniper Networks, Inc. + * Copyright (c) 2012-2013, SRI International * All rights reserved. * + * Portions of this software were developed by SRI International and the + * University of Cambridge Computer Laboratory under DARPA/AFRL contract + * (FA8750-10-C-0237) ("CTSRD"), as part of the DARPA CRASH research + * programme. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_var.h#6 (text+ko) ==== @@ -1,7 +1,13 @@ /*- * Copyright (c) 2007, Juniper Networks, Inc. + * Copyright (c) 2012-2013, SRI International * All rights reserved. * + * Portions of this software were developed by SRI International and the + * University of Cambridge Computer Laboratory under DARPA/AFRL contract + * (FA8750-10-C-0237) ("CTSRD"), as part of the DARPA CRASH research + * programme. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -57,8 +63,10 @@ struct cfi_region *sc_region; /* Array of region info. */ u_int sc_cmdset; - struct bintime sc_typical_timeouts[3]; - struct bintime sc_max_timeouts[3]; + sbintime_t sc_typical_timeouts[3]; + sbintime_t sc_max_timeouts[3]; + u_int sc_tto_counts[3]; + u_int sc_mto_counts[3]; u_int sc_maxbuf; From owner-p4-projects@FreeBSD.ORG Tue Sep 3 21:09:29 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86EB0ACB; Tue, 3 Sep 2013 21:09:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 46F90AC9 for ; Tue, 3 Sep 2013 21:09:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3183529F6 for ; Tue, 3 Sep 2013 21:09:29 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r83L9Tem029261 for ; Tue, 3 Sep 2013 21:09:29 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 r83L9Txc029258 for perforce@freebsd.org; Tue, 3 Sep 2013 21:09:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Sep 2013 21:09:29 GMT Message-Id: <201309032109.r83L9Txc029258@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 570899 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: Tue, 03 Sep 2013 21:09:29 -0000 http://p4web.freebsd.org/@@570899?ac=10 Change 570899 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/03 21:08:49 Define CHERI_CCALL() and CHERI_CRETURN() macros in cheri.h for the CHERI CCall and CReturn instructions, allowing them to be used from C programs compiled using conventional GCC MIPS. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cheri.h#19 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cheri.h#19 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2011-2012 Robert N. M. Watson + * Copyright (c) 2011-2013 Robert N. M. Watson * All rights reserved. * * This software was developed by SRI International and the University of @@ -165,6 +165,19 @@ } while (0) /* + * Routines associated with CHERI object-capability invocation; currently we + * believe these require no clobbers, as they don't directly replace c0. + */ +#define CHERI_CCALL(cs, cb) do { \ + __asm__ __volatile__ ("ccall $c%0, %c%1" : : \ + "i" (cs), "i" (cb)); \ +} while (0) + +#define CHERI_CRETURN() do { \ + __asm__ __volatile__ ("creturn"); \ +} while (0) + +/* * Capability store; while this doesn't muck with c0, it does require a memory * clobber. */ From owner-p4-projects@FreeBSD.ORG Tue Sep 3 21:20:41 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C26DF6A; Tue, 3 Sep 2013 21:20:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5E665F67 for ; Tue, 3 Sep 2013 21:20:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4A99B2AF6 for ; Tue, 3 Sep 2013 21:20:41 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r83LKfUY046459 for ; Tue, 3 Sep 2013 21:20:41 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 r83LKfB6046452 for perforce@freebsd.org; Tue, 3 Sep 2013 21:20:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Sep 2013 21:20:41 GMT Message-Id: <201309032120.r83LKfB6046452@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 570986 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: Tue, 03 Sep 2013 21:20:41 -0000 http://p4web.freebsd.org/@@570986?ac=10 Change 570986 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/03 21:20:00 Correcty '%c' -> '$c' in three currently unused CHERI macros; when unused, these aren't syntax checked by the compiler/assembler. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cheri.h#20 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cheri.h#20 (text+ko) ==== @@ -169,7 +169,7 @@ * believe these require no clobbers, as they don't directly replace c0. */ #define CHERI_CCALL(cs, cb) do { \ - __asm__ __volatile__ ("ccall $c%0, %c%1" : : \ + __asm__ __volatile__ ("ccall $c%0, $c%1" : : \ "i" (cs), "i" (cb)); \ } while (0) @@ -260,10 +260,10 @@ */ #define CHERI_CGETPCC(v, cd) do { \ if ((cd) == 0) \ - __asm__ __volatile__ ("cgetpcc %0, %c%1" : "=r" (v) : \ + __asm__ __volatile__ ("cgetpcc %0, $c%1" : "=r" (v) : \ "i" (cd) : "memory"); \ else \ - __asm__ __volatile__ ("cgetpcc %0, %c%1" : "=r" (v) : \ + __asm__ __volatile__ ("cgetpcc %0, $c%1" : "=r" (v) : \ "i" (cd)); \ } while (0) From owner-p4-projects@FreeBSD.ORG Tue Sep 3 22:30:57 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 104FCF75; Tue, 3 Sep 2013 22:30:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A1357E9B for ; Tue, 3 Sep 2013 22:30:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8D0F6206D for ; Tue, 3 Sep 2013 22:30:56 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r83MUuLC056234 for ; Tue, 3 Sep 2013 22:30:56 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 r83MUujE056231 for perforce@freebsd.org; Tue, 3 Sep 2013 22:30:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Sep 2013 22:30:56 GMT Message-Id: <201309032230.r83MUujE056231@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 571565 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: Tue, 03 Sep 2013 22:30:57 -0000 http://p4web.freebsd.org/@@571565?ac=10 Change 571565 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/03 22:30:29 Compile cheritest statically, for now, to make debugging a bit easier when working with CPU traces. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/bin/cheritest/Makefile#4 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/bin/cheritest/Makefile#4 (text+ko) ==== @@ -7,4 +7,6 @@ #DPADD= ${LIBDEVSTAT} ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL} LDADD= -lcheri +NO_SHARED?= YES + .include From owner-p4-projects@FreeBSD.ORG Tue Sep 3 22:30:56 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6FE8E9D; Tue, 3 Sep 2013 22:30:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 874E6E9A for ; Tue, 3 Sep 2013 22:30:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 728AB206C for ; Tue, 3 Sep 2013 22:30:56 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r83MUuOn056226 for ; Tue, 3 Sep 2013 22:30:56 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 r83MUuJA056222 for perforce@freebsd.org; Tue, 3 Sep 2013 22:30:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Sep 2013 22:30:56 GMT Message-Id: <201309032230.r83MUuJA056222@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 571561 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: Tue, 03 Sep 2013 22:30:57 -0000 http://p4web.freebsd.org/@@571561?ac=10 Change 571561 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/03 22:30:10 Add stub CCall and CReturn exercise cases to cheritest -- for now, they expect the kernel's temporary behaviour of $pc += 4 rather than an actual invoke. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#12 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Robert N. M. Watson + * Copyright (c) 2012-2013 Robert N. M. Watson * All rights reserved. * * This software was developed by SRI International and the University of @@ -66,7 +66,9 @@ usage(void) { + fprintf(stderr, "cheritest ccall\n"); fprintf(stderr, "cheritest copyregs\n"); + fprintf(stderr, "cheritest creturn\n"); fprintf(stderr, "cheritest listregs\n"); fprintf(stderr, "cheritest overrun\n"); fprintf(stderr, "cheritest sandbox\n"); @@ -93,6 +95,22 @@ } static void +cheritest_ccall(void) +{ + + /* XXXRW: Temporary nop semantics. */ + CHERI_CCALL(10, 11); +} + +static void +cheritest_creturn(void) +{ + + /* XXXRW: Temporary nop semantics. */ + CHERI_CRETURN(); +} + +static void cheritest_copyregs(void) { @@ -252,8 +270,12 @@ for (i = 0; i < argc; i++) { if (strcmp(argv[i], "listregs") == 0) cheritest_listregs(); + else if (strcmp(argv[i], "ccall") == 0) + cheritest_ccall(); else if (strcmp(argv[i], "copyregs") == 0) cheritest_copyregs(); + else if (strcmp(argv[i], "creturn") == 0) + cheritest_creturn(); else if (strcmp(argv[i], "overrun") == 0) cheritest_overrun(); else if (strcmp(argv[i], "sandbox") == 0) From owner-p4-projects@FreeBSD.ORG Thu Sep 5 18:50:04 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53C8AE5F; Thu, 5 Sep 2013 18:50:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 14FFBE5D for ; Thu, 5 Sep 2013 18:50:04 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E7BC72885 for ; Thu, 5 Sep 2013 18:50:03 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r85Io3A9028684 for ; Thu, 5 Sep 2013 18:50:03 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r85Io3KM028681 for perforce@freebsd.org; Thu, 5 Sep 2013 18:50:03 GMT (envelope-from brooks@freebsd.org) Date: Thu, 5 Sep 2013 18:50:03 GMT Message-Id: <201309051850.r85Io3KM028681@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 593392 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, 05 Sep 2013 18:50:04 -0000 http://p4web.freebsd.org/@@593392?ac=10 Change 593392 by brooks@brooks_zenith on 2013/09/05 18:49:16 Make WITH_SOAAP imply WITH_LLVM_INSTRUMENTED for now. Break up the rules to create *.soaap_cg and *.soaap_perf versions so the intermediate files don't collide and are generated by their own rules thus allowing conditional compiliation. Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#11 edit .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#16 edit .. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#17 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#11 (text+ko) ==== @@ -628,8 +628,8 @@ # 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. +# XXX: The current construction allow an empty instrumentation 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. @@ -637,15 +637,28 @@ .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 ${MK_TESLA} == "no" && ${MK_SOAAP} == "no" .if defined(WITH_LLVM_INSTRUMENTED) MK_LLVM_INSTRUMENTED:= yes .else MK_LLVM_INSTRUMENTED:= no .endif +.endif + +.if ${MK_SOAAP} != "no" +CFLAGS+= -I${SOAAP_SOURCE_DIR}/include +.if defined(WITHOUT_LLVM_INSTRUMENTED) +.error WITHOUT_LLVM_INSTRUMENTED and WITH_SOAAP can't both be set. .else +MK_LLVM_INSTRUMENTED:= yes +.endif +.endif + +.if ${MK_TESLA} == "no" +LLVM_INSTR_DEP?= +LLVM_INSTR_COMMAND?= cp ${.IMPSRC} ${.TARGET} +.else LLVM_INSTR_DEP= tesla.manifest .if ${LLVM_IR_TYPE} == "bc" LLVM_INSTR_COMMAND= ${TESLA} instrument -verify-each -tesla-manifest \ @@ -663,10 +676,6 @@ .endif .endif -.if defined(WITH_LLVM_INSTRUMENTED) && defined(WITH_SOAAP) -CFLAGS+= -I${SOAAP_SOURCE_DIR}/include -.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/bsd.prog.mk#16 (text+ko) ==== @@ -5,7 +5,6 @@ .SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .ln .s .S .asm - # XXX The use of COPTS in modern makefiles is discouraged. .if defined(COPTS) CFLAGS+=${COPTS} @@ -69,7 +68,7 @@ INSTR_IRS= ${LLVM_CFILES:R:S/$/.instr${LLVM_IR_TYPE}/} INSTR_OBJS= ${LLVM_CFILES:R:S/$/.instro/} OBJS+= ${INSTR_OBJS} -CLEANFILES+= ${OIRS} ${INSTR_IRS} ${INSTR_OBJS} ${PROG}.${LLVM_IR_TYPE}-a +CLEANFILES+= ${OIRS} ${INSTR_IRS} ${INSTR_OBJS} .if ${MK_TESLA} != "no" TESLA_FILES= ${LLVM_CFILES:R:S/$/.tesla/} CLEANFILES+= ${TESLA_FILES} tesla.manifest @@ -119,17 +118,18 @@ .endif .endif # defined(PROG) -.if defined(WITH_LLVM_INSTRUMENTED) -all: objwarn ${PROG} ${PROG}.${LLVM_IR_TYPE}-a ${SCRIPTS} -.else all: objwarn ${PROG} ${SCRIPTS} -.endif .if ${MK_MAN} != "no" all: _manpages .endif .if defined(PROG) CLEANFILES+= ${PROG} +.if ${MK_SOAAP} != "no" +CLEANFILES+= ${PROG}.${LLVM_IR_TYPE}-a \ + ${PROG}.bc_cep ${PROG}.po_cep ${PROG}.soaap_cg \ + ${PROG}.bc_soaap_perf ${PROG}.po_soaap_perf ${PROG}.soaap_pef +.endif .endif .if defined(OBJS) ==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#17 (text+ko) ==== @@ -32,7 +32,7 @@ .if defined(%POSIX) .SUFFIXES: .o .c .y .l .a .sh .f .else -.SUFFIXES: .out .a .dot .bc-a .ll-a .instrbc .instrll .instro .obc .oll .ln .manifest .o .c .cc .cpp .cxx .C .m .F .f .e .r .soaap .soaap_cg .soaap_perf .tesla .y .l .S .asm .s .cl .p .h .sh +.SUFFIXES: .out .a .ao .dot .bc-a .bc_cep .bc_soaap_perf .ll-a .instrbc .instrll .instro .llvmlinked .obc .oll .po_cep .po_soaap_perf .ln .manifest .o .c .cc .cpp .cxx .C .m .F .f .e .r .soaap .soaap_cg .soaap_perf .tesla .y .l .S .asm .s .cl .p .h .sh .endif AR ?= ar @@ -297,21 +297,37 @@ .error Unknown LLVM IR type ${LLVM_IR_TYPE} .endif -.if defined(WITH_SOAAP) -CLEANFILES+= *.${LLVM_IR_TYPE}-a *.po *.pbc *.soaap_cg *.soaap_perf .${LLVM_IR_TYPE}-a.soaap: - ${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap ${SOAAP_FLAGS} -o /dev/null ${.IMPSRC} + ${OPT} -load ${SOAAP_BUILD_DIR}/libsoaap.so -soaap ${SOAAP_FLAGS} \ + -o /dev/null ${.IMPSRC} + +.${LLVM_IR_TYPE}-a.bc_cep: + ${OPT} -load ${SOAAP_BUILD_DIR}/libcep.so -insert-call-edge-profiling \ + -o ${.TARGET} ${.IMPSRC} + +.bc_cep.po_cep: + ${LLC} -filetype=obj ${LLCFLAGS} -o ${.TARGET} ${.IMPSRC} + +.po_cep.soaap_cg: + ${CC} ${.IMPSRC} -L${SOAAP_BUILD_DIR} -L${LLVM_BUILD_DIR}/lib \ + -lcep_rt -lprofile_rt ${LDADD} -o ${.TARGET} + +.${LLVM_IR_TYPE}-a.bc_soaap_perf: + ${OPT} -load ${SOAAP_BUILD_DIR}/libsoaap.so -soaap \ + -soaap-emulate-performance ${SOAAP_FLAGS} -o ${.TARGET} ${.IMPSRC} + +.bc_soaap_perf.po_soaap_perf: + ${LLC} -filetype=obj -o ${.TARGET} ${.IMPSRC} + +.po_soaap_perf.soaap_perf: + ${CC} ${.IMPSRC} ${LDADD} -o ${.TARGET} -.${LLVM_IR_TYPE}-a.soaap_cg: - ${OPT} -load $(SOAAP_BUILD_DIR)/libcep.so -insert-call-edge-profiling -o ${.IMPSRC:R}.pbc ${.IMPSRC} - ${LLC} -filetype=obj -o ${.IMPSRC:R}.po ${.IMPSRC:R}.pbc - ${CC} -L $(SOAAP_BUILD_DIR) -L $(LLVM_BUILD_DIR)/lib -lcep_rt -lprofile_rt $(LDADD) -o ${.TARGET} ${.IMPSRC:R}.po +.${LLVM_IR_TYPE}-a.ao: + ${LLC} -filetype=obj -o ${.TARGET} ${.IMPSRC} -.${LLVM_IR_TYPE}-a.soaap_perf: - ${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap -soaap-emulate-performance ${SOAAP_FLAGS} -o ${.IMPSRC:R}.pbc ${.IMPSRC} - ${LLC} -filetype=obj -o ${.IMPSRC:R}.po ${.IMPSRC:R}.pbc - ${CC} $(LDADD) -o ${.TARGET} ${.IMPSRC:R}.po -.endif +# XXX: missing non-c objects +.ao.llvmlinked: + ${CC} ${.IMPSRC} ${LDADD} -o ${.TARGET} .manifest.dot: ${TESLA} graph ${.IMPSRC} -o ${.TARGET} From owner-p4-projects@FreeBSD.ORG Fri Sep 6 11:06:25 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69F5226F; Fri, 6 Sep 2013 11:06:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2BCC826D for ; Fri, 6 Sep 2013 11:06:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 184632205 for ; Fri, 6 Sep 2013 11:06:25 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r86B6Onj039208 for ; Fri, 6 Sep 2013 11:06:24 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 r86B6O6i039173 for perforce@freebsd.org; Fri, 6 Sep 2013 11:06:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 6 Sep 2013 11:06:24 GMT Message-Id: <201309061106.r86B6O6i039173@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 601761 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, 06 Sep 2013 11:06:25 -0000 http://p4web.freebsd.org/@@601761?ac=10 Change 601761 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/06 11:05:45 Fixes to the CHERI CCall/CReturn stub exception handler: (1) Set noorder -- exception handlers with NOPs semi-arbitrarily inserted and removed work less well. (2) No need to ifdef CHERI exception handling paths -- this is definitely compiled only for CHERI. (3) Insert several NOPs after modifying EPC to ensure the new value is in place before ERET. The no-op CCall/CReturn handler now appears to be a no-op, rather than a recipe for segfaults. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#13 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/ccall.S#3 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#13 (text+ko) ==== ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/ccall.S#3 (text+ko) ==== @@ -43,6 +43,8 @@ #include "assym.s" + .set noreorder /* Preserve nops, allow instructions in b-d slots. */ + /* * Software implementations of CCall, CReturn handlers for CHERI. * @@ -51,18 +53,15 @@ VECTOR(CHERICCallVector, unknown) .set push .set noat -#ifdef CPU_CHERI CHERI_EXCEPTION_ENTER(k0) -#endif /* XXXRW: For now, increment PC as though it were a no-op. */ MFC0 k0, MIPS_COP_0_EXC_PC PTR_ADDU k0, 4 MTC0 k0, MIPS_COP_0_EXC_PC + COP0_SYNC -#ifdef CPU_CHERI CHERI_EXCEPTION_RETURN(k0) -#endif eret .set pop VECTOR_END(CHERICCallVector) From owner-p4-projects@FreeBSD.ORG Fri Sep 6 14:47:20 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A99B5F75; Fri, 6 Sep 2013 14:47:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6D74FF73 for ; Fri, 6 Sep 2013 14:47:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5944122A7 for ; Fri, 6 Sep 2013 14:47:20 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r86ElKQb010833 for ; Fri, 6 Sep 2013 14:47:20 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 r86ElKnn010826 for perforce@freebsd.org; Fri, 6 Sep 2013 14:47:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 6 Sep 2013 14:47:20 GMT Message-Id: <201309061447.r86ElKnn010826@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 603689 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, 06 Sep 2013 14:47:21 -0000 http://p4web.freebsd.org/@@603689?ac=10 Change 603689 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/06 14:47:19 Start assembling parts to construct test CCall sandboxes for cheritest. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/bin/cheritest/Makefile#5 edit .. //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#14 edit .. //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest_sandbox.S#1 add .. //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest_sandbox.h#1 add Differences ... ==== //depot/projects/ctsrd/cheribsd/src/bin/cheritest/Makefile#5 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= cheritest -SRCS= cheritest.c +SRCS= cheritest.c cheritest_sandbox.S NO_MAN=yes #DPADD= ${LIBDEVSTAT} ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL} ==== //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#14 (text+ko) ==== @@ -44,6 +44,8 @@ #include "sandbox.h" +#include "cheritest_sandbox.h" + #define CHERI_CAPREG_PRINT(crn) do { \ register_t c_tag; \ register_t c_unsealed, c_perms, c_otype, c_base, c_length; \ From owner-p4-projects@FreeBSD.ORG Fri Sep 6 20:31:29 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE2564D6; Fri, 6 Sep 2013 20:31:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 809834D4 for ; Fri, 6 Sep 2013 20:31:29 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6B61A22B8 for ; Fri, 6 Sep 2013 20:31:29 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r86KVT9J004337 for ; Fri, 6 Sep 2013 20:31:29 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r86KVSDg004332 for perforce@freebsd.org; Fri, 6 Sep 2013 20:31:28 GMT (envelope-from jhb@freebsd.org) Date: Fri, 6 Sep 2013 20:31:28 GMT Message-Id: <201309062031.r86KVSDg004332@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 606722 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, 06 Sep 2013 20:31:30 -0000 http://p4web.freebsd.org/@@606722?ac=10 Change 606722 by jhb@jhb_jhbbsd on 2013/09/06 20:31:16 IFC @606559 Affected files ... .. //depot/projects/smpng/share/man/man9/EVENTHANDLER.9#7 integrate .. //depot/projects/smpng/share/man/man9/Makefile#38 integrate .. //depot/projects/smpng/share/man/man9/pfil.9#4 integrate .. //depot/projects/smpng/share/man/man9/timeout.9#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#25 integrate .. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#36 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#12 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#40 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#116 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#89 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#130 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#61 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#31 integrate .. //depot/projects/smpng/sys/amd64/include/cpufunc.h#31 integrate .. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#27 integrate .. //depot/projects/smpng/sys/amd64/include/pcpu.h#21 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#47 integrate .. //depot/projects/smpng/sys/amd64/include/sf_buf.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#30 integrate .. //depot/projects/smpng/sys/amd64/include/xen/hypercall.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/xen/xen-os.h#4 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#42 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_instruction_emul.c#4 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_msr.c#3 integrate .. //depot/projects/smpng/sys/amd64/vmm/x86.c#5 integrate .. //depot/projects/smpng/sys/amd64/vmm/x86.h#3 integrate .. //depot/projects/smpng/sys/arm/arm/irq_dispatch.S#11 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#45 integrate .. //depot/projects/smpng/sys/arm/arm/pmap-v6.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#75 integrate .. //depot/projects/smpng/sys/arm/arm/stdatomic.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/swtch.S#26 integrate .. //depot/projects/smpng/sys/arm/conf/DIGI-CCWMX53#1 branch .. //depot/projects/smpng/sys/arm/conf/VERSATILEPB#3 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/files.imx53#1 branch .. //depot/projects/smpng/sys/arm/freescale/imx/imx51_ccm.c#3 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx51_gpio.c#3 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx51_iomux.c#3 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx51_machdep.c#2 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx53_machdep.c#1 branch .. //depot/projects/smpng/sys/arm/freescale/imx/imx_gpt.c#4 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx_wdog.c#3 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/std.imx53#1 branch .. //depot/projects/smpng/sys/arm/include/param.h#22 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#43 integrate .. //depot/projects/smpng/sys/arm/include/pte.h#8 integrate .. //depot/projects/smpng/sys/arm/include/sf_buf.h#4 integrate .. //depot/projects/smpng/sys/arm/include/vmparam.h#23 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/digi-ccwmx53.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/imx53x.dtsi#1 branch .. //depot/projects/smpng/sys/boot/forth/beastie.4th#21 integrate .. //depot/projects/smpng/sys/boot/forth/version.4th#5 integrate .. //depot/projects/smpng/sys/boot/forth/version.4th.8#6 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#17 integrate .. //depot/projects/smpng/sys/bsm/audit_kevents.h#21 integrate .. //depot/projects/smpng/sys/bsm/audit_record.h#16 integrate .. //depot/projects/smpng/sys/cam/cam_debug.h#7 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#55 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#88 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.h#14 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl.c#8 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl.h#3 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_backend.h#3 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_backend_block.c#5 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_backend_ramdisk.c#5 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_frontend.h#3 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_io.h#3 integrate .. //depot/projects/smpng/sys/cam/ctl/scsi_ctl.c#9 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#46 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#31 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#112 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.h#8 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_enc.c#6 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_enc_ses.c#7 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#46 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_targ_bh.c#19 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#37 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/file.h#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#18 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#16 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#19 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#17 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#12 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#15 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#16 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#13 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#16 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#8 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#8 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#28 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#27 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#39 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#3 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_load.c#7 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_unload.c#6 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c#4 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c#3 integrate .. //depot/projects/smpng/sys/cddl/dev/fbt/fbt.c#6 integrate .. //depot/projects/smpng/sys/cddl/dev/fbt/fbt_powerpc.c#2 integrate .. //depot/projects/smpng/sys/cddl/dev/sdt/sdt.c#6 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32.h#21 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_capability.c#2 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_ioctl.c#6 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#83 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#78 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#77 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#77 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#78 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_systrace_args.c#11 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#81 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#56 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#78 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#58 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#52 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#32 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#35 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#22 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.c#19 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#71 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#49 integrate .. //depot/projects/smpng/sys/conf/Makefile.amd64#25 integrate .. //depot/projects/smpng/sys/conf/files#288 integrate .. //depot/projects/smpng/sys/conf/files.amd64#97 integrate .. //depot/projects/smpng/sys/conf/files.i386#155 integrate .. //depot/projects/smpng/sys/conf/files.mips#24 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#79 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#24 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/changes.txt#26 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#23 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adwalk.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmextern.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtable.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#24 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslload.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#24 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asloptions.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtcompile.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/debugger/dbcmds.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/debugger/dbfileio.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/debugger/dbinput.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/debugger/dbnames.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/events/evgpeutil.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/events/evmisc.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/events/evregion.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/events/evsci.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/events/evxface.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/hardware/hwxface.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/namespace/nsaccess.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/namespace/nsdump.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/namespace/nsxfeval.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/tables/tbinstal.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/tables/tbprint.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/tables/tbxfroot.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/utilities/utdebug.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/utilities/utglobal.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdebug.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdisasm.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acevents.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acexcep.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acglobal.h#23 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/aclocal.h#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acnamesp.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpiosxf.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpixf.h#26 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/actypes.h#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/ARUBA_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/ARUBA_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/ARUBA_rlc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/BARTS_mc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/BARTS_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/BARTS_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/BTC_rlc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/CAICOS_mc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/CAICOS_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/CAICOS_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/CAYMAN_mc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/CAYMAN_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/CAYMAN_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/CAYMAN_rlc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/CEDAR_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/CEDAR_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/CEDAR_rlc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/CYPRESS_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/CYPRESS_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/CYPRESS_rlc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/CYPRESS_uvd.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/HAINAN_ce.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/HAINAN_mc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/HAINAN_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/HAINAN_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/HAINAN_rlc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/JUNIPER_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/JUNIPER_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/JUNIPER_rlc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/LICENSE.radeon#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/Makefile#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/OLAND_ce.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/OLAND_mc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/OLAND_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/OLAND_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/OLAND_rlc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/PALM_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/PALM_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/PITCAIRN_ce.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/PITCAIRN_mc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/PITCAIRN_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/PITCAIRN_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/PITCAIRN_rlc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/R100_cp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/R200_cp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/R300_cp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/R420_cp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/R520_cp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/R600_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/R600_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/R600_rlc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/R700_rlc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/README#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/REDWOOD_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/REDWOOD_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/REDWOOD_rlc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RS600_cp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RS690_cp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RS780_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RS780_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV610_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV610_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV620_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV620_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV630_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV630_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV635_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV635_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV670_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV670_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV710_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV710_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV710_uvd.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV730_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV730_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV770_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/RV770_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/SUMO2_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/SUMO2_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/SUMO_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/SUMO_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/SUMO_rlc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/SUMO_uvd.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/TAHITI_ce.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/TAHITI_mc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/TAHITI_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/TAHITI_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/TAHITI_rlc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/TAHITI_uvd.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/TURKS_mc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/TURKS_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/TURKS_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/VERDE_ce.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/VERDE_mc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/VERDE_me.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/VERDE_pfp.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/drm2/radeonkmsfw/VERDE_rlc.bin.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu#1 branch .. //depot/projects/smpng/sys/contrib/rdma/krping/krping.c#5 integrate .. //depot/projects/smpng/sys/contrib/rdma/krping/krping.h#4 integrate .. //depot/projects/smpng/sys/contrib/rdma/krping/krping_dev.c#4 integrate .. //depot/projects/smpng/sys/crypto/aesni/aesencdec.h#1 branch .. //depot/projects/smpng/sys/crypto/aesni/aesencdec_amd64.S#3 delete .. //depot/projects/smpng/sys/crypto/aesni/aesencdec_i386.S#3 delete .. //depot/projects/smpng/sys/crypto/aesni/aeskeys_amd64.S#4 integrate .. //depot/projects/smpng/sys/crypto/aesni/aesni.c#5 integrate .. //depot/projects/smpng/sys/crypto/aesni/aesni.h#5 integrate .. //depot/projects/smpng/sys/crypto/aesni/aesni_wrap.c#8 integrate .. //depot/projects/smpng/sys/dev/aac/aac_linux.c#7 integrate .. //depot/projects/smpng/sys/dev/aacraid/aacraid_linux.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#54 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci.c#31 integrate .. //depot/projects/smpng/sys/dev/amdtemp/amdtemp.c#8 integrate .. //depot/projects/smpng/sys/dev/amr/amr_linux.c#8 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#108 integrate .. //depot/projects/smpng/sys/dev/atkbdc/psm.c#27 integrate .. //depot/projects/smpng/sys/dev/cas/if_cas.c#15 integrate .. //depot/projects/smpng/sys/dev/cfi/cfi_bus_nexus.c#2 integrate .. //depot/projects/smpng/sys/dev/cfi/cfi_core.c#10 integrate .. //depot/projects/smpng/sys/dev/cfi/cfi_dev.c#8 integrate .. //depot/projects/smpng/sys/dev/cfi/cfi_disk.c#6 integrate .. //depot/projects/smpng/sys/dev/cfi/cfi_reg.h#5 integrate .. //depot/projects/smpng/sys/dev/cfi/cfi_var.h#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#38 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgbe/adapter.h#12 integrate .. //depot/projects/smpng/sys/dev/cxgbe/offload.h#10 integrate .. //depot/projects/smpng/sys/dev/cxgbe/osdep.h#9 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_main.c#16 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_sge.c#13 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_tracer.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgbe/tom/t4_cpl_io.c#7 integrate .. //depot/projects/smpng/sys/dev/cxgbe/tom/t4_listen.c#7 integrate .. //depot/projects/smpng/sys/dev/cxgbe/tom/t4_tom.c#6 integrate .. //depot/projects/smpng/sys/dev/drm2/ati_pcigart.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/drmP.h#6 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_atomic.h#3 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_buffer.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/drm_buffer.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/drm_context.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_core.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/drm_crtc.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_crtc.h#3 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_crtc_helper.h#3 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_dp_helper.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/drm_dp_helper.h#3 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_dp_iic_helper.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_drv.c#5 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_edid.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_fixed.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/drm_gem.c#5 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_gem_names.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_ioctl.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_irq.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_linux_list.h#3 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_os_freebsd.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/drm_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_pciids.h#4 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_sysctl.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_gem.c#7 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_gem_execbuffer.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_crt.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_display.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_dp.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_drv.h#3 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_hdmi.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_lvds.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_panel.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_sdvo.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_tv.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/radeon/ObjectID.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/README#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/atom-bits.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/atom-names.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/atom-types.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/atom.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/atom.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/atombios.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/atombios_crtc.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/atombios_dp.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/atombios_encoders.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/atombios_i2c.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/avivod.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/cayman_blit_shaders.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/cayman_blit_shaders.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/cayman_reg_safe.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/evergreen.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/evergreen_blit_kms.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/evergreen_blit_shaders.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/evergreen_blit_shaders.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/evergreen_cs.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/evergreen_hdmi.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/evergreen_reg.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/evergreen_reg_safe.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/evergreend.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/ni.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/ni_reg.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/nid.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r100.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r100_reg_safe.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r100_track.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r100d.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r200.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r200_reg_safe.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r300.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r300_cmdbuf.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r300_reg.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r300_reg_safe.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r300d.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r420.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r420_reg_safe.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r420d.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r500_reg.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r520.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r520d.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r600.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r600_audio.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r600_blit.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r600_blit_kms.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r600_blit_shaders.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r600_blit_shaders.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r600_cp.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r600_cp.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r600_cs.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r600_cs.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r600_hdmi.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r600_reg.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r600_reg_safe.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/r600d.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_acpi.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_acpi.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_agp.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_asic.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_asic.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_atombios.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_atpx_handler.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_benchmark.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_bios.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_blit_common.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_clocks.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_combios.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_connectors.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_cp.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_cs.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_cursor.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_device.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_display.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_drm.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_drv.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_drv.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_encoders.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_family.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_fb.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_fence.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_gart.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_gem.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_gem.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_i2c.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_ioc32.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_irq.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_irq_kms.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_irq_kms.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_kms.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_kms.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_legacy_crtc.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_legacy_encoders.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_legacy_tv.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_mem.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_mode.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_object.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_object.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_pm.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_prime.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_reg.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_ring.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_sa.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_semaphore.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_state.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_test.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_trace.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_trace_points.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_ttm.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/reg_srcs/cayman#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/reg_srcs/evergreen#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/reg_srcs/r100#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/reg_srcs/r200#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/reg_srcs/r300#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/reg_srcs/r420#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/reg_srcs/r600#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/reg_srcs/rn50#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/reg_srcs/rs600#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/reg_srcs/rv515#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rn50_reg_safe.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rs100d.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rs400.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rs400d.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rs600.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rs600_reg_safe.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rs600d.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rs690.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rs690d.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rv200d.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rv250d.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rv350d.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rv515.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rv515_reg_safe.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rv515d.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rv770.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/rv770d.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/si.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/si_blit_shaders.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/si_blit_shaders.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/si_reg.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/radeon/sid.h#1 branch .. //depot/projects/smpng/sys/dev/drm2/ttm/ttm_bo.c#2 integrate .. //depot/projects/smpng/sys/dev/drm2/ttm/ttm_bo_driver.h#2 integrate .. //depot/projects/smpng/sys/dev/drm2/ttm/ttm_bo_util.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/ttm/ttm_bo_vm.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/ttm/ttm_execbuf_util.c#2 integrate .. //depot/projects/smpng/sys/dev/drm2/ttm/ttm_page_alloc.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/ttm/ttm_tt.c#4 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#43 integrate .. //depot/projects/smpng/sys/dev/fb/vesa.c#17 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#40 integrate .. //depot/projects/smpng/sys/dev/filemon/filemon.c#5 integrate .. //depot/projects/smpng/sys/dev/flash/mx25l.c#9 integrate .. //depot/projects/smpng/sys/dev/gpio/gpiobus.c#5 integrate .. //depot/projects/smpng/sys/dev/gxemul/cons/gxemul_cons.c#4 integrate .. //depot/projects/smpng/sys/dev/gxemul/disk/gxemul_disk.c#4 integrate .. //depot/projects/smpng/sys/dev/gxemul/disk/gxemul_diskreg.h#3 integrate .. //depot/projects/smpng/sys/dev/gxemul/ether/gxreg.h#3 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#20 integrate .. //depot/projects/smpng/sys/dev/hpt27xx/hpt27xx_osm_bsd.c#2 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_core.c#19 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_logging.c#21 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#45 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mpc7xxx.c#1 branch .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_powerpc.c#7 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_powerpc.h#1 branch .. //depot/projects/smpng/sys/dev/hwpmc/pmc_events.h#18 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#71 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi_linux.c#4 integrate .. //depot/projects/smpng/sys/dev/iscsi_initiator/isc_soc.c#2 integrate .. //depot/projects/smpng/sys/dev/iscsi_initiator/iscsi.c#2 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#31 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#37 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixv.c#10 integrate .. //depot/projects/smpng/sys/dev/jme/if_jme.c#17 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#48 integrate .. //depot/projects/smpng/sys/dev/md/md.c#108 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_cam.c#11 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_linux.c#7 integrate .. //depot/projects/smpng/sys/dev/mmc/mmc.c#25 integrate .. //depot/projects/smpng/sys/dev/mwl/if_mwl.c#14 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#30 integrate .. //depot/projects/smpng/sys/dev/ntb/if_ntb/if_ntb.c#2 integrate .. //depot/projects/smpng/sys/dev/ntb/ntb_hw/ntb_hw.c#2 integrate .. //depot/projects/smpng/sys/dev/ntb/ntb_hw/ntb_hw.h#2 integrate .. //depot/projects/smpng/sys/dev/ntb/ntb_hw/ntb_regs.h#2 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm.c#10 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_tx.c#11 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#40 integrate .. //depot/projects/smpng/sys/dev/pci/vga_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/qlxgb/qla_hw.c#4 integrate .. //depot/projects/smpng/sys/dev/qlxgbe/ql_misc.c#2 integrate .. //depot/projects/smpng/sys/dev/qlxgbe/ql_os.c#3 integrate .. //depot/projects/smpng/sys/dev/sfxge/sfxge_rx.c#4 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_linux.c#5 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#28 integrate .. //depot/projects/smpng/sys/dev/usb/controller/dwc_otg.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#183 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#20 integrate .. //depot/projects/smpng/sys/dev/virtio/network/if_vtnet.c#8 integrate .. //depot/projects/smpng/sys/dev/virtio/network/if_vtnetvar.h#5 integrate .. //depot/projects/smpng/sys/dev/virtio/network/virtio_net.h#5 integrate .. //depot/projects/smpng/sys/dev/virtio/pci/virtio_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/virtio/virtio_if.m#4 integrate .. //depot/projects/smpng/sys/dev/virtio/virtqueue.c#7 integrate .. //depot/projects/smpng/sys/dev/virtio/virtqueue.h#7 integrate .. //depot/projects/smpng/sys/dev/vmware/vmxnet3/if_vmx.c#1 branch .. //depot/projects/smpng/sys/dev/vmware/vmxnet3/if_vmxreg.h#1 branch .. //depot/projects/smpng/sys/dev/vmware/vmxnet3/if_vmxvar.h#1 branch .. //depot/projects/smpng/sys/dev/wb/if_wb.c#11 integrate .. //depot/projects/smpng/sys/dev/xen/balloon/balloon.c#11 integrate .. //depot/projects/smpng/sys/dev/xen/blkback/blkback.c#12 integrate .. //depot/projects/smpng/sys/dev/xen/blkfront/blkfront.c#20 integrate .. //depot/projects/smpng/sys/dev/xen/blkfront/block.h#10 integrate .. //depot/projects/smpng/sys/dev/xen/console/console.c#17 integrate .. //depot/projects/smpng/sys/dev/xen/console/xencons_ring.c#6 integrate .. //depot/projects/smpng/sys/dev/xen/control/control.c#6 integrate .. //depot/projects/smpng/sys/dev/xen/netback/netback.c#11 integrate .. //depot/projects/smpng/sys/dev/xen/netfront/netfront.c#25 integrate .. //depot/projects/smpng/sys/dev/xen/timer/timer.c#1 branch .. //depot/projects/smpng/sys/dev/xen/xenpci/evtchn.c#6 delete .. //depot/projects/smpng/sys/dev/xen/xenpci/xenpci.c#5 integrate .. //depot/projects/smpng/sys/dev/xen/xenpci/xenpcivar.h#2 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#43 integrate .. //depot/projects/smpng/sys/fs/fuse/fuse_vfsops.c#3 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs.h#12 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clkrpc.c#10 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clport.c#20 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvfsops.c#24 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdport.c#32 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_subr.c#25 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vfsops.c#14 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#40 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#72 integrate .. //depot/projects/smpng/sys/geom/part/g_part_ldm.c#5 integrate .. //depot/projects/smpng/sys/geom/zero/g_zero.c#8 integrate .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#32 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#182 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#149 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#169 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_fcntl.c#17 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ioctl.c#19 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#43 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#45 integrate .. //depot/projects/smpng/sys/i386/include/intr_machdep.h#30 integrate .. //depot/projects/smpng/sys/i386/include/pcpu.h#30 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#63 integrate .. //depot/projects/smpng/sys/i386/include/sf_buf.h#7 integrate .. //depot/projects/smpng/sys/i386/include/xen/xen-os.h#9 integrate .. //depot/projects/smpng/sys/i386/include/xen/xen_clock_util.h#3 delete .. //depot/projects/smpng/sys/i386/include/xen/xenfunc.h#6 integrate .. //depot/projects/smpng/sys/i386/include/xen/xenvar.h#10 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#79 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#58 integrate .. //depot/projects/smpng/sys/i386/xen/clock.c#15 integrate .. //depot/projects/smpng/sys/i386/xen/exception.s#6 integrate .. //depot/projects/smpng/sys/i386/xen/mp_machdep.c#29 integrate .. //depot/projects/smpng/sys/i386/xen/mptable.c#8 integrate .. //depot/projects/smpng/sys/i386/xen/pmap.c#33 integrate .. //depot/projects/smpng/sys/i386/xen/xen_clock_util.c#3 delete .. //depot/projects/smpng/sys/i386/xen/xen_machdep.c#17 integrate .. //depot/projects/smpng/sys/i386/xen/xen_rtc.c#3 delete .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#113 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#59 integrate .. //depot/projects/smpng/sys/ia64/include/sf_buf.h#5 integrate .. //depot/projects/smpng/sys/kern/capabilities.conf#6 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#110 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#149 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#73 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#148 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#95 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#85 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#119 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_physio.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#130 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#172 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#141 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#60 integrate .. //depot/projects/smpng/sys/kern/subr_capability.c#1 branch .. //depot/projects/smpng/sys/kern/subr_mbpool.c#6 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#56 integrate .. //depot/projects/smpng/sys/kern/subr_unit.c#11 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#197 integrate .. //depot/projects/smpng/sys/kern/sys_capability.c#11 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#76 integrate .. //depot/projects/smpng/sys/kern/sys_procdesc.c#6 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#109 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#116 integrate .. //depot/projects/smpng/sys/kern/systrace_args.c#34 integrate .. //depot/projects/smpng/sys/kern/tty.c#112 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#27 integrate .. //depot/projects/smpng/sys/kern/uipc_debug.c#10 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#72 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#38 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#41 integrate .. //depot/projects/smpng/sys/kern/uipc_sockbuf.c#23 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#153 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#145 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#105 integrate .. //depot/projects/smpng/sys/kern/vfs_acl.c#17 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#96 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#149 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#60 integrate .. //depot/projects/smpng/sys/kern/vfs_extattr.c#16 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#74 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#118 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#176 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_spi.c#3 integrate .. //depot/projects/smpng/sys/mips/atheros/if_arge.c#13 integrate .. //depot/projects/smpng/sys/mips/conf/DIR-825#4 integrate .. //depot/projects/smpng/sys/mips/conf/DIR-825.hints#4 integrate .. //depot/projects/smpng/sys/mips/conf/GXEMUL32#1 branch .. //depot/projects/smpng/sys/mips/conf/MALTA#10 integrate .. //depot/projects/smpng/sys/mips/conf/MALTA64#8 integrate .. //depot/projects/smpng/sys/mips/conf/PICOSTATION_M2HP#1 branch .. //depot/projects/smpng/sys/mips/conf/PICOSTATION_M2HP.hints#1 branch .. //depot/projects/smpng/sys/mips/conf/ROUTERSTATION.hints#4 integrate .. //depot/projects/smpng/sys/mips/gxemul/mpreg.h#3 integrate .. //depot/projects/smpng/sys/mips/include/_stdint.h#8 integrate .. //depot/projects/smpng/sys/mips/include/sf_buf.h#5 integrate .. //depot/projects/smpng/sys/mips/malta/files.malta#5 integrate .. //depot/projects/smpng/sys/mips/malta/gt_pci.c#11 integrate .. //depot/projects/smpng/sys/mips/malta/gt_pci_bus_space.c#1 branch .. //depot/projects/smpng/sys/mips/malta/gt_pci_bus_space.h#1 branch .. //depot/projects/smpng/sys/mips/malta/malta_machdep.c#8 integrate .. //depot/projects/smpng/sys/mips/malta/yamon.c#5 integrate .. //depot/projects/smpng/sys/mips/mips/pmap.c#42 integrate .. //depot/projects/smpng/sys/mips/mips/vm_machdep.c#17 integrate .. //depot/projects/smpng/sys/modules/Makefile#198 integrate .. //depot/projects/smpng/sys/modules/aesni/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/cam/Makefile#24 integrate .. //depot/projects/smpng/sys/modules/drm2/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/drm2/drm2/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/drm2/radeonkms/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/ARUBA_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/ARUBA_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/ARUBA_rlc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/BARTS_mc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/BARTS_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/BARTS_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/BTC_rlc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/CAICOS_mc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/CAICOS_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/CAICOS_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/CAYMAN_mc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/CAYMAN_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/CAYMAN_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/CAYMAN_rlc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/CEDAR_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/CEDAR_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/CEDAR_rlc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/CYPRESS_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/CYPRESS_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/CYPRESS_rlc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/CYPRESS_uvd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/HAINAN_ce/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/HAINAN_mc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/HAINAN_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/HAINAN_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/HAINAN_rlc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/JUNIPER_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/JUNIPER_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/JUNIPER_rlc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/OLAND_ce/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/OLAND_mc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/OLAND_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/OLAND_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/OLAND_rlc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/PALM_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/PALM_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/PITCAIRN_ce/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/PITCAIRN_mc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/PITCAIRN_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/PITCAIRN_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/PITCAIRN_rlc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/R100_cp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/R200_cp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/R300_cp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/R420_cp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/R520_cp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/R600_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/R600_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/R600_rlc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/R700_rlc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/REDWOOD_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/REDWOOD_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/REDWOOD_rlc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RS600_cp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RS690_cp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RS780_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RS780_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV610_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV610_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV620_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV620_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV630_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV630_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV635_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV635_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV670_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV670_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV710_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV710_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV710_uvd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV730_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV730_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV770_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/RV770_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/SUMO2_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/SUMO2_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/SUMO_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/SUMO_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/SUMO_rlc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/SUMO_uvd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/TAHITI_ce/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/TAHITI_mc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/TAHITI_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/TAHITI_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/TAHITI_rlc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/TAHITI_uvd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/TURKS_mc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/TURKS_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/TURKS_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/VERDE_ce/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/VERDE_mc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/VERDE_me/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/VERDE_pfp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/VERDE_rlc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm2/radeonkmsfw/gen-makefiles#1 branch .. //depot/projects/smpng/sys/modules/hwpmc/Makefile#12 integrate .. //depot/projects/smpng/sys/modules/ip6_mroute_mod/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/iwnfw/iwn2000/Makefile#1 branch .. //depot/projects/smpng/sys/modules/linux/Makefile#34 integrate .. //depot/projects/smpng/sys/modules/rdma/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/send/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/virtio/network/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/vmware/Makefile#1 branch .. //depot/projects/smpng/sys/modules/vmware/vmxnet3/Makefile#1 branch .. //depot/projects/smpng/sys/net/if.h#57 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#43 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#42 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#32 integrate .. //depot/projects/smpng/sys/net/if_lagg.h#12 integrate .. //depot/projects/smpng/sys/net/if_llatbl.h#18 integrate .. //depot/projects/smpng/sys/net/if_pfsync.h#4 integrate .. //depot/projects/smpng/sys/net/pfil.c#17 integrate .. //depot/projects/smpng/sys/net/pfil.h#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#60 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#37 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_superg.c#10 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#36 integrate .. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.h#17 integrate .. //depot/projects/smpng/sys/netinet/icmp_var.h#17 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#49 integrate .. //depot/projects/smpng/sys/netinet/igmp_var.h#10 integrate .. //depot/projects/smpng/sys/netinet/in.h#59 integrate .. //depot/projects/smpng/sys/netinet/in_kdtrace.c#1 branch .. //depot/projects/smpng/sys/netinet/in_kdtrace.h#1 branch .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#45 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#128 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#82 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#132 integrate .. //depot/projects/smpng/sys/netinet/pim_var.h#8 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.c#28 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.h#13 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#49 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#50 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#41 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#59 integrate .. //depot/projects/smpng/sys/netinet/sctp_structs.h#35 integrate .. //depot/projects/smpng/sys/netinet/sctp_timer.c#34 integrate .. //depot/projects/smpng/sys/netinet/sctp_uio.h#39 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#59 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#154 integrate .. //depot/projects/smpng/sys/netinet/tcp_lro.c#9 integrate .. //depot/projects/smpng/sys/netinet/tcp_lro.h#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#83 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#140 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#92 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#98 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#92 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#112 integrate .. //depot/projects/smpng/sys/netinet/udp_var.h#24 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#86 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#54 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#86 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#47 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#80 integrate .. //depot/projects/smpng/sys/netinet6/pim6_var.h#7 integrate .. //depot/projects/smpng/sys/netinet6/sctp6_usrreq.c#32 integrate .. //depot/projects/smpng/sys/netinet6/send.c#7 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#71 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.h#27 integrate .. //depot/projects/smpng/sys/netipsec/key_var.h#5 integrate .. //depot/projects/smpng/sys/netpfil/ipfw/ip_dummynet.c#4 integrate .. //depot/projects/smpng/sys/netpfil/ipfw/ip_fw2.c#5 integrate .. //depot/projects/smpng/sys/netpfil/ipfw/ip_fw_nat.c#3 integrate .. //depot/projects/smpng/sys/netpfil/ipfw/ip_fw_private.h#4 integrate .. //depot/projects/smpng/sys/netpfil/pf/pf_lb.c#3 integrate .. //depot/projects/smpng/sys/netsmb/smb_dev.c#33 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvkrpc.c#16 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/en_frag.c#3 integrate .. //depot/projects/smpng/sys/ofed/include/linux/file.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/linux/net.h#3 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap.c#23 integrate .. //depot/projects/smpng/sys/powerpc/aim/vm_machdep.c#15 integrate .. //depot/projects/smpng/sys/powerpc/include/_stdint.h#8 integrate .. //depot/projects/smpng/sys/powerpc/include/frame.h#16 integrate .. //depot/projects/smpng/sys/powerpc/include/pmc_mdep.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/sf_buf.h#6 integrate .. //depot/projects/smpng/sys/powerpc/powermac/atibl.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powermac/kiic.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powermac/nvbl.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mmu_if.m#19 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap_dispatch.c#23 integrate .. //depot/projects/smpng/sys/rpc/clnt_dg.c#17 integrate .. //depot/projects/smpng/sys/security/audit/audit.h#18 integrate .. //depot/projects/smpng/sys/security/audit/audit_arg.c#24 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm.c#24 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_klib.c#18 integrate .. //depot/projects/smpng/sys/security/audit/audit_private.h#20 integrate .. //depot/projects/smpng/sys/security/audit/bsm_token.c#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_syscalls.c#13 integrate .. //depot/projects/smpng/sys/sparc64/include/sf_buf.h#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#108 integrate .. //depot/projects/smpng/sys/sys/_types.h#21 integrate .. //depot/projects/smpng/sys/sys/_unrhdr.h#1 branch .. //depot/projects/smpng/sys/sys/bitset.h#2 integrate .. //depot/projects/smpng/sys/sys/callout.h#20 integrate .. //depot/projects/smpng/sys/sys/capability.h#13 integrate .. //depot/projects/smpng/sys/sys/caprights.h#1 branch .. //depot/projects/smpng/sys/sys/conf.h#78 integrate .. //depot/projects/smpng/sys/sys/cpuset.h#13 integrate .. //depot/projects/smpng/sys/sys/eventhandler.h#41 integrate .. //depot/projects/smpng/sys/sys/fcntl.h#18 integrate .. //depot/projects/smpng/sys/sys/file.h#43 integrate .. //depot/projects/smpng/sys/sys/filedesc.h#41 integrate .. //depot/projects/smpng/sys/sys/jail.h#37 integrate .. //depot/projects/smpng/sys/sys/kernel.h#56 integrate .. //depot/projects/smpng/sys/sys/ktrace.h#25 integrate .. //depot/projects/smpng/sys/sys/mbpool.h#4 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#97 integrate .. //depot/projects/smpng/sys/sys/mount.h#91 integrate .. //depot/projects/smpng/sys/sys/mouse.h#10 integrate .. //depot/projects/smpng/sys/sys/namei.h#27 integrate .. //depot/projects/smpng/sys/sys/param.h#184 integrate .. //depot/projects/smpng/sys/sys/pmckern.h#13 integrate .. //depot/projects/smpng/sys/sys/procdesc.h#3 integrate .. //depot/projects/smpng/sys/sys/sf_buf.h#8 integrate .. //depot/projects/smpng/sys/sys/sockbuf.h#6 integrate .. //depot/projects/smpng/sys/sys/socket.h#45 integrate .. //depot/projects/smpng/sys/sys/syscall.h#108 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#108 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#78 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#113 integrate .. //depot/projects/smpng/sys/sys/systm.h#112 integrate .. //depot/projects/smpng/sys/sys/time.h#38 integrate .. //depot/projects/smpng/sys/sys/types.h#47 integrate .. //depot/projects/smpng/sys/sys/user.h#52 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#67 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#41 integrate .. //depot/projects/smpng/sys/vm/pmap.h#45 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#100 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#126 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#101 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#137 integrate .. //depot/projects/smpng/sys/vm/vm_radix.c#4 integrate .. //depot/projects/smpng/sys/vm/vm_radix.h#3 integrate .. //depot/projects/smpng/sys/x86/include/segments.h#4 integrate .. //depot/projects/smpng/sys/x86/x86/local_apic.c#19 integrate .. //depot/projects/smpng/sys/x86/xen/hvm.c#1 branch .. //depot/projects/smpng/sys/x86/xen/xen_intr.c#1 branch .. //depot/projects/smpng/sys/xen/evtchn.h#3 integrate .. //depot/projects/smpng/sys/xen/evtchn/evtchn.c#13 delete .. //depot/projects/smpng/sys/xen/evtchn/evtchn_dev.c#7 integrate .. //depot/projects/smpng/sys/xen/evtchn/evtchnvar.h#1 branch .. //depot/projects/smpng/sys/xen/features.c#5 integrate .. //depot/projects/smpng/sys/xen/gnttab.c#10 integrate .. //depot/projects/smpng/sys/xen/gnttab.h#7 integrate .. //depot/projects/smpng/sys/xen/hvm.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/event_channel.h#3 integrate .. //depot/projects/smpng/sys/xen/xen-os.h#1 branch .. //depot/projects/smpng/sys/xen/xen_intr.h#5 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbus.c#4 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbus_if.m#5 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbusb_front.c#5 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbusvar.h#7 integrate .. //depot/projects/smpng/sys/xen/xenstore/xenstore.c#9 integrate .. //depot/projects/smpng/sys/xen/xenstore/xenstore_dev.c#3 integrate .. //depot/projects/smpng/sys/xen/xenstore/xenstorevar.h#4 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/EVENTHANDLER.9#7 (text+ko) ==== @@ -21,7 +21,7 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" $FreeBSD: head/share/man/man9/EVENTHANDLER.9 254309 2013-08-14 00:42:21Z markj $ +.\" $FreeBSD: head/share/man/man9/EVENTHANDLER.9 254813 2013-08-24 21:13:38Z markj $ .\" .Dd August 1, 2013 .Dt EVENTHANDLER 9 @@ -258,6 +258,8 @@ .It Vt kld_load Callbacks invoked after a linker file has been loaded. .It Vt kld_unload +Callbacks invoked after a linker file has been successfully unloaded. +.It Vt kld_unload_try Callbacks invoked before a linker file is about to be unloaded. These callbacks may be used to return an error and prevent the unload from proceeding. ==== //depot/projects/smpng/share/man/man9/Makefile#38 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/man/man9/Makefile 254138 2013-08-09 11:11:11Z attilio $ +# $FreeBSD: head/share/man/man9/Makefile 255208 2013-09-04 17:48:41Z jmg $ MAN= accept_filter.9 \ accf_data.9 \ @@ -324,6 +324,7 @@ vm_map_wire.9 \ vm_page_alloc.9 \ vm_page_bits.9 \ + vm_page_busy.9 \ vm_page_cache.9 \ vm_page_deactivate.9 \ vm_page_dontneed.9 \ @@ -1446,6 +1447,13 @@ MLINKS+=vhold.9 vdrop.9 \ vhold.9 vdropl.9 \ vhold.9 vholdl.9 +MLINKS+=vmem.9 vmem_add.9 \ + vmem.9 vmem_alloc.9 \ + vmem.9 vmem_create.9 \ + vmem.9 vmem_destroy.9 \ + vmem.9 vmem_free.9 \ + vmem.9 vmem_xalloc.9 \ + vmem.9 vmem_xfree.9 MLINKS+=vm_map_lock.9 vm_map_lock_downgrade.9 \ vm_map_lock.9 vm_map_lock_read.9 \ vm_map_lock.9 vm_map_lock_upgrade.9 \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 6 20:33:32 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 286E36DA; Fri, 6 Sep 2013 20:33:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DDF216D8 for ; Fri, 6 Sep 2013 20:33:31 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B201D22CF for ; Fri, 6 Sep 2013 20:33: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 r86KXV1n008312 for ; Fri, 6 Sep 2013 20:33:31 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r86KXVqm008309 for perforce@freebsd.org; Fri, 6 Sep 2013 20:33:31 GMT (envelope-from jhb@freebsd.org) Date: Fri, 6 Sep 2013 20:33:31 GMT Message-Id: <201309062033.r86KXVqm008309@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 606742 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, 06 Sep 2013 20:33:32 -0000 http://p4web.freebsd.org/@@606742?ac=10 Change 606742 by jhb@jhb_jhbbsd on 2013/09/06 20:33:18 IFC @606686 Affected files ... .. //depot/projects/smpng/sys/amd64/conf/NOTES#72 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#164 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/conf/NOTES#72 (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 254624 2013-08-21 22:43:29Z obrien $ +# $FreeBSD: head/sys/amd64/conf/NOTES 255323 2013-09-06 20:24:21Z bryanv $ # # @@ -309,6 +309,7 @@ # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking # sfxge: Solarflare SFC9000 family 10Gb Ethernet adapters +# vmx: VMware VMXNET3 Ethernet (BSD open source) # wpi: Intel 3945ABG Wireless LAN controller # Requires the wpi firmware module @@ -325,6 +326,7 @@ device nfe # nVidia nForce MCP on-board Ethernet device nve # nVidia nForce MCP on-board Ethernet Networking device sfxge # Solarflare SFC9000 10Gb Ethernet +device vmx # VMware VMXNET3 Ethernet device wpi # Intel 3945ABG wireless NICs. # IEEE 802.11 adapter firmware modules ==== //depot/projects/smpng/sys/i386/conf/NOTES#164 (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/i386/conf/NOTES 254624 2013-08-21 22:43:29Z obrien $ +# $FreeBSD: head/sys/i386/conf/NOTES 255323 2013-09-06 20:24:21Z bryanv $ # # @@ -580,6 +580,7 @@ # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking # sbni: Granch SBNI12-xx ISA and PCI adapters +# vmx: VMware VMXNET3 Ethernet (BSD open source) # wl: Lucent Wavelan (ISA card only). # wpi: Intel 3945ABG Wireless LAN controller # Requires the wpi firmware module @@ -629,6 +630,7 @@ hint.sbni.0.port="0x210" hint.sbni.0.irq="0xefdead" hint.sbni.0.flags="0" +device vmx # VMware VMXNET3 Ethernet device wl hint.wl.0.at="isa" hint.wl.0.port="0x300"