From owner-p4-projects@FreeBSD.ORG Sun Dec 3 00:16:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AECE16A416; Sun, 3 Dec 2006 00:16:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0656016A403 for ; Sun, 3 Dec 2006 00:16:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9032C43CA2 for ; Sun, 3 Dec 2006 00:15:59 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB30GMZc081476 for ; Sun, 3 Dec 2006 00:16:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB30G0HW081471 for perforce@freebsd.org; Sun, 3 Dec 2006 00:16:00 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 00:16:00 GMT Message-Id: <200612030016.kB30G0HW081471@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110893 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 00:16:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=110893 Change 110893 by jb@jb_freebsd8 on 2006/12/03 00:15:25 IFproject_opensolaris (the staging post containing FreeBSD changes) Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#9 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/Makefile#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/32/Makefile#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/64/Makefile#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/src/Getopt.java#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/src/JDTrace.java#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/src/jdtrace.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/Makefile#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/Makefile.pkg#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/SUNWdtrt/Makefile#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/SUNWdtrt/pkginfo.tmpl#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/SUNWdtrt/prototype_com#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/SUNWdtrt/prototype_i386#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/SUNWdtrt/prototype_sparc#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/common/README#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/common/bld_awk_pkginfo.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/common/depend#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/bitarch.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_INVAL.wrongdec4.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.nonprofile.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginexit.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.twoprof.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.aggrate.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.statusrate.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.switchrate.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.basename.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.caller.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.cleanpath.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.copyin.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.copyin2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.ddi_pathname.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.dirname.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.errno.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.execname.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.gid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.hton.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.index.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.msgdsize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.msgsize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.null.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.pid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.ppid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.progenyof.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.random.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.rw.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.shortstr.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.stack.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.stackdepth.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.strchr.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.strjoin.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.strstr.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.strtok.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.substr.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.uid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.unalign.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.uregs.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.ustack.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.ustackdepth.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.vahole.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.violentdeath.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.zonename.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_ARR_LOCAL.thisarray.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_DECL_CLASS.selfthis.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_DECL_CLASS.thisself.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_DECL_IDRED.errval.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_OP_INCOMPAT.dec.err.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_OP_INCOMPAT.dupgtype.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_OP_INCOMPAT.dupltype.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_OP_INCOMPAT.dupttype.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_SYNTAX.declare.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.basicvar.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.localvar.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.misc.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.self.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfthis.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.this.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.thisself.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sched/tst.enqueue.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sched/tst.oncpu.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sched/tst.stackdepth.d#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/err.D_MACRO_UNDEF.invalidargs.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/err.D_OP_LVAL.rdonly.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/err.D_OP_WRITE.usepidmacro.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/err.D_SYNTAX.concat.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/err.D_SYNTAX.desc.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/err.D_SYNTAX.inval.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/err.D_SYNTAX.pid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arg0.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.assign.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.basic.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.pgid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.pid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.quite.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.trace.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/err.D_IDENT_BADREF.SizeofAssoc.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/err.D_IDENT_UNDEF.UnknownSymbol.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/err.D_SIZEOF_TYPE.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/err.D_SYNTAX.SizeofBadType.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/tst.SizeofArray.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/tst.SizeofDataTypes.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/tst.SizeofExpression.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/tst.SizeofNULL.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/tst.SizeofStrConst.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/tst.SizeofString1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/tst.SizeofString2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/bug.1001148.SpecSizeVariations.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithBreakPoint.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithChill.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithCopyOut.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithCopyOutStr.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithPanic.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithRaise.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithStop.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_AGG_COMM.AggAftCommit.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithAvg.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithCount.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithLquant.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithMax.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithMin.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithQuant.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithSum.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_COMM_COMM.CommitAftCommit.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_COMM_COMM.DisjointCommit.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_COMM_DREC.CommitAftDataRec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_DREC_COMM.DataRecAftCommit.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_DREC_COMM.ExitAfterCommit.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_EXIT_SPEC.ExitAftSpec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_PRAGMA_MALFORM.NspecExpr.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_PRAGMA_OPTSET.HugeNspecValue.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_PRAGMA_OPTSET.InvalidSpecSize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_PRAGMA_OPTSET.NegSpecSize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_PROTO_LEN.SpecNoId.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_SPEC_COMM.SpecAftCommit.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_SPEC_DREC.SpecAftDataRec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_SPEC_SPEC.SpecAftSpec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.NegativeBufSize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.NegativeNspec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.NegativeSpecSize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.SpecSizeVariations1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.SpecSizeVariations2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.CommitAfterDiscard.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.CommitWithZero.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.DataRecAftDiscard.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.DiscardAftCommit.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.DiscardAftDataRec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.DiscardAftDiscard.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.DiscardWithZero.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.ExitAftDiscard.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.NoSpecBuffer.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.SpecSizeVariations1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.SpecSizeVariations2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.SpecSizeVariations3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.SpeculateWithRandom.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.SpeculationCommit.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.SpeculationDiscard.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.SpeculationID.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.SpeculationWithZero.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.TwoSpecBuffers.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.negcommit.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.negspec.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.zerosize.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/stability/err.D_ATTR_MIN.MinAttributes.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/stack/err.D_STACK_PROTO.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/stack/err.D_STACK_SIZE.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/stack/err.D_USTACK_FRAMES.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/stack/err.D_USTACK_PROTO.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/stack/err.D_USTACK_STRSIZE.bad.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/stack/tst.default.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/stackdepth/tst.default.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/stop/tst.stop1.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/stop/tst.stop1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/stop/tst.stop2.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/stop/tst.stop2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/strlen/tst.strlen1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/struct/err.D_ADDROF_VAR.StructPointer.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/struct/err.D_DECL_COMBO.StructWithoutColon.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/struct/err.D_DECL_COMBO.StructWithoutColon1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/struct/err.D_DECL_INCOMPLETE.circular.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/struct/err.D_DECL_INCOMPLETE.order.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/struct/err.D_DECL_INCOMPLETE.order2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/struct/err.D_DECL_INCOMPLETE.recursive.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/struct/err.D_DECL_INCOMPLETE.simple.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/struct/err.D_DECL_VOIDOBJ.baddec.d#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 3 00:32:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5207416A50D; Sun, 3 Dec 2006 00:32:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0040116A50B for ; Sun, 3 Dec 2006 00:32:43 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83BDF43C9D for ; Sun, 3 Dec 2006 00:32:20 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB30WhJi084166 for ; Sun, 3 Dec 2006 00:32:43 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB30Whsf084163 for perforce@freebsd.org; Sun, 3 Dec 2006 00:32:43 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 3 Dec 2006 00:32:43 GMT Message-Id: <200612030032.kB30Whsf084163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 110895 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 00:32:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=110895 Change 110895 by mjacob@newisp on 2006/12/03 00:31:58 Sync changes with CVS. Affected files ... .. //depot/projects/newisp/dev/mpt/mpt.h#6 edit .. //depot/projects/newisp/dev/mpt/mpt_cam.c#15 edit Differences ... ==== //depot/projects/newisp/dev/mpt/mpt.h#6 (text+ko) ==== @@ -1193,7 +1193,6 @@ PageAddress, hdr, len, sleep_ok, timeout_ms)); } - /* mpt_debug.c functions */ void mpt_print_reply(void *vmsg); void mpt_print_db(uint32_t mb); ==== //depot/projects/newisp/dev/mpt/mpt_cam.c#15 (text+ko) ==== @@ -1879,12 +1879,14 @@ * Do a *short* print here if we're set to MPT_PRT_DEBUG */ if (mpt->verbose == MPT_PRT_DEBUG) { + U32 df; mpt_prt(mpt, "mpt_start: %s op 0x%x ", (mpt_req->Function == MPI_FUNCTION_SCSI_IO_REQUEST)? "SCSI_IO_REQUEST" : "SCSI_IO_PASSTHRU", mpt_req->CDB[0]); - if (mpt_req->Control != MPI_SCSIIO_CONTROL_NODATATRANSFER) { + df = mpt_req->Control & MPI_SCSIIO_CONTROL_DATADIRECTION_MASK; + if (df != MPI_SCSIIO_CONTROL_NODATATRANSFER) { mpt_prtc(mpt, "(%s %u byte%s ", - (mpt_req->Control == MPI_SCSIIO_CONTROL_READ)? + (df == MPI_SCSIIO_CONTROL_READ)? "read" : "write", csio->dxfer_len, (csio->dxfer_len == 1)? ")" : "s)"); } @@ -2862,7 +2864,8 @@ tgt = ccb->ccb_h.target_id; lun = ccb->ccb_h.target_lun; - if (raid_passthru && ccb->ccb_h.func_code != XPT_PATH_INQ && + if (raid_passthru && + ccb->ccb_h.func_code != XPT_PATH_INQ && ccb->ccb_h.func_code != XPT_RESET_BUS && ccb->ccb_h.func_code != XPT_RESET_DEV) { CAMLOCK_2_MPTLOCK(mpt); @@ -2908,11 +2911,9 @@ break; } case XPT_RESET_DEV: - xpt_print_path(ccb->ccb_h.path); printf("reset %s\n", ccb->ccb_h.func_code == XPT_RESET_BUS? "bus" : "device"); - CAMLOCK_2_MPTLOCK(mpt); (void) mpt_bus_reset(mpt, tgt, lun, FALSE); MPTLOCK_2_CAMLOCK(mpt); @@ -3330,19 +3331,28 @@ return (rv); } MPTLOCK_2_CAMLOCK(mpt); + mpt_lprt(mpt, MPT_PRT_DEBUG, + "mpt_get_spi_settings[%d]: current NP %x Info %x\n", tgt, + tmp.NegotiatedParameters, tmp.Information); dval |= (tmp.NegotiatedParameters & MPI_SCSIDEVPAGE0_NP_WIDE) ? DP_WIDE : DP_NARROW; dval |= (mpt->mpt_disc_enable & (1 << tgt)) ? DP_DISC_ENABLE : DP_DISC_DISABL; dval |= (mpt->mpt_tag_enable & (1 << tgt)) ? DP_TQING_ENABLE : DP_TQING_DISABL; - oval = (tmp.NegotiatedParameters >> 16) & 0xff; - pval = (tmp.NegotiatedParameters >> 8) & 0xff; + oval = tmp.NegotiatedParameters; + oval &= MPI_SCSIDEVPAGE0_NP_NEG_SYNC_OFFSET_MASK; + oval >>= MPI_SCSIDEVPAGE0_NP_SHIFT_SYNC_OFFSET; + pval = tmp.NegotiatedParameters; + pval &= MPI_SCSIDEVPAGE0_NP_NEG_SYNC_PERIOD_MASK; + pval >>= MPI_SCSIDEVPAGE0_NP_SHIFT_SYNC_PERIOD; mpt->mpt_dev_page0[tgt] = tmp; } else { dval = DP_WIDE|DP_DISC_ENABLE|DP_TQING_ENABLE; - oval = (mpt->mpt_port_page0.Capabilities >> 16) & 0xff; - pval = (mpt->mpt_port_page0.Capabilities >> 8) & 0xff; + oval = mpt->mpt_port_page0.Capabilities; + oval = MPI_SCSIPORTPAGE0_CAP_GET_MAX_SYNC_OFFSET(oval); + pval = mpt->mpt_port_page0.Capabilities; + pval = MPI_SCSIPORTPAGE0_CAP_GET_MIN_SYNC_PERIOD(pval); } spi->valid = 0; @@ -3376,9 +3386,10 @@ scsi->valid = 0; } mpt_lprt(mpt, MPT_PRT_NEGOTIATION, - "mpt_get_spi_settings[%d]:%s per=%x off=%d spv=%x scv=%x\n", + "mpt_get_spi_settings[%d]:%s per=%x off=%d SPF=%x SPV=%x SCF=%x SCV" + "=%x bw=%x\n", tgt, IS_CURRENT_SETTINGS(cts)? "ACTIVE" : "NVRAM ", pval, oval, - spi->valid, scsi->valid); + spi->flags, spi->valid, scsi->flags, scsi->valid, spi->bus_width); return (0); } From owner-p4-projects@FreeBSD.ORG Sun Dec 3 00:39:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 053E716A416; Sun, 3 Dec 2006 00:39:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D542F16A412 for ; Sun, 3 Dec 2006 00:39:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39FB443CA8 for ; Sun, 3 Dec 2006 00:39:30 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB30drTY084742 for ; Sun, 3 Dec 2006 00:39:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB30drG4084739 for perforce@freebsd.org; Sun, 3 Dec 2006 00:39:53 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 00:39:53 GMT Message-Id: <200612030039.kB30drG4084739@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110896 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 00:39:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=110896 Change 110896 by jb@jb_freebsd8 on 2006/12/03 00:39:24 Add a missing function prototype definition. Affected files ... .. //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/cvt/alist.h#3 edit Differences ... ==== //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/cvt/alist.h#3 (text) ==== @@ -48,6 +48,7 @@ int alist_find(alist_t *, void *, void **); int alist_iter(alist_t *, int (*)(void *, void *, void *), void *); void alist_stats(alist_t *, int); +int alist_dump(alist_t *, int (*)(void *, void *)); #ifdef __cplusplus } From owner-p4-projects@FreeBSD.ORG Sun Dec 3 00:42:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C79E16A412; Sun, 3 Dec 2006 00:42:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 27E4A16A407 for ; Sun, 3 Dec 2006 00:42:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D07B43CA5 for ; Sun, 3 Dec 2006 00:42:34 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB30gvEo085908 for ; Sun, 3 Dec 2006 00:42:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB30gvtb085904 for perforce@freebsd.org; Sun, 3 Dec 2006 00:42:57 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 00:42:57 GMT Message-Id: <200612030042.kB30gvtb085904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110897 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 00:42:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=110897 Change 110897 by jb@jb_freebsd8 on 2006/12/03 00:42:02 FreeBSD has elf.h, not sys/machelf.h Affected files ... .. //depot/projects/opensolaris/contrib/opensolaris/cmd/sgs/include/alist.h#3 edit Differences ... ==== //depot/projects/opensolaris/contrib/opensolaris/cmd/sgs/include/alist.h#3 (text) ==== @@ -39,7 +39,11 @@ #endif #include +#if defined(sun) #include +#else +#include +#endif #define ALO_DATA (sizeof (Alist) - sizeof (void *)) From owner-p4-projects@FreeBSD.ORG Sun Dec 3 00:46:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18C2616A416; Sun, 3 Dec 2006 00:46:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C3AB916A40F for ; Sun, 3 Dec 2006 00:46:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2EEB643CA7 for ; Sun, 3 Dec 2006 00:45:39 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB30k2fJ086202 for ; Sun, 3 Dec 2006 00:46:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB30k1qr086199 for perforce@freebsd.org; Sun, 3 Dec 2006 00:46:01 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 00:46:01 GMT Message-Id: <200612030046.kB30k1qr086199@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110898 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 00:46:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=110898 Change 110898 by jb@jb_freebsd8 on 2006/12/03 00:45:55 Add Solaris compatibility definitions. Affected files ... .. //depot/projects/dtrace/src/include/stdlib.h#4 edit Differences ... ==== //depot/projects/dtrace/src/include/stdlib.h#4 (text+ko) ==== @@ -282,6 +282,15 @@ extern char *suboptarg; /* getsubopt(3) external variable */ #endif /* __BSD_VISIBLE */ + +/* + * Solaris compatibility definitions. + */ +#ifdef _SOLARIS_C_SOURCE + +#define getpname() getprogname() + +#endif /* _SOLARIS_C_SOURCE */ __END_DECLS #endif /* !_STDLIB_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Dec 3 00:49:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5691A16A415; Sun, 3 Dec 2006 00:49:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 33CF816A403 for ; Sun, 3 Dec 2006 00:49:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9159143C9D for ; Sun, 3 Dec 2006 00:48:43 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB30n6S7094377 for ; Sun, 3 Dec 2006 00:49:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB30n6Ve094374 for perforce@freebsd.org; Sun, 3 Dec 2006 00:49:06 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 00:49:06 GMT Message-Id: <200612030049.kB30n6Ve094374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110899 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 00:49:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=110899 Change 110899 by jb@jb_freebsd8 on 2006/12/03 00:48:18 #ifdef a Solaris-only header include Affected files ... .. //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/dump/dump.c#3 edit Differences ... ==== //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/dump/dump.c#3 (text) ==== @@ -27,7 +27,9 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include +# if defined(sun) #include +#endif #include #include From owner-p4-projects@FreeBSD.ORG Sun Dec 3 00:51:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E227716A412; Sun, 3 Dec 2006 00:51:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8A1AE16A403 for ; Sun, 3 Dec 2006 00:51:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0885543C9D for ; Sun, 3 Dec 2006 00:50:47 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB30pAGu094850 for ; Sun, 3 Dec 2006 00:51:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB30pA7R094842 for perforce@freebsd.org; Sun, 3 Dec 2006 00:51:10 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 00:51:10 GMT Message-Id: <200612030051.kB30pA7R094842@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110900 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 00:51:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=110900 Change 110900 by jb@jb_freebsd8 on 2006/12/03 00:50:34 On FreeBSD we have less control over our source base. Failing in a CTF tool shouldn't make us fail a build, so exit with no error after outputting the whinge-message. Affected files ... .. //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/cvt/util.c#3 edit Differences ... ==== //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/cvt/util.c#3 (text) ==== @@ -148,7 +148,17 @@ if (getenv("CTF_ABORT_ON_TERMINATE") != NULL) abort(); +#if defined(__FreeBSD__) +/* + * For the time being just output the termination message, but don't + * return an exit status that would cause the build to fail. We need + * to get as much stuff built as possible before going back and + * figuring out what is wrong with certain files. + */ + exit(0); +#else exit(1); +#endif } /*PRINTFLIKE1*/ @@ -161,7 +171,11 @@ whine("ERROR", format, ap); va_end(ap); +#if defined(sun) abort(); +#else + exit(0); +#endif } /*PRINTFLIKE1*/ From owner-p4-projects@FreeBSD.ORG Sun Dec 3 01:04:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E920216A416; Sun, 3 Dec 2006 01:04:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A2E1016A407 for ; Sun, 3 Dec 2006 01:04:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE6B343CA2 for ; Sun, 3 Dec 2006 01:04:04 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB314S1O098503 for ; Sun, 3 Dec 2006 01:04:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB314Sdr098499 for perforce@freebsd.org; Sun, 3 Dec 2006 01:04:28 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 01:04:28 GMT Message-Id: <200612030104.kB314Sdr098499@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 01:04:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=110901 Change 110901 by jb@jb_freebsd8 on 2006/12/03 01:03:46 Add a Solaris compatibility header which they often include to get MIN() and MAX() which we have in sys/param.h Affected files ... .. //depot/projects/dtrace/src/sys/sys/sysmacros.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 3 01:07:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA69816A412; Sun, 3 Dec 2006 01:07:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6A30516A415 for ; Sun, 3 Dec 2006 01:07:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id CAB8C43CA3 for ; Sun, 3 Dec 2006 01:07:09 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB317WoR098705 for ; Sun, 3 Dec 2006 01:07:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB317WhL098702 for perforce@freebsd.org; Sun, 3 Dec 2006 01:07:32 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 01:07:32 GMT Message-Id: <200612030107.kB317WhL098702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110902 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 01:07:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=110902 Change 110902 by jb@jb_freebsd8 on 2006/12/03 01:07:02 On second thoughts, it doesn't hurt to have a compatibility header. The idea with the compatibility definitions is that other source code written for OpenSolaris would compile on FreeBSD without having to do the GNU/configure madness. Affected files ... .. //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/dump/dump.c#4 edit Differences ... ==== //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/dump/dump.c#4 (text) ==== @@ -27,9 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include -# if defined(sun) #include -#endif #include #include From owner-p4-projects@FreeBSD.ORG Sun Dec 3 01:08:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E37216A415; Sun, 3 Dec 2006 01:08:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3CD7016A403 for ; Sun, 3 Dec 2006 01:08:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CF1643C9D for ; Sun, 3 Dec 2006 01:08:11 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB318YBg098730 for ; Sun, 3 Dec 2006 01:08:34 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB318Y7I098727 for perforce@freebsd.org; Sun, 3 Dec 2006 01:08:34 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 01:08:34 GMT Message-Id: <200612030108.kB318Y7I098727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110903 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 01:08:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=110903 Change 110903 by jb@jb_freebsd8 on 2006/12/03 01:08:18 IFprojects_opensolaris. (loop back) Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/alist.h#4 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.h#4 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/util.c#8 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/dump/dump.c#4 integrate Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/alist.h#4 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.h#4 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/util.c#8 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/dump/dump.c#4 (text) ==== @@ -769,9 +769,6 @@ static int print_usage(FILE *fp, int verbose) { -#if !defined(sun) -#define getpname getprogname -#endif (void) fprintf(fp, "Usage: %s [-dfhlsSt] [-u file] file\n", getpname()); if (verbose) { From owner-p4-projects@FreeBSD.ORG Sun Dec 3 01:14:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FEE716A417; Sun, 3 Dec 2006 01:14:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 78A0416A415 for ; Sun, 3 Dec 2006 01:14:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB67643CA2 for ; Sun, 3 Dec 2006 01:14:19 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB31EhQa000213 for ; Sun, 3 Dec 2006 01:14:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB31EhNN000206 for perforce@freebsd.org; Sun, 3 Dec 2006 01:14:43 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 01:14:43 GMT Message-Id: <200612030114.kB31EhNN000206@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110904 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 01:14:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=110904 Change 110904 by jb@jb_freebsd8 on 2006/12/03 01:13:49 Add a macro. Affected files ... .. //depot/projects/dtrace/src/sys/sys/sysmacros.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/sysmacros.h#2 (text+ko) ==== @@ -33,4 +33,6 @@ #include +#define P2ROUNDUP(x, align) (-(-(x) & -(align))) + #endif /* _SYS_SYSMACROS_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Dec 3 01:14:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 165DD16A55E; Sun, 3 Dec 2006 01:14:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CF43516A547 for ; Sun, 3 Dec 2006 01:14:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27B0943CA2 for ; Sun, 3 Dec 2006 01:14:20 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB31EhFw000219 for ; Sun, 3 Dec 2006 01:14:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB31EhRI000216 for perforce@freebsd.org; Sun, 3 Dec 2006 01:14:43 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 01:14:43 GMT Message-Id: <200612030114.kB31EhRI000216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110905 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 01:14:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=110905 Change 110905 by jb@jb_freebsd8 on 2006/12/03 01:14:25 Reset these to match OpenSolaris sources. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_buf.c#4 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#5 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_buf.c#4 (text) ==== @@ -39,9 +39,7 @@ * to check for errors and then perform a single check before using the buffer. */ -#if defined(sun) #include -#endif #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#5 (text) ==== @@ -27,11 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include -#if defined(sun) #include -#else -#define P2ROUNDUP(x, align) (-(-(x) & -(align))) -#endif #include #include From owner-p4-projects@FreeBSD.ORG Sun Dec 3 01:15:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 089DF16A415; Sun, 3 Dec 2006 01:15:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CFAE316A407 for ; Sun, 3 Dec 2006 01:15:48 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CFA543CA2 for ; Sun, 3 Dec 2006 01:15:25 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB31FmuB000319 for ; Sun, 3 Dec 2006 01:15:48 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB31FjEQ000315 for perforce@freebsd.org; Sun, 3 Dec 2006 01:15:45 GMT (envelope-from sam@freebsd.org) Date: Sun, 3 Dec 2006 01:15:45 GMT Message-Id: <200612030115.kB31FjEQ000315@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 110906 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 01:15:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=110906 Change 110906 by sam@sam_ebb on 2006/12/03 01:14:46 checkpoint changes to kobj'ify crypto driver api's and to support specifying a device or class of devices for use Affected files ... .. //depot/projects/crypto/sys/conf/files#2 edit .. //depot/projects/crypto/sys/conf/kmod.mk#2 edit .. //depot/projects/crypto/sys/crypto/via/padlock.c#2 edit .. //depot/projects/crypto/sys/dev/hifn/hifn7751.c#2 edit .. //depot/projects/crypto/sys/dev/safe/safe.c#2 edit .. //depot/projects/crypto/sys/dev/ubsec/ubsec.c#2 edit .. //depot/projects/crypto/sys/geom/eli/g_eli.c#2 edit .. //depot/projects/crypto/sys/geom/eli/g_eli_crypto.c#2 edit .. //depot/projects/crypto/sys/modules/crypto/Makefile#2 edit .. //depot/projects/crypto/sys/modules/cryptodev/Makefile#2 edit .. //depot/projects/crypto/sys/modules/hifn/Makefile#2 edit .. //depot/projects/crypto/sys/modules/padlock/Makefile#2 edit .. //depot/projects/crypto/sys/modules/safe/Makefile#2 edit .. //depot/projects/crypto/sys/modules/ubsec/Makefile#2 edit .. //depot/projects/crypto/sys/netipsec/ipsec.c#2 edit .. //depot/projects/crypto/sys/opencrypto/crypto.c#2 edit .. //depot/projects/crypto/sys/opencrypto/crypto_if.m#2 delete .. //depot/projects/crypto/sys/opencrypto/cryptodev.c#2 edit .. //depot/projects/crypto/sys/opencrypto/cryptodev.h#2 edit .. //depot/projects/crypto/sys/opencrypto/cryptodev_if.m#1 add .. //depot/projects/crypto/sys/opencrypto/cryptosoft.c#2 edit .. //depot/projects/crypto/sys/opencrypto/cryptosoft.h#2 edit .. //depot/projects/crypto/tools/tools/crypto/cryptokeytest.c#2 edit .. //depot/projects/crypto/tools/tools/crypto/cryptotest.c#2 edit Differences ... ==== //depot/projects/crypto/sys/conf/files#2 (text+ko) ==== @@ -1901,6 +1901,7 @@ opencrypto/criov.c optional crypto opencrypto/crypto.c optional crypto opencrypto/cryptodev.c optional cryptodev +opencrypto/cryptodev_if.m optional crypto opencrypto/cryptosoft.c optional crypto opencrypto/deflate.c optional crypto opencrypto/rmd160.c optional crypto | ipsec ==== //depot/projects/crypto/sys/conf/kmod.mk#2 (text+ko) ==== @@ -327,7 +327,7 @@ dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \ dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \ kern/bus_if.m kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ - libkern/iconv_converter_if.m opencrypto/crypto_if.m \ + libkern/iconv_converter_if.m opencrypto/cryptodev_if.m \ pc98/pc98/canbus_if.m pci/agp_if.m .for _srcsrc in ${MFILES} ==== //depot/projects/crypto/sys/crypto/via/padlock.c#2 (text+ko) ==== @@ -46,6 +46,10 @@ #include +#include +#include +#include "cryptodev_if.h" + /* * Technical documentation about the PadLock engine can be found here: * @@ -59,26 +63,29 @@ struct mtx sc_sessions_mtx; }; -static struct padlock_softc *padlock_sc; +static int padlock_newsession(device_t, uint32_t *sidp, struct cryptoini *cri); +static int padlock_freesession(device_t, uint64_t tid); +static int padlock_process(device_t, struct cryptop *crp, int hint __unused); -static int padlock_newsession(void *arg __unused, uint32_t *sidp, - struct cryptoini *cri); -static int padlock_freesession(void *arg __unused, uint64_t tid); -static int padlock_process(void *arg __unused, struct cryptop *crp, - int hint __unused); +MALLOC_DEFINE(M_PADLOCK, "padlock_data", "PadLock Data"); -MALLOC_DEFINE(M_PADLOCK, "padlock_data", "PadLock Data"); +static void +padlock_identify(device_t *dev, device_t parent) +{ + /* NB: order 10 is so we get attached after h/w devices */ + if (BUS_ADD_CHILD(parent, 10, "padlock", -1) == 0) + panic("padlock: could not attach"); +} static int -padlock_init(void) +padlock_probe(device_t dev) { - struct padlock_softc *sc; char capp[256]; #if defined(__i386__) && !defined(PC98) /* If there is no AES support, we has nothing to do here. */ if (!(via_feature_xcrypt & VIA_HAS_AES)) { - printf("PadLock: No ACE support.\n"); + device_printf(dev, "No ACE support.\n"); return (EINVAL); } strlcpy(capp, "AES-CBC", sizeof(capp)); @@ -97,63 +104,53 @@ if (via_feature_xcrypt & VIA_HAS_MM) strlcat(capp, ",RSA", sizeof(capp)); #endif - printf("PadLock: HW support loaded for %s.\n", capp); + device_set_desc(dev, capp); #else return (EINVAL); #endif + return (0); +} + +static int +padlock_attach(device_t dev) +{ + struct padlock_softc *sc = device_get_softc(dev); - padlock_sc = sc = malloc(sizeof(*padlock_sc), M_PADLOCK, - M_WAITOK | M_ZERO); TAILQ_INIT(&sc->sc_sessions); sc->sc_sid = 1; - sc->sc_cid = crypto_get_driverid(0); + sc->sc_cid = crypto_get_driverid(dev, CRYPTOCAP_F_HARDWARE); if (sc->sc_cid < 0) { - printf("PadLock: Could not get crypto driver id.\n"); - free(padlock_sc, M_PADLOCK); - padlock_sc = NULL; + device_printf(dev, "Could not get crypto driver id.\n"); return (ENOMEM); } mtx_init(&sc->sc_sessions_mtx, "padlock_mtx", NULL, MTX_DEF); - crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0, padlock_newsession, - padlock_freesession, padlock_process, NULL); - crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0, padlock_newsession, - padlock_freesession, padlock_process, NULL); - crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0, padlock_newsession, - padlock_freesession, padlock_process, NULL); - crypto_register(sc->sc_cid, CRYPTO_RIPEMD160_HMAC, 0, 0, - padlock_newsession, padlock_freesession, padlock_process, NULL); - crypto_register(sc->sc_cid, CRYPTO_SHA2_256_HMAC, 0, 0, - padlock_newsession, padlock_freesession, padlock_process, NULL); - crypto_register(sc->sc_cid, CRYPTO_SHA2_384_HMAC, 0, 0, - padlock_newsession, padlock_freesession, padlock_process, NULL); - crypto_register(sc->sc_cid, CRYPTO_SHA2_512_HMAC, 0, 0, - padlock_newsession, padlock_freesession, padlock_process, NULL); + crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_RIPEMD160_HMAC, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_SHA2_256_HMAC, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_SHA2_384_HMAC, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_SHA2_512_HMAC, 0, 0); return (0); } static int -padlock_destroy(void) +padlock_detach(device_t dev) { - struct padlock_softc *sc = padlock_sc; + struct padlock_softc *sc = device_get_softc(dev); struct padlock_session *ses; - u_int active = 0; - if (sc == NULL) - return (0); mtx_lock(&sc->sc_sessions_mtx); TAILQ_FOREACH(ses, &sc->sc_sessions, ses_next) { - if (ses->ses_used) - active++; + if (ses->ses_used) { + mtx_unlock(&sc->sc_sessions_mtx); + device_printf(dev, + "Cannot detach, sessions still active.\n"); + return (EBUSY); + } } - if (active > 0) { - mtx_unlock(&sc->sc_sessions_mtx); - printf("PadLock: Cannot destroy, %u sessions active.\n", - active); - return (EBUSY); - } - padlock_sc = NULL; for (ses = TAILQ_FIRST(&sc->sc_sessions); ses != NULL; ses = TAILQ_FIRST(&sc->sc_sessions)) { TAILQ_REMOVE(&sc->sc_sessions, ses, ses_next); @@ -161,19 +158,18 @@ } mtx_destroy(&sc->sc_sessions_mtx); crypto_unregister_all(sc->sc_cid); - free(sc, M_PADLOCK); return (0); } static int -padlock_newsession(void *arg __unused, uint32_t *sidp, struct cryptoini *cri) +padlock_newsession(device_t dev, uint32_t *sidp, struct cryptoini *cri) { - struct padlock_softc *sc = padlock_sc; + struct padlock_softc *sc = device_get_softc(dev); struct padlock_session *ses = NULL; struct cryptoini *encini, *macini; int error; - if (sc == NULL || sidp == NULL || cri == NULL) + if (sidp == NULL || cri == NULL) return (EINVAL); encini = macini = NULL; @@ -255,14 +251,12 @@ } static int -padlock_freesession(void *arg __unused, uint64_t tid) +padlock_freesession(device_t dev, uint64_t tid) { - struct padlock_softc *sc = padlock_sc; + struct padlock_softc *sc = device_get_softc(dev); struct padlock_session *ses; uint32_t sid = ((uint32_t)tid) & 0xffffffff; - if (sc == NULL) - return (EINVAL); mtx_lock(&sc->sc_sessions_mtx); TAILQ_FOREACH(ses, &sc->sc_sessions, ses_next) { if (ses->ses_id == sid) @@ -282,9 +276,9 @@ } static int -padlock_process(void *arg __unused, struct cryptop *crp, int hint __unused) +padlock_process(device_t dev, struct cryptop *crp, int hint __unused) { - struct padlock_softc *sc = padlock_sc; + struct padlock_softc *sc = device_get_softc(dev); struct padlock_session *ses = NULL; struct cryptodesc *crd, *enccrd, *maccrd; int error = 0; @@ -373,28 +367,27 @@ return (error); } -static int -padlock_modevent(module_t mod, int type, void *unused __unused) -{ - int error; +static device_method_t padlock_methods[] = { + DEVMETHOD(device_identify, padlock_identify), + DEVMETHOD(device_probe, padlock_probe), + DEVMETHOD(device_attach, padlock_attach), + DEVMETHOD(device_detach, padlock_detach), + + DEVMETHOD(cryptodev_newsession, padlock_newsession), + DEVMETHOD(cryptodev_freesession,padlock_freesession), + DEVMETHOD(cryptodev_process, padlock_process), - error = EOPNOTSUPP; - switch (type) { - case MOD_LOAD: - error = padlock_init(); - break; - case MOD_UNLOAD: - error = padlock_destroy(); - break; - } - return (error); -} + {0, 0}, +}; -static moduledata_t padlock_mod = { +static driver_t padlock_driver = { "padlock", - padlock_modevent, - 0 + padlock_methods, + sizeof(struct padlock_softc), }; -DECLARE_MODULE(padlock, padlock_mod, SI_SUB_DRIVERS, SI_ORDER_ANY); +static devclass_t padlock_devclass; + +/* XXX where to attach */ +DRIVER_MODULE(padlock, nexus, padlock_driver, padlock_devclass, 0, 0); MODULE_VERSION(padlock, 1); MODULE_DEPEND(padlock, crypto, 1, 1, 1); ==== //depot/projects/crypto/sys/dev/hifn/hifn7751.c#2 (text+ko) ==== @@ -70,6 +70,9 @@ #include #include +#include + +#include "cryptodev_if.h" #include #include @@ -90,6 +93,10 @@ static int hifn_resume(device_t); static void hifn_shutdown(device_t); +static int hifn_newsession(device_t, u_int32_t *, struct cryptoini *); +static int hifn_freesession(device_t, u_int64_t); +static int hifn_process(device_t, struct cryptop *, int); + static device_method_t hifn_methods[] = { /* Device interface */ DEVMETHOD(device_probe, hifn_probe), @@ -103,6 +110,11 @@ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), + /* crypto device methods */ + DEVMETHOD(cryptodev_newsession, hifn_newsession), + DEVMETHOD(cryptodev_freesession,hifn_freesession), + DEVMETHOD(cryptodev_process, hifn_process), + { 0, 0 } }; static driver_t hifn_driver = { @@ -132,9 +144,6 @@ static void hifn_intr(void *); static u_int hifn_write_command(struct hifn_command *, u_int8_t *); static u_int32_t hifn_next_signature(u_int32_t a, u_int cnt); -static int hifn_newsession(void *, u_int32_t *, struct cryptoini *); -static int hifn_freesession(void *, u_int64_t); -static int hifn_process(void *, struct cryptop *, int); static void hifn_callback(struct hifn_softc *, struct hifn_command *, u_int8_t *); static int hifn_crypto(struct hifn_softc *, struct hifn_command *, struct cryptop *, int); static int hifn_readramaddr(struct hifn_softc *, int, u_int8_t *); @@ -559,7 +568,7 @@ 2 + 2*((sc->sc_pllconfig & HIFN_PLL_ND) >> 11)); printf("\n"); - sc->sc_cid = crypto_get_driverid(0); + sc->sc_cid = crypto_get_driverid(dev, CRYPTOCAP_F_HARDWARE); if (sc->sc_cid < 0) { device_printf(dev, "could not get crypto driver id\n"); goto fail_intr; @@ -571,26 +580,17 @@ switch (ena) { case HIFN_PUSTAT_ENA_2: - crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0, - hifn_newsession, hifn_freesession, hifn_process, sc); - crypto_register(sc->sc_cid, CRYPTO_ARC4, 0, 0, - hifn_newsession, hifn_freesession, hifn_process, sc); + crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_ARC4, 0, 0); if (sc->sc_flags & HIFN_HAS_AES) - crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0, - hifn_newsession, hifn_freesession, - hifn_process, sc); + crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0); /*FALLTHROUGH*/ case HIFN_PUSTAT_ENA_1: - crypto_register(sc->sc_cid, CRYPTO_MD5, 0, 0, - hifn_newsession, hifn_freesession, hifn_process, sc); - crypto_register(sc->sc_cid, CRYPTO_SHA1, 0, 0, - hifn_newsession, hifn_freesession, hifn_process, sc); - crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0, - hifn_newsession, hifn_freesession, hifn_process, sc); - crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0, - hifn_newsession, hifn_freesession, hifn_process, sc); - crypto_register(sc->sc_cid, CRYPTO_DES_CBC, 0, 0, - hifn_newsession, hifn_freesession, hifn_process, sc); + crypto_register(sc->sc_cid, CRYPTO_MD5, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_SHA1, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_DES_CBC, 0, 0); break; } @@ -2292,10 +2292,10 @@ * id on successful allocation. */ static int -hifn_newsession(void *arg, u_int32_t *sidp, struct cryptoini *cri) +hifn_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri) { + struct hifn_softc *sc = device_get_softc(dev); struct cryptoini *c; - struct hifn_softc *sc = arg; int mac = 0, cry = 0, sesn; struct hifn_session *ses = NULL; @@ -2389,9 +2389,9 @@ * XXX to blow away any keys already stored there. */ static int -hifn_freesession(void *arg, u_int64_t tid) +hifn_freesession(device_t dev, u_int64_t tid) { - struct hifn_softc *sc = arg; + struct hifn_softc *sc = device_get_softc(dev); int session; u_int32_t sid = CRYPTO_SESID2LID(tid); @@ -2408,9 +2408,9 @@ } static int -hifn_process(void *arg, struct cryptop *crp, int hint) +hifn_process(device_t dev, struct cryptop *crp, int hint) { - struct hifn_softc *sc = arg; + struct hifn_softc *sc = device_get_softc(dev); struct hifn_command *cmd = NULL; int session, err, ivlen; struct cryptodesc *crd1, *crd2, *maccrd, *enccrd; ==== //depot/projects/crypto/sys/dev/safe/safe.c#2 (text+ko) ==== @@ -59,6 +59,9 @@ #include #include #include +#include + +#include "cryptodev_if.h" #include #include @@ -83,6 +86,10 @@ static int safe_resume(device_t); static void safe_shutdown(device_t); +static int safe_newsession(device_t, u_int32_t *, struct cryptoini *); +static int safe_freesession(device_t, u_int64_t); +static int safe_process(device_t, struct cryptop *, int); + static device_method_t safe_methods[] = { /* Device interface */ DEVMETHOD(device_probe, safe_probe), @@ -96,6 +103,11 @@ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), + /* crypto device methods */ + DEVMETHOD(cryptodev_newsession, safe_newsession), + DEVMETHOD(cryptodev_freesession,safe_freesession), + DEVMETHOD(cryptodev_process, safe_process), + { 0, 0 } }; static driver_t safe_driver = { @@ -112,9 +124,6 @@ #endif static void safe_intr(void *); -static int safe_newsession(void *, u_int32_t *, struct cryptoini *); -static int safe_freesession(void *, u_int64_t); -static int safe_process(void *, struct cryptop *, int); static void safe_callback(struct safe_softc *, struct safe_ringentry *); static void safe_feed(struct safe_softc *, struct safe_ringentry *); static void safe_mcopy(struct mbuf *, struct mbuf *, u_int); @@ -270,7 +279,7 @@ goto bad2; } - sc->sc_cid = crypto_get_driverid(0); + sc->sc_cid = crypto_get_driverid(dev, CRYPTOCAP_F_HARDWARE); if (sc->sc_cid < 0) { device_printf(dev, "could not get crypto driver id\n"); goto bad3; @@ -388,39 +397,30 @@ #if 0 printf(" key"); sc->sc_flags |= SAFE_FLAGS_KEY; - crypto_kregister(sc->sc_cid, CRK_MOD_EXP, 0, - safe_kprocess, sc); - crypto_kregister(sc->sc_cid, CRK_MOD_EXP_CRT, 0, - safe_kprocess, sc); + crypto_kregister(sc->sc_cid, CRK_MOD_EXP, 0); + crypto_kregister(sc->sc_cid, CRK_MOD_EXP_CRT, 0); #endif } if (devinfo & SAFE_DEVINFO_DES) { printf(" des/3des"); - crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0, - safe_newsession, safe_freesession, safe_process, sc); - crypto_register(sc->sc_cid, CRYPTO_DES_CBC, 0, 0, - safe_newsession, safe_freesession, safe_process, sc); + crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_DES_CBC, 0, 0); } if (devinfo & SAFE_DEVINFO_AES) { printf(" aes"); - crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0, - safe_newsession, safe_freesession, safe_process, sc); + crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0); } if (devinfo & SAFE_DEVINFO_MD5) { printf(" md5"); - crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0, - safe_newsession, safe_freesession, safe_process, sc); + crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0); } if (devinfo & SAFE_DEVINFO_SHA1) { printf(" sha1"); - crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0, - safe_newsession, safe_freesession, safe_process, sc); + crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0); } printf(" null"); - crypto_register(sc->sc_cid, CRYPTO_NULL_CBC, 0, 0, - safe_newsession, safe_freesession, safe_process, sc); - crypto_register(sc->sc_cid, CRYPTO_NULL_HMAC, 0, 0, - safe_newsession, safe_freesession, safe_process, sc); + crypto_register(sc->sc_cid, CRYPTO_NULL_CBC, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_NULL_HMAC, 0, 0); /* XXX other supported algorithms */ printf("\n"); @@ -710,10 +710,10 @@ * id on successful allocation. */ static int -safe_newsession(void *arg, u_int32_t *sidp, struct cryptoini *cri) +safe_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri) { + struct safe_softc *sc = device_get_softc(dev); struct cryptoini *c, *encini = NULL, *macini = NULL; - struct safe_softc *sc = arg; struct safe_session *ses = NULL; int sesn; @@ -826,9 +826,9 @@ * Deallocate a session. */ static int -safe_freesession(void *arg, u_int64_t tid) +safe_freesession(device_t dev, u_int64_t tid) { - struct safe_softc *sc = arg; + struct safe_softc *sc = device_get_softc(dev); int session, ret; u_int32_t sid = ((u_int32_t) tid) & 0xffffffff; @@ -859,10 +859,10 @@ } static int -safe_process(void *arg, struct cryptop *crp, int hint) +safe_process(device_t dev, struct cryptop *crp, int hint) { + struct safe_softc *sc = device_get_softc(dev); int err = 0, i, nicealign, uniform; - struct safe_softc *sc = arg; struct cryptodesc *crd1, *crd2, *maccrd, *enccrd; int bypass, oplen, ivsize; caddr_t iv; ==== //depot/projects/crypto/sys/dev/ubsec/ubsec.c#2 (text+ko) ==== @@ -73,6 +73,9 @@ #include #include #include +#include + +#include "cryptodev_if.h" #include #include @@ -106,6 +109,11 @@ static int ubsec_resume(device_t); static void ubsec_shutdown(device_t); +static int ubsec_newsession(device_t, u_int32_t *, struct cryptoini *); +static int ubsec_freesession(device_t, u_int64_t); +static int ubsec_process(device_t, struct cryptop *, int); +static int ubsec_kprocess(device_t, struct cryptkop *, int); + static device_method_t ubsec_methods[] = { /* Device interface */ DEVMETHOD(device_probe, ubsec_probe), @@ -119,6 +127,12 @@ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), + /* crypto device methods */ + DEVMETHOD(cryptodev_newsession, ubsec_newsession), + DEVMETHOD(cryptodev_freesession,ubsec_freesession), + DEVMETHOD(cryptodev_process, ubsec_process), + DEVMETHOD(cryptodev_kprocess, ubsec_kprocess), + { 0, 0 } }; static driver_t ubsec_driver = { @@ -135,9 +149,6 @@ #endif static void ubsec_intr(void *); -static int ubsec_newsession(void *, u_int32_t *, struct cryptoini *); -static int ubsec_freesession(void *, u_int64_t); -static int ubsec_process(void *, struct cryptop *, int); static void ubsec_callback(struct ubsec_softc *, struct ubsec_q *); static void ubsec_feed(struct ubsec_softc *); static void ubsec_mcopy(struct mbuf *, struct mbuf *, int, int); @@ -158,7 +169,6 @@ static int ubsec_free_q(struct ubsec_softc *sc, struct ubsec_q *q); -static int ubsec_kprocess(void*, struct cryptkop *, int); static int ubsec_kprocess_modexp_hw(struct ubsec_softc *, struct cryptkop *, int); static int ubsec_kprocess_modexp_sw(struct ubsec_softc *, struct cryptkop *, int); static int ubsec_kprocess_rsapriv(struct ubsec_softc *, struct cryptkop *, int); @@ -350,7 +360,7 @@ goto bad2; } - sc->sc_cid = crypto_get_driverid(0); + sc->sc_cid = crypto_get_driverid(dev, CRYPTOCAP_F_HARDWARE); if (sc->sc_cid < 0) { device_printf(dev, "could not get crypto driver id\n"); goto bad3; @@ -405,14 +415,10 @@ device_printf(sc->sc_dev, "%s\n", ubsec_partname(sc)); - crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0, - ubsec_newsession, ubsec_freesession, ubsec_process, sc); - crypto_register(sc->sc_cid, CRYPTO_DES_CBC, 0, 0, - ubsec_newsession, ubsec_freesession, ubsec_process, sc); - crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0, - ubsec_newsession, ubsec_freesession, ubsec_process, sc); - crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0, - ubsec_newsession, ubsec_freesession, ubsec_process, sc); + crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_DES_CBC, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0); + crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0); /* * Reset Broadcom chip @@ -475,11 +481,9 @@ if (sc->sc_flags & UBS_FLAGS_KEY) { sc->sc_statmask |= BS_STAT_MCR2_DONE; - crypto_kregister(sc->sc_cid, CRK_MOD_EXP, 0, - ubsec_kprocess, sc); + crypto_kregister(sc->sc_cid, CRK_MOD_EXP, 0); #if 0 - crypto_kregister(sc->sc_cid, CRK_MOD_EXP_CRT, 0, - ubsec_kprocess, sc); + crypto_kregister(sc->sc_cid, CRK_MOD_EXP_CRT, 0); #endif } return (0); @@ -900,10 +904,10 @@ * id on successful allocation. */ static int -ubsec_newsession(void *arg, u_int32_t *sidp, struct cryptoini *cri) +ubsec_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri) { + struct ubsec_softc *sc = device_get_softc(dev); struct cryptoini *c, *encini = NULL, *macini = NULL; - struct ubsec_softc *sc = arg; struct ubsec_session *ses = NULL; int sesn; @@ -995,9 +999,9 @@ * Deallocate a session. */ static int -ubsec_freesession(void *arg, u_int64_t tid) +ubsec_freesession(device_t dev, u_int64_t tid) { - struct ubsec_softc *sc = arg; + struct ubsec_softc *sc = device_get_softc(dev); int session, ret; u_int32_t sid = CRYPTO_SESID2LID(tid); @@ -1035,11 +1039,11 @@ } static int -ubsec_process(void *arg, struct cryptop *crp, int hint) +ubsec_process(device_t dev, struct cryptop *crp, int hint) { + struct ubsec_softc *sc = device_get_softc(dev); struct ubsec_q *q = NULL; int err = 0, i, j, nicealign; - struct ubsec_softc *sc = arg; struct cryptodesc *crd1, *crd2, *maccrd, *enccrd; int encoffset = 0, macoffset = 0, cpskip, cpoffset; int sskip, dskip, stheend, dtheend; @@ -2110,9 +2114,9 @@ } static int -ubsec_kprocess(void *arg, struct cryptkop *krp, int hint) +ubsec_kprocess(device_t dev, struct cryptkop *krp, int hint) { - struct ubsec_softc *sc = arg; + struct ubsec_softc *sc = device_get_softc(dev); int r; if (krp == NULL || krp->krp_callback == NULL) ==== //depot/projects/crypto/sys/geom/eli/g_eli.c#2 (text+ko) ==== @@ -654,12 +654,14 @@ * Use software cryptography, if we cannot get it. */ if (LIST_EMPTY(&sc->sc_workers)) { - error = crypto_newsession(&wr->w_sid, &crie, 1); + error = crypto_newsession(&wr->w_sid, &crie, + CRYPTOCAP_F_HARDWARE); if (error == 0) sc->sc_crypto = G_ELI_CRYPTO_HW; } if (sc->sc_crypto == G_ELI_CRYPTO_SW) - error = crypto_newsession(&wr->w_sid, &crie, 0); + error = crypto_newsession(&wr->w_sid, &crie, + CRYPTOCAP_F_SOFTWARE); if (error != 0) { free(wr, M_ELI); if (req != NULL) { ==== //depot/projects/crypto/sys/geom/eli/g_eli_crypto.c#2 (text+ko) ==== @@ -73,7 +73,7 @@ cri.cri_alg = algo; cri.cri_key = __DECONST(void *, key); cri.cri_klen = keysize; - error = crypto_newsession(&sid, &cri, 0); + error = crypto_newsession(&sid, &cri, CRYPTOCAP_F_SOFTWARE); if (error != 0) return (error); p = malloc(sizeof(*crp) + sizeof(*crd) + sizeof(*uio) + sizeof(*iov), ==== //depot/projects/crypto/sys/modules/crypto/Makefile#2 (text+ko) ==== @@ -8,12 +8,12 @@ .PATH: ${.CURDIR}/../../crypto/sha2 KMOD = crypto -SRCS = crypto.c +SRCS = crypto.c cryptodev_if.c SRCS += criov.c cryptosoft.c xform.c SRCS += cast.c deflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c SRCS += skipjack.c bf_enc.c bf_skey.c SRCS += des_ecb.c des_enc.c des_setkey.c SRCS += sha1.c sha2.c -SRCS += opt_param.h +SRCS += opt_param.h cryptodev_if.h bus_if.h device_if.h .include ==== //depot/projects/crypto/sys/modules/cryptodev/Makefile#2 (text+ko) ==== @@ -3,5 +3,6 @@ .PATH: ${.CURDIR}/../../opencrypto KMOD = cryptodev SRCS = cryptodev.c +SRCS += bus_if.h device_if.h .include ==== //depot/projects/crypto/sys/modules/hifn/Makefile#2 (text+ko) ==== @@ -4,7 +4,7 @@ KMOD = hifn SRCS = hifn7751.c opt_hifn.h SRCS += device_if.h bus_if.h pci_if.h -SRCS += opt_bus.h crypto_if.h +SRCS += opt_bus.h cryptodev_if.h .if !defined(KERNBUILDDIR) opt_hifn.h: ==== //depot/projects/crypto/sys/modules/padlock/Makefile#2 (text+ko) ==== @@ -4,5 +4,6 @@ KMOD= padlock SRCS= padlock.c padlock_cipher.c padlock_hash.c +SRCS += device_if.h bus_if.h opt_bus.h cryptodev_if.h .include ==== //depot/projects/crypto/sys/modules/safe/Makefile#2 (text+ko) ==== @@ -30,7 +30,7 @@ KMOD = safe SRCS = safe.c opt_safe.h SRCS += device_if.h bus_if.h pci_if.h -SRCS += opt_bus.h crypto_if.h +SRCS += opt_bus.h cryptodev_if.h .if !defined(KERNBUILDDIR) opt_safe.h: ==== //depot/projects/crypto/sys/modules/ubsec/Makefile#2 (text+ko) ==== @@ -4,7 +4,7 @@ KMOD = ubsec SRCS = ubsec.c opt_ubsec.h SRCS += device_if.h bus_if.h pci_if.h -SRCS += opt_bus.h crypto_if.h +SRCS += opt_bus.h cryptodev_if.h .if !defined(KERNBUILDDIR) opt_ubsec.h: ==== //depot/projects/crypto/sys/netipsec/ipsec.c#2 (text+ko) ==== @@ -117,7 +117,7 @@ * -1 require software support * 0 take anything */ -int crypto_support = 0; +int crypto_support = CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE; SYSCTL_DECL(_net_inet_ipsec); ==== //depot/projects/crypto/sys/opencrypto/crypto.c#2 (text+ko) ==== @@ -1,4 +1,38 @@ -/* $OpenBSD: crypto.c,v 1.38 2002/06/11 11:14:29 beck Exp $ */ +/*- + * Copyright (c) 2002-2006 Sam Leffler. All rights reserved. + * + * 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 ``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 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. + */ + +#include +__FBSDID("$FreeBSD: src/sys/opencrypto/crypto.c,v 1.26 2006/06/06 15:04:52 pjd Exp $"); + +/* + * Cryptographic Subsystem. + * + * This code is derived from the Openbsd Cryptographic Framework (OCF) + * that has the copyright shown below. Very little of the original + * code remains. + */ + /*- * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) * @@ -20,9 +54,6 @@ * PURPOSE. */ -#include -__FBSDID("$FreeBSD: src/sys/opencrypto/crypto.c,v 1.26 2006/06/06 15:04:52 pjd Exp $"); - #define CRYPTO_TIMING /* enable timing support */ #include @@ -41,6 +72,10 @@ #include #include /* XXX for M_XDATA */ +#include +#include +#include "cryptodev_if.h" + /* * Crypto drivers register themselves by allocating a slot in the * crypto_drivers table with crypto_get_driverid() and then registering @@ -49,6 +84,33 @@ static struct mtx crypto_drivers_mtx; /* lock on driver table */ #define CRYPTO_DRIVER_LOCK() mtx_lock(&crypto_drivers_mtx) #define CRYPTO_DRIVER_UNLOCK() mtx_unlock(&crypto_drivers_mtx) +#define CRYPTO_DRIVER_ASSERT() mtx_assert(&crypto_drivers_mtx, MA_OWNED) + +/* + * Crypto device/driver capabilities structure. + * + * Synchronization: + * (d) - protected by CRYPTO_DRIVER_LOCK() + * (q) - protected by CRYPTO_Q_LOCK() + * Not tagged fields are read-only. + */ +struct cryptocap { + device_t cc_dev; /* (d) device/driver */ + u_int32_t cc_sessions; /* (d) # of sessions */ + u_int32_t cc_koperations; /* (d) # os asym operations */ + /* + * Largest possible operator length (in bits) for each type of + * encryption algorithm. XXX not used + */ + u_int16_t cc_max_op_len[CRYPTO_ALGORITHM_MAX + 1]; + u_int8_t cc_alg[CRYPTO_ALGORITHM_MAX + 1]; + u_int8_t cc_kalg[CRK_ALGORITHM_MAX + 1]; + + int cc_flags; /* (d) flags */ +#define CRYPTOCAP_F_CLEANUP 0x80000000 /* needs resource cleanup */ + int cc_qblocked; /* (q) symmetric q blocked */ + int cc_kqblocked; /* (q) asymmetric q blocked */ +}; static struct cryptocap *crypto_drivers = NULL; static int crypto_drivers_num = 0; @@ -101,7 +163,7 @@ static struct proc *cryptoretproc; static void crypto_destroy(void); static int crypto_invoke(struct cryptocap *cap, struct cryptop *crp, int hint); -static int crypto_kinvoke(struct cryptkop *krp); +static int crypto_kinvoke(struct cryptkop *krp, int flags); static struct cryptostats cryptostats; SYSCTL_STRUCT(_kern, OID_AUTO, crypto_stats, CTLFLAG_RW, &cryptostats, @@ -256,112 +318,133 @@ DECLARE_MODULE(crypto, crypto_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_DEPEND(crypto, zlib, 1, 1, 1); +static struct cryptocap * +crypto_checkdriver(u_int32_t hid) +{ + if (crypto_drivers == NULL) + return NULL; + return (hid >= crypto_drivers_num ? NULL : &crypto_drivers[hid]); +} + /* - * Create a new session. + * Compare a driver's list of supported algorithms against another + * list; return non-zero if all algorithms are supported. */ -int -crypto_newsession(u_int64_t *sid, struct cryptoini *cri, int hard) +static int +driver_suitable(const struct cryptocap *cap, const struct cryptoini *cri) { - struct cryptocap *cap = NULL; - struct cryptoini *cr; - u_int32_t hid = 0, lid; - int err = EINVAL; + const struct cryptoini *cr; - CRYPTO_DRIVER_LOCK(); + /* See if all the algorithms are supported. */ + for (cr = cri; cr; cr = cr->cri_next) + if (cap->cc_alg[cr->cri_alg] == 0) + return 0; + return 1; +} - if (crypto_drivers == NULL) - goto done; +/* + * Select a driver for a new session that supports the specified + * algorithms and, optionally, is constrained according to the flags. + * The algorithm we use here is pretty stupid; just use the + * first driver that supports all the algorithms we need. If there + * are multiple drivers we choose the driver with the fewest active + * sessions. We prefer hardware-backed drivers to software ones. + * + * XXX We need more smarts here (in real life too, but that's + * XXX another story altogether). + */ +static struct cryptocap * +crypto_select_driver(const struct cryptoini *cri, int flags) +{ + struct cryptocap *cap, *best; + int match, hid; - /* - * The algorithm we use here is pretty stupid; just use the - * first driver that supports all the algorithms we need. - * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 3 01:17:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66D6216A416; Sun, 3 Dec 2006 01:17:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2A66616A403 for ; Sun, 3 Dec 2006 01:17:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A48A43CA3 for ; Sun, 3 Dec 2006 01:17:28 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB31HpJE000388 for ; Sun, 3 Dec 2006 01:17:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB31Hpxm000385 for perforce@freebsd.org; Sun, 3 Dec 2006 01:17:51 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 01:17:51 GMT Message-Id: <200612030117.kB31Hpxm000385@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 01:17:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=110907 Change 110907 by jb@jb_freebsd8 on 2006/12/03 01:17:38 Reset to match OpenSolaris sources. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/dump/dump.c#5 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/dump/dump.c#5 (text) ==== @@ -27,9 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include -# if defined(sun) #include -#endif #include #include From owner-p4-projects@FreeBSD.ORG Sun Dec 3 01:22:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CE0A16A415; Sun, 3 Dec 2006 01:22:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E302616A40F for ; Sun, 3 Dec 2006 01:22:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F83643CA3 for ; Sun, 3 Dec 2006 01:22:35 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB31MwlF001496 for ; Sun, 3 Dec 2006 01:22:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB31MwK3001493 for perforce@freebsd.org; Sun, 3 Dec 2006 01:22:58 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 01:22:58 GMT Message-Id: <200612030122.kB31MwK3001493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110908 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 01:22:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=110908 Change 110908 by jb@jb_freebsd8 on 2006/12/03 01:22:43 Reset to match OpenSolaris sources. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.h#4 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.h#4 (text) ==== @@ -54,14 +54,12 @@ size_t str_size; /* total size of strings in bytes */ } strtab_t; -typedef ssize_t STRTAB_COPY_FUNC(void *, size_t, void *); - extern void strtab_create(strtab_t *); extern void strtab_destroy(strtab_t *); extern size_t strtab_insert(strtab_t *, const char *); extern size_t strtab_size(const strtab_t *); extern ssize_t strtab_write(const strtab_t *, - STRTAB_COPY_FUNC, void *); + ssize_t (*)(const void *, size_t, void *), void *); extern void strtab_print(const strtab_t *); #ifdef __cplusplus From owner-p4-projects@FreeBSD.ORG Sun Dec 3 01:24:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B03E16A5DE; Sun, 3 Dec 2006 01:24:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DBC6816A5D5 for ; Sun, 3 Dec 2006 01:24:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37F0143C9D for ; Sun, 3 Dec 2006 01:23:37 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB31O0Zo001890 for ; Sun, 3 Dec 2006 01:24:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB31O0M7001885 for perforce@freebsd.org; Sun, 3 Dec 2006 01:24:00 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 01:24:00 GMT Message-Id: <200612030124.kB31O0M7001885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110909 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 01:24:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=110909 Change 110909 by jb@jb_freebsd8 on 2006/12/03 01:23:08 Reset to match OpenSolaris sources. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#6 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#6 (text) ==== @@ -27,11 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include -#if defined(sun) #include -#else -#define MIN(a, b) ((a) < (b) ? (a) : (b)) -#endif #include #include #include @@ -209,7 +205,7 @@ ssize_t strtab_write(const strtab_t *sp, - STRTAB_COPY_FUNC func, void *priv) + ssize_t (*func)(const void *, size_t, void *), void *priv) { ssize_t res, total = 0; ulong_t i; From owner-p4-projects@FreeBSD.ORG Sun Dec 3 01:39:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2395C16A416; Sun, 3 Dec 2006 01:39:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DBD6516A412 for ; Sun, 3 Dec 2006 01:39:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10BC843C9D for ; Sun, 3 Dec 2006 01:38:57 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB31dKAh003624 for ; Sun, 3 Dec 2006 01:39:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB31dKxn003621 for perforce@freebsd.org; Sun, 3 Dec 2006 01:39:20 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 01:39:20 GMT Message-Id: <200612030139.kB31dKxn003621@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110910 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 01:39:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=110910 Change 110910 by jb@jb_freebsd8 on 2006/12/03 01:38:59 Add a Solaris compatibility header. Affected files ... .. //depot/projects/dtrace/src/include/alloca.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 3 01:43:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9400116A4AB; Sun, 3 Dec 2006 01:43:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6B46016A494 for ; Sun, 3 Dec 2006 01:43:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F28B43C9D for ; Sun, 3 Dec 2006 01:43:02 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB31hQo8004853 for ; Sun, 3 Dec 2006 01:43:26 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB31hPXH004849 for perforce@freebsd.org; Sun, 3 Dec 2006 01:43:25 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 01:43:25 GMT Message-Id: <200612030143.kB31hPXH004849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 01:43:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=110911 Change 110911 by jb@jb_freebsd8 on 2006/12/03 01:42:54 Reset to match OpenSolaris sources. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.c#5 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.c#5 (text) ==== @@ -34,9 +34,7 @@ #include #include #include -#if defined(sun) #include -#endif #include "hash.h" #include "memory.h" From owner-p4-projects@FreeBSD.ORG Sun Dec 3 01:49:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D7E316A55C; Sun, 3 Dec 2006 01:49:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0180116A5C9 for ; Sun, 3 Dec 2006 01:49:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21D2643CA8 for ; Sun, 3 Dec 2006 01:49:11 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB31nY30005253 for ; Sun, 3 Dec 2006 01:49:34 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB31nYBY005250 for perforce@freebsd.org; Sun, 3 Dec 2006 01:49:34 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 01:49:34 GMT Message-Id: <200612030149.kB31nYBY005250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110912 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 01:49:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=110912 Change 110912 by jb@jb_freebsd8 on 2006/12/03 01:48:57 Return 0 (integer) rather that NULL (which we define as a pointer) Affected files ... .. //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/cvt/ctf.c#3 edit Differences ... ==== //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/cvt/ctf.c#3 (text) ==== @@ -1196,7 +1196,7 @@ (rc = inflate(&zstr, Z_NO_FLUSH)) != Z_STREAM_END || (rc = inflateEnd(&zstr)) != Z_OK) { warning("CTF decompress zlib error %s\n", zError(rc)); - return (NULL); + return (0); } debug(3, "reflated %lu bytes to %lu, pointer at %d\n", From owner-p4-projects@FreeBSD.ORG Sun Dec 3 01:50:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 748F916A412; Sun, 3 Dec 2006 01:50:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 52E4616A403 for ; Sun, 3 Dec 2006 01:50:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E71543C9D for ; Sun, 3 Dec 2006 01:50:13 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB31oaTi005384 for ; Sun, 3 Dec 2006 01:50:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB31oaH5005381 for perforce@freebsd.org; Sun, 3 Dec 2006 01:50:36 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 01:50:36 GMT Message-Id: <200612030150.kB31oaH5005381@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110913 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 01:50:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=110913 Change 110913 by jb@jb_freebsd8 on 2006/12/03 01:49:45 Loop back. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#8 integrate Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#8 (text) ==== From owner-p4-projects@FreeBSD.ORG Sun Dec 3 01:54:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62D9F16A415; Sun, 3 Dec 2006 01:54:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3C73316A407 for ; Sun, 3 Dec 2006 01:54:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C42443CA3 for ; Sun, 3 Dec 2006 01:54:19 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB31sgSt006657 for ; Sun, 3 Dec 2006 01:54:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB31sgXm006654 for perforce@freebsd.org; Sun, 3 Dec 2006 01:54:42 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 01:54:42 GMT Message-Id: <200612030154.kB31sgXm006654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110915 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 01:54:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=110915 Change 110915 by jb@jb_freebsd8 on 2006/12/03 01:53:50 Match return types. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/output.c#7 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/output.c#7 (text) ==== @@ -466,7 +466,7 @@ int pad; int i; - if (gelf_newehdr(dst, gelf_getclass(src)) == 0) + if (gelf_newehdr(dst, gelf_getclass(src)) == NULL) elfterminate(dstname, "Cannot copy ehdr to temp file"); gelf_getehdr(src, &sehdr); memcpy(&dehdr, &sehdr, sizeof (GElf_Ehdr)); @@ -482,7 +482,7 @@ */ if (sehdr.e_phnum != 0) { (void) elf_flagelf(dst, ELF_C_SET, ELF_F_LAYOUT); - if (gelf_newphdr(dst, sehdr.e_phnum) == 0) + if (gelf_newphdr(dst, sehdr.e_phnum) == NULL) elfterminate(dstname, "Cannot make phdrs in temp file"); for (i = 0; i < sehdr.e_phnum; i++) { From owner-p4-projects@FreeBSD.ORG Sun Dec 3 01:55:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C8EB16A412; Sun, 3 Dec 2006 01:55:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5B38416A407 for ; Sun, 3 Dec 2006 01:55:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7105143CA2 for ; Sun, 3 Dec 2006 01:55:21 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB31tiWK006762 for ; Sun, 3 Dec 2006 01:55:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB31tijV006759 for perforce@freebsd.org; Sun, 3 Dec 2006 01:55:44 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 01:55:44 GMT Message-Id: <200612030155.kB31tijV006759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110916 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 01:55:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=110916 Change 110916 by jb@jb_freebsd8 on 2006/12/03 01:54:54 Match return types. Affected files ... .. //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/cvt/output.c#3 edit Differences ... ==== //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/cvt/output.c#3 (text) ==== @@ -616,7 +616,7 @@ } } - if (gelf_update_shdr(dscn, &shdr) == NULL) + if (gelf_update_shdr(dscn, &shdr) == 0) elfterminate(dstname, "Cannot update sect %s", sname); new_offset = (off_t)shdr.sh_offset; From owner-p4-projects@FreeBSD.ORG Sun Dec 3 02:00:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BAC516A415; Sun, 3 Dec 2006 02:00:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2445D16A403 for ; Sun, 3 Dec 2006 02:00:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3659443C9D for ; Sun, 3 Dec 2006 02:00:29 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB320qYg007020 for ; Sun, 3 Dec 2006 02:00:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB320qxD007017 for perforce@freebsd.org; Sun, 3 Dec 2006 02:00:52 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 02:00:52 GMT Message-Id: <200612030200.kB320qxD007017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110917 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 02:00:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=110917 Change 110917 by jb@jb_freebsd8 on 2006/12/03 02:00:27 Cast integers up to uintptr_t before casting to void * to avoid compiler warnings about size mismatches. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/merge.c#6 edit .. //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/cvt/merge.c#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/merge.c#6 (text) ==== @@ -181,10 +181,10 @@ { debug(3, "Adding mapping %u => %u\n", srcid, tgtid); - assert(!alist_find(ta, (void *)(ulong_t)srcid, NULL)); + assert(!alist_find(ta, (void *)(uintptr_t)srcid, NULL)); assert(srcid != 0 && tgtid != 0); - alist_add(ta, (void *)(ulong_t)srcid, (void *)(ulong_t)tgtid); + alist_add(ta, (void *)(uintptr_t)srcid, (void *)(uintptr_t)tgtid); } static tid_t @@ -192,7 +192,7 @@ { long ltgtid; - if (alist_find(ta, (void *)(ulong_t)srcid, (void **)<gtid)) + if (alist_find(ta, (void *)(uintptr_t)srcid, (void **)<gtid)) return ((int)ltgtid); else return (0); @@ -908,7 +908,7 @@ redir_mstr_fwd_cb(void *name, void *value, void *arg) { tdesc_t *fwd = name; - int defnid = (ulong_t)value; + int defnid = (uintptr_t)value; redir_mstr_data_t *rmd = arg; tdesc_t template; tdesc_t *defn; ==== //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/cvt/merge.c#3 (text) ==== @@ -181,10 +181,10 @@ { debug(3, "Adding mapping %u => %u\n", srcid, tgtid); - assert(!alist_find(ta, (void *)srcid, NULL)); + assert(!alist_find(ta, (void *)(uintptr_t)srcid, NULL)); assert(srcid != 0 && tgtid != 0); - alist_add(ta, (void *)srcid, (void *)tgtid); + alist_add(ta, (void *)(uintptr_t)srcid, (void *)(uintptr_t)tgtid); } static tid_t @@ -192,7 +192,7 @@ { long ltgtid; - if (alist_find(ta, (void *)srcid, (void **)<gtid)) + if (alist_find(ta, (void *)(uintptr_t)srcid, (void **)<gtid)) return ((int)ltgtid); else return (0); @@ -908,7 +908,7 @@ redir_mstr_fwd_cb(void *name, void *value, void *arg) { tdesc_t *fwd = name; - int defnid = (int)value; + int defnid = (uintptr_t)value; redir_mstr_data_t *rmd = arg; tdesc_t template; tdesc_t *defn; From owner-p4-projects@FreeBSD.ORG Sun Dec 3 02:02:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98A7816A407; Sun, 3 Dec 2006 02:02:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 59D7916A416 for ; Sun, 3 Dec 2006 02:02:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 696CA43C9D for ; Sun, 3 Dec 2006 02:02:32 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB322t1L007793 for ; Sun, 3 Dec 2006 02:02:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB322tSi007790 for perforce@freebsd.org; Sun, 3 Dec 2006 02:02:55 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 02:02:55 GMT Message-Id: <200612030202.kB322tSi007790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110918 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 02:02:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=110918 Change 110918 by jb@jb_freebsd8 on 2006/12/03 02:02:32 Allow for the .S file extension too. Affected files ... .. //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/cvt/input.c#3 edit Differences ... ==== //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/cvt/input.c#3 (text) ==== @@ -71,6 +71,7 @@ /* ignore */ break; case 's': + case 'S': types |= SOURCE_S; break; default: From owner-p4-projects@FreeBSD.ORG Sun Dec 3 02:07:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9362416A416; Sun, 3 Dec 2006 02:07:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4C4C916A403 for ; Sun, 3 Dec 2006 02:07:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 566E843CA2 for ; Sun, 3 Dec 2006 02:06:39 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB3272Nr009642 for ; Sun, 3 Dec 2006 02:07:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB32722W009639 for perforce@freebsd.org; Sun, 3 Dec 2006 02:07:02 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 02:07:02 GMT Message-Id: <200612030207.kB32722W009639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110919 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 02:07:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=110919 Change 110919 by jb@jb_freebsd8 on 2006/12/03 02:06:34 Reset to match OpenSolaris sources. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c#5 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c#5 (text) ==== @@ -27,9 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include -#if defined(sun) #include -#endif #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Dec 3 02:12:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 845DF16A49E; Sun, 3 Dec 2006 02:12:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5DE9916A47C for ; Sun, 3 Dec 2006 02:12:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11B9543CBB for ; Sun, 3 Dec 2006 02:11:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB32C96v010779 for ; Sun, 3 Dec 2006 02:12:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB32C9ZQ010774 for perforce@freebsd.org; Sun, 3 Dec 2006 02:12:09 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 02:12:09 GMT Message-Id: <200612030212.kB32C9ZQ010774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110920 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 02:12:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=110920 Change 110920 by jb@jb_freebsd8 on 2006/12/03 02:12:02 Reset to match OpenSolaris sources. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_decl.c#4 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_decl.c#4 (text) ==== @@ -29,9 +29,7 @@ #include #include #include -#if defined(sun) #include -#endif #include #include From owner-p4-projects@FreeBSD.ORG Sun Dec 3 02:14:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 539C816A415; Sun, 3 Dec 2006 02:14:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2BAB316A407 for ; Sun, 3 Dec 2006 02:14:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DD0843CA2 for ; Sun, 3 Dec 2006 02:13:49 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB32ECL8011096 for ; Sun, 3 Dec 2006 02:14:12 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB32ECfC011093 for perforce@freebsd.org; Sun, 3 Dec 2006 02:14:12 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 02:14:12 GMT Message-Id: <200612030214.kB32ECfC011093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110921 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 02:14:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=110921 Change 110921 by jb@jb_freebsd8 on 2006/12/03 02:14:02 Fix a mis-merge. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#9 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#9 (text) ==== @@ -461,7 +461,6 @@ { resbuf_t *rb = (resbuf_t *)data; int rc; - resbuf_t *rb = (resbuf_t *) arg; rb->rb_zstr.next_out = (Bytef *)rb->rb_ptr; rb->rb_zstr.avail_out = rb->rb_size - (rb->rb_ptr - rb->rb_base); From owner-p4-projects@FreeBSD.ORG Sun Dec 3 02:42:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 865BF16A412; Sun, 3 Dec 2006 02:42:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 271C816A403 for ; Sun, 3 Dec 2006 02:42:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 23E8243CA2 for ; Sun, 3 Dec 2006 02:42:26 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB32gnUp042930 for ; Sun, 3 Dec 2006 02:42:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB32gnv5042925 for perforce@freebsd.org; Sun, 3 Dec 2006 02:42:49 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 02:42:49 GMT Message-Id: <200612030242.kB32gnv5042925@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110922 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 02:42:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=110922 Change 110922 by jb@jb_freebsd8 on 2006/12/03 02:42:12 Add alloca.h Affected files ... .. //depot/projects/dtrace/src/include/Makefile#9 edit Differences ... ==== //depot/projects/dtrace/src/include/Makefile#9 (text+ko) ==== @@ -7,8 +7,8 @@ CLEANFILES= osreldate.h version vers.c SUBDIR= arpa gssapi protocols rpcsvc rpc -INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \ - db.h \ +INCS= a.out.h alloca.h ar.h assert.h bitstring.h complex.h cpio.h \ + _ctype.h ctype.h db.h \ dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \ fts.h ftw.h getopt.h glob.h grp.h gssapi.h \ histedit.h ieeefp.h ifaddrs.h \ From owner-p4-projects@FreeBSD.ORG Sun Dec 3 02:48:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A72BF16A416; Sun, 3 Dec 2006 02:48:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6B97716A40F for ; Sun, 3 Dec 2006 02:48:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B1CD43C9D for ; Sun, 3 Dec 2006 02:48:34 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB32mvgX046273 for ; Sun, 3 Dec 2006 02:48:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB32mv6a046270 for perforce@freebsd.org; Sun, 3 Dec 2006 02:48:57 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 02:48:57 GMT Message-Id: <200612030248.kB32mv6a046270@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110923 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 02:48:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=110923 Change 110923 by jb@jb_freebsd8 on 2006/12/03 02:48:38 More general compatibility definition. Affected files ... .. //depot/projects/dtrace/src/include/stdlib.h#5 edit Differences ... ==== //depot/projects/dtrace/src/include/stdlib.h#5 (text+ko) ==== @@ -288,7 +288,7 @@ */ #ifdef _SOLARIS_C_SOURCE -#define getpname() getprogname() +#define getpname getprogname #endif /* _SOLARIS_C_SOURCE */ __END_DECLS From owner-p4-projects@FreeBSD.ORG Sun Dec 3 02:53:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F57B16A407; Sun, 3 Dec 2006 02:53:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0160416A40F for ; Sun, 3 Dec 2006 02:53:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id D199943C9D for ; Sun, 3 Dec 2006 02:52:39 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB32r338047524 for ; Sun, 3 Dec 2006 02:53:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB32r3Vt047520 for perforce@freebsd.org; Sun, 3 Dec 2006 02:53:03 GMT (envelope-from jb@freebsd.org) Date: Sun, 3 Dec 2006 02:53:03 GMT Message-Id: <200612030253.kB32r3Vt047520@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 110924 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 02:53:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=110924 Change 110924 by jb@jb_freebsd8 on 2006/12/03 02:53:00 Add Solaris compatibility definitions. Affected files ... .. //depot/projects/dtrace/src/sys/sys/fcntl.h#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/fcntl.h#5 (text+ko) ==== @@ -223,6 +223,15 @@ #if __BSD_VISIBLE int flock(int, int); #endif + +/* + * Solaris compatibility definitions. + */ +#ifdef _SOLARIS_C_SOURCE + +#define open64 open + +#endif __END_DECLS #endif From owner-p4-projects@FreeBSD.ORG Sun Dec 3 07:21:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DACD16A412; Sun, 3 Dec 2006 07:21:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 15C8F16A403 for ; Sun, 3 Dec 2006 07:21:56 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9609343C9D for ; Sun, 3 Dec 2006 07:21:30 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB37LtL3005062 for ; Sun, 3 Dec 2006 07:21:55 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB37Ltpr005059 for perforce@freebsd.org; Sun, 3 Dec 2006 07:21:55 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 3 Dec 2006 07:21:55 GMT Message-Id: <200612030721.kB37Ltpr005059@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 110928 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 07:21:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=110928 Change 110928 by mjacob@newisp on 2006/12/03 07:21:23 Fix XPT_GET_TRANSPORT_SETTINGS to zero validity and flags- this was causing us to not negotiate sync at all, or at random. Affected files ... .. //depot/projects/newisp/dev/isp/isp_freebsd.c#30 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_freebsd.c#30 (text+ko) ==== @@ -2741,8 +2741,9 @@ *dptr &= ~DPARM_SYNC; } isp_prt(isp, ISP_LOGDEBUG0, - "SET bus %d targ %d to flags %x off %x per %x", - bus, tgt, sdp->isp_devparam[tgt].goal_flags, + "SET (%d.%d.%d) to flags %x off %x per %x", + bus, tgt, cts->ccb_h.target_lun, + sdp->isp_devparam[tgt].goal_flags, sdp->isp_devparam[tgt].goal_offset, sdp->isp_devparam[tgt].goal_period); sdp->isp_devparam[tgt].dev_update = 1; @@ -2809,20 +2810,22 @@ cts->transport = XPORT_SPI; cts->transport_version = 2; - scsi->flags &= ~CTS_SCSI_FLAGS_TAG_ENB; - spi->flags &= ~CTS_SPI_FLAGS_DISC_ENB; + spi->valid = 0; + scsi->valid = 0; + spi->flags = 0; + scsi->flags = 0; if (dval & DPARM_DISC) { spi->flags |= CTS_SPI_FLAGS_DISC_ENB; } - if (dval & DPARM_TQING) { - scsi->flags |= CTS_SCSI_FLAGS_TAG_ENB; - } if ((dval & DPARM_SYNC) && oval && pval) { spi->sync_offset = oval; spi->sync_period = pval; - spi->valid |= CTS_SPI_VALID_SYNC_OFFSET; - spi->valid |= CTS_SPI_VALID_SYNC_RATE; + } else { + spi->sync_offset = 0; + spi->sync_period = 0; } + spi->valid |= CTS_SPI_VALID_SYNC_OFFSET; + spi->valid |= CTS_SPI_VALID_SYNC_RATE; spi->valid |= CTS_SPI_VALID_BUS_WIDTH; if (dval & DPARM_WIDE) { spi->bus_width = MSG_EXT_WDTR_BUS_16_BIT; @@ -2831,14 +2834,15 @@ } if (cts->ccb_h.target_lun != CAM_LUN_WILDCARD) { scsi->valid = CTS_SCSI_VALID_TQ; + if (dval & DPARM_TQING) { + scsi->flags |= CTS_SCSI_FLAGS_TAG_ENB; + } spi->valid |= CTS_SPI_VALID_DISC; - } else { - scsi->valid = 0; } isp_prt(isp, ISP_LOGDEBUG0, - "GET %s bus %d targ %d to flags %x off %x per %x", + "GET %s (%d.%d.%d) to flags %x off %x per %x", IS_CURRENT_SETTINGS(cts)? "ACTIVE" : "NVRAM", - bus, tgt, dval, oval, pval); + bus, tgt, cts->ccb_h.target_lun, dval, oval, pval); } ISPLOCK_2_CAMLOCK(isp); ccb->ccb_h.status = CAM_REQ_CMP; From owner-p4-projects@FreeBSD.ORG Sun Dec 3 07:56:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A91FD16A40F; Sun, 3 Dec 2006 07:56:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 52BFA16A403 for ; Sun, 3 Dec 2006 07:56:43 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id DEC6D43C9D for ; Sun, 3 Dec 2006 07:56:17 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB37ug1L010593 for ; Sun, 3 Dec 2006 07:56:42 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB37ugqQ010590 for perforce@freebsd.org; Sun, 3 Dec 2006 07:56:42 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 3 Dec 2006 07:56:42 GMT Message-Id: <200612030756.kB37ugqQ010590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 110933 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 07:56:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=110933 Change 110933 by mjacob@newisp on 2006/12/03 07:56:35 Fix a massive couple of botches here: the NVRAM settings read wasn't flagging the SYNC mode was enabled. The temp values for offset and sync period were uint8_t, but were being assigned and shifted from a uint32_t value. This didn't show up in testing because a random number of 1030 cards set a bit that says "honor BIOS negotiation", which means this whole code path was skipped. Affected files ... .. //depot/projects/newisp/dev/mpt/mpt_cam.c#16 edit Differences ... ==== //depot/projects/newisp/dev/mpt/mpt_cam.c#16 (text+ko) ==== @@ -660,7 +660,7 @@ if (rv) { mpt_prt(mpt, "failed to read SPI Port Page 0\n"); } else { - mpt_lprt(mpt, MPT_PRT_DEBUG, + mpt_lprt(mpt, MPT_PRT_NEGOTIATION, "SPI Port Page 0: Capabilities %x PhysicalInterface %x\n", mpt->mpt_port_page0.Capabilities, mpt->mpt_port_page0.PhysicalInterface); @@ -3290,7 +3290,7 @@ struct ccb_trans_settings_scsi *scsi = &cts->proto_specific.scsi; struct ccb_trans_settings_spi *spi = &cts->xport_specific.spi; target_id_t tgt; - uint8_t dval, pval, oval; + uint32_t dval, pval, oval; int rv; cts->protocol = PROTO_SCSI; @@ -3348,7 +3348,7 @@ pval >>= MPI_SCSIDEVPAGE0_NP_SHIFT_SYNC_PERIOD; mpt->mpt_dev_page0[tgt] = tmp; } else { - dval = DP_WIDE|DP_DISC_ENABLE|DP_TQING_ENABLE; + dval = DP_WIDE|DP_DISC_ENABLE|DP_TQING_ENABLE|DP_SYNC; oval = mpt->mpt_port_page0.Capabilities; oval = MPI_SCSIPORTPAGE0_CAP_GET_MAX_SYNC_OFFSET(oval); pval = mpt->mpt_port_page0.Capabilities; @@ -3359,37 +3359,29 @@ scsi->valid = 0; spi->flags = 0; scsi->flags = 0; - if (dval & DP_DISC_ENABLE) { - spi->flags |= CTS_SPI_FLAGS_DISC_ENB; - } - if (oval) { - spi->sync_offset = oval; - spi->valid |= CTS_SPI_VALID_SYNC_OFFSET; - } - if (pval) { - spi->sync_period = pval; - spi->valid |= CTS_SPI_VALID_SYNC_RATE; - } + spi->sync_offset = oval; + spi->sync_period = pval; + spi->valid |= CTS_SPI_VALID_SYNC_OFFSET; + spi->valid |= CTS_SPI_VALID_SYNC_RATE; spi->valid |= CTS_SPI_VALID_BUS_WIDTH; if (dval & DP_WIDE) { spi->bus_width = MSG_EXT_WDTR_BUS_16_BIT; } else { spi->bus_width = MSG_EXT_WDTR_BUS_8_BIT; } - if (dval & DP_TQING_ENABLE) { - scsi->flags |= CTS_SCSI_FLAGS_TAG_ENB; - } if (cts->ccb_h.target_lun != CAM_LUN_WILDCARD) { scsi->valid = CTS_SCSI_VALID_TQ; + if (dval & DP_TQING_ENABLE) { + scsi->flags |= CTS_SCSI_FLAGS_TAG_ENB; + } spi->valid |= CTS_SPI_VALID_DISC; - } else { - scsi->valid = 0; + if (dval & DP_DISC_ENABLE) { + spi->flags |= CTS_SPI_FLAGS_DISC_ENB; + } } mpt_lprt(mpt, MPT_PRT_NEGOTIATION, - "mpt_get_spi_settings[%d]:%s per=%x off=%d SPF=%x SPV=%x SCF=%x SCV" - "=%x bw=%x\n", - tgt, IS_CURRENT_SETTINGS(cts)? "ACTIVE" : "NVRAM ", pval, oval, - spi->flags, spi->valid, scsi->flags, scsi->valid, spi->bus_width); + "mpt_get_spi_settings[%d]: %s flags 0x%x per 0x%x off=%d\n", tgt, + IS_CURRENT_SETTINGS(cts)? "ACTIVE" : "NVRAM ", dval, pval, oval); return (0); } From owner-p4-projects@FreeBSD.ORG Sun Dec 3 07:58:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E068C16A416; Sun, 3 Dec 2006 07:58:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 91F2416A403 for ; Sun, 3 Dec 2006 07:58:46 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16A3643CA5 for ; Sun, 3 Dec 2006 07:58:21 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB37wkdU010707 for ; Sun, 3 Dec 2006 07:58:46 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB37wkux010704 for perforce@freebsd.org; Sun, 3 Dec 2006 07:58:46 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 3 Dec 2006 07:58:46 GMT Message-Id: <200612030758.kB37wkux010704@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 110934 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 07:58:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=110934 Change 110934 by mjacob@newisp on 2006/12/03 07:57:48 Mimic CVS and eliminate an unused flag. Affected files ... .. //depot/projects/newisp/cam/cam_ccb.h#4 edit Differences ... ==== //depot/projects/newisp/cam/cam_ccb.h#4 (text+ko) ==== @@ -719,7 +719,6 @@ #define CTS_SPI_VALID_PPR_OPTIONS 0x10 u_int flags; #define CTS_SPI_FLAGS_DISC_ENB 0x01 -#define CTS_SPI_FLAGS_TAG_ENB 0x02 u_int sync_period; u_int sync_offset; u_int bus_width; From owner-p4-projects@FreeBSD.ORG Sun Dec 3 10:08:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57B8016A412; Sun, 3 Dec 2006 10:08:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1A2E916A407 for ; Sun, 3 Dec 2006 10:08:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F81043CA2 for ; Sun, 3 Dec 2006 10:08:08 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB3A8Xvt044749 for ; Sun, 3 Dec 2006 10:08:33 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB3A8Xei044743 for perforce@freebsd.org; Sun, 3 Dec 2006 10:08:33 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Dec 2006 10:08:33 GMT Message-Id: <200612031008.kB3A8Xei044743@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 110939 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 10:08:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=110939 Change 110939 by rdivacky@rdivacky_witten on 2006/12/03 10:07:41 MFi386: return EOPNOTSUPP for unknown module events. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#5 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#5 (text+ko) ==== @@ -1120,7 +1120,7 @@ printf("Could not deinstall ELF interpreter entry\n"); break; default: - break; + return EOPNOTSUPP; } return error; } From owner-p4-projects@FreeBSD.ORG Sun Dec 3 10:17:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CAA316A4B3; Sun, 3 Dec 2006 10:17:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7130016A4A0 for ; Sun, 3 Dec 2006 10:17:46 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0FE743CBA for ; Sun, 3 Dec 2006 10:17:19 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB3AHj6T048326 for ; Sun, 3 Dec 2006 10:17:45 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB3AHj10048323 for perforce@freebsd.org; Sun, 3 Dec 2006 10:17:45 GMT (envelope-from soc-andrew@freebsd.org) Date: Sun, 3 Dec 2006 10:17:45 GMT Message-Id: <200612031017.kB3AHj10048323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 110940 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 10:17:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=110940 Change 110940 by soc-andrew@soc-andrew_serv on 2006/12/03 10:17:15 Add the start of a file fetcher. This gives the user the option of where to get the files from. At the moment it only works with a ``local'' file (ie. off a CD or existing NFS mount point and anything the fetch command can download. Planned is to be able to install from a user generated NFS mountpoint. Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/lib/Fetch.lua#1 add .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/lib/Makefile#4 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/lib/Makefile#4 (text+ko) ==== @@ -8,6 +8,7 @@ Partition.lua PartitionUI.lua StorageSystem.lua \ StorageSystemUI.lua Subpartition.lua +FILES+= Fetch.lua FILESDIR= ${INST_DIR}/lib From owner-p4-projects@FreeBSD.ORG Sun Dec 3 16:24:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4130B16A4CA; Sun, 3 Dec 2006 16:24:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 18B0B16A4A7 for ; Sun, 3 Dec 2006 16:24:49 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DAFF43CC2 for ; Sun, 3 Dec 2006 16:24:13 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB3GOcAJ026094 for ; Sun, 3 Dec 2006 16:24:38 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB3GOcFE026091 for perforce@freebsd.org; Sun, 3 Dec 2006 16:24:38 GMT (envelope-from piso@freebsd.org) Date: Sun, 3 Dec 2006 16:24:38 GMT Message-Id: <200612031624.kB3GOcFE026091@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 110950 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 16:24:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=110950 Change 110950 by piso@piso_newluxor on 2006/12/03 16:24:06 Add support for ipfw's nat in rc.firewall. Affected files ... .. //depot/projects/soc2005/libalias/etc/rc.firewall#3 edit Differences ... ==== //depot/projects/soc2005/libalias/etc/rc.firewall#3 (text+ko) ==== @@ -129,6 +129,14 @@ fi ;; esac + case ${firewall_nat_enable} in + [Yy][Ee][Ss]) + if [ -n "${firewall_nat_interface}" ]; then + ${fwcmd} nat 666 config if ${firewall_nat_interface} log + ${fwcmd} add 50 nat 666 ip4 from any to any via ${firewall_nat_interface} + fi + ;; + esac esac ############ From owner-p4-projects@FreeBSD.ORG Sun Dec 3 16:26:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 870D516A40F; Sun, 3 Dec 2006 16:26:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 62D8616A403 for ; Sun, 3 Dec 2006 16:26:42 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id B22CE43CB0 for ; Sun, 3 Dec 2006 16:26:14 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB3GQfkI026241 for ; Sun, 3 Dec 2006 16:26:41 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB3GQfHs026238 for perforce@freebsd.org; Sun, 3 Dec 2006 16:26:41 GMT (envelope-from piso@freebsd.org) Date: Sun, 3 Dec 2006 16:26:41 GMT Message-Id: <200612031626.kB3GQfHs026238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 110951 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 16:26:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=110951 Change 110951 by piso@piso_newluxor on 2006/12/03 16:26:33 Cosmetic/typos. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#23 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#23 (text+ko) ==== @@ -1623,17 +1623,16 @@ #ifdef _KERNEL /* - * m_megapullup() function is a big hack (only used in ng_nat and ipfw+nat). + * m_megapullup() - this function is a big hack. + * Thankfully, it's only used in ng_nat and ipfw+nat. + * + * It allocates an mbuf with cluster and copies the whole chain into cluster, + * so that it is all contiguous and the whole packet can be accessed via a + * plain (char *) pointer. This is required, because libalias doesn't know + * how to handle mbuf chains. * - * It allocates an mbuf with cluster and copies the whole - * chain into cluster, so that it is all contigous and the - * whole packet can be accessed via char pointer. - * This is required, because libalias doesn't have idea - * about mbufs. - * - * On success, m_megapullup returns an mbuf with cluster - * containing the input packet, on failure NULL. - * In both cases, the input packet is consumed. + * On success, m_megapullup returns an mbuf with cluster containing the input + * packet, on failure NULL. In both cases, the input packet is consumed. */ struct mbuf * m_megapullup(struct mbuf *m, int len) { From owner-p4-projects@FreeBSD.ORG Sun Dec 3 16:48:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2186216A4FD; Sun, 3 Dec 2006 16:48:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DDBF316A4A0; Sun, 3 Dec 2006 16:48:08 +0000 (UTC) (envelope-from flag@newluxor.wired.org) Received: from mail.oltrelinux.com (krisma.oltrelinux.com [194.242.226.43]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F77843E3C; Sun, 3 Dec 2006 16:36:46 +0000 (GMT) (envelope-from flag@newluxor.wired.org) Received: from newluxor.wired.org (ip-64-88.sn2.eutelia.it [83.211.64.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.oltrelinux.com (Postfix) with ESMTP id 956E111AE43; Sun, 3 Dec 2006 17:36:49 +0100 (CET) Received: (from flag@localhost) by newluxor.wired.org (8.13.8/8.13.8/Submit) id kB3GahsF033355; Sun, 3 Dec 2006 17:36:43 +0100 (CET) (envelope-from flag) Date: Sun, 3 Dec 2006 17:36:43 +0100 From: Paolo Pisati To: Paolo Pisati Message-ID: <20061203163643.GA32073@tin.it> References: <200612031626.kB3GQfHs026238@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200612031626.kB3GQfHs026238@repoman.freebsd.org> User-Agent: Mutt/1.4.2.2i X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at krisma.oltrelinux.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 110951 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 16:48:09 -0000 On Sun, Dec 03, 2006 at 04:26:41PM +0000, Paolo Pisati wrote: > http://perforce.freebsd.org/chv.cgi?CH=110951 > > Change 110951 by piso@piso_newluxor on 2006/12/03 16:26:33 > > Cosmetic/typos. > Provided by: Giorgos Keramidas bye -- Paolo From owner-p4-projects@FreeBSD.ORG Sun Dec 3 17:45:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31E0516A47B; Sun, 3 Dec 2006 17:45:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D9C2616A403 for ; Sun, 3 Dec 2006 17:45:13 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id D53B543CA8 for ; Sun, 3 Dec 2006 17:44:45 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB3HjDdt050002 for ; Sun, 3 Dec 2006 17:45:13 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB3HjDTt049995 for perforce@freebsd.org; Sun, 3 Dec 2006 17:45:13 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Dec 2006 17:45:13 GMT Message-Id: <200612031745.kB3HjDTt049995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 110956 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 17:45:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=110956 Change 110956 by rdivacky@rdivacky_witten on 2006/12/03 17:44:49 Last commit broke linuxulator... we need LINUX_MSG_INFO definition. I put it into linux_ipc.h because it doesnt seem to be MD but all the other definitions are in arch/linux*/linux*.h Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.h#2 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.h#2 (text+ko) ==== @@ -135,6 +135,8 @@ int linux_shmdt(struct thread *, struct linux_shmdt_args *); int linux_shmget(struct thread *, struct linux_shmget_args *); +#define LINUX_MSG_INFO 12 + #endif /* __i386__ || __amd64__ */ #endif /* _LINUX_IPC_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Dec 3 17:47:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A437316A47B; Sun, 3 Dec 2006 17:47:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 48A5416A416 for ; Sun, 3 Dec 2006 17:47:17 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10DC543CA5 for ; Sun, 3 Dec 2006 17:46:49 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB3HlGRq050156 for ; Sun, 3 Dec 2006 17:47:16 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB3HlGpR050153 for perforce@freebsd.org; Sun, 3 Dec 2006 17:47:16 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Dec 2006 17:47:16 GMT Message-Id: <200612031747.kB3HlGpR050153@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 110957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 17:47:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=110957 Change 110957 by rdivacky@rdivacky_witten on 2006/12/03 17:46:16 Use TAILQ_FOREACH_SAFE instead of unsafe variant in linsysfs_uninit because we are deleting the element we are using. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linsysfs/linsysfs.c#2 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linsysfs/linsysfs.c#2 (text) ==== @@ -268,9 +268,10 @@ static int linsysfs_uninit(PFS_INIT_ARGS) { - struct scsi_host_queue *scsi_host; + struct scsi_host_queue *scsi_host, *scsi_host_temp; - TAILQ_FOREACH(scsi_host, &scsi_host_q, scsi_host_next) { + TAILQ_FOREACH_SAFE(scsi_host, &scsi_host_q, scsi_host_next, + scsi_host_temp) { TAILQ_REMOVE(&scsi_host_q, scsi_host, scsi_host_next); free(scsi_host->path, M_TEMP); free(scsi_host, M_TEMP); From owner-p4-projects@FreeBSD.ORG Sun Dec 3 18:02:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD1DB16A504; Sun, 3 Dec 2006 18:02:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8653416A500 for ; Sun, 3 Dec 2006 18:02:40 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6641D43CAB for ; Sun, 3 Dec 2006 18:02:12 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB3I2dFe061007 for ; Sun, 3 Dec 2006 18:02:39 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB3I2ZAN060984 for perforce@freebsd.org; Sun, 3 Dec 2006 18:02:35 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Dec 2006 18:02:35 GMT Message-Id: <200612031802.kB3I2ZAN060984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 110958 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 18:02:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=110958 Change 110958 by rdivacky@rdivacky_witten on 2006/12/03 18:01:58 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/nexus_io.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_spi.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_twi.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/AVILA#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/bus.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_io.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/loader.8#3 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/common/copy.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/common/libia64.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/sparc64/loader/hcall.S#2 delete .. //depot/projects/linuxolator/src/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#41 integrate .. //depot/projects/linuxolator/src/sys/conf/files#12 integrate .. //depot/projects/linuxolator/src/sys/conf/files.arm#3 integrate .. //depot/projects/linuxolator/src/sys/conf/files.sun4v#6 integrate .. //depot/projects/linuxolator/src/sys/conf/kern.mk#2 integrate .. //depot/projects/linuxolator/src/sys/conf/options#8 integrate .. //depot/projects/linuxolator/src/sys/conf/options.arm#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.c#11 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/flash/at45d.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/ad7418.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/iicbus/ds1672.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/inphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/miidevs#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/miivar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/rp/rp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/rp/rpreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/buffer.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/channel.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/fake.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/feeder.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/feeder_fmt.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/mixer.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/FILES#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_auereg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ukbd.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_conv.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/ntfs/ntfs_subr.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/locore.s#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/clock.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_resource.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_time.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_prf.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/linuxolator/src/sys/modules/Makefile#4 integrate .. //depot/projects/linuxolator/src/sys/modules/wlan_amrr/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/net/bridgestp.c#6 integrate .. //depot/projects/linuxolator/src/sys/net/bridgestp.h#4 integrate .. //depot/projects/linuxolator/src/sys/net/ethernet.h#3 integrate .. //depot/projects/linuxolator/src/sys/net/if.c#4 integrate .. //depot/projects/linuxolator/src/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridge.c#8 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridgevar.h#4 integrate .. //depot/projects/linuxolator/src/sys/net/if_llc.h#2 integrate .. //depot/projects/linuxolator/src/sys/net/netisr.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/route.c#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_amrr.c#1 branch .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_amrr.h#1 branch .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet6/nd6.c#5 integrate .. //depot/projects/linuxolator/src/sys/nfs/nfsproto.h#2 integrate .. //depot/projects/linuxolator/src/sys/nfs4client/nfs4_subs.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_node.c#4 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/linuxolator/src/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/pci/if_pcn.c#3 integrate .. //depot/projects/linuxolator/src/sys/pci/if_pcnreg.h#3 integrate .. //depot/projects/linuxolator/src/sys/pci/if_rl.c#3 integrate .. //depot/projects/linuxolator/src/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/mmu_oea.c#3 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/genassym.c#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_diff.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_findname.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_fini.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/t1_copy.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/conf/DEFAULTS#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/NOTES#7 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/asm.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/hv_api.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/hypervisor_api.h#3 delete .. //depot/projects/linuxolator/src/sys/sun4v/include/hypervisorvar.h#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/pcb.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/pmap.h#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/sun4v_cpufunc.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/tsb.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/tte_hash.h#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_diff.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_findname.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_findnodeprop.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_fini.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getbinsize.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getgen.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getpropdata.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getpropstr.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getpropval.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_init_intern.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_nodecount.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_rootnode.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_scandag.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/exception.S#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hvcons.c#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hviommu.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/interrupt.S#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/mp_locore.S#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/nexus.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/rtc.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/simdisk.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/support.S#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/t1_copy.S#3 delete .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/trap.c#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tte.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/vnex.c#3 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#7 integrate .. //depot/projects/linuxolator/src/sys/sys/pcpu.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/soundcard.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/uio.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/umtx.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/vmmeter.h#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_kern.h#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_meter.c#2 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.39 2006/11/11 16:26:55 trhodes Exp $ +# $FreeBSD: src/sys/Makefile,v 1.40 2006/11/26 18:27:16 maxim Exp $ .include @@ -8,8 +8,8 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ - isofs kern libkern modules net net80211 netatalk netatm \ +CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ + isa isofs kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ==== //depot/projects/linuxolator/src/sys/amd64/amd64/genassym.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.158 2006/11/01 04:54:49 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.159 2006/11/30 04:17:04 jb Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -185,7 +185,6 @@ ASSYM(PC_FPCURTHREAD, offsetof(struct pcpu, pc_fpcurthread)); ASSYM(PC_IDLETHREAD, offsetof(struct pcpu, pc_idlethread)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); -ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); ASSYM(PC_SCRATCH_RSP, offsetof(struct pcpu, pc_scratch_rsp)); ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ==== //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.663 2006/11/17 20:27:01 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.664 2006/11/19 20:54:57 alc Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -833,7 +833,7 @@ static void getmemsize(caddr_t kmdp, u_int64_t first) { - int i, physmap_idx, pa_indx, da_indx; + int i, off, physmap_idx, pa_indx, da_indx; vm_paddr_t pa, physmap[PHYSMAP_SIZE]; u_long physmem_tunable; pt_entry_t *pte; @@ -1096,14 +1096,17 @@ /* Trim off space for the message buffer. */ phys_avail[pa_indx] -= round_page(MSGBUF_SIZE); - avail_end = phys_avail[pa_indx]; + /* Map the message buffer. */ + for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) + pmap_kenter((vm_offset_t)msgbufp + off, phys_avail[pa_indx] + + off); } u_int64_t hammer_time(u_int64_t modulep, u_int64_t physfree) { caddr_t kmdp; - int gsel_tss, off, x; + int gsel_tss, x; struct pcpu *pc; u_int64_t msr; char *env; @@ -1270,10 +1273,6 @@ /* now running on new page tables, configured,and u/iom is accessible */ - /* Map the message buffer. */ - for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) - pmap_kenter((vm_offset_t)msgbufp + off, avail_end + off); - msgbufinit(msgbufp, MSGBUF_SIZE); fpuinit(); ==== //depot/projects/linuxolator/src/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.573 2006/11/12 21:48:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.576 2006/11/23 21:37:04 ru Exp $"); /* * Manages physical address maps. @@ -168,8 +168,7 @@ struct pmap kernel_pmap_store; -vm_paddr_t avail_start; /* PA of first available physical page */ -vm_paddr_t avail_end; /* PA of last available physical page */ +static vm_paddr_t avail_start; /* PA of first available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ @@ -1613,7 +1612,7 @@ #define PC_FREE1 0xfffffffffffffffful #define PC_FREE2 0x000000fffffffffful -static uint64_t pc_freemask[3] = { PC_FREE0, PC_FREE1, PC_FREE2 }; +static uint64_t pc_freemask[_NPCM] = { PC_FREE0, PC_FREE1, PC_FREE2 }; SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, "Current number of pv entries"); @@ -2127,7 +2126,8 @@ return; } - if (prot & VM_PROT_WRITE) + if ((prot & (VM_PROT_WRITE|VM_PROT_EXECUTE)) == + (VM_PROT_WRITE|VM_PROT_EXECUTE)) return; anychanged = 0; @@ -2163,7 +2163,10 @@ * Check for large page. */ if ((ptpaddr & PG_PS) != 0) { - *pde &= ~(PG_M|PG_RW); + if ((prot & VM_PROT_WRITE) == 0) + *pde &= ~(PG_M|PG_RW); + if ((prot & VM_PROT_EXECUTE) == 0) + *pde |= pg_nx; anychanged = 1; continue; } @@ -2178,6 +2181,8 @@ retry: obits = pbits = *pte; + if ((pbits & PG_V) == 0) + continue; if (pbits & PG_MANAGED) { m = NULL; if (pbits & PG_A) { @@ -2193,7 +2198,10 @@ } } - pbits &= ~(PG_RW | PG_M); + if ((prot & VM_PROT_WRITE) == 0) + pbits &= ~(PG_RW | PG_M); + if ((prot & VM_PROT_EXECUTE) == 0) + pbits |= pg_nx; if (pbits != obits) { if (!atomic_cmpset_long(pte, obits, pbits)) ==== //depot/projects/linuxolator/src/sys/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.311 2006/10/26 21:42:16 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.312 2006/11/28 20:04:00 ru Exp $"); /* * AMD64 Trap and System call handling @@ -646,9 +646,10 @@ #endif if (type == T_PAGEFLT) { printf("fault virtual address = 0x%lx\n", eva); - printf("fault code = %s %s, %s\n", + printf("fault code = %s %s %s, %s\n", code & PGEX_U ? "user" : "supervisor", code & PGEX_W ? "write" : "read", + code & PGEX_I ? "instruction" : "data", code & PGEX_P ? "protection violation" : "page not present"); } printf("instruction pointer = 0x%lx:0x%lx\n", ==== //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#5 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.468 2006/10/26 22:11:34 jb Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.469 2006/11/22 10:34:12 ru Exp $ cpu HAMMER ident GENERIC @@ -73,7 +73,7 @@ # Linux 32-bit ABI support options COMPAT_LINUX32 # Compatible with i386 linux binaries -options LINPROCFS # Cannot be a module yet. +options LINPROCFS options LINSYSFS # Bus support. ==== //depot/projects/linuxolator/src/sys/amd64/include/pmap.h#3 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.136 2006/11/13 20:33:54 ru Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.137 2006/11/19 20:54:57 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -296,7 +296,6 @@ extern caddr_t CADDR1; extern pt_entry_t *CMAP1; -extern vm_paddr_t avail_end; extern vm_paddr_t phys_avail[]; extern vm_paddr_t dump_avail[]; extern vm_offset_t virtual_avail; ==== //depot/projects/linuxolator/src/sys/amd64/isa/clock.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.227 2006/10/02 18:23:36 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.228 2006/12/03 03:49:28 bde Exp $"); /* * Routines to handle clock hardware. @@ -115,6 +115,7 @@ static int (*i8254_pending)(struct intsrc *); static int i8254_ticked; static int using_lapic_timer; +static int rtc_reg = -1; static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR; @@ -421,24 +422,30 @@ u_char val; RTC_LOCK; - outb(IO_RTC, reg); - inb(0x84); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } val = inb(IO_RTC + 1); - inb(0x84); RTC_UNLOCK; return (val); } -static __inline void -writertc(u_char reg, u_char val) +static void +writertc(int reg, u_char val) { RTC_LOCK; - inb(0x84); - outb(IO_RTC, reg); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } + outb(IO_RTC + 1, val); inb(0x84); - outb(IO_RTC + 1, val); - inb(0x84); /* XXX work around wrong order in rtcin() */ RTC_UNLOCK; } ==== //depot/projects/linuxolator/src/sys/arm/arm/cpufunc.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.13 2006/11/07 22:36:56 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.15 2006/11/30 23:34:07 cognet Exp $"); #include #include @@ -1015,7 +1015,6 @@ #ifdef CPU_XSCALE_IXP425 if (cputype == CPU_ID_IXP425_533 || cputype == CPU_ID_IXP425_400 || cputype == CPU_ID_IXP425_266) { - ixp425_icu_init(); cpufuncs = xscale_cpufuncs; #if defined(PERFCTRS) @@ -1886,7 +1885,9 @@ xscale_setup(args) char *args; { +#ifndef CPU_XSCALE_CORE3 uint32_t auxctl; +#endif int cpuctrl, cpuctrlmask; /* @@ -1932,6 +1933,7 @@ /* cpu_control(cpuctrlmask, cpuctrl);*/ cpu_control(0xffffffff, cpuctrl); +#ifndef CPU_XSCALE_CORE3 /* Make sure write coalescing is turned on */ __asm __volatile("mrc p15, 0, %0, c1, c0, 1" : "=r" (auxctl)); @@ -1942,6 +1944,7 @@ #endif __asm __volatile("mcr p15, 0, %0, c1, c0, 1" : : "r" (auxctl)); +#endif } #endif /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 CPU_XSCALE_80219 */ ==== //depot/projects/linuxolator/src/sys/arm/arm/genassym.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.7 2006/11/01 04:54:50 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.8 2006/11/30 04:17:04 jb Exp $"); #include #include #include @@ -69,7 +69,6 @@ ASSYM(PCB_PC, offsetof(struct pcb, un_32.pcb32_pc)); ASSYM(PCB_SP, offsetof(struct pcb, un_32.pcb32_sp)); -ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread)); ASSYM(M_LEN, offsetof(struct mbuf, m_len)); ==== //depot/projects/linuxolator/src/sys/arm/arm/identcpu.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.9 2006/11/07 22:36:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.10 2006/11/19 23:45:33 sam Exp $"); #include #include #include @@ -141,7 +141,7 @@ }; static const char * const ixp425_steppings[16] = { - "step 0", "rev 1", "rev 2", "rev 3", + "step 0 (A0)", "rev 1 (ARMv5TE)", "rev 2", "rev 3", "rev 4", "rev 5", "rev 6", "rev 7", "rev 8", "rev 9", "rev 10", "rev 11", "rev 12", "rev 13", "rev 14", "rev 15", ==== //depot/projects/linuxolator/src/sys/arm/arm/nexus_io.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.6 2006/10/21 04:25:00 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.7 2006/11/19 23:46:50 sam Exp $"); #include #include @@ -152,7 +152,7 @@ void -nexus_bs_unmap(void *t, bus_size_t size) +nexus_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) { /* * Temporary implementation ==== //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#4 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.73 2006/11/12 21:48:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.76 2006/12/01 12:29:55 cognet Exp $"); #include #include #include @@ -585,7 +585,7 @@ #endif /* ARM_MMU_SA1 == 1*/ #if ARM_MMU_XSCALE == 1 -#if (ARM_NMMUS > 1) +#if (ARM_NMMUS > 1) || defined (CPU_XSCALE_CORE3) static u_int xscale_use_minidata; #endif @@ -614,9 +614,11 @@ * is significantly faster than the traditional, write-through * behavior of this case. */ +#ifndef CPU_XSCALE_CORE3 pte_l1_s_cache_mode |= L1_S_XSCALE_TEX(TEX_XSCALE_X); pte_l2_l_cache_mode |= L2_XSCALE_L_TEX(TEX_XSCALE_X); pte_l2_s_cache_mode |= L2_XSCALE_T_TEX(TEX_XSCALE_X); +#endif #endif /* XSCALE_CACHE_READ_WRITE_ALLOCATE */ #ifdef XSCALE_CACHE_WRITE_THROUGH /* @@ -673,8 +675,16 @@ pte_l1_c_proto = L1_C_PROTO_xscale; pte_l2_s_proto = L2_S_PROTO_xscale; +#ifdef CPU_XSCALE_CORE3 + pmap_copy_page_func = pmap_copy_page_generic; + pmap_zero_page_func = pmap_zero_page_generic; + xscale_use_minidata = 0; + pte_l1_s_cache_mode_pt = pte_l2_l_cache_mode_pt = + pte_l2_s_cache_mode_pt = 0; +#else pmap_copy_page_func = pmap_copy_page_xscale; pmap_zero_page_func = pmap_zero_page_xscale; +#endif /* * Disable ECC protection of page table access, for now. @@ -3136,6 +3146,7 @@ if (TAILQ_EMPTY(&m->md.pv_list)) return; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); curpm = vmspace_pmap(curproc->p_vmspace); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { if (flush == FALSE && (pv->pv_pmap == curpm || @@ -3437,7 +3448,8 @@ else if (!pve && !(m->flags & (PG_UNMANAGED | PG_FICTITIOUS))) pve = pmap_get_pv_entry(); - KASSERT(pve != NULL, ("No pv")); + KASSERT(pve != NULL || m->flags & (PG_UNMANAGED | + PG_FICTITIOUS), ("No pv")); oflags = pve->pv_flags; /* @@ -4005,7 +4017,7 @@ * StrongARM accesses to non-cached pages are non-burst making writing * _any_ bulk data very slow. */ -#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 +#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 || defined(CPU_XSCALE_CORE3) void pmap_zero_page_generic(vm_paddr_t phys, int off, int size) { @@ -4094,7 +4106,7 @@ pt_entry_t *ptep, *sptep, pte; vm_offset_t next_bucket, eva; -#if (ARM_NMMUS > 1) +#if (ARM_NMMUS > 1) || defined(CPU_XSCALE_CORE3) if (xscale_use_minidata == 0) return; #endif @@ -4267,7 +4279,7 @@ * hook points. The same comment regarding cachability as in * pmap_zero_page also applies here. */ -#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 +#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 || defined (CPU_XSCALE_CORE3) void pmap_copy_page_generic(vm_paddr_t src, vm_paddr_t dst) { @@ -4430,6 +4442,9 @@ int pmap_ts_referenced(vm_page_t m) { + + if (m->flags & PG_FICTITIOUS) + return (0); return (pmap_clearbit(m, PVF_REF)); } ==== //depot/projects/linuxolator/src/sys/arm/at91/at91.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.8 2006/08/28 20:05:00 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.10 2006/11/20 06:27:15 imp Exp $"); #include #include @@ -68,7 +68,7 @@ } static void -at91_bs_unmap(void *t, bus_size_t size) +at91_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) { vm_offset_t va, endva; @@ -171,7 +171,7 @@ static int at91_probe(device_t dev) { - device_set_desc(dev, "AT91RM9200 device bus"); + device_set_desc(dev, "AT91 device bus"); return (0); } @@ -410,12 +410,12 @@ AT91RM92_SYS_SIZE, &sc->sc_sys_sh) != 0) panic("Enable to map IRQ registers"); sc->sc_irq_rman.rm_type = RMAN_ARRAY; - sc->sc_irq_rman.rm_descr = "AT91RM92 IRQs"; + sc->sc_irq_rman.rm_descr = "AT91 IRQs"; sc->sc_mem_rman.rm_type = RMAN_ARRAY; - sc->sc_mem_rman.rm_descr = "AT91RM92 Memory"; + sc->sc_mem_rman.rm_descr = "AT91 Memory"; #if 0 sc->sc_usbmem_rman.rm_type = RMAN_ARRAY; - sc->sc_usbmem_rman.rm_descr = "AT91RM92 USB Memory-mapped regs"; + sc->sc_usbmem_rman.rm_descr = "AT91RM9200 USB Memory-mapped regs"; #endif if (rman_init(&sc->sc_irq_rman) != 0 || rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0) ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_pio.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.3 2006/07/14 22:22:57 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.4 2006/11/29 08:17:40 imp Exp $"); #include #include @@ -154,8 +154,8 @@ AT91_PIO_LOCK_DESTROY(sc); goto out; } - sc->cdev = make_dev(&at91_pio_cdevsw, device_get_unit(dev), UID_ROOT - , GID_WHEEL, 0600, "pio%d", device_get_unit(dev)); + sc->cdev = make_dev(&at91_pio_cdevsw, device_get_unit(dev), UID_ROOT, + GID_WHEEL, 0600, "pio%d", device_get_unit(dev)); if (sc->cdev == NULL) { err = ENOMEM; goto out; ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_spi.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.3 2006/10/20 07:10:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.4 2006/11/29 07:57:02 imp Exp $"); #include #include @@ -223,7 +223,7 @@ cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) goto out; WR4(sc, PDC_TNPR, addr); - WR4(sc, PDC_TNCR, cmd->tx_cmd_sz); + WR4(sc, PDC_TNCR, cmd->tx_data_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREWRITE); mode[i++] = BUS_DMASYNC_POSTWRITE; } @@ -234,12 +234,12 @@ WR4(sc, PDC_RCR, cmd->tx_cmd_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); mode[i++] = BUS_DMASYNC_POSTREAD; - if (cmd->tx_data_sz > 0) { + if (cmd->rx_data_sz > 0) { if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->rx_data, cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) goto out; WR4(sc, PDC_RNPR, addr); - WR4(sc, PDC_RNCR, cmd->tx_data_sz); + WR4(sc, PDC_RNCR, cmd->rx_data_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); mode[i++] = BUS_DMASYNC_POSTREAD; } ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_twi.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.5 2006/10/20 07:06:39 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.7 2006/11/29 08:15:59 imp Exp $"); #include #include @@ -52,9 +52,7 @@ struct resource *irq_res; /* IRQ resource */ struct resource *mem_res; /* Memory resource */ struct mtx sc_mtx; /* basically a perimeter lock */ - volatile int flags; -#define RXRDY 4 -#define TXRDY 0x10 + volatile uint32_t flags; uint32_t cwgr; int sc_started; int twi_addr; @@ -131,8 +129,6 @@ WR4(sc, TWI_CR, TWI_CR_SWRST); WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); WR4(sc, TWI_CWGR, sc->cwgr); -// WR4(sc, TWI_IER, TWI_SR_RXRDY | TWI_SR_OVRE | TWI_SR_UNRE | -// TWI_SR_NACK); if ((sc->iicbus = device_add_child(dev, "iicbus", -1)) == NULL) device_printf(dev, "could not allocate iicbus instance\n"); @@ -208,17 +204,17 @@ struct at91_twi_softc *sc = xsc; uint32_t status; - /* Reading the status also clears the interrupt */ status = RD4(sc, TWI_SR); - printf("status %x\n", status); if (status == 0) return; - AT91_TWI_LOCK(sc); + sc->flags |= status & (TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); if (status & TWI_SR_RXRDY) - sc->flags |= RXRDY; + sc->flags |= TWI_SR_RXRDY; if (status & TWI_SR_TXRDY) - sc->flags |= TXRDY; - AT91_TWI_UNLOCK(sc); + sc->flags |= TWI_SR_TXRDY; + if (status & TWI_SR_TXCOMP) + sc->flags |= TWI_SR_TXCOMP; + WR4(sc, TWI_IDR, status); wakeup(sc); return; } @@ -227,130 +223,17 @@ at91_twi_wait(struct at91_twi_softc *sc, uint32_t bit) { int err = 0; - int counter = 10000; + int counter = 100000; + uint32_t sr; - while (!(RD4(sc, TWI_SR) & bit) && counter-- >= 0) - DELAY(10); + while (!((sr = RD4(sc, TWI_SR)) & bit) && counter-- > 0) + continue; if (counter <= 0) - err = EIO; - return (err); -} - -/* - * Stop the transfer by entering a STOP state on the iic bus. For read - * operations, we've already entered the STOP state, since we need to do - * that to read the last character. For write operations, we need to - * wait for the TXCOMP bit to turn on before returning. - */ -static int -at91_twi_stop(device_t dev) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 3 18:42:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A8D516A528; Sun, 3 Dec 2006 18:42:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1993A16A416 for ; Sun, 3 Dec 2006 18:42:20 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0133443CD3 for ; Sun, 3 Dec 2006 18:41:04 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB3IfWMW068665 for ; Sun, 3 Dec 2006 18:41:32 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB3IfWej068659 for perforce@freebsd.org; Sun, 3 Dec 2006 18:41:32 GMT (envelope-from piso@freebsd.org) Date: Sun, 3 Dec 2006 18:41:32 GMT Message-Id: <200612031841.kB3IfWej068659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 110963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 18:42:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=110963 Change 110963 by piso@piso_newluxor on 2006/12/03 18:41:27 Do not worship the demon. Affected files ... .. //depot/projects/soc2005/libalias/etc/rc.firewall#4 edit Differences ... ==== //depot/projects/soc2005/libalias/etc/rc.firewall#4 (text+ko) ==== @@ -132,8 +132,8 @@ case ${firewall_nat_enable} in [Yy][Ee][Ss]) if [ -n "${firewall_nat_interface}" ]; then - ${fwcmd} nat 666 config if ${firewall_nat_interface} log - ${fwcmd} add 50 nat 666 ip4 from any to any via ${firewall_nat_interface} + ${fwcmd} nat 123 config if ${firewall_nat_interface} log + ${fwcmd} add 50 nat 123 ip4 from any to any via ${firewall_nat_interface} fi ;; esac From owner-p4-projects@FreeBSD.ORG Sun Dec 3 19:12:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 668A916A47C; Sun, 3 Dec 2006 19:12:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 40CAE16A417 for ; Sun, 3 Dec 2006 19:12:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D1A443CA2 for ; Sun, 3 Dec 2006 19:11:49 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB3JCHNP076712 for ; Sun, 3 Dec 2006 19:12:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB3JCHfi076708 for perforce@freebsd.org; Sun, 3 Dec 2006 19:12:17 GMT (envelope-from sam@freebsd.org) Date: Sun, 3 Dec 2006 19:12:17 GMT Message-Id: <200612031912.kB3JCHfi076708@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 110968 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 19:12:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=110968 Change 110968 by sam@sam_ebb on 2006/12/03 19:12:05 add to branch Affected files ... .. //depot/projects/crypto/tools/debugscripts/README#1 branch .. //depot/projects/crypto/tools/debugscripts/dot.gdbinit#1 branch .. //depot/projects/crypto/tools/debugscripts/gdbinit.i386#1 branch .. //depot/projects/crypto/tools/debugscripts/gdbinit.kernel#1 branch .. //depot/projects/crypto/tools/debugscripts/kgdb#1 branch .. //depot/projects/crypto/tools/debugscripts/kld_deb.py#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 3 19:15:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 129D516A47E; Sun, 3 Dec 2006 19:15:56 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A8D3016A407 for ; Sun, 3 Dec 2006 19:15:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77FCC43CD0 for ; Sun, 3 Dec 2006 19:15:02 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB3JFLAW077132 for ; Sun, 3 Dec 2006 19:15:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB3JFLbh077129 for perforce@freebsd.org; Sun, 3 Dec 2006 19:15:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 3 Dec 2006 19:15:21 GMT Message-Id: <200612031915.kB3JFLbh077129@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 110969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2006 19:15:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=110969 Change 110969 by hselasky@hselasky_mini_itx on 2006/12/03 19:14:41 Fix a bug in the uplcom probe routine where a revision of 0xFFFF was not treated as a special value. The old version of uplcom.c has the check, so probably a misunderstanding happened. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#14 (text+ko) ==== @@ -424,7 +424,8 @@ while(up->vendor) { if ((up->vendor == uaa->vendor) && (up->product == uaa->product) && - (up->release <= uaa->release)) { + ((up->release <= uaa->release) || + (up->release == 0xFFFF))) { return up; } up++; From owner-p4-projects@FreeBSD.ORG Mon Dec 4 01:10:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90D9F16A415; Mon, 4 Dec 2006 01:10:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 547E616A403 for ; Mon, 4 Dec 2006 01:10:05 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5263B43C9D for ; Mon, 4 Dec 2006 01:09:35 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB41A4qf063432 for ; Mon, 4 Dec 2006 01:10:04 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB41A4L0063429 for perforce@freebsd.org; Mon, 4 Dec 2006 01:10:04 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 4 Dec 2006 01:10:04 GMT Message-Id: <200612040110.kB41A4L0063429@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 110985 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 01:10:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=110985 Change 110985 by soc-andrew@soc-andrew_serv on 2006/12/04 01:09:11 Add two missing files Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/DiskUI.lua#1 add .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/PartitionUI.lua#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Dec 4 10:44:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F8CE16A47B; Mon, 4 Dec 2006 10:44:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F230716A407 for ; Mon, 4 Dec 2006 10:44:04 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 987D843CC1 for ; Mon, 4 Dec 2006 10:43:28 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4Ai0dK080271 for ; Mon, 4 Dec 2006 10:44:00 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4Ai0B1080267 for perforce@freebsd.org; Mon, 4 Dec 2006 10:44:00 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 4 Dec 2006 10:44:00 GMT Message-Id: <200612041044.kB4Ai0B1080267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 110998 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 10:44:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=110998 Change 110998 by zec@zec_tpx32 on 2006/12/04 10:43:00 Set the per-thread vnet affinity to match the ifnet / vnet binding in rt_ieee80211msg() during routing message dispatch. Affected files ... .. //depot/projects/vimage/src/sys/net/rtsock.c#3 edit Differences ... ==== //depot/projects/vimage/src/sys/net/rtsock.c#3 (text+ko) ==== @@ -1033,7 +1033,9 @@ if (m->m_flags & M_PKTHDR) m->m_pkthdr.len += data_len; mtod(m, struct if_announcemsghdr *)->ifan_msglen += data_len; + CURVNETB_SET(ifp->if_vnetb); rt_dispatch(m, NULL); + CURVNETB_RESTORE(); } } From owner-p4-projects@FreeBSD.ORG Mon Dec 4 14:50:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DB1616A49E; Mon, 4 Dec 2006 14:50:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D9A7E16A417 for ; Mon, 4 Dec 2006 14:50:21 +0000 (UTC) (envelope-from wkoszek@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8105243CAF for ; Mon, 4 Dec 2006 14:49:42 +0000 (GMT) (envelope-from wkoszek@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4EoFg6037030 for ; Mon, 4 Dec 2006 14:50:15 GMT (envelope-from wkoszek@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4EoFP5037023 for perforce@freebsd.org; Mon, 4 Dec 2006 14:50:15 GMT (envelope-from wkoszek@FreeBSD.org) Date: Mon, 4 Dec 2006 14:50:15 GMT Message-Id: <200612041450.kB4EoFP5037023@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wkoszek@FreeBSD.org using -f From: "Wojciech A. Koszek" To: Perforce Change Reviews Cc: Subject: PERFORCE change 111008 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 14:50:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=111008 Change 111008 by wkoszek@wkoszek_wshit on 2006/12/04 14:49:23 Set ad0s1a as a root filesystem. Affected files ... .. //depot/projects/mips2/src/sys/mips/conf/MALTA#11 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/conf/MALTA#11 (text+ko) ==== @@ -48,6 +48,7 @@ options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories +options ROOTDEVNAME=\"ufs:ad0s1a\" # Debugging for use in -current From owner-p4-projects@FreeBSD.ORG Mon Dec 4 15:10:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA34016A47C; Mon, 4 Dec 2006 15:10:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A9ECB16A412 for ; Mon, 4 Dec 2006 15:10:43 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11CD243CAD for ; Mon, 4 Dec 2006 15:10:09 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4FAg89042261 for ; Mon, 4 Dec 2006 15:10:42 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4FAflj042257 for perforce@freebsd.org; Mon, 4 Dec 2006 15:10:41 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 4 Dec 2006 15:10:41 GMT Message-Id: <200612041510.kB4FAflj042257@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111010 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 15:10:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=111010 Change 111010 by zec@zec_tca51 on 2006/12/04 15:09:44 Initial attempt at implementing interface moving from one vnet to another. So far this works only for IFT_ETHER type devices, and as long as none of the devfs methods gets triggered on an interface in a non-default vnet. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#3 edit .. //depot/projects/vimage/src/sys/net/if.c#3 edit .. //depot/projects/vimage/src/sys/net/if_var.h#3 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#3 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include +#include #include #include #include @@ -174,6 +175,7 @@ { struct vimage *new_vip; struct vnet_base *new_vnetb = NULL; + u_char eaddr[6]; if (vi_req == NULL || strcmp(vi_req->vi_name, "-") == 0) { if (vip == &vimage_0) @@ -192,17 +194,23 @@ if (new_vnetb == NULL) return (ENXIO); -#if 0 /* XXX deal with this later (tm) */ if (ifp == NULL) - ifp = ifunit(vi_req->vi_chroot, cur_vnetb); + ifp = ifunit(vi_req->vi_chroot); if (ifp == NULL) return (ENXIO); - if (vi_req != NULL && ifunit(vi_req->vi_parent_name, new_vnetb) != NULL) - return (EEXIST); + if (vi_req != NULL) { + struct ifnet *t_ifp; + + CURVNETB_SET(new_vnetb); + t_ifp = ifunit(vi_req->vi_parent_name); + CURVNETB_RESTORE(); + if (t_ifp != NULL) + return (EEXIST); + } /* Loopback interfaces cannot be moved across network stacks */ - if (ifp == &cur_vnetb->loif) + if (ifp->if_flags & IFF_LOOPBACK) return (EPERM); /* @@ -212,89 +220,53 @@ * in the target vnetb. */ switch (ifp->if_type) { - case IFT_ETHER: /* all these types use struct arpcom */ - case IFT_FDDI: - case IFT_XETHER: - case IFT_ISO88025: - case IFT_L2VLAN: - ether_ifdetach(ifp, ETHER_BPF_SUPPORTED); + case IFT_ETHER: + bcopy(IF_LLADDR(ifp), eaddr, 6); + ether_ifdetach(ifp); break; default: - if_detach(ifp); + panic("don't know yet how to handle iftype %d", ifp->if_type); + /* if_detach(ifp); */ } + ifp->if_bpf = NULL; - ifp->if_vnetb = new_vnetb; - - if (ifp->if_rname == NULL) { - ifp->if_rname = ifp->if_name; - ifp->if_runit = ifp->if_unit; + CURVNETB_SET(new_vnetb); + INIT_VNET_NET(new_vnetb); + /* + * Try to find an empty slot below if_index. If we fail, take + * the next slot. + * + * XXX: should be locked! + */ + for (ifp->if_index = 1; ifp->if_index <= V_if_index; ifp->if_index++) { + if (ifnet_byindex(ifp->if_index) == NULL) + break; } + /* Catch if_index overflow. */ + if (ifp->if_index < 1) + panic("vi_if_move: if_index overflow"); - unit = 0; - if (vip->vi_parent != NULL && - new_vnetb == vip->vi_parent->v_vnetb && - ifp->if_rname != NULL) { - ifp->if_name = ifp->if_rname; - unit = ifp->if_runit; - } - - if (vi_req != NULL && strlen(vi_req->vi_parent_name) && unit == 0 ) { - char c; - const char *cp; - unsigned len, m; + if (ifp->if_index > V_if_index) + V_if_index = ifp->if_index; + if (V_if_index >= V_if_indexlim) + if_grow(); + ifnet_byindex(ifp->if_index) = ifp; - len = strlen(vi_req->vi_parent_name); - if (len < 2 || len > IFNAMSIZ) - return (EINVAL); - cp = vi_req->vi_parent_name + len - 1; - c = *cp; - if (c < '0' || c > '9') - return (EINVAL); /* trailing garbage */ - m = 1; - do { - if (cp == vi_req->vi_parent_name) - return (EINVAL); /* no interface name */ - unit += (c - '0') * m; - if (unit > 1000000) - return (EINVAL); /* number is unreasonable */ - m *= 10; - c = *--cp; - } while (c >= '0' && c <= '9'); - len = cp - vi_req->vi_parent_name + 1; - bcopy(vi_req->vi_parent_name, ifp->if_fname, len); - ifp->if_fname[len] = '\0'; - ifp->if_name = ifp->if_fname; - } else { - do { - TAILQ_FOREACH(ifp1, &new_vnetb->ifnet, if_link) { - if (strcmp(ifp->if_name, ifp1->if_name)) - continue; - if (unit == ifp1->if_unit) - break; - } - unit++; - } while (ifp1); - unit--; - } - - ifp->if_unit = unit; switch (ifp->if_type) { - case IFT_ETHER: /* all these types use struct arpcom */ - case IFT_FDDI: - case IFT_XETHER: - case IFT_ISO88025: - case IFT_L2VLAN: - ether_ifattach(ifp, ETHER_BPF_SUPPORTED); + case IFT_ETHER: + ether_ifattach(ifp, eaddr); break; default: - if_attach(ifp); + panic("don't know yet how to handle iftype %d", ifp->if_type); + /* if_attach(ifp); */ } getmicrotime(&ifp->if_lastchange); if (vi_req != NULL) - sprintf(vi_req->vi_chroot, "%s%d", ifp->if_name, ifp->if_unit); + sprintf(vi_req->vi_chroot, "%s%d", + ifp->if_dname, ifp->if_dunit); -#endif + CURVNETB_RESTORE(); return (0); } @@ -518,17 +490,19 @@ struct vnet_base *vnetb = vip->v_vnetb; struct vprocg *vprocg = vip->v_procg; struct vcpu *vcpu = vip->v_cpu; + struct ifnet *ifp; + INIT_VNET_NET(vnetb); -#if 0 /* return all interfaces to the parent vnetb */ - while ((ifp = TAILQ_FIRST(&vnetb->ifnet)) != NULL) { - if (ifp == &vnet->loif) { + while ((ifp = TAILQ_FIRST(&V_ifnet)) != NULL) { + if (ifp->if_flags & IFF_LOOPBACK) { bpfdetach(ifp); if_detach(ifp); } else vi_if_move(NULL, ifp, vip); } +#if 0 /* * Call all domain destroy routines - those basically have to free * the allocated memory and stop all the pending timers. ==== //depot/projects/vimage/src/sys/net/if.c#3 (text+ko) ==== @@ -106,7 +106,6 @@ static void if_attachdomain(void *); static void if_attachdomain1(struct ifnet *); static int ifconf(u_long, caddr_t); -static void if_grow(void); static void if_init(void *); static void if_check(void *); static void if_qflush(struct ifaltq *); @@ -357,7 +356,7 @@ return 0; } -static void +void if_grow(void) { INIT_VNET_NET(curvnetb); @@ -1511,26 +1510,19 @@ static void if_slowtimo(void *arg) { -#ifdef VIMAGE - struct vnet_base *vnetb; -#endif struct ifnet *ifp; int s = splimp(); IFNET_RLOCK(); -#ifdef VIMAGE - LIST_FOREACH(vnetb, &vnetb_head, vnetb_le) { - INIT_VNET_NET(vnetb); -#endif + VNETB_ITERLOOP_BEGIN(); + INIT_VNET_NET(curvnetb); TAILQ_FOREACH(ifp, &V_ifnet, if_link) { if (ifp->if_timer == 0 || --ifp->if_timer) continue; if (ifp->if_watchdog) (*ifp->if_watchdog)(ifp); } -#ifdef VIMAGE - } -#endif + VNETB_ITERLOOP_END(); IFNET_RUNLOCK(); splx(s); timeout(if_slowtimo, (void *)0, hz / IFNET_SLOWHZ); ==== //depot/projects/vimage/src/sys/net/if_var.h#3 (text+ko) ==== @@ -669,6 +669,7 @@ int if_allmulti(struct ifnet *, int); struct ifnet* if_alloc(u_char); void if_attach(struct ifnet *); +void if_grow(void); int if_delmulti(struct ifnet *, struct sockaddr *); void if_detach(struct ifnet *); void if_purgeaddrs(struct ifnet *); From owner-p4-projects@FreeBSD.ORG Mon Dec 4 15:52:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 629D816A417; Mon, 4 Dec 2006 15:52:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1C3C216A415 for ; Mon, 4 Dec 2006 15:52:43 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16A4943E1A for ; Mon, 4 Dec 2006 15:51:04 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4FpZ8m049177 for ; Mon, 4 Dec 2006 15:51:35 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4FpZ2B049169 for perforce@freebsd.org; Mon, 4 Dec 2006 15:51:35 GMT (envelope-from piso@freebsd.org) Date: Mon, 4 Dec 2006 15:51:35 GMT Message-Id: <200612041551.kB4FpZ2B049169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111011 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 15:52:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=111011 Change 111011 by piso@piso_newluxor on 2006/12/04 15:51:32 Add iwi to the list of filtered drivers. Affected files ... .. //depot/projects/soc2006/intr_filter/notes#11 edit Differences ... ==== //depot/projects/soc2006/intr_filter/notes#11 (text+ko) ==== @@ -81,4 +81,4 @@ Converted drivers: --bfe, em, re, aac, xl+-bfe, em, re, aac, xl, iwi From owner-p4-projects@FreeBSD.ORG Mon Dec 4 16:02:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A6A116A415; Mon, 4 Dec 2006 16:02:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 33C3216A47C for ; Mon, 4 Dec 2006 16:02:51 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04CBC43CBC for ; Mon, 4 Dec 2006 16:02:17 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4G2ojN051243 for ; Mon, 4 Dec 2006 16:02:50 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4G2ohr051240 for perforce@freebsd.org; Mon, 4 Dec 2006 16:02:50 GMT (envelope-from piso@freebsd.org) Date: Mon, 4 Dec 2006 16:02:50 GMT Message-Id: <200612041602.kB4G2ohr051240@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111012 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 16:02:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=111012 Change 111012 by piso@piso_newluxor on 2006/12/04 16:02:38 Try to reduce diff against HEAD. Affected files ... .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#12 edit Differences ... ==== //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#12 (text+ko) ==== @@ -111,26 +111,26 @@ } static void -intrcnt_updatename(struct ppc_intr_handler *ppc_ih) +intrcnt_updatename(struct ppc_intr_handler *ih) { - intrcnt_setname(ppc_ih->ih_event->ie_fullname, ppc_ih->ih_index); + intrcnt_setname(ih->ih_event->ie_fullname, ih->ih_index); } static void -intrcnt_register(struct ppc_intr_handler *ppc_ih) +intrcnt_register(struct ppc_intr_handler *ih) { char straystr[MAXCOMLEN + 1]; - KASSERT(ppc_ih->ih_event != NULL, + KASSERT(ih->ih_event != NULL, ("%s: ppc_intr_handler with no event", __func__)); - ppc_ih->ih_index = intrcnt_index; + ih->ih_index = intrcnt_index; intrcnt_index += 2; - snprintf(straystr, MAXCOMLEN + 1, "stray irq%d", ppc_ih->ih_irq); - intrcnt_updatename(ppc_ih); - ppc_ih->ih_count = &intrcnt[ppc_ih->ih_index]; - intrcnt_setname(straystr, ppc_ih->ih_index + 1); - ppc_ih->ih_straycount = &intrcnt[ppc_ih->ih_index + 1]; + snprintf(straystr, MAXCOMLEN + 1, "stray irq%d", ih->ih_irq); + intrcnt_updatename(ih); + ih->ih_count = &intrcnt[ih->ih_index]; + intrcnt_setname(straystr, ih->ih_index + 1); + ih->ih_straycount = &intrcnt[ih->ih_index + 1]; } void @@ -143,7 +143,6 @@ if (intr_handlers != NULL) panic("intr_init: interrupts intialized twice\n"); - intr_nirq = nirq; intr_handlers = malloc(nirq * sizeof(struct ppc_intr_handler), M_INTR, M_NOWAIT|M_ZERO); @@ -175,7 +174,7 @@ inthand_add(const char *name, u_int irq, int (*filter)(void *), void (*handler)(void *), void *arg, int flags, void **cookiep) { - struct ppc_intr_handler *ppc_ih; + struct ppc_intr_handler *ih; struct intr_event *event, *orphan; int error = 0; @@ -183,9 +182,9 @@ * Work around a race where more than one CPU may be registering * handlers on the same IRQ at the same time. */ - ppc_ih = &intr_handlers[irq]; + ih = &intr_handlers[irq]; mtx_lock_spin(&intr_table_lock); - event = ppc_ih->ih_event; + event = ih->ih_event; mtx_unlock_spin(&intr_table_lock); if (event == NULL) { error = intr_event_create(&event, (void *)irq, 0, @@ -195,12 +194,12 @@ mtx_lock_spin(&intr_table_lock); - if (ppc_ih->ih_event == NULL) { - ppc_ih->ih_event = event; + if (ih->ih_event == NULL) { + ih->ih_event = event; mtx_unlock_spin(&intr_table_lock); } else { orphan = event; - event = ppc_ih->ih_event; + event = ih->ih_event; mtx_unlock_spin(&intr_table_lock); intr_event_destroy(orphan); } @@ -212,7 +211,7 @@ if (error) return (error); - intrcnt_register(ppc_ih); + intrcnt_register(ih); return (0); } @@ -221,16 +220,17 @@ inthand_remove(u_int irq, void *cookie) { - return(intr_event_remove_handler(cookie)); + return (intr_event_remove_handler(cookie)); } /* Stray detection MD code */ static struct intr_event * -walk_intr_ppc(void) { +walk_intr_ppc(void) +{ struct ppc_intr_handler *ppc; static int i = 0; - for (; iih_event != NULL) @@ -286,15 +286,15 @@ static void intr_stray_handler(void *cookie) { - struct ppc_intr_handler *ppc_ih = cookie; + struct ppc_intr_handler *ih = cookie; - if (*intr_handlers[ppc_ih->ih_irq].ih_straycount < MAX_STRAY_LOG) { - printf("stray irq %d\n", ppc_ih->ih_irq); + if (*intr_handlers[ih->ih_irq].ih_straycount < MAX_STRAY_LOG) { + printf("stray irq %d\n", ih->ih_irq); - atomic_add_long(intr_handlers[ppc_ih->ih_irq].ih_straycount, 1); - if (*intr_handlers[ppc_ih->ih_irq].ih_straycount >= MAX_STRAY_LOG) + atomic_add_long(intr_handlers[ih->ih_irq].ih_straycount, 1); + if (*intr_handlers[ih->ih_irq].ih_straycount >= MAX_STRAY_LOG) printf("got %d stray irq %d's: not logging anymore\n", - MAX_STRAY_LOG, ppc_ih->ih_irq); + MAX_STRAY_LOG, ih->ih_irq); } } From owner-p4-projects@FreeBSD.ORG Mon Dec 4 16:37:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC87F16A4FD; Mon, 4 Dec 2006 16:37:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 86E1416A4B3 for ; Mon, 4 Dec 2006 16:37:09 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4988743F32 for ; Mon, 4 Dec 2006 16:31:30 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4GVRhO057665 for ; Mon, 4 Dec 2006 16:31:27 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4GVREi057659 for perforce@freebsd.org; Mon, 4 Dec 2006 16:31:27 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 16:31:27 GMT Message-Id: <200612041631.kB4GVREi057659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111013 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 16:37:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=111013 Change 111013 by millert@millert_g5tower on 2006/12/04 16:31:09 The data field of mac_file_check_ioctl() is not usable as it is a pointer into userspace. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_generic.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_file.c#9 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#21 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#30 edit .. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#23 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#47 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_generic.c#6 (text+ko) ==== @@ -747,8 +747,7 @@ } #ifdef MAC - error = mac_file_check_ioctl(proc_ucred(p), fp->f_fglob, uap->com, - (void *)uap->data); + error = mac_file_check_ioctl(proc_ucred(p), fp->f_fglob, uap->com); if (error) goto out; #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_file.c#9 (text+ko) ==== @@ -116,12 +116,11 @@ } int -mac_file_check_ioctl(struct ucred *cred, struct fileglob *fg, u_long cmd, - void *data) +mac_file_check_ioctl(struct ucred *cred, struct fileglob *fg, u_long cmd) { int error; - MAC_CHECK(file_check_ioctl, cred, fg, fg->fg_label, cmd, data); + MAC_CHECK(file_check_ioctl, cred, fg, fg->fg_label, cmd); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#21 (text+ko) ==== @@ -132,7 +132,7 @@ int mac_file_check_get_offset(struct ucred *cred, struct fileglob *fg); int mac_file_check_inherit(struct ucred *cred, struct fileglob *fg); int mac_file_check_ioctl(struct ucred *cred, struct fileglob *fg, - u_long com, void *data); + u_long cmd); int mac_file_check_lock(struct ucred *cred, struct fileglob *fg, int op, struct flock *fl); int mac_file_check_mmap(struct ucred *cred, struct fileglob *fg, ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#30 (text+ko) ==== @@ -725,8 +725,7 @@ struct ucred *cred, struct fileglob *fg, struct label *label, - unsigned long cmd, - void *data + unsigned long cmd ); /** @brief Access control check for file locking ==== //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#23 (text+ko) ==== @@ -1985,12 +1985,12 @@ static int mac_mls_file_check_ioctl(struct ucred *cred, struct fileglob *fg, - struct label *fdlabel, unsigned long com, void *data) + struct label *fdlabel, unsigned long com) { if (!mac_mls_enabled) return (0); - MLS_MESSAGE("file_check_ioctl: fp %p com %d(%x) data %d(%p)\n", fp, com, data); + MLS_MESSAGE("file_check_ioctl: fp %p com %d(%x)\n", fp, com); #warning Implement mac_mls_file_check_ioctl() return (0); } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#47 (text+ko) ==== @@ -3105,7 +3105,7 @@ */ static int sebsd_file_check_ioctl(struct ucred *cred, struct fileglob *fg, - struct label *fglabel, u_long com, void *data) + struct label *fglabel, u_long com) { return (file_has_perm(cred, fg, fglabel, 0)); From owner-p4-projects@FreeBSD.ORG Mon Dec 4 16:39:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEA3E16A492; Mon, 4 Dec 2006 16:39:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 92C7416A417 for ; Mon, 4 Dec 2006 16:39:33 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4177943D5E for ; Mon, 4 Dec 2006 16:34:23 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4GYXrb058649 for ; Mon, 4 Dec 2006 16:34:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4GYXnK058646 for perforce@freebsd.org; Mon, 4 Dec 2006 16:34:33 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 16:34:33 GMT Message-Id: <200612041634.kB4GYXnK058646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111018 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 16:39:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=111018 Change 111018 by millert@millert_g5tower on 2006/12/04 16:33:55 Move mac_vnode_label_associate_extattr() proto to proper location. Fix compiler warning caused by global variable buf. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#22 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#22 (text+ko) ==== @@ -141,7 +141,7 @@ int *prot); int mac_file_check_receive(struct ucred *cred, struct fileglob *fg); int mac_file_check_set(struct ucred *cred, struct fileglob *fg, - char *buf, int buflen); + char *bufp, int buflen); void mac_file_label_associate(struct ucred *cred, struct fileglob *fg); void mac_file_label_destroy(struct fileglob *fg); void mac_file_label_init(struct fileglob *fg); @@ -391,9 +391,9 @@ vfs_context_t ctx); void mac_vnode_label_associate_devfs(struct mount *mp, struct devnode *de, struct vnode *vp); +int mac_vnode_label_associate_extattr(struct mount *mp, struct vnode *vp); int mac_vnode_label_associate_fdesc(struct mount *mp, struct fdescnode *fnp, struct vnode *vp, vfs_context_t ctx); -int mac_vnode_label_associate_extattr(struct mount *mp, struct vnode *vp); void mac_vnode_label_associate_singlelabel(struct mount *mp, struct vnode *vp); void mac_vnode_label_copy(struct label *l1, struct label *l2); From owner-p4-projects@FreeBSD.ORG Mon Dec 4 16:39:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE0B416A4FF; Mon, 4 Dec 2006 16:39:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C919616A4CE for ; Mon, 4 Dec 2006 16:39:57 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6CAE44008 for ; Mon, 4 Dec 2006 16:34:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4GXVoK058487 for ; Mon, 4 Dec 2006 16:33:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4GXU3s058484 for perforce@freebsd.org; Mon, 4 Dec 2006 16:33:30 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 16:33:30 GMT Message-Id: <200612041633.kB4GXU3s058484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111015 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 16:39:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=111015 Change 111015 by millert@millert_g5tower on 2006/12/04 16:32:52 Add missing check for read-only filesystem in mac_vnop_setxattr() and mac_vnop_removexattr(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs_subr.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs_subr.c#8 (text+ko) ==== @@ -156,6 +156,9 @@ uio_t auio; int error; + if (vfs_isrdonly(vp->v_mount)) + return (EROFS); + context.vc_proc = current_proc(); context.vc_ucred = kauth_cred_get(); auio = uio_createwithbuffer(1, 0, UIO_SYSSPACE, UIO_WRITE, @@ -198,6 +201,9 @@ struct vfs_context context; int error; + if (vfs_isrdonly(vp->v_mount)) + return (EROFS); + context.vc_proc = current_proc(); context.vc_ucred = kauth_cred_get(); From owner-p4-projects@FreeBSD.ORG Mon Dec 4 16:39:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4788016A59B; Mon, 4 Dec 2006 16:39:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1076116A538 for ; Mon, 4 Dec 2006 16:39:58 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6356243E42 for ; Mon, 4 Dec 2006 16:34:28 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4GYXkB058643 for ; Mon, 4 Dec 2006 16:34:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4GYXH9058640 for perforce@freebsd.org; Mon, 4 Dec 2006 16:34:33 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 16:34:33 GMT Message-Id: <200612041634.kB4GYXH9058640@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 16:39:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=111017 Change 111017 by millert@millert_g5tower on 2006/12/04 16:33:33 relabel /private/tmp since it gets recreated. Also label /private/var/tmp for good measure. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/rc#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/rc#5 (text+ko) ==== @@ -133,8 +133,8 @@ touch -t 198501010000 /var/run/sudo/* fi -# Set labels on /var/run -/sbin/setfiles /etc/sedarwin/refpolicy/contexts/files/file_contexts /private/var/run +# Set labels on /tmp and /var/run +/sbin/setfiles /etc/sedarwin/refpolicy/contexts/files/file_contexts /private/tmp /private/var/run /private/var/tmp # Clear utmp (who is logged on). touch /var/run/utmp /var/run/utmpx From owner-p4-projects@FreeBSD.ORG Mon Dec 4 16:41:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F75E16A47E; Mon, 4 Dec 2006 16:41:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 60E3B16A47C for ; Mon, 4 Dec 2006 16:41:42 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2823543D66 for ; Mon, 4 Dec 2006 16:35:06 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4GZZmM058749 for ; Mon, 4 Dec 2006 16:35:35 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4GZZWt058746 for perforce@freebsd.org; Mon, 4 Dec 2006 16:35:35 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 16:35:35 GMT Message-Id: <200612041635.kB4GZZWt058746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111019 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 16:41:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=111019 Change 111019 by millert@millert_g5tower on 2006/12/04 16:35:12 Revert to vendor versions. Changes were from Panther and are not needed any longer. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ppc/ppc_init.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/pexpert/pexpert/ppc/boot.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ppc/ppc_init.c#3 (text+ko) ==== @@ -30,12 +30,6 @@ /* * @OSF_COPYRIGHT@ */ -/* - * NOTICE: This file was modified by McAfee Research in 2004 to introduce - * support for mandatory and extensible security protections. This notice - * is included in support of clause 2.2 (b) of the Apple Public License, - * Version 2.0. - */ #include #include @@ -144,30 +138,6 @@ void ppc_init_cpu( struct per_proc_info *proc_info); -static int *boot_exdata = 0; -static size_t boot_exdatalen = 0; - -int preload_find_data (const char *name, size_t *size, void **ptr) -{ - size_t rlen = boot_exdatalen; - int *exp = boot_exdata; - - while (rlen > 0) { - size_t esize = (exp[0] + sizeof (int) * 5 + 0xfff) & ~0xfff; - if (strcmp ((char *) (exp + 1), name)) { - rlen -= esize; - exp = (int *) (((char*)exp) + esize); - } - else { - *size = exp[0]; - *ptr = exp + 5; - return 1; - } - } - - return 0; -} - /* * Routine: ppc_init * Function: @@ -309,10 +279,7 @@ } } } - - boot_exdata = args->exdata; - boot_exdatalen = args->exdatalen; - + machine_startup(args); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/pexpert/pexpert/ppc/boot.h#3 (text+ko) ==== @@ -30,12 +30,6 @@ /* * @OSF_COPYRIGHT@ */ -/* - * NOTICE: This file was modified by McAfee Research in 2004 to introduce - * support for mandatory and extensible security protections. This notice - * is included in support of clause 2.2 (b) of the Apple Public License, - * Version 2.0. - */ #ifndef _PEXPERT_PPC_BOOT_H_ #define _PEXPERT_PPC_BOOT_H_ @@ -71,7 +65,7 @@ /* Boot argument structure - passed into Mach kernel at boot time. */ -#define kBootArgsRevision 2 +#define kBootArgsRevision 1 #define kBootArgsVersion1 1 #define kBootArgsVersion2 2 @@ -85,8 +79,6 @@ void *deviceTreeP; /* Base of flattened device tree */ unsigned long deviceTreeLength;/* Length of flattened tree */ unsigned long topOfKernelData;/* Highest address used in kernel data area */ - void *exdata; - unsigned long exdatalen; } boot_args; extern boot_args passed_args; From owner-p4-projects@FreeBSD.ORG Mon Dec 4 16:41:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30DF516A51F; Mon, 4 Dec 2006 16:41:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E9CA316A505 for ; Mon, 4 Dec 2006 16:41:49 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 612B643E6E for ; Mon, 4 Dec 2006 16:36:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4GabeC058898 for ; Mon, 4 Dec 2006 16:36:37 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4GabMb058895 for perforce@freebsd.org; Mon, 4 Dec 2006 16:36:37 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 16:36:37 GMT Message-Id: <200612041636.kB4GabMb058895@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111020 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 16:41:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=111020 Change 111020 by millert@millert_g5tower on 2006/12/04 16:35:38 #ifdef out unused code. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#10 (text+ko) ==== @@ -831,6 +831,7 @@ audit_log_end(ab); } +#ifdef __linux__ /** * avc_add_callback - Register a callback for security events. * @callback: callback function @@ -871,6 +872,7 @@ out: return rc; } +#endif static inline int avc_sidcmp(u32 x, u32 y) { From owner-p4-projects@FreeBSD.ORG Mon Dec 4 16:42:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6344216A508; Mon, 4 Dec 2006 16:42:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 28D5E16A505 for ; Mon, 4 Dec 2006 16:42:52 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6081443EF5 for ; Mon, 4 Dec 2006 16:37:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4Gbdhx058949 for ; Mon, 4 Dec 2006 16:37:39 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4GbdNB058946 for perforce@freebsd.org; Mon, 4 Dec 2006 16:37:39 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 16:37:39 GMT Message-Id: <200612041637.kB4GbdNB058946@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111022 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 16:42:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=111022 Change 111022 by millert@millert_g5tower on 2006/12/04 16:37:20 Map GFP_ATOMIC to M_NOWAIT like it should be. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/linux-compat.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/linux-compat.h#3 (text+ko) ==== @@ -128,7 +128,7 @@ #define kstrdup(str, flags) sebsd_strdup(str, M_SEBSD, flags) #define kfree(addr) sebsd_free(addr, M_SEBSD) #define __get_free_page(flags) sebsd_malloc(PAGE_SIZE, M_SEBSD, flags) -#define GFP_ATOMIC M_WAITOK /* XXX - want M_NOWAIT but too early */ +#define GFP_ATOMIC M_NOWAIT #define GFP_KERNEL M_WAITOK /* TBD: no boot-time tunable support yet */ From owner-p4-projects@FreeBSD.ORG Mon Dec 4 16:43:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B69916A4A7; Mon, 4 Dec 2006 16:43:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 42A9716A494 for ; Mon, 4 Dec 2006 16:43:11 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BD8D43EF0 for ; Mon, 4 Dec 2006 16:37:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4GbceM058943 for ; Mon, 4 Dec 2006 16:37:38 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4GbcQO058940 for perforce@freebsd.org; Mon, 4 Dec 2006 16:37:38 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 16:37:38 GMT Message-Id: <200612041637.kB4GbcQO058940@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 16:43:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=111021 Change 111021 by millert@millert_g5tower on 2006/12/04 16:37:00 It is OK to for malloc to sleep during sidtab initialization. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/sidtab.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/sidtab.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ { int i; - s->htable = kmalloc(sizeof(*(s->htable)) * SIDTAB_SIZE, GFP_ATOMIC); + s->htable = kmalloc(sizeof(*(s->htable)) * SIDTAB_SIZE, GFP_KERNEL); if (!s->htable) return ENOMEM; for (i = 0; i < SIDTAB_SIZE; i++) From owner-p4-projects@FreeBSD.ORG Mon Dec 4 16:43:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7F1F16A4B3; Mon, 4 Dec 2006 16:43:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8BC8A16A407 for ; Mon, 4 Dec 2006 16:43:50 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8485E43CBE for ; Mon, 4 Dec 2006 16:38:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4GcflY059104 for ; Mon, 4 Dec 2006 16:38:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4Gcebl059101 for perforce@freebsd.org; Mon, 4 Dec 2006 16:38:40 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 16:38:40 GMT Message-Id: <200612041638.kB4Gcebl059101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111023 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 16:43:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=111023 Change 111023 by millert@millert_g5tower on 2006/12/04 16:37:42 Do not build/install the DeviceAccessControl kext. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/Makefile#4 (text+ko) ==== @@ -8,7 +8,6 @@ $(MAKE) -C cctools $(MAKE) -C kext_tools $(MAKE) -C $(XNU) - $(MAKE) -C drivers $(MAKE) -C bootstrap_cmds $(MAKE) -C libmac $(MAKE) -C mac_cmds @@ -29,7 +28,6 @@ $(DESTDIR)/$(SYSTEM_PLUGINS)/ install -m 644 $(XNU)/BUILD/dst/mach_kernel $(DESTDIR)/ tar -C $(XNU)/BUILD/dst -cf - usr/include | tar -C $(DESTDIR) -xf - - $(MAKE) -C drivers DSTROOT=$(DESTDIR) install $(MAKE) -C libmac install $(MAKE) -C mac_cmds install $(MAKE) -C osx_cmds install @@ -49,7 +47,6 @@ $(MAKE) -C bootstrap_cmds clean $(MAKE) -C cctools clean $(MAKE) -C kext_tools clean - $(MAKE) -C drivers clean $(MAKE) -C libmac clean $(MAKE) -C mac_cmds clean $(MAKE) -C osx_cmds clean From owner-p4-projects@FreeBSD.ORG Mon Dec 4 16:43:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1132B16A559; Mon, 4 Dec 2006 16:43:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AEE8816A494 for ; Mon, 4 Dec 2006 16:43:50 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAACB43CC6 for ; Mon, 4 Dec 2006 16:38:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4GcfZ2059110 for ; Mon, 4 Dec 2006 16:38:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4GcfHI059107 for perforce@freebsd.org; Mon, 4 Dec 2006 16:38:41 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 16:38:41 GMT Message-Id: <200612041638.kB4GcfHI059107@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111024 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 16:43:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=111024 Change 111024 by millert@millert_g5tower on 2006/12/04 16:38:00 Comment out a debugging print statement. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/iokit/Kernel/IOService.cpp#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/iokit/Kernel/IOService.cpp#4 (text+ko) ==== @@ -2446,7 +2446,7 @@ if( !symbol) continue; - IOLog("%s alloc (symbol %p props %p)\n", symbol->getCStringNoCopy(), symbol, props); + //IOLog("%s alloc (symbol %p props %p)\n", symbol->getCStringNoCopy(), symbol, props); // alloc the driver instance inst = (IOService *) OSMetaClass::allocClassWithName( symbol); From owner-p4-projects@FreeBSD.ORG Mon Dec 4 16:44:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3AED16A417; Mon, 4 Dec 2006 16:44:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BADD816A412 for ; Mon, 4 Dec 2006 16:44:50 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A34643CF0 for ; Mon, 4 Dec 2006 16:39:05 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4GWT45058093 for ; Mon, 4 Dec 2006 16:32:29 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4GWTI1058090 for perforce@freebsd.org; Mon, 4 Dec 2006 16:32:29 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 16:32:29 GMT Message-Id: <200612041632.kB4GWTI1058090@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111014 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 16:44:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=111014 Change 111014 by millert@millert_g5tower on 2006/12/04 16:31:37 Explicitly mention rremoving kext caches Affected files ... .. //depot/projects/trustedbsd/sedarwin8/sefos-install.txt#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/sefos-install.txt#6 (text+ko) ==== @@ -213,7 +213,15 @@ $ sudo make install -Step 12: Reboot in Single User Mode +Step 12: Flush kernel caches + + Remove the old kext and kernel caches: + + $ sudo rm -f /System/Library/Extensions.* \ + /System/Library/Caches/com.apple.kernelcaches/* + + +Step 13: Reboot in Single User Mode At this point, you should now have a new Darwin kernel, support libraries, command line tools, and configuration files installed. @@ -233,13 +241,13 @@ mode has been enabled. -Step 13: Reboot +Step 14: Reboot If you were in single user mode to set initial file labels, run 'reboot' from the console. Otherwise, restart the machine normally. -Step 14: Verify System Functionality +Step 15: Verify System Functionality After rebooting, log in on the graphical console. After you have entered your password you will be presented with an additional From owner-p4-projects@FreeBSD.ORG Mon Dec 4 16:44:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A93816A5D1; Mon, 4 Dec 2006 16:44:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BF8DB16A590 for ; Mon, 4 Dec 2006 16:44:53 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBAAB43CBD for ; Mon, 4 Dec 2006 16:39:09 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4GdhdW059225 for ; Mon, 4 Dec 2006 16:39:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4Gdgoo059222 for perforce@freebsd.org; Mon, 4 Dec 2006 16:39:42 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 16:39:42 GMT Message-Id: <200612041639.kB4Gdgoo059222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111025 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 16:44:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=111025 Change 111025 by millert@millert_g5tower on 2006/12/04 16:38:58 Export the posix sem/shm subsystem locks. Use struct definitions in the header files instead of duplicating them in the .c files. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/posix_sem.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/posix_shm.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/posix_sem.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/posix_shm.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/posix_sem.c#6 (text+ko) ==== @@ -65,6 +65,7 @@ #include #include #include +#include #include #include @@ -90,30 +91,7 @@ #define f_ops f_fglob->fg_ops #define f_offset f_fglob->fg_offset #define f_data f_fglob->fg_data -#define PSEMNAMLEN 31 /* maximum name segment length we bother with */ - -struct pseminfo { - unsigned int psem_flags; - unsigned int psem_usecount; - mode_t psem_mode; - uid_t psem_uid; - gid_t psem_gid; - char psem_name[PSEMNAMLEN + 1]; /* segment name */ - semaphore_t psem_semobject; - struct proc * sem_proc; - struct label * psem_label; -}; -#define PSEMINFO_NULL (struct pseminfo *)0 -#define PSEM_NONE 1 -#define PSEM_DEFINED 2 -#define PSEM_ALLOCATED 4 -#define PSEM_MAPPED 8 -#define PSEM_INUSE 0x10 -#define PSEM_REMOVED 0x20 -#define PSEM_INCREATE 0x40 -#define PSEM_INDELETE 0x80 - struct psemcache { LIST_ENTRY(psemcache) psem_hash; /* hash chain */ struct pseminfo *pseminfo; /* vnode the name refers to */ @@ -183,10 +161,7 @@ static lck_grp_t *psx_sem_subsys_lck_grp; static lck_grp_attr_t *psx_sem_subsys_lck_grp_attr; static lck_attr_t *psx_sem_subsys_lck_attr; -static lck_mtx_t psx_sem_subsys_mutex; - -#define PSEM_SUBSYS_LOCK() lck_mtx_lock(& psx_sem_subsys_mutex) -#define PSEM_SUBSYS_UNLOCK() lck_mtx_unlock(& psx_sem_subsys_mutex) + lck_mtx_t psx_sem_subsys_mutex; static int psem_cache_add(struct pseminfo *psemp, struct psemname *pnp, struct psemcache *pcp); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/posix_shm.c#6 (text+ko) ==== @@ -67,6 +67,7 @@ #include #include #include +#include #include @@ -93,35 +94,7 @@ #define f_ops f_fglob->fg_ops #define f_offset f_fglob->fg_offset #define f_data f_fglob->fg_data -#define PSHMNAMLEN 31 /* maximum name segment length we bother with */ - -struct pshminfo { - unsigned int pshm_flags; - unsigned int pshm_usecount; - off_t pshm_length; - mode_t pshm_mode; - uid_t pshm_uid; - gid_t pshm_gid; - char pshm_name[PSHMNAMLEN + 1]; /* segment name */ - void * pshm_memobject; -#if DIAGNOSTIC - unsigned int pshm_readcount; - unsigned int pshm_writecount; - struct proc * pshm_proc; -#endif /* DIAGNOSTIC */ - struct label* pshm_label; -}; -#define PSHMINFO_NULL (struct pshminfo *)0 -#define PSHM_NONE 1 -#define PSHM_DEFINED 2 -#define PSHM_ALLOCATED 4 -#define PSHM_MAPPED 8 -#define PSHM_INUSE 0x10 -#define PSHM_REMOVED 0x20 -#define PSHM_INCREATE 0x40 -#define PSHM_INDELETE 0x80 - struct pshmcache { LIST_ENTRY(pshmcache) pshm_hash; /* hash chain */ struct pshminfo *pshminfo; /* vnode the name refers to */ @@ -193,10 +166,7 @@ static lck_grp_t *psx_shm_subsys_lck_grp; static lck_grp_attr_t *psx_shm_subsys_lck_grp_attr; static lck_attr_t *psx_shm_subsys_lck_attr; -static lck_mtx_t psx_shm_subsys_mutex; - -#define PSHM_SUBSYS_LOCK() lck_mtx_lock(& psx_shm_subsys_mutex) -#define PSHM_SUBSYS_UNLOCK() lck_mtx_unlock(& psx_shm_subsys_mutex) + lck_mtx_t psx_shm_subsys_mutex; /* Initialize the mutex governing access to the posix shm subsystem */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/posix_sem.h#4 (text+ko) ==== @@ -76,4 +76,10 @@ #define PSEM_INCREATE 0x40 #define PSEM_INDELETE 0x80 +#ifdef KERNEL +extern lck_mtx_t psx_sem_subsys_mutex; +#define PSEM_SUBSYS_LOCK() lck_mtx_lock(& psx_sem_subsys_mutex) +#define PSEM_SUBSYS_UNLOCK() lck_mtx_unlock(& psx_sem_subsys_mutex) +#endif + #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/posix_shm.h#4 (text+ko) ==== @@ -80,4 +80,10 @@ #define PSHM_INCREATE 0x40 #define PSHM_INDELETE 0x80 +#ifdef KERNEL +extern lck_mtx_t psx_shm_subsys_mutex; +#define PSHM_SUBSYS_LOCK() lck_mtx_lock(& psx_shm_subsys_mutex) +#define PSHM_SUBSYS_UNLOCK() lck_mtx_unlock(& psx_shm_subsys_mutex) +#endif /* KERNEL */ + #endif From owner-p4-projects@FreeBSD.ORG Mon Dec 4 16:47:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70BD616A494; Mon, 4 Dec 2006 16:47:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 26E2B16A4C9 for ; Mon, 4 Dec 2006 16:47:32 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7359543CF0 for ; Mon, 4 Dec 2006 16:44:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4GioB8060687 for ; Mon, 4 Dec 2006 16:44:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4GiosS060683 for perforce@freebsd.org; Mon, 4 Dec 2006 16:44:50 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 16:44:50 GMT Message-Id: <200612041644.kB4GiosS060683@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111027 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 16:47:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=111027 Change 111027 by millert@millert_g5tower on 2006/12/04 16:44:41 Fix locking in mac_vnode_label_associate_fdesc(): Use fp_lookup() not fdfile macro to get the struct fileproc for an fd and have it lock the proc fd lock. Use socket, posix sem and shm, and pipe locks. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#21 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#21 (text+ko) ==== @@ -952,15 +952,18 @@ mac_vnode_label_associate_fdesc(struct mount *mp, struct fdescnode *fnp, struct vnode *vp, vfs_context_t ctx) { - struct fileglob *fg; + struct fileproc *fp; struct pseminfo *psem; struct pshminfo *pshm; struct xsocket xso; struct socket *so; struct pipe *cpipe; struct vnode *fvp; + struct proc *p; int error; + error = 0; + /* * If no backing file, let the policy choose which label to use. */ @@ -970,52 +973,76 @@ return (0); } - fg = (*fdfile(vfs_context_proc(ctx), fnp->fd_fd))->f_fglob; - switch (fg->fg_type) { + p = vfs_context_proc(ctx); + error = fp_lookup(p, fnp->fd_fd, &fp, 0); + if (error) + return (error); + + if (fp->f_fglob == NULL) { + error = EBADF; + goto out; + } + + switch (fp->f_fglob->fg_type) { case DTYPE_VNODE: - fvp = (struct vnode *)fg->fg_data; + fvp = (struct vnode *)fp->f_fglob->fg_data; if ((error = vnode_getwithref(fvp))) - return (error); + goto out; MAC_PERFORM(vnode_label_copy, fvp->v_label, vp->v_label); (void)vnode_put(fvp); break; case DTYPE_SOCKET: - so = (struct socket *)fg->fg_data; + so = (struct socket *)fp->f_fglob->fg_data; + SOCK_LOCK(so); sotoxsocket(so, &xso); MAC_PERFORM(vnode_label_associate_socket, vfs_context_ucred(ctx), &xso, so->so_label, vp, vp->v_label); + SOCK_UNLOCK(so); break; case DTYPE_PSXSHM: - /* XXX: should hold the PSHM_SUBSYS lock. */ - pshm = pshmnodeinfo((struct pshmnode *)fg->fg_data); - if (pshm == NULL) - return (EINVAL); - MAC_PERFORM(vnode_label_associate_posixshm, - vfs_context_ucred(ctx), pshm, pshm->pshm_label, - vp, vp->v_label); + PSHM_SUBSYS_LOCK(); + pshm = pshmnodeinfo((struct pshmnode *)fp->f_fglob->fg_data); + if (pshm != NULL) { + MAC_PERFORM(vnode_label_associate_posixshm, + vfs_context_ucred(ctx), pshm, pshm->pshm_label, + vp, vp->v_label); + } else + error = EINVAL; + PSHM_SUBSYS_UNLOCK(); break; case DTYPE_PSXSEM: - /* XXX: should hold the PSEM_SUBSYS lock. */ - psem = psemnodeinfo((struct psemnode *)fg->fg_data); - if (psem == NULL) - return (EINVAL); - MAC_PERFORM(vnode_label_associate_posixsem, - vfs_context_ucred(ctx), psem, psem->psem_label, - vp, vp->v_label); + PSEM_SUBSYS_LOCK(); + psem = psemnodeinfo((struct psemnode *)fp->f_fglob->fg_data); + if (psem != NULL) { + MAC_PERFORM(vnode_label_associate_posixsem, + vfs_context_ucred(ctx), psem, psem->psem_label, + vp, vp->v_label); + } else + error = EINVAL; + PSEM_SUBSYS_UNLOCK(); break; case DTYPE_PIPE: - /* XXX: should PIPE_LOCK */ - cpipe = (struct pipe *)fg->fg_data; + cpipe = (struct pipe *)fp->f_fglob->fg_data; + /* kern/sys_pipe.c:pipe_select() suggests this test. */ + if (cpipe == (struct pipe *)-1) { + error = EINVAL; + goto out; + } + PIPE_LOCK(cpipe); MAC_PERFORM(vnode_label_associate_pipe, vfs_context_ucred(ctx), cpipe, cpipe->pipe_label, vp, vp->v_label); + PIPE_UNLOCK(cpipe); break; case DTYPE_KQUEUE: case DTYPE_FSEVENTS: default: MAC_PERFORM(vnode_label_associate_file, vfs_context_ucred(ctx), - mp, mp->mnt_mntlabel, fg, fg->fg_label, vp, vp->v_label); + mp, mp->mnt_mntlabel, fp->f_fglob, fp->f_fglob->fg_label, + vp, vp->v_label); break; } - return (0); +out: + fp_drop(p, fnp->fd_fd, fp, 0); + return (error); } From owner-p4-projects@FreeBSD.ORG Mon Dec 4 17:54:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FFBC16A417; Mon, 4 Dec 2006 17:54:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 295D516A403 for ; Mon, 4 Dec 2006 17:54:27 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD1F643CBA for ; Mon, 4 Dec 2006 17:53:48 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4HsMpN081076 for ; Mon, 4 Dec 2006 17:54:22 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4HsMdD081070 for perforce@freebsd.org; Mon, 4 Dec 2006 17:54:22 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 17:54:22 GMT Message-Id: <200612041754.kB4HsMdD081070@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111031 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 17:54:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=111031 Change 111031 by millert@millert_g5tower on 2006/12/04 17:54:01 Restore mac_is_present() routine, create a new command to use it. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/mac_cmds/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/mac_cmds/chkmac/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/mac_cmds/chkmac/chkmac.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/mac_cmds/chkmac/chkmac.c#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac.c#3 (text+ko) ==== @@ -471,13 +471,11 @@ strcat(mibname, policyname); strcat(mibname, ".enabled"); siz = 5; - /*error = sysctlnametomib(mibname, mib, &siz);*/ - error = 0; + error = sysctlnametomib(mibname, mib, &siz); free(mibname); } else { siz = 3; - error = 0; - /*error = sysctlnametomib("security.mac", mib, &siz);*/ + error = sysctlnametomib("security.mac", mib, &siz); } if (error == -1) { switch (errno) { ==== //depot/projects/trustedbsd/sedarwin8/darwin/mac_cmds/Makefile#2 (text+ko) ==== @@ -1,3 +1,3 @@ -SUBDIR= getfmac getlcmac getpmac lcs mexec setfsmac setlcmac setpmac +SUBDIR= getfmac getlcmac getpmac lcs mexec setfsmac setlcmac setpmac chkmac include ../../policies/mk/subdir.mk From owner-p4-projects@FreeBSD.ORG Mon Dec 4 17:55:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE43C16A415; Mon, 4 Dec 2006 17:55:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 94A5416A403 for ; Mon, 4 Dec 2006 17:55:24 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6006343CA5 for ; Mon, 4 Dec 2006 17:54:50 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4HtOdC081389 for ; Mon, 4 Dec 2006 17:55:24 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4HtOKc081386 for perforce@freebsd.org; Mon, 4 Dec 2006 17:55:24 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 17:55:24 GMT Message-Id: <200612041755.kB4HtOKc081386@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111032 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 17:55:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=111032 Change 111032 by millert@millert_g5tower on 2006/12/04 17:54:39 Add APL modification clause. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_generic.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_generic.c#7 (text+ko) ==== @@ -67,6 +67,12 @@ * * @(#)sys_generic.c 8.9 (Berkeley) 2/14/95 */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ #include #include From owner-p4-projects@FreeBSD.ORG Mon Dec 4 17:59:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5337A16A412; Mon, 4 Dec 2006 17:59:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 303F316A407 for ; Mon, 4 Dec 2006 17:59:30 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id E330E43CA7 for ; Mon, 4 Dec 2006 17:58:55 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4HxTXW081538 for ; Mon, 4 Dec 2006 17:59:29 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4HxTt3081535 for perforce@freebsd.org; Mon, 4 Dec 2006 17:59:29 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 17:59:29 GMT Message-Id: <200612041759.kB4HxTt3081535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111033 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 17:59:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=111033 Change 111033 by millert@millert_g5tower on 2006/12/04 17:59:04 Be sure to label aliased vnodes too. The vnode created by bdevvp() has no label and when checkalias() in vnode_create() returns that vnode for devfs to use, we failed to call mac_vnode_label_associate_singlelabel() Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_subr.c#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_subr.c#9 (text+ko) ==== @@ -3678,15 +3678,14 @@ if (param->vnfs_mp) { if (param->vnfs_mp->mnt_kern_flag & MNTK_LOCK_LOCAL) vp->v_flag |= VLOCKLOCAL; - if (insert) { #ifdef MAC - if ((vfs_flags(param->vnfs_mp) & MNT_MULTILABEL) == 0) { - /* No locks or references needed */ - mac_vnode_label_associate_singlelabel(param->vnfs_mp, vp); - vp->v_lflag |= VL_LABELED; - } + if ((vfs_flags(param->vnfs_mp) & MNT_MULTILABEL) == 0) { + /* No locks or references needed */ + mac_vnode_label_associate_singlelabel(param->vnfs_mp, vp); + vp->v_lflag |= VL_LABELED; + } #endif - + if (insert) { /* * enter in mount vnode list */ From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:00:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1923816A47B; Mon, 4 Dec 2006 18:00:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E8DC316A415 for ; Mon, 4 Dec 2006 18:00:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACEF743CA5 for ; Mon, 4 Dec 2006 17:59:57 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4I0V3r081642 for ; Mon, 4 Dec 2006 18:00:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4I0VtE081639 for perforce@freebsd.org; Mon, 4 Dec 2006 18:00:31 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:00:31 GMT Message-Id: <200612041800.kB4I0VtE081639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111034 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:00:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=111034 Change 111034 by millert@millert_g5tower on 2006/12/04 17:59:56 Add missing include. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket2.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_cache.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket2.c#6 (text+ko) ==== @@ -92,6 +92,10 @@ #include #include +#ifdef MAC +#include +#endif + #define DBG_FNC_SBDROP NETDBG_CODE(DBG_NETSOCK, 4) #define DBG_FNC_SBAPPEND NETDBG_CODE(DBG_NETSOCK, 5) ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_cache.c#4 (text+ko) ==== @@ -83,6 +83,10 @@ #include #include +#ifdef MAC +#include +#endif + /* * Name caching works as follows: * From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:01:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 815AC16A415; Mon, 4 Dec 2006 18:01:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3B7BC16A494 for ; Mon, 4 Dec 2006 18:01:36 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5F7243CB8 for ; Mon, 4 Dec 2006 18:00:59 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4I1X8T082328 for ; Mon, 4 Dec 2006 18:01:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4I1XfZ082325 for perforce@freebsd.org; Mon, 4 Dec 2006 18:01:33 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:01:33 GMT Message-Id: <200612041801.kB4I1XfZ082325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111035 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:01:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=111035 Change 111035 by millert@millert_g5tower on 2006/12/04 18:01:12 Use the correct vnode in mac_vnode_check_open(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#17 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#17 (text+ko) ==== @@ -519,7 +519,7 @@ ronly = (mp->mnt_flag & MNT_RDONLY) != 0; #ifdef MAC error = mac_vnode_check_open( - vfs_context_ucred(&context), vp, + vfs_context_ucred(&context), devvp, ronly ? FREAD : FREAD|FWRITE); if (error) goto out3; From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:05:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B3FF16A47C; Mon, 4 Dec 2006 18:05:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B3EF016A407 for ; Mon, 4 Dec 2006 18:05:39 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6920D43CA3 for ; Mon, 4 Dec 2006 18:05:05 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4I5dsD084457 for ; Mon, 4 Dec 2006 18:05:39 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4I5dTd084454 for perforce@freebsd.org; Mon, 4 Dec 2006 18:05:39 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:05:39 GMT Message-Id: <200612041805.kB4I5dTd084454@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111036 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:05:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=111036 Change 111036 by millert@millert_macbook on 2006/12/04 18:04:51 Integrate Device Access Control changes. Support Array/Dictionary in OSModuleData. Move 'device_access' policy configuration to Info.plist. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/build/mkPolicyInfoPlist.sh#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/drivers/DeviceAccessControl/DeviceAccessControlFireWire.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/drivers/DeviceAccessControl/DeviceAccessControlUSB.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/iokit/Kernel/IOCatalogue.cpp#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#10 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#23 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_data.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_iokit.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/device_access/mac_device_access.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/build/mkPolicyInfoPlist.sh#3 (xtext) ==== @@ -28,6 +28,13 @@ OSBundleCompatibleVersion ${POLICY_COMPVER} +__EOF__ + +if [ -f Default.plist ] ; then + cat Default.plist +fi + +cat << __EOF__ OSBundleLibraries __EOF__ ==== //depot/projects/trustedbsd/sedarwin8/darwin/drivers/DeviceAccessControl/DeviceAccessControlFireWire.h#3 (text+ko) ==== @@ -52,7 +52,7 @@ extern "C" vm_map_t kernel_map; extern "C" void kmem_free(vm_map_t map, vm_offset_t addr, vm_size_t size); -extern "C" int mac_iokit_check_device(int, struct mac_module_data *); +extern "C" int mac_iokit_check_device(char *, struct mac_module_data *); // Uncomment to enable debug output #define DEVICEACCESSCONTROL_DEBUG 1 ==== //depot/projects/trustedbsd/sedarwin8/darwin/drivers/DeviceAccessControl/DeviceAccessControlUSB.h#3 (text+ko) ==== @@ -51,7 +51,7 @@ extern "C" vm_map_t kernel_map; extern "C" void kmem_free(vm_map_t map, vm_offset_t addr, vm_size_t size); -extern "C" int mac_iokit_check_device(int, struct mac_module_data *); +extern "C" int mac_iokit_check_device(char *, struct mac_module_data *); // Uncomment to enable debug output #define DEVICEACCESSCONTROL_DEBUG 1 ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/iokit/Kernel/IOCatalogue.cpp#4 (text+ko) ==== @@ -57,6 +57,17 @@ #include +/* + * define IOC_DEBUG to display run-time debugging information + * #define IOC_DEBUG 1 + */ + +#ifdef IOC_DEBUG +#define DPRINTF(x) printf x +#else +#define IOC_DEBUG +#define DPRINTF(x) +#endif extern "C" { int IODTGetLoaderInfo( char *key, void **infoAddr, int *infoSize ); @@ -130,6 +141,86 @@ extern "C" kern_return_t kmod_retain(kmod_t id); extern "C" kern_return_t kmod_release(kmod_t id); +static bool +primitive_type(OSObject *obj) +{ + const OSMetaClass *typeID; + + typeID = OSTypeIDInst(obj); + if (typeID == OSTypeID(OSString) || typeID == OSTypeID(OSNumber) || + typeID == OSTypeID(OSBoolean) || typeID == OSTypeID(OSData)) + return(true); + else + return(false); +} + +static int +primitive_type_length(OSObject *obj) +{ + const OSMetaClass *typeID; + int len; + + typeID = OSTypeIDInst(obj); + if (typeID == OSTypeID(OSString)) { + OSString * stringObj = OSDynamicCast(OSString, obj); + len = stringObj->getLength() + 1; + } + else if (typeID == OSTypeID(OSNumber)) { + len = sizeof("4294967295"); /* UINT32_MAX */ + } + else if (typeID == OSTypeID(OSBoolean)) { + OSBoolean * boolObj = OSDynamicCast(OSBoolean, obj); + len = boolObj->isTrue() ? sizeof("true") : sizeof("false"); + } + else if (typeID == OSTypeID(OSData)) { + OSData * dataObj = OSDynamicCast(OSData, obj); + len = dataObj->getLength(); + } + else { + len = 0; + } + return(len); +} + +static void +primitive_type_collect(struct mac_module_data_element *element, OSObject *value) +{ + const OSMetaClass *typeID; + + typeID = OSTypeIDInst(value); + if (typeID == OSTypeID(OSString)) { + OSString *stringObj = OSDynamicCast(OSString, value); + element->value_type = MAC_DATA_TYPE_PRIMITIVE; + element->value_size = stringObj->getLength() + 1; + DPRINTF(("osdict: string %s size %d\n", + stringObj->getCStringNoCopy(), element->value_size)); + memcpy(element->value, stringObj->getCStringNoCopy(), + element->value_size); + } else if (typeID == OSTypeID(OSNumber)) { + OSNumber *numberObj = OSDynamicCast(OSNumber, value); + element->value_type = MAC_DATA_TYPE_PRIMITIVE; + element->value_size = sprintf(element->value, "%u", + numberObj->unsigned32BitValue()) + 1; + } else if (typeID == OSTypeID(OSBoolean)) { + OSBoolean *boolObj = OSDynamicCast(OSBoolean, value); + element->value_type = MAC_DATA_TYPE_PRIMITIVE; + if (boolObj->isTrue()) { + strcpy(element->value, "true"); + element->value_size = 5; + } else { + strcpy(element->value, "false"); + element->value_size = 6; + } + } else if (typeID == OSTypeID(OSData)) { + OSData *dataObj = OSDynamicCast(OSData, value); + element->value_type = MAC_DATA_TYPE_PRIMITIVE; + element->value_size = dataObj->getLength(); + DPRINTF(("osdict: data size %d\n", dataObj->getLength())); + memcpy(element->value, dataObj->getBytesNoCopy(), + element->value_size); + } +} + /********************************************************************* * This function takes an OSDictionary and returns a struct mac_module_data * list. @@ -143,9 +234,13 @@ struct mac_module_data * module_data = 0; struct mac_module_data_element * element; unsigned int strtabsize = 0; + unsigned int listtabsize = 0; + unsigned int dicttabsize = 0; unsigned int nkeys = 0; unsigned int datalen; - char * strtab = 0; + char *strtab = NULL; + char *listtab = NULL; + char *dicttab = NULL; vm_offset_t data_addr; keyIterator = OSCollectionIterator::withCollection(dict); @@ -161,18 +256,69 @@ continue; typeID = OSTypeIDInst(value); - if (typeID == OSTypeID(OSString)) { - OSString * stringObj = OSDynamicCast(OSString, value); - strtabsize += stringObj->getLength() + 1; - } else if (typeID == OSTypeID(OSNumber)) { - strtabsize += sizeof("4294967295"); /* UINT32_MAX */ - } else if (typeID == OSTypeID(OSBoolean)) { - OSBoolean * boolObj = OSDynamicCast(OSBoolean, value); - strtabsize += boolObj->isTrue() ? sizeof("true") : sizeof("false"); - } else if (typeID == OSTypeID(OSData)) { - OSData * dataObj = OSDynamicCast(OSData, value); - strtabsize += dataObj->getLength(); - } else { + if (primitive_type(value)) { + strtabsize += primitive_type_length(value); + } + else if (typeID == OSTypeID(OSArray)) { + unsigned int k, cnt, nents; + OSArray *arrayObj = OSDynamicCast(OSArray, value); + + nents = 0; + cnt = arrayObj->getCount(); + for (k = 0; k < cnt; k++) { + value = arrayObj->getObject(k); + typeID = OSTypeIDInst(value); + if (primitive_type(value)) { + listtabsize += primitive_type_length(value); + nents++; + } + else if (typeID == OSTypeID(OSDictionary)) { + unsigned int dents; + OSDictionary *dictObj; + OSString *dictkey; + OSCollectionIterator *dictIterator; + + dents = 0; + dictObj = OSDynamicCast(OSDictionary, value); + dictIterator = OSCollectionIterator::withCollection(dictObj); + if (!dictIterator) + goto finish; + while ((dictkey = OSDynamicCast(OSString, + dictIterator->getNextObject()))) { + OSObject *dictvalue; + + dictvalue = dictObj->getObject(dictkey); + if (!dictvalue) + continue; + if (primitive_type(dictvalue)) { + strtabsize += primitive_type_length(dictvalue); + } + else { + continue; /* Only handle primitive types here. */ + } + /* + * Allow for the "arraynnn/" prefix in the key length. + */ + strtabsize += dictkey->getLength() + 1; + dents++; + } + dictIterator->release(); + if (dents-- > 0) { + dicttabsize += sizeof(struct mac_module_data_list) + + dents * sizeof(struct mac_module_data_element); + nents++; + } + } + else { + continue; /* Skip everything else. */ + } + } + if (nents == 0) + continue; + listtabsize += sizeof(struct mac_module_data_list) + + (nents - 1) * sizeof(struct mac_module_data_element); + } + else { continue; /* skip anything else */ } strtabsize += key->getLength() + 1; @@ -185,16 +331,26 @@ * Allocate and fill in the module data structures. */ datalen = sizeof(struct mac_module_data) + - sizeof(mac_module_data_element) * (nkeys - 1) + strtabsize; + sizeof(mac_module_data_element) * (nkeys - 1) + + strtabsize + listtabsize + dicttabsize; + DPRINTF(("osdict: datalen %d strtabsize %d listtabsize %d dicttabsize %d\n", + datalen, strtabsize, listtabsize, dicttabsize)); if (kmem_alloc(kernel_map, &data_addr, datalen) != KERN_SUCCESS) goto finish; module_data = (mac_module_data *)data_addr; + module_data->base_addr = data_addr; module_data->size = datalen; module_data->count = nkeys; strtab = (char *)&module_data->data[nkeys]; + listtab = strtab + strtabsize; + dicttab = listtab + listtabsize; + DPRINTF(("osdict: data_addr %p strtab %p listtab %p dicttab %p end %p\n", + data_addr, strtab, listtab, dicttab, data_addr + datalen)); keyIterator->reset(); + nkeys = 0; element = &module_data->data[0]; + DPRINTF(("osdict: element %p\n", element)); while ( (key = OSDynamicCast(OSString, keyIterator->getNextObject())) ) { // Get the key's value and determine its type @@ -203,43 +359,138 @@ continue; /* Store key */ + DPRINTF(("osdict: element @%p\n", element)); element->key = strtab; element->key_size = key->getLength() + 1; + DPRINTF(("osdict: key %s size %d @%p\n", key->getCStringNoCopy(), element->key_size, strtab)); memcpy(element->key, key->getCStringNoCopy(), element->key_size); - /* Store value */ - element->value = element->key + element->key_size; typeID = OSTypeIDInst(value); - if (typeID == OSTypeID(OSString)) { - OSString * stringObj = OSDynamicCast(OSString, value); - element->value_size = stringObj->getLength() + 1; - memcpy(element->value, stringObj->getCStringNoCopy(), - element->value_size); - } else if (typeID == OSTypeID(OSNumber)) { - OSNumber * numberObj = OSDynamicCast(OSNumber, value); - element->value_size = sprintf(element->value, "%u", - numberObj->unsigned32BitValue()) + 1; - } else if (typeID == OSTypeID(OSBoolean)) { - OSBoolean * boolObj = OSDynamicCast(OSBoolean, value); - if (boolObj->isTrue()) { - strcpy(element->value, "true"); - element->value_size = 5; - } else { - strcpy(element->value, "false"); - element->value_size = 6; + if (primitive_type(value)) { + /* Store value */ + element->value = element->key + element->key_size; + DPRINTF(("osdict: primitive element value %p\n", element->value)); + primitive_type_collect(element, value); + strtab += element->key_size + element->value_size; + DPRINTF(("osdict: new strtab %p\n", strtab)); + } + else if (typeID == OSTypeID(OSArray)) { + unsigned int k, cnt, nents; + char *astrtab; + struct mac_module_data_list *arrayhd; + struct mac_module_data_element *ele; + OSArray *arrayObj = OSDynamicCast(OSArray, value); + + element->value = listtab; + DPRINTF(("osdict: array element value %p\n", element->value)); + element->value_type = MAC_DATA_TYPE_ARRAY; + arrayhd = (struct mac_module_data_list *)element->value; + arrayhd->type = 0; + DPRINTF(("osdict: arrayhd %p\n", arrayhd)); + nents = 0; + astrtab = strtab + element->key_size; + ele = &(arrayhd->list[0]); + cnt = arrayObj->getCount(); + for (k = 0; k < cnt; k++) { + value = arrayObj->getObject(k); + DPRINTF(("osdict: array ele %d @%p\n", nents, ele)); + ele->key = NULL; + ele->key_size = 0; + typeID = OSTypeIDInst(value); + if (primitive_type(value)) { + if (arrayhd->type != 0 && + arrayhd->type != MAC_DATA_TYPE_PRIMITIVE) + continue; + arrayhd->type = MAC_DATA_TYPE_PRIMITIVE; + ele->value = astrtab; + primitive_type_collect(ele, value); + astrtab += ele->value_size; + DPRINTF(("osdict: array new astrtab %p\n", astrtab)); + } + else if (typeID == OSTypeID(OSDictionary)) { + unsigned int dents; + char *dstrtab; + OSDictionary *dictObj; + OSString *dictkey; + OSCollectionIterator *dictIterator; + struct mac_module_data_list *dicthd; + struct mac_module_data_element *dele; + + if (arrayhd->type != 0 && + arrayhd->type != MAC_DATA_TYPE_DICT) + continue; + dictObj = OSDynamicCast(OSDictionary, value); + dictIterator = OSCollectionIterator::withCollection(dictObj); + if (!dictIterator) + goto finish; + DPRINTF(("osdict: dict\n")); + ele->value = dicttab; + ele->value_type = MAC_DATA_TYPE_DICT; + dicthd = (struct mac_module_data_list *)ele->value; + DPRINTF(("osdict: dicthd %p\n", dicthd)); + dstrtab = astrtab; + dents = 0; + while ((dictkey = OSDynamicCast(OSString, + dictIterator->getNextObject()))) { + OSObject *dictvalue; + + dictvalue = dictObj->getObject(dictkey); + if (!dictvalue) + continue; + dele = &(dicthd->list[dents]); + DPRINTF(("osdict: dict ele %d @%p\n", dents, dele)); + if (primitive_type(dictvalue)) { + dele->key = dstrtab; + dele->key_size = dictkey->getLength() + 1; + DPRINTF(("osdict: dictkey %s size %d @%p\n", + dictkey->getCStringNoCopy(), dictkey->getLength(), dstrtab)); + memcpy(dele->key, dictkey->getCStringNoCopy(), + dele->key_size); + dele->value = dele->key + dele->key_size; + primitive_type_collect(dele, dictvalue); + dstrtab += dele->key_size + dele->value_size; + DPRINTF(("osdict: dict new dstrtab %p\n", dstrtab)); + } + else { + continue; /* Only handle primitive types here. */ + } + dents++; + } + dictIterator->release(); + if (dents == 0) + continue; + arrayhd->type = MAC_DATA_TYPE_DICT; + ele->value_size = sizeof(struct mac_module_data_list) + + (dents - 1) * sizeof(struct mac_module_data_element); + DPRINTF(("osdict: dict ele size %d ents %d\n", ele->value_size, dents)); + dicttab += ele->value_size; + DPRINTF(("osdict: new dicttab %p\n", dicttab)); + dicthd->count = dents; + astrtab = dstrtab; + } + else { + continue; /* Skip everything else. */ + } + nents++; + ele++; } - } else if (typeID == OSTypeID(OSData)) { - OSData * dataObj = OSDynamicCast(OSData, value); - element->value_size = dataObj->getLength(); - memcpy(element->value, dataObj->getBytesNoCopy(), - element->value_size); - } else { + if (nents == 0) + continue; + element->value_size = sizeof(struct mac_module_data_list) + + (nents - 1) * sizeof(struct mac_module_data_element); + listtab += element->value_size; + DPRINTF(("osdict: new listtab %p\n", listtab)); + arrayhd->count = nents; + strtab = astrtab; + DPRINTF(("osdict: new strtab %p\n", strtab)); + } + else { continue; /* skip anything else */ } - - strtab += element->key_size + element->value_size; element++; } + DPRINTF(("module_data list @%p, key %p value %p\n", + module_data, module_data->data[0].key, module_data->data[0].value)); finish: if (keyIterator) keyIterator->release(); @@ -273,7 +524,7 @@ */ vm_map_copyin(kernel_map, (vm_offset_t)module_data, *datalen, FALSE, ©); kmem_free(kernel_map, (vm_offset_t)module_data, *datalen); - + DPRINTF(("get_module_data: copy @ %p\n", copy)); finish: return (kmod_args_t)copy; } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#10 (text+ko) ==== @@ -70,8 +70,9 @@ /* * Device types for mac_iokit_check_device() */ -#define MAC_DEVICE_USB 0 -#define MAC_DEVICE_FIREWIRE 1 +#define MAC_DEVICE_USB "USB" +#define MAC_DEVICE_FIREWIRE "FireWire" +#define MAC_DEVICE_TYPE_KEY "DeviceType" #ifndef KERNEL /* @@ -117,7 +118,7 @@ * I/O Kit device access control. * Note that this routine is called from a C++ I/O Kit driver. */ -int mac_iokit_check_device(int devtype, struct module_data *mdata); +int mac_iokit_check_device(char *devtype, struct module_data *mdata); __END_DECLS #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#23 (text+ko) ==== @@ -69,6 +69,18 @@ #include #include +/* + * define MB_DEBUG to display run-time debugging information + * #define MB_DEBUG 1 + */ + +#ifdef MB_DEBUG +#define DPRINTF(x) printf x +#else +#define MB_DEBUG +#define DPRINTF(x) +#endif + SYSCTL_NODE(, OID_AUTO, security, CTLFLAG_RW, 0, "Security Controls"); SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, @@ -671,6 +683,44 @@ } } +static __inline void +mac_policy_fixup_mmd_list(struct mac_module_data *new) +{ + struct mac_module_data *old; + struct mac_module_data_element *ele, *aele, *dele; + struct mac_module_data_list *arr, *dict; + unsigned int i, j, k; + + old = new->base_addr; + DPRINTF(("fixup_mmd: old %p new %p\n", old, new)); + for (i = 0; i < new->count; i++) { + ele = &(new->data[i]); + DPRINTF(("fixup_mmd: ele %p\n", ele)); + DPRINTF((" key %p value %p\n", ele->key, ele->value)); + mmd_fixup_ele(old, new, ele); /* Fix up key/value ptrs. */ + DPRINTF((" key %p value %p\n", ele->key, ele->value)); + if (ele->value_type == MAC_DATA_TYPE_ARRAY) { + arr = (struct mac_module_data_list *)ele->value; + DPRINTF(("fixup_mmd: array @%p\n", arr)); + for (j = 0; j < arr->count; j++) { + aele = &(arr->list[j]); + DPRINTF(("fixup_mmd: aele %p\n", aele)); + DPRINTF((" key %p value %p\n", aele->key, aele->value)); + mmd_fixup_ele(old, new, aele); + DPRINTF((" key %p value %p\n", aele->key, aele->value)); + if (arr->type == MAC_DATA_TYPE_DICT) { + dict = (struct mac_module_data_list *)aele->value; + DPRINTF(("fixup_mmd: dict @%p\n", dict)); + for (k = 0; k < dict->count; k++) + mmd_fixup_ele(old, new, + &(dict->list[k])); + } + } + } + } + new->base_addr = new; +} + int mac_policy_register(struct mac_policy_conf *mpc, mac_policy_handle_t *handlep, void *xd) @@ -766,22 +816,14 @@ if (xd) { struct mac_module_data *mmd = xd; /* module data from plist */ - char *strtab; /* Make a copy of the data. */ mpc->mpc_data = (void *)kalloc(mmd->size); if (mpc->mpc_data != NULL) { memcpy(mpc->mpc_data, mmd, mmd->size); - mmd = mpc->mpc_data; - /* Fix up pointers into string table after copy. */ - strtab = (char *)&mmd->data[mmd->count]; - for (i = 0; i < mmd->count; i++) { - mmd->data[i].key = strtab; - strtab += mmd->data[i].key_size; - mmd->data[i].value = strtab; - strtab += mmd->data[i].value_size; - } + /* Fix up pointers after copy. */ + mac_policy_fixup_mmd_list(mpc->mpc_data); } } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_data.h#4 (text+ko) ==== @@ -33,7 +33,11 @@ This structure specifies module data that is passed in to the TrustedBSD MAC policy module by the kernel module loader. The data is made of up key/value pairs where the key is always a - string and the value is either a string or binary data. + string and the value is a string, binary data or array. An array + may be a list of values (actually a similar set of key/value pairs, + but in this case the keys are always null), and may also consist of + a set of dictionaries, which in turn are made up of a list of key/value + pairs. Module data may be specified in the MAC policy module's Info.plist file as part of the OSModuleData dictionary. @@ -41,30 +45,74 @@ E.g. OSModuleData + + foo + bar + Beers + - foo - bar + type + lager + Name + Anchor Steam + + + type + ale + Name + Sierra Nevada Pale Ale + + */ struct mac_module_data_element { unsigned int key_size; unsigned int value_size; + unsigned int value_type; char *key; char *value; }; +struct mac_module_data_list { + unsigned int count; + unsigned int type; + struct mac_module_data_element list[1]; +}; struct mac_module_data { + void *base_addr; /* Orig base address, for ptr fixup. */ unsigned int size; unsigned int count; struct mac_module_data_element data[1]; /* actually bigger */ }; +#define MAC_DATA_TYPE_PRIMITIVE 0 /* Primitive type (int, string, etc.) */ +#define MAC_DATA_TYPE_ARRAY 1 /* Array type. */ +#define MAC_DATA_TYPE_DICT 2 /* Dictionary type. */ + #ifdef _SECURITY_MAC_POLICY_H_ /* XXX mac_policy_handle_t is defined in mac_policy.h, move prototype there? */ int mac_find_policy_data(const mac_policy_handle_t, const char *key, void **valp, size_t *sizep); int mac_find_module_data(struct mac_module_data *mmd, const char *key, void **valp, size_t *sizep); + +/* + * This is a routine to fix up pointers in a mac_module_data_element when the + * mac_module_data has been copied to a new area. It depends on the pointers + * all being offset from base_addr. + */ +static __inline void +mmd_fixup_ele(struct mac_module_data *oldbase, + struct mac_module_data *newbase, struct mac_module_data_element *ele) +{ + if (ele->key != NULL) { /* Array elements have no keys. */ + ele->key -= (unsigned int)oldbase; + ele->key += (unsigned int)newbase; + } + ele->value -= (unsigned int)oldbase; + ele->value += (unsigned int)newbase; +} + #endif #endif /* !_SECURITY_MAC_DATA_H_ */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_iokit.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include int -mac_iokit_check_device(int devtype, struct module_data *mdata) +mac_iokit_check_device(char *devtype, struct module_data *mdata) { int error; ==== //depot/projects/trustedbsd/sedarwin8/policies/device_access/mac_device_access.c#5 (text+ko) ==== @@ -36,7 +36,6 @@ * define DA_DEBUG to display run-time debugging information * #define DA_DEBUG 1 */ -#define DA_DEBUG 1 #ifdef DA_DEBUG #define DA_TRACE printf("In %s\n", __FUNCTION__) @@ -48,85 +47,7 @@ #define MAC_DEVACCESS_POLICY_NAME "device_access" -struct keyvals { - unsigned int ksize; - const char *k; - unsigned int vsize; - const char *v; -}; -struct allowed_devs { - int type; /* Device type. */ - unsigned int nprops; /* Number of properties. */ - struct keyvals props[2]; -}; -static struct allowed_devs devlist[] = { - { MAC_DEVICE_USB, 2, { /* Apple Extended USB Keyboard */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 4, "516" } /* 0x0204 */ - } - }, - { MAC_DEVICE_USB, 2, { /* Apple Extended USB Keyboard */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 4, "517" } /* 0x0205 */ - } - }, - { MAC_DEVICE_USB, 2, { /* Apple Extended USB Keyboard */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 4, "523" } /* 0x020b */ - } - }, - { MAC_DEVICE_USB, 2, { /* Apple Extended USB Keyboard */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 4, "524" } /* 0x020c */ - } - }, - { MAC_DEVICE_USB, 2, { /* Apple Optical USB Mouse */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 4, "770" } /* 0x0302 */ - } - }, - { MAC_DEVICE_USB, 2, { /* Apple Optical USB Mouse */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 4, "772" } /* 0x0304 */ - } - }, - { MAC_DEVICE_USB, 2, { /* Apple Optical USB Mouse */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 4, "774" } /* 0x0306 */ - } - }, - { MAC_DEVICE_USB, 2, { /* OHCI Root Hub Simulation */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 6, "32773" } /* 0x8005 */ - } - }, - { MAC_DEVICE_USB, 2, { /* Hub in Apple Extended USB Keyboard */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 5, "4098" } /* 0x1002 */ - } - }, - { MAC_DEVICE_USB, 2, { /* Hub in Apple Extended USB Keyboard */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 5, "4099" } /* 0x1003 */ - } - }, - { MAC_DEVICE_USB, 2, { /* Texas Instruments Hub */ - { 9, "VendorID", 5, "1105" }, /* 0x0451 */ - { 12, "ModelNumber", 5, "8262" } /* 0x2046 */ - } - }, - { MAC_DEVICE_USB, 2, { /* MachKey Intl USB KVM Switch */ - { 9, "VendorID", 5, "1778" }, /* 0x06f2 */ - { 12, "ModelNumber", 4, "123" } /* 0x007b */ - } - }, - { MAC_DEVICE_FIREWIRE, 2, { /* Apple laptop. */ - { 9, "VendorID", 5, "2599" }, - { 12, "ModelNumber", 3, "10" } - } - } -}; -static unsigned int devlist_ents = sizeof(devlist) / sizeof(struct allowed_devs); +static struct mac_module_data *device_access_list = NULL; /* * SYSCTL entry points @@ -145,8 +66,15 @@ device_access_policy_init(struct mac_policy_conf *mpc) { DA_TRACE; + if (device_access_list == NULL && mpc->mpc_data != NULL) { + device_access_list = mpc->mpc_data; + DPRINTF(("device_access list @%p, key %p value %p\n", + device_access_list, device_access_list->data[0].key, + device_access_list->data[0].value)); + } printf("MAC Device Access policy is initialized\n"); - DPRINTF((" %sabled\n", mac_device_access_enabled ? "En" : "Dis")); + DPRINTF((" %sabled, device_access_list @%p\n", + mac_device_access_enabled ? "En" : "Dis", device_access_list)); } static void @@ -160,49 +88,102 @@ device_access_policy_initbsd(struct mac_policy_conf *mpc) { DA_TRACE; + if (device_access_list == NULL && mpc->mpc_data != NULL) + device_access_list = mpc->mpc_data; sysctl_register_oid(&sysctl__security_mac_device_access); sysctl_register_oid(&sysctl__security_mac_device_access_enabled); } +/* + * Compare a device access dictionary entry against the device properties. + * Return true if a matching key exists in the properties with a matching + * value. + */ static int -dev_match(struct mac_module_data *mdata, struct keyvals *props) +dev_match(struct mac_module_data *props, struct mac_module_data_element *ele) { unsigned int k; int kmatch = 0; - for (k = 0; k < mdata->count; k++) { - if (mdata->data[k].key_size != props->ksize) + for (k = 0; k < props->count; k++) { + if (props->data[k].key_size != ele->key_size) continue; - if (!strncmp(mdata->data[k].key, props->k, props->ksize) && - !bcmp(mdata->data[k].value, props->v, props->vsize)) + if (!strncmp(props->data[k].key, ele->key, ele->key_size) && + props->data[k].value_size == ele->value_size && + !bcmp(props->data[k].value, ele->value, ele->value_size)) kmatch++; } return(kmatch); } static int -device_access_iokit_check_device(int devtype, struct mac_module_data *mdata) +device_access_iokit_check_device(char *devtype, struct mac_module_data *mdata) { + struct mac_module_data_list *dict, *list; unsigned int matches; unsigned int i, j; DA_TRACE; - if (!mac_device_access_enabled) + if (!mac_device_access_enabled || device_access_list == NULL) + return(0); + /* + * The module data should have one entry, an array of dicts. Each + * dict is itself an array of key/value pairs that describe an + * allowed device. + */ + if (device_access_list->data[0].value_type != MAC_DATA_TYPE_ARRAY) + return(0); + list = (struct mac_module_data_list *)device_access_list->data[0].value; + /* + * If it's not an array of , somebody messed up and it's + * unusable. + */ + if (list->type != MAC_DATA_TYPE_DICT) return(0); /* - * Go through our list of allowed devices. If all the properties of - * one of our listed devices match corresponding properties in the - * passed device properties, the device is allowed. + * Go through the list of dictionaries and compare each one to the + * passed device property list. If all the entries of a dictionary + * match corresponding properties in the passed property list, the + * device is allowed. */ - for (i = 0; i < devlist_ents; i++) { - if (devlist[i].type != devtype) /* Skip if the wrong type. */ - continue; - matches = 0; - for (j = 0; j < devlist[i].nprops; j++) { - if (dev_match(mdata, &(devlist[i].props[j])) > 0) - matches++; /* Key matched. */ + for (i = 0; i < list->count; i++) { + dict = (struct mac_module_data_list *)list->list[i].value; + /* + * If this dictionary doesn't match the device type, skip it. + */ + for (j = 0; j < dict->count; j++) { + unsigned int keylen, vallen; + + keylen = strlen(MAC_DEVICE_TYPE_KEY) + 1; + vallen = strlen(devtype) + 1; + if (dict->list[j].key_size != keylen || + strncmp(dict->list[j].key, MAC_DEVICE_TYPE_KEY, keylen)) + continue; /* Key mismatch, next key. */ + if (vallen == dict->list[j].value_size && + !bcmp(devtype, dict->list[j].value, vallen)) + break; /* Match. */ + } + if (j == dict->count) /* Key found and matched? */ + continue; /* No, go to next dictionary. */ + /* + * Compare all the dictionary entries against the device + * property list. If they all match, the device is allowed. + */ + matches = 1; /* We've already matched devtype. */ + for (j = 0; j < dict->count; j++) { + /* + * If there's a "Name" entry in the dict, it always + * matches. + */ + if (dict->list[j].key_size == strlen("Name")+1 && + !strncmp(dict->list[j].key, "Name", strlen("Name"))) { + matches++; + continue; + } + if (dev_match(mdata, &(dict->list[j])) > 0) + matches++; /* Entry matched. */ } - if (matches == devlist[i].nprops) + if (matches == dict->count) return(0); } return(EPERM); From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:12:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9574516A47E; Mon, 4 Dec 2006 18:12:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5C80C16A40F for ; Mon, 4 Dec 2006 18:12:49 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5F2043CA6 for ; Mon, 4 Dec 2006 18:12:14 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4ICmtW085637 for ; Mon, 4 Dec 2006 18:12:48 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4ICmtE085634 for perforce@freebsd.org; Mon, 4 Dec 2006 18:12:48 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:12:48 GMT Message-Id: <200612041812.kB4ICmtE085634@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111037 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:12:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=111037 Change 111037 by millert@millert_g5tower on 2006/12/04 18:12:30 Use fp_lookup()/fp_drop() in mac_{g,s}et_fd(). This prevents theoretical races and NULL dereferences. Add missing DTYPE constants to switch, in default section. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#24 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#24 (text+ko) ==== @@ -309,8 +309,6 @@ return; } -extern int fdgetf_noref(struct proc *, int, struct fileproc **); - static __inline void mac_policy_grab_exclusive(void) { @@ -1579,7 +1577,7 @@ AUDIT_ARG(mac_string, elements); MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); - error = fdgetf_noref(p, uap->fd, &fp); + error = fp_lookup(p, uap->fd, &fp, 0); if (error) { FREE(buffer, M_MACTEMP); FREE(elements, M_MACTEMP); @@ -1588,6 +1586,7 @@ error = mac_file_check_get(p->p_ucred, fp, elements, mac.m_buflen); if (error) { + fp_drop(p, uap->fd, fp, 0); FREE(buffer, M_MACTEMP); FREE(elements, M_MACTEMP); return (error); @@ -1618,9 +1617,16 @@ } mac_vnode_label_free(intlabel); break; + case DTYPE_PSXSHM: + case DTYPE_PSXSEM: + case DTYPE_PIPE: + case DTYPE_KQUEUE: + case DTYPE_FSEVENTS: default: error = ENOSYS; // only sockets are handled so far + break; } + fp_drop(p, uap->fd, fp, 0); if (error == 0) error = copyout(buffer, CAST_USER_ADDR_T(mac.m_string), strlen(buffer)+1); @@ -1745,7 +1751,7 @@ } AUDIT_ARG(mac_string, buffer); - error = fdgetf_noref(p, uap->fd, &fp); + error = fp_lookup(p, uap->fd, &fp, 0); if (error) { FREE(buffer, M_MACTEMP); return (error); @@ -1753,6 +1759,7 @@ error = mac_file_check_set(p->p_ucred, fp, buffer, mac.m_buflen); if (error) { + fp_drop(p, uap->fd, fp, 0); FREE(buffer, M_MACTEMP); return (error); } @@ -1790,10 +1797,17 @@ mac_vnode_label_free(intlabel); break; + case DTYPE_PSXSHM: + case DTYPE_PSXSEM: + case DTYPE_PIPE: + case DTYPE_KQUEUE: + case DTYPE_FSEVENTS: default: error = ENOSYS; // only sockets are handled at this point + break; } + fp_drop(p, uap->fd, fp, 0); FREE(buffer, M_MACTEMP); return (error); } From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:16:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD7C516A417; Mon, 4 Dec 2006 18:16:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A9FD616A407 for ; Mon, 4 Dec 2006 18:16:54 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F79D43CA8 for ; Mon, 4 Dec 2006 18:16:20 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IGsqb086137 for ; Mon, 4 Dec 2006 18:16:54 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IGsc7086134 for perforce@freebsd.org; Mon, 4 Dec 2006 18:16:54 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 4 Dec 2006 18:16:54 GMT Message-Id: <200612041816.kB4IGsc7086134@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111038 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:16:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=111038 Change 111038 by zec@zec_tca51 on 2006/12/04 18:16:34 When in a non-default vnet context, do not create / destroy devfs handles on ifattach / ifdetach events. Affected files ... .. //depot/projects/vimage/src/sys/net/if.c#4 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if.c#4 (text+ko) ==== @@ -321,9 +321,14 @@ vnet_net_iattach(); #endif IFNET_LOCK_INIT(); -#ifndef VIMAGE /* big XXX !!! */ +#ifdef VIMAGE + if (curvnetb == &vnetb_0) { + INIT_VNET_NET(curvnetb); +#endif ifdev_byindex(0) = make_dev(&net_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "network"); +#ifdef VIMAGE + } #endif if_clone_init(); } @@ -536,7 +541,6 @@ #endif #ifdef VIMAGE - /* XXX this devd mess need to be solved... */ if (curvnetb == &vnetb_0) { #endif ifdev_byindex(ifp->if_index) = make_dev(&net_cdevsw, @@ -772,7 +776,13 @@ * Clean up all addresses. */ ifp->if_addr = NULL; +#ifdef VIMAGE + if (curvnetb == &vnetb_0) { +#endif destroy_dev(ifdev_byindex(ifp->if_index)); +#ifdef VIMAGE + } +#endif ifdev_byindex(ifp->if_index) = NULL; /* We can now free link ifaddr. */ From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:18:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE1E316A47B; Mon, 4 Dec 2006 18:18:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 623E016A412 for ; Mon, 4 Dec 2006 18:18:58 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id A17A043CA5 for ; Mon, 4 Dec 2006 18:18:23 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IIvZi086190 for ; Mon, 4 Dec 2006 18:18:57 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IIvsL086187 for perforce@freebsd.org; Mon, 4 Dec 2006 18:18:57 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 4 Dec 2006 18:18:57 GMT Message-Id: <200612041818.kB4IIvsL086187@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111039 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:18:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=111039 Change 111039 by zec@zec_tca51 on 2006/12/04 18:18:30 Set per-thread vnet affinity in bpfclose(). Affected files ... .. //depot/projects/vimage/src/sys/net/bpf.c#3 edit Differences ... ==== //depot/projects/vimage/src/sys/net/bpf.c#3 (text+ko) ==== @@ -439,8 +439,11 @@ BPFD_UNLOCK(d); funsetown(&d->bd_sigio); mtx_lock(&bpf_mtx); - if (d->bd_bif) + if (d->bd_bif) { + CURVNETB_SET(d->bd_bif->bif_ifp->if_vnetb); bpf_detachd(d); + CURVNETB_RESTORE(); + } mtx_unlock(&bpf_mtx); selwakeuppri(&d->bd_sel, PRINET); #ifdef MAC From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:22:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B77316A407; Mon, 4 Dec 2006 18:22:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1685616A412 for ; Mon, 4 Dec 2006 18:22:03 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCBDB43CAC for ; Mon, 4 Dec 2006 18:21:27 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IM1E5087059 for ; Mon, 4 Dec 2006 18:22:01 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IM1dC087047 for perforce@freebsd.org; Mon, 4 Dec 2006 18:22:01 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:22:01 GMT Message-Id: <200612041822.kB4IM1dC087047@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111040 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:22:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=111040 Change 111040 by millert@millert_g5tower on 2006/12/04 18:21:52 Fix typo Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_iokit.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_iokit.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #include int -mac_iokit_check_device(char *devtype, struct module_data *mdata) +mac_iokit_check_device(char *devtype, struct mac_module_data *mdata) { int error; From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:30:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FA9A16A47B; Mon, 4 Dec 2006 18:30:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 08E3616A416 for ; Mon, 4 Dec 2006 18:30:13 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EBB043CBE for ; Mon, 4 Dec 2006 18:29:38 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IUCab087879 for ; Mon, 4 Dec 2006 18:30:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IUCdb087876 for perforce@freebsd.org; Mon, 4 Dec 2006 18:30:12 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:30:12 GMT Message-Id: <200612041830.kB4IUCdb087876@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111041 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:30:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=111041 Change 111041 by millert@millert_g5tower on 2006/12/04 18:29:50 Eliminate 'data' argument to fsctl()/ioctl() framework/policy entrypoints. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_pipe.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#18 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_vnops.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#23 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#31 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#22 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_pipe.c#5 (text+ko) ==== @@ -1300,7 +1300,7 @@ PIPE_LOCK(mpipe); #ifdef MAC - error = mac_pipe_check_ioctl(kauth_cred_get(), mpipe, cmd, data); + error = mac_pipe_check_ioctl(kauth_cred_get(), mpipe, cmd); if (error) { PIPE_UNLOCK(mpipe); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#18 (text+ko) ==== @@ -5337,7 +5337,7 @@ if ((error = namei(&nd))) goto FSCtl_Exit; #ifdef MAC - error = mac_mount_check_fsctl(context.vc_ucred, vnode_mount(nd.ni_vp), cmd, data); + error = mac_mount_check_fsctl(context.vc_ucred, vnode_mount(nd.ni_vp), cmd); if (error) { vnode_put(nd.ni_vp); nameidone(&nd); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_vnops.c#8 (text+ko) ==== @@ -857,7 +857,7 @@ context.vc_ucred = p->p_ucred; /* XXX kauth_cred_get() ??? */ #ifdef MAC - error = mac_vnode_check_ioctl(context.vc_ucred, vp, com, data); + error = mac_vnode_check_ioctl(context.vc_ucred, vp, com); if (error) goto out; #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#23 (text+ko) ==== @@ -161,8 +161,7 @@ void mac_mbuf_tag_copy(struct m_tag *m, struct m_tag *mtag); void mac_mbuf_tag_destroy(struct m_tag *mtag); int mac_mbuf_tag_init(struct m_tag *, int how); -int mac_mount_check_fsctl(struct ucred *cred, struct mount *mp, - int com, caddr_t data); +int mac_mount_check_fsctl(struct ucred *cred, struct mount *mp, int com); int mac_mount_check_getattr(struct ucred *cred, struct mount *mp, struct vfs_attr *vfa); int mac_mount_check_label_update(struct ucred *cred, struct mount *mp); @@ -181,7 +180,7 @@ void mac_mount_label_init(struct mount *); int mac_mount_label_internalize(struct label *, char *string); int mac_pipe_check_ioctl(struct ucred *cred, struct pipe *cpipe, - unsigned long cmd, void *data); + unsigned long cmd); int mac_pipe_check_kqfilter(struct ucred *cred, struct knote *kn, struct pipe *cpipe); int mac_pipe_check_read(struct ucred *cred, struct pipe *cpipe); @@ -342,8 +341,7 @@ struct attrlist *alist); int mac_vnode_check_getextattr(struct ucred *cred, struct vnode *vp, const char *name, struct uio *uio); -int mac_vnode_check_ioctl(struct ucred *cred, struct vnode *vp, int com, - caddr_t data); +int mac_vnode_check_ioctl(struct ucred *cred, struct vnode *vp, int com); int mac_vnode_check_kqfilter(struct ucred *active_cred, struct ucred *file_cred, struct knote *kn, struct vnode *vp); int mac_vnode_check_label_update(struct ucred *cred, struct vnode *vp, ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#8 (text+ko) ==== @@ -122,12 +122,11 @@ return (error); } int -mac_pipe_check_ioctl(struct ucred *cred, struct pipe *cpipe, - unsigned long cmd, void *data) +mac_pipe_check_ioctl(struct ucred *cred, struct pipe *cpipe, unsigned long cmd) { int error; - MAC_CHECK(pipe_check_ioctl, cred, cpipe, cpipe->pipe_label, cmd, data); + MAC_CHECK(pipe_check_ioctl, cred, cpipe, cpipe->pipe_label, cmd); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#31 (text+ko) ==== @@ -1111,7 +1111,6 @@ @param mp The mount point @param label Label associated with the mount point @param com Filesystem-dependent request code; see fsctl(2) - @param data Request-specific information; see fsctl(2) Determine whether the subject identified by the credential can perform the volume operation indicated by com. @@ -1128,8 +1127,7 @@ struct ucred *cred, struct mount *mp, struct label *label, - int com, - caddr_t data + int com ); /** @brief Access control check for the retrieval of file system attributes @@ -1360,7 +1358,6 @@ @param cpipe Object to be accessed @param pipelabel The label on the pipe @param cmd The ioctl command; see ioctl(2) - @param data Request-specific information; see ioctl(2) Determine whether the subject identified by the credential can perform the ioctl operation indicated by cmd. @@ -1377,8 +1374,7 @@ struct ucred *cred, struct pipe *cpipe, struct label *pipelabel, - unsigned long cmd, - void *data + unsigned long cmd ); /** @brief Access control check for pipe kqfilter @@ -4092,7 +4088,6 @@ @param vp Object vnode @param label Policy label for vp @param com Device-dependent request code; see ioctl(2) - @param data Request-specific information; see ioctl(2) Determine whether the subject identified by the credential can perform the ioctl operation indicated by com. @@ -4109,8 +4104,7 @@ struct ucred *cred, struct vnode *vp, struct label *label, - int com, - caddr_t data + int com ); /** @brief Access control check for vnode kqfilter ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#22 (text+ko) ==== @@ -504,12 +504,11 @@ } int -mac_vnode_check_ioctl(struct ucred *cred, struct vnode *vp, int com, - caddr_t data) +mac_vnode_check_ioctl(struct ucred *cred, struct vnode *vp, int com) { int error; - MAC_CHECK(vnode_check_ioctl, cred, vp, vp->v_label, com, data); + MAC_CHECK(vnode_check_ioctl, cred, vp, vp->v_label, com); return (error); } @@ -876,12 +875,11 @@ } int -mac_mount_check_fsctl(struct ucred *cred, struct mount *mp, int com, - caddr_t data) +mac_mount_check_fsctl(struct ucred *cred, struct mount *mp, int com) { int error; - MAC_CHECK(mount_check_fsctl, cred, mp, mp->mnt_mntlabel, com, data); + MAC_CHECK(mount_check_fsctl, cred, mp, mp->mnt_mntlabel, com); return (error); } From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:32:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CF6016A416; Mon, 4 Dec 2006 18:32:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2E9BB16A415 for ; Mon, 4 Dec 2006 18:32:19 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8102E43CBB for ; Mon, 4 Dec 2006 18:31:44 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IWINJ088855 for ; Mon, 4 Dec 2006 18:32:18 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IWIkn088852 for perforce@freebsd.org; Mon, 4 Dec 2006 18:32:18 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:32:18 GMT Message-Id: <200612041832.kB4IWIkn088852@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111042 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:32:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=111042 Change 111042 by millert@millert_g5tower on 2006/12/04 18:31:19 Implement vnode_label_associate_* entry points. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/device_access/mac_device_access.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#24 edit .. //depot/projects/trustedbsd/sedarwin8/policies/readonly/mac_readonly.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#18 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/device_access/mac_device_access.c#6 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#24 (text+ko) ==== @@ -1190,6 +1190,27 @@ mac_mls_copy_effective(source, dest); } +static void +mac_mls_vnode_label_associate_file(struct ucred *cred, + struct mount *mp, struct label *mntlabel, + struct fileglob *fg, struct label *fglabel, + struct vnode *vp, struct label *vlabel) +{ + struct mac_mls *source, *dest; + + if (fglabel != NULL) + source = SLOT(fglabel); + else + if (mntlabel != NULL) + source = SLOT(mntlabel); + else + source = SLOT(cred->cr_label); + + dest = SLOT(vlabel); + + mac_mls_copy_effective(source, dest); +} + static int mac_mls_vnode_label_associate_extattr(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel) @@ -1250,6 +1271,44 @@ } static void +mac_mls_vnode_label_associate_pipe(struct ucred *cred, struct pipe *cpipe, + struct label *pipelabel, struct vnode *vp, struct label *vlabel) +{ + struct mac_mls *source, *dest; + + source = SLOT(pipelabel); + dest = SLOT(vlabel); + + mac_mls_copy_effective(source, dest); +} + +static void +mac_mls_vnode_label_associate_posixsem(struct ucred *cred, + struct pseminfo *psem, struct label *psemlabel, struct vnode *vp, + struct label *vlabel) +{ + struct mac_mls *source, *dest; + + source = SLOT(psemlabel); + dest = SLOT(vlabel); + + mac_mls_copy_effective(source, dest); +} + +static void +mac_mls_vnode_label_associate_posixshm(struct ucred *cred, + struct pshminfo *pshm, struct label *pshmlabel, struct vnode *vp, + struct label *vlabel) +{ + struct mac_mls *source, *dest; + + source = SLOT(pshmlabel); + dest = SLOT(vlabel); + + mac_mls_copy_effective(source, dest); +} + +static void mac_mls_vnode_label_associate_singlelabel(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel) { @@ -1261,6 +1320,18 @@ mac_mls_copy_effective(source, dest); } +static void +mac_mls_vnode_label_associate_socket(struct ucred *cred, struct xsocket *xso, + struct label *solabel, struct vnode *vp, struct label *vlabel) +{ + struct mac_mls *source, *dest; + + source = SLOT(solabel); + dest = SLOT(vlabel); + + mac_mls_copy_effective(source, dest); +} + static int mac_mls_vnode_notify_create(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct vnode *dvp, struct label *dlabel, @@ -2696,12 +2767,12 @@ static int mac_mls_mount_check_fsctl(struct ucred *cred, struct mount *mp, - struct label *mntlabel, int com, caddr_t data) + struct label *mntlabel, int com) { if (!mac_mls_enabled) return (0); - MLS_MESSAGE("file_check_fsctl: mp %p com %d(%x) data %d(%p)\n", mp, com, data); + MLS_MESSAGE("file_check_fsctl: mp %p com %d(%x)\n", mp, com, data); #warning Implement mac_mls_file_check_fsctl() return (0); } @@ -2784,7 +2855,7 @@ static int mac_mls_pipe_check_ioctl(struct ucred *cred, struct pipe *cpipe, - struct label *pipelabel, unsigned long cmd, void *data) + struct label *pipelabel, unsigned long cmd) { struct mac_mls *subj, *obj; @@ -3375,12 +3446,12 @@ static int mac_mls_vnode_check_ioctl(struct ucred *cred, struct vnode *vp, - struct label *label, int com, caddr_t data) + struct label *label, int com) { if (!mac_mls_enabled) return (0); - MLS_MESSAGE("vnode_check_ioctl: fp %p com %d(%x) data %d(%p)\n", fp, com, com, data, data); + MLS_MESSAGE("vnode_check_ioctl: vp %p com %d(%x)\n", vp, com, com); #warning Implement mac_mls_vnode_check_ioctl() return (0); } @@ -4079,8 +4150,13 @@ .mpo_cred_label_associate_user = mac_mls_cred_label_associate_user, .mpo_vnode_label_associate_devfs = mac_mls_vnode_label_associate_devfs, + .mpo_vnode_label_associate_file = mac_mls_vnode_label_associate_file, .mpo_vnode_label_associate_extattr = mac_mls_vnode_label_associate_extattr, + .mpo_vnode_label_associate_pipe = mac_mls_vnode_label_associate_pipe, + .mpo_vnode_label_associate_posixsem = mac_mls_vnode_label_associate_posixsem, + .mpo_vnode_label_associate_posixshm = mac_mls_vnode_label_associate_posixshm, .mpo_vnode_label_associate_singlelabel= mac_mls_vnode_label_associate_singlelabel, + .mpo_vnode_label_associate_socket= mac_mls_vnode_label_associate_socket, .mpo_vnode_label_recycle = mac_mls_recycle_label, .mpo_vnode_label_copy = mac_mls_label_copy, .mpo_vnode_notify_create = mac_mls_vnode_notify_create, ==== //depot/projects/trustedbsd/sedarwin8/policies/readonly/mac_readonly.c#8 (text+ko) ==== @@ -295,7 +295,7 @@ if (error == ENOATTR) return (0); - if (error == EOPNOTSUPP) { + if (error == ENOTSUP) { ro_setflags(vlabel, RO_FLAG_READONLY | RO_FLAG_NOTSUPP); return (0); } ==== //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#18 (text+ko) ==== @@ -1081,7 +1081,7 @@ * Labeling event operations: file system objects, and things that look * a lot like file system objects. */ - + /* mp can be NULL in this fcn */ static void mac_test_vnode_label_associate_devfs(struct mount *mp, struct label *mntlabel, @@ -1110,26 +1110,35 @@ } static void -mac_test_vnode_label_associate_singlelabel(struct mount *mp, - struct label *mntlabel, struct vnode *vp, struct label *vlabel) +mac_test_vnode_label_associate_file(struct ucred *cred, + struct mount *mp, struct label *mntlabel, + struct fileglob *fg, struct label *fglabel, + struct vnode *vp, struct label *vlabel) { + CHECKNULL(cred); CHECKNULL(mp); CHECKNULL(vp); INIT_LABEL(vlabel, VNODETYPE); - USE_LABEL(mntlabel, MOUNTTYPE); + + if (fglabel) { + CHECKNULL(fg); + USE_LABEL(fglabel, FILETYPE); + } else { + USE_LABEL(mntlabel, MOUNTTYPE); + } } static void -mac_test_vnode_label_associate_socket(struct ucred *cred, struct xsocket *xso, - struct label *solabel, struct vnode *vp, struct label *vlabel) +mac_test_vnode_label_associate_pipe(struct ucred *cred, struct pipe *cpipe, + struct label *pipelabel, struct vnode *vp, struct label *vlabel) { CHECKNULL(cred); - CHECKNULL(xso); + CHECKNULL(cpipe); CHECKNULL(vp); INIT_LABEL(vlabel, VNODETYPE); - USE_LABEL(solabel, SOCKETTYPE); + USE_LABEL(pipelabel, PIPETYPE); } static void @@ -1157,37 +1166,31 @@ INIT_LABEL(vlabel, VNODETYPE); USE_LABEL(pshmlabel, POSIXSHMTYPE); } - + static void -mac_test_vnode_label_associate_pipe(struct ucred *cred, struct pipe *cpipe, - struct label *pipelabel, struct vnode *vp, struct label *vlabel) +mac_test_vnode_label_associate_singlelabel(struct mount *mp, + struct label *mntlabel, struct vnode *vp, struct label *vlabel) { - CHECKNULL(cred); - CHECKNULL(cpipe); + CHECKNULL(mp); CHECKNULL(vp); INIT_LABEL(vlabel, VNODETYPE); - USE_LABEL(pipelabel, PIPETYPE); + USE_LABEL(mntlabel, MOUNTTYPE); } static void -mac_test_vnode_label_associate_file(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct fileglob *fg, struct label *fglabel, - struct vnode *vp, struct label *vlabel) +mac_test_vnode_label_associate_socket(struct ucred *cred, struct xsocket *xso, + struct label *solabel, struct vnode *vp, struct label *vlabel) { CHECKNULL(cred); + CHECKNULL(xso); CHECKNULL(vp); INIT_LABEL(vlabel, VNODETYPE); - - if (fglabel) { - CHECKNULL(fg); - USE_LABEL(fglabel, FILETYPE); - } else { - USE_LABEL(cred->cr_label, CREDTYPE); - } + USE_LABEL(solabel, SOCKETTYPE); } +/* The ucred and mount parameters can be NULL for this fcn */ static void mac_test_devfs_label_associate_device(dev_t dev, struct devnode *de, struct label *label, const char *fullpath) @@ -1231,8 +1234,8 @@ CHECKNULL(cred); CHECKNULL(mp); + USE_LABEL(cred->cr_label, CREDTYPE); INIT_LABEL(mntlabel, MOUNTTYPE); - USE_LABEL(cred->cr_label, CREDTYPE); } static void @@ -1907,16 +1910,16 @@ .mpo_vnode_label_associate_devfs= mac_test_vnode_label_associate_devfs, .mpo_vnode_label_associate_extattr= mac_test_vnode_label_associate_extattr, + .mpo_vnode_label_associate_file= mac_test_vnode_label_associate_file, + .mpo_vnode_label_associate_pipe = mac_test_vnode_label_associate_pipe, + .mpo_vnode_label_associate_posixsem= + mac_test_vnode_label_associate_posixsem, + .mpo_vnode_label_associate_posixshm= + mac_test_vnode_label_associate_posixshm, .mpo_vnode_label_associate_singlelabel= mac_test_vnode_label_associate_singlelabel, .mpo_vnode_label_associate_socket= mac_test_vnode_label_associate_socket, - .mpo_vnode_label_associate_posixsem= - mac_test_vnode_label_associate_posixsem, - .mpo_vnode_label_associate_posixshm= - mac_test_vnode_label_associate_posixshm, - .mpo_vnode_label_associate_pipe = mac_test_vnode_label_associate_pipe, - .mpo_vnode_label_associate_file = mac_test_vnode_label_associate_file, .mpo_devfs_label_associate_device= mac_test_devfs_label_associate_device, .mpo_devfs_label_associate_directory= From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:33:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9289416A417; Mon, 4 Dec 2006 18:33:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4046B16A403 for ; Mon, 4 Dec 2006 18:33:21 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id A256143CC3 for ; Mon, 4 Dec 2006 18:32:46 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IXKYq089219 for ; Mon, 4 Dec 2006 18:33:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IXKnf089216 for perforce@freebsd.org; Mon, 4 Dec 2006 18:33:20 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:33:20 GMT Message-Id: <200612041833.kB4IXKnf089216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111044 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:33:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=111044 Change 111044 by millert@millert_g5tower on 2006/12/04 18:33:04 Remove includes from sebsd_labels.h Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.h#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc_audit.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#48 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_syscall.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_sysctl.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/init.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.h#7 (text+ko) ==== @@ -14,6 +14,7 @@ #endif #include +#include #include #include #include ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc_audit.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include +#include #include #include ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#48 (text+ko) ==== @@ -81,9 +81,11 @@ #include #include +#include #include #include #include +#include #include /* ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#4 (text+ko) ==== @@ -41,14 +41,10 @@ #ifndef _SYS_SECURITY_SEBSD_LABELS_H #define _SYS_SECURITY_SEBSD_LABELS_H -#include -#include -#include - struct task_security_struct { u_int32_t osid; u_int32_t sid; -#if 0 +#ifdef notyet u_int32_t exec_sid; /* exec SID */ u_int32_t create_sid; /* fscreate SID */ #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_syscall.c#4 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_sysctl.c#3 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/init.c#4 (text+ko) ==== @@ -17,6 +17,7 @@ #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:33:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2D8816A501; Mon, 4 Dec 2006 18:33:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B0E0616A412 for ; Mon, 4 Dec 2006 18:33:24 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CABE43CBC for ; Mon, 4 Dec 2006 18:32:46 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IXKn7089213 for ; Mon, 4 Dec 2006 18:33:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IXKii089210 for perforce@freebsd.org; Mon, 4 Dec 2006 18:33:20 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:33:20 GMT Message-Id: <200612041833.kB4IXKii089210@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111043 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:33:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=111043 Change 111043 by millert@millert_g5tower on 2006/12/04 18:32:24 Make AVC initialization a printf, not an audit_log Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#11 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#11 (text+ko) ==== @@ -299,13 +299,12 @@ AVC_CACHE_MAXNODES * sizeof(struct avc_node), AVC_CACHE_RECLAIM * sizeof(struct avc_node), "avc node"); - audit_log(current->audit_context, GFP_KERNEL, AUDIT_KERNEL, - "AVC INITIALIZED"); - if (sebsd_find_data("enforce", &ev, &evsize) == 0) { if (evsize > 0 && strcmp((char *)ev, "true") == 0) selinux_enforcing = 1; } + + printf("AVC INITIALIZED\n"); /* XXX */ } #if 0 From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:34:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8772F16A4B3; Mon, 4 Dec 2006 18:34:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4B28716A4AB for ; Mon, 4 Dec 2006 18:34:23 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8C5643CA7 for ; Mon, 4 Dec 2006 18:33:48 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IYMH7089538 for ; Mon, 4 Dec 2006 18:34:22 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IYM7k089535 for perforce@freebsd.org; Mon, 4 Dec 2006 18:34:22 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:34:22 GMT Message-Id: <200612041834.kB4IYM7k089535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111046 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:34:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=111046 Change 111046 by millert@millert_g5tower on 2006/12/04 18:34:01 Remove rate limiting, it was removed in selinux long ago. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#12 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#12 (text+ko) ==== @@ -148,14 +148,9 @@ #define NOTIF_LOCK lck_mtx_lock(notif_lock) #define NOTIF_UNLOCK lck_mtx_unlock(notif_lock) -static lck_mtx_t *ratelimit_lock; -#define RATELIM_LOCK lck_mtx_lock(ratelimit_lock) -#define RATELIM_UNLOCK lck_mtx_unlock(ratelimit_lock) - static struct avc_cache avc_cache; static struct avc_callback_node *avc_callbacks; static zone_t avc_node_cachep; -static uint64_t avc_msg_cost, avc_msg_burst; static inline int avc_hash(u32 ssid, u32 tsid, u16 tclass) { @@ -277,7 +272,6 @@ /* allocate avc mutexes */ avc_log_lock = lck_mtx_alloc_init(avc_lck_grp, avc_lck_attr); notif_lock = lck_mtx_alloc_init(avc_lck_grp, avc_lck_attr); - ratelimit_lock = lck_mtx_alloc_init(avc_lck_grp, avc_lck_attr); for (i = 0; i < AVC_CACHE_SLOTS; i++) { LIST_INIT(&avc_cache.slots[i]); @@ -291,10 +285,6 @@ lck_attr_free(avc_lck_attr); lck_grp_attr_free(avc_lck_grp_attr); - /* For avc_ratelimit() */ - nanoseconds_to_absolutetime(5000000000ULL, &avc_msg_cost); - avc_msg_burst = 10 * avc_msg_cost; - avc_node_cachep = mac_zinit(sizeof(struct avc_node), AVC_CACHE_MAXNODES * sizeof(struct avc_node), AVC_CACHE_RECLAIM * sizeof(struct avc_node), "avc node"); @@ -575,63 +565,6 @@ } #endif /* __linux__ */ - -#define AVC_MSG_COST avc_msg_cost -#define AVC_MSG_BURST avc_msg_burst - -/* - * This enforces a rate limit: not more than one kernel message - * every 5secs to make a denial-of-service attack impossible. - */ -static int avc_ratelimit(void) -{ - static uint64_t toks; - static uint64_t last_msg; - static int missed, rc; - uint64_t now; - - now = mach_absolute_time(); - - RATELIM_LOCK; - toks += now - last_msg; - last_msg = now; - if (toks > AVC_MSG_BURST) - toks = AVC_MSG_BURST; - if (toks >= AVC_MSG_COST) { - int lost = missed; - missed = 0; - toks -= AVC_MSG_COST; - RATELIM_UNLOCK; - if (lost) - printk(KERN_WARNING "AVC: %d messages suppressed.\n", - lost); - rc = 1; - goto out; - } - missed++; - RATELIM_UNLOCK; -out: - return rc; -} - -static inline int check_avc_ratelimit(void) -{ - - /* - * If auditing is not enabled, suppress all messages. - */ - if (!selinux_auditing) - return 0; - - /* - * If in permissive mode, display all messages. - */ - if (!selinux_enforcing) - return 1; - - return avc_ratelimit(); -} - /** * avc_audit - Audit the granting or denial of permissions. * @ssid: source security identifier @@ -672,9 +605,6 @@ return; } - if (!check_avc_ratelimit()) - return; - ab = audit_log_start(); if (!ab) return; /* audit_panic has been called */ From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:34:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C15616A57B; Mon, 4 Dec 2006 18:34:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1FC1A16A573 for ; Mon, 4 Dec 2006 18:34:25 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75C5043CAE for ; Mon, 4 Dec 2006 18:33:48 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IYM2p089532 for ; Mon, 4 Dec 2006 18:34:22 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IYMIE089529 for perforce@freebsd.org; Mon, 4 Dec 2006 18:34:22 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:34:22 GMT Message-Id: <200612041834.kB4IYMIE089529@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111045 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:34:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=111045 Change 111045 by millert@millert_g5tower on 2006/12/04 18:33:25 The contents of avc_cache_stats should be of type atomic_t. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.h#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.h#8 (text+ko) ==== @@ -89,12 +89,12 @@ */ struct avc_cache_stats { - unsigned int lookups; - unsigned int hits; - unsigned int misses; - unsigned int allocations; - unsigned int reclaims; - unsigned int frees; + atomic_t lookups; + atomic_t hits; + atomic_t misses; + atomic_t allocations; + atomic_t reclaims; + atomic_t frees; }; /* From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:35:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B39116A50A; Mon, 4 Dec 2006 18:35:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 48D9F16A509 for ; Mon, 4 Dec 2006 18:35:25 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1AAB43CBA for ; Mon, 4 Dec 2006 18:34:50 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IZO6N089677 for ; Mon, 4 Dec 2006 18:35:24 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IZOws089674 for perforce@freebsd.org; Mon, 4 Dec 2006 18:35:24 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:35:24 GMT Message-Id: <200612041835.kB4IZOws089674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111047 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:35:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=111047 Change 111047 by millert@millert_g5tower on 2006/12/04 18:35:19 Add mac_thread_userret() function which gets called when a BSD syscall or Mach trap exits. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/dev/ppc/systemcalls.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ppc/hw_exception.s#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#25 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#24 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#32 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/dev/ppc/systemcalls.c#3 (text+ko) ==== @@ -221,6 +221,7 @@ error = (*(callp->sy_call))(proc, (void *)uthread->uu_arg, &(uthread->uu_rval[0])); #ifdef MAC AUDIT_SYSCALL_EXIT(code, error, proc, uthread); + mac_thread_userret(thread_act); #else AUDIT_SYSCALL_EXIT(error, proc, uthread); #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ppc/hw_exception.s#3 (text+ko) ==== @@ -625,6 +625,10 @@ stw r0, saver3(r30) ; stash the high part of the return code stw r3,saver3+4(r30) ; Stash the low part of the return code beq-- cr0,.L_mach_invalid_ret ; otherwise fall through into the normal return path +#ifdef MAC + mr r3,r31 + bl EXT(mac_thread_userret) +#endif .L_mach_invalid_arg: ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#25 (text+ko) ==== @@ -1233,6 +1233,14 @@ return (error); } +void +mac_thread_userret(struct thread *thread) +{ + + if (mac_late) + MAC_PERFORM(thread_userret, thread); +} + /* system calls */ int ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#24 (text+ko) ==== @@ -68,7 +68,7 @@ struct proc; struct semid_kernel; struct shmid_kernel; -struct uthread; +struct thread; struct timespec; struct ucred; struct uio; @@ -325,6 +325,7 @@ void mac_sysvshm_label_init(struct shmid_kernel* shmsegptr); void mac_sysvshm_label_recycle(struct shmid_kernel *shmsegptr); int mac_task_check_get_port(struct ucred *cred, struct task *task); +void mac_thread_userret(struct thread *thread); int mac_vnode_check_access(struct ucred *cred, struct vnode *vp, int acc_mode); int mac_vnode_check_chdir(struct ucred *cred, struct vnode *dvp); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#32 (text+ko) ==== @@ -75,6 +75,7 @@ struct semid_kernel; struct shmid_kernel; struct task; +struct thread; struct ucred; struct vnode; struct xsocket; @@ -3884,6 +3885,17 @@ struct label *task ); /** + @brief Perform MAC-related events when a thread returns to user space + @param thread Mach thread that is returning + + This entry point permits policy modules to perform MAC-related + events when a thread returns to user space, via a system call + return, trap return, or otherwise. +*/ +typedef void mpo_thread_userret_t( + struct thread *thread +); +/** @brief Check vnode access @param cred Subject credential @param vp Object vnode @@ -5227,6 +5239,7 @@ mpo_task_label_init_t *mpo_task_label_init; mpo_task_label_internalize_t *mpo_task_label_internalize; mpo_task_label_update_t *mpo_task_label_update; + mpo_thread_userret_t *mpo_thread_userret; mpo_vnode_check_access_t *mpo_vnode_check_access; mpo_vnode_check_chdir_t *mpo_vnode_check_chdir; mpo_vnode_check_chroot_t *mpo_vnode_check_chroot; From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:38:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C318416A47B; Mon, 4 Dec 2006 18:38:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 94C8A16A407 for ; Mon, 4 Dec 2006 18:38:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 204CE43C9D for ; Mon, 4 Dec 2006 18:37:55 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IcTxq090448 for ; Mon, 4 Dec 2006 18:38:29 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IcSb4090445 for perforce@freebsd.org; Mon, 4 Dec 2006 18:38:28 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:38:28 GMT Message-Id: <200612041838.kB4IcSb4090445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111048 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:38:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=111048 Change 111048 by millert@millert_g5tower on 2006/12/04 18:38:23 When logging avc audit info, fill in an array of struct audit_buffer which are later processed by audit_log_process() via sebsd_thread_userret(). This lets us log audit data without blocking during the actual syscall (atomic operations are used as needed). We use a spin lock to keep the printf()s from overlapping. Fixes a problem on dual CPU machines. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#13 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc_audit.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/linux-compat.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#49 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#13 (text+ko) ==== @@ -270,7 +270,7 @@ lck_attr_setdefault(avc_lck_attr); /* no lock debugging */ /* allocate avc mutexes */ - avc_log_lock = lck_mtx_alloc_init(avc_lck_grp, avc_lck_attr); + avc_log_lock = lck_spin_alloc_init(avc_lck_grp, avc_lck_attr); notif_lock = lck_mtx_alloc_init(avc_lck_grp, avc_lck_attr); for (i = 0; i < AVC_CACHE_SLOTS; i++) { ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc_audit.c#3 (text+ko) ==== @@ -43,46 +43,80 @@ /* * Emulate Linux audit API. - * In the future we may wish to use the BSD audit support instead. - * TBD: use a freelist so we don't have to mallc/free so much. + * In the future we may wish to use the BSM audit support instead. */ -lck_mtx_t *avc_log_lock; - -extern void conslog_putc(char); - struct audit_buffer { struct sbuf sbuf; char buf[1024]; }; +#define AUDIT_SLOT_MAX 256 +static SInt32 nslots; +struct audit_buffer *audit_slots[AUDIT_SLOT_MAX]; + +lck_spin_t *avc_log_lock; + struct audit_buffer * audit_log_start(void) { struct audit_buffer *ab; ab = sebsd_malloc(sizeof(*ab), M_SEBSD, M_NOWAIT); - if (ab == NULL) { - printf("%s: unable to allocate audit buffer\n", __func__); - return (NULL); - } - sbuf_new(&ab->sbuf, ab->buf, sizeof(ab->buf), SBUF_FIXEDLEN); + if (ab != NULL) + sbuf_new(&ab->sbuf, ab->buf, sizeof(ab->buf), SBUF_FIXEDLEN); + return (ab); } void audit_log_end(struct audit_buffer *ab) { + int i; + UInt32 oldval; sbuf_finish(&ab->sbuf); - lck_mtx_lock(avc_log_lock); - printf("\n%s\n", sbuf_data(&ab->sbuf)); - lck_mtx_unlock(avc_log_lock); - sbuf_delete(&ab->sbuf); + + /* + * Find and claim an audit slot (assumes 32bit pointers). + */ + for (i = 0; i < AUDIT_SLOT_MAX; i++) { + oldval = (UInt32)audit_slots[i]; + if (oldval == 0 && OSCompareAndSwap(oldval, (UInt32)ab, + (UInt32 *)&audit_slots[i])) { + OSIncrementAtomic(&nslots); + return; + } + } + /* No free slots, drop record. */ sebsd_free(ab, M_SEBSD); } void +audit_log_process(void) +{ + struct audit_buffer *ab; + int i; + + /* + * Print and free all existing (finished) audit records. + */ + lck_spin_lock(avc_log_lock); + for (i = 0; nslots != 0 && i < AUDIT_SLOT_MAX; i++) { + ab = audit_slots[i]; + if (ab != NULL) { + if (OSCompareAndSwap((UInt32)ab, 0, + (UInt32 *)&audit_slots[i])) { + OSDecrementAtomic(&nslots); + printf("\n%s\n", sbuf_data(&ab->sbuf)); + sebsd_free(ab, M_SEBSD); + } + } + } + lck_spin_unlock(avc_log_lock); +} + +void audit_log_format(struct audit_buffer *ab, const char *fmt, ...) { va_list ap; @@ -93,8 +127,21 @@ } void +_audit_log(const char *fmt, ...) +{ + struct audit_buffer *ab; + va_list ap; + + ab = audit_log_start(); + va_start(ap, fmt); + sbuf_vprintf(&ab->sbuf, fmt, ap); + va_end(ap); + audit_log_end(ab); +} + +void audit_log_untrustedstring(struct audit_buffer *ab, const char *s) { - sbuf_cat(&ab->sbuf, s); + sbuf_cat(&ab->sbuf, s); /* XXX - wants vis(3) support */ } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/linux-compat.h#4 (text+ko) ==== @@ -135,18 +135,15 @@ #define TUNABLE_INT_FETCH(str,var) /* emulate linux audit support */ -extern lck_mtx_t *avc_log_lock; +extern lck_spin_t *avc_log_lock; struct audit_buffer; struct audit_buffer *audit_log_start(void); +void _audit_log(const char *, ...); void audit_log_end(struct audit_buffer *); void audit_log_format(struct audit_buffer *, const char *, ...); void audit_log_untrustedstring(struct audit_buffer *, const char *); -#define audit_log(ac, mf, af, ...) do { \ - lck_mtx_lock(avc_log_lock); \ - printf(__VA_ARGS__); \ - printf("\n"); \ - lck_mtx_unlock(avc_log_lock); \ -} while (0) +void audit_log_process(void); +#define audit_log(ac, mf, af, ...) _audit_log(__VA_ARGS__) /* we don't enable the selinux netlbl support */ #define selinux_netlbl_cache_invalidate() ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#49 (text+ko) ==== @@ -3527,6 +3527,14 @@ return (ipc_has_perm(cred, pshmlabel, SHM__DESTROY)); } +static void +sebsd_thread_userret(struct thread *thread) +{ + + /* Process any pending audit log records at syscall exit. */ + audit_log_process(); +} + static struct mac_policy_ops sebsd_ops = { .mpo_cred_check_label_update =sebsd_cred_check_label_update, .mpo_cred_check_label_update_execve = sebsd_cred_check_label_update_execve, @@ -3706,6 +3714,7 @@ .mpo_task_label_init = sebsd_cred_label_init, .mpo_task_label_internalize = sebsd_cred_label_internalize, .mpo_task_label_update = sebsd_task_label_update, + .mpo_thread_userret = sebsd_thread_userret, .mpo_vnode_check_access = sebsd_vnode_check_access, .mpo_vnode_check_chdir = sebsd_vnode_check_chdir, .mpo_vnode_check_chroot = sebsd_vnode_check_chroot, From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:39:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A32C16A513; Mon, 4 Dec 2006 18:39:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D256F16A500 for ; Mon, 4 Dec 2006 18:39:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5495043CA6 for ; Mon, 4 Dec 2006 18:38:57 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IdV98090526 for ; Mon, 4 Dec 2006 18:39:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IdVpT090519 for perforce@freebsd.org; Mon, 4 Dec 2006 18:39:31 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:39:31 GMT Message-Id: <200612041839.kB4IdVpT090519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111049 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:39:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=111049 Change 111049 by millert@millert_g5tower on 2006/12/04 18:39:07 Install man page Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/file_cmds/ls/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/file_cmds/ls/Makefile.postamble#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/file_cmds/ls/Makefile.preamble#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/file_cmds/ls/Makefile#2 (text+ko) ==== @@ -7,8 +7,6 @@ # and Makefile.postamble (both optional), and Makefile will include them. # -include ../../../Makeconfig - NAME = ls PROJECTVERSION = 2.8 @@ -20,7 +18,7 @@ OTHERSRCS = Makefile Makefile.preamble Makefile.postamble ls.1 -OTHER_CFLAGS = -DCOLORLS -I$(EXPORT_HDRS)/bsd -I$(EXPORT_HDRS)/security \ +OTHER_CFLAGS = -DCOLORLS \ -I/System/Library/Frameworks/System.framework/PrivateHeaders OTHER_LDFLAGS = -lncurses @@ -35,8 +33,6 @@ -NEXTSTEP_BUILD_OUTPUT_DIR = $(DARWIN_ROOT)/file_cmds/Build/$(NAME) - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc ==== //depot/projects/trustedbsd/sedarwin8/darwin/file_cmds/ls/Makefile.postamble#2 (text+ko) ==== @@ -1,1 +1,6 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common +INSTALL_AS_USER = $(BINOWN) +INSTALL_AS_GROUP = $(BINGRP) + +after_install: + install -m 755 -o $(MANOWN) -g $(MANGRP) -d $(DSTROOT)/usr/share/man/man1 + install -m 644 -o $(MANOWN) -g $(MANGRP) -c ls.1 $(DSTROOT)/usr/share/man/man1 ==== //depot/projects/trustedbsd/sedarwin8/darwin/file_cmds/ls/Makefile.preamble#2 (text+ko) ==== @@ -1,1 +1,2 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common +-include ../../../Makeconfig +OTHER_CFLAGS += -I$(EXPORT_HDRS)/bsd -I$(EXPORT_HDRS)/security From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:40:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5E6A16A526; Mon, 4 Dec 2006 18:40:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8341E16A50A for ; Mon, 4 Dec 2006 18:40:37 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AE4443CAB for ; Mon, 4 Dec 2006 18:39:59 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IeXgV090795 for ; Mon, 4 Dec 2006 18:40:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IeWSB090790 for perforce@freebsd.org; Mon, 4 Dec 2006 18:40:32 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:40:32 GMT Message-Id: <200612041840.kB4IeWSB090790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111050 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:40:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=111050 Change 111050 by millert@millert_g5tower on 2006/12/04 18:39:31 Install man pages and man page links. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/Makefile#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/libmac/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin8/release/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/Makefile#5 (text+ko) ==== @@ -9,7 +9,7 @@ $(MAKE) -C kext_tools $(MAKE) -C $(XNU) $(MAKE) -C bootstrap_cmds - $(MAKE) -C libmac + bsdmake -C libmac $(MAKE) -C mac_cmds $(MAKE) -C adv_cmds/ps.tproj all $(MAKE) -C file_cmds/ls all @@ -28,7 +28,7 @@ $(DESTDIR)/$(SYSTEM_PLUGINS)/ install -m 644 $(XNU)/BUILD/dst/mach_kernel $(DESTDIR)/ tar -C $(XNU)/BUILD/dst -cf - usr/include | tar -C $(DESTDIR) -xf - - $(MAKE) -C libmac install + bsdmake -C libmac install $(MAKE) -C mac_cmds install $(MAKE) -C osx_cmds install $(MAKE) -C adv_cmds/ps.tproj DSTROOT=$(DESTDIR) install @@ -47,7 +47,7 @@ $(MAKE) -C bootstrap_cmds clean $(MAKE) -C cctools clean $(MAKE) -C kext_tools clean - $(MAKE) -C libmac clean + bsdmake -C libmac clean $(MAKE) -C mac_cmds clean $(MAKE) -C osx_cmds clean $(MAKE) -C adv_cmds/ps.tproj clean ==== //depot/projects/trustedbsd/sedarwin8/darwin/libmac/Makefile#4 (text+ko) ==== @@ -1,30 +1,36 @@ include ../../Makeconfig -MIGSOURCE= $(DARWIN)/BUILD/obj/EXPORT_HDRS/osfmk/mach/ - +MIGSOURCE= $(DARWIN)/BUILD/obj/EXPORT_HDRS/osfmk/mach CFLAGS+= $(DARWIN_HDRS) # -I$(MIGSOURCE) -LIB= mac -OBJS = mac.o mac_exec.o mac_get.o mac_set.o mac_mount.o security.o \ - mac_getmntinfo.o -AR = ar cq -RANLIB = ranlib -INSTALL = install +LIB= mac +SRCS= mac.c mac_exec.c mac_get.c mac_getmntinfo.c mac_mount.c \ + mac_set.c security.c +MAN= mac.3 mac.conf.5 mac_free.3 mac_get.3 mac_is_present.3 \ + mac_prepare.3 mac_set.3 mac_text.3 maclabel.7 +MLINKS= mac_get.3 mac_get_fd.3 \ + mac_get.3 mac_get_file.3 \ + mac_get.3 mac_get_link.3 \ + mac_get.3 mac_get_lcid.3 \ + mac_get.3 mac_get_lctx.3 \ + mac_get.3 mac_get_mount.3 \ + mac_get.3 mac_get_pid.3 \ + mac_get.3 mac_get_proc.3 \ + mac_prepare.3 mac_prepare_file_label.3 \ + mac_prepare.3 mac_prepare_ifnet_label.3 \ + mac_prepare.3 mac_prepare_process_label.3 \ + mac_set.3 mac_set_link.3 \ + mac_set.3 mac_set_fd.3 \ + mac_set.3 mac_set_file.3 \ + mac_set.3 mac_set_lctx.3 \ + mac_set.3 mac_set_proc.3 \ + mac_text.3 mac_from_text.3 \ + mac_text.3 mac_to_text.3 \ -all: lib$(LIB).a +NOPROFILE= +CLEANFILES+= security.c security.h -install: all - $(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 0644 lib$(LIB).a \ - $(DESTDIR)/usr/lib - $(RANLIB) $(DESTDIR)/usr/lib/lib$(LIB).a - -clean: - rm -f lib$(LIB).a $(OBJS) security.c security.h - -lib$(LIB).a:: $(OBJS) - rm -f lib$(LIB).a - $(AR) lib$(LIB).a `lorder $(OBJS) | tsort -q` - $(RANLIB) lib$(LIB).a - security.c: $(MIGSOURCE)/security.defs mig $(CFLAGS) -user $@ -header security.h -server /dev/null -sheader /dev/null $(MIGSOURCE)/security.defs + +.include ==== //depot/projects/trustedbsd/sedarwin8/release/Makefile#4 (text+ko) ==== @@ -5,7 +5,10 @@ $(DESTDIR)/usr/bin \ $(DESTDIR)/usr/lib \ $(DESTDIR)/usr/share/man/man1 \ + $(DESTDIR)/usr/share/man/man3 \ $(DESTDIR)/usr/share/man/man4 \ + $(DESTDIR)/usr/share/man/man5 \ + $(DESTDIR)/usr/share/man/man7 \ $(DESTDIR)/usr/share/man/man8 \ $(DESTDIR)/System/Library/Extensions \ $(DESTDIR)/System/Library/Extensions/System.kext/PlugIns \ From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:40:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 023AB16A53E; Mon, 4 Dec 2006 18:40:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 87A5216A50B for ; Mon, 4 Dec 2006 18:40:37 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90C1A43CA8 for ; Mon, 4 Dec 2006 18:39:59 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IeXHM090802 for ; Mon, 4 Dec 2006 18:40:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IeXd0090798 for perforce@freebsd.org; Mon, 4 Dec 2006 18:40:33 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:40:33 GMT Message-Id: <200612041840.kB4IeXd0090798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111051 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:40:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=111051 Change 111051 by millert@millert_g5tower on 2006/12/04 18:40:06 s/mac_is_present_np/mac_is_present/g Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac_prepare.3#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac_set.3#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac_text.3#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac_prepare.3#3 (text+ko) ==== @@ -103,7 +103,7 @@ .Xr mac 3 , .Xr mac_free 3 , .Xr mac_get 3 , -.Xr mac_is_present_np 3 , +.Xr mac_is_present 3 , .Xr mac_set 3 , .Xr mac 4 , .Xr mac.conf 5 , ==== //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac_set.3#3 (text+ko) ==== @@ -145,7 +145,7 @@ .Xr mac 3 , .Xr mac_free 3 , .Xr mac_get 3 , -.Xr mac_is_present_np 3 , +.Xr mac_is_present 3 , .Xr mac_prepare 3 , .Xr mac_text 3 , .Xr mac 4 , ==== //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac_text.3#3 (text+ko) ==== @@ -95,7 +95,7 @@ .Xr free 3 , .Xr mac 3 , .Xr mac_get 3 , -.Xr mac_is_present_np 3 , +.Xr mac_is_present 3 , .Xr mac_prepare 3 , .Xr mac_set 3 , .Xr mac 4 , From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:42:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 796D316A417; Mon, 4 Dec 2006 18:42:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 53A9216A403 for ; Mon, 4 Dec 2006 18:42:37 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA0E643CB5 for ; Mon, 4 Dec 2006 18:42:02 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IgbRt091860 for ; Mon, 4 Dec 2006 18:42:37 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IgafU091855 for perforce@freebsd.org; Mon, 4 Dec 2006 18:42:36 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:42:36 GMT Message-Id: <200612041842.kB4IgafU091855@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111053 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:42:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=111053 Change 111053 by millert@millert_g5tower on 2006/12/04 18:42:12 Update to reality Affected files ... .. //depot/projects/trustedbsd/sedarwin8/ERRATA#4 edit .. //depot/projects/trustedbsd/sedarwin8/README#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/drivers/DeviceAccessControl/README#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/ERRATA#4 (text+ko) ==== @@ -1,20 +1,21 @@ -Port of TrustedBSD MAC Framework to Darwin 8 +Port of TrustedBSD MAC Framework to Darwin 10.4 SPARTA, Inc 7110 Samuel Morse Drive -Columbia, MD 21046 +Columbia, MD 21046-3401 The following known issues are present in this release: - 52: The fdsec (filesystem) should have labels - The fdesc file system - provides /dev/fd entries on darwin instead of implementing this - within devfs. - 62: Darwin and MAC Framework have no notion of process visibility, unlike FreeBSD. Currently, any process can retrieve information about any other - process. (203 was duplicate) + process. - 96: There is no security for fsoctl, ioctl, sysctl. (225 was duplicate) +111: mach_init needs to run at equal so everything can talk to the + namespace. It has to start its child processes in an mls-specific + manner by performing a mac_set_proc ("mls/low(low-high)") after forking. + The MAC.loginPlugin starts user sessions in a label appropriate for the + user, but system services would still be equal with no automatic way to + change. 130: The Mach error returns from the framework don't always map well. Most framework entry points return bsd errno values, which @@ -22,19 +23,11 @@ framework would return its own private error codes, which could be converted to either type by lookup tables. -135: No MAC access control checks in the fsctl() system call. Darwin - contains a syscall called fsctl() for doing IOCTL-style - operations on a filesystem object via a supplied path. A similar - syscall does not exist in FreeBSD. A generic MAC entry point is - likely needed for this. +141: Some man pages are missing for added system calls. -136: The hfs_ioctl interface allows unchecked ability to modify the - filesystem. hfs_ioctl() allows IOCTL-style commands to be - performed on an HFS filesystem via the fsctl() syscall and - VOP_IOCTL vector. A MAC Framework access control check needs to - be inserted here. - -141: Some man pages are missing for added system calls. +235: "error processing extended attributes: Operation not permitted" is + seen occassionaly during system builds. This can be reproduced when + extended attribute labels change during a copy process. 238: Currently the port label of a label handle is unused. This could (and probably should) be used to implement access control @@ -50,13 +43,50 @@ current work around involves a new ioflag (IO_NOAUTH) which bypasses MAC checks. MAC mediation in vn_rdwr_64() needs to be evaluated. -317: The framework uses the VL_LABELED flag to indicate that a vnode has - been labeled by the framework/policy. This flag is set regardless of - the success/failure of label association/creation. If a policy provides - consistency checking for xattr backed labels and fails to provide a valid - label, the vnode will not have a valid label. Policy and framework - interactions when bad labels is read from the file system needs to be - reviewed. - 321: Additional documentation is needed in mac_policy.h to specify if an entrypoint may sleep. + +339: It's not possible to retrieve SYSV IPC labels. On Panther, there was + no API to access SYSV IPC label information at all, but on Tiger there + is the ipcs program for System V IPC. We may wish to add externalize + operations for those labels. This does not really affect the security + of the system and SYSV IPC is relatively unused. + +340: We should remove process labels entirely (Note: this does not refer + to user credential labels). They were only (poorly) used by LOMAC, + a policy that we didn't port to Darwin. + +345: mac_policy.h should have additional NULLOK tags. We recently added + support for NULLOK tags in mac_policy.h in support of the automatically + generated mac_test policy module. We should run mac_test for a while, + note the messages, confirm with the source code whether they are + permitted to be NULL, and add tags to the interface spec. This will + quiet the verbose mac_test debugging messages where they aren't correct. + +365: mac_vnode_check_lookup() is called with name cache lock held. + cache_lookup_path() in vfs_cache.c calls mac_vnode_check_lookup() with + the name cache mutex held. This means that any policy module that + calls a vn_* functions that uses the name cache will cause deadlock. + For example, a policy calling vn_getname() will end up sleeping forever. + vn_getpath() is exported from BSDKernel.exports. This restriction + needs to be documented. + +375: Revisit architecture issues to achieve real mediation of ioctls(). + Meaningful mediation of ioctl() will require the policy to decode the + fileproc. The framework should perform this for the policy to avoid code + duplication. In the end, real mediation of ioctls() is quite difficult + as they lack sufficient information to allow useful decisions without a + great deal of decoding. + +378: Need a new entry point to replace mpo_vnode_check_mprotect. For instance, + mprotect() can be used to make a (formerly) non-executable address space + executable. This is especially important when the stack is marked non- + executable. It would be nice to detect a process attempting to make the + heap executable as well but that may be difficult on OSX where you don't + have a real sbrk. + +380: Relabeling during certain vnode check operations + (mpo_vnode_check[read,write,open,access]) is needed. + +401: Suspected VFS race causing crashes with MULTILABEL fdesc. + ==== //depot/projects/trustedbsd/sedarwin8/README#5 (text+ko) ==== @@ -9,7 +9,7 @@ ============ This release includes a port of the TrustedBSD MAC Framework to Apple's -Darwin 8.7 (Mac OS X 10.4.7) operating system, made up of kernel, library, +Darwin 8.8 (Mac OS X 10.4.8) operating system, made up of kernel, library, and user space tool extensions to support flexible policy introduction. In addition, several sample policy modules are present: @@ -44,7 +44,7 @@ appropriate for use in production environments. The following modifications have been made relative to Apple's Darwin -8.7 release: +8.8 release: - Inclusion of a subset of the MAC Framework entry points to provide label support and protection of files, processes, System V @@ -60,6 +60,72 @@ Mach servers. The launchd and notifyd daemons have been modified to use our security-enhanced MiG. +New Features in the 20061130 release +===================================== + - Update to a newer version of Tiger; the vendor source base was + updated to Apple's 10.4.8 release (xnu-792.12.6 for PPC). + + - Update other system components to most recent versions + corresponding to Apple's Mac OS X 10.4.8: + cctools-622.5.1 + diskdev_cmds-332.11.5 + file_cmds-116.10 + kext_tools-65.2.1 + launchd-106.14 + msdosfs-89.13 + pam_modules-17.1 + system_cmds-336.1.5 + + - Install man pages for additional APIs and MAC Framework helper + programs. + + - Add new access control checks: + mpo_vnode_check_truncate + mpo_mount_check_fsctl + mpo_file_check_ioctl (renamed from mpo_check_ioctl) + + - Allow USB and Firewire device access control lists to be read + in from a plist file. Additional information is available in the + Policy Module Writing Guide. + + - Remove mac_enforce toggles from the Framework, they were + inconsistent and mostly unused. + + - Change APIs for some devfs entry points. The first parameter was + always NULL; it was removed from the entry points: + mpo_devfs_label_associate_device + mpo_devfs_label_associate_directory + + - Remove the need for an installed /etc/mac.conf file, the default + was changed so that all labels may be displayed. + + - Rename login context creation entry point to a name that is more + appropriate; mpo_lctx_label_associate became mpo_lctx_notify_create. + + - MAC-specific audit data now uses a zone allocator. + + - Update the build system for the GUI components to permit the use + of Xcode 2.4 or newer. + + - Move labeling association for devfs and fdesc out of filesystem + code. Labeling association is now handled the same way for all + filesystems. + + - Sort the APIs in mac_policy.h and mac_framework.h. + + - Correct a logic reversal bug where the mac_get_file and + mac_set_file APIs should follow symlinks but mac_get_link and + mac_set_link should not. + + - Add call graph generation tools; they are located in the + src/release/tools/cgraph directory. + + - Add experimental fdesc multilabel support. Since these changes + are race prone, they are disabled by default. + + - In addition, a large number of bug fixes and minor enhancements + have been made to improve the overall MAC Framework quality. + New Features in the 20061013 release ===================================== ==== //depot/projects/trustedbsd/sedarwin8/darwin/drivers/DeviceAccessControl/README#2 (text+ko) ==== @@ -7,14 +7,13 @@ must be installed in /System/Library/Extensions and they must be loaded. When a device is attached to the system, the DeviceAccessControl driver calls the mac_device_access policy to determine whether it is an approved device. That -policy implements the mpo_check_device_allowed() entry point. +policy implements the mpo_iokit_check_device() entry point. -The mpo_check_device_allowed() routine is passed the device type (currently +The mpo_iokit_check_device() routine is passed the device type (currently only USB, later also Firewire) and a pointer to and the length of a mac_module_data structure: -int mpo_access_check_device_allowed(int devtype, struct mac_module_data *mdata, - int mdlen); +int mpo_iokit_check_device(char* devtype, struct mac_module_data *mdata); The mac_module_data structure contains a set of key/value pairs corresponding to the characteristics of the device. For example, a USB device will have @@ -24,95 +23,164 @@ function returns 0 (zero), otherwise it returns the error EPERM. The DeviceAccessControl driver reverses the sense of the match, matching those -devices _not_ matched by the mpo_access_check_device_allowed() routine. The +devices _not_ matched by the mpo_iokit_check_device() routine. The I/O kit has been modified to favor a match of the driver over any other. -The mpo_access_check_device_allowed() routine uses a hardcoded list of device -parameters against which it matches passed device parameters. This list as of -this writing is: +The mpo_iokit_check_device() routine matches the passed device +parameters against a list of allowed devices. In the model implementation, +this list is specified as an OSModuleData property list in the Info.plist +associated with the mac_device_access kernel extension. This property list is +picked up by the build from the policies/device_access/Default.plist file. +As of this writing, that list looks like: -static struct allowed_devs devlist[] = { - { MAC_DEVICE_USB, 2, { /* Apple Extended USB Keyboard */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 4, "516" } /* 0x0204 */ - } - }, - { MAC_DEVICE_USB, 2, { /* Apple Extended USB Keyboard */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 4, "517" } /* 0x0205 */ - } - }, - { MAC_DEVICE_USB, 2, { /* Apple Extended USB Keyboard */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 4, "523" } /* 0x020b */ - } - }, - { MAC_DEVICE_USB, 2, { /* Apple Extended USB Keyboard */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 4, "524" } /* 0x020c */ - } - }, - { MAC_DEVICE_USB, 2, { /* Apple Optical USB Mouse */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 4, "770" } /* 0x0302 */ - } - }, - { MAC_DEVICE_USB, 2, { /* Apple Optical USB Mouse */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 4, "772" } /* 0x0304 */ - } - }, - { MAC_DEVICE_USB, 2, { /* Apple Optical USB Mouse */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 4, "774" } /* 0x0306 */ - } - }, - { MAC_DEVICE_USB, 2, { /* OHCI Root Hub Simulation */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 6, "32773" } /* 0x8005 */ - } - }, - { MAC_DEVICE_USB, 2, { /* Hub in Apple Extended USB Keyboard */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 5, "4098" } /* 0x1002 */ - } - }, - { MAC_DEVICE_USB, 2, { /* Hub in Apple Extended USB Keyboard */ - { 9, "VendorID", 5, "1452" }, /* 0x05ac */ - { 12, "ModelNumber", 5, "4099" } /* 0x1003 */ - } - }, - { MAC_DEVICE_USB, 2, { /* Texas Instruments Hub */ - { 9, "VendorID", 5, "1105" }, /* 0x0451 */ - { 12, "ModelNumber", 5, "8262" } /* 0x2046 */ - } - }, - { MAC_DEVICE_USB, 2, { /* MachKey Intl USB KVM Switch */ - { 9, "VendorID", 5, "1778" }, /* 0x06f2 */ - { 12, "ModelNumber", 4, "123" } /* 0x007b */ - } - }, - { MAC_DEVICE_FIREWIRE, 2, { /* Apple laptop. */ - { 9, "VendorID", 5, "2599" }, - { 12, "ModelNumber", 3, "10" } - } - } -}; -static unsigned int devlist_ents = sizeof(devlist) / sizeof(struct allowed_devs); +OSModuleData + + DeviceAccessList + + + DeviceType + USB + Name + Apple Extended USB Keyboard + VendorID + 1452 + ModelNumber + 516 + + + DeviceType + USB + Name + Apple Extended USB Keyboard + VendorID + 1452 + ModelNumber + 517 + + + DeviceType + USB + Name + Apple Extended USB Keyboard + VendorID + 1452 + ModelNumber + 523 + + + DeviceType + USB + Name + Apple Extended USB Keyboard + VendorID + 1452 + ModelNumber + 524 + + + DeviceType + USB + Name + Apple Optical USB Mouse + VendorID + 1452 + ModelNumber + 770 + + + DeviceType + USB + Name + Apple Optical USB Mouse + VendorID + 1452 + ModelNumber + 772 + + + DeviceType + USB + Name + Apple Optical USB Mouse + VendorID + 1452 + ModelNumber + 774 + + + DeviceType + USB + Name + OHCI Root Hub Simulation + VendorID + 1452 + ModelNumber + 32773 + + + DeviceType + USB + Name + Hub in Apple Extended USB Keyboard + VendorID + 1452 + ModelNumber + 4098 + + + DeviceType + USB + Name + Hub in Apple Extended USB Keyboard + VendorID + 1452 + ModelNumber + 4099 + + + DeviceType + USB + Name + Texas Instruments Hub + VendorID + 1105 + ModelNumber + 8262 + + + DeviceType + USB + Name + MachKey Intl USB KVM Switch + VendorID + 1778 + ModelNumber + 123 + + + DeviceType + FireWire + Name + Apple laptop + VendorID + 2599 + ModelNumber + 10 + + + -Devices are listed as the device type followed by the number of parameters -for the device, then the list of parameters as key length, key, value length, -value tuples. Note that the key and value lengths include the terminating -ASCII NUL ('\0') of the string given. +The device definitions are specified as an array of dict entries. Each +dict entry specifies one device, giving a set of key/string pairs that +identify it. To add a new device, determine the appropriate parameters and add a new entry -to the list following the illustrated pattern. Also change the 'devlist_ents' -value to match the new length of the devlist array. To determine the -parameters for USB devices, first attach the device and then run the USBProber +to the list following the illustrated pattern. To determine the parameters +for USB devices, first attach the device and then run the USBProber application, which may be found on a system with the Xcode package installed in /Developer/Utilities. The "Device Descriptor" field gives the device vendor ID and product ID, among other things. For Firewire devices, one may run the -IORegistryExploror application in the same location; choose the IOFireWire +IORegistryExplorer application in the same location; choose the IOFireWire service plane and follow the tree to the device in question. If the Xcode package is not installed, one may also determine this information using the command 'ioreg -l', which lists all devices known by the registry. @@ -123,13 +191,24 @@ hub or any other USB or Firewire device. For details of device properties for USB and Firewire, see the references -below. The driver currently understands the following device properties: +below. Each entry must have a "DeviceType" key, which may be one of "USB" or +"FireWire". This determines which type of device the entry matches and +supersedes any other potential match (i.e. a FireWire device will never match +a USB device and vice versa, even if all the other keys match). If a device +entry doesn't have a "DeviceType" key, it will be ignored by the matching code +and will end up matching nothing. + +The driver currently understands the following device properties: For all device types: Key name Description + DeviceType "USB" or "FireWire". REQUIRED. VendorID Vendor identification number. ModelNumber Number identifying the device model itself. + Name A human-readable text string describing the + device. This is ignored by the matching code + and is provided for documentation purposes. For USB: Key name Description From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:42:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0612016A415; Mon, 4 Dec 2006 18:42:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BE0C216A55C for ; Mon, 4 Dec 2006 18:42:37 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C0D143CB7 for ; Mon, 4 Dec 2006 18:42:02 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IgaEO091852 for ; Mon, 4 Dec 2006 18:42:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4Igapk091849 for perforce@freebsd.org; Mon, 4 Dec 2006 18:42:36 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:42:36 GMT Message-Id: <200612041842.kB4Igapk091849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111052 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:42:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=111052 Change 111052 by millert@millert_g5tower on 2006/12/04 18:41:42 Integrate callgraph tools. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/release/tools/cgraph/MakeInc.patch#1 add .. //depot/projects/trustedbsd/sedarwin8/release/tools/cgraph/README#1 add .. //depot/projects/trustedbsd/sedarwin8/release/tools/cgraph/cgraph-mac2dot.pl#1 add .. //depot/projects/trustedbsd/sedarwin8/release/tools/cgraph/cgraph2dot.pl#1 add .. //depot/projects/trustedbsd/sedarwin8/release/tools/cgraph/cgraph_gen.pl#1 add .. //depot/projects/trustedbsd/sedarwin8/release/tools/cgraph/gcc-3.4.6-APPLE.patch#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:43:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3A6116A416; Mon, 4 Dec 2006 18:43:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D282C16A403 for ; Mon, 4 Dec 2006 18:43:39 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 05BCC43CAC for ; Mon, 4 Dec 2006 18:43:04 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IhdNs092166 for ; Mon, 4 Dec 2006 18:43:39 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IhchR092160 for perforce@freebsd.org; Mon, 4 Dec 2006 18:43:38 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:43:38 GMT Message-Id: <200612041843.kB4IhchR092160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111055 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:43:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=111055 Change 111055 by millert@millert_g5tower on 2006/12/04 18:43:24 Print error if no migscs data. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mach_av.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mach_av.c#7 (text+ko) ==== @@ -148,8 +148,10 @@ void *tdata; if (sebsd_find_data("migscs_data", &tdata, &tsize) != 0 || - sebsd_load_migscs(tdata, tsize) != 0) + sebsd_load_migscs(tdata, tsize) != 0) { + printf("sebsd: migscs data missing, using empty table\n"); msgid2class = hashtab_create(msgid_hash, msgid_cmp, 3); + } } From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:43:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40E5B16A55B; Mon, 4 Dec 2006 18:43:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DD77D16A407 for ; Mon, 4 Dec 2006 18:43:39 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9EC7C43CAA for ; Mon, 4 Dec 2006 18:43:04 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4Ihcuv092156 for ; Mon, 4 Dec 2006 18:43:38 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4Ihc3p092151 for perforce@freebsd.org; Mon, 4 Dec 2006 18:43:38 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:43:38 GMT Message-Id: <200612041843.kB4Ihc3p092151@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111054 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:43:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=111054 Change 111054 by millert@millert_g5tower on 2006/12/04 18:43:05 Remove comment that is no longer correct. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/init.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/init.c#5 (text+ko) ==== @@ -37,7 +37,6 @@ printf("security: starting up (compiled " __DATE__ ")\n"); - /* XXX - should also lookup & store policy_path */ if (sebsd_find_data("policy_data", &policy_data, &policy_len) != 0) goto loaderr; From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:44:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EB7B16A47B; Mon, 4 Dec 2006 18:44:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5FFD016A412 for ; Mon, 4 Dec 2006 18:44:41 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id CABC243CA5 for ; Mon, 4 Dec 2006 18:44:06 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4Iie49092406 for ; Mon, 4 Dec 2006 18:44:40 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IieCS092403 for perforce@freebsd.org; Mon, 4 Dec 2006 18:44:40 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 4 Dec 2006 18:44:40 GMT Message-Id: <200612041844.kB4IieCS092403@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111056 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:44:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=111056 Change 111056 by zec@zec_tca51 on 2006/12/04 18:44:02 Dump my ancient "vimage" management utility into p4. It has to be and will be completely redesigned and rewritten from scratch, along with a new vimage management API. As an interim hack this old tool can be used for instantiating virtual stacks and playing around with them. Affected files ... .. //depot/projects/vimage/src/usr.sbin/Makefile#1 add .. //depot/projects/vimage/src/usr.sbin/vimage.8#1 add .. //depot/projects/vimage/src/usr.sbin/vimage.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:44:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92BF916A573; Mon, 4 Dec 2006 18:44:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9989416A416 for ; Mon, 4 Dec 2006 18:44:41 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F2AB43CA5 for ; Mon, 4 Dec 2006 18:44:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IifFH092412 for ; Mon, 4 Dec 2006 18:44:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IifYU092409 for perforce@freebsd.org; Mon, 4 Dec 2006 18:44:41 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:44:41 GMT Message-Id: <200612041844.kB4IifYU092409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111057 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:44:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=111057 Change 111057 by millert@millert_g5tower on 2006/12/04 18:44:16 Rename _audit_log() -> sebsd_log() Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc_audit.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/linux-compat.h#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc_audit.c#4 (text+ko) ==== @@ -127,7 +127,7 @@ } void -_audit_log(const char *fmt, ...) +sebsd_log(const char *fmt, ...) { struct audit_buffer *ab; va_list ap; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/linux-compat.h#5 (text+ko) ==== @@ -138,12 +138,12 @@ extern lck_spin_t *avc_log_lock; struct audit_buffer; struct audit_buffer *audit_log_start(void); -void _audit_log(const char *, ...); +void sebsd_log(const char *, ...); void audit_log_end(struct audit_buffer *); void audit_log_format(struct audit_buffer *, const char *, ...); void audit_log_untrustedstring(struct audit_buffer *, const char *); void audit_log_process(void); -#define audit_log(ac, mf, af, ...) _audit_log(__VA_ARGS__) +#define audit_log(ac, mf, af, ...) sebsd_log(__VA_ARGS__) /* we don't enable the selinux netlbl support */ #define selinux_netlbl_cache_invalidate() From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:44:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BFFF16A574; Mon, 4 Dec 2006 18:44:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9670F16A574 for ; Mon, 4 Dec 2006 18:44:42 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id A581643C9D for ; Mon, 4 Dec 2006 18:44:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4Iift5092420 for ; Mon, 4 Dec 2006 18:44:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4Iif24092415 for perforce@freebsd.org; Mon, 4 Dec 2006 18:44:41 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:44:41 GMT Message-Id: <200612041844.kB4Iif24092415@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:44:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=111058 Change 111058 by millert@millert_g5tower on 2006/12/04 18:44:35 Use sebsd_log() instead of printf() so we don't block. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#50 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#50 (text+ko) ==== @@ -243,9 +243,8 @@ printf("sebsd: init\n"); sebsd_zone_init(); avc_init(); - if (security_init()) { + if (security_init()) panic("SEBSD: couldn't read policy file"); - } sebsd_mach_av_init(); } @@ -837,7 +836,7 @@ if (error) { if (error == ENOATTR || error == ENOTSUP || error == EPERM) goto dosclass; - printf("%s: ERROR %d returned by mac_vnop_getxattr()\n", + sebsd_log("%s: ERROR %d returned by mac_vnop_getxattr()", __func__, error); return (error); /* Fail closed */ } @@ -850,7 +849,7 @@ error = security_context_to_sid(context, context_len, &vsec->sid); if (error) - printf("%s: ERROR mapping context to sid: %.*s\n", + sebsd_log("%s: ERROR mapping context to sid: %.*s", __func__, context_len, context); dosclass: @@ -894,7 +893,7 @@ vsec->sclass = vnode_type_to_security_class(vp->v_type); if (sbsec == NULL) { if (vp->v_mount != NULL) - printf ("vnode_create: no mount label for mnt=%s\n", + sebsd_log("vnode_create: no mount label for mnt=%s", vp->v_mount->mnt_vfsstat.f_mntonname); } else vsec->sid = sbsec->sid; @@ -1080,9 +1079,7 @@ */ if (security_transition_sid(tsec->sid, msqsec->sid, SECCLASS_MSG, &msgsec->sid) < 0) { - printf("Warning: security_transition_sid failed on" - "sysvmsg_label_associate\n"); - printf("Assigning the requesting thread's sid to the msg\n"); + sebsd_log("%s: security_transition_sid failed, using task sid"); msgsec->sid = tsec->sid; } } @@ -1155,7 +1152,7 @@ /* TBD: debugging */ if (sebsd_verbose > 1) { - printf("%s(%s): rc=%d, sclass=%d, computedsid=%d, dirent=%d\n", + sebsd_log("%s(%s): rc=%d, sclass=%d, computedsid=%d, dirent=%d", __func__, path, rc, dirent->sclass, newsid, dirent->sid); } sebsd_free(path, M_SEBSD); @@ -1187,8 +1184,8 @@ /* TBD: debugging */ if (sebsd_verbose > 1) { - printf("%s(%s): mountpoint=devfs, rc=%d, sclass=%d, " - "computedsid=%d, dirent=%d\n", + sebsd_log("%s(%s): mountpoint=devfs, rc=%d, sclass=%d, " + "computedsid=%d, dirent=%d", __func__, path, rc, dirent->sclass, newsid, dirent->sid); } sebsd_free(path, M_SEBSD); @@ -1219,8 +1216,6 @@ task = SLOT(cred->cr_label); task->osid = task->sid = SECINITSID_KERNEL; - printf("%s: using SECINITSID_KERNEL = %d\n", __func__, - SECINITSID_KERNEL); } static void @@ -1244,11 +1239,11 @@ sbsec = SLOT(mntlabel); rc = security_fs_use(mp->mnt_vfsstat.f_fstypename, &behavior, &sbsec->sid); if (rc) { - printf("%s: security_fs_use(%s) returned %d\n", __func__, - mp->mnt_vfsstat.f_fstypename, rc); + sebsd_log("%s: security_fs_use(%s) returned %d", + __func__, mp->mnt_vfsstat.f_fstypename, rc); behavior = SECURITY_FS_USE_NONE; } else if (sebsd_verbose > 1) { - printf("%s: security_fs_use(%s) behavior %d, sid %d\n", + sebsd_log("%s: security_fs_use(%s) behavior %d, sid %d", __func__, mp->mnt_vfsstat.f_fstypename, behavior, sbsec->sid); } @@ -1299,8 +1294,8 @@ */ break; default: - printf("%s: security_fs_use(%s) returned unrecognized " - "behavior %d\n", __func__, mp->mnt_vfsstat.f_fstypename, + sebsd_log("%s: security_fs_use(%s) returned unrecognized " + "behavior %d", __func__, mp->mnt_vfsstat.f_fstypename, behavior); behavior = SECURITY_FS_USE_NONE; break; @@ -1941,16 +1936,6 @@ source = SLOT(newlabel); dest = SLOT(pipelabel); - /* XXXRW: Should be KASSERT's? */ - if (!source) { - printf("%s: source is NULL!\n", __func__); - return; - } - if (!dest) { - printf("%s: dest is NULL!\n", __func__); - return; - } - dest->sid = source->sid; } @@ -1971,16 +1956,6 @@ source = SLOT(label); dest = SLOT(vnodelabel); - /* XXXRW: Should be KASSERT's? */ - if (!source) { - printf("%s: source is NULL!\n", __func__); - return; - } - if (!dest) { - printf("%s: dest is NULL!\n", __func__); - return; - } - dest->sid = source->sid; } @@ -2100,7 +2075,7 @@ sbsec = SLOT(dvp->v_mount->mnt_mntlabel); #ifdef SEFOS_DEBUG if (sbsec == NULL) { - printf ("vnode_create: no mount label for mnt=%s\n", + sebsd_log("vnode_create: no mount label for mnt=%s", dvp->v_mount->mnt_vfsstat.f_mntonname); return (0); } @@ -2383,8 +2358,8 @@ ad.u.fs.vp = vp; if (old->sclass == 0) { - printf("%s: ERROR, sid=%d, sclass=0, v_type=%d\n", __func__, - old->sid, vp->v_type); + sebsd_log("%s: ERROR, sid=%d, sclass=0, v_type=%d", + __func__, old->sid, vp->v_type); return (0); /* TBD: debugging */ } rc = avc_has_perm(task->sid, old->sid, old->sclass, @@ -2438,8 +2413,8 @@ if (rc) return (rc); if (old_file->sclass == 0) { - printf("%s: ERROR, sid=%d, sclass=0, v_type=%d\n", __func__, - old_file->sid, vp->v_type); + sebsd_log("%s: ERROR, sid=%d, sclass=0, v_type=%d", + __func__, old_file->sid, vp->v_type); return (0); /* TBD: debugging */ } @@ -2497,7 +2472,7 @@ rc = avc_has_perm(task->sid, new_dir->sid, SECCLASS_DIR, av, &ad); if (rc == 0 && vp != NULL) { if (new_file->sclass == 0) { - printf("%s: ERROR, sid=%d, sclass=0, v_type=%d\n", + sebsd_log("%s: ERROR, sid=%d, sclass=0, v_type=%d", __func__, new_file->sid, vp->v_type); return (0); /* TBD: debugging */ } From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:45:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3406B16A415; Mon, 4 Dec 2006 18:45:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0FC8516A403 for ; Mon, 4 Dec 2006 18:45:44 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99F6D43CAC for ; Mon, 4 Dec 2006 18:45:09 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IjhNX092530 for ; Mon, 4 Dec 2006 18:45:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IjhAM092527 for perforce@freebsd.org; Mon, 4 Dec 2006 18:45:43 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:45:43 GMT Message-Id: <200612041845.kB4IjhAM092527@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:45:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=111059 Change 111059 by millert@millert_g5tower on 2006/12/04 18:45:06 numsids argument to security_get_file_sids() should be u32 * Reorganize security_get_file_sids() slightly to make easier to read Hold policy lock in security_get_file_sids() Check for mls_context_isvalid() in security_get_file_sids() Use non-blocking allocations in security_get_file_sids() Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/security.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/services.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/security.h#3 (text+ko) ==== @@ -69,7 +69,7 @@ int security_get_user_sids(u32 callsid, char *username, u32 **sids, u32 *nel); -int security_get_file_sids(u32 user, u16 sclass, u32 **sids, int *numsids); +int security_get_file_sids(u32 user, u16 sclass, u32 **sids, u32 *numsids); int security_port_sid(u16 domain, u16 type, u8 protocol, u16 port, u32 *out_sid); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/services.c#3 (text+ko) ==== @@ -1632,56 +1632,69 @@ void *args) { struct getfilesids *p = args; + struct role_datum *role; + struct user_datum *usrdatum; + struct constraint_node *constraint; struct context fc; - u16 specified = avk->specified & ~(AVTAB_ENABLED|AVTAB_ENABLED_OLD); - u32 ir, iu; + u32 sid; if (avk->source_type != p->scon->type || avk->target_class != p->sclass || - (specified & AVTAB_AV) == 0 || + (avk->specified & AVTAB_AV) == 0 || (avd->data & COMMON_FILE__RELABELTO) == 0) return 0; fc.type = avk->target_type; - for (ir = 0; ir < policydb.p_roles.nprim; ir++) { - if (ir + 1 != OBJECT_R_VAL && - ebitmap_get_bit(&policydb.role_val_to_struct[ir]->types, - fc.type - 1) == 0) - continue; + for (fc.role = 1; fc.role <= policydb.p_roles.nprim; fc.role++) { + /* + * Role must be authorized for the type. + */ + if (fc.role != OBJECT_R_VAL) { + role = policydb.role_val_to_struct[fc.role - 1]; + if (ebitmap_get_bit(&role->types, fc.type - 1) == 0) + continue; /* not associated with type */ + } - fc.role = ir + 1; - for (iu = 0; iu < policydb.p_users.nprim; iu++) { - struct constraint_node *constraint; - u32 sid; + for (fc.user = 1; fc.user <= policydb.p_users.nprim; fc.user++) { + /* + * User must be authorized for the role. + */ + if (fc.role != OBJECT_R_VAL) { + usrdatum = + policydb.user_val_to_struct[fc.user - 1]; + if (usrdatum == NULL || + ebitmap_get_bit(&usrdatum->roles, + fc.role - 1) == 0) + continue; + } - if (fc.role == OBJECT_R_VAL || - ebitmap_get_bit(&policydb.user_val_to_struct[iu]->roles, ir)) { - fc.user = iu + 1; - for (constraint = p->sca->constraints; - constraint != NULL; - constraint = constraint->next) { - if ((constraint->permissions & COMMON_FILE__RELABELTO) && - !constraint_expr_eval(p->scon, &fc, - NULL, constraint->expr)) - break; - } + for (constraint = p->sca->constraints; + constraint != NULL; + constraint = constraint->next) { + if ((constraint->permissions & COMMON_FILE__RELABELTO) && + !constraint_expr_eval(p->scon, &fc, NULL, + constraint->expr)) + break; + } - if (constraint == NULL && - sidtab_context_to_sid(&sidtab, &fc, &sid) == 0) { - /* passed all checks, add to list */ - if (p->numsids == p->maxsids) { - u32 *sids; + if (constraint == NULL && + mls_context_isvalid(&policydb, &fc) && + sidtab_context_to_sid(&sidtab, &fc, &sid) == 0) { + /* passed all checks, add to list */ + if (p->numsids == p->maxsids) { + u32 *sids; - p->maxsids += 16; - sids = kmalloc(sizeof(u32) * p->maxsids, GFP_KERNEL); - memcpy(sids, p->sids, - sizeof(u32) * p->numsids); - kfree(p->sids); - p->sids = sids; - } - p->sids[p->numsids++] = sid; + p->maxsids *= 2; + sids = kmalloc(sizeof(u32) * p->maxsids, GFP_ATOMIC); + if (sids == NULL) + return ENOMEM; + memcpy(sids, p->sids, + sizeof(u32) * p->numsids); + kfree(p->sids); + p->sids = sids; } + p->sids[p->numsids++] = sid; } } } @@ -1692,32 +1705,53 @@ int security_get_file_sids(u32 user, u16 sclass, u32 **sids, - int *numsids) + u32 *numsids) { struct getfilesids p; struct context *scontext; + int rc; + + if (!ss_initialized) { + *sids = NULL; + *numsids = 0; + return 0; + } - scontext = sidtab_search(&sidtab, user); - if (scontext == NULL) + if (!sclass || sclass > policydb.p_classes.nprim) goto out_err; + POLICY_RDLOCK; + + scontext = sidtab_search(&sidtab, user); + if (scontext == NULL) { + rc = EINVAL; + goto out_unlock; + } p.scon = scontext; p.sclass = sclass; - if (!sclass || sclass > policydb.p_classes.nprim) - goto out_err; p.sca = policydb.class_val_to_struct[sclass - 1]; p.maxsids = 32; - p.sids = kmalloc(sizeof(u32) * p.maxsids, GFP_KERNEL); + p.sids = kmalloc(sizeof(u32) * p.maxsids, GFP_ATOMIC); + if (p.sids == NULL) { + rc = ENOMEM; + goto out_unlock; + } p.numsids = 0; - avtab_map(&policydb.te_avtab, getfilesids1, &p); + rc = avtab_map(&policydb.te_avtab, getfilesids1, &p); + if (rc != 0) { + kfree(p.sids); + goto out_unlock; + } *sids = p.sids; *numsids = p.numsids; - return 0; + return rc; +out_unlock: + POLICY_RDUNLOCK; out_err: *numsids = 0; *sids = NULL; - return EINVAL; + return rc; } /** From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:45:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0271C16A494; Mon, 4 Dec 2006 18:45:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D15CF16A572 for ; Mon, 4 Dec 2006 18:45:49 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC04343CA8 for ; Mon, 4 Dec 2006 18:45:14 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4Ijm52092540 for ; Mon, 4 Dec 2006 18:45:48 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IjhMU092533 for perforce@freebsd.org; Mon, 4 Dec 2006 18:45:43 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:45:43 GMT Message-Id: <200612041845.kB4IjhMU092533@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:45:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=111060 Change 111060 by millert@millert_g5tower on 2006/12/04 18:45:27 Don't install policy.old in the sefos tarball Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Makefile#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Makefile#8 (text+ko) ==== @@ -588,8 +588,12 @@ # Install policy sources # install-src: $(mig_secclass) $(mig_avs) $(mig_msgids) +ifeq ($(SEDARWIN_BUILD),1) rm -rf $(srcpath)/policy.old -mv $(srcpath)/policy $(srcpath)/policy.old +else + rm -rf $(srcpath)/policy $(srcpath)/policy.old +endif mkdir -p $(srcpath)/policy cp -R . $(srcpath)/policy From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:46:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE67A16A585; Mon, 4 Dec 2006 18:46:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C576E16A582 for ; Mon, 4 Dec 2006 18:46:52 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 413BC43CC2 for ; Mon, 4 Dec 2006 18:46:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IkpxG092765 for ; Mon, 4 Dec 2006 18:46:51 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IkpQE092757 for perforce@freebsd.org; Mon, 4 Dec 2006 18:46:51 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:46:51 GMT Message-Id: <200612041846.kB4IkpQE092757@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:46:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=111063 Change 111063 by millert@millert_g5tower on 2006/12/04 18:46:46 Enable the sidtab spinlock. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/init.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/sidtab.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/sidtab.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/init.c#6 (text+ko) ==== @@ -26,11 +26,11 @@ #include lck_grp_t *ss_lck_grp; +lck_attr_t *ss_lck_attr; int security_init(void) { lck_grp_attr_t *ss_lck_grp_attr; - lck_attr_t *ss_lck_attr; void *policy_data; size_t policy_len; int rc; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/sidtab.c#4 (text+ko) ==== @@ -16,22 +16,15 @@ #define SIDTAB_HASH(sid) \ (sid & SIDTAB_HASH_MASK) -#ifdef __FreeBSD__ -#define INIT_SIDTAB_LOCK(s) \ - memset (&s->lock, 0, sizeof (struct mtx)); \ - mtx_init (&s->lock, "SEBSD sidtab lock", NULL, MTX_DEF) +extern lck_grp_t *ss_lck_grp; +extern lck_attr_t *ss_lck_attr; -#define SIDTAB_LOCK(s) mtx_lock(&s->lock) -#define SIDTAB_UNLOCK(s) mtx_unlock(&s->lock) +#define INIT_SIDTAB_LOCK(s) do { \ + (s)->lock = lck_spin_alloc_init(ss_lck_grp, ss_lck_attr); \ +} while (0) -#else - -/* XXX - darwin locking */ -#define INIT_SIDTAB_LOCK(s) -#define SIDTAB_LOCK(s) -#define SIDTAB_UNLOCK(s) - -#endif +#define SIDTAB_LOCK(s) lck_spin_lock((s)->lock) +#define SIDTAB_UNLOCK(s) lck_spin_unlock((s)->lock) int sidtab_init(struct sidtab *s) { ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/sidtab.h#3 (text+ko) ==== @@ -29,9 +29,7 @@ unsigned int nel; /* number of elements */ unsigned int next_sid; /* next SID to allocate */ unsigned char shutdown; -#ifdef __FreeBSD__ - spinlock_t lock; -#endif + lck_spin_t *lock; }; int sidtab_init(struct sidtab *s); From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:46:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BAF616A5E1; Mon, 4 Dec 2006 18:46:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D42C916A583 for ; Mon, 4 Dec 2006 18:46:52 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A51643CB7 for ; Mon, 4 Dec 2006 18:46:16 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IkonQ092746 for ; Mon, 4 Dec 2006 18:46:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4Ikosx092743 for perforce@freebsd.org; Mon, 4 Dec 2006 18:46:50 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:46:50 GMT Message-Id: <200612041846.kB4Ikosx092743@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:46:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=111061 Change 111061 by millert@millert_g5tower on 2006/12/04 18:45:51 Expose the sidtab_search_context() function for use outside of sidtab.c. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/sidtab.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/sidtab.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/sidtab.c#3 (text+ko) ==== @@ -192,8 +192,7 @@ return; } -static inline u32 sidtab_search_context(struct sidtab *s, - struct context *context) +u32 sidtab_search_context(struct sidtab *s, struct context *context) { int i; struct sidtab_node *cur; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/sidtab.h#2 (text+ko) ==== @@ -56,6 +56,7 @@ void sidtab_hash_eval(struct sidtab *h, char *tag); void sidtab_destroy(struct sidtab *s); +u32 sidtab_search_context(struct sidtab *s, struct context *context); void sidtab_set(struct sidtab *dst, struct sidtab *src); void sidtab_shutdown(struct sidtab *s); From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:46:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B55A916A684; Mon, 4 Dec 2006 18:46:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7405A16A67D for ; Mon, 4 Dec 2006 18:46:54 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 121AB43CBE for ; Mon, 4 Dec 2006 18:46:16 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IkpWt092754 for ; Mon, 4 Dec 2006 18:46:51 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IkoWX092749 for perforce@freebsd.org; Mon, 4 Dec 2006 18:46:50 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:46:50 GMT Message-Id: <200612041846.kB4IkoWX092749@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111062 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:46:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=111062 Change 111062 by millert@millert_g5tower on 2006/12/04 18:46:12 In getfilesids1() use sidtab_search_context() instead of sidtab_context_to_sid() to validate sids. The latter will insert a non-existent sid into the table which is not what we want. Fixes the security.mac.sebsd.file.sids sysctl. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/services.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/services.c#4 (text+ko) ==== @@ -1680,7 +1680,7 @@ if (constraint == NULL && mls_context_isvalid(&policydb, &fc) && - sidtab_context_to_sid(&sidtab, &fc, &sid) == 0) { + (sid = sidtab_search_context(&sidtab, &fc)) != 0) { /* passed all checks, add to list */ if (p->numsids == p->maxsids) { u32 *sids; @@ -1702,7 +1702,7 @@ return 0; } -int security_get_file_sids(u32 user, +int security_get_file_sids(u32 usersid, u16 sclass, u32 **sids, u32 *numsids) @@ -1722,7 +1722,7 @@ POLICY_RDLOCK; - scontext = sidtab_search(&sidtab, user); + scontext = sidtab_search(&sidtab, usersid); if (scontext == NULL) { rc = EINVAL; goto out_unlock; From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:47:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E925616A4D8; Mon, 4 Dec 2006 18:47:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AF0D016A49E for ; Mon, 4 Dec 2006 18:47:53 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2930643CA5 for ; Mon, 4 Dec 2006 18:47:19 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4Ilrrf092843 for ; Mon, 4 Dec 2006 18:47:53 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4Ilq6t092840 for perforce@freebsd.org; Mon, 4 Dec 2006 18:47:52 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:47:52 GMT Message-Id: <200612041847.kB4Ilq6t092840@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111064 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:47:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=111064 Change 111064 by millert@millert_g5tower on 2006/12/04 18:47:08 Use spin locks in the avc until we have something RCU-like that does not sleep. Should fix remaining deadlock on dual CPU systems Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#14 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#14 (text+ko) ==== @@ -109,7 +109,7 @@ struct avc_cache { LIST_HEAD(, avc_node) slots[AVC_CACHE_SLOTS]; - lck_rw_t *slots_lock[AVC_CACHE_SLOTS]; + lck_spin_t *slots_lock[AVC_CACHE_SLOTS]; atomic_t lru_hint; /* LRU hint for reclaim scan */ atomic_t active_nodes; u32 latest_notif; /* latest revocation notification */ @@ -139,14 +139,12 @@ static lck_grp_t *avc_lck_grp; -#define AVC_RDLOCK(n) lck_rw_lock_shared(avc_cache.slots_lock[n]) -#define AVC_WRLOCK(n) lck_rw_lock_exclusive(avc_cache.slots_lock[n]) -#define AVC_RDUNLOCK(n) lck_rw_unlock_shared(avc_cache.slots_lock[n]) -#define AVC_WRUNLOCK(n) lck_rw_unlock_exclusive(avc_cache.slots_lock[n]) +#define AVC_LOCK(n) lck_spin_lock(avc_cache.slots_lock[n]) +#define AVC_UNLOCK(n) lck_spin_unlock(avc_cache.slots_lock[n]) -static lck_mtx_t *notif_lock; -#define NOTIF_LOCK lck_mtx_lock(notif_lock) -#define NOTIF_UNLOCK lck_mtx_unlock(notif_lock) +static lck_spin_t *notif_lock; +#define NOTIF_LOCK lck_spin_lock(notif_lock) +#define NOTIF_UNLOCK lck_spin_unlock(notif_lock) static struct avc_cache avc_cache; static struct avc_callback_node *avc_callbacks; @@ -271,12 +269,12 @@ /* allocate avc mutexes */ avc_log_lock = lck_spin_alloc_init(avc_lck_grp, avc_lck_attr); - notif_lock = lck_mtx_alloc_init(avc_lck_grp, avc_lck_attr); + notif_lock = lck_spin_alloc_init(avc_lck_grp, avc_lck_attr); for (i = 0; i < AVC_CACHE_SLOTS; i++) { LIST_INIT(&avc_cache.slots[i]); avc_cache.slots_lock[i] = - lck_rw_alloc_init(avc_lck_grp, avc_lck_attr); + lck_spin_alloc_init(avc_lck_grp, avc_lck_attr); } avc_cache.active_nodes = 0; avc_cache.lru_hint = 0; @@ -306,7 +304,7 @@ slots_used = 0; max_chain_len = 0; for (i = 0; i < AVC_CACHE_SLOTS; i++) { - AVC_RDLOCK(i); + AVC_LOCK(i); if (!LIST_EMPTY(&avc_cache.slots[i])) { slots_used++; chain_len = 0; @@ -315,7 +313,7 @@ if (chain_len > max_chain_len) max_chain_len = chain_len; } - AVC_RDUNLOCK(i); + AVC_UNLOCK(i); } return scnprintf(page, PAGE_SIZE, "entries: %d\nbuckets used: %d/%d\n" @@ -365,7 +363,7 @@ for (try = 0, ecx = 0; try < AVC_CACHE_SLOTS; try++ ) { hvalue = atomic_inc_return(&avc_cache.lru_hint) & (AVC_CACHE_SLOTS - 1); - AVC_WRLOCK(hvalue); + AVC_LOCK(hvalue); for (node = LIST_FIRST(&avc_cache.slots[hvalue]); node != NULL; node = next) { next = LIST_NEXT(node, list); @@ -375,12 +373,12 @@ avc_cache_stats_incr(reclaims); ecx++; if (ecx >= AVC_CACHE_RECLAIM) { - AVC_WRUNLOCK(hvalue); + AVC_UNLOCK(hvalue); goto out; } } } - AVC_WRUNLOCK(hvalue); + AVC_UNLOCK(hvalue); } out: return ecx; @@ -422,7 +420,7 @@ struct avc_node *node, *ret = NULL; *hvaluep = avc_hash(ssid, tsid, tclass); - AVC_RDLOCK(*hvaluep); + AVC_LOCK(*hvaluep); LIST_FOREACH(node, &avc_cache.slots[*hvaluep], list) { if (ssid == node->ae.ssid && tclass == node->ae.tclass && @@ -471,7 +469,7 @@ goto out; } - AVC_RDUNLOCK(*hvaluep); + AVC_UNLOCK(*hvaluep); node = NULL; avc_cache_stats_incr(misses); out: @@ -528,7 +526,7 @@ *hvaluep = avc_hash(ssid, tsid, tclass); avc_node_populate(node, ssid, tsid, tclass, ae); - AVC_WRLOCK(*hvaluep); + AVC_LOCK(*hvaluep); LIST_FOREACH(pos, &avc_cache.slots[*hvaluep], list) { if (pos->ae.ssid == ssid && @@ -832,7 +830,7 @@ /* Lock the target slot */ hvalue = avc_hash(ssid, tsid, tclass); - AVC_WRLOCK(hvalue); + AVC_LOCK(hvalue); LIST_FOREACH(pos, &avc_cache.slots[hvalue], list){ if ( ssid==pos->ae.ssid && @@ -878,7 +876,7 @@ } avc_node_replace(node, orig); out_unlock: - AVC_WRUNLOCK(hvalue); + AVC_UNLOCK(hvalue); out: return rc; } @@ -895,10 +893,10 @@ for (i = 0; i < AVC_CACHE_SLOTS; i++) { - AVC_WRLOCK(i); + AVC_LOCK(i); while ((node = LIST_FIRST(&avc_cache.slots[i])) != NULL) avc_node_delete(node); - AVC_WRUNLOCK(i); + AVC_UNLOCK(i); } for (c = avc_callbacks; c; c = c->next) { @@ -961,9 +959,9 @@ denied = requested & ~(p_ae->avd.allowed); if (found) - AVC_RDUNLOCK(hvalue); /* locked by avc_lookup() */ + AVC_UNLOCK(hvalue); /* locked by avc_lookup() */ else if (node) - AVC_WRUNLOCK(hvalue); /* locked by avc_insert() */ + AVC_UNLOCK(hvalue); /* locked by avc_insert() */ if (!requested || denied) { if (selinux_enforcing) From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:57:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B76E16A40F; Mon, 4 Dec 2006 18:57:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C10DA16A403 for ; Mon, 4 Dec 2006 18:57:13 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 059C443CCB for ; Mon, 4 Dec 2006 18:56:32 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4Iv6SR094429 for ; Mon, 4 Dec 2006 18:57:06 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4Iv6Xc094426 for perforce@freebsd.org; Mon, 4 Dec 2006 18:57:06 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:57:06 GMT Message-Id: <200612041857.kB4Iv6Xc094426@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:57:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=111065 Change 111065 by millert@millert_macbook on 2006/12/04 18:56:37 Default plist for mac_device_access Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/device_access/Default.plist#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Dec 4 18:58:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF73416A415; Mon, 4 Dec 2006 18:58:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A39B816A403 for ; Mon, 4 Dec 2006 18:58:08 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1769D43CA6 for ; Mon, 4 Dec 2006 18:57:34 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4Iw8Wx094474 for ; Mon, 4 Dec 2006 18:58:08 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4Iw8O1094471 for perforce@freebsd.org; Mon, 4 Dec 2006 18:58:08 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 18:58:08 GMT Message-Id: <200612041858.kB4Iw8O1094471@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 18:58:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=111066 Change 111066 by millert@millert_macbook on 2006/12/04 18:57:54 Man page for mac_is_present(3) Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac_is_present.3#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Dec 4 19:00:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBD8F16A50C; Mon, 4 Dec 2006 19:00:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B041716A501 for ; Mon, 4 Dec 2006 19:00:29 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B90643CF1 for ; Mon, 4 Dec 2006 18:59:37 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4J0BkJ094622 for ; Mon, 4 Dec 2006 19:00:11 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4J0BAv094619 for perforce@freebsd.org; Mon, 4 Dec 2006 19:00:11 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 19:00:11 GMT Message-Id: <200612041900.kB4J0BAv094619@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111067 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 19:00:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=111067 Change 111067 by millert@millert_macbook on 2006/12/04 18:59:11 No longer needed. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/sorted-framework.vim#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/sorted-policynames.vim#5 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Dec 4 19:01:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98A3F16A415; Mon, 4 Dec 2006 19:01:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7672C16A407 for ; Mon, 4 Dec 2006 19:01:18 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12A8143CB6 for ; Mon, 4 Dec 2006 19:00:40 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4J1Fo4094777 for ; Mon, 4 Dec 2006 19:01:15 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4J1F1b094774 for perforce@freebsd.org; Mon, 4 Dec 2006 19:01:15 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 19:01:15 GMT Message-Id: <200612041901.kB4J1F1b094774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 19:01:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=111068 Change 111068 by millert@millert_macbook on 2006/12/04 19:00:47 Tool to list/get/set/remove extended attributes. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/release/tools/xattr/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/release/tools/xattr/xattr.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Dec 4 19:03:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EC8A16A492; Mon, 4 Dec 2006 19:03:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 33DDB16A47C for ; Mon, 4 Dec 2006 19:03:19 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43D2943CA7 for ; Mon, 4 Dec 2006 19:02:44 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4J3IMu096880 for ; Mon, 4 Dec 2006 19:03:18 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4J3Hbq096876 for perforce@freebsd.org; Mon, 4 Dec 2006 19:03:17 GMT (envelope-from millert@freebsd.org) Date: Mon, 4 Dec 2006 19:03:17 GMT Message-Id: <200612041903.kB4J3Hbq096876@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 19:03:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=111069 Change 111069 by millert@millert_macbook on 2006/12/04 19:02:48 Update policy Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/DirectoryService.fc#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.fc#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.if#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#8 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreaudiod.te#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.te#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/kextd.te#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.if#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/lookupd.te#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/mDNSResponder.te#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.if#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.te#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.if#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/update.te#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/files.fc#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/kernel.if#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.if#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.if#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/logging.if#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/logging.te#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/DirectoryService.fc#4 (text+ko) ==== @@ -9,9 +9,6 @@ /Library/Preferences/DirectoryService -d gen_context(system_u:object_r:DirectoryService_resource_t,s0) /Library/Preferences/DirectoryService/.* -- gen_context(system_u:object_r:DirectoryService_resource_t,s0) -/System/Library/Frameworks/DirectoryService.framework -d gen_context(system_u:object_r:DirectoryService_resource_t,s0) -/System/Library/Frameworks/DirectoryService.framework/.* gen_context(system_u:object_r:DirectoryService_resource_t,s0) -/System/Library/PrivateFrameworks/DirectoryServiceCore.framework.* gen_context(system_u:object_r:DirectoryService_resource_t,s0) /private/var/run/.DSRunningSP1 -- gen_context(system_u:object_r:DirectoryService_var_run_t,s0) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.fc#4 (text+ko) ==== @@ -5,4 +5,4 @@ /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Resources/WindowServer -- gen_context(system_u:object_r:WindowServer_exec_t,s0) -/System/Library/Displays/.* -- gen_context(system_u:object_r:WindowServer_resource_t) +/System/Library/Displays.* gen_context(system_u:object_r:WindowServer_resource_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.if#5 (text+ko) ==== @@ -97,7 +97,7 @@ # interface(`WindowServer_allow_resource_read',` - allow $1 WindowServer_resource_t:file {read getattr}; - allow $1 WindowServer_resource_t:dir {search}; + allow $1 WindowServer_resource_t:file read_file_perms; + allow $1 WindowServer_resource_t:dir r_dir_perms; ') ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#7 (text+ko) ==== @@ -116,3 +116,11 @@ # Read general resource files darwin_allow_resource_read(WindowServer_t) + +# Perform filesystem operations +fs_getattr_xattr_fs(WindowServer_t) + +# Read user home dirs +userdom_search_all_users_home_content(WindowServer_t) +userdom_read_all_users_home_content_files(WindowServer_t) + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#8 (text+ko) ==== @@ -145,6 +145,7 @@ WindowServer_allow_shm(configd_t) # Read prefs, etc +darwin_allow_global_pref_manage(configd_t) darwin_allow_global_pref_rw(configd_t) darwin_allow_host_pref_read(configd_t) darwin_allow_system_read(configd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreaudiod.te#6 (text+ko) ==== @@ -63,3 +63,7 @@ # Allow reading of /private darwin_allow_private_read(coreaudiod_t) + +# Allow reading of /var +files_read_var_symlinks(coreaudiod_t) +files_read_var_files(coreaudiod_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.te#7 (text+ko) ==== @@ -47,8 +47,23 @@ allow diskarbitrationd_t self:udp_socket create; allow diskarbitrationd_t self:unix_dgram_socket create; allow diskarbitrationd_t sbin_t:dir search; +allow diskarbitrationd_t self:mach_task set_special_port; + +# Allow disk/device/fs operations +allow diskarbitrationd_t device_t:chr_file { ioctl read }; +allow diskarbitrationd_t fs_t:dir getattr; +allow diskarbitrationd_t fsadm_t:file execute_no_trans; +# Allow mount operations +allow diskarbitrationd_t fs_t:filesystem mount; +allow diskarbitrationd_t mnt_t:dir { getattr read remove_name rmdir search }; +allow diskarbitrationd_t mnt_t:file { getattr unlink }; +allow diskarbitrationd_t mnt_t:lnk_file unlink; + + + + # Allow various file operations allow diskarbitrationd_t nfs_t:dir getattr; allow diskarbitrationd_t nfs_t:filesystem mount; @@ -61,9 +76,10 @@ allow diskarbitrationd_t mount_exec_t:file { execute_no_trans read }; # Allow access to raw disk devices +storage_raw_read_fixed_disk(diskarbitrationd_t) # Note: This causes the following error...we need to figure it out: # -# libsepol.check_assertion_helper: assertion on line 337564 violated by allow diskarbitrationd_t fixed_disk_device_t:blk_file { read }; +## libsepol.check_assertion_helper: assertion on line 337564 violated by allow diskarbitrationd_t fixed_disk_device_t:blk_file { read }; # libsepol.check_assertions: 1 assertion violations occured # Error while expanding policy #allow diskarbitrationd_t fixed_disk_device_t:blk_file { ioctl read }; @@ -79,6 +95,7 @@ # Allow Mach IPC with launchd init_allow_ipc(diskarbitrationd_t) +init_allow_bootstrap(diskarbitrationd_t) # Allow Mach IPC with configd configd_allow_ipc(diskarbitrationd_t) @@ -105,7 +122,7 @@ frameworks_read(diskarbitrationd_t) # Read /private/var -files_read_var_files(diskarbitrationd_t) +files_rw_var_files(diskarbitrationd_t) # Allow reading of /private darwin_allow_private_read(diskarbitrationd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/kextd.te#4 (text+ko) ==== @@ -77,6 +77,16 @@ # Use tmp files files_tmp_file(kextd_t) - # Read /private/var files_read_var_files(kextd_t) + +# Read/write/create in /private +darwin_allow_private_rw(kextd_t) +darwin_allow_private_create(kextd_t) + +# Read the kernel +kernel_read_kernel(kextd_t) + + + # Use CoreServices +darwin_allow_CoreServices_read(kextd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.fc#2 (text+ko) ==== @@ -4,3 +4,4 @@ # MCS categories: /System/Library/CoreServices/loginwindow.app/Contents/MacOS/loginwindow -- gen_context(system_u:object_r:loginwindow_exec_t,s0) +/System/Library/LoginPlugins gen_context(system_u:object_r:loginwindow_resource_t,s0) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.if#4 (text+ko) ==== @@ -54,3 +54,24 @@ allow $1 loginwindow_t:shm { create destroy getattr setattr read write associate unix_read unix_write lock }; ') + + +######################################## +## +## Allow reading of loginwindow resource files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`loginwindow_allow_resource_read',` + gen_require(` + type loginwindow_resource_t; + ') + + allow $1 loginwindow_resource_t:file read_file_perms; + allow $1 loginwindow_resource_t:dir r_dir_perms; + +') ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#5 (text+ko) ==== @@ -10,6 +10,8 @@ domain_type(loginwindow_t) init_domain(loginwindow_t, loginwindow_exec_t) +type loginwindow_resource_t; + ######################################## # # loginwindow local policy @@ -77,16 +79,55 @@ # Use CoreServices darwin_allow_CoreServices_read(loginwindow_t) +darwin_allow_CoreServices_execute(loginwindow_t) # Read prefs darwin_allow_global_pref_read(loginwindow_t) darwin_allow_host_pref_read(loginwindow_t) # Read /private -darwin_allow_private_read(loginwindow_t) +darwin_allow_private_rw(loginwindow_t) +darwin_allow_private_create(loginwindow_t) # Read /System darwin_allow_system_read(loginwindow_t) # Use frameworks frameworks_read(loginwindow_t) +frameworks_execute(loginwindow_t) + +# Read general resources +darwin_allow_resource_read(loginwindow_t) + +# Read our own resources +loginwindow_allow_resource_read(loginwindow_t) + +# Read user home dirs +userdom_search_all_users_home_content(loginwindow_t) +userdom_read_all_users_home_content_files(loginwindow_t) + +# Read/Write lastlog +auth_rw_lastlog(loginwindow_t) + +# Perform filesystem operations +fs_getattr_xattr_fs(loginwindow_t) +# Note: Not sure of the best way to do this "for real" +allow loginwindow_t fs_t:dir { getattr read search }; +allow loginwindow_t fs_t:file { getattr read }; + +# Read/Write utmp +init_rw_utmp(loginwindow_t) + +# Use login plugins +darwin_allow_loginplugin_read(loginwindow_t) +darwin_allow_loginplugin_execute(loginwindow_t) + +# Read WindowServer resources +WindowServer_allow_resource_read(loginwindow_t) + +# Read/write caches +darwin_allow_cache_rw(loginwindow_t) + +# Read services files +darwin_allow_services_read(loginwindow_t) + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/lookupd.te#4 (text+ko) ==== @@ -99,4 +99,7 @@ # Use frameworks frameworks_read(lookupd_t) +frameworks_execute(lookupd_t) +# Allow Mach IPC w/ syslogd +logging_allow_ipc(lookupd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/mDNSResponder.te#4 (text+ko) ==== @@ -77,3 +77,5 @@ # Read /private darwin_allow_private_read(mDNSResponder_t) +# Talk to notifyd +notifyd_allow_ipc(mDNSResponder_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.if#4 (text+ko) ==== @@ -34,10 +34,10 @@ interface(`notifyd_allow_ipc',` # Allow communication with notification server - allow $1 notifyd_t:mi_notify_ipc { notify_server_cancel notify_server_get_state notify_server_monitor_file notify_server_register_check notify_server_register_plain notify_server_post notify_server_register_mach_port notify_server_register_signal}; + allow $1 notifyd_t:mi_notify_ipc { notify_server_cancel notify_server_get_state notify_server_monitor_file notify_server_register_check notify_server_register_plain notify_server_post notify_server_register_mach_port notify_server_register_signal notify_server_set_state notify_server_get_state}; # Note. this may be temporary. We are still investigating the reasons # for launchd started services being labeled init_t. - allow $1 init_t:mi_notify_ipc { notify_server_cancel notify_server_get_state notify_server_monitor_file notify_server_register_check notify_server_register_plain notify_server_post notify_server_register_mach_port notify_server_register_signal}; + allow $1 init_t:mi_notify_ipc { notify_server_cancel notify_server_get_state notify_server_monitor_file notify_server_register_check notify_server_register_plain notify_server_post notify_server_register_mach_port notify_server_register_signal notify_server_set_state notify_server_get_state}; mach_allow_ipc($1, notifyd_t) ') ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.te#4 (text+ko) ==== @@ -41,3 +41,6 @@ # Allow signalling of other processes allow notifyd_t init_t:process signal; allow notifyd_t lookupd_t:process signal; + +# Read /private +darwin_allow_private_read(notifyd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.fc#2 (text+ko) ==== @@ -4,3 +4,5 @@ # MCS categories: /usr/sbin/securityd -- gen_context(system_u:object_r:securityd_exec_t,s0) + +/private/var/tmp/mds.* gen_context(system_u:object_r:securityd_tmp_t,s0) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.if#3 (text+ko) ==== @@ -36,3 +36,20 @@ # Allow bidirectional comminication with securityd mach_allow_ipc(securityd_t, $1) ') + +######################################## +## +## Allow read of securityd tmp files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`securityd_tmp_read',` + + allow $1 securityd_tmp_t:file read_file_perms; + allow $1 securityd_tmp_t:dir search_dir_perms; +') + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#4 (text+ko) ==== @@ -10,6 +10,9 @@ domain_type(securityd_t) init_domain(securityd_t, securityd_exec_t) +type securityd_tmp_t; +files_tmp_file(securityd_tmp_t) + ######################################## # # securityd local policy @@ -38,7 +41,14 @@ allow securityd_t nfs_t:filesystem getattr; allow securityd_t nfs_t:lnk_file read; allow securityd_t usr_t:file { getattr read }; +allow securityd_t random_device_t:chr_file read; +allow securityd_t sbin_t:dir { getattr read search }; +# /var file operations +files_manage_var_files(securityd_t) +files_manage_var_dirs(securityd_t) +files_manage_var_symlinks(securityd_t) + # Talk to launchd init_allow_ipc(securityd_t) @@ -52,3 +62,43 @@ # something is probably mislabeled. allow securityd_t lib_t:file execute_no_trans; +# Talk to bootstrap server +init_allow_bootstrap(securityd_t) + +# Talk to kernel +kernel_allow_ipc(securityd_t) + +# Use CoreServices +darwin_allow_CoreServices_read(securityd_t) +darwin_allow_CoreServices_execute(securityd_t) + +# Read prefs +darwin_allow_global_pref_read(securityd_t) +darwin_allow_host_pref_read(securityd_t) + +# Read /private +darwin_allow_private_rw(securityd_t) + +# Use general resources +darwin_allow_resource_read(securityd_t) + +# read /System +darwin_allow_system_read(securityd_t) + +# Use frameworks +frameworks_read(securityd_t) + +# Share memory w/ WindowServer +WindowServer_allow_shm(securityd_t) + +# Read configd executable +allow securityd_t configd_exec_t:file read; + +# Read/Write temp files, etc +files_read_generic_tmp_files(securityd_t) +securityd_tmp_read(securityd_t) + +# Read user home dirs +userdom_search_all_users_home_content(securityd_t) +userdom_read_all_users_home_content_files(securityd_t) + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/update.te#3 (text+ko) ==== @@ -25,5 +25,12 @@ allow update_t self:fifo_file { read write }; allow update_t self:unix_stream_socket create_stream_socket_perms; +# talk to self +mach_allow_message(update_t, update_t) + +# talk to kernel +kernel_allow_ipc(update_t) + # talk to launchd init_allow_ipc(update_t) + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/files.fc#6 (text+ko) ==== @@ -45,6 +45,11 @@ /Volumes/[^/]*/.* <> # +# /tmp +# +/tmp gen_context(system_u:object_r:tmp_t,s0-mls_systemhigh) + +# # /private/tmp # /private/tmp -d gen_context(system_u:object_r:tmp_t,s0-mls_systemhigh) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/kernel.if#4 (text+ko) ==== @@ -2386,3 +2386,17 @@ interface(`kernel_allow_ipc',` mach_allow_ipc(kernel_t, $1) ') + +######################################## +## +## Allow reading of the kernel. +## +## +## +## Domain allowed access. +## +## +# +interface(`kernel_read_kernel',` + allow $1 kernel_t:file read_file_perms; +') ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#3 (text+ko) ==== @@ -1,12 +1,35 @@ -/Library/Preferences/.GlobalPreferences.plist -- gen_context(system_u:object_r:darwin_global_pref_t,s0) -/Library/Preferences -d gen_context(system_u:object_r:darwin_global_pref_t,s0) + +# +# /private +# +/private -d gen_context(system_u:object_r:darwin_private_t,s0) /private/var/db/.AppleSetupDone -- gen_context(system_u:object_r:darwin_global_pref_t,s0) -/Library/Preferences/SystemConfiguration.* gen_context(system_u:object_r:darwin_global_pref_t,s0) /private/var/root/Library/Preferences/ByHost.* gen_context(system_u:object_r:darwin_host_pref_t,s0) + + +# +# /System +# +/System/Library/LoginPlugins.* gen_context(system_u:object_r:darwin_loginplugin_t,s0) +/System/library/Caches.* gen_context(system_u:object_r:darwin_loginplugin_t,s0) +/System/library/Services.* gen_context(system_u:object_r:darwin_services_t,s0) +/System/Library/Security.* gen_context(system_u:object_r:darwin_security_t,s0) /System/Library/CoreServices.* gen_context(system_u:object_r:darwin_CoreServices_t,s0) +/System/Library/ColorSync.* gen_context(system_u:object_r:darwin_resource_t,s0) -/private -d gen_context(system_u:object_r:darwin_private_t,s0) +# +# Applications +# +/Applications.* gen_context(system_u:object_r:bin_t,s0) +# +# /Library +# /Library/ColorSync.* gen_context(system_u:object_r:darwin_resource_t,s0) -/System/Library/ColorSync.* gen_context(system_u:object_r:darwin_resource_t,s0) +/Library/Preferences/.GlobalPreferences.plist -- gen_context(system_u:object_r:darwin_global_pref_t,s0) +/Library/Preferences.* gen_context(system_u:object_r:darwin_global_pref_t,s0) +/Library/Preferences/SystemConfiguration.* gen_context(system_u:object_r:darwin_global_pref_t,s0) +/Library/Keychains.* gen_context(system_u:object_r:darwin_keychain_t,s0) +# Kernel +/mach_kernel -- gen_context(system_u:object_r:kernel_t,s0) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.if#3 (text+ko) ==== @@ -42,6 +42,25 @@ ######################################## ## +## Allow creation of global preference files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_global_pref_manage',` + gen_require(` + type darwin_global_pref_t; + ') + + allow $1 darwin_global_pref_t:file manage_file_perms; + +') + +######################################## +## ## Allow reading of host preference files ## ## @@ -60,7 +79,6 @@ allow $1 darwin_host_pref_t:dir r_dir_perms; ') - ######################################## ## ## Allow reading of CoreServices files @@ -72,13 +90,33 @@ ## # interface(`darwin_allow_CoreServices_read',` + gen_require(` + type darwin_CoreServices_t; + ') + + allow $1 darwin_CoreServices_t:file read_file_perms; + allow $1 darwin_CoreServices_t:dir r_dir_perms; + allow $1 darwin_CoreServices_t:lnk_file { getattr read }; + +') + + +######################################## +## +## Allow execution of CoreServices files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_CoreServices_execute',` gen_require(` type darwin_CoreServices_t; ') - allow $1 darwin_CoreServices_t:file read_file_perms; - allow $1 darwin_CoreServices_t:dir r_dir_perms; - allow $1 darwin_CoreServices_t:lnk_file { getattr read }; + allow $1 darwin_CoreServices_t:file { execute execute_no_trans }; ') @@ -117,6 +155,7 @@ ') allow $1 darwin_private_t:dir r_dir_perms; + allow $1 darwin_private_t:file read_file_perms; ') @@ -136,11 +175,51 @@ ') allow $1 darwin_private_t:dir rw_dir_perms; + allow $1 darwin_private_t:file rw_file_perms; ') ######################################## ## +## Allow creation of files in /private +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_private_create',` + gen_require(` + type darwin_private_t; + ') + + allow $1 darwin_private_t:file create_file_perms; + allow $1 darwin_private_t:dir create_dir_perms; + +') + +######################################## +## +## Allow complete managament of /private +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_private_manage',` + gen_require(` + type darwin_private_t; + ') + + allow $1 darwin_private_t:dir manage_dir_perms; + +') + +######################################## +## ## Allow reading of general resource files ## ## @@ -158,3 +237,360 @@ allow $1 darwin_resource_t:dir r_dir_perms; ') + +######################################## +## +## Allow reading of loginplugin files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_loginplugin_read',` + gen_require(` + type darwin_loginplugin_t; + ') + + allow $1 darwin_loginplugin_t:file read_file_perms; + allow $1 darwin_loginplugin_t:dir r_dir_perms; + +') + +######################################## +## +## Allow reading/writing of loginplugin files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_loginplugin_rw',` + gen_require(` + type darwin_loginplugin_t; + ') + + allow $1 darwin_loginplugin_t:file rw_file_perms; + allow $1 darwin_loginplugin_t:dir rw_dir_perms; + +') + +######################################## +## +## Allow managing of loginplugin files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_loginplugin_manage',` + gen_require(` + type darwin_loginplugin_t; + ') + + allow $1 darwin_loginplugin_t:file manage_file_perms; + +') + +######################################## +## +## Allow execution of loginplugin files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_loginplugin_execute',` + gen_require(` + type darwin_loginplugin_t; + ') + + allow $1 darwin_loginplugin_t:file { execute execute_no_trans }; + +') + +######################################## +## +## Allow reading of cache files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_cache_read',` + gen_require(` + type darwin_cache_t; + ') + + allow $1 darwin_cache_t:file read_file_perms; + +') + +######################################## +## +## Allow reading/writing of cache files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_cache_rw',` + gen_require(` + type darwin_cache_t; + ') + + allow $1 darwin_cache_t:file rw_file_perms; + +') + +######################################## +## +## Allow managing of cache files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_cache_manage',` + gen_require(` + type darwin_cache_t; + ') + + allow $1 darwin_cache_t:file manage_file_perms; + +') + +######################################## +## +## Allow reading of services files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_services_read',` + gen_require(` + type darwin_services_t; + ') + + allow $1 darwin_services_t:file read_file_perms; + +') + +######################################## +## +## Allow reading/writing of services files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_services_rw',` + gen_require(` + type darwin_services_t; + ') + + allow $1 darwin_services_t:file rw_file_perms; + +') + +######################################## +## +## Allow managing of services files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_services_manage',` + gen_require(` + type darwin_services_t; + ') + + allow $1 darwin_services_t:file manage_file_perms; +') + +######################################## +## +## Allow reading of trash files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_trash_read',` + gen_require(` + type darwin_trash_t; + ') + + allow $1 darwin_trash_t:file read_file_perms; + allow $1 darwin_trash_t:dir read_dir_perms; +') + +######################################## +## +## Allow reading/writing of trash files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_trash_rw',` + gen_require(` + type darwin_trash_t; + ') + + allow $1 darwin_trash_t:file rw_file_perms; + allow $1 darwin_trash_t:dir rw_dir_perms; +') +######################################## +## +## Allow managing of trash files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_trash_manage',` + gen_require(` + type darwin_trash_t; + ') + + allow $1 darwin_trash_t:file manage_file_perms; +') + +######################################## +## +## Allow reading of security files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_security_read',` + gen_require(` + type darwin_security_t; + ') + + allow $1 darwin_security_t:file read_file_perms; + allow $1 darwin_security_t:file r_dir_perms; +') + +######################################## +## +## Allow reading/writing of security files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_security_rw',` + gen_require(` + type darwin_security_t; + ') + + allow $1 darwin_security_t:file rw_file_perms; +') + +######################################## +## +## Allow reading/writing of security files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_security_manage',` + gen_require(` + type darwin_security_t; + ') + + allow $1 darwin_security_t:file manage_file_perms; +') + + +######################################## +## +## Allow reading of keychain files +## +## +## +## Type to be used as a domain. +## +## +# +interface(`darwin_allow_keychain_read',` + gen_require(` + type darwin_keychain_t; + ') + + allow $1 darwin_keychain_t:file read_file_perms; + allow $1 darwin_keychain_t:file r_dir_perms; +') + +######################################## +## +## Allow reading/writing of keychain files >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 4 21:24:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12DD216A40F; Mon, 4 Dec 2006 21:24:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8DC4116A417 for ; Mon, 4 Dec 2006 21:24:58 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0ACA43CF8 for ; Mon, 4 Dec 2006 21:18:42 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4LJD9x029053 for ; Mon, 4 Dec 2006 21:19:13 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4LJDIY029050 for perforce@freebsd.org; Mon, 4 Dec 2006 21:19:13 GMT (envelope-from piso@freebsd.org) Date: Mon, 4 Dec 2006 21:19:13 GMT Message-Id: <200612042119.kB4LJDIY029050@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 21:24:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=111075 Change 111075 by piso@piso_newluxor on 2006/12/04 21:18:51 Reduce the verbosity while in kernel. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#16 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#16 (text+ko) ==== @@ -463,7 +463,6 @@ va_start(ap, format); vsnprintf(str, LIBALIAS_BUF_SIZE, format, ap); - log(LOG_SECURITY | LOG_INFO, "%s\n", str); va_end(ap); } #else From owner-p4-projects@FreeBSD.ORG Mon Dec 4 23:02:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F400216A4D0; Mon, 4 Dec 2006 23:02:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CDAC716A4C9 for ; Mon, 4 Dec 2006 23:02:33 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 918E743CC4 for ; Mon, 4 Dec 2006 23:01:52 +0000 (GMT) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4N2Rcx048955 for ; Mon, 4 Dec 2006 23:02:27 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4N2Q6a048949 for perforce@freebsd.org; Mon, 4 Dec 2006 23:02:26 GMT (envelope-from jkim@freebsd.org) Date: Mon, 4 Dec 2006 23:02:26 GMT Message-Id: <200612042302.kB4N2Q6a048949@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 111079 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 23:02:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=111079 Change 111079 by jkim@jkim_hammer on 2006/12/04 23:02:01 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/linuxolator/src/sys/compat/linsysfs/linsysfs.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#42 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_thr.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_umtx.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_lock.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_rman.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/bridgestp.c#7 integrate .. //depot/projects/linuxolator/src/sys/net/bridgestp.h#5 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridge.c#9 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridgevar.h#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/igmp.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/tsb.h#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/pmap.c#7 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tsb.c#4 integrate .. //depot/projects/linuxolator/src/sys/sys/proc.h#7 integrate .. //depot/projects/linuxolator/src/sys/sys/umtx.h#6 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#6 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.469 2006/11/22 10:34:12 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.470 2006/12/03 21:02:09 netchild Exp $ cpu HAMMER ident GENERIC @@ -71,11 +71,6 @@ # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -# Linux 32-bit ABI support -options COMPAT_LINUX32 # Compatible with i386 linux binaries -options LINPROCFS -options LINSYSFS - # Bus support. device acpi device pci ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.25 2006/10/31 17:53:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.26 2006/12/03 21:06:07 netchild Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 ==== //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#5 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.76 2006/12/01 12:29:55 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.77 2006/12/04 12:55:00 cognet Exp $"); #include #include #include @@ -2807,6 +2807,7 @@ if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); pmap_free_pv_entry(pv); + pmap_free_l2_bucket(pmap, l2b, 1); } vm_page_unlock_queues(); cpu_idcache_wbinv_all(); ==== //depot/projects/linuxolator/src/sys/compat/linsysfs/linsysfs.c#3 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linsysfs/linsysfs.c,v 1.2 2006/05/11 15:27:58 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linsysfs/linsysfs.c,v 1.3 2006/12/03 21:00:31 netchild Exp $"); #include #include @@ -268,10 +268,10 @@ static int linsysfs_uninit(PFS_INIT_ARGS) { - struct scsi_host_queue *scsi_host, *scsi_host_temp; + struct scsi_host_queue *scsi_host, *scsi_host_tmp; - TAILQ_FOREACH_SAFE(scsi_host, &scsi_host_q, scsi_host_next, - scsi_host_temp) { + TAILQ_FOREACH_SAFE(scsi_host, &scsi_host_q, scsi_host_next, + scsi_host_tmp) { TAILQ_REMOVE(&scsi_host_q, scsi_host, scsi_host_next); free(scsi_host->path, M_TEMP); free(scsi_host, M_TEMP); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#42 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.198 2006/12/02 14:56:25 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.199 2006/12/04 22:46:09 jkim Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.85 2006/10/22 11:52:11 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.86 2006/12/04 22:38:52 jkim Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.154 2006/12/01 01:37:45 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.157 2006/12/04 22:12:21 jkim Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -281,36 +281,12 @@ { 0, NULL } }; -#define BGE_IS_5705_OR_BEYOND(sc) \ - ((sc)->bge_asicrev == BGE_ASICREV_BCM5705 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5750 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5714_A0 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5780 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5714 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5752 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5755 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5787) +#define BGE_IS_JUMBO_CAPABLE(sc) ((sc)->bge_flags & BGE_FLAG_JUMBO) +#define BGE_IS_5700_FAMILY(sc) ((sc)->bge_flags & BGE_FLAG_5700_FAMILY) +#define BGE_IS_5705_PLUS(sc) ((sc)->bge_flags & BGE_FLAG_5705_PLUS) +#define BGE_IS_5714_FAMILY(sc) ((sc)->bge_flags & BGE_FLAG_5714_FAMILY) +#define BGE_IS_575X_PLUS(sc) ((sc)->bge_flags & BGE_FLAG_575X_PLUS) -#define BGE_IS_575X_PLUS(sc) \ - ((sc)->bge_asicrev == BGE_ASICREV_BCM5750 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5714_A0 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5780 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5714 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5752 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5755 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5787) - -#define BGE_IS_5714_FAMILY(sc) \ - ((sc)->bge_asicrev == BGE_ASICREV_BCM5714_A0 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5780 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5714) - -#define BGE_IS_JUMBO_CAPABLE(sc) \ - ((sc)->bge_asicrev == BGE_ASICREV_BCM5700 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5701 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5703 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5704) - const struct bge_revision * bge_lookup_rev(uint32_t); const struct bge_vendor * bge_lookup_vendor(uint16_t); static int bge_probe(device_t); @@ -1229,23 +1205,13 @@ /* Note: the BCM5704 has a smaller mbuf space than other chips. */ - if (!(BGE_IS_5705_OR_BEYOND(sc))) { + if (!(BGE_IS_5705_PLUS(sc))) { /* Configure mbuf memory pool */ - if (sc->bge_flags & BGE_FLAG_EXTRAM) { - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR, - BGE_EXT_SSRAM); - if (sc->bge_asicrev == BGE_ASICREV_BCM5704) - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x10000); - else - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x18000); - } else { - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR, - BGE_BUFFPOOL_1); - if (sc->bge_asicrev == BGE_ASICREV_BCM5704) - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x10000); - else - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x18000); - } + CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR, BGE_BUFFPOOL_1); + if (sc->bge_asicrev == BGE_ASICREV_BCM5704) + CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x10000); + else + CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x18000); /* Configure DMA resource pool */ CSR_WRITE_4(sc, BGE_BMAN_DMA_DESCPOOL_BASEADDR, @@ -1254,7 +1220,7 @@ } /* Configure mbuf pool watermarks */ - if (!(BGE_IS_5705_OR_BEYOND(sc))) { + if (!(BGE_IS_5705_PLUS(sc))) { CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x0); CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x10); } else { @@ -1268,7 +1234,7 @@ CSR_WRITE_4(sc, BGE_BMAN_DMA_DESCPOOL_HIWAT, 10); /* Enable buffer manager */ - if (!(BGE_IS_5705_OR_BEYOND(sc))) { + if (!(BGE_IS_5705_PLUS(sc))) { CSR_WRITE_4(sc, BGE_BMAN_MODE, BGE_BMANMODE_ENABLE|BGE_BMANMODE_LOMBUF_ATTN); @@ -1310,15 +1276,12 @@ BGE_ADDR_HI(sc->bge_ldata.bge_rx_std_ring_paddr); bus_dmamap_sync(sc->bge_cdata.bge_rx_std_ring_tag, sc->bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_PREREAD); - if (BGE_IS_5705_OR_BEYOND(sc)) + if (BGE_IS_5705_PLUS(sc)) rcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(512, 0); else rcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(BGE_MAX_FRAMELEN, 0); - if (sc->bge_flags & BGE_FLAG_EXTRAM) - rcb->bge_nicaddr = BGE_EXT_STD_RX_RINGS; - else - rcb->bge_nicaddr = BGE_STD_RX_RINGS; + rcb->bge_nicaddr = BGE_STD_RX_RINGS; CSR_WRITE_4(sc, BGE_RX_STD_RCB_HADDR_HI, rcb->bge_hostaddr.bge_addr_hi); CSR_WRITE_4(sc, BGE_RX_STD_RCB_HADDR_LO, rcb->bge_hostaddr.bge_addr_lo); @@ -1344,10 +1307,7 @@ BUS_DMASYNC_PREREAD); rcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(0, BGE_RCB_FLAG_USE_EXT_RX_BD|BGE_RCB_FLAG_RING_DISABLED); - if (sc->bge_flags & BGE_FLAG_EXTRAM) - rcb->bge_nicaddr = BGE_EXT_JUMBO_RX_RINGS; - else - rcb->bge_nicaddr = BGE_JUMBO_RX_RINGS; + rcb->bge_nicaddr = BGE_JUMBO_RX_RINGS; CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_HADDR_HI, rcb->bge_hostaddr.bge_addr_hi); CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_HADDR_LO, @@ -1393,7 +1353,7 @@ RCB_WRITE_4(sc, vrcb, bge_hostaddr.bge_addr_lo, taddr.bge_addr_lo); RCB_WRITE_4(sc, vrcb, bge_nicaddr, BGE_NIC_TXRING_ADDR(0, BGE_TX_RING_CNT)); - if (!(BGE_IS_5705_OR_BEYOND(sc))) + if (!(BGE_IS_5705_PLUS(sc))) RCB_WRITE_4(sc, vrcb, bge_maxlen_flags, BGE_RCB_MAXLEN_FLAGS(BGE_TX_RING_CNT, 0)); @@ -1477,7 +1437,7 @@ CSR_WRITE_4(sc, BGE_HCC_TX_COAL_TICKS, sc->bge_tx_coal_ticks); CSR_WRITE_4(sc, BGE_HCC_RX_MAX_COAL_BDS, sc->bge_rx_max_coal_bds); CSR_WRITE_4(sc, BGE_HCC_TX_MAX_COAL_BDS, sc->bge_tx_max_coal_bds); - if (!(BGE_IS_5705_OR_BEYOND(sc))) { + if (!(BGE_IS_5705_PLUS(sc))) { CSR_WRITE_4(sc, BGE_HCC_RX_COAL_TICKS_INT, 0); CSR_WRITE_4(sc, BGE_HCC_TX_COAL_TICKS_INT, 0); } @@ -1485,7 +1445,7 @@ CSR_WRITE_4(sc, BGE_HCC_TX_MAX_COAL_BDS_INT, 0); /* Set up address of statistics block */ - if (!(BGE_IS_5705_OR_BEYOND(sc))) { + if (!(BGE_IS_5705_PLUS(sc))) { CSR_WRITE_4(sc, BGE_HCC_STATS_ADDR_HI, BGE_ADDR_HI(sc->bge_ldata.bge_stats_paddr)); CSR_WRITE_4(sc, BGE_HCC_STATS_ADDR_LO, @@ -1514,7 +1474,7 @@ CSR_WRITE_4(sc, BGE_RXLP_MODE, BGE_RXLPMODE_ENABLE); /* Turn on RX list selector state machine. */ - if (!(BGE_IS_5705_OR_BEYOND(sc))) + if (!(BGE_IS_5705_PLUS(sc))) CSR_WRITE_4(sc, BGE_RXLS_MODE, BGE_RXLSMODE_ENABLE); /* Turn on DMA, clear stats */ @@ -1537,7 +1497,7 @@ #endif /* Turn on DMA completion state machine */ - if (!(BGE_IS_5705_OR_BEYOND(sc))) + if (!(BGE_IS_5705_PLUS(sc))) CSR_WRITE_4(sc, BGE_DMAC_MODE, BGE_DMACMODE_ENABLE); /* Turn on write DMA state machine */ @@ -1558,7 +1518,7 @@ CSR_WRITE_4(sc, BGE_RDBDI_MODE, BGE_RDBDIMODE_ENABLE); /* Turn on Mbuf cluster free state machine */ - if (!(BGE_IS_5705_OR_BEYOND(sc))) + if (!(BGE_IS_5705_PLUS(sc))) CSR_WRITE_4(sc, BGE_MBCF_MODE, BGE_MBCFMODE_ENABLE); /* Turn on send BD completion state machine */ @@ -2156,11 +2116,38 @@ sc->bge_asicrev = BGE_ASICREV(sc->bge_chipid); sc->bge_chiprev = BGE_CHIPREV(sc->bge_chipid); + /* Save chipset family. */ + switch (sc->bge_asicrev) { + case BGE_ASICREV_BCM5700: + case BGE_ASICREV_BCM5701: + case BGE_ASICREV_BCM5703: + case BGE_ASICREV_BCM5704: + sc->bge_flags |= BGE_FLAG_5700_FAMILY | BGE_FLAG_JUMBO; + break; + + case BGE_ASICREV_BCM5714_A0: + case BGE_ASICREV_BCM5780: + case BGE_ASICREV_BCM5714: + sc->bge_flags |= BGE_FLAG_5714_FAMILY /* | BGE_FLAG_JUMBO */; + /* Fall through */ + + case BGE_ASICREV_BCM5750: + case BGE_ASICREV_BCM5752: + case BGE_ASICREV_BCM5755: + case BGE_ASICREV_BCM5787: + sc->bge_flags |= BGE_FLAG_575X_PLUS; + /* Fall through */ + + case BGE_ASICREV_BCM5705: + sc->bge_flags |= BGE_FLAG_5705_PLUS; + break; + } + /* * XXX: Broadcom Linux driver. Not in specs or eratta. * PCI-Express? */ - if (BGE_IS_5705_OR_BEYOND(sc)) { + if (BGE_IS_5705_PLUS(sc)) { uint32_t v; v = pci_read_config(dev, BGE_PCI_MSI_CAPID, 4); @@ -2240,7 +2227,7 @@ } /* 5705 limits RX return ring to 512 entries. */ - if (BGE_IS_5705_OR_BEYOND(sc)) + if (BGE_IS_5705_PLUS(sc)) sc->bge_return_ring_cnt = BGE_RETURN_RING_CNT_5705; else sc->bge_return_ring_cnt = BGE_RETURN_RING_CNT; @@ -2944,7 +2931,7 @@ BGE_LOCK_ASSERT(sc); - if (BGE_IS_5705_OR_BEYOND(sc)) + if (BGE_IS_5705_PLUS(sc)) bge_stats_update_regs(sc); else bge_stats_update(sc); @@ -3661,7 +3648,7 @@ if_printf(ifp, "watchdog timeout -- resetting\n"); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - bge_init(sc); + bge_init_locked(sc); ifp->if_oerrors++; } @@ -3693,7 +3680,7 @@ BGE_CLRBIT(sc, BGE_RX_MODE, BGE_RXMODE_ENABLE); BGE_CLRBIT(sc, BGE_RBDI_MODE, BGE_RBDIMODE_ENABLE); BGE_CLRBIT(sc, BGE_RXLP_MODE, BGE_RXLPMODE_ENABLE); - if (!(BGE_IS_5705_OR_BEYOND(sc))) + if (!(BGE_IS_5705_PLUS(sc))) BGE_CLRBIT(sc, BGE_RXLS_MODE, BGE_RXLSMODE_ENABLE); BGE_CLRBIT(sc, BGE_RDBDI_MODE, BGE_RBDIMODE_ENABLE); BGE_CLRBIT(sc, BGE_RDC_MODE, BGE_RDCMODE_ENABLE); @@ -3707,7 +3694,7 @@ BGE_CLRBIT(sc, BGE_SDI_MODE, BGE_SDIMODE_ENABLE); BGE_CLRBIT(sc, BGE_RDMA_MODE, BGE_RDMAMODE_ENABLE); BGE_CLRBIT(sc, BGE_SDC_MODE, BGE_SDCMODE_ENABLE); - if (!(BGE_IS_5705_OR_BEYOND(sc))) + if (!(BGE_IS_5705_PLUS(sc))) BGE_CLRBIT(sc, BGE_DMAC_MODE, BGE_DMACMODE_ENABLE); BGE_CLRBIT(sc, BGE_SBDC_MODE, BGE_SBDCMODE_ENABLE); @@ -3717,11 +3704,11 @@ */ BGE_CLRBIT(sc, BGE_HCC_MODE, BGE_HCCMODE_ENABLE); BGE_CLRBIT(sc, BGE_WDMA_MODE, BGE_WDMAMODE_ENABLE); - if (!(BGE_IS_5705_OR_BEYOND(sc))) + if (!(BGE_IS_5705_PLUS(sc))) BGE_CLRBIT(sc, BGE_MBCF_MODE, BGE_MBCFMODE_ENABLE); CSR_WRITE_4(sc, BGE_FTQ_RESET, 0xFFFFFFFF); CSR_WRITE_4(sc, BGE_FTQ_RESET, 0); - if (!(BGE_IS_5705_OR_BEYOND(sc))) { + if (!(BGE_IS_5705_PLUS(sc))) { BGE_CLRBIT(sc, BGE_BMAN_MODE, BGE_BMANMODE_ENABLE); BGE_CLRBIT(sc, BGE_MARB_MODE, BGE_MARBMODE_ENABLE); } ==== //depot/projects/linuxolator/src/sys/dev/bge/if_bgereg.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.58 2006/12/01 01:08:52 jkim Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.60 2006/12/04 22:12:21 jkim Exp $ */ /* @@ -2455,12 +2455,17 @@ struct resource *bge_res; struct ifmedia bge_ifmedia; /* TBI media info */ uint32_t bge_flags; -#define BGE_FLAG_EXTRAM 0x00000001 /* Has external SSRAM. */ +#define BGE_FLAG_EXTRAM 0x00000001 /* External SSRAM (unused) */ #define BGE_FLAG_TBI 0x00000002 #define BGE_FLAG_RX_ALIGNBUG 0x00000004 #define BGE_FLAG_NO3LED 0x00000008 #define BGE_FLAG_PCIX 0x00000010 #define BGE_FLAG_PCIE 0x00000020 +#define BGE_FLAG_JUMBO 0x00000040 +#define BGE_FLAG_5700_FAMILY 0x00000100 +#define BGE_FLAG_5705_PLUS 0x00000200 +#define BGE_FLAG_5714_FAMILY 0x00000400 +#define BGE_FLAG_575X_PLUS 0x00000800 uint32_t bge_chipid; uint8_t bge_asicrev; uint8_t bge_chiprev; ==== //depot/projects/linuxolator/src/sys/dev/hme/if_hme.c#2 (text+ko) ==== @@ -34,11 +34,11 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * from: NetBSD: hme.c,v 1.29 2002/05/05 03:02:38 thorpej Exp + * from: NetBSD: hme.c,v 1.35 2003/02/27 14:58:22 pk Exp */ #include -__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.49 2006/08/12 01:19:37 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.51 2006/12/04 01:53:40 marius Exp $"); /* * HME Ethernet module driver. @@ -115,6 +115,7 @@ static void hme_setladrf(struct hme_softc *, int); static int hme_mediachange(struct ifnet *); +static int hme_mediachange_locked(struct hme_softc *); static void hme_mediastatus(struct ifnet *, struct ifmediareq *); static int hme_load_txmbuf(struct hme_softc *, struct mbuf **); @@ -310,19 +311,21 @@ /* * Walk along the list of attached MII devices and - * establish an `MII instance' to `phy number' - * mapping. We'll use this mapping in media change - * requests to determine which phy to use to program - * the MIF configuration register. + * establish an `MII instance' to `PHY number' + * mapping. We'll use this mapping to enable the MII + * drivers of the external transceiver according to + * the currently selected media. */ - for (child = LIST_FIRST(&sc->sc_mii->mii_phys); child != NULL; - child = LIST_NEXT(child, mii_list)) { + sc->sc_phys[0] = sc->sc_phys[1] = -1; + LIST_FOREACH(child, &sc->sc_mii->mii_phys, mii_list) { /* * Note: we support just two PHYs: the built-in * internal device and an external on the MII * connector. */ - if (child->mii_phy > 1 || child->mii_inst > 1) { + if ((child->mii_phy != HME_PHYAD_EXTERNAL && + child->mii_phy != HME_PHYAD_INTERNAL) || + child->mii_inst > 1) { device_printf(sc->sc_dev, "cannot accommodate " "MII device %s at phy %d, instance %d\n", device_get_name(child->mii_dev), @@ -476,6 +479,9 @@ callout_stop(&sc->sc_tick_ch); sc->sc_ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); + /* Mask all interrupts */ + HME_SEB_WRITE_4(sc, HME_SEBI_IMASK, 0xffffffff); + /* Reset transmitter and receiver */ HME_SEB_WRITE_4(sc, HME_SEBI_RESET, HME_SEB_RESET_ETX | HME_SEB_RESET_ERX); @@ -741,7 +747,6 @@ v = ((ea[4] << 8) | ea[5]) & 0x3fff; HME_MAC_WRITE_4(sc, HME_MACI_RANDSEED, v); - /* Note: Accepting power-on default for other MAC registers here.. */ /* step 5. RX MAC registers & counters */ @@ -833,9 +838,6 @@ /* step 11. XIF Configuration */ v = HME_MAC_READ_4(sc, HME_MACI_XIF); v |= HME_MAC_XIF_OE; - /* If an external transceiver is connected, enable its MII drivers */ - if ((HME_MIF_READ_4(sc, HME_MIFI_CFG) & HME_MIF_CFG_MDI1) != 0) - v |= HME_MAC_XIF_MIIENABLE; CTR1(KTR_HME, "hme_init: programming XIF to %x", (u_int)v); HME_MAC_WRITE_4(sc, HME_MACI_XIF, v); @@ -871,9 +873,7 @@ #endif /* Set the current media. */ - /* - * mii_mediachg(sc->sc_mii); - */ + hme_mediachange_locked(sc); /* Start the one second timer. */ callout_reset(&sc->sc_tick_ch, hz, hme_tick, sc); @@ -1290,7 +1290,11 @@ { if ((status & HME_SEB_STAT_MIFIRQ) != 0) { - device_printf(sc->sc_dev, "XXXlink status changed\n"); + device_printf(sc->sc_dev, "XXXlink status changed: " + "cfg=%#x, stat=%#x, sm=%#x\n", + HME_MIF_READ_4(sc, HME_MIFI_CFG), + HME_MIF_READ_4(sc, HME_MIFI_STAT), + HME_MIF_READ_4(sc, HME_MIFI_SM)); return; } @@ -1322,7 +1326,6 @@ HME_UNLOCK(sc); } - static void hme_watchdog(struct ifnet *ifp) { @@ -1351,10 +1354,26 @@ { u_int32_t v; - /* Configure the MIF in frame mode */ - v = HME_MIF_READ_4(sc, HME_MIFI_CFG); - v &= ~HME_MIF_CFG_BBMODE; - HME_MIF_WRITE_4(sc, HME_MIFI_CFG, v); + /* + * Configure the MIF in frame mode, polling disabled, internal PHY + * selected. + */ + HME_MIF_WRITE_4(sc, HME_MIFI_CFG, 0); + + /* + * If the currently selected media uses the external transceiver, + * enable its MII drivers (which basically isolates the internal + * one and vice versa). In case the current media hasn't been set, + * yet, we default to the internal transceiver. + */ + v = HME_MAC_READ_4(sc, HME_MACI_XIF); + if (sc->sc_mii != NULL && sc->sc_mii->mii_media.ifm_cur != NULL && + sc->sc_phys[IFM_INST(sc->sc_mii->mii_media.ifm_cur->ifm_media)] == + HME_PHYAD_EXTERNAL) + v |= HME_MAC_XIF_MIIENABLE; + else + v &= ~HME_MAC_XIF_MIIENABLE; + HME_MAC_WRITE_4(sc, HME_MACI_XIF, v); } /* @@ -1363,17 +1382,21 @@ int hme_mii_readreg(device_t dev, int phy, int reg) { - struct hme_softc *sc = device_get_softc(dev); + struct hme_softc *sc; int n; u_int32_t v; + /* We can at most have two PHYs. */ + if (phy != HME_PHYAD_EXTERNAL && phy != HME_PHYAD_INTERNAL) + return (0); + + sc = device_get_softc(dev); /* Select the desired PHY in the MIF configuration register */ v = HME_MIF_READ_4(sc, HME_MIFI_CFG); - /* Clear PHY select bit */ - v &= ~HME_MIF_CFG_PHY; if (phy == HME_PHYAD_EXTERNAL) - /* Set PHY select bit to get at external device */ v |= HME_MIF_CFG_PHY; + else + v &= ~HME_MIF_CFG_PHY; HME_MIF_WRITE_4(sc, HME_MIFI_CFG, v); /* Construct the frame command */ @@ -1387,9 +1410,8 @@ for (n = 0; n < 100; n++) { DELAY(1); v = HME_MIF_READ_4(sc, HME_MIFI_FO); - if (v & HME_MIF_FO_TALSB) { + if (v & HME_MIF_FO_TALSB) return (v & HME_MIF_FO_DATA); - } } device_printf(sc->sc_dev, "mii_read timeout\n"); @@ -1399,17 +1421,21 @@ int hme_mii_writereg(device_t dev, int phy, int reg, int val) { - struct hme_softc *sc = device_get_softc(dev); + struct hme_softc *sc; int n; u_int32_t v; + /* We can at most have two PHYs. */ + if (phy != HME_PHYAD_EXTERNAL && phy != HME_PHYAD_INTERNAL) + return (0); + + sc = device_get_softc(dev); /* Select the desired PHY in the MIF configuration register */ v = HME_MIF_READ_4(sc, HME_MIFI_CFG); - /* Clear PHY select bit */ - v &= ~HME_MIF_CFG_PHY; if (phy == HME_PHYAD_EXTERNAL) - /* Set PHY select bit to get at external device */ v |= HME_MIF_CFG_PHY; + else + v &= ~HME_MIF_CFG_PHY; HME_MIF_WRITE_4(sc, HME_MIFI_CFG, v); /* Construct the frame command */ @@ -1435,25 +1461,16 @@ void hme_mii_statchg(device_t dev) { - struct hme_softc *sc = device_get_softc(dev); - int instance; - int phy; + struct hme_softc *sc; u_int32_t v; - instance = IFM_INST(sc->sc_mii->mii_media.ifm_cur->ifm_media); - phy = sc->sc_phys[instance]; + sc = device_get_softc(dev); + #ifdef HMEDEBUG if (sc->sc_debug) - printf("hme_mii_statchg: status change: phy = %d\n", phy); + device_printf(sc->sc_dev, "hme_mii_statchg: status change\n"); #endif - /* Select the current PHY in the MIF configuration register */ - v = HME_MIF_READ_4(sc, HME_MIFI_CFG); - v &= ~HME_MIF_CFG_PHY; - if (phy == HME_PHYAD_EXTERNAL) - v |= HME_MIF_CFG_PHY; - HME_MIF_WRITE_4(sc, HME_MIFI_CFG, v); - /* Set the MAC Full Duplex bit appropriately */ v = HME_MAC_READ_4(sc, HME_MACI_TXCFG); if (!hme_mac_bitflip(sc, HME_MACI_TXCFG, v, HME_MAC_TXCFG_ENABLE, 0)) @@ -1474,11 +1491,39 @@ int error; HME_LOCK(sc); - error = mii_mediachg(sc->sc_mii); + error = hme_mediachange_locked(sc); HME_UNLOCK(sc); return (error); } +static int +hme_mediachange_locked(struct hme_softc *sc) +{ + struct mii_softc *child; + + HME_LOCK_ASSERT(sc, MA_OWNED); +#ifdef HMEDEBUG + if (sc->sc_debug) + device_printf(sc->sc_dev, "hme_mediachange_locked"); +#endif + + hme_mifinit(sc); + + /* + * If both PHYs are present reset them. This is required for + * unisolating the previously isolated PHY when switching PHYs. + * As the above hme_mifinit() call will set the MII drivers in + * the XIF configuration register accoring to the currently + * selected media, there should be no window during which the + * data paths of both transceivers are open at the same time, + * even if the PHY device drivers use MIIF_NOISOLATE. + */ + if (sc->sc_phys[0] != -1 && sc->sc_phys[1] != -1) + LIST_FOREACH(child, &sc->sc_mii->mii_phys, mii_list) + mii_phy_reset(child); + return (mii_mediachg(sc->sc_mii)); +} + static void hme_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr) { ==== //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vnops.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.165 2006/11/06 13:41:57 rwatson Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.166 2006/12/03 19:04:26 maxim Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */ /*- @@ -343,13 +343,15 @@ vap->va_rdev = 0; vap->va_size = dep->de_FileSize; fattime2timespec(dep->de_MDate, dep->de_MTime, 0, 0, &vap->va_mtime); + vap->va_ctime = vap->va_mtime; if (pmp->pm_flags & MSDOSFSMNT_LONGNAME) { fattime2timespec(dep->de_ADate, 0, 0, 0, &vap->va_atime); fattime2timespec(dep->de_CDate, dep->de_CTime, dep->de_CHun, - 0, &vap->va_ctime); + 0, &vap->va_birthtime); } else { vap->va_atime = vap->va_mtime; - vap->va_ctime = vap->va_mtime; + vap->va_birthtime.tv_sec = -1; + vap->va_birthtime.tv_nsec = 0; } vap->va_flags = 0; if ((dep->de_Attributes & ATTR_ARCHIVE) == 0) ==== //depot/projects/linuxolator/src/sys/kern/kern_thr.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thr.c,v 1.56 2006/11/11 16:46:31 trhodes Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thr.c,v 1.57 2006/12/04 14:15:12 davidxu Exp $"); #include "opt_compat.h" #include "opt_posix.h" @@ -402,6 +402,12 @@ TIMESPEC_TO_TIMEVAL(&tv, tsp); hz = tvtohz(&tv); } + + if (td->td_pflags & TDP_WAKEUP) { + td->td_pflags &= ~TDP_WAKEUP; + return (0); + } + PROC_LOCK(td->td_proc); if ((td->td_flags & TDF_THRWAKEUP) == 0) error = msleep((void *)td, &td->td_proc->p_mtx, PCATCH, "lthr", @@ -430,6 +436,11 @@ struct proc *p; struct thread *ttd; + if (uap->id == td->td_tid) { + td->td_pflags |= TDP_WAKEUP; + return (0); + } + p = td->td_proc; PROC_LOCK(p); ttd = thread_find(p, uap->id); ==== //depot/projects/linuxolator/src/sys/kern/kern_umtx.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_umtx.c,v 1.55 2006/12/03 01:49:22 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_umtx.c,v 1.56 2006/12/04 14:15:12 davidxu Exp $"); #include "opt_compat.h" #include @@ -2170,7 +2170,7 @@ static int do_cv_wait(struct thread *td, struct ucond *cv, struct umutex *m, - struct timespec *timeout) + struct timespec *timeout, u_long wflags) { struct umtx_q *uq; struct timeval tv; @@ -2202,7 +2202,11 @@ umtxq_lock(&uq->uq_key); if (error == 0) { - if (timeout == NULL) { + if ((wflags & UMTX_CHECK_UNPARKING) && + (td->td_pflags & TDP_WAKEUP)) { + td->td_pflags &= ~TDP_WAKEUP; + error = EINTR; + } else if (timeout == NULL) { error = umtxq_sleep(uq, "ucond", 0); } else { getnanouptime(&ets); @@ -2236,7 +2240,8 @@ * occur, and indeed a kernel based implementation * can not avoid it. */ - umtxq_signal(&uq->uq_key, 1); + if (!umtxq_signal(&uq->uq_key, 1)) + error = 0; } if (error == ERESTART) error = EINTR; @@ -2431,7 +2436,7 @@ } ts = &timeout; } - return (do_cv_wait(td, uap->obj, uap->uaddr1, ts)); + return (do_cv_wait(td, uap->obj, uap->uaddr1, ts, uap->val)); } static int @@ -2592,7 +2597,7 @@ return (EINVAL); ts = &timeout; } - return (do_cv_wait(td, uap->obj, uap->uaddr1, ts)); + return (do_cv_wait(td, uap->obj, uap->uaddr1, ts, uap->val)); } static _umtx_op_func op_table_compat32[] = { ==== //depot/projects/linuxolator/src/sys/kern/subr_lock.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.11 2006/11/13 05:41:46 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.12 2006/12/04 22:15:50 kmacy Exp $"); #include "opt_ddb.h" #include "opt_mprof.h" @@ -260,10 +260,10 @@ l->lpo_filename = file; l->lpo_lineno = line; l->lpo_acqtime = nanoseconds(); - if (waittime) { - if (l->lpo_acqtime > waittime) - l->lpo_waittime = l->lpo_acqtime - waittime; - } + if (waittime && (l->lpo_acqtime > waittime)) + l->lpo_waittime = l->lpo_acqtime - waittime; + else + l->lpo_waittime = 0; } } ==== //depot/projects/linuxolator/src/sys/kern/subr_rman.c#3 (text+ko) ==== @@ -56,11 +56,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_rman.c,v 1.53 2006/09/11 19:31:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_rman.c,v 1.54 2006/12/04 16:45:23 jhb Exp $"); #include #include #include +#include #include #include #include @@ -169,10 +170,12 @@ mtx_lock(rm->rm_mtx); /* Skip entries before us. */ - for (s = TAILQ_FIRST(&rm->rm_list); - s && s->r_end + 1 < r->r_start; - s = TAILQ_NEXT(s, r_link)) - ; + TAILQ_FOREACH(s, &rm->rm_list, r_link) { + if (s->r_end == ULONG_MAX) + break; + if (s->r_end + 1 >= r->r_start) + break; + } /* If we ran off the end of the list, insert at the tail. */ if (s == NULL) { ==== //depot/projects/linuxolator/src/sys/net/bridgestp.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.31 2006/11/27 00:35:40 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.32 2006/12/04 14:45:02 syrinx Exp $"); #include #include @@ -1637,7 +1637,10 @@ struct bstp_state *bs = bp->bp_bs; BSTP_LOCK(bs); - bp->bp_operedge = set; + if ((bp->bp_operedge = set) == 0) + bp->bp_flags &= ~BSTP_PORT_ADMEDGE; + else + bp->bp_flags |= BSTP_PORT_ADMEDGE; BSTP_UNLOCK(bs); return (0); } @@ -1809,8 +1812,12 @@ if (bp->bp_role == BSTP_ROLE_DISABLED) bstp_enable_port(bs, bp); } else { - if (bp->bp_role != BSTP_ROLE_DISABLED) + if (bp->bp_role != BSTP_ROLE_DISABLED) { bstp_disable_port(bs, bp); + if ((bp->bp_flags & BSTP_PORT_ADMEDGE) && + bp->bp_protover == BSTP_PROTO_RSTP) + bp->bp_operedge = 1; + } } return; } ==== //depot/projects/linuxolator/src/sys/net/bridgestp.h#5 (text+ko) ==== @@ -67,7 +67,7 @@ * * OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp * - * $FreeBSD: src/sys/net/bridgestp.h,v 1.10 2006/12/01 18:25:18 imp Exp $ + * $FreeBSD: src/sys/net/bridgestp.h,v 1.11 2006/12/04 14:45:02 syrinx Exp $ */ /* @@ -109,6 +109,7 @@ #define BSTP_PORT_ADMCOST 0x0008 #define BSTP_PORT_AUTOEDGE 0x0010 #define BSTP_PORT_AUTOP2P 0x0020 +#define BSTP_PORT_ADMEDGE 0x0040 /* BPDU priority */ #define BSTP_PDU_SUPERIOR 1 ==== //depot/projects/linuxolator/src/sys/net/if_bridge.c#9 (text+ko) ==== @@ -80,7 +80,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.89 2006/11/27 00:35:40 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.91 2006/12/04 14:45:02 syrinx Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -421,7 +421,7 @@ BC_F_COPYOUT }, { bridge_ioctl_gifsstp, sizeof(struct ifbpstpconf), - BC_F_COPYOUT }, + BC_F_COPYIN|BC_F_COPYOUT }, { bridge_ioctl_sproto, sizeof(struct ifbrparam), BC_F_COPYIN|BC_F_SUSER }, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 4 23:58:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92CD216A4FB; Mon, 4 Dec 2006 23:58:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 505C316A40F; Mon, 4 Dec 2006 23:58:16 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (vc4-2-0-87.dsl.netrack.net [199.45.160.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9868143F83; Mon, 4 Dec 2006 23:50:11 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.13.4/8.13.4) with ESMTP id kB4NoQM4015055; Mon, 4 Dec 2006 16:50:27 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Mon, 04 Dec 2006 16:21:48 -0700 (MST) Message-Id: <20061204.162148.-300783081.imp@bsdimp.com> To: hselasky@freebsd.org From: "M. Warner Losh" In-Reply-To: <200612031915.kB3JFLbh077129@repoman.freebsd.org> References: <200612031915.kB3JFLbh077129@repoman.freebsd.org> X-Mailer: Mew version 4.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (harmony.bsdimp.com [127.0.0.1]); Mon, 04 Dec 2006 16:50:27 -0700 (MST) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 110969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 23:58:16 -0000 In message: <200612031915.kB3JFLbh077129@repoman.freebsd.org> Hans Petter Selasky writes: : http://perforce.freebsd.org/chv.cgi?CH=110969 : : Change 110969 by hselasky@hselasky_mini_itx on 2006/12/03 19:14:41 : : Fix a bug in the uplcom probe routine where a revision of 0xFFFF : was not treated as a special value. The old version of uplcom.c has : the check, so probably a misunderstanding happened. : : Affected files ... : : .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#14 edit : : Differences ... : : ==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#14 (text+ko) ==== : : @@ -424,7 +424,8 @@ : while(up->vendor) { : if ((up->vendor == uaa->vendor) && : (up->product == uaa->product) && : - (up->release <= uaa->release)) { : + ((up->release <= uaa->release) || : + (up->release == 0xFFFF))) { : return up; : } : up++; What really needs to happen here is that we probe the plcom chip for its properties, ala the linux driver rather than having a fixed (and often wrong) table of hard codings. I looked into this a while ago, but got distracted... Warner From owner-p4-projects@FreeBSD.ORG Mon Dec 4 23:59:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98AAC16A4D4; Mon, 4 Dec 2006 23:59:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7725216A4CA for ; Mon, 4 Dec 2006 23:59:04 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECD114405C for ; Mon, 4 Dec 2006 23:51:57 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4NqXaC060920 for ; Mon, 4 Dec 2006 23:52:33 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4NqWPG060912 for perforce@freebsd.org; Mon, 4 Dec 2006 23:52:32 GMT (envelope-from imp@freebsd.org) Date: Mon, 4 Dec 2006 23:52:32 GMT Message-Id: <200612042352.kB4NqWPG060912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111085 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 23:59:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=111085 Change 111085 by imp@imp_lighthouse on 2006/12/04 23:52:22 Commit cognet's pmap_remove fix. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/pmap.c#29 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/pmap.c#29 (text+ko) ==== @@ -2797,6 +2797,7 @@ if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); pmap_free_pv_entry(pv); + pmap_free_l2_bucket(pmap, l2b, 1); } vm_page_unlock_queues(); cpu_idcache_wbinv_all(); From owner-p4-projects@FreeBSD.ORG Tue Dec 5 00:56:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62CC516A47B; Tue, 5 Dec 2006 00:56:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2C66E16A415 for ; Tue, 5 Dec 2006 00:56:01 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4265343CA3 for ; Tue, 5 Dec 2006 00:55:22 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB50tv3d083500 for ; Tue, 5 Dec 2006 00:55:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB50tvTe083497 for perforce@freebsd.org; Tue, 5 Dec 2006 00:55:57 GMT (envelope-from sam@freebsd.org) Date: Tue, 5 Dec 2006 00:55:57 GMT Message-Id: <200612050055.kB50tvTe083497@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 00:56:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=111091 Change 111091 by sam@sam_ebb on 2006/12/05 00:55:52 check if cryptosoft device exists before adding it; this works around the device not being detached on module unload Affected files ... .. //depot/projects/crypto/sys/opencrypto/cryptosoft.c#3 edit Differences ... ==== //depot/projects/crypto/sys/opencrypto/cryptosoft.c#3 (text+ko) ==== @@ -975,7 +975,8 @@ swcr_identify(device_t *dev, device_t parent) { /* NB: order 10 is so we get attached after h/w devices */ - if (BUS_ADD_CHILD(parent, 10, "cryptosoft", -1) == 0) + if (device_find_child(parent, "cryptosoft", -1) == NULL && + BUS_ADD_CHILD(parent, 10, "cryptosoft", -1) == 0) panic("cryptosoft: could not attach"); } From owner-p4-projects@FreeBSD.ORG Tue Dec 5 00:59:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31FC616A4C8; Tue, 5 Dec 2006 00:59:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0DE0C16A4B3 for ; Tue, 5 Dec 2006 00:59:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95DD743CBE for ; Tue, 5 Dec 2006 00:58:26 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB50x2e3083640 for ; Tue, 5 Dec 2006 00:59:02 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB50x2i3083637 for perforce@freebsd.org; Tue, 5 Dec 2006 00:59:02 GMT (envelope-from sam@freebsd.org) Date: Tue, 5 Dec 2006 00:59:02 GMT Message-Id: <200612050059.kB50x2i3083637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111092 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 00:59:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=111092 Change 111092 by sam@sam_ebb on 2006/12/05 00:58:48 split s/w crypto driver into it's own module; have it bundled in the crypto module leads to problems as we cannot easily order the cryptosoft device detach before the crypto module unload (resulting in reference to a mutex that's been destroyed) Affected files ... .. //depot/projects/crypto/sys/modules/Makefile#2 edit .. //depot/projects/crypto/sys/modules/crypto/Makefile#3 edit .. //depot/projects/crypto/sys/modules/cryptosoft/Makefile#1 add Differences ... ==== //depot/projects/crypto/sys/modules/Makefile#2 (text+ko) ==== @@ -58,6 +58,7 @@ ${_cpufreq} \ ${_crypto} \ ${_cryptodev} \ + ${_cryptosoft} \ ${_cs} \ ${_ctau} \ cue \ @@ -312,6 +313,7 @@ .if exists(${.CURDIR}/../opencrypto) _crypto= crypto _cryptodev= cryptodev +_cryptosoft= cryptosoft .endif .if exists(${.CURDIR}/../crypto) _random= random ==== //depot/projects/crypto/sys/modules/crypto/Makefile#3 (text+ko) ==== @@ -9,7 +9,7 @@ KMOD = crypto SRCS = crypto.c cryptodev_if.c -SRCS += criov.c cryptosoft.c xform.c +SRCS += criov.c xform.c SRCS += cast.c deflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c SRCS += skipjack.c bf_enc.c bf_skey.c SRCS += des_ecb.c des_enc.c des_setkey.c From owner-p4-projects@FreeBSD.ORG Tue Dec 5 01:00:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4531F16A4D1; Tue, 5 Dec 2006 01:00:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0CB0716A4A0 for ; Tue, 5 Dec 2006 01:00:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 402FF43CBA for ; Tue, 5 Dec 2006 00:59:36 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB5104sC083677 for ; Tue, 5 Dec 2006 01:00:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB5104g2083674 for perforce@freebsd.org; Tue, 5 Dec 2006 01:00:04 GMT (envelope-from sam@freebsd.org) Date: Tue, 5 Dec 2006 01:00:04 GMT Message-Id: <200612050100.kB5104g2083674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111093 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 01:00:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=111093 Change 111093 by sam@sam_ebb on 2006/12/05 00:59:29 cryptosoft is now a standalone crypto driver Affected files ... .. //depot/projects/crypto/sys/conf/files#3 edit Differences ... ==== //depot/projects/crypto/sys/conf/files#3 (text+ko) ==== @@ -1902,7 +1902,7 @@ opencrypto/crypto.c optional crypto opencrypto/cryptodev.c optional cryptodev opencrypto/cryptodev_if.m optional crypto -opencrypto/cryptosoft.c optional crypto +opencrypto/cryptosoft.c optional cryptosoft opencrypto/deflate.c optional crypto opencrypto/rmd160.c optional crypto | ipsec opencrypto/skipjack.c optional crypto From owner-p4-projects@FreeBSD.ORG Tue Dec 5 01:36:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F78F16A536; Tue, 5 Dec 2006 01:36:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0297716A532 for ; Tue, 5 Dec 2006 01:36:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67C0643CA8 for ; Tue, 5 Dec 2006 01:35:17 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB51Zq8W090897 for ; Tue, 5 Dec 2006 01:35:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB51ZqRT090894 for perforce@freebsd.org; Tue, 5 Dec 2006 01:35:52 GMT (envelope-from jb@freebsd.org) Date: Tue, 5 Dec 2006 01:35:52 GMT Message-Id: <200612050135.kB51ZqRT090894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 111096 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 01:36:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=111096 Change 111096 by jb@jb_freebsd8 on 2006/12/05 01:34:53 Remove a few definitions that were part of !KDTRACE. Affected files ... .. //depot/projects/dtrace/src/sys/sys/sdt.h#8 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/sdt.h#8 (text+ko) ==== @@ -108,12 +108,6 @@ (uintptr_t)(arg3), (uintptr_t)(arg4)); \ __SDT_LABEL(name); \ } -#else -#define DTRACE_PROBE(name) -#define DTRACE_PROBE1(name, type1, arg1) -#define DTRACE_PROBE2(name, type1, arg1, type2, arg2) -#define DTRACE_PROBE3(name, type1, arg1, type2, arg2, type3, arg3) -#define DTRACE_PROBE4(name, type1, arg1, type2, arg2, type3, arg3, type4, arg4) #endif /* _KERNEL */ extern const char *sdt_prefix; From owner-p4-projects@FreeBSD.ORG Tue Dec 5 01:41:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F1BF16A54A; Tue, 5 Dec 2006 01:41:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4144616A53F for ; Tue, 5 Dec 2006 01:41:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0092E43CBC for ; Tue, 5 Dec 2006 01:40:25 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB51f1h2091245 for ; Tue, 5 Dec 2006 01:41:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB51ewTf091151 for perforce@freebsd.org; Tue, 5 Dec 2006 01:40:58 GMT (envelope-from jb@freebsd.org) Date: Tue, 5 Dec 2006 01:40:58 GMT Message-Id: <200612050140.kB51ewTf091151@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 111097 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 01:41:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=111097 Change 111097 by jb@jb_freebsd8 on 2006/12/05 01:40:06 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#37 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#25 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#16 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#34 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#18 integrate .. //depot/projects/dtrace/doc/share/sgml/freebsd.ent#10 integrate .. //depot/projects/dtrace/ports/LEGAL#15 integrate .. //depot/projects/dtrace/ports/MOVED#34 integrate .. //depot/projects/dtrace/ports/Mk/bsd.autotools.mk#4 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#13 integrate .. //depot/projects/dtrace/ports/Mk/bsd.wx.mk#4 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/processonelog#8 integrate .. //depot/projects/dtrace/src/etc/rc.initdiskless#6 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#16 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/freebsd-tips#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/gen/confstr.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/gen/err.3#5 integrate .. //depot/projects/dtrace/src/lib/libc/net/nscachedcli.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/close.2#4 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_cancel.c#5 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_cond.c#6 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#11 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_sig.c#7 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_umtx.c#6 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_umtx.h#6 integrate .. //depot/projects/dtrace/src/sbin/camcontrol/camcontrol.c#6 integrate .. //depot/projects/dtrace/src/sbin/mount_unionfs/Makefile#4 integrate .. //depot/projects/dtrace/src/sbin/mount_unionfs/mount_unionfs.8#4 integrate .. //depot/projects/dtrace/src/sbin/mount_unionfs/mount_unionfs.c#4 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#16 integrate .. //depot/projects/dtrace/src/share/man/man4/npe.4#1 branch .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#18 integrate .. //depot/projects/dtrace/src/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#17 integrate .. //depot/projects/dtrace/src/sys/cam/cam_ccb.h#6 integrate .. //depot/projects/dtrace/src/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_all.h#6 integrate .. //depot/projects/dtrace/src/sys/compat/linsysfs/linsysfs.c#3 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#15 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_stats.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#16 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bgereg.h#11 integrate .. //depot/projects/dtrace/src/sys/dev/hme/if_hme.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.c#13 integrate .. //depot/projects/dtrace/src/sys/dev/mii/acphy.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/mii/amphy.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/mii/miidevs#7 integrate .. //depot/projects/dtrace/src/sys/dev/mii/rgephy.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/mii/tdkphy.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#15 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.h#17 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#20 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_raid.c#9 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/dtrace/src/sys/i386/isa/clock.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_thr.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/kern_umtx.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/subr_lock.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/subr_rman.c#9 integrate .. //depot/projects/dtrace/src/sys/net/bridgestp.c#12 integrate .. //depot/projects/dtrace/src/sys/net/bridgestp.h#7 integrate .. //depot/projects/dtrace/src/sys/net/if_bridge.c#20 integrate .. //depot/projects/dtrace/src/sys/net/if_bridgevar.h#9 integrate .. //depot/projects/dtrace/src/sys/netinet/igmp.c#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#15 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/tsb.h#6 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#20 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tsb.c#8 integrate .. //depot/projects/dtrace/src/sys/sys/proc.h#18 integrate .. //depot/projects/dtrace/src/sys/sys/umtx.h#8 integrate .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.sh#5 integrate .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wX.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wXl.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wc.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wdl.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wdn.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.we.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wf.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wg.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wgd.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wo.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wp1.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wp2.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wp3.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wp4.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wp5.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wp6.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wu.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wwe.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wx.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wxn.out#1 branch .. //depot/projects/dtrace/src/usr.bin/jot/jot.c#5 integrate .. //depot/projects/dtrace/www/en/developers.sgml#15 integrate .. //depot/projects/dtrace/www/en/donations/donors.sgml#20 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#18 integrate .. //depot/projects/dtrace/www/en/index.xsl#11 integrate .. //depot/projects/dtrace/www/en/layout/css/layout.css#5 integrate .. //depot/projects/dtrace/www/en/platforms/arm.sgml#5 integrate .. //depot/projects/dtrace/www/share/sgml/events.xml#8 integrate .. //depot/projects/dtrace/www/share/sgml/header.ent#4 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#37 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + @@ -466,7 +466,7 @@ - &a.assar; (2000 - 2002) + &a.assar; (2000 - 2002) ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2358,7 +2358,7 @@ The address block being used for this local area network is a Class C block (192.168.0.0 - - 192.168.255.255). + 192.168.0.255). The default netmask is for a Class C network (255.255.255.0). ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2766,6 +2766,14 @@ + RELENG_6_2_0_RELEASE + + + FreeBSD 6.2 + + + + RELENG_6_1_0_RELEASE ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -750,7 +750,7 @@ x11-fonts/ttmkfdir. &prompt.root; cd /usr/X11R6/lib/X11/fonts/TrueType -&prompt.root; ttmkfdir > fonts.dir +&prompt.root; ttmkfdir -o fonts.dir Now add the &truetype; directory to the font path. This is just the same as described above for 7.0-CURRENT after the addition of libelf. 700025 + + 7.0-CURRENT after major changes on sound + sysctls. + 700026 + ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#18 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.404 2006/11/29 23:13:59 lx Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.405 2006/12/04 23:41:35 nivit Exp $ --> aaron@FreeBSD.org"> @@ -700,6 +700,8 @@ niklas@FreeBSD.org"> +nivit@FreeBSD.org"> + njl@FreeBSD.org"> nobutaka@FreeBSD.org"> ==== //depot/projects/dtrace/doc/share/sgml/freebsd.ent#10 (text+ko) ==== @@ -1,7 +1,7 @@ FreeBSD Òýµ¼¹ý³Ì @@ -614,12 +614,12 @@ Õâ¸ö±äÁ¿ÊÇÔÚ loader ÀïÃæÉèÖõġ£ - ×Ô¶¯ÖØÆô¶ÓÁÐ + ×Ô¶¯ÖØÆô¹ý³Ì - ×Ô¶¯ÖØÆô¶ÓÁб£Ö¤ÁË¿ÉÓõÄÎļþϵͳÊÇÎȶ¨µÄ¡£ - Èç¹û²»ÊÇ£¬ÇÒ &man.fsck.8; ²»ÄÜÐÞ¸´ÕâЩ´íÎó£¬ - &man.init.8; »á½øÈëµ¥Óû§Ä£Ê½ - ÒÔ±ãϵͳ¹ÜÀíÔ±Ö±½Ó½â¾öÎÊÌâ¡£ + ×Ô¶¯ÖØÆô¹ý³Ì»áÈ·ÈÏϵͳÖпÉÓõÄÎļþϵͳ´¦ÓÚ½¡¿µµÄ״̬¡£ + Èç¹û²»ÊÇ£¬ ¶øÇÒʹÓà &man.fsck.8; Ò²ÎÞ·¨ÐÞ¸´ÕâЩÎÊÌ⣬ + &man.init.8; »á½øÈë µ¥Óû§Ä£Ê½ + ÒÔ±ãϵͳ¹ÜÀíÔ±Ö±½ÓÐÞÕýÕâЩÎÊÌâ¡£ @@ -628,12 +628,12 @@ ¿ØÖÆ̨ ´Ëģʽ¿ÉÒÔͨ¹ý - ×Ô¶¯ÖØÆô¶ÓÁлòÕßͨ¹ý´øÓÐ + ×Ô¶¯ÖØÆô¹ý³Ì »òÕßͨ¹ý´øÓÐ Ñ¡ÏîµÄÓû§Òýµ¼»òͨ¹ýÔÚ loader ÀïÉèÖà boot_single ±äÁ¿µÈ¶àÖÖ·½Ê½À´´ïµ½¡£ - Ò²¿ÉÒÔÔÚ¶àÓû§Ä£Ê½Ïµ÷¶¯ÎÞ reboot()Ñ¡ÏîºÍ - halt () Ñ¡ÏîµÄ &man.shutdown.8; + Ò²¿ÉÒÔÔÚ¶àÓû§Ä£Ê½Ïµ÷¶¯ÎÞÖØÆô () Ñ¡ÏîºÍÍ£»ú + () Ñ¡ÏîµÄ &man.shutdown.8; ÃüÁîÀ´½øÈëµ¥Óû§Ä£Ê½¡£ Èç¹ûϵͳ ¿ØÖÆ̨ ÔÚÎļþ @@ -683,19 +683,19 @@ - shutdown ¶ÓÁÐ + ¹Ø»ú (shutdown) ¹ý³Ì shutdown - ÓÉÃüÁî &man.shutdown.8; µÄ¿ØÖÆ£¬ + ÓÉÃüÁî &man.shutdown.8; µÄ·¢ÆðµÄ¹Ø»ú¹ý³ÌÖУ¬ &man.init.8; »áÊÔ×ÅÔËÐÐ /etc/rc.shutdown ½Å±¾£¬ - ¸øËùÓнø³Ì·¢ËÍ TERM Ðźţ¬È»ºó¸ø²»°´Ê±Í£Ö¹µÄ½ø³Ì·¢ËÍ - KILLÐźš£ + ¸øËùÓнø³Ì·¢ËÍ TERM Ðźţ¬ ×îºó¸ø²»°´Ê±Í£Ö¹µÄ½ø³Ì·¢ËÍ + KILL Ðźš£ - ÔÚÖ§³ÖµçÔ´¹ÜÀíµÄÌåϵÉÏ¹Ø±Õ FreeBSD ϵͳµÄµçÔ´£¬Ö»Òª¼òµ¥µÄʹÓÃÃüÁî - shutdown -p now Á¢¼´¹Ø±ÕµçÔ´¡£Ê¹ÓÃÃüÁî - shutdown -r now ÖØÆô FreeBSD¡£ÒªÖ´ÐÐ &man.shutdown.8; + ÔÚÖ§³ÖµçÔ´¹ÜÀíµÄƽ̨ÉÏ¹Ø±Õ FreeBSD ϵͳµÄµçÔ´£¬ Ö»Òª¼òµ¥µØʹÓÃÃüÁî + shutdown -p now ¼´¿É¡£ ´ËÍ⣬ ¿ÉÒÔÓÃÃüÁî + shutdown -r now À´ÖØÆô FreeBSD¡£ ÒªÖ´ÐÐ &man.shutdown.8; Äú±ØÐëÊÇ root Óû§»ò operator ×éµÄ³ÉÔ±¡£ Ò²¿ÉÒÔʹÓà &man.halt.8; ºÍ &man.reboot.8; ÃüÁîÀ´¹Ø±Õϵͳ£¬ Çë²Î¿´ËüÃǵÄÁª»úÊÖ²áÒÔ»ñµÃ¸ü¶àµÄÐÅÏ¢¡£ ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#9 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Chinese Documentation Project - Original Revision: 1.223 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/config/chapter.sgml,v 1.11 2006/10/27 06:37:47 delphij Exp $ + Original Revision: 1.225 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/config/chapter.sgml,v 1.12 2006/12/05 02:36:13 delphij Exp $ --> @@ -1499,18 +1499,21 @@ sysctl.conf sysctl - sysctl.conf ¿´ÆðÀ´ºÜÏñ - rc.conf¡£ËüÓà variable=value - µÄÐÎʽÀ´É趨ֵ¡£Ö¸¶¨µÄÖµÔÚϵͳ½øÈë¶àÓû§Ä£Ê½Ö®ºó±»É趨¡£ - ²¢²»ÊÇËùÓеıäÁ¿¶¼¿ÉÒÔÔÚÕâ¸öģʽÏÂÉ趨¡£ + sysctl.conf ºÍ + rc.conf ÕâÁ½¸öÎļþµÄ·ç¸ñºÜ½Ó½ü¡£ ÆäÖеÄÅäÖþùΪ + ±äÁ¿=Öµ + ÕâÑùµÄÐÎʽ¡£ ÔÚÕâ¸öÎļþÖÐÅäÖõÄÖµ£¬ ¾ù»áÔÚϵͳ½øÈë¶àÓû§Ä£Ê½Ö®ºó½øÐÐʵ¼ÊµÄÐ޸IJÙ×÷¡£ + ÐèҪעÒâµÄÊÇ£¬ ²¢²»ÊÇËùÓеıäÁ¿¶¼Äܹ»ÔÚ¶àÓû§Ä£Ê½ÏÂÐ޸ġ£ + + Èç¹ûÏ£Íû¹Ø±Õ¶ÔÊÕµ½ÖÂÃüµÄÐźÅÍ˳öµÄ½ø³Ì½øÐмǼ£¬ + ²¢×èÖ¹ÆÕͨÓû§¿´µ½ÆäËûÓû§µÄ½ø³Ì£¬ ¿ÉÒÔÔÚ sysctl.conf + ÖнøÐÐÏÂÁÐÅäÖ㺠- Ò»¸ö¼òµ¥µÄÀý×Ó¾ÙÃ÷ÁËÔÚ sysctl.conf - ÖйرÕÁËÖØÒªµÄÍ˳öÐźŵÄÈÕÖ¾²¢ÇÒÈà Linux ³ÌÐòÖªµÀËûÃÇÆäʵÔËÐÐÔÚ - &os; ÏÂÃ棺 + # ²»¼Ç¼ÓÉÓÚÖÂÃüÐźŵ¼ÖµĽø³ÌÍ˳ö (ÀýÈçÐźŠ11£¬·ÃÎÊÔ½½ç) +kern.logsigexit=0 - kern.logsigexit=0 # Do not log fatal signal exits (e.g. sig 11) -compat.linux.osname=&os; -compat.linux.osrelease=4.3-STABLE +# ×èÖ¹Óû§¿´µ½ÒÔÆäËûÓû§ UID Éí·ÝÖ´ÐеĽø³Ì¡£ +security.bsd.see_other_uids=0 @@ -1873,10 +1876,10 @@ ÔÚ´óÐÍÉú²ú·þÎñÆ÷ÉÏ£¬ ¿ÉÄÜ»áÇáÒ×µØÓõôÊýǧ¸öÎļþÃèÊö·û£¬ ¾ßÌåÓÃÁ¿È¡¾öÓÚ·þÎñµÄÀàÐͺͲ¢ÐÐÆô¶¯µÄ·þÎñÊýÁ¿¡£ - ÔÚÔçÆÚ°æ±¾µÄ &os; ÖУ¬ kern.maxfile µÄĬÈÏÖµ£¬ + ÔÚÔçÆÚ°æ±¾µÄ &os; ÖУ¬ kern.maxfiles µÄĬÈÏÖµ£¬ ÊǸù¾ÝÄúÄÚºËÅäÖÃÎļþÖÐµÄ Ñ¡Ïî¼ÆËãµÄ¡£ kern.maxfiles Õâ¸öÊýÖµ£¬ - »áÓë ³É±ÈÀýÔö¼õ¡£ + »áËæ ³É±ÈÀýµØÔö¼õ¡£ µ±±àÒ붨ÖƵÄÄÚºËʱ£¬ °´ÕÕÄúϵͳµÄÓÃ;À´ÐÞ¸ÄÕâ¸öÖµÊǸöºÃÖ÷Òâ¡£ Õâ¸öÊý×Öͬʱ»¹¾ö¶¨Äں˵ÄÐí¶àÔ¤ÉèµÄÏÞÖÆÖµ¡£ ÓÐʱ£¬ ¾¡¹Ü²¢²»»áÕæµÄÓÐ 256 ¸öÓû§Í¬Ê±Á¬½Óһ̨Éú²ú·þÎñÆ÷£¬ ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/desktop/chapter.sgml#6 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Chinese Project - Original Revision: 1.66 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/desktop/chapter.sgml,v 1.7 2006/09/15 05:41:06 delphij Exp $ + Original Revision: 1.67 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/desktop/chapter.sgml,v 1.8 2006/12/05 02:36:13 delphij Exp $ --> @@ -557,7 +557,7 @@ °²×° OpenOffice.org ·½·¨ÈçÏ£º - &prompt.root; pkg_add -r openoffice + &prompt.root; pkg_add -r openoffice.org Èç¹ûÄúÕýÔÚʹÓà &os; µÄ -RELEASE °æ±¾£¬ Ò»°ãÀ´ËµÕâÑù×öÊÇûÎÊÌâµÄ¡£ @@ -581,7 +581,7 @@ package£¬ÄúÈԾɿÉÒÔÑ¡Ôñ±àÒë port¡£È»¶ø£¬ Äú±ØÐë¼ÇסËüµÄÒªÇóÒÔ¼°´óÁ¿µÄ´ÅÅÌ¿Õ¼äºÍÏ൱³¤µÄʱ¼ä±àÒë¡£ - &prompt.root; cd /usr/ports/editors/openoffice.org-2.0 + &prompt.root; cd /usr/ports/editors/openoffice.org-2 &prompt.root; make install clean ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#12 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.337 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/install/chapter.sgml,v 1.14 2006/11/17 14:51:01 delphij Exp $ + Original Revision: 1.338 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/install/chapter.sgml,v 1.15 2006/12/05 02:36:13 delphij Exp $ --> @@ -2016,7 +2016,7 @@ ±¾·¶ÀýÖеÄIPµØÖ·ÊôÓÚÒ»¸öCÀàµØÖ· £¨192.168.0.0 - - 192.168.255.255£©¡£Ä¬ÈϵÄ×ÓÍøÑÚÂëΪ + 192.168.0.255£©¡£Ä¬ÈϵÄ×ÓÍøÑÚÂëΪ £¨255.255.255.0£©¡£ ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#8 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Chinese Documentation Project - Original Revision: 1.420 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml,v 1.10 2006/08/26 13:45:54 delphij Exp $ + Original Revision: 1.421 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml,v 1.11 2006/12/05 02:36:13 delphij Exp $ --> @@ -2624,6 +2624,14 @@ + RELENG_6_2_0_RELEASE + + + FreeBSD 6.2 + + + + RELENG_6_1_0_RELEASE ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#11 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.177 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml,v 1.16 2006/11/17 14:59:43 delphij Exp $ + Original Revision: 1.178 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml,v 1.17 2006/12/05 02:36:13 delphij Exp $ --> @@ -663,7 +663,7 @@ x11-fonts/ttmkfdir ÖÐÕÒµ½¡£ &prompt.root; cd /usr/X11R6/lib/X11/fonts/TrueType -&prompt.root; ttmkfdir > fonts.dir +&prompt.root; ttmkfdir -o fonts.dir ÏÖÔÚ°Ñ &truetype; ×ÖÌåĿ¼Ìí¼Óµ½×ÖÌå·¾¶ÖС£ ÕâºÍÉÏÃæ Type1 ×ÖÌåµÄ²½ÖèÊÇÒ»ÑùµÄ£¬ ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#14 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.769 - $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.19 2006/11/17 15:01:43 delphij Exp $ + Original Revision: 1.772 + $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.20 2006/12/05 02:36:13 delphij Exp $ --> + + ×Ô¶¯¼¤»îµÄÌØÐÔ + + ÔÚʹÓà GNU configure ½Å±¾Ê±£¬ Ò»¶¨ÒªÐ¡ÐÄÓÐЩÌØÐÔ»áÓÉÆä×Ô¶¯¼ì²â¶ø¼¤»î¡£ + ÄúӦͨ¹ýÃ÷È·µØÖ¸¶¨ÏàÓ¦µÄ + --without-xxx »ò --disable-xxx + ²ÎÊýµ½ CONFIGURE_ARGS À´½ûÓò»Ï£ÍûµÄÌØÐÔ¡£ + + + ´¦ÀíÑ¡ÏîʱµÄ´íÎó×ö·¨ + .if defined(WITH_FOO) +LIB_DEPENDS+= foo.0:${PORTSDIR}/devel/foo +CONFIGURE_ARGS+= --enable-foo +.endif + + + ÔÚÇ°ÃæµÄÀý×ÓÖУ¬ ¼ÙÉèϵͳÖÐÒѾ­°²×°ÁË libfoo ¿â¡£ Óû§¿ÉÄܲ¢²»Ï£ÍûÓ¦ÓóÌÐòʹÓà libfoo£¬ + Òò´ËËûÔÚ make config ¶Ô»°¿òÖйصôÁËÕâ¸öÑ¡Ïî¡£ + µ«ÊÇ£¬ Ó¦ÓóÌÐòµÄ configure ½Å±¾¼ì²âµ½ÁËϵͳÖдæÔÚÕâ¸ö¿â£¬ + ²¢½«Æä¼ÓÈëµ½ÁË×îÖÕ¿ÉÖ´ÐÐÎļþÖ§³ÖµÄ¹¦ÄÜÖС£ ÏÖÔÚ£¬ Èç¹ûÓû§¾ö¶¨´ÓϵͳÖÐжÔØ libfoo ʱ£¬ + ports ϵͳ¾ÍÎÞ·¨±£»¤Õâ¸öÓ¦ÓóÌÐòÃâÔâÆÆ»µÁË (ÒòΪûÓмǼ libfoo µÄÒÀÀµ¹Øϵ)¡£ + + + ´¦ÀíÑ¡ÏîʱµÄÕýÈ·×ö·¨ + .if defined(WITH_FOO) +LIB_DEPENDS+= foo.0:${PORTSDIR}/devel/foo +CONFIGURE_ARGS+= --enable-foo +.else +CONFIGURE_ARGS+= --disable-foo +.endif + + + ÔÚµÚ¶þ¸öÀý×ÓÖУ¬ libfoo ¿â±»Ã÷È·½ûÓᣠ¼´Ê¹ÏµÍ³ÖÐÒѾ­°²×°ÁËÕâ¸ö¿â£¬ + configure ½Å±¾Ò²²»»áÆôÓÃÏàÓ¦µÄ¹¦ÄÜÁË¡£ + + @@ -6436,6 +6472,44 @@ ¶øÎÞÐè WX_PREMK µÄ²ÎÓë¡£ + + + ¶îÍâµÄ <command>configure</command> ²ÎÊý + + ijЩ GNU configure ½Å±¾ÔÚÖ»ÉèÖÃÁË + WX_CONFIG »·¾³±äÁ¿Ê±£¬ ÎÞ·¨×Ô¶¯ÕÒµ½ + wxWidgets£¬ ¶øÐèҪʹÓöîÍâµÄ²ÎÊýÀ´¼ÓÒÔÖ¸¶¨¡£ + Äú¿ÉÒÔʹÓà WX_CONF_ARGS ±äÁ¿À´¸ø³öÕâЩ²ÎÊý¡£ + + + ¿ÉÓÃÓÚ <makevar>WX_CONF_ARGS</makevar> µÄÖµ + + + + + ¿ÉÓÃÖµ + + ½á¹û + + + + + + absolute + + --with-wx-config=${WX_CONFIG} + + + + relative + + --with-wx=${X11BASE} + --with-wx-config=${WX_CONFIG:T} + + + +
+ @@ -9962,6 +10036,10 @@ ¼ÓÈëÁË libelf Ö®ºóµÄ 7.0-CURRENT¡£ 700025 + + ¶ÔÒôЧÏà¹ØµÄ sysctl ½øÐдó·ùµ÷ÕûÖ®ºóµÄ 7.0-CURRENT¡£ + 700026 + ==== //depot/projects/dtrace/src/sys/powerpc/include/pmap.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: pmap.h,v 1.17 2000/03/30 16:18:24 jdolecek Exp $ - * $FreeBSD: src/sys/powerpc/include/pmap.h,v 1.19 2005/12/06 21:09:01 jhb Exp $ + * $FreeBSD: src/sys/powerpc/include/pmap.h,v 1.20 2006/12/05 04:01:52 grehan Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -95,7 +95,7 @@ void pmap_deactivate(struct thread *); vm_offset_t pmap_kextract(vm_offset_t); int pmap_dev_direct_mapped(vm_offset_t, vm_size_t); - +boolean_t pmap_page_executable(vm_page_t); boolean_t pmap_mmu_install(char *name, int prio); #define vtophys(va) pmap_kextract((vm_offset_t)(va)) ==== //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_if.m#6 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/sys/powerpc/powerpc/mmu_if.m,v 1.6 2006/08/01 19:06:05 alc Exp $ +# $FreeBSD: src/sys/powerpc/powerpc/mmu_if.m,v 1.7 2006/12/05 04:01:52 grehan Exp $ # #include @@ -752,3 +752,17 @@ vm_offset_t _pa; vm_size_t _size; }; + + +/** + * @brief Evaluate if a physical page has an executable mapping + * + * @param _pg physical page + * + * @retval bool TRUE if a physical mapping exists for the given page. + */ +METHOD boolean_t page_executable { + mmu_t _mmu; + vm_page_t _pg; +}; + ==== //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_oea.c#9 (text+ko) ==== @@ -91,7 +91,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mmu_oea.c,v 1.113 2006/11/30 08:13:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mmu_oea.c,v 1.114 2006/12/05 04:01:52 grehan Exp $"); /* * Manages physical address maps. @@ -342,6 +342,7 @@ vm_offset_t moea_kextract(mmu_t, vm_offset_t); void moea_kenter(mmu_t, vm_offset_t, vm_offset_t); boolean_t moea_dev_direct_mapped(mmu_t, vm_offset_t, vm_size_t); +boolean_t moea_page_executable(mmu_t, vm_page_t); static mmu_method_t moea_methods[] = { MMUMETHOD(mmu_change_wiring, moea_change_wiring), @@ -380,6 +381,7 @@ MMUMETHOD(mmu_kextract, moea_kextract), MMUMETHOD(mmu_kenter, moea_kenter), MMUMETHOD(mmu_dev_direct_mapped,moea_dev_direct_mapped), + MMUMETHOD(mmu_page_executable, moea_page_executable), { 0, 0 } }; @@ -2453,6 +2455,12 @@ return (EFAULT); } +boolean_t +moea_page_executable(mmu_t mmu, vm_page_t pg) +{ + return ((moea_attr_fetch(pg) & PTE_EXEC) == PTE_EXEC); +} + /* * Map a set of physical memory pages into the kernel virtual * address space. Return a pointer to where it is mapped. This ==== //depot/projects/dtrace/src/sys/powerpc/powerpc/pmap_dispatch.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap_dispatch.c,v 1.8 2006/11/11 20:57:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap_dispatch.c,v 1.9 2006/12/05 04:01:52 grehan Exp $"); /* * Dispatch MI pmap calls to the appropriate MMU implementation @@ -345,6 +345,11 @@ return (MMU_DEV_DIRECT_MAPPED(mmu_obj, pa, size)); } +boolean_t +pmap_page_executable(vm_page_t pg) +{ + return (MMU_PAGE_EXECUTABLE(mmu_obj, pg)); +} /* * MMU install routines. Highest priority wins, equal priority also ==== //depot/projects/dtrace/src/sys/powerpc/powerpc/uio_machdep.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/uio_machdep.c,v 1.5 2005/01/07 02:29:20 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/uio_machdep.c,v 1.6 2006/12/05 04:01:52 grehan Exp $"); #include #include @@ -49,6 +49,7 @@ #include #include +#include #include /* @@ -92,10 +93,13 @@ uio_yield(); if (uio->uio_rw == UIO_READ) error = copyout(cp, iov->iov_base, cnt); - else + else error = copyin(iov->iov_base, cp, cnt); if (error) goto out; + if (uio->uio_rw == UIO_WRITE && + pmap_page_executable(ma[offset >> PAGE_SHIFT])) + __syncicache(cp, cnt); break; case UIO_SYSSPACE: if (uio->uio_rw == UIO_READ) ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/hcall.S#9 (text+ko) ==== @@ -1,1433 +1,1850 @@ -/* - * CDDL HEADER START +/*- + * Copyright (c) 2006 Kip Macy + * All rights reserved. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. + * 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. * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END + * $FreeBSD: src/sys/sun4v/sun4v/hcall.S,v 1.17 2006/11/26 04:37:49 kmacy Exp $ */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "@(#)hcall.s 1.10 05/09/28 SMI" - -/* - * Hypervisor calls - */ -#define _ASM - +#include + #include -__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/hcall.S,v 1.3 2006/11/08 22:16:05 kmacy Exp $") - #include #include -#include +#include #include #include "assym.s" +/* + * Section 9 API Versioning + * + */ -#if defined(lint) -#error lint -#endif -#if defined(__lint) -#error __lint -#endif -#if defined(lint) || defined(__lint) +/* + * request and check for a version of the hypervisor apis + * which may be compatible + * + * arg0 api_group (%o0) + * arg1 major_number (%o1) + * arg2 req_minor_number (%o2) + * + * ret0 status (%o0) + * ret1 act_minor_number (%o1) + * + */ +ENTRY(api_set_version) + mov API_SET_VERSION, %o5 + ta CORE_TRAP + retl + stx %o1, [%o3] +END(api_set_version) -/*ARGSUSED*/ -int64_t -hv_cnputchar(uint8_t ch) -{ return (0); } +/* + * retrieve the major and minor number of the most recently + * successfully negotiated API + * + * arg0 api_group (%o0) + * + * ret0 status (%o0) + * ret1 major_number (%o1) + * ret2 major_number (%o2) + * + */ +ENTRY(api_get_version) + mov %o2, %o4 + mov %o1, %o3 + mov API_GET_VERSION, %o5 + ta CORE_TRAP + retl + stx %o1, [%o4] + +END(api_get_version) + +/* + * Section 10 Domain Services + * + */ -/*ARGSUSED*/ -int64_t -hv_cngetchar(uint8_t *ch) -{ return (0); } +/* + * stop all CPUs in the virtual machine domain and place them + * in the stopped state + * + * arg0 exit_code (%o0) + * + */ +ENTRY(hv_mach_exit) + mov MACH_EXIT, %o5 + ta FAST_TRAP + retl + nop +END(hv_mach_exit) + +/* + * copy the most current machine description into buffer + * upon success or EINVAL the service returns the actual + * size of the machine description + * + * arg0 buffer (%o0) + * arg1 length (%o1) + * + * ret0 status (%o0) + * ret1 length (%o1) + * + */ +ENTRY(hv_mach_desc) + mov %o1, %o2 + ldx [%o1], %o1 + mov MACH_DESC, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] +END(hv_mach_desc) -/*ARGSUSED*/ -uint64_t -hv_tod_get(uint64_t *seconds) -{ return (0); } +/* + * execute a software initiated reset of a virtual machine domain + * + */ +ENTRY(hv_mach_sir) + mov MACH_SIR, %o5 + ta FAST_TRAP + retl + nop +END(hv_mach_sir) + +/* + * report the guests soft state to the hypervisor + * + * arg0 soft_state (%o0) + * arg1 soft_state_desc_ptr (%o1) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mach_set_soft_state) + mov MACH_SET_SOFT_STATE, %o5 + ta FAST_TRAP + retl + nop +END(hv_mach_set_soft_state) + +/* + * retrieve the current value of the guest's software state + * + * arg0 soft_desc_ptr (%o0) + * + * ret0 status (%o0) + * arg1 soft_state (%o1) + * + */ +ENTRY(hv_mach_get_soft_state) + mov %o1, %o2 + mov MACH_SET_SOFT_STATE, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] +END(hv_mach_get_soft_state) + +/* + * set a watchdog timer, 0 disables, upon success + * time_remaining contains the time previously remaining + * + * arg0 timeout (%o0) + * + * ret0 status (%o0) + * ret1 time_remaining (%o1) + * + */ +ENTRY(hv_mach_watchdog) + mov %o1, %o2 + mov MACH_WATCHDOG, %o5 + ta FAST_TRAP + brnz,pn %o0, 1f + nop + stx %o1, [%o2] +1: retl + nop +END(hv_mach_watchdog) + +/* + * Section 11 CPU Services + * + */ -/*ARGSUSED*/ -uint64_t -hv_tod_set(uint64_t seconds) -{ return (0);} +/* + * start CPU with id cpuid with pc in %pc and real trap base address + * of rtba + * + * arg0 cpuid (%o0) + * arg1 pc (%o1) + * arg2 rtba (%o2) + * arg3 target_arg0 (%o3) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_cpu_start) + mov CPU_START, %o5 + ta FAST_TRAP + retl + nop +END(hv_cpu_start) -/*ARGSUSED*/ -uint64_t -hv_mmu_map_perm_addr(void *vaddr, int ctx, uint64_t tte, int flags) -{ return (0); } +/* + * stop CPU with id cpuid + * + * arg0 cpuid (%o0) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_cpu_stop) + mov CPU_STOP, %o5 + ta FAST_TRAP + retl + nop +END(hv_cpu_stop) -/*ARGSUSED*/ -uint64_t -hv_mmu_unmap_perm_addr(void *vaddr, int ctx, int flags) -{ return (0); } +/* + * set the real trap base address of the local cpu to rtba + * upon success the previous_rtba contains the address of the + * old rtba + * + * arg0 rtba (%o0) + * + * ret0 status (%o0) + * ret1 previous_rtba(%o1) + * + */ +ENTRY(hv_cpu_set_rtba) + mov %o1, %o2 + mov CPU_SET_RTBA, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] + +END(hv_cpu_set_rtba) -/*ARGSUSED*/ -uint64_t -hv_set_ctx0(uint64_t ntsb_descriptor, uint64_t desc_ra) -{ return (0); } +/* + * return the current real trap base address + * + * ret0 status (%o0) + * ret1 rtba (%o1) + * + */ +ENTRY(hv_cpu_get_rtba) + mov CPU_GET_RTBA, %o5 + ta FAST_TRAP + retl + nop +END(hv_cpu_get_rtba) + +/* + * suspend execution on current cpu + * + * ret0 status (%o0) + * + */ +ENTRY(hv_cpu_yield) + mov CPU_YIELD, %o5 + ta FAST_TRAP + retl + nop +END(hv_cpu_yield) -/*ARGSUSED*/ -uint64_t -hv_set_ctxnon0(uint64_t ntsb_descriptor, uint64_t desc_ra) -{ return (0); } +/* + * configure queue of size nentries to be placed at base raddr + * + * arg0 queue (%o0) + * arg1 base raddr (%o1) + * arg2 nentries (%o2) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_cpu_qconf) + mov CPU_QCONF, %o5 + ta FAST_TRAP + retl + nop +END(hv_cpu_qconf) + +/* + * return configuration of queue queue + * + * arg0 queue (%o0) + * + * ret0 status (%o0) + * ret1 base raddr (%o1) + * ret2 nentries (%o2) + * + */ +ENTRY(hv_cpu_qinfo) +END(hv_cpu_qinfo) + +/* + * send cpu mondo interrupt to cpulist + * + * arg0 ncpus (%o0) + * arg1 cpu list ra (%o1) + * arg2 mondo data ra(%o2) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_cpu_mondo_send) + ldx [PCPU(MONDO_DATA_RA)], %o2 + mov CPU_MONDO_SEND, %o5 + ta FAST_TRAP + retl + membar #Sync +END(hv_cpu_mondo_send) -#ifdef SET_MMU_STATS -/*ARGSUSED*/ -uint64_t -hv_mmu_set_stat_area(uint64_t rstatarea, uint64_t size) -{ return (0); } -#endif /* SET_MMU_STATS */ +/* + * return the hypervisor id for the current cpu + * + * ret0 status (%o0) + * ret1 cpuid (%o1) + * + */ +ENTRY(hv_cpu_myid) + mov %o0, %o2 + mov CPU_MYID, %o5 + ta FAST_TRAP + stx %o1, [%o2] + retl + nop +END(hv_cpu_myid) -/*ARGSUSED*/ -uint64_t -hv_cpu_qconf(int queue, uint64_t paddr, int size) -{ return (0); } +/* + * retrieve the current state of cpu cpuid + * + * arg0 cpuid (%o0) + * + * ret0 status (%o0) + * ret1 state (%o1) + * + */ +ENTRY(hv_cpu_state) + mov %o1, %o2 + mov CPU_STATE, %o5 + ta FAST_TRAP + stx %o1, [%o2] + retl + nop +END(hv_cpu_state) + +/* + * Section 12 MMU Services + * + */ + +/* + * set the tsb(s) for the current cpu for context 0 + * + * arg0 ntsb (%o0) + * arg1 tsbdptr (%o1) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_tsb_ctx0) + mov MMU_TSB_CTX0, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_tsb_ctx0) -/*ARGSUSED*/ -uint64_t -hvio_config_get(devhandle_t dev_hdl, pci_device_t bdf, - pci_config_offset_t off, pci_config_size_t size, pci_cfg_data_t *data_p) -{ return (0); } +/* + * set the tsb(s) for the current cpu for non-zero contexts + * + * arg0 ntsb (%o0) + * arg1 tsbptr (%o1) + * + * ret0 status (%o0) + * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 5 05:54:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5531516A417; Tue, 5 Dec 2006 05:54:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ED27A16A40F for ; Tue, 5 Dec 2006 05:54:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 936BC43C9D for ; Tue, 5 Dec 2006 05:54:05 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB55sgcR070542 for ; Tue, 5 Dec 2006 05:54:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB55sflS070534 for perforce@freebsd.org; Tue, 5 Dec 2006 05:54:41 GMT (envelope-from jb@freebsd.org) Date: Tue, 5 Dec 2006 05:54:41 GMT Message-Id: <200612050554.kB55sflS070534@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 111117 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 05:54:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=111117 Change 111117 by jb@jb_freebsd8 on 2006/12/05 05:54:38 Brick batts for p4. pffff. Even a force integration wasn't enough to get it to use the files in current. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/_libelf.h#14 edit .. //depot/projects/dtrace/src/lib/libelf/elf.3#6 edit .. //depot/projects/dtrace/src/lib/libelf/elf_begin.3#5 edit .. //depot/projects/dtrace/src/lib/libelf/elf_begin.c#8 edit .. //depot/projects/dtrace/src/lib/libelf/elf_cntl.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_cntl.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_data.c#5 edit .. //depot/projects/dtrace/src/lib/libelf/elf_end.3#4 edit .. //depot/projects/dtrace/src/lib/libelf/elf_end.c#5 edit .. //depot/projects/dtrace/src/lib/libelf/elf_errmsg.3#4 edit .. //depot/projects/dtrace/src/lib/libelf/elf_errmsg.c#11 edit .. //depot/projects/dtrace/src/lib/libelf/elf_errno.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_fill.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_fill.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_flag.c#5 edit .. //depot/projects/dtrace/src/lib/libelf/elf_flagdata.3#5 edit .. //depot/projects/dtrace/src/lib/libelf/elf_getarhdr.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_getarhdr.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_getarsym.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_getbase.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_getbase.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_getdata.3#5 edit .. //depot/projects/dtrace/src/lib/libelf/elf_getident.3#4 edit .. //depot/projects/dtrace/src/lib/libelf/elf_getident.c#4 edit .. //depot/projects/dtrace/src/lib/libelf/elf_getscn.3#5 edit .. //depot/projects/dtrace/src/lib/libelf/elf_getshnum.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_getshstrndx.3#4 edit .. //depot/projects/dtrace/src/lib/libelf/elf_hash.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_hash.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_kind.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_kind.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_memory.3#4 edit .. //depot/projects/dtrace/src/lib/libelf/elf_memory.c#9 edit .. //depot/projects/dtrace/src/lib/libelf/elf_next.3#4 edit .. //depot/projects/dtrace/src/lib/libelf/elf_next.c#7 edit .. //depot/projects/dtrace/src/lib/libelf/elf_rand.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_rand.c#4 edit .. //depot/projects/dtrace/src/lib/libelf/elf_rawfile.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_rawfile.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_scn.c#8 edit .. //depot/projects/dtrace/src/lib/libelf/elf_shnum.c#4 edit .. //depot/projects/dtrace/src/lib/libelf/elf_shstrndx.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_strptr.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_strptr.c#5 edit .. //depot/projects/dtrace/src/lib/libelf/elf_types.m4#5 edit .. //depot/projects/dtrace/src/lib/libelf/elf_update.3#6 edit .. //depot/projects/dtrace/src/lib/libelf/elf_update.c#8 edit .. //depot/projects/dtrace/src/lib/libelf/elf_version.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_version.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf.3#4 edit .. //depot/projects/dtrace/src/lib/libelf/gelf.h#4 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_checksum.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_checksum.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_dyn.c#4 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_ehdr.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_fsize.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_fsize.c#4 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_getclass.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_getclass.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_getdyn.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_getehdr.3#7 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_getmove.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_getphdr.3#4 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_getrel.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_getrela.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_getshdr.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_getsym.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_getsyminfo.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_newehdr.3#9 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_newphdr.3#5 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_phdr.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_rel.c#5 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_rela.c#5 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_sym.c#4 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_update_ehdr.3#3 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_xlate.c#6 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_xlatetof.3#5 edit .. //depot/projects/dtrace/src/lib/libelf/libelf.c#7 edit .. //depot/projects/dtrace/src/lib/libelf/libelf.h#13 edit .. //depot/projects/dtrace/src/lib/libelf/libelf_align.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/libelf_allocate.c#8 edit .. //depot/projects/dtrace/src/lib/libelf/libelf_ar.c#4 edit .. //depot/projects/dtrace/src/lib/libelf/libelf_checksum.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#13 edit .. //depot/projects/dtrace/src/lib/libelf/libelf_data.c#5 edit .. //depot/projects/dtrace/src/lib/libelf/libelf_ehdr.c#9 edit .. //depot/projects/dtrace/src/lib/libelf/libelf_fsize.m4#7 edit .. //depot/projects/dtrace/src/lib/libelf/libelf_msize.m4#6 edit .. //depot/projects/dtrace/src/lib/libelf/libelf_phdr.c#6 edit .. //depot/projects/dtrace/src/lib/libelf/libelf_shdr.c#3 edit .. //depot/projects/dtrace/src/lib/libelf/libelf_xlate.c#4 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/_libelf.h#14 (text+ko) ==== @@ -23,14 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/lib/libelf/_libelf.h,v 1.1 2006/11/11 17:16:33 jkoshy Exp $ */ #ifndef __LIBELF_H_ #define __LIBELF_H_ #include -#include #ifndef NULL #define NULL ((void *) 0) @@ -62,7 +61,6 @@ #define LIBELF_SET_ERROR(E, O) do { \ LIBELF_PRIVATE(error) = ((ELF_E_##E & LIBELF_ELF_ERROR_MASK)| \ ((O) << LIBELF_OS_ERROR_SHIFT)); \ - printf("Error %d in function %s line %d\n", ELF_E_##E, __FUNCTION__, __LINE__); \ } while (0) #define LIBELF_ADJUST_AR_SIZE(S) (((S) + 1U) & ~1U) @@ -76,6 +74,7 @@ struct _Elf { int e_activations; /* activation count */ + Elf_Arhdr *e_arhdr; /* header for archive members */ unsigned int e_byteorder; /* ELFDATA* */ int e_class; /* ELFCLASS* */ Elf_Cmd e_cmd; /* ELF_C_* used at creation time */ @@ -89,14 +88,14 @@ union { struct { /* ar(1) archives */ - off_t e_next; + off_t e_next; /* set by elf_rand()/elf_next() */ int e_nchildren; char *e_rawstrtab; /* file name strings */ size_t e_rawstrtabsz; char *e_rawsymtab; /* symbol table */ size_t e_rawsymtabsz; - Elf_Arhdr *e_hdrtab; Elf_Arsym *e_symtab; + size_t e_symtabsz; } e_ar; struct { /* regular ELF files */ union { @@ -134,6 +133,24 @@ ELF_TOMEMORY }; +#define LIBELF_COPY_U32(DST,SRC,NAME) do { \ + if ((SRC)->NAME > UINT_MAX) { \ + LIBELF_SET_ERROR(RANGE, 0); \ + return (0); \ + } \ + (DST)->NAME = (SRC)->NAME; \ + } while (0) + +#define LIBELF_COPY_S32(DST,SRC,NAME) do { \ + if ((SRC)->NAME > INT_MAX || \ + (SRC)->NAME < INT_MIN) { \ + LIBELF_SET_ERROR(RANGE, 0); \ + return (0); \ + } \ + (DST)->NAME = (SRC)->NAME; \ + } while (0) + + /* * Prototypes */ @@ -141,7 +158,10 @@ Elf_Data *_libelf_allocate_data(Elf_Scn *_s); Elf *_libelf_allocate_elf(void); Elf_Scn *_libelf_allocate_scn(Elf *_e, size_t _ndx); +Elf_Arhdr *_libelf_ar_gethdr(Elf *_e); Elf *_libelf_ar_open(Elf *_e); +Elf *_libelf_ar_open_member(int _fd, Elf_Cmd _c, Elf *_ar); +Elf_Arsym *_libelf_ar_process_symtab(Elf *_ar, size_t *_dst); unsigned long _libelf_checksum(Elf *_e, int _elfclass); void *_libelf_ehdr(Elf *_e, int _elfclass, int _allocate); int _libelf_falign(Elf_Type _t, int _elfclass); @@ -152,7 +172,8 @@ void *_libelf_getphdr(Elf *_e, int _elfclass); void *_libelf_getshdr(Elf_Scn *_scn, int _elfclass); int _libelf_getshnum(Elf *_e, void *_eh, int _elfclass, size_t *_shnum); -int _libelf_getshstrndx(void *_eh, int _elfclass, size_t *_shstrndx); +int _libelf_getshstrndx(Elf *_e, void *_eh, int _elfclass, + size_t *_shstrndx); void _libelf_init_elf(Elf *_e, Elf_Kind _kind); int _libelf_malign(Elf_Type _t, int _elfclass); size_t _libelf_msize(Elf_Type _t, int _elfclass, unsigned int _version); @@ -161,7 +182,8 @@ Elf *_libelf_release_elf(Elf *_e); Elf_Scn *_libelf_release_scn(Elf_Scn *_s); int _libelf_setshnum(Elf *_e, void *_eh, int _elfclass, size_t _shnum); -int _libelf_setshstrndx(void *_eh, int _elfclass, size_t _shstrndx); +int _libelf_setshstrndx(Elf *_e, void *_eh, int _elfclass, + size_t _shstrndx); Elf_Data *_libelf_xlate(Elf_Data *_d, const Elf_Data *_s, unsigned int _encoding, int _elfclass, int _direction); int _libelf_xlate_shtype(uint32_t _sht); ==== //depot/projects/dtrace/src/lib/libelf/elf.3#6 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libelf/elf.3,v 1.2 2006/11/13 09:46:15 ru Exp $ .\" .Dd September 1, 2006 .Os @@ -44,6 +44,8 @@ and word-size independent way, allowing an application to read and create ELF objects for 32 and 64 bit architectures and for little- and big-endian machines. +The library is capable of processing ELF objects that use extended +section numbering. .Pp This manual page serves to provide an overview of the functionality in the ELF library. @@ -236,12 +238,15 @@ data structure describes an individual chunk of a ELF file as represented in memory. It has the following application visible members: -.Bl -tag -width ".Vt unsigned int d_version" +.Bl -tag -width ".Vt unsigned int d_version" -compact .It Vt "uint64_t d_align" -The alignment of the data buffer within its containing ELF section. +The in-file alignment of the data buffer within its containing ELF section. +This value must be a power of two. .It Vt "uint64_t d_off" The offset with the containing section where this descriptors data would be placed. +This field will be computed by the library unless the application +requests full control of the ELF object's layout. .It Vt "uint64_t d_size" The number of bytes of data in this descriptor. .It Vt "void *d_buf" @@ -369,7 +374,7 @@ Sets the operating version. .El .It "IO Control" -.Bl -tag -compact +.Bl -tag -width ".Fn elf_setshstrndx" -compact .It Fn elf_cntl Manage the association between and ELF descriptor and its underlying file. .It Fn elf_flagdata @@ -386,16 +391,23 @@ descriptor as dirty. .It Fn elf_flagshdr Mark an ELF Section Header as dirty. +.It Fn elf_setshstrndx +Set the index of the section name string table for the ELF object. .It Fn elf_update Recompute ELF object layout and optionally write the modified object back to the underlying file. .El .It "Queries" -.Bl -tag -compact +.Bl -tag -width ".Fn elf_getshstrndx" -compact .It Fn elf32_checksum , Fn elf64_checkum Compute checksum of an ELF object. .It Fn elf_getident Retrieve the identification bytes for an ELF object. +.It Fn elf_getshnum +Retrieve the number of sections in an ELF object. +.It Fn elf_getshstrndx +Retrieve the section index of the section name string table in +an ELF object. .It Fn elf_hash Compute the ELF hash value of a string. .It Fn elf_kind @@ -413,9 +425,10 @@ However, if the application wishes to take complete charge of the layout of the ELF file, it may set the .Dv ELF_F_LAYOUT -flag on an ELF descriptor, following which the library will use the -section offsets and alignments specified by the application when -laying out the file. +flag on an ELF descriptor using +.Xr elf_flagelf 3 , +following which the library will use the data offsets and alignments +specified by the application when laying out the file. .Pp Gaps in between sections will be filled with the fill character set by function @@ -423,7 +436,8 @@ .Ss Error Handling In case an error is encountered, these library functions set an internal error number and signal the presence of the error by -returning an special return value. The application can check the +returning an special return value. +The application can check the current error number by calling .Xr elf_errno 3 . A human readable description of the recorded error is available by ==== //depot/projects/dtrace/src/lib/libelf/elf_begin.3#5 (text+ko) ==== @@ -21,11 +21,11 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libelf/elf_begin.3,v 1.2 2006/11/13 09:46:15 ru Exp $ .\" .Dd June 21, 2006 .Os -.Dt ELF 3 +.Dt ELF_BEGIN 3 .Sh NAME .Nm elf_begin .Nd open an ELF file or ar(1) archive ==== //depot/projects/dtrace/src/lib/libelf/elf_begin.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libelf/elf_begin.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $"); #include #include @@ -33,14 +33,13 @@ #include #include -#include #include #include #include "_libelf.h" static Elf * -libelf_open_object(int fd, Elf_Cmd c) +_libelf_open_object(int fd, Elf_Cmd c) { Elf *e; void *m; @@ -82,52 +81,8 @@ return (e); } -static Elf * -libelf_open_member(int fd, Elf_Cmd c, Elf *elf) -{ - Elf *e; - struct ar_hdr *arh; - int i, ch; - size_t sz; - - assert(elf->e_kind == ELF_K_AR); - - /* - * TODO: The following code is incorrect for archives using - * the new extended header scheme. - */ - arh = (struct ar_hdr *) (elf->e_rawfile + elf->e_u.e_ar.e_next); - for (i = sz = 0; i < 10; i++) { - ch = arh->ar_size[i]; - if (isdigit(ch)) { - sz *= 10; - sz += ch; - } else { - LIBELF_SET_ERROR(ARCHIVE, 0); - return (NULL); - } - } - - assert(sz > 0); - - arh++; /* skip over archive member header */ - - if ((e = elf_memory((char *) arh, sz)) == NULL) { - LIBELF_SET_ERROR(RESOURCE, 0); - return (NULL); - } - - e->e_fd = fd; - e->e_cmd = c; - - elf->e_u.e_ar.e_nchildren++; - e->e_parent = elf; - - return (e); -} - Elf * -elf_begin(int fd, Elf_Cmd c, Elf *elf) +elf_begin(int fd, Elf_Cmd c, Elf *a) { Elf *e; @@ -144,6 +99,11 @@ case ELF_C_WRITE: + if (a != NULL) { /* not allowed for ar(1) archives. */ + LIBELF_SET_ERROR(ARGUMENT, 0); + return (NULL); + } + /* * Check writeability of `fd' immediately and fail if * not writeable. @@ -162,13 +122,17 @@ return (e); case ELF_C_RDWR: - if (elf != NULL) { + if (a != NULL) { /* not allowed for ar(1) archives. */ LIBELF_SET_ERROR(ARGUMENT, 0); return (NULL); } /*FALLTHROUGH*/ case ELF_C_READ: - if (elf && (elf->e_fd != fd || c != elf->e_cmd)) { + /* + * Descriptor `a' could be for a regular ELF file, or + * for an ar(1) archive. + */ + if (a && (a->e_fd != fd || c != a->e_cmd)) { LIBELF_SET_ERROR(ARGUMENT, 0); return (NULL); } @@ -181,12 +145,12 @@ } - if (elf == NULL) - e = libelf_open_object(fd, c); - else if (elf->e_kind == ELF_K_AR) - e = libelf_open_member(fd, c, elf); + if (a == NULL) + e = _libelf_open_object(fd, c); + else if (a->e_kind == ELF_K_AR) + e = _libelf_ar_open_member(fd, c, a); else - (e = elf)->e_activations++; + (e = a)->e_activations++; return (e); } ==== //depot/projects/dtrace/src/lib/libelf/elf_cntl.3#3 (text+ko) ==== @@ -21,11 +21,11 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libelf/elf_cntl.3,v 1.2 2006/11/13 09:46:15 ru Exp $ .\" .Dd August 9, 2006 .Os -.Dt ELF 3 +.Dt ELF_CNTL 3 .Sh NAME .Nm elf_cntl .Nd control an elf file descriptor ==== //depot/projects/dtrace/src/lib/libelf/elf_cntl.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libelf/elf_cntl.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $"); #include ==== //depot/projects/dtrace/src/lib/libelf/elf_data.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libelf/elf_data.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $"); #include #include @@ -141,6 +141,14 @@ return (NULL); } + /* + * elf_newdata() has to append a data descriptor, so + * bring in existing section data if not already present. + */ + if (e->e_rawfile && s->s_size > 0 && STAILQ_EMPTY(&s->s_data)) + if (elf_getdata(s, NULL) == NULL) + return (NULL); + if ((d = malloc(sizeof(Elf_Data))) == NULL) { LIBELF_SET_ERROR(RESOURCE, errno); return (NULL); ==== //depot/projects/dtrace/src/lib/libelf/elf_end.3#4 (text+ko) ==== @@ -21,11 +21,11 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libelf/elf_end.3,v 1.2 2006/11/13 09:46:15 ru Exp $ .\" .Dd June 29, 2006 .Os -.Dt ELF 3 +.Dt ELF_END 3 .Sh NAME .Nm elf_end .Nd release an ELF descriptor ==== //depot/projects/dtrace/src/lib/libelf/elf_end.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libelf/elf_end.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $"); #include ==== //depot/projects/dtrace/src/lib/libelf/elf_errmsg.3#4 (text+ko) ==== @@ -21,11 +21,11 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libelf/elf_errmsg.3,v 1.2 2006/11/13 09:46:15 ru Exp $ .\" .Dd June 11, 2006 .Os -.Dt ELF 3 +.Dt ELF_ERRMSG 3 .Sh NAME .Nm elf_errmsg , .Nm elf_errno ==== //depot/projects/dtrace/src/lib/libelf/elf_errmsg.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libelf/elf_errmsg.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $"); #include #include ==== //depot/projects/dtrace/src/lib/libelf/elf_errno.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libelf/elf_errno.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $"); #include ==== //depot/projects/dtrace/src/lib/libelf/elf_fill.3#3 (text+ko) ==== @@ -21,11 +21,11 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libelf/elf_fill.3,v 1.2 2006/11/13 09:46:15 ru Exp $ .\" .Dd June 11, 2006 .Os -.Dt ELF 3 +.Dt ELF_FILL 3 .Sh NAME .Nm elf_fill .Nd set fill byte for inter-section padding @@ -49,4 +49,4 @@ .Sh SEE ALSO .Xr elf 3 , .Xr elf_flagelf 3 , -.Xr gelf 3+.Xr gelf 3 ==== //depot/projects/dtrace/src/lib/libelf/elf_fill.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libelf/elf_fill.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $"); #include @@ -36,4 +36,3 @@ { LIBELF_PRIVATE(fillchar) = fill; } - ==== //depot/projects/dtrace/src/lib/libelf/elf_flag.c#5 (text+ko) ==== @@ -25,9 +25,8 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libelf/elf_flag.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $"); -#include #include #include "_libelf.h" ==== //depot/projects/dtrace/src/lib/libelf/elf_flagdata.3#5 (text+ko) ==== @@ -21,11 +21,11 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.2 2006/11/13 09:46:15 ru Exp $ .\" .Dd August 10, 2006 .Os -.Dt ELF 3 +.Dt ELF_FLAGDATA 3 .Sh NAME .Nm elf_flagdata , .Nm elf_flagehdr , @@ -139,14 +139,14 @@ .El .Sh SEE ALSO .Xr elf 3 , -.Xr elf_newdata 3 , -.Xr elf_update 3 , .Xr elf32_newehdr 3 , .Xr elf32_newphdr 3 , .Xr elf32_newshdr 3 , .Xr elf64_newehdr 3 , .Xr elf64_newphdr 3 , .Xr elf64_newshdr 3 , +.Xr elf_newdata 3 , +.Xr elf_update 3 , .Xr gelf 3 , .Xr gelf_newehdr 3 , .Xr gelf_newphdr 3 , ==== //depot/projects/dtrace/src/lib/libelf/elf_getarhdr.3#3 (text+ko) ==== @@ -21,11 +21,11 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libelf/elf_getarhdr.3,v 1.2 2006/11/13 09:46:15 ru Exp $ .\" .Dd August 15, 2006 .Os -.Dt ELF 3 +.Dt ELF_GETARHDR 3 .Sh NAME .Nm elf_getarhdr .Nd retrieve ar(1) header for an archive member @@ -94,4 +94,4 @@ .Xr elf 3 , .Xr elf_begin 3 , .Xr elf_getarsym 3 , -.Xr elf_memory 3+.Xr elf_memory 3 ==== //depot/projects/dtrace/src/lib/libelf/elf_getarhdr.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 John Birrell jb@freebsd.org + * Copyright (c) 2006 Joseph Koshy * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,16 +25,24 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libelf/elf_getarhdr.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $"); #include -#include #include "_libelf.h" Elf_Arhdr * -elf_getarhdr(__unused Elf *elf) +elf_getarhdr(Elf *e) { - printf("%s: not implemented\n", __FUNCTION__); - return (0); + Elf_Arhdr *arh; + + if (e == NULL) { + LIBELF_SET_ERROR(ARGUMENT, 0); + return (NULL); + } + + if ((arh = e->e_arhdr) != NULL) + return (arh); + + return (_libelf_ar_gethdr(e)); } ==== //depot/projects/dtrace/src/lib/libelf/elf_getarsym.3#3 (text+ko) ==== @@ -21,11 +21,11 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libelf/elf_getarsym.3,v 1.2 2006/11/13 09:46:15 ru Exp $ .\" .Dd August 15, 2006 .Os -.Dt ELF 3 +.Dt ELF_GETARSYM 3 .Sh NAME .Nm elf_getarsym .Nd retrieve the symbol table of an archive @@ -60,7 +60,7 @@ An .Vt Elf_Arsym structure has the following elements: -.Bl -tag -width indent +.Bl -tag -width indent -compact .It Vt "char *" Va as_name This structure member is a pointer to a null-terminated symbol name. .It Vt "off_t" Va as_off @@ -85,8 +85,8 @@ .Ar ptr is non-null, the .Fn elf_getarsym -function will store the number of table entries into the location it -points to, including the last entry in the count. +function will store the number of table entries returned (including the +sentinel entry at the end) into the location it points to. .Sh RETURN VALUES Function .Fn elf_getarsym @@ -97,9 +97,13 @@ .Pp If argument .Ar ptr -is non-null, the library will store the number of archive -symbol entries into the location it points to if successful, -or will store zero to the location in case of an error. +is non-null and there was no error, the library will store the +number of archive symbol entries returned into the location it +points to. +If argument +.Ar ptr +is non-null and an error was encountered, the library will +set the location pointed to by it to zero. .Sh ERRORS Function .Fn elf_getarsym @@ -123,4 +127,4 @@ .Xr elf_hash 3 , .Xr elf_memory 3 , .Xr elf_next 3 , -.Xr elf_rand 3+.Xr elf_rand 3 ==== //depot/projects/dtrace/src/lib/libelf/elf_getbase.3#3 (text+ko) ==== @@ -21,11 +21,11 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libelf/elf_getbase.3,v 1.2 2006/11/13 09:46:15 ru Exp $ .\" .Dd June 11, 2006 .Os -.Dt ELF 3 +.Dt ELF_GETBASE 3 .Sh NAME .Nm elf_getbase .Nd get the base offset for an object file @@ -64,4 +64,4 @@ .Xr elf_getarhdr 3 , .Xr elf_getident 3 , .Xr elf_rawfile 3 , -.Xr gelf 3+.Xr gelf 3 ==== //depot/projects/dtrace/src/lib/libelf/elf_getbase.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libelf/elf_getbase.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $"); #include @@ -43,4 +43,3 @@ return ((off_t) ((uintptr_t) e->e_rawfile - (uintptr_t) e->e_parent->e_rawfile)); } - ==== //depot/projects/dtrace/src/lib/libelf/elf_getdata.3#5 (text+ko) ==== @@ -21,11 +21,11 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libelf/elf_getdata.3,v 1.2 2006/11/13 09:46:15 ru Exp $ .\" .Dd August 26, 2006 .Os -.Dt ELF 3 +.Dt ELF_GETDATA 3 .Sh NAME .Nm elf_getdata , .Nm elf_newdata , @@ -80,6 +80,9 @@ Initialized to NULL. .It Va d_off Set to (off_t) -1. +This field is under application control if the +.Dv ELF_F_LAYOUT +flag was set on the ELF descriptor. .It Va d_size Set to zero. .It Va d_type @@ -95,6 +98,15 @@ Section .Ar scn must be associated with an ELF file opened for writing. +If the application has not requested full control of layout by +setting the +.Dv ELF_F_LAYOUT +flag on descriptor +.Ar elf , +then the data referenced by the returned descriptor will be positioned +after the existing content of the section, honoring the file alignment +specified in member +.Va d_align . On successful completion of a call to .Fn elf_newdata , the ELF library will mark the section ==== //depot/projects/dtrace/src/lib/libelf/elf_getident.3#4 (text+ko) ==== @@ -21,11 +21,11 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libelf/elf_getident.3,v 1.2 2006/11/13 09:46:15 ru Exp $ .\" .Dd July 3, 2006 .Os -.Dt ELF 3 +.Dt ELF_GETIDENT 3 .Sh NAME .Nm elf_getident .Nd return the initial bytes of a file @@ -70,14 +70,14 @@ .El .Sh SEE ALSO .Xr elf 3 , +.Xr elf32_getehdr 3 , +.Xr elf64_getehdr 3 , .Xr elf_getarhdr 3 , .Xr elf_getbase 3 , .Xr elf_getflags 3 , .Xr elf_kind 3 , .Xr elf_rawfile 3 , .Xr elf_update 3 , -.Xr elf32_getehdr , -.Xr elf64_getehdr , .Xr gelf 3 , .Xr gelf_getclass 3 , .Xr gelf_getehdr 3 ==== //depot/projects/dtrace/src/lib/libelf/elf_getident.c#4 (text+ko) ==== @@ -25,12 +25,10 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libelf/elf_getident.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $"); +#include #include -#include - -#include #include #include "_libelf.h" ==== //depot/projects/dtrace/src/lib/libelf/elf_getscn.3#5 (text+ko) ==== @@ -21,11 +21,11 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libelf/elf_getscn.3,v 1.2 2006/11/13 09:46:15 ru Exp $ .\" .Dd August 26, 2006 .Os -.Dt ELF 3 +.Dt ELF_GETSCN 3 .Sh NAME .Nm elf_getscn , .Nm elf_ndxscn , ==== //depot/projects/dtrace/src/lib/libelf/elf_getshnum.3#3 (text+ko) ==== @@ -21,11 +21,11 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libelf/elf_getshnum.3,v 1.2 2006/11/13 09:46:15 ru Exp $ .\" .Dd October 31, 2006 .Os -.Dt ELF 3 +.Dt ELF_GETSHNUM 3 .Sh NAME .Nm elf_getshnum .Nd return the number of sections in an ELF file @@ -46,8 +46,6 @@ This routine allows applications to uniformly process both normal ELF objects, and ELF objects that use extended section numbering. .Pp -.Sh IMPLEMENTATION NOTES -Support for extended section numbering is currently unimplemented. .Sh RETURN VALUES Function .Fn elf_getshnum @@ -69,18 +67,12 @@ Argument .Ar elf lacks an ELF Executable header. -.It Bq Er ELF_E_UNIMPL -Argument -.Ar elf -had more than -.Dv SHN_XINDEX -sections. .El .Sh SEE ALSO .Xr elf 3 , +.Xr elf32_getehdr 3 , +.Xr elf64_getehdr 3 , .Xr elf_getident 3 , .Xr elf_getshstrndx 3 , -.Xr elf32_getehdr , -.Xr elf64_getehdr , .Xr gelf 3 , .Xr gelf_getehdr 3 ==== //depot/projects/dtrace/src/lib/libelf/elf_getshstrndx.3#4 (text+ko) ==== @@ -21,11 +21,11 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libelf/elf_getshstrndx.3,v 1.2 2006/11/13 09:46:15 ru Exp $ .\" .Dd October 31, 2006 .Os >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 5 06:17:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41E0816A492; Tue, 5 Dec 2006 06:17:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1E04A16A412 for ; Tue, 5 Dec 2006 06:17:13 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB0FC43C9D for ; Tue, 5 Dec 2006 06:16:35 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB56HCvF075181 for ; Tue, 5 Dec 2006 06:17:12 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB56HCMw075178 for perforce@freebsd.org; Tue, 5 Dec 2006 06:17:12 GMT (envelope-from sam@freebsd.org) Date: Tue, 5 Dec 2006 06:17:12 GMT Message-Id: <200612050617.kB56HCMw075178@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 06:17:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=111119 Change 111119 by sam@sam_ebb on 2006/12/05 06:17:07 request only h/w crypto operations Affected files ... .. //depot/projects/crypto/tools/tools/crypto/cryptokeytest.c#3 edit .. //depot/projects/crypto/tools/tools/crypto/cryptotest.c#3 edit Differences ... ==== //depot/projects/crypto/tools/tools/crypto/cryptokeytest.c#3 (text+ko) ==== @@ -20,7 +20,7 @@ #include #include -int crid = CRYPTO_FLAG_SOFTWARE | CRYPTO_FLAG_HARDWARE; +int crid = CRYPTO_FLAG_HARDWARE; int verbose = 0; static int ==== //depot/projects/crypto/tools/tools/crypto/cryptotest.c#3 (text+ko) ==== @@ -107,7 +107,7 @@ int verbose = 0; int opflags = 0; int verify = 0; -int crid = CRYPTO_FLAG_SOFTWARE | CRYPTO_FLAG_HARDWARE; +int crid = CRYPTO_FLAG_SOFTWARE; struct alg { const char* name; From owner-p4-projects@FreeBSD.ORG Tue Dec 5 06:19:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C155216A412; Tue, 5 Dec 2006 06:19:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 99CA616A407 for ; Tue, 5 Dec 2006 06:19:16 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B15243CA2 for ; Tue, 5 Dec 2006 06:18:39 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB56JGAJ075276 for ; Tue, 5 Dec 2006 06:19:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB56JGaV075273 for perforce@freebsd.org; Tue, 5 Dec 2006 06:19:16 GMT (envelope-from sam@freebsd.org) Date: Tue, 5 Dec 2006 06:19:16 GMT Message-Id: <200612050619.kB56JGaV075273@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 06:19:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=111120 Change 111120 by sam@sam_ebb on 2006/12/05 06:18:27 sigh, dwim Affected files ... .. //depot/projects/crypto/tools/tools/crypto/cryptotest.c#4 edit Differences ... ==== //depot/projects/crypto/tools/tools/crypto/cryptotest.c#4 (text+ko) ==== @@ -107,7 +107,7 @@ int verbose = 0; int opflags = 0; int verify = 0; -int crid = CRYPTO_FLAG_SOFTWARE; +int crid = CRYPTO_FLAG_HARDWARE; struct alg { const char* name; From owner-p4-projects@FreeBSD.ORG Tue Dec 5 06:59:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3321916A416; Tue, 5 Dec 2006 06:59:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0F66716A412 for ; Tue, 5 Dec 2006 06:59:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4281A43CAD for ; Tue, 5 Dec 2006 06:58:30 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB56x75P081654 for ; Tue, 5 Dec 2006 06:59:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB56x7dC081651 for perforce@freebsd.org; Tue, 5 Dec 2006 06:59:07 GMT (envelope-from jb@freebsd.org) Date: Tue, 5 Dec 2006 06:59:07 GMT Message-Id: <200612050659.kB56x7dC081651@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 111123 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 06:59:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=111123 Change 111123 by jb@jb_freebsd8 on 2006/12/05 06:58:07 Add some definitions that OpenSolaris uses. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/gelf.h#5 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/gelf.h#5 (text+ko) ==== @@ -56,6 +56,11 @@ typedef Elf64_Syminfo GElf_Syminfo; /* Symbol information */ #endif +#define GELF_ST_BIND ELF64_ST_BIND +#define GELF_ST_TYPE ELF64_ST_TYPE +#define GELF_ST_INFO ELF64_ST_INFO + + __BEGIN_DECLS long gelf_checksum(Elf *_elf); size_t gelf_fsize(Elf *_elf, Elf_Type _type, size_t _count, From owner-p4-projects@FreeBSD.ORG Tue Dec 5 07:11:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D80D716A412; Tue, 5 Dec 2006 07:11:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9DEA416A40F for ; Tue, 5 Dec 2006 07:11:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC76543CA3 for ; Tue, 5 Dec 2006 07:10:45 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB57BMSP085550 for ; Tue, 5 Dec 2006 07:11:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB57BMjv085547 for perforce@freebsd.org; Tue, 5 Dec 2006 07:11:22 GMT (envelope-from jb@freebsd.org) Date: Tue, 5 Dec 2006 07:11:22 GMT Message-Id: <200612050711.kB57BMjv085547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 111124 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 07:11:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=111124 Change 111124 by jb@jb_freebsd8 on 2006/12/05 07:10:59 Add more annoying GELF definitions. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/gelf.h#6 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/gelf.h#6 (text+ko) ==== @@ -56,10 +56,17 @@ typedef Elf64_Syminfo GElf_Syminfo; /* Symbol information */ #endif -#define GELF_ST_BIND ELF64_ST_BIND -#define GELF_ST_TYPE ELF64_ST_TYPE -#define GELF_ST_INFO ELF64_ST_INFO - +#define GELF_M_SYM ELF64_M_SYM +#define GELF_M_SIZE ELF64_M_SIZE +#define GELF_ST_BIND ELF64_ST_BIND +#define GELF_ST_TYPE ELF64_ST_TYPE +#define GELF_ST_INFO ELF64_ST_INFO +#define GELF_R_TYPE ELF64_R_TYPE_ID +#define GELF_R_SYM ELF64_R_SYM +#define GELF_R_INFO ELF64_R_INFO +#define GELF_R_TYPE_DATA ELF64_R_TYPE_DATA +#define GELF_R_TYPE_ID ELF64_R_TYPE_ID +#define GELF_R_TYPE_INFO ELF64_R_TYPE_INFO __BEGIN_DECLS long gelf_checksum(Elf *_elf); From owner-p4-projects@FreeBSD.ORG Tue Dec 5 07:54:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27CE516A415; Tue, 5 Dec 2006 07:54:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CEFEF16A403 for ; Tue, 5 Dec 2006 07:54:22 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED3E043CA3 for ; Tue, 5 Dec 2006 07:53:44 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB57sMht092593 for ; Tue, 5 Dec 2006 07:54:22 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB57sJNc092581 for perforce@freebsd.org; Tue, 5 Dec 2006 07:54:19 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 5 Dec 2006 07:54:19 GMT Message-Id: <200612050754.kB57sJNc092581@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111126 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 07:54:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=111126 Change 111126 by mjacob@newisp on 2006/12/05 07:53:48 IFC Affected files ... .. //depot/projects/newisp/amd64/conf/GENERIC#6 integrate .. //depot/projects/newisp/amd64/isa/clock.c#3 integrate .. //depot/projects/newisp/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/newisp/arm/arm/cpufunc.c#5 integrate .. //depot/projects/newisp/arm/arm/pmap.c#4 integrate .. //depot/projects/newisp/arm/include/cpuconf.h#3 integrate .. //depot/projects/newisp/arm/xscale/i80321/i80321_space.c#3 integrate .. //depot/projects/newisp/cam/cam_ccb.h#5 integrate .. //depot/projects/newisp/cam/cam_xpt.c#13 integrate .. //depot/projects/newisp/cam/scsi/scsi_all.h#4 integrate .. //depot/projects/newisp/compat/linsysfs/linsysfs.c#2 integrate .. //depot/projects/newisp/compat/linux/linux_misc.c#10 integrate .. //depot/projects/newisp/compat/linux/linux_stats.c#4 integrate .. //depot/projects/newisp/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/newisp/dev/bge/if_bge.c#12 integrate .. //depot/projects/newisp/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/newisp/dev/ep/if_ep.c#2 integrate .. //depot/projects/newisp/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/newisp/dev/hme/if_hme.c#2 integrate .. //depot/projects/newisp/dev/iicbus/iicbb.c#3 integrate .. //depot/projects/newisp/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/newisp/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/newisp/dev/iicbus/iiconf.h#3 integrate .. //depot/projects/newisp/dev/isp/isp_freebsd.c#31 integrate .. //depot/projects/newisp/dev/mii/acphy.c#2 integrate .. //depot/projects/newisp/dev/mii/amphy.c#2 integrate .. //depot/projects/newisp/dev/mii/bmtphy.c#3 integrate .. //depot/projects/newisp/dev/mii/brgphy.c#3 integrate .. //depot/projects/newisp/dev/mii/ciphy.c#3 integrate .. //depot/projects/newisp/dev/mii/inphy.c#2 integrate .. //depot/projects/newisp/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/newisp/dev/mii/lxtphy.c#3 integrate .. //depot/projects/newisp/dev/mii/mii_physubr.c#3 integrate .. //depot/projects/newisp/dev/mii/miidevs#3 integrate .. //depot/projects/newisp/dev/mii/miivar.h#3 integrate .. //depot/projects/newisp/dev/mii/mlphy.c#2 integrate .. //depot/projects/newisp/dev/mii/nsgphy.c#3 integrate .. //depot/projects/newisp/dev/mii/nsphy.c#3 integrate .. //depot/projects/newisp/dev/mii/pnaphy.c#2 integrate .. //depot/projects/newisp/dev/mii/qsphy.c#3 integrate .. //depot/projects/newisp/dev/mii/rgephy.c#2 integrate .. //depot/projects/newisp/dev/mii/rlphy.c#3 integrate .. //depot/projects/newisp/dev/mii/tdkphy.c#2 integrate .. //depot/projects/newisp/dev/mii/tlphy.c#2 integrate .. //depot/projects/newisp/dev/mii/xmphy.c#2 integrate .. //depot/projects/newisp/dev/mpt/mpt.c#5 integrate .. //depot/projects/newisp/dev/mpt/mpt.h#7 integrate .. //depot/projects/newisp/dev/mpt/mpt_cam.c#17 integrate .. //depot/projects/newisp/dev/mpt/mpt_raid.c#5 integrate .. //depot/projects/newisp/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/newisp/dev/sound/pci/ich.c#3 integrate .. //depot/projects/newisp/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/newisp/fs/unionfs/union.h#2 integrate .. //depot/projects/newisp/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/newisp/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/newisp/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/newisp/geom/journal/g_journal.c#3 integrate .. //depot/projects/newisp/i386/isa/clock.c#3 integrate .. //depot/projects/newisp/kern/kern_thr.c#6 integrate .. //depot/projects/newisp/kern/kern_umtx.c#11 integrate .. //depot/projects/newisp/kern/subr_lock.c#3 integrate .. //depot/projects/newisp/kern/subr_rman.c#3 integrate .. //depot/projects/newisp/modules/Makefile#7 integrate .. //depot/projects/newisp/net/bridgestp.c#7 integrate .. //depot/projects/newisp/net/bridgestp.h#5 integrate .. //depot/projects/newisp/net/ethernet.h#3 integrate .. //depot/projects/newisp/net/if_atmsubr.c#3 integrate .. //depot/projects/newisp/net/if_bridge.c#9 integrate .. //depot/projects/newisp/net/if_bridgevar.h#5 integrate .. //depot/projects/newisp/net/if_llc.h#2 integrate .. //depot/projects/newisp/net80211/ieee80211.h#2 integrate .. //depot/projects/newisp/net80211/ieee80211_input.c#3 integrate .. //depot/projects/newisp/net80211/ieee80211_output.c#3 integrate .. //depot/projects/newisp/netgraph/ng_nat.c#3 integrate .. //depot/projects/newisp/netinet/igmp.c#3 integrate .. //depot/projects/newisp/netinet/ip_carp.h#2 integrate .. //depot/projects/newisp/netinet/libalias/alias.c#3 integrate .. //depot/projects/newisp/netinet/libalias/alias.h#3 integrate .. //depot/projects/newisp/pci/if_rl.c#3 integrate .. //depot/projects/newisp/pci/if_rlreg.h#3 integrate .. //depot/projects/newisp/powerpc/include/pmap.h#2 integrate .. //depot/projects/newisp/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/newisp/powerpc/powerpc/mmu_oea.c#4 integrate .. //depot/projects/newisp/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/newisp/powerpc/powerpc/uio_machdep.c#2 integrate .. //depot/projects/newisp/sun4v/conf/GENERIC#4 integrate .. //depot/projects/newisp/sun4v/include/tsb.h#3 integrate .. //depot/projects/newisp/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/newisp/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/newisp/sys/proc.h#5 integrate .. //depot/projects/newisp/sys/umtx.h#6 integrate Differences ... ==== //depot/projects/newisp/amd64/conf/GENERIC#6 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.469 2006/11/22 10:34:12 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.470 2006/12/03 21:02:09 netchild Exp $ cpu HAMMER ident GENERIC @@ -71,11 +71,6 @@ # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -# Linux 32-bit ABI support -options COMPAT_LINUX32 # Compatible with i386 linux binaries -options LINPROCFS -options LINSYSFS - # Bus support. device acpi device pci ==== //depot/projects/newisp/amd64/isa/clock.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.227 2006/10/02 18:23:36 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.228 2006/12/03 03:49:28 bde Exp $"); /* * Routines to handle clock hardware. @@ -115,6 +115,7 @@ static int (*i8254_pending)(struct intsrc *); static int i8254_ticked; static int using_lapic_timer; +static int rtc_reg = -1; static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR; @@ -421,24 +422,30 @@ u_char val; RTC_LOCK; - outb(IO_RTC, reg); - inb(0x84); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } val = inb(IO_RTC + 1); - inb(0x84); RTC_UNLOCK; return (val); } -static __inline void -writertc(u_char reg, u_char val) +static void +writertc(int reg, u_char val) { RTC_LOCK; - inb(0x84); - outb(IO_RTC, reg); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } + outb(IO_RTC + 1, val); inb(0x84); - outb(IO_RTC + 1, val); - inb(0x84); /* XXX work around wrong order in rtcin() */ RTC_UNLOCK; } ==== //depot/projects/newisp/amd64/linux32/linux32_sysvec.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.25 2006/10/31 17:53:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.26 2006/12/03 21:06:07 netchild Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1120,7 +1120,7 @@ printf("Could not deinstall ELF interpreter entry\n"); break; default: - break; + return EOPNOTSUPP; } return error; } ==== //depot/projects/newisp/arm/arm/cpufunc.c#5 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.14 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.15 2006/11/30 23:34:07 cognet Exp $"); #include #include @@ -1885,7 +1885,9 @@ xscale_setup(args) char *args; { +#ifndef CPU_XSCALE_CORE3 uint32_t auxctl; +#endif int cpuctrl, cpuctrlmask; /* @@ -1931,6 +1933,7 @@ /* cpu_control(cpuctrlmask, cpuctrl);*/ cpu_control(0xffffffff, cpuctrl); +#ifndef CPU_XSCALE_CORE3 /* Make sure write coalescing is turned on */ __asm __volatile("mrc p15, 0, %0, c1, c0, 1" : "=r" (auxctl)); @@ -1941,6 +1944,7 @@ #endif __asm __volatile("mcr p15, 0, %0, c1, c0, 1" : : "r" (auxctl)); +#endif } #endif /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 CPU_XSCALE_80219 */ ==== //depot/projects/newisp/arm/arm/pmap.c#4 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.73 2006/11/12 21:48:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.77 2006/12/04 12:55:00 cognet Exp $"); #include #include #include @@ -585,7 +585,7 @@ #endif /* ARM_MMU_SA1 == 1*/ #if ARM_MMU_XSCALE == 1 -#if (ARM_NMMUS > 1) +#if (ARM_NMMUS > 1) || defined (CPU_XSCALE_CORE3) static u_int xscale_use_minidata; #endif @@ -614,9 +614,11 @@ * is significantly faster than the traditional, write-through * behavior of this case. */ +#ifndef CPU_XSCALE_CORE3 pte_l1_s_cache_mode |= L1_S_XSCALE_TEX(TEX_XSCALE_X); pte_l2_l_cache_mode |= L2_XSCALE_L_TEX(TEX_XSCALE_X); pte_l2_s_cache_mode |= L2_XSCALE_T_TEX(TEX_XSCALE_X); +#endif #endif /* XSCALE_CACHE_READ_WRITE_ALLOCATE */ #ifdef XSCALE_CACHE_WRITE_THROUGH /* @@ -673,8 +675,16 @@ pte_l1_c_proto = L1_C_PROTO_xscale; pte_l2_s_proto = L2_S_PROTO_xscale; +#ifdef CPU_XSCALE_CORE3 + pmap_copy_page_func = pmap_copy_page_generic; + pmap_zero_page_func = pmap_zero_page_generic; + xscale_use_minidata = 0; + pte_l1_s_cache_mode_pt = pte_l2_l_cache_mode_pt = + pte_l2_s_cache_mode_pt = 0; +#else pmap_copy_page_func = pmap_copy_page_xscale; pmap_zero_page_func = pmap_zero_page_xscale; +#endif /* * Disable ECC protection of page table access, for now. @@ -2797,6 +2807,7 @@ if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); pmap_free_pv_entry(pv); + pmap_free_l2_bucket(pmap, l2b, 1); } vm_page_unlock_queues(); cpu_idcache_wbinv_all(); @@ -3136,6 +3147,7 @@ if (TAILQ_EMPTY(&m->md.pv_list)) return; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); curpm = vmspace_pmap(curproc->p_vmspace); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { if (flush == FALSE && (pv->pv_pmap == curpm || @@ -3437,7 +3449,8 @@ else if (!pve && !(m->flags & (PG_UNMANAGED | PG_FICTITIOUS))) pve = pmap_get_pv_entry(); - KASSERT(pve != NULL, ("No pv")); + KASSERT(pve != NULL || m->flags & (PG_UNMANAGED | + PG_FICTITIOUS), ("No pv")); oflags = pve->pv_flags; /* @@ -4005,7 +4018,7 @@ * StrongARM accesses to non-cached pages are non-burst making writing * _any_ bulk data very slow. */ -#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 +#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 || defined(CPU_XSCALE_CORE3) void pmap_zero_page_generic(vm_paddr_t phys, int off, int size) { @@ -4094,7 +4107,7 @@ pt_entry_t *ptep, *sptep, pte; vm_offset_t next_bucket, eva; -#if (ARM_NMMUS > 1) +#if (ARM_NMMUS > 1) || defined(CPU_XSCALE_CORE3) if (xscale_use_minidata == 0) return; #endif @@ -4267,7 +4280,7 @@ * hook points. The same comment regarding cachability as in * pmap_zero_page also applies here. */ -#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 +#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 || defined (CPU_XSCALE_CORE3) void pmap_copy_page_generic(vm_paddr_t src, vm_paddr_t dst) { @@ -4430,6 +4443,9 @@ int pmap_ts_referenced(vm_page_t m) { + + if (m->flags & PG_FICTITIOUS) + return (0); return (pmap_clearbit(m, PVF_REF)); } ==== //depot/projects/newisp/arm/include/cpuconf.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.9 2006/11/07 22:36:56 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.10 2006/11/30 23:30:40 cognet Exp $ * */ @@ -139,4 +139,7 @@ #define ARM_XSCALE_PMU 0 #endif +#if defined(CPU_XSCALE_81342) +#define CPU_XSCALE_CORE3 +#endif #endif /* _MACHINE_CPUCONF_H_ */ ==== //depot/projects/newisp/arm/xscale/i80321/i80321_space.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_space.c,v 1.6 2006/11/20 13:21:02 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_space.c,v 1.7 2006/12/02 13:37:29 cognet Exp $"); #include #include @@ -139,6 +139,42 @@ generic_armv4_bs_c_2, NULL, NULL, + + /* read (single) stream */ + generic_bs_r_1, + generic_armv4_bs_r_2, + generic_bs_r_4, + NULL, + + /* read multiple stream */ + generic_bs_rm_1, + generic_armv4_bs_rm_2, + generic_bs_rm_4, + NULL, + + /* read region stream */ + generic_bs_rr_1, + generic_armv4_bs_rr_2, + generic_bs_rr_4, + NULL, + + /* write (single) stream */ + generic_bs_w_1, + generic_armv4_bs_w_2, + generic_bs_w_4, + NULL, + + /* write multiple stream */ + generic_bs_wm_1, + generic_armv4_bs_wm_2, + generic_bs_wm_4, + NULL, + + /* write region stream */ + NULL, + generic_armv4_bs_wr_2, + generic_bs_wr_4, + NULL, }; void ==== //depot/projects/newisp/cam/cam_ccb.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.33 2006/11/02 00:54:32 mjacob Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.34 2006/12/03 07:19:28 mjacob Exp $ */ #ifndef _CAM_CAM_CCB_H ==== //depot/projects/newisp/cam/cam_xpt.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.168 2006/11/07 23:06:00 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.169 2006/12/04 23:04:13 mjacob Exp $"); #include #include ==== //depot/projects/newisp/cam/scsi/scsi_all.h#4 (text+ko) ==== @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.27 2006/11/03 05:42:15 njl Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.28 2006/12/04 23:04:13 mjacob Exp $ */ /* ==== //depot/projects/newisp/compat/linsysfs/linsysfs.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linsysfs/linsysfs.c,v 1.2 2006/05/11 15:27:58 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linsysfs/linsysfs.c,v 1.3 2006/12/03 21:00:31 netchild Exp $"); #include #include @@ -268,9 +268,10 @@ static int linsysfs_uninit(PFS_INIT_ARGS) { - struct scsi_host_queue *scsi_host; + struct scsi_host_queue *scsi_host, *scsi_host_tmp; - TAILQ_FOREACH(scsi_host, &scsi_host_q, scsi_host_next) { + TAILQ_FOREACH_SAFE(scsi_host, &scsi_host_q, scsi_host_next, + scsi_host_tmp) { TAILQ_REMOVE(&scsi_host_q, scsi_host, scsi_host_next); free(scsi_host->path, M_TEMP); free(scsi_host, M_TEMP); ==== //depot/projects/newisp/compat/linux/linux_misc.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.197 2006/11/18 14:37:54 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.199 2006/12/04 22:46:09 jkim Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -890,11 +890,34 @@ printf(ARGS(mknod, "%s, %d, %d"), path, args->mode, args->dev); #endif - if (S_ISFIFO(args->mode)) + switch (args->mode & S_IFMT) { + case S_IFIFO: + case S_IFSOCK: error = kern_mkfifo(td, path, UIO_SYSSPACE, args->mode); - else + break; + + case S_IFCHR: + case S_IFBLK: error = kern_mknod(td, path, UIO_SYSSPACE, args->mode, args->dev); + break; + + case S_IFDIR: + error = EPERM; + break; + + case 0: + args->mode |= S_IFREG; + /* fall through */ + case S_IFREG: + error = kern_open(td, path, UIO_SYSSPACE, + O_WRONLY | O_CREAT | O_TRUNC, args->mode); + break; + + default: + error = EINVAL; + break; + } LFREEPATH(path); return (error); } @@ -1588,7 +1611,7 @@ int linux_prctl(struct thread *td, struct linux_prctl_args *args) { - int error = 0; + int error = 0, max_size; struct proc *p = td->td_proc; char comm[LINUX_MAX_COMM_LEN]; struct linux_emuldata *em; @@ -1615,16 +1638,41 @@ EMUL_UNLOCK(&emul_lock); break; case LINUX_PR_SET_NAME: - comm[LINUX_MAX_COMM_LEN-1] = 0; - error = copyin(comm, (void *)(register_t) args->arg2, LINUX_MAX_COMM_LEN-1); + /* + * To be on the safe side we need to make sure to not + * overflow the size a linux program expects. We already + * do this here in the copyin, so that we don't need to + * check on copyout. + */ + max_size = MIN(sizeof(comm), sizeof(p->p_comm)); + error = copyinstr((void *)(register_t) args->arg2, comm, + max_size, NULL); + + /* Linux silently truncates the name if it is too long. */ + if (error == ENAMETOOLONG) { + /* + * XXX: copyinstr() isn't documented to populate the + * array completely, so do a copyin() to be on the + * safe side. This should be changed in case + * copyinstr() is changed to guarantee this. + */ + error = copyin((void *)(register_t)args->arg2, comm, + max_size - 1); + comm[max_size - 1] = '\0'; + } if (error) return (error); + PROC_LOCK(p); - strcpy(p->p_comm, comm); + strlcpy(p->p_comm, comm, sizeof(p->p_comm)); PROC_UNLOCK(p); break; case LINUX_PR_GET_NAME: - error = copyout(&p->p_comm, (void *)(register_t) args->arg2, MAXCOMLEN+1); + PROC_LOCK(p); + strlcpy(comm, p->p_comm, sizeof(comm)); + PROC_UNLOCK(p); + error = copyout(comm, (void *)(register_t) args->arg2, + strlen(comm)+1); break; default: error = EINVAL; ==== //depot/projects/newisp/compat/linux/linux_stats.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.85 2006/10/22 11:52:11 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.86 2006/12/04 22:38:52 jkim Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -100,23 +100,16 @@ translate_fd_major_minor(struct thread *td, int fd, struct stat *buf) { struct file *fp; - int error; int major, minor; - if ((error = fget(td, fd, &fp)) != 0) + if ((!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode)) || + fget(td, fd, &fp) != 0) return; - if (fp->f_vnode) { - if (fp->f_vnode->v_type == VCHR - || fp->f_vnode->v_type == VBLK) { - if (fp->f_vnode->v_un.vu_cdev) { - if (linux_driver_get_major_minor( - fp->f_vnode->v_un.vu_cdev->si_name, - &major, &minor) == 0) { - buf->st_rdev = (major << 8 | minor); - } - } - } - } + if (fp->f_vnode != NULL && + fp->f_vnode->v_un.vu_cdev != NULL && + linux_driver_get_major_minor(fp->f_vnode->v_un.vu_cdev->si_name, + &major, &minor) == 0) + buf->st_rdev = (major << 8 | minor); fdrop(fp, td); } @@ -129,6 +122,8 @@ int fd; int temp; + if (!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode)) + return; temp = td->td_retval[0]; if (kern_open(td, path, UIO_SYSSPACE, O_RDONLY, 0) != 0) return; @@ -179,18 +174,19 @@ #endif error = kern_stat(td, path, UIO_SYSSPACE, &buf); - if (!error && strlen(path) > strlen("/dev/pts/") && - !strncmp(path, "/dev/pts/", strlen("/dev/pts/")) - && path[9] >= '0' && path[9] <= '9') { - /* - * Linux checks major and minors of the slave device to make - * sure it's a pty device, so let's make him believe it is. - */ - buf.st_rdev = (136 << 8); - } - - translate_path_major_minor(td, path, &buf); - + if (!error) { + if (strlen(path) > strlen("/dev/pts/") && + !strncmp(path, "/dev/pts/", strlen("/dev/pts/")) && + path[9] >= '0' && path[9] <= '9') { + /* + * Linux checks major and minors of the slave device + * to make sure it's a pty device, so let's make him + * believe it is. + */ + buf.st_rdev = (136 << 8); + } else + translate_path_major_minor(td, path, &buf); + } LFREEPATH(path); if (error) return (error); @@ -212,7 +208,8 @@ #endif error = kern_lstat(td, path, UIO_SYSSPACE, &sb); - translate_path_major_minor(td, path, &sb); + if (!error) + translate_path_major_minor(td, path, &sb); LFREEPATH(path); if (error) return (error); @@ -524,18 +521,19 @@ #endif error = kern_stat(td, filename, UIO_SYSSPACE, &buf); - if (!error && strlen(filename) > strlen("/dev/pts/") && - !strncmp(filename, "/dev/pts/", strlen("/dev/pts/")) - && filename[9] >= '0' && filename[9] <= '9') { - /* - * Linux checks major and minors of the slave device to make - * sure it's a pty deivce, so let's make him believe it is. - */ - buf.st_rdev = (136 << 8); + if (!error) { + if (strlen(filename) > strlen("/dev/pts/") && + !strncmp(filename, "/dev/pts/", strlen("/dev/pts/")) && + filename[9] >= '0' && filename[9] <= '9') { + /* + * Linux checks major and minors of the slave device + * to make sure it's a pty deivce, so let's make him + * believe it is. + */ + buf.st_rdev = (136 << 8); + } else + translate_path_major_minor(td, filename, &buf); } - - translate_path_major_minor(td, filename, &buf); - LFREEPATH(filename); if (error) return (error); @@ -557,7 +555,8 @@ #endif error = kern_lstat(td, filename, UIO_SYSSPACE, &sb); - translate_path_major_minor(td, filename, &sb); + if (!error) + translate_path_major_minor(td, filename, &sb); LFREEPATH(filename); if (error) return (error); ==== //depot/projects/newisp/dev/ath/if_ath_pci.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.15 2006/06/07 20:37:14 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.16 2006/12/01 16:03:39 sam Exp $"); /* * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver. @@ -196,8 +196,8 @@ ATH_LOCK_INIT(sc); error = ath_attach(pci_get_device(dev), sc); - if (error == 0) - return error; + if (error == 0) /* success */ + return 0; ATH_LOCK_DESTROY(sc); bus_dma_tag_destroy(sc->sc_dmat); ==== //depot/projects/newisp/dev/bge/if_bge.c#12 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.152 2006/11/30 13:40:39 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.157 2006/12/04 22:12:21 jkim Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -281,36 +281,12 @@ { 0, NULL } }; -#define BGE_IS_5705_OR_BEYOND(sc) \ - ((sc)->bge_asicrev == BGE_ASICREV_BCM5705 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5750 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5714_A0 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5780 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5714 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5752 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5755 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5787) - -#define BGE_IS_575X_PLUS(sc) \ - ((sc)->bge_asicrev == BGE_ASICREV_BCM5750 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5714_A0 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5780 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5714 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5752 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5755 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5787) +#define BGE_IS_JUMBO_CAPABLE(sc) ((sc)->bge_flags & BGE_FLAG_JUMBO) +#define BGE_IS_5700_FAMILY(sc) ((sc)->bge_flags & BGE_FLAG_5700_FAMILY) +#define BGE_IS_5705_PLUS(sc) ((sc)->bge_flags & BGE_FLAG_5705_PLUS) +#define BGE_IS_5714_FAMILY(sc) ((sc)->bge_flags & BGE_FLAG_5714_FAMILY) +#define BGE_IS_575X_PLUS(sc) ((sc)->bge_flags & BGE_FLAG_575X_PLUS) -#define BGE_IS_5714_FAMILY(sc) \ - ((sc)->bge_asicrev == BGE_ASICREV_BCM5714_A0 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5780 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5714) - -#define BGE_IS_JUMBO_CAPABLE(sc) \ - ((sc)->bge_asicrev == BGE_ASICREV_BCM5700 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5701 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5703 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5704) - const struct bge_revision * bge_lookup_rev(uint32_t); const struct bge_vendor * bge_lookup_vendor(uint16_t); static int bge_probe(device_t); @@ -1229,23 +1205,13 @@ /* Note: the BCM5704 has a smaller mbuf space than other chips. */ - if (!(BGE_IS_5705_OR_BEYOND(sc))) { + if (!(BGE_IS_5705_PLUS(sc))) { /* Configure mbuf memory pool */ - if (sc->bge_flags & BGE_FLAG_EXTRAM) { - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR, - BGE_EXT_SSRAM); - if (sc->bge_asicrev == BGE_ASICREV_BCM5704) - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x10000); - else - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x18000); - } else { - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR, - BGE_BUFFPOOL_1); - if (sc->bge_asicrev == BGE_ASICREV_BCM5704) - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x10000); - else - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x18000); - } + CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR, BGE_BUFFPOOL_1); + if (sc->bge_asicrev == BGE_ASICREV_BCM5704) + CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x10000); + else + CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x18000); /* Configure DMA resource pool */ CSR_WRITE_4(sc, BGE_BMAN_DMA_DESCPOOL_BASEADDR, @@ -1254,7 +1220,7 @@ } /* Configure mbuf pool watermarks */ - if (!(BGE_IS_5705_OR_BEYOND(sc))) { + if (!(BGE_IS_5705_PLUS(sc))) { CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x0); CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x10); } else { @@ -1268,7 +1234,7 @@ CSR_WRITE_4(sc, BGE_BMAN_DMA_DESCPOOL_HIWAT, 10); /* Enable buffer manager */ - if (!(BGE_IS_5705_OR_BEYOND(sc))) { + if (!(BGE_IS_5705_PLUS(sc))) { CSR_WRITE_4(sc, BGE_BMAN_MODE, BGE_BMANMODE_ENABLE|BGE_BMANMODE_LOMBUF_ATTN); @@ -1310,15 +1276,12 @@ BGE_ADDR_HI(sc->bge_ldata.bge_rx_std_ring_paddr); bus_dmamap_sync(sc->bge_cdata.bge_rx_std_ring_tag, sc->bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_PREREAD); - if (BGE_IS_5705_OR_BEYOND(sc)) + if (BGE_IS_5705_PLUS(sc)) rcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(512, 0); else rcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(BGE_MAX_FRAMELEN, 0); - if (sc->bge_flags & BGE_FLAG_EXTRAM) - rcb->bge_nicaddr = BGE_EXT_STD_RX_RINGS; - else - rcb->bge_nicaddr = BGE_STD_RX_RINGS; + rcb->bge_nicaddr = BGE_STD_RX_RINGS; CSR_WRITE_4(sc, BGE_RX_STD_RCB_HADDR_HI, rcb->bge_hostaddr.bge_addr_hi); CSR_WRITE_4(sc, BGE_RX_STD_RCB_HADDR_LO, rcb->bge_hostaddr.bge_addr_lo); @@ -1344,10 +1307,7 @@ BUS_DMASYNC_PREREAD); rcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(0, BGE_RCB_FLAG_USE_EXT_RX_BD|BGE_RCB_FLAG_RING_DISABLED); - if (sc->bge_flags & BGE_FLAG_EXTRAM) - rcb->bge_nicaddr = BGE_EXT_JUMBO_RX_RINGS; - else - rcb->bge_nicaddr = BGE_JUMBO_RX_RINGS; + rcb->bge_nicaddr = BGE_JUMBO_RX_RINGS; CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_HADDR_HI, rcb->bge_hostaddr.bge_addr_hi); CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_HADDR_LO, @@ -1393,7 +1353,7 @@ RCB_WRITE_4(sc, vrcb, bge_hostaddr.bge_addr_lo, taddr.bge_addr_lo); RCB_WRITE_4(sc, vrcb, bge_nicaddr, BGE_NIC_TXRING_ADDR(0, BGE_TX_RING_CNT)); - if (!(BGE_IS_5705_OR_BEYOND(sc))) + if (!(BGE_IS_5705_PLUS(sc))) RCB_WRITE_4(sc, vrcb, bge_maxlen_flags, BGE_RCB_MAXLEN_FLAGS(BGE_TX_RING_CNT, 0)); @@ -1477,7 +1437,7 @@ CSR_WRITE_4(sc, BGE_HCC_TX_COAL_TICKS, sc->bge_tx_coal_ticks); CSR_WRITE_4(sc, BGE_HCC_RX_MAX_COAL_BDS, sc->bge_rx_max_coal_bds); CSR_WRITE_4(sc, BGE_HCC_TX_MAX_COAL_BDS, sc->bge_tx_max_coal_bds); - if (!(BGE_IS_5705_OR_BEYOND(sc))) { + if (!(BGE_IS_5705_PLUS(sc))) { CSR_WRITE_4(sc, BGE_HCC_RX_COAL_TICKS_INT, 0); CSR_WRITE_4(sc, BGE_HCC_TX_COAL_TICKS_INT, 0); } @@ -1485,7 +1445,7 @@ CSR_WRITE_4(sc, BGE_HCC_TX_MAX_COAL_BDS_INT, 0); /* Set up address of statistics block */ - if (!(BGE_IS_5705_OR_BEYOND(sc))) { + if (!(BGE_IS_5705_PLUS(sc))) { CSR_WRITE_4(sc, BGE_HCC_STATS_ADDR_HI, BGE_ADDR_HI(sc->bge_ldata.bge_stats_paddr)); CSR_WRITE_4(sc, BGE_HCC_STATS_ADDR_LO, @@ -1514,7 +1474,7 @@ CSR_WRITE_4(sc, BGE_RXLP_MODE, BGE_RXLPMODE_ENABLE); /* Turn on RX list selector state machine. */ - if (!(BGE_IS_5705_OR_BEYOND(sc))) + if (!(BGE_IS_5705_PLUS(sc))) CSR_WRITE_4(sc, BGE_RXLS_MODE, BGE_RXLSMODE_ENABLE); /* Turn on DMA, clear stats */ @@ -1537,7 +1497,7 @@ #endif /* Turn on DMA completion state machine */ - if (!(BGE_IS_5705_OR_BEYOND(sc))) + if (!(BGE_IS_5705_PLUS(sc))) CSR_WRITE_4(sc, BGE_DMAC_MODE, BGE_DMACMODE_ENABLE); /* Turn on write DMA state machine */ @@ -1558,7 +1518,7 @@ CSR_WRITE_4(sc, BGE_RDBDI_MODE, BGE_RDBDIMODE_ENABLE); /* Turn on Mbuf cluster free state machine */ - if (!(BGE_IS_5705_OR_BEYOND(sc))) + if (!(BGE_IS_5705_PLUS(sc))) CSR_WRITE_4(sc, BGE_MBCF_MODE, BGE_MBCFMODE_ENABLE); /* Turn on send BD completion state machine */ @@ -2156,11 +2116,38 @@ sc->bge_asicrev = BGE_ASICREV(sc->bge_chipid); sc->bge_chiprev = BGE_CHIPREV(sc->bge_chipid); + /* Save chipset family. */ + switch (sc->bge_asicrev) { + case BGE_ASICREV_BCM5700: + case BGE_ASICREV_BCM5701: + case BGE_ASICREV_BCM5703: + case BGE_ASICREV_BCM5704: + sc->bge_flags |= BGE_FLAG_5700_FAMILY | BGE_FLAG_JUMBO; + break; + + case BGE_ASICREV_BCM5714_A0: + case BGE_ASICREV_BCM5780: + case BGE_ASICREV_BCM5714: + sc->bge_flags |= BGE_FLAG_5714_FAMILY /* | BGE_FLAG_JUMBO */; + /* Fall through */ + + case BGE_ASICREV_BCM5750: + case BGE_ASICREV_BCM5752: + case BGE_ASICREV_BCM5755: + case BGE_ASICREV_BCM5787: + sc->bge_flags |= BGE_FLAG_575X_PLUS; + /* Fall through */ + + case BGE_ASICREV_BCM5705: + sc->bge_flags |= BGE_FLAG_5705_PLUS; + break; + } + /* * XXX: Broadcom Linux driver. Not in specs or eratta. * PCI-Express? */ - if (BGE_IS_5705_OR_BEYOND(sc)) { + if (BGE_IS_5705_PLUS(sc)) { uint32_t v; v = pci_read_config(dev, BGE_PCI_MSI_CAPID, 4); @@ -2240,7 +2227,7 @@ } /* 5705 limits RX return ring to 512 entries. */ - if (BGE_IS_5705_OR_BEYOND(sc)) + if (BGE_IS_5705_PLUS(sc)) sc->bge_return_ring_cnt = BGE_RETURN_RING_CNT_5705; else sc->bge_return_ring_cnt = BGE_RETURN_RING_CNT; @@ -2943,7 +2930,7 @@ BGE_LOCK_ASSERT(sc); - if (BGE_IS_5705_OR_BEYOND(sc)) + if (BGE_IS_5705_PLUS(sc)) bge_stats_update_regs(sc); else bge_stats_update(sc); @@ -2978,27 +2965,19 @@ static void bge_stats_update_regs(struct bge_softc *sc) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 5 07:57:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CD5116A412; Tue, 5 Dec 2006 07:57:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1238A16A407 for ; Tue, 5 Dec 2006 07:57:28 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D7F243CA6 for ; Tue, 5 Dec 2006 07:56:50 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB57vRWj092769 for ; Tue, 5 Dec 2006 07:57:27 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB57vQYt092766 for perforce@freebsd.org; Tue, 5 Dec 2006 07:57:26 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 5 Dec 2006 07:57:26 GMT Message-Id: <200612050757.kB57vQYt092766@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111127 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 07:57:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=111127 Change 111127 by mjacob@newisp on 2006/12/05 07:57:04 Messy IFC. Affected files ... .. //depot/projects/newisp/cam/cam_periph.c#3 integrate .. //depot/projects/newisp/cam/cam_xpt.c#14 integrate .. //depot/projects/newisp/cam/cam_xpt.h#2 integrate .. //depot/projects/newisp/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/newisp/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/newisp/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/newisp/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/newisp/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/newisp/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/newisp/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/newisp/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/newisp/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/newisp/dev/isp/isp.c#41 integrate .. //depot/projects/newisp/dev/isp/isp_freebsd.c#32 integrate .. //depot/projects/newisp/dev/isp/isp_stds.h#8 integrate .. //depot/projects/newisp/dev/isp/isp_target.c#13 integrate .. //depot/projects/newisp/dev/isp/ispvar.h#20 integrate .. //depot/projects/newisp/dev/mpt/mpt_cam.c#18 integrate .. //depot/projects/newisp/sun4v/sun4v/hcall.S#4 integrate Differences ... ==== //depot/projects/newisp/cam/cam_periph.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.63 2006/10/01 20:23:50 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.64 2006/12/05 07:45:27 mjacob Exp $"); #include #include @@ -334,12 +334,12 @@ if (periph != NULL && periph->unit_number == newunit) { if (wired != 0) { - xpt_print_path(periph->path); - printf("Duplicate Wired Device entry!\n"); - xpt_print_path(periph->path); - printf("Second device (%s device at scbus%d " - "target %d lun %d) will not be wired\n", - periph_name, pathid, target, lun); + xpt_print(periph->path, "Duplicate Wired " + "Device entry!\n"); + xpt_print(periph->path, "Second device (%s " + "device at scbus%d target %d lun %d) will " + "not be wired\n", periph_name, pathid, + target, lun); wired = 0; } continue; @@ -995,8 +995,8 @@ saved_ccb->ccb_h.status |= CAM_AUTOSNS_VALID; #if 0 - xpt_print_path(saved_ccb->ccb_h.path); - printf("Recovered Sense\n"); + xpt_print(saved_ccb->ccb_h.path, + "Recovered Sense\n"); scsi_sense_print(&saved_ccb->csio); cam_error_print(saved_ccb, CAM_ESF_ALL, CAM_EPF_ALL); @@ -1287,8 +1287,7 @@ *timeout = 0; error = ERESTART; if (bootverbose) { - xpt_print_path(ccb->ccb_h.path); - printf("Queue Full\n"); + xpt_print(ccb->ccb_h.path, "Queue Full\n"); } break; } @@ -1300,8 +1299,7 @@ * command completes or a 1 second timeout. */ if (bootverbose) { - xpt_print_path(ccb->ccb_h.path); - printf("Device Busy\n"); + xpt_print(ccb->ccb_h.path, "Device Busy\n"); } if (ccb->ccb_h.retry_count > 0) { ccb->ccb_h.retry_count--; @@ -1314,13 +1312,12 @@ } break; case SCSI_STATUS_RESERV_CONFLICT: - xpt_print_path(ccb->ccb_h.path); - printf("Reservation Conflict\n"); + xpt_print(ccb->ccb_h.path, "Reservation Conflict\n"); error = EIO; break; default: - xpt_print_path(ccb->ccb_h.path); - printf("SCSI Status 0x%x\n", ccb->csio.scsi_status); + xpt_print(ccb->ccb_h.path, "SCSI Status 0x%x\n", + ccb->csio.scsi_status); error = EIO; break; } @@ -1574,42 +1571,38 @@ &timeout); break; case CAM_AUTOSENSE_FAIL: - xpt_print_path(ccb->ccb_h.path); - printf("AutoSense Failed\n"); + xpt_print(ccb->ccb_h.path, "AutoSense Failed\n"); error = EIO; /* we have to kill the command */ break; case CAM_REQ_CMP_ERR: if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Request completed with CAM_REQ_CMP_ERR\n"); + xpt_print(ccb->ccb_h.path, + "Request completed with CAM_REQ_CMP_ERR\n"); printed++; } /* FALLTHROUGH */ case CAM_CMD_TIMEOUT: if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Command timed out\n"); + xpt_print(ccb->ccb_h.path, "Command timed out\n"); printed++; } /* FALLTHROUGH */ case CAM_UNEXP_BUSFREE: if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Unexpected Bus Free\n"); + xpt_print(ccb->ccb_h.path, "Unexpected Bus Free\n"); printed++; } /* FALLTHROUGH */ case CAM_UNCOR_PARITY: if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Uncorrected Parity Error\n"); + xpt_print(ccb->ccb_h.path, + "Uncorrected Parity Error\n"); printed++; } /* FALLTHROUGH */ case CAM_DATA_RUN_ERR: if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Data Overrun\n"); + xpt_print(ccb->ccb_h.path, "Data Overrun\n"); printed++; } error = EIO; /* we have to kill the command */ @@ -1638,8 +1631,8 @@ ccb->ccb_h.retry_count--; error = ERESTART; if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Selection Timeout\n"); + xpt_print(ccb->ccb_h.path, + "Selection Timeout\n"); printed++; } @@ -1701,8 +1694,7 @@ /* Unconditional requeue */ error = ERESTART; if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Request Requeued\n"); + xpt_print(ccb->ccb_h.path, "Request Requeued\n"); printed++; } break; @@ -1723,8 +1715,8 @@ ccb->ccb_h.retry_count--; error = ERESTART; if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("CAM Status 0x%x\n", status); + xpt_print(ccb->ccb_h.path, "CAM Status 0x%x\n", + status); printed++; } } else { @@ -1763,11 +1755,9 @@ if (action_string == NULL) action_string = "Unretryable Error"; if (error != ERESTART) { - xpt_print_path(ccb->ccb_h.path); - printf("error %d\n", error); + xpt_print(ccb->ccb_h.path, "error %d\n", error); } - xpt_print_path(ccb->ccb_h.path); - printf("%s\n", action_string); + xpt_print(ccb->ccb_h.path, "%s\n", action_string); } return (error); ==== //depot/projects/newisp/cam/cam_xpt.c#14 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.169 2006/12/04 23:04:13 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.170 2006/12/05 07:45:27 mjacob Exp $"); #include #include @@ -63,6 +63,7 @@ #include #include #include +#include /* for xpt_print below */ #include "opt_cam.h" /* Datastructures internal to the xpt layer */ @@ -3407,10 +3408,9 @@ crs->openings); if (bootverbose) { - xpt_print_path(crs->ccb_h.path); - printf("tagged openings " - "now %d\n", - crs->openings); + xpt_print(crs->ccb_h.path, + "tagged openings now %d\n", + crs->openings); } } } @@ -3513,8 +3513,8 @@ cam_dflags = CAM_DEBUG_NONE; } else { start_ccb->ccb_h.status = CAM_REQ_CMP; - xpt_print_path(cam_dpath); - printf("debugging flags now %x\n", cam_dflags); + xpt_print(cam_dpath, "debugging flags now %x\n", + cam_dflags); } } else { cam_dpath = NULL; @@ -4160,6 +4160,16 @@ } } +void +xpt_print(struct cam_path *path, const char *fmt, ...) +{ + va_list ap; + xpt_print_path(path); + va_start(ap, fmt); + vprintf(fmt, ap); + va_end(ap); +} + int xpt_path_string(struct cam_path *path, char *str, size_t str_len) { @@ -5529,16 +5539,14 @@ if (request_ccb == NULL) { request_ccb = malloc(sizeof(union ccb), M_TEMP, M_NOWAIT); if (request_ccb == NULL) { - xpt_print_path(path); - printf("xpt_scan_lun: can't allocate CCB, can't " - "continue\n"); + xpt_print(path, "xpt_scan_lun: can't allocate CCB, " + "can't continue\n"); return; } new_path = malloc(sizeof(*new_path), M_TEMP, M_NOWAIT); if (new_path == NULL) { - xpt_print_path(path); - printf("xpt_scan_lun: can't allocate path, can't " - "continue\n"); + xpt_print(path, "xpt_scan_lun: can't allocate path, " + "can't continue\n"); free(request_ccb, M_TEMP); return; } @@ -5548,9 +5556,8 @@ path->device->lun_id); if (status != CAM_REQ_CMP) { - xpt_print_path(path); - printf("xpt_scan_lun: can't compile path, can't " - "continue\n"); + xpt_print(path, "xpt_scan_lun: can't compile path, " + "can't continue\n"); free(request_ccb, M_TEMP); free(new_path, M_TEMP); return; @@ -5576,9 +5583,8 @@ request_ccb); if (status != CAM_REQ_CMP) { - xpt_print_path(path); - printf("xpt_scan_lun: cam_alloc_periph returned an " - "error, can't continue probe\n"); + xpt_print(path, "xpt_scan_lun: cam_alloc_periph " + "returned an error, can't continue probe\n"); request_ccb->ccb_h.status = status; xpt_done(request_ccb); } @@ -5763,8 +5769,8 @@ inq_buf = malloc(inquiry_len, M_TEMP, M_NOWAIT); } if (inq_buf == NULL) { - xpt_print_path(periph->path); - printf("malloc failure- skipping Basic Domain Validation\n"); + xpt_print(periph->path, "malloc failure- skipping Basic" + "Domain Validation\n"); softc->action = PROBE_DV_EXIT; scsi_test_unit_ready(csio, /*retries*/4, @@ -5809,8 +5815,8 @@ /*timeout*/60000); break; } - xpt_print_path(periph->path); - printf("Unable to mode sense control page - malloc failure\n"); + xpt_print(periph->path, "Unable to mode sense control page - " + "malloc failure\n"); softc->action = PROBE_SERIAL_NUM; } /* FALLTHROUGH */ @@ -5887,15 +5893,14 @@ xpt_action((union ccb *)&cts); if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { if (bootverbose) { - xpt_print_path(periph->path); - printf("failed to get current settings\n"); + xpt_print(periph->path, + "failed to get current device settings\n"); } return (0); } if (cts.transport != XPORT_SPI) { if (bootverbose) { - xpt_print_path(periph->path); - printf("not SPI transport\n"); + xpt_print(periph->path, "not SPI transport\n"); } return (0); } @@ -5906,8 +5911,7 @@ */ if ((spi->valid & CTS_SPI_VALID_SYNC_RATE) == 0) { if (bootverbose) { - xpt_print_path(periph->path); - printf("no sync rate known\n"); + xpt_print(periph->path, "no sync rate known\n"); } return (0); } @@ -5925,8 +5929,7 @@ if ((spi->valid & CTS_SPI_VALID_SYNC_OFFSET) == 0 || spi->sync_offset == 0 || spi->sync_period == 0) { if (bootverbose) { - xpt_print_path(periph->path); - printf("no sync rate available\n"); + xpt_print(periph->path, "no sync rate available\n"); } return (0); } @@ -6285,8 +6288,8 @@ csio = &done_ccb->csio; nbuf = (struct scsi_inquiry_data *)csio->data_ptr; if (bcmp(nbuf, &path->device->inq_data, SHORT_INQUIRY_LENGTH)) { - xpt_print_path(path); - printf("inquiry fails comparison at DV%d step\n", + xpt_print(path, + "inquiry data fails comparison at DV%d step\n", softc->action == PROBE_INQUIRY_BASIC_DV1? 1 : 2); if (proberequestbackoff(periph, path->device)) { path->device->flags &= ~CAM_DEV_IN_DV; @@ -6484,17 +6487,16 @@ cts->protocol_version = device->protocol_version; if (cts->protocol != device->protocol) { - xpt_print_path(cts->ccb_h.path); - printf("Uninitialized Protocol %x:%x?\n", + xpt_print(cts->ccb_h.path, "Uninitialized Protocol %x:%x?\n", cts->protocol, device->protocol); cts->protocol = device->protocol; } if (cts->protocol_version > device->protocol_version) { if (bootverbose) { - xpt_print_path(cts->ccb_h.path); - printf("Down reving Protocol Version from %d to %d?\n", - cts->protocol_version, device->protocol_version); + xpt_print(cts->ccb_h.path, "Down reving Protocol " + "Version from %d to %d?\n", cts->protocol_version, + device->protocol_version); } cts->protocol_version = device->protocol_version; } @@ -6510,18 +6512,16 @@ cts->transport_version = device->transport_version; if (cts->transport != device->transport) { - xpt_print_path(cts->ccb_h.path); - printf("Uninitialized Transport %x:%x?\n", - cts->transport, device->transport); + xpt_print(cts->ccb_h.path, "Uninitialized Transport %x:%x?\n", + cts->transport, device->transport); cts->transport = device->transport; } if (cts->transport_version > device->transport_version) { if (bootverbose) { - xpt_print_path(cts->ccb_h.path); - printf("Down reving Transport Version from %d to %d?\n", - cts->transport_version, - device->transport_version); + xpt_print(cts->ccb_h.path, "Down reving Transport " + "Version from %d to %d?\n", cts->transport_version, + device->transport_version); } cts->transport_version = device->transport_version; } ==== //depot/projects/newisp/cam/cam_xpt.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.5 2005/01/05 22:34:34 imp Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.6 2006/12/05 07:45:27 mjacob Exp $ */ #ifndef _CAM_CAM_XPT_H @@ -62,6 +62,7 @@ int xpt_path_comp(struct cam_path *path1, struct cam_path *path2); void xpt_print_path(struct cam_path *path); +void xpt_print(struct cam_path *path, const char *fmt, ...); int xpt_path_string(struct cam_path *path, char *str, size_t str_len); path_id_t xpt_path_path_id(struct cam_path *path); ==== //depot/projects/newisp/cam/scsi/scsi_cd.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.96 2006/07/14 13:58:32 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.97 2006/12/05 07:45:27 mjacob Exp $"); #include "opt_cd.h" @@ -408,8 +408,7 @@ camq_remove(&softc->changer->devq, softc->pinfo.index); disk_gone(softc->disk); - xpt_print_path(periph->path); - printf("lost device\n"); + xpt_print(periph->path, "lost device\n"); } static void @@ -420,13 +419,11 @@ softc = (struct cd_softc *)periph->softc; - xpt_print_path(periph->path); - printf("removing device entry\n"); + xpt_print(periph->path, "removing device entry\n"); if ((softc->flags & CD_FLAG_SCTX_INIT) != 0 && sysctl_ctx_free(&softc->sysctl_ctx) != 0) { - xpt_print_path(periph->path); - printf("can't remove sysctl context\n"); + xpt_print(periph->path, "can't remove sysctl context\n"); } s = splsoftcam(); @@ -494,8 +491,7 @@ STAILQ_REMOVE(&changerq, softc->changer, cdchanger, changer_links); - xpt_print_path(periph->path); - printf("removing changer entry\n"); + xpt_print(periph->path, "removing changer entry\n"); free(softc->changer, M_DEVBUF); num_changers--; } @@ -1568,8 +1564,8 @@ M_TEMP, M_NOWAIT); if (rcap == NULL) { - xpt_print_path(periph->path); - printf("cdstart: Couldn't malloc read_capacity data\n"); + xpt_print(periph->path, + "cdstart: Couldn't malloc read_capacity data\n"); /* cd_free_periph??? */ break; } @@ -1631,8 +1627,8 @@ if (error != 0) { int s; - xpt_print_path(periph->path); - printf("cddone: got error %#x back\n", error); + xpt_print(periph->path, + "cddone: got error %#x back\n", error); s = splbio(); bioq_flush(&softc->bio_queue, NULL, EIO); splx(s); @@ -1813,14 +1809,12 @@ scsi_sense_print( &done_ccb->csio); else { - xpt_print_path(periph->path); - printf("got CAM status %#x\n", - done_ccb->ccb_h.status); + xpt_print(periph->path, + "got CAM status %#x\n", + done_ccb->ccb_h.status); } - xpt_print_path(periph->path); - printf("fatal error, failed" - " to attach to device\n"); - + xpt_print(periph->path, "fatal error, " + "failed to attach to device\n"); /* * Invalidate this peripheral. */ @@ -2955,16 +2949,16 @@ * cdsetmode()! */ if (found == 0) { - xpt_print_path(periph->path); - printf("mode buffer not found in mode queue!\n"); + xpt_print(periph->path, + "mode buffer not found in mode queue!\n"); return (0); } params->cdb_size = 10; softc->minimum_command_size = 10; - xpt_print_path(ccb->ccb_h.path); - printf("%s(6) failed, increasing minimum CDB size to 10 bytes\n", - (cdb[0] == MODE_SENSE_6) ? "MODE_SENSE" : "MODE_SELECT"); + xpt_print(ccb->ccb_h.path, + "%s(6) failed, increasing minimum CDB size to 10 bytes\n", + (cdb[0] == MODE_SENSE_6) ? "MODE_SENSE" : "MODE_SELECT"); if (cdb[0] == MODE_SENSE_6) { struct scsi_mode_sense_10 ms10; @@ -3296,10 +3290,9 @@ * the data length incorrectly. */ if (data_len > data->alloc_len) { - xpt_print_path(periph->path); - printf("allocated modepage %d length %d < returned " - "length %d\n", page, data->alloc_len, data_len); - + xpt_print(periph->path, "allocated modepage %d length " + "%d < returned length %d\n", page, data->alloc_len, + data_len); error = ENOSPC; } } @@ -3757,9 +3750,8 @@ goto bailout; if (ccb->csio.resid != 0) { - xpt_print_path(periph->path); - printf("warning, residual for report key command is %d\n", - ccb->csio.resid); + xpt_print(periph->path, "warning, residual for report key " + "command is %d\n", ccb->csio.resid); } switch(authinfo->format) { ==== //depot/projects/newisp/cam/scsi/scsi_ch.c#2 (text+ko) ==== @@ -68,7 +68,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.42 2005/03/26 04:21:11 ken Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.43 2006/12/05 07:45:28 mjacob Exp $"); #include #include @@ -273,8 +273,7 @@ softc->flags |= CH_FLAG_INVALID; - xpt_print_path(periph->path); - printf("lost device\n"); + xpt_print(periph->path, "lost device\n"); } @@ -287,8 +286,7 @@ devstat_remove_entry(softc->device_stats); destroy_dev(softc->dev); - xpt_print_path(periph->path); - printf("removing device entry\n"); + xpt_print(periph->path, "removing device entry\n"); free(softc, M_DEVBUF); } @@ -647,13 +645,12 @@ == CAM_SCSI_STATUS_ERROR) scsi_sense_print(&done_ccb->csio); else { - xpt_print_path(periph->path); - printf("got CAM status %#x\n", - done_ccb->ccb_h.status); + xpt_print(periph->path, + "got CAM status %#x\n", + done_ccb->ccb_h.status); } - xpt_print_path(periph->path); - printf("fatal error, failed to attach to" - " device\n"); + xpt_print(periph->path, "fatal error, failed " + "to attach to device\n"); cam_periph_invalidate(periph); @@ -1162,8 +1159,8 @@ avail = scsi_2btoul(st_hdr->count); if (avail != cesr->cesr_element_count) { - xpt_print_path(periph->path); - printf("warning, READ ELEMENT STATUS avail != count\n"); + xpt_print(periph->path, + "warning, READ ELEMENT STATUS avail != count\n"); } user_data = (struct changer_element_status *) @@ -1403,9 +1400,9 @@ } if (error) { - xpt_print_path(periph->path); - printf("chgetparams: error getting element " - "address page\n"); + xpt_print(periph->path, + "chgetparams: error getting element " + "address page\n"); xpt_release_ccb(ccb); free(mode_buffer, M_TEMP); return(error); @@ -1466,9 +1463,9 @@ } if (error) { - xpt_print_path(periph->path); - printf("chgetparams: error getting device " - "capabilities page\n"); + xpt_print(periph->path, + "chgetparams: error getting device " + "capabilities page\n"); xpt_release_ccb(ccb); free(mode_buffer, M_TEMP); return(error); ==== //depot/projects/newisp/cam/scsi/scsi_da.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.199 2006/11/26 17:18:31 maxim Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.200 2006/12/05 07:45:28 mjacob Exp $"); #include @@ -654,11 +654,10 @@ if (sense_key != SSD_KEY_ILLEGAL_REQUEST) scsi_sense_print(&ccb->csio); } else { - xpt_print_path(periph->path); - printf("Synchronize cache failed, status " - "== 0x%x, scsi status == 0x%x\n", - ccb->csio.ccb_h.status, - ccb->csio.scsi_status); + xpt_print(periph->path, "Synchronize cache " + "failed, status == 0x%x, scsi status == " + "0x%x\n", ccb->csio.ccb_h.status, + ccb->csio.scsi_status); } } @@ -826,10 +825,10 @@ if (sense_key != SSD_KEY_ILLEGAL_REQUEST) scsi_sense_print(&csio); } else { - xpt_print_path(periph->path); - printf("Synchronize cache failed, status " - "== 0x%x, scsi status == 0x%x\n", - csio.ccb_h.status, csio.scsi_status); + xpt_print(periph->path, "Synchronize cache " + "failed, status == 0x%x, scsi status == " + "0x%x\n", csio.ccb_h.status, + csio.scsi_status); } } } @@ -923,8 +922,7 @@ SLIST_REMOVE(&softc_list, softc, da_softc, links); disk_gone(softc->disk); - xpt_print_path(periph->path); - printf("lost device\n"); + xpt_print(periph->path, "lost device\n"); } static void @@ -934,15 +932,13 @@ softc = (struct da_softc *)periph->softc; - xpt_print_path(periph->path); - printf("removing device entry\n"); + xpt_print(periph->path, "removing device entry\n"); /* * If we can't free the sysctl tree, oh well... */ if ((softc->flags & DA_FLAG_SCTX_INIT) != 0 && sysctl_ctx_free(&softc->sysctl_ctx) != 0) { - xpt_print_path(periph->path); - printf("can't remove sysctl context\n"); + xpt_print(periph->path, "can't remove sysctl context\n"); } disk_destroy(softc->disk); free(softc, M_DEVBUF); @@ -1401,9 +1397,8 @@ (*cdb != READ_6 && *cdb != WRITE_6)) return 0; - xpt_print_path(ccb->ccb_h.path); - printf("READ(6)/WRITE(6) not supported, " - "increasing minimum_cmd_size to 10.\n"); + xpt_print(ccb->ccb_h.path, "READ(6)/WRITE(6) not supported, " + "increasing minimum_cmd_size to 10.\n"); softc = (struct da_softc *)xpt_path_periph(ccb->ccb_h.path)->softc; softc->minimum_cmd_size = 10; @@ -1473,11 +1468,12 @@ * Catastrophic error. Mark our pack as * invalid. */ - /* XXX See if this is really a media - * change first. + /* + * XXX See if this is really a media + * XXX change first? */ - xpt_print_path(periph->path); - printf("Invalidating pack\n"); + xpt_print(periph->path, + "Invalidating pack\n"); softc->flags |= DA_FLAG_PACK_INVALID; } @@ -1575,9 +1571,9 @@ * here. */ if (block_size >= MAXPHYS || block_size == 0) { - xpt_print_path(periph->path); - printf("unsupportable block size %ju\n", - (uintmax_t) block_size); + xpt_print(periph->path, + "unsupportable block size %ju\n", + (uintmax_t) block_size); announce_buf[0] = '\0'; cam_periph_invalidate(periph); } else { @@ -1672,14 +1668,13 @@ scsi_sense_print( &done_ccb->csio); else { - xpt_print_path(periph->path); - printf("got CAM status %#x\n", - done_ccb->ccb_h.status); + xpt_print(periph->path, + "got CAM status %#x\n", + done_ccb->ccb_h.status); } - xpt_print_path(periph->path); - printf("fatal error, failed" - " to attach to device\n"); + xpt_print(periph->path, "fatal error, " + "failed to attach to device\n"); /* * Free up resources. @@ -2024,10 +2019,10 @@ if (sense_key != SSD_KEY_ILLEGAL_REQUEST) scsi_sense_print(&ccb.csio); } else { - xpt_print_path(periph->path); - printf("Synchronize cache failed, status " - "== 0x%x, scsi status == 0x%x\n", - ccb.ccb_h.status, ccb.csio.scsi_status); + xpt_print(periph->path, "Synchronize " + "cache failed, status == 0x%x, scsi status " + "== 0x%x\n", ccb.ccb_h.status, + ccb.csio.scsi_status); } } ==== //depot/projects/newisp/cam/scsi/scsi_pass.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.44 2006/08/14 19:29:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.45 2006/12/05 07:45:28 mjacob Exp $"); #include #include @@ -174,8 +174,7 @@ */ if (bootverbose) { - xpt_print_path(periph->path); - printf("lost device\n"); + xpt_print(periph->path, "lost device\n"); } } @@ -192,8 +191,7 @@ destroy_dev(softc->dev); if (bootverbose) { - xpt_print_path(periph->path); - printf("removing device entry\n"); + xpt_print(periph->path, "removing device entry\n"); } free(softc, M_DEVBUF); } @@ -360,8 +358,7 @@ * We don't allow nonblocking access. */ if ((flags & O_NONBLOCK) != 0) { - xpt_print_path(periph->path); - printf("can't do nonblocking access\n"); + xpt_print(periph->path, "can't do nonblocking access\n"); splx(s); return(EINVAL); } @@ -476,9 +473,9 @@ * through the transport layer device. */ if (inccb->ccb_h.func_code & XPT_FC_XPT_ONLY) { - xpt_print_path(periph->path); - printf("CCB function code %#x is restricted to the " - "XPT device\n", inccb->ccb_h.func_code); + xpt_print(periph->path, "CCB function code %#x is " + "restricted to the XPT device\n", + inccb->ccb_h.func_code); error = ENODEV; break; } @@ -504,8 +501,7 @@ } if (ccb == NULL) { - xpt_print_path(periph->path); - printf("unable to allocate CCB\n"); + xpt_print(periph->path, "unable to allocate CCB\n"); error = ENOMEM; break; } ==== //depot/projects/newisp/cam/scsi/scsi_pt.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.43 2005/01/05 22:34:34 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.44 2006/12/05 07:45:28 mjacob Exp $"); #include #include @@ -387,8 +387,7 @@ splx(s); - xpt_print_path(periph->path); - printf("lost device\n"); + xpt_print(periph->path, "lost device\n"); } static void @@ -402,8 +401,7 @@ destroy_dev(softc->dev); - xpt_print_path(periph->path); - printf("removing device entry\n"); + xpt_print(periph->path, "removing device entry\n"); free(softc, M_DEVBUF); } @@ -577,8 +575,8 @@ * Catastrophic error. Mark our device * as invalid. */ - xpt_print_path(periph->path); - printf("Invalidating device\n"); + xpt_print(periph->path, + "Invalidating device\n"); softc->flags |= PT_FLAG_DEVICE_INVALID; } ==== //depot/projects/newisp/cam/scsi/scsi_sa.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.106 2006/01/14 14:32:41 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.107 2006/12/05 07:45:28 mjacob Exp $"); #include #include @@ -566,8 +566,8 @@ */ error = sacheckeod(periph); if (error) { - xpt_print_path(periph->path); - printf("failed to write terminating filemark(s)\n"); + xpt_print(periph->path, + "failed to write terminating filemark(s)\n"); softc->flags |= SA_FLAG_TAPE_FROZEN; } @@ -622,19 +622,18 @@ if (error == 0 && writing && (softc->quirks & SA_QUIRK_2FM)) { tmp = saspace(periph, -1, SS_FILEMARKS); if (tmp) { - xpt_print_path(periph->path); - printf("unable to backspace over one of double" - " filemarks at end of tape\n"); - xpt_print_path(periph->path); - printf("it is possible that this device" - " needs a SA_QUIRK_1FM quirk set for it\n"); + xpt_print(periph->path, "unable to backspace " + "over one of double filemarks at end of " + "tape\n"); + xpt_print(periph->path, "it is possible that " + "this device needs a SA_QUIRK_1FM quirk set" + "for it\n"); softc->flags |= SA_FLAG_TAPE_FROZEN; } } break; default: - xpt_print_path(periph->path); - panic("unknown mode 0x%x in saclose", mode); + xpt_print(periph->path, "unknown mode 0x%x in saclose\n", mode); /* NOTREACHED */ break; } @@ -654,9 +653,8 @@ * Inform users if tape state if frozen.... */ if (softc->flags & SA_FLAG_TAPE_FROZEN) { - xpt_print_path(periph->path); - printf("tape is now frozen- use an OFFLINE, REWIND or MTEOM " - "command to clear this state.\n"); + xpt_print(periph->path, "tape is now frozen- use an OFFLINE, " + "REWIND or MTEOM command to clear this state.\n"); } /* release the device if it is no longer mounted */ @@ -749,10 +747,9 @@ ((bp->bio_bcount & softc->blk_mask) != 0)) || ((softc->blk_mask == ~0) && ((bp->bio_bcount % softc->min_blk) != 0))) { - xpt_print_path(periph->path); - printf("Invalid request. Fixed block device " - "requests must be a multiple " - "of %d bytes\n", softc->min_blk); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 5 09:31:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C77316A407; Tue, 5 Dec 2006 09:31:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 15B5E16A416 for ; Tue, 5 Dec 2006 09:31:26 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6B3A43CA2 for ; Tue, 5 Dec 2006 09:30:47 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB59VP4U018563 for ; Tue, 5 Dec 2006 09:31:25 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB59VPM1018548 for perforce@freebsd.org; Tue, 5 Dec 2006 09:31:25 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 5 Dec 2006 09:31:25 GMT Message-Id: <200612050931.kB59VPM1018548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 111129 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 09:31:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=111129 Change 111129 by gonzo@gonzo_hq on 2006/12/05 09:31:25 o We should preserve S0..S7 registers in trap as well. These resgisters should not be changed during function call. It's OK to leave them alone in all kinds of exceptions but syscall. fork(2) call modifies them and child process gets wrong values after return. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/frame.h#4 edit .. //depot/projects/mips2/src/sys/mips/mips/exception.S#17 edit .. //depot/projects/mips2/src/sys/mips/mips/genassym.c#5 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/frame.h#4 (text+ko) ==== @@ -59,15 +59,24 @@ #define TF_T8 15 #define TF_T9 16 -#define TF_RA 17 -#define TF_SR 18 -#define TF_MULLO 19 -#define TF_MULHI 20 -#define TF_EPC 21 /* may be changed by trap() call */ +#define TF_S0 17 +#define TF_S1 18 +#define TF_S2 19 +#define TF_S3 20 +#define TF_S4 21 +#define TF_S5 22 +#define TF_S6 23 +#define TF_S7 24 + +#define TF_RA 25 +#define TF_SR 26 +#define TF_MULLO 27 +#define TF_MULHI 28 +#define TF_EPC 29 /* may be changed by trap() call */ -#define TF_SP 22 +#define TF_SP 30 -#define TF_NREGS 23 +#define TF_NREGS 31 /* Needs to be 8-byte aligned */ struct trapframe { ==== //depot/projects/mips2/src/sys/mips/mips/exception.S#17 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#16 $ + * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#17 $ */ /* $NetBSD: mipsX_subr.S,v 1.19 2005/12/11 12:18:09 christos Exp $ */ @@ -776,6 +776,17 @@ lw t1, TF_REG_T1(k1) lw t0, TF_REG_T0(k1) + lw s0, TF_REG_S0(k1) + lw s1, TF_REG_S1(k1) + lw s2, TF_REG_S2(k1) + lw s3, TF_REG_S3(k1) + lw s4, TF_REG_S4(k1) + lw s5, TF_REG_S5(k1) + lw s6, TF_REG_S6(k1) + lw s7, TF_REG_S7(k1) + + + /* * Brief interlude. */ @@ -841,8 +852,14 @@ sw a2, TF_REG_A2(k1) sw a3, TF_REG_A3(k1) - - + sw s0, TF_REG_S0(k1) + sw s1, TF_REG_S1(k1) + sw s2, TF_REG_S2(k1) + sw s3, TF_REG_S3(k1) + sw s4, TF_REG_S4(k1) + sw s5, TF_REG_S5(k1) + sw s6, TF_REG_S6(k1) + sw s7, TF_REG_S7(k1) /* * Brief interlude. ==== //depot/projects/mips2/src/sys/mips/mips/genassym.c#5 (text+ko) ==== @@ -157,6 +157,16 @@ ASSYM(TF_REG_MULHI, offsetof(struct trapframe, tf_regs[TF_MULHI])); ASSYM(TF_REG_EPC, offsetof(struct trapframe, tf_regs[TF_EPC])); ASSYM(TF_REG_SP, offsetof(struct trapframe, tf_regs[TF_SP])); + +ASSYM(TF_REG_S0, offsetof(struct trapframe, tf_regs[TF_S0])); +ASSYM(TF_REG_S1, offsetof(struct trapframe, tf_regs[TF_S1])); +ASSYM(TF_REG_S2, offsetof(struct trapframe, tf_regs[TF_S2])); +ASSYM(TF_REG_S3, offsetof(struct trapframe, tf_regs[TF_S3])); +ASSYM(TF_REG_S4, offsetof(struct trapframe, tf_regs[TF_S4])); +ASSYM(TF_REG_S5, offsetof(struct trapframe, tf_regs[TF_S5])); +ASSYM(TF_REG_S6, offsetof(struct trapframe, tf_regs[TF_S6])); +ASSYM(TF_REG_S7, offsetof(struct trapframe, tf_regs[TF_S7])); + ASSYM(TF_PPL, offsetof(struct trapframe, tf_ppl)); ASSYM(PCB_REG_S0, offsetof(struct pcb, pcb_regs[PCB_REG_S0])); From owner-p4-projects@FreeBSD.ORG Tue Dec 5 09:49:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28BF516A416; Tue, 5 Dec 2006 09:49:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0305D16A407 for ; Tue, 5 Dec 2006 09:49:51 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4990343CA6 for ; Tue, 5 Dec 2006 09:49:12 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB59noEO020866 for ; Tue, 5 Dec 2006 09:49:50 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB59noR9020863 for perforce@freebsd.org; Tue, 5 Dec 2006 09:49:50 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 5 Dec 2006 09:49:50 GMT Message-Id: <200612050949.kB59noR9020863@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 111130 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 09:49:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=111130 Change 111130 by soc-andrew@soc-andrew_serv on 2006/12/05 09:49:09 Clean contrib/bsdinstaller/backend/lua/install/500_install_os.lua up a little Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#11 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#11 (text+ko) ==== @@ -86,9 +86,9 @@ -- App.state.target:cmds_install_srcs(cmds, App.conf.install_items) - --- Install the generic kernel + --- Install the kernel(s) install_kernel = function(n, kernel) - cmds:add { + cmds:add { cmdline = "${root}${TAR} -x " .. "-f ${root}usr/${uname}/kernels/${kernel}.tgz " .. "-C ${root}${base}/boot", @@ -99,7 +99,6 @@ } } end - table.foreach(App.conf.kernels, install_kernel) cmds:add { From owner-p4-projects@FreeBSD.ORG Tue Dec 5 10:09:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EFC016A416; Tue, 5 Dec 2006 10:09:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 33FDA16A407 for ; Tue, 5 Dec 2006 10:09:17 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 925EB43CA2 for ; Tue, 5 Dec 2006 10:08:38 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB5A9GDn025200 for ; Tue, 5 Dec 2006 10:09:16 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB5A9GFY025197 for perforce@freebsd.org; Tue, 5 Dec 2006 10:09:16 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 5 Dec 2006 10:09:16 GMT Message-Id: <200612051009.kB5A9GFY025197@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 111134 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 10:09:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=111134 Change 111134 by soc-andrew@soc-andrew_serv on 2006/12/05 10:08:55 Add a UI to select where to get the distfiles from Uase the new Fetch library to get the distfiles Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#12 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/Installation.lua#3 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/429_dist_location.lua#1 add .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#9 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#12 (text+ko) ==== @@ -10,8 +10,6 @@ -- 5) clean up -- -local POSIX = require("posix") - id = "install_os" name = _("Install OS") req_state = { "storage", "sel_disk", "sel_part", "sel_pkgs" } @@ -88,17 +86,19 @@ --- Install the kernel(s) install_kernel = function(n, kernel) - cmds:add { + local file = App.fetcher:get_file(cmds, "kernels/" .. kernel .. + ".tgz") + cmds:add { cmdline = "${root}${TAR} -x " .. - "-f ${root}usr/${uname}/kernels/${kernel}.tgz " .. + "-f ${root}${file} " .. "-C ${root}${base}/boot", replacements = { base = base, - kernel = kernel, - uname = POSIX.uname("%r") + file = file } } end + table.foreach(App.conf.kernels, install_kernel) cmds:add { @@ -111,15 +111,16 @@ --- Install the ports tree if App.conf.install_ports == true then - cmds:add{ - cmdline = "${root}${TAR} -x " .. - "-f ${root}usr/${uname}/ports/ports.tgz ".. - "-C ${root}${base}/usr", - replacements = { - base = base, - uname = POSIX.uname("%r") - } - } + local file = App.fetcher:get_file(cmds, "ports/ports.tgz") + cmds:add{ + cmdline = "${root}${TAR} -x " .. + "-f ${root}${file} ".. + "-C ${root}${base}/usr", + replacements = { + base = base, + file = file + } + } end -- ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/Installation.lua#3 (text+ko) ==== @@ -422,21 +422,21 @@ elseif App.conf.use_tar then add_copy_command = function(src, dest) if (string.sub(src, 0, 1) == "s") then - dir = "src" + dir = "src/" else - dir = src + dir = src .. "/" end + local file = App.fetcher:get_file(cmds, dir .. src .. + "." .. App.conf.dist_suffix) cmds:add{ cmdline = "${root}${TAR} -f " .. - "${root}usr/${uname}/${dir}/${src}.${dist_suffix}" .. + "${root}${file}" .. " -x -C ${root}${base}${dest}", replacements = { base = base, src = src, - dir = dir, dest = dest, - dist_suffix = App.conf.dist_suffix, - uname = POSIX.uname("%r") + file = file }, log_mode = CmdChain.LOG_QUIET -- don't spam log } ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#9 (text+ko) ==== @@ -10,7 +10,8 @@ 900_reboot.lua main.lua # Local scripts -FILES+= 430_select_dists.lua 432_kernel.lua 435_ports.lua +FILES+= 429_dist_location.lua 430_select_dists.lua 432_kernel.lua \ + 435_ports.lua FILESDIR= ${INST_DIR}/install From owner-p4-projects@FreeBSD.ORG Tue Dec 5 10:16:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C648616A47B; Tue, 5 Dec 2006 10:16:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A050616A415 for ; Tue, 5 Dec 2006 10:16:26 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A72043CA6 for ; Tue, 5 Dec 2006 10:15:48 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB5AGQgP026687 for ; Tue, 5 Dec 2006 10:16:26 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB5AGQN0026684 for perforce@freebsd.org; Tue, 5 Dec 2006 10:16:26 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 5 Dec 2006 10:16:26 GMT Message-Id: <200612051016.kB5AGQN0026684@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 111135 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 10:16:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=111135 Change 111135 by soc-andrew@soc-andrew_serv on 2006/12/05 10:16:24 Remove the BSDInstaller front end, libaura and libdfui. They are now installed from packages Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/.cvsignore#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/Makefile#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/curses_bar.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/curses_bar.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/curses_form.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/curses_form.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/curses_util.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/curses_util.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/curses_widget.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/curses_widget.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/curses_xlat.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/curses_xlat.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/fred.txt#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/main.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/po/dfuife_curses.pot#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/po/ru.po#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/frontends/ncurses/puffy.txt#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/aura/.cvsignore#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/aura/Makefile#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/aura/README#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/aura/buffer.c#4 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/aura/buffer.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/aura/dict.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/aura/dict.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/aura/fspred.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/aura/fspred.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/aura/mem.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/aura/mem.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/aura/popen.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/aura/popen.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/aura/test.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/.cvsignore#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/Makefile#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/README#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/conn_caps.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/conn_caps.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/conn_npipe.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/conn_npipe.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/conn_tcp.c#3 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/conn_tcp.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/connection.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/decode.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/dfui.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/dump.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/dump.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/encode.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/encoding.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/form.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/lang.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/lang.h#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/system.c#2 delete .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/system.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Dec 5 12:54:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EB1416A506; Tue, 5 Dec 2006 12:54:31 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 13C1C16A503 for ; Tue, 5 Dec 2006 12:54:31 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id CABF143CBB for ; Tue, 5 Dec 2006 12:52:28 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB5Cqoc6064661 for ; Tue, 5 Dec 2006 12:52:50 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB5CqnO5064650 for perforce@freebsd.org; Tue, 5 Dec 2006 12:52:49 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 5 Dec 2006 12:52:49 GMT Message-Id: <200612051252.kB5CqnO5064650@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 12:54:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=111141 Change 111141 by zec@zec_tca51 on 2006/12/05 12:51:52 When destroying a vnet instance, first set the per-thread vnet affinity to that instance. Do not iterate through the entire list of vnets when setting / restoring the per-thread vnet affinity. Instead, as an alternative consistency checking measure, check that the target vnet has its magic number field correctly set. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#4 edit .. //depot/projects/vimage/src/sys/netinet/if_ether.c#3 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#3 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#3 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#4 (text+ko) ==== @@ -420,6 +420,7 @@ panic("vi_alloc: malloc failed for vnetb \"%s\"\n", name); bzero(vnetb, sizeof(struct vnet_base)); vip->v_vnetb = vnetb; + vnetb->vnet_magic_n = VNET_MAGIC_N; vprocg = malloc(sizeof(struct vprocg), M_VPROCG, M_NOWAIT); if (vprocg == NULL) @@ -491,6 +492,8 @@ struct vprocg *vprocg = vip->v_procg; struct vcpu *vcpu = vip->v_cpu; struct ifnet *ifp; + + CURVNETB_SET(vnetb); INIT_VNET_NET(vnetb); /* return all interfaces to the parent vnetb */ @@ -516,8 +519,11 @@ free((caddr_t)vnetb->ifindex2ifnet, M_IFADDR); #endif + CURVNETB_RESTORE(); + /* hopefully, we are finally OK to free the vnetb container itself! */ LIST_REMOVE(vnetb, vnetb_le); + vnetb->vnet_magic_n = -1; free(vnetb, M_VNET); LIST_REMOVE(vprocg, vprocg_le); @@ -550,6 +556,7 @@ vimage_0.v_cpu = &vcpu_0; vnetb_tbl[0] = &vnetb_0; /* XXX */ + vnetb_0.vnet_magic_n = VNET_MAGIC_N; TAILQ_INIT(&vnet_modlink_head); ==== //depot/projects/vimage/src/sys/netinet/if_ether.c#3 (text+ko) ==== @@ -139,7 +139,7 @@ static void arptimer(void *arg) { - CURVNETB_SET(arg); + CURVNETB_SET((struct vnet_base *) arg); INIT_VNET_NET((struct vnet_base *) arg); INIT_VNET_INET((struct vnet_base *) arg); struct llinfo_arp *la, *ola; ==== //depot/projects/vimage/src/sys/netinet6/nd6.c#3 (text+ko) ==== @@ -1919,8 +1919,8 @@ nd6_slowtimo(arg) void *arg; { - CURVNETB_SET(arg); - INIT_VNET_NET(curvnetb); + CURVNETB_SET((struct vnet_base *) arg); + INIT_VNET_NET((struct vnet_base *) arg); struct nd_ifinfo *nd6if; struct ifnet *ifp; ==== //depot/projects/vimage/src/sys/sys/vimage.h#3 (text+ko) ==== @@ -82,6 +82,8 @@ int ifccnt; int sockcnt; + + int vnet_magic_n; }; struct vnet_symmap { @@ -116,26 +118,22 @@ #define VNET_SYMMAP_END \ { NULL, 0 } +#define VNET_MAGIC_N 0x3e0d8f29 + #define CURVNETB_SET(arg) \ - struct vnet_base *vnetb_iter_XXX; \ + VNET_ASSERT((arg)->vnet_magic_n == VNET_MAGIC_N); \ struct vnet_base *saved_vnetb = curvnetb; \ const char *saved_vnet_lpush = curthread->td_vnet_lpush; \ curvnetb = arg; \ curthread->td_vnet_lpush = __FUNCTION__ ; \ - LIST_FOREACH(vnetb_iter_XXX, &vnetb_head, vnetb_le) \ - if (arg == vnetb_iter_XXX) \ - break; \ - VNET_ASSERT(arg == vnetb_iter_XXX && arg != NULL ); \ if (saved_vnetb) \ printf("curvnetb_set() in %s cpu %d: %p (%s) -> %p\n", \ curthread->td_vnet_lpush, curcpu, saved_vnetb, \ saved_vnet_lpush, curvnetb); #define CURVNETB_RESTORE() \ - LIST_FOREACH(vnetb_iter_XXX, &vnetb_head, vnetb_le) \ - if (saved_vnetb == vnetb_iter_XXX) \ - break; \ - VNET_ASSERT(saved_vnetb == vnetb_iter_XXX); \ + VNET_ASSERT(saved_vnetb == NULL || \ + saved_vnetb->vnet_magic_n == VNET_MAGIC_N); \ curvnetb = saved_vnetb; \ curthread->td_vnet_lpush = saved_vnet_lpush; From owner-p4-projects@FreeBSD.ORG Tue Dec 5 15:03:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7755C16A47C; Tue, 5 Dec 2006 15:03:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4E49C16A412 for ; Tue, 5 Dec 2006 15:03:42 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id E72D843CA5 for ; Tue, 5 Dec 2006 15:03:01 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB5F3fVp089249 for ; Tue, 5 Dec 2006 15:03:41 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB5F3fFe089229 for perforce@freebsd.org; Tue, 5 Dec 2006 15:03:41 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 5 Dec 2006 15:03:41 GMT Message-Id: <200612051503.kB5F3fFe089229@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 15:03:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=111145 Change 111145 by zec@zec_tca51 on 2006/12/05 15:03:17 If a function has an argument that holds a pointer to a vnet instance, set the local vnet * using this info, instead of using the per-thread vnet affinity (curvnetb). Furthermore, the macro which sets the local vnet * will compare the target vnet with the per-thread curvnetb, and panic if those two do not match. This should allow us to catch more inconsistencies than solely relying on curvnetb to be pointing to the correct vnet instance all the time. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#5 edit .. //depot/projects/vimage/src/sys/net/if.c#5 edit .. //depot/projects/vimage/src/sys/net/if_loop.c#3 edit .. //depot/projects/vimage/src/sys/net/if_stf.c#3 edit .. //depot/projects/vimage/src/sys/net/rtsock.c#4 edit .. //depot/projects/vimage/src/sys/netgraph/ng_ether.c#3 edit .. //depot/projects/vimage/src/sys/netinet/if_ether.c#4 edit .. //depot/projects/vimage/src/sys/netinet/igmp.c#3 edit .. //depot/projects/vimage/src/sys/netinet/in.c#3 edit .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#3 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#3 edit .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#3 edit .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#3 edit .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#3 edit .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#3 edit .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#3 edit .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#3 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#4 edit .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#3 edit .. //depot/projects/vimage/src/sys/netinet6/scope6.c#3 edit .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#3 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#4 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/if.c#5 (text+ko) ==== @@ -408,6 +408,8 @@ #endif if_slowtimo(0); #ifdef VIMAGE + } else { + panic("if_check() called for a non-default vimage!?!"); } #endif } ==== //depot/projects/vimage/src/sys/net/if_loop.c#3 (text+ko) ==== @@ -124,7 +124,7 @@ lo_clone_destroy(ifp) struct ifnet *ifp; { - INIT_VNET_NET(curvnetb); + INIT_VNET_NET(ifp->if_vnetb); struct lo_softc *sc; sc = ifp->if_softc; @@ -291,7 +291,7 @@ int af; int hlen; { - INIT_VNET_NET(curvnetb); + INIT_VNET_NET(ifp->if_vnetb); int isr; M_ASSERTPKTHDR(m); ==== //depot/projects/vimage/src/sys/net/if_stf.c#3 (text+ko) ==== @@ -365,7 +365,7 @@ stf_getsrcifa6(ifp) struct ifnet *ifp; { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(ifp->if_vnetb); struct ifaddr *ia; struct in_ifaddr *ia4; struct sockaddr_in6 *sin6; ==== //depot/projects/vimage/src/sys/net/rtsock.c#4 (text+ko) ==== @@ -317,7 +317,7 @@ route_output(struct mbuf *m, struct socket *so) { #define sa_equal(a1, a2) (bcmp((a1), (a2), (a1)->sa_len) == 0) - INIT_VNET_NET(curvnetb); + INIT_VNET_NET(so->so_vnetb); struct rt_msghdr *rtm = NULL; struct rtentry *rt = NULL; struct radix_node_head *rnh; ==== //depot/projects/vimage/src/sys/netgraph/ng_ether.c#3 (text+ko) ==== @@ -741,22 +741,14 @@ /* Create nodes for any already-existing Ethernet interfaces */ IFNET_RLOCK(); -#ifdef VIMAGE - struct vnet_base *vnetb_iter; - /* XXX LOCKING */ - LIST_FOREACH(vnetb_iter, &vnetb_head, vnetb_le) { - CURVNETB_SET(vnetb_iter); - INIT_VNET_NET(vnetb_iter); -#endif + VNETB_ITERLOOP_BEGIN(); + INIT_VNET_NET(vnetb_iter); TAILQ_FOREACH(ifp, &V_ifnet, if_link) { if (ifp->if_type == IFT_ETHER || ifp->if_type == IFT_L2VLAN) ng_ether_attach(ifp); } -#ifdef VIMAGE - CURVNETB_RESTORE(); - } -#endif + VNETB_ITERLOOP_END(); IFNET_RUNLOCK(); break; ==== //depot/projects/vimage/src/sys/netinet/if_ether.c#4 (text+ko) ==== @@ -603,7 +603,6 @@ in_arpinput(m) struct mbuf *m; { - INIT_VNET_INET(curvnetb); struct arphdr *ah; struct ifnet *ifp = m->m_pkthdr.rcvif; struct llinfo_arp *la; @@ -621,6 +620,7 @@ #ifdef DEV_CARP int carp_match = 0; #endif + INIT_VNET_INET(ifp->if_vnetb); if (ifp->if_bridge) bridged = 1; @@ -995,7 +995,8 @@ static void arp_init(void) { - INIT_VNET_INET(curvnetb); /* XXX */ + INIT_VNET_INET(curvnetb); /* XXX should panic here! */ +printf("arp_init\n"); arpintrq.ifq_maxlen = 50; mtx_init(&arpintrq.ifq_mtx, "arp_inq", NULL, MTX_DEF); ==== //depot/projects/vimage/src/sys/netinet/igmp.c#3 (text+ko) ==== @@ -156,7 +156,7 @@ static struct router_info * find_rti(struct ifnet *ifp) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(ifp->if_vnetb); struct router_info *rti; mtx_assert(&igmp_mtx, MA_OWNED); @@ -185,7 +185,6 @@ void igmp_input(register struct mbuf *m, int off) { - INIT_VNET_INET(curvnetb); register int iphlen = off; register struct igmp *igmp; register struct ip *ip; @@ -197,6 +196,7 @@ struct in_multistep step; struct router_info *rti; int timer; /** timer value in the igmp query header **/ + INIT_VNET_INET(ifp->if_vnetb); ++igmpstat.igps_rcv_total; ==== //depot/projects/vimage/src/sys/netinet/in.c#3 (text+ko) ==== @@ -720,7 +720,7 @@ struct sockaddr_in *sin; int scrub; { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(ifp->if_vnetb); register u_long i = ntohl(sin->sin_addr.s_addr); struct sockaddr_in oldaddr; int s = splimp(), flags = RTF_UP, error = 0; @@ -998,7 +998,7 @@ register struct in_addr *ap; register struct ifnet *ifp; { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(ifp->if_vnetb); register struct in_multi *inm; int error; @@ -1107,7 +1107,7 @@ in_delmulti_ifp(ifp) register struct ifnet *ifp; { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(ifp->if_vnetb); struct in_multi *inm; struct in_multi *oinm; @@ -1129,7 +1129,7 @@ in_ifdetach(ifp) struct ifnet *ifp; { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(ifp->if_vnetb); in_pcbpurgeif0(&V_ripcbinfo, ifp); in_pcbpurgeif0(&V_udbinfo, ifp); ==== //depot/projects/vimage/src/sys/netinet/in_pcb.c#3 (text+ko) ==== @@ -270,7 +270,6 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr *nam, in_addr_t *laddrp, u_short *lportp, struct ucred *cred) { - INIT_VNET_INET(curvnetb); struct socket *so = inp->inp_socket; unsigned short *lastport; struct sockaddr_in *sin; @@ -280,6 +279,7 @@ int wild = 0, reuseport = (so->so_options & SO_REUSEPORT); int error, prison = 0; int dorandom; + INIT_VNET_INET(so->so_vnetb); INP_INFO_WLOCK_ASSERT(pcbinfo); INP_LOCK_ASSERT(inp); ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#3 (text+ko) ==== @@ -1604,7 +1604,7 @@ int ip_rsvp_init(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_RSVP) ==== //depot/projects/vimage/src/sys/netinet/raw_ip.c#3 (text+ko) ==== @@ -281,7 +281,7 @@ int rip_output(struct mbuf *m, struct socket *so, u_long dst) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct ip *ip; int error; struct inpcb *inp = sotoinpcb(so); @@ -616,7 +616,7 @@ static int rip_attach(struct socket *so, int proto, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; int error; @@ -654,7 +654,7 @@ static void rip_detach(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; inp = sotoinpcb(so); @@ -690,7 +690,7 @@ static void rip_abort(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; inp = sotoinpcb(so); @@ -706,7 +706,7 @@ static void rip_close(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; inp = sotoinpcb(so); @@ -722,7 +722,7 @@ static int rip_disconnect(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; if ((so->so_state & SS_ISCONNECTED) == 0) @@ -741,8 +741,8 @@ static int rip_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { - INIT_VNET_NET(curvnetb); - INIT_VNET_INET(curvnetb); + INIT_VNET_NET(so->so_vnetb); + INIT_VNET_INET(so->so_vnetb); struct sockaddr_in *addr = (struct sockaddr_in *)nam; struct inpcb *inp; @@ -776,8 +776,8 @@ static int rip_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { - INIT_VNET_NET(curvnetb); - INIT_VNET_INET(curvnetb); + INIT_VNET_NET(so->so_vnetb); + INIT_VNET_INET(so->so_vnetb); struct sockaddr_in *addr = (struct sockaddr_in *)nam; struct inpcb *inp; @@ -940,7 +940,7 @@ static int rip_sockaddr(struct socket *so, struct sockaddr **nam) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); return (in_setsockaddr(so, nam, &V_ripcbinfo)); } @@ -951,7 +951,7 @@ static int rip_peeraddr(struct socket *so, struct sockaddr **nam) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); return (in_setpeeraddr(so, nam, &V_ripcbinfo)); } ==== //depot/projects/vimage/src/sys/netinet/tcp_output.c#3 (text+ko) ==== @@ -120,8 +120,8 @@ int tcp_output(struct tcpcb *tp) { - INIT_VNET_INET(curvnetb); struct socket *so = tp->t_inpcb->inp_socket; + INIT_VNET_INET(so->so_vnetb); long len, recwin, sendwin; int off, flags, error; #ifdef TCP_SIGNATURE ==== //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#3 (text+ko) ==== @@ -152,7 +152,7 @@ static void tcp_detach(struct socket *so, struct inpcb *inp) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct tcpcb *tp; #ifdef INET6 int isipv6 = INP_CHECK_SOCKAF(so, AF_INET6) != 0; @@ -247,7 +247,7 @@ static void tcp_usr_detach(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; struct tcpcb *tp; TCPDEBUG0; @@ -272,7 +272,7 @@ static int tcp_usr_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); int error = 0; struct inpcb *inp; struct tcpcb *tp = NULL; @@ -313,7 +313,7 @@ static int tcp6_usr_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); int error = 0; struct inpcb *inp; struct tcpcb *tp = NULL; @@ -372,7 +372,7 @@ static int tcp_usr_listen(struct socket *so, int backlog, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); int error = 0; struct inpcb *inp; struct tcpcb *tp = NULL; @@ -409,7 +409,7 @@ static int tcp6_usr_listen(struct socket *so, int backlog, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); int error = 0; struct inpcb *inp; struct tcpcb *tp = NULL; @@ -457,7 +457,7 @@ static int tcp_usr_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); int error = 0; struct inpcb *inp; struct tcpcb *tp = NULL; @@ -500,7 +500,7 @@ static int tcp6_usr_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); int error = 0; struct inpcb *inp; struct tcpcb *tp = NULL; @@ -573,7 +573,7 @@ static int tcp_usr_disconnect(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; struct tcpcb *tp = NULL; int error = 0; @@ -702,7 +702,7 @@ static int tcp_sockaddr(struct socket *so, struct sockaddr **nam) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); return (in_setsockaddr(so, nam, &V_tcbinfo)); } @@ -714,7 +714,7 @@ static int tcp_peeraddr(struct socket *so, struct sockaddr **nam) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); return (in_setpeeraddr(so, nam, &V_tcbinfo)); } @@ -725,7 +725,7 @@ static int tcp_usr_shutdown(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); int error = 0; struct inpcb *inp; struct tcpcb *tp = NULL; @@ -792,7 +792,7 @@ tcp_usr_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, struct mbuf *control, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); int error = 0; struct inpcb *inp; struct tcpcb *tp = NULL; @@ -948,7 +948,7 @@ static void tcp_usr_abort(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; struct tcpcb *tp = NULL; TCPDEBUG0; @@ -987,7 +987,7 @@ static void tcp_usr_close(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; struct tcpcb *tp = NULL; TCPDEBUG0; @@ -1121,12 +1121,12 @@ struct sockaddr *nam; struct thread *td; { - INIT_VNET_INET(curvnetb); struct inpcb *inp = tp->t_inpcb, *oinp; struct socket *so = inp->inp_socket; struct in_addr laddr; u_short lport; int error; + INIT_VNET_INET(so->so_vnetb); INP_INFO_WLOCK_ASSERT(&V_tcbinfo); INP_LOCK_ASSERT(inp); @@ -1176,12 +1176,12 @@ struct sockaddr *nam; struct thread *td; { - INIT_VNET_INET(curvnetb); struct inpcb *inp = tp->t_inpcb, *oinp; struct socket *so = inp->inp_socket; struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)nam; struct in6_addr *addr6; int error; + INIT_VNET_INET(so->so_vnetb); INP_INFO_WLOCK_ASSERT(&V_tcbinfo); INP_LOCK_ASSERT(inp); @@ -1452,7 +1452,7 @@ tcp_attach(so) struct socket *so; { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); register struct tcpcb *tp; struct inpcb *inp; int error; @@ -1514,9 +1514,9 @@ tcp_disconnect(tp) register struct tcpcb *tp; { - INIT_VNET_INET(curvnetb); struct inpcb *inp = tp->t_inpcb; struct socket *so = inp->inp_socket; + INIT_VNET_INET(so->so_vnetb); INP_INFO_WLOCK_ASSERT(&V_tcbinfo); INP_LOCK_ASSERT(inp); ==== //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#3 (text+ko) ==== @@ -981,7 +981,7 @@ static void udp_abort(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; inp = sotoinpcb(so); @@ -1000,7 +1000,7 @@ static int udp_attach(struct socket *so, int proto, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; int error; @@ -1027,7 +1027,7 @@ static int udp_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; int error; @@ -1044,7 +1044,7 @@ static void udp_close(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; inp = sotoinpcb(so); @@ -1063,7 +1063,7 @@ static int udp_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; int error; struct sockaddr_in *sin; @@ -1091,7 +1091,7 @@ static void udp_detach(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; inp = sotoinpcb(so); @@ -1108,7 +1108,7 @@ static int udp_disconnect(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; inp = sotoinpcb(so); @@ -1163,7 +1163,7 @@ static int udp_sockaddr(struct socket *so, struct sockaddr **nam) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); return (in_setsockaddr(so, nam, &V_udbinfo)); } @@ -1175,7 +1175,7 @@ static int udp_peeraddr(struct socket *so, struct sockaddr **nam) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); return (in_setpeeraddr(so, nam, &V_udbinfo)); } ==== //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#3 (text+ko) ==== @@ -360,7 +360,7 @@ struct ifnet *altifp; /* secondary EUI64 source */ struct in6_addr *in6; { - INIT_VNET_NET(curvnetb); + INIT_VNET_NET(ifp0->if_vnetb); struct ifnet *ifp; /* first, try to get it from the interface itself */ @@ -734,8 +734,8 @@ in6_ifdetach(ifp) struct ifnet *ifp; { - INIT_VNET_NET(curvnetb); - INIT_VNET_INET(curvnetb); + INIT_VNET_NET(ifp->if_vnetb); + INIT_VNET_INET(ifp->if_vnetb); struct in6_ifaddr *ia, *oia; struct ifaddr *ifa, *next; struct rtentry *rt; ==== //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#3 (text+ko) ==== @@ -562,7 +562,7 @@ int in6_mapped_sockaddr(struct socket *so, struct sockaddr **nam) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; int error; @@ -584,7 +584,7 @@ int in6_mapped_peeraddr(struct socket *so, struct sockaddr **nam) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; int error; ==== //depot/projects/vimage/src/sys/netinet6/nd6.c#4 (text+ko) ==== @@ -1197,12 +1197,12 @@ struct rtentry *rt; struct rt_addrinfo *info; /* xxx unused */ { - INIT_VNET_NET(curvnetb); struct sockaddr *gate = rt->rt_gateway; struct llinfo_nd6 *ln = (struct llinfo_nd6 *)rt->rt_llinfo; static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK}; struct ifnet *ifp = rt->rt_ifp; struct ifaddr *ifa; + INIT_VNET_NET(ifp->if_vnetb); RT_LOCK_ASSERT(rt); ==== //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#3 (text+ko) ==== @@ -553,7 +553,7 @@ static int rip6_attach(struct socket *so, int proto, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; struct icmp6_filter *filter; int error; @@ -591,7 +591,7 @@ static void rip6_detach(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; inp = sotoinpcb(so); @@ -649,8 +649,8 @@ static int rip6_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { - INIT_VNET_NET(curvnetb); - INIT_VNET_INET(curvnetb); + INIT_VNET_NET(so->so_vnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp = sotoinpcb(so); struct sockaddr_in6 *addr = (struct sockaddr_in6 *)nam; struct ifaddr *ia = NULL; @@ -684,8 +684,8 @@ static int rip6_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { - INIT_VNET_NET(curvnetb); - INIT_VNET_INET(curvnetb); + INIT_VNET_NET(so->so_vnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp = sotoinpcb(so); struct sockaddr_in6 *addr = (struct sockaddr_in6 *)nam; struct in6_addr *in6a = NULL; @@ -757,7 +757,7 @@ rip6_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, struct mbuf *control, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp = sotoinpcb(so); struct sockaddr_in6 tmp; struct sockaddr_in6 *dst; ==== //depot/projects/vimage/src/sys/netinet6/scope6.c#3 (text+ko) ==== @@ -115,7 +115,7 @@ struct ifnet *ifp; struct scope6_id *idlist; { - INIT_VNET_NET(curvnetb); + INIT_VNET_NET(ifp->if_vnetb); int i; int error = 0; struct scope6_id *sid = NULL; ==== //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#3 (text+ko) ==== @@ -485,7 +485,7 @@ static void udp6_abort(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; inp = sotoinpcb(so); @@ -515,7 +515,7 @@ static int udp6_attach(struct socket *so, int proto, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; int error; @@ -554,7 +554,7 @@ static int udp6_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; int error; @@ -594,7 +594,7 @@ static void udp6_close(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; inp = sotoinpcb(so); @@ -623,7 +623,7 @@ static int udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; int error; @@ -676,7 +676,7 @@ static void udp6_detach(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; inp = sotoinpcb(so); @@ -692,7 +692,7 @@ static int udp6_disconnect(struct socket *so) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; int error; @@ -731,7 +731,7 @@ udp6_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, struct mbuf *control, struct thread *td) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(so->so_vnetb); struct inpcb *inp; int error = 0; ==== //depot/projects/vimage/src/sys/sys/vimage.h#4 (text+ko) ==== @@ -147,7 +147,10 @@ #define VSYM(base, sym) ((base)->_##sym) #define INIT_FROM_VNET_BASE(vnetb, modindex, modtype, sym) \ - VNET_ASSERT(vnetb != 0); \ + if (vnetb != curvnetb) \ + panic("in %s:%d %s()\n vnetb=%p curvnetb=%p", \ + __FILE__, __LINE__, __FUNCTION__, \ + vnetb, curvnetb); \ modtype *sym = (vnetb)->mod_data[modindex]; #define VNETB_ITERLOOP_BEGIN() \ From owner-p4-projects@FreeBSD.ORG Tue Dec 5 16:45:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 525A716A4FC; Tue, 5 Dec 2006 16:45:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 75E4916A4D1 for ; Tue, 5 Dec 2006 16:45:53 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC14443CAA for ; Tue, 5 Dec 2006 16:45:12 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB5Gjq7c014671 for ; Tue, 5 Dec 2006 16:45:52 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB5GjpHD014668 for perforce@freebsd.org; Tue, 5 Dec 2006 16:45:51 GMT (envelope-from imp@freebsd.org) Date: Tue, 5 Dec 2006 16:45:51 GMT Message-Id: <200612051645.kB5GjpHD014668@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 16:45:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=111147 Change 111147 by imp@imp_lighthouse on 2006/12/05 16:45:47 Adjust iic to latest hinting on iic bus. Also minor tweaks to eliminate i386 specific items and use options convention more. # maybe I should hack config to allow hints in config file Affected files ... .. //depot/projects/arm/src/sys/arm/conf/AVILA#11 edit .. //depot/projects/arm/src/sys/arm/conf/AVILA.hints#1 add Differences ... ==== //depot/projects/arm/src/sys/arm/conf/AVILA#11 (text+ko) ==== @@ -27,12 +27,12 @@ options STARTUP_PAGETABLE_ADDR=0x10000000 include "../xscale/ixp425/std.avila" -#To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" #Default places to look for devices. +# Provide info on how generic devices are connected +hints "AVILA.hints" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale -#options HZ=1000 +#options HZ=1000 options HZ=100 options DEVICE_POLLING @@ -44,7 +44,7 @@ #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options DIAGNOSTIC +#options DIAGNOSTIC options SCHED_4BSD #4BSD scheduler options KSE @@ -72,10 +72,10 @@ options BOOTP_NFSROOT options BOOTP_NFSV3 options BOOTP_WIRED_TO=npe0 -#options BOOTP_WIRED_TO=ath0 +#options BOOTP_WIRED_TO=ath0 options BOOTP_COMPAT -#options PREEMPTION -#options VERBOSE_SYSINIT +#options PREEMPTION +#options VERBOSE_SYSINIT device genclock device nexus @@ -118,7 +118,7 @@ device md device random # Entropy device -#options ARM_USE_SMALL_ALLOC +#options ARM_USE_SMALL_ALLOC # Wireless NIC cards device wlan # 802.11 support From owner-p4-projects@FreeBSD.ORG Tue Dec 5 16:46:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2143116A4FB; Tue, 5 Dec 2006 16:46:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DBCCC16A4D1 for ; Tue, 5 Dec 2006 16:46:54 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3DE343C9D for ; Tue, 5 Dec 2006 16:46:14 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB5Gks1B014700 for ; Tue, 5 Dec 2006 16:46:54 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB5GksZe014697 for perforce@freebsd.org; Tue, 5 Dec 2006 16:46:54 GMT (envelope-from imp@freebsd.org) Date: Tue, 5 Dec 2006 16:46:54 GMT Message-Id: <200612051646.kB5GksZe014697@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111148 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 16:46:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=111148 Change 111148 by imp@imp_lighthouse on 2006/12/05 16:46:25 unbreak icee and remove debugs. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#35 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#35 (text+ko) ==== @@ -232,8 +232,6 @@ err = EBUSY; else if (sr & TWI_SR_NACK) err = EADDRNOTAVAIL; - if (sr & ~bit) - printf("status is %x\n", sr); return (err); } @@ -271,7 +269,6 @@ WR4(sc, TWI_CR, TWI_CR_SWRST); WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); WR4(sc, TWI_CWGR, sc->cwgr); - printf("setting cwgr to %#x\n", sc->cwgr); return 0; } @@ -336,20 +333,16 @@ WR4(sc, TWI_THR, *buf++); if (len == 0) WR4(sc, TWI_CR, TWI_CR_STOP); - if ((err = at91_twi_wait(sc, TWI_SR_TXRDY))) { - printf("Len %d\n", len); + if ((err = at91_twi_wait(sc, TWI_SR_TXRDY))) goto out; - } } } if ((err = at91_twi_wait(sc, TWI_SR_TXCOMP))) break; } out:; - if (err) { + if (err) WR4(sc, TWI_CR, TWI_CR_STOP); - printf("Err is %d\n", err); - } AT91_TWI_UNLOCK(sc); return (err); } From owner-p4-projects@FreeBSD.ORG Tue Dec 5 17:55:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0094016A416; Tue, 5 Dec 2006 17:55:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B2A8016A407 for ; Tue, 5 Dec 2006 17:55:23 +0000 (UTC) (envelope-from wkoszek@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D3B943CA3 for ; Tue, 5 Dec 2006 17:54:43 +0000 (GMT) (envelope-from wkoszek@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB5HtNQG035244 for ; Tue, 5 Dec 2006 17:55:23 GMT (envelope-from wkoszek@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB5HtNN6035241 for perforce@freebsd.org; Tue, 5 Dec 2006 17:55:23 GMT (envelope-from wkoszek@FreeBSD.org) Date: Tue, 5 Dec 2006 17:55:23 GMT Message-Id: <200612051755.kB5HtNN6035241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wkoszek@FreeBSD.org using -f From: "Wojciech A. Koszek" To: Perforce Change Reviews Cc: Subject: PERFORCE change 111150 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 17:55:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=111150 Change 111150 by wkoszek@wkoszek_wshit on 2006/12/05 17:55:05 For now we'll need single user mode only. Force it by setting boothowto to RB_SINGLE. Affected files ... .. //depot/projects/mips2/src/sys/kern/init_main.c#2 edit Differences ... ==== //depot/projects/mips2/src/sys/kern/init_main.c#2 (text+ko) ==== @@ -99,7 +99,10 @@ struct vmspace vmspace0; struct proc *initproc; -int boothowto = 0; /* initialized so that it can be patched */ +/* + * XXXMIPS: boot in single user mode for now. + */ +int boothowto = RB_SINGLE; /* initialized so that it can be patched */ SYSCTL_INT(_debug, OID_AUTO, boothowto, CTLFLAG_RD, &boothowto, 0, ""); int bootverbose; SYSCTL_INT(_debug, OID_AUTO, bootverbose, CTLFLAG_RW, &bootverbose, 0, ""); From owner-p4-projects@FreeBSD.ORG Tue Dec 5 18:10:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C609316A4C8; Tue, 5 Dec 2006 18:10:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8515616A4AB for ; Tue, 5 Dec 2006 18:10:43 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02E2C43CA2 for ; Tue, 5 Dec 2006 18:10:03 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB5IAhBI038460 for ; Tue, 5 Dec 2006 18:10:43 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB5IAh7l038457 for perforce@freebsd.org; Tue, 5 Dec 2006 18:10:43 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 5 Dec 2006 18:10:43 GMT Message-Id: <200612051810.kB5IAh7l038457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 111151 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 18:10:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=111151 Change 111151 by gonzo@gonzo_hq on 2006/12/05 18:10:12 o Remove stuff derived from amd64. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/setjmp.h#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/setjmp.h#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include -#define _JBLEN 12 /* Size of the jmp_buf on AMD64. */ +#define _JBLEN 12 /* Size of the jmp_buf on MIPS. */ /* * jmp_buf and sigjmp_buf are encapsulated in different structs to force @@ -45,9 +45,9 @@ * internally to avoid some run-time errors for mismatches. */ #if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE -typedef struct _sigjmp_buf { long _sjb[_JBLEN]; } sigjmp_buf[1]; +typedef struct _sigjmp_buf { __register_t _sjb[_JBLEN]; } sigjmp_buf[1]; #endif -typedef struct _jmp_buf { long _jb[_JBLEN]; } jmp_buf[1]; +typedef struct _jmp_buf { __register_t _jb[_JBLEN]; } jmp_buf[1]; #endif /* !_MACHINE_SETJMP_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Dec 5 18:21:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34D1016A47C; Tue, 5 Dec 2006 18:21:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E668216A40F for ; Tue, 5 Dec 2006 18:20:59 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12B8643CA8 for ; Tue, 5 Dec 2006 18:20:16 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB5IKu8E040234 for ; Tue, 5 Dec 2006 18:20:56 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB5IKu6E040220 for perforce@freebsd.org; Tue, 5 Dec 2006 18:20:56 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 5 Dec 2006 18:20:56 GMT Message-Id: <200612051820.kB5IKu6E040220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 111152 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 18:21:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=111152 Change 111152 by gonzo@gonzo_hq on 2006/12/05 18:20:27 o Stick on the moment with _jmp_buf as an array of 12 registers, do not consider signal context, let's put signals aside for a while. Affected files ... .. //depot/projects/mips2/src/lib/libc/mips/gen/_setjmp.S#3 edit Differences ... ==== //depot/projects/mips2/src/lib/libc/mips/gen/_setjmp.S#3 (text+ko) ==== @@ -67,19 +67,19 @@ #endif .set push - li v0, 0xACEDBADE # sigcontext magic number - sw ra, (2 * 4)(a0) # sc_pc = return address - sw v0, (_OFFSETOF_SC_REGS)(a0) # saved in sc_regs[0] - sw s0, (S0 * SZREG + _OFFSETOF_SC_REGS)(a0) - sw s1, (S1 * SZREG + _OFFSETOF_SC_REGS)(a0) - sw s2, (S2 * SZREG + _OFFSETOF_SC_REGS)(a0) - sw s3, (S3 * SZREG + _OFFSETOF_SC_REGS)(a0) - sw s4, (S4 * SZREG + _OFFSETOF_SC_REGS)(a0) - sw s5, (S5 * SZREG + _OFFSETOF_SC_REGS)(a0) - sw s6, (S6 * SZREG + _OFFSETOF_SC_REGS)(a0) - sw s7, (S7 * SZREG + _OFFSETOF_SC_REGS)(a0) - sw sp, (SP * SZREG + _OFFSETOF_SC_REGS)(a0) - sw s8, (S8 * SZREG + _OFFSETOF_SC_REGS)(a0) + li v0, 0xACEDBADE + sw v0, (a0) + sw ra, (1 * SZREG)(a0) + sw s0, (2 * SZREG)(a0) + sw s1, (3 * SZREG)(a0) + sw s2, (4 * SZREG)(a0) + sw s3, (5 * SZREG)(a0) + sw s4, (6 * SZREG)(a0) + sw s5, (7 * SZREG)(a0) + sw s6, (8 * SZREG)(a0) + sw s7, (9 * SZREG)(a0) + sw sp, (10 * SZREG)(a0) + sw s8, (11 * SZREG)(a0) #ifndef SOFTFLOAT cfc1 v0, $31 # too bad cant check if FP used swc1 $f20, (20 * 4 + _OFFSETOF_SC_FPREGS)(a0) @@ -111,23 +111,23 @@ .set noreorder #endif .set push - lw v0, (_OFFSETOF_SC_REGS)(a0) # get magic number - lw ra, (2 * 4)(a0) + lw v0, (a0) # get magic number + lw ra, (1 * SZREG)(a0) li t0, 0xACEDBADE bne v0, t0, botch # jump if error addu sp, sp, 32 # does not matter, sanity - lw s0, (S0 * SZREG + _OFFSETOF_SC_REGS)(a0) - lw s1, (S1 * SZREG + _OFFSETOF_SC_REGS)(a0) - lw s2, (S2 * SZREG + _OFFSETOF_SC_REGS)(a0) - lw s3, (S3 * SZREG + _OFFSETOF_SC_REGS)(a0) - lw s4, (S4 * SZREG + _OFFSETOF_SC_REGS)(a0) - lw s5, (S5 * SZREG + _OFFSETOF_SC_REGS)(a0) - lw s6, (S6 * SZREG + _OFFSETOF_SC_REGS)(a0) - lw s7, (S7 * SZREG + _OFFSETOF_SC_REGS)(a0) + lw s0, (2 * SZREG)(a0) + lw s1, (3 * SZREG)(a0) + lw s2, (4 * SZREG)(a0) + lw s3, (5 * SZREG)(a0) + lw s4, (6 * SZREG)(a0) + lw s5, (7 * SZREG)(a0) + lw s6, (8 * SZREG)(a0) + lw s7, (9 * SZREG)(a0) + lw sp, (10 * SZREG)(a0) + lw s8, (11 * SZREG)(a0) +#ifndef SOFTFLOAT lw v0, (32 * 4 + _OFFSETOF_SC_FPREGS)(a0) # get fpu status - lw sp, (SP * SZREG + _OFFSETOF_SC_REGS)(a0) - lw s8, (S8 * SZREG + _OFFSETOF_SC_REGS)(a0) -#ifndef SOFTFLOAT ctc1 v0, $31 lwc1 $f20, (20 * 4 + _OFFSETOF_SC_FPREGS)(a0) lwc1 $f21, (21 * 4 + _OFFSETOF_SC_FPREGS)(a0) From owner-p4-projects@FreeBSD.ORG Tue Dec 5 18:53:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A721616A417; Tue, 5 Dec 2006 18:53:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6037216A407 for ; Tue, 5 Dec 2006 18:53:41 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9070043CA5 for ; Tue, 5 Dec 2006 18:53:00 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB5IreNi047772 for ; Tue, 5 Dec 2006 18:53:40 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB5Ireqe047766 for perforce@freebsd.org; Tue, 5 Dec 2006 18:53:40 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 5 Dec 2006 18:53:40 GMT Message-Id: <200612051853.kB5Ireqe047766@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 111155 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 18:53:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=111155 Change 111155 by rdivacky@rdivacky_witten on 2006/12/05 18:53:31 Lint wants /* FALLTHRU */ or /* FALLTHROUGH */ not /* fall through */ I noticed using the latter in the code... maybe we should change the lint? Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#43 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#43 (text+ko) ==== @@ -909,7 +909,7 @@ case 0: args->mode |= S_IFREG; - /* fall through */ + /* FALLTHROUGH */ case S_IFREG: error = kern_open(td, path, UIO_SYSSPACE, O_WRONLY | O_CREAT | O_TRUNC, args->mode); From owner-p4-projects@FreeBSD.ORG Tue Dec 5 21:31:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 053BB16A47C; Tue, 5 Dec 2006 21:31:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D2CEC16A403 for ; Tue, 5 Dec 2006 21:31:05 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC4DC43CB6 for ; Tue, 5 Dec 2006 21:30:21 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB5LV357084708 for ; Tue, 5 Dec 2006 21:31:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB5LV2SL084705 for perforce@freebsd.org; Tue, 5 Dec 2006 21:31:02 GMT (envelope-from sam@freebsd.org) Date: Tue, 5 Dec 2006 21:31:02 GMT Message-Id: <200612052131.kB5LV2SL084705@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111160 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 21:31:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=111160 Change 111160 by sam@sam_ebb on 2006/12/05 21:30:35 Plan B: instead of splitting the cryptosoft driver out as a separate driver/module lump it back into the crypto module as done prior to kobj'ification of crypto drivers. To deal with the ordering requirements of module unload and driver detach use explicit metadata linkage. A tad awkward but seesm to work. Thanks to jhb for guidance. Affected files ... .. //depot/projects/crypto/sys/conf/files#4 edit .. //depot/projects/crypto/sys/modules/Makefile#3 edit .. //depot/projects/crypto/sys/modules/crypto/Makefile#4 edit .. //depot/projects/crypto/sys/modules/cryptosoft/Makefile#2 delete .. //depot/projects/crypto/sys/opencrypto/crypto.c#7 edit .. //depot/projects/crypto/sys/opencrypto/cryptosoft.c#4 edit Differences ... ==== //depot/projects/crypto/sys/conf/files#4 (text+ko) ==== @@ -1902,7 +1902,7 @@ opencrypto/crypto.c optional crypto opencrypto/cryptodev.c optional cryptodev opencrypto/cryptodev_if.m optional crypto -opencrypto/cryptosoft.c optional cryptosoft +opencrypto/cryptosoft.c optional crypto opencrypto/deflate.c optional crypto opencrypto/rmd160.c optional crypto | ipsec opencrypto/skipjack.c optional crypto ==== //depot/projects/crypto/sys/modules/Makefile#3 (text+ko) ==== @@ -58,7 +58,6 @@ ${_cpufreq} \ ${_crypto} \ ${_cryptodev} \ - ${_cryptosoft} \ ${_cs} \ ${_ctau} \ cue \ @@ -313,7 +312,6 @@ .if exists(${.CURDIR}/../opencrypto) _crypto= crypto _cryptodev= cryptodev -_cryptosoft= cryptosoft .endif .if exists(${.CURDIR}/../crypto) _random= random ==== //depot/projects/crypto/sys/modules/crypto/Makefile#4 (text+ko) ==== @@ -9,7 +9,7 @@ KMOD = crypto SRCS = crypto.c cryptodev_if.c -SRCS += criov.c xform.c +SRCS += criov.c cryptosoft.c xform.c SRCS += cast.c deflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c SRCS += skipjack.c bf_enc.c bf_skey.c SRCS += des_ecb.c des_enc.c des_setkey.c ==== //depot/projects/crypto/sys/opencrypto/crypto.c#7 (text+ko) ==== @@ -286,38 +286,6 @@ mtx_destroy(&crypto_drivers_mtx); } -/* - * Initialization code, both for static and dynamic loading. - */ -static int -crypto_modevent(module_t mod, int type, void *unused) -{ - int error = EINVAL; - - switch (type) { - case MOD_LOAD: - error = crypto_init(); - if (error == 0 && bootverbose) - printf("crypto: \n"); - break; - case MOD_UNLOAD: - /*XXX disallow if active sessions */ - error = 0; - crypto_destroy(); - return 0; - } - return error; -} - -static moduledata_t crypto_mod = { - "crypto", - crypto_modevent, - 0 -}; -MODULE_VERSION(crypto, 1); -DECLARE_MODULE(crypto, crypto_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); -MODULE_DEPEND(crypto, zlib, 1, 1, 1); - static struct cryptocap * crypto_checkdriver(u_int32_t hid) { @@ -1462,3 +1430,34 @@ crypto_finis(&crp_ret_q); } + +int crypto_modevent(module_t mod, int type, void *unused); + +/* + * Initialization code, both for static and dynamic loading. + * Note this is not invoked with the usual MODULE_DECLARE + * mechanism but instead is listed as a dependency by the + * cryptosoft driver. This guarantees proper ordering of + * calls on module load/unload. + */ +int +crypto_modevent(module_t mod, int type, void *unused) +{ + int error = EINVAL; + + switch (type) { + case MOD_LOAD: + error = crypto_init(); + if (error == 0 && bootverbose) + printf("crypto: \n"); + break; + case MOD_UNLOAD: + /*XXX disallow if active sessions */ + error = 0; + crypto_destroy(); + return 0; + } + return error; +} +MODULE_VERSION(crypto, 1); +MODULE_DEPEND(crypto, zlib, 1, 1, 1); ==== //depot/projects/crypto/sys/opencrypto/cryptosoft.c#4 (text+ko) ==== @@ -1053,7 +1053,15 @@ }; static devclass_t swcr_devclass; +/* + * NB: We explicitly reference the crypto module so we + * get the necessary ordering when built as a loadable + * module. This is required because we bundle the crypto + * module code together with the cryptosoft driver (otherwise + * normal module dependencies would handle things). + */ +extern int crypto_modevent(struct module *, int, void *); /* XXX where to attach */ -DRIVER_MODULE(cryptosoft, nexus, swcr_driver, swcr_devclass, 0, 0); +DRIVER_MODULE(cryptosoft, nexus, swcr_driver, swcr_devclass, crypto_modevent,0); MODULE_VERSION(cryptosoft, 1); MODULE_DEPEND(cryptosoft, crypto, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Tue Dec 5 22:05:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C323616A40F; Tue, 5 Dec 2006 22:05:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7A43116A403 for ; Tue, 5 Dec 2006 22:05:49 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4A4243C9D for ; Tue, 5 Dec 2006 22:05:07 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB5M5nZD092172 for ; Tue, 5 Dec 2006 22:05:49 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB5M5mES092169 for perforce@freebsd.org; Tue, 5 Dec 2006 22:05:48 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 5 Dec 2006 22:05:48 GMT Message-Id: <200612052205.kB5M5mES092169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111162 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 22:05:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=111162 Change 111162 by mjacob@newisp on 2006/12/05 22:04:59 Begin another process of cleanup where we try to follow the Fusion spec a bit more closely and be a bit more generic in our endian cleanliness. Affected files ... .. //depot/projects/newisp/dev/mpt/mpt.c#6 edit .. //depot/projects/newisp/dev/mpt/mpt.h#8 edit .. //depot/projects/newisp/dev/mpt/mpt_cam.c#19 edit .. //depot/projects/newisp/dev/mpt/mpt_cam.h#2 edit .. //depot/projects/newisp/dev/mpt/mpt_debug.c#2 edit .. //depot/projects/newisp/dev/mpt/mpt_raid.c#6 edit Differences ... ==== //depot/projects/newisp/dev/mpt/mpt.c#6 (text+ko) ==== @@ -128,7 +128,7 @@ static int mpt_send_event_request(struct mpt_softc *mpt, int onoff); static int mpt_soft_reset(struct mpt_softc *mpt); static void mpt_hard_reset(struct mpt_softc *mpt); -static int mpt_configure_ioc(struct mpt_softc *mpt); +static int mpt_configure_ioc(struct mpt_softc *mpt, int, int); static int mpt_enable_ioc(struct mpt_softc *mpt, int); /************************* Personality Module Support *************************/ @@ -1484,25 +1484,27 @@ f_req.Function = MPI_FUNCTION_IOC_FACTS; f_req.MsgContext = htole32(MPT_REPLY_HANDLER_HANDSHAKE); error = mpt_send_handshake_cmd(mpt, sizeof f_req, &f_req); - if (error) + if (error) { return(error); + } error = mpt_recv_handshake_reply(mpt, sizeof (*freplp), freplp); return (error); } static int -mpt_get_portfacts(struct mpt_softc *mpt, MSG_PORT_FACTS_REPLY *freplp) +mpt_get_portfacts(struct mpt_softc *mpt, U8 port, MSG_PORT_FACTS_REPLY *freplp) { MSG_PORT_FACTS f_req; int error; - /* XXX: Only getting PORT FACTS for Port 0 */ memset(&f_req, 0, sizeof f_req); f_req.Function = MPI_FUNCTION_PORT_FACTS; + f_req.PortNumber = port; f_req.MsgContext = htole32(MPT_REPLY_HANDLER_HANDSHAKE); error = mpt_send_handshake_cmd(mpt, sizeof f_req, &f_req); - if (error) + if (error) { return(error); + } error = mpt_recv_handshake_reply(mpt, sizeof (*freplp), freplp); return (error); } @@ -1523,8 +1525,8 @@ memset(&init, 0, sizeof init); init.WhoInit = who; init.Function = MPI_FUNCTION_IOC_INIT; - init.MaxDevices = mpt->mpt_max_devices; - init.MaxBuses = 1; + init.MaxDevices = 0; /* at least 256 devices per bus */ + init.MaxBuses = 16; /* at least 16 busses */ init.MsgVersion = htole16(MPI_VERSION); init.HeaderVersion = htole16(MPI_HEADER_VERSION); @@ -1759,17 +1761,10 @@ return (rv); } -#if __FreeBSD_version >= 500000 - mpt_lprt(mpt, MPT_PRT_DEBUG, "IOC Page 2 Header: ver %x, len %zx, " - "num %x, type %x\n", hdr.PageVersion, - hdr.PageLength * sizeof(uint32_t), - hdr.PageNumber, hdr.PageType); -#else - mpt_lprt(mpt, MPT_PRT_DEBUG, "IOC Page 2 Header: ver %x, len %z, " - "num %x, type %x\n", hdr.PageVersion, - hdr.PageLength * sizeof(uint32_t), - hdr.PageNumber, hdr.PageType); -#endif + mpt_lprt(mpt, MPT_PRT_DEBUG, + "IOC Page 2 Header: Version %x len %x PageNumber %x PageType %x\n", + hdr.PageVersion, hdr.PageLength << 2, + hdr.PageNumber, hdr.PageType); len = hdr.PageLength * sizeof(uint32_t); mpt->ioc_page2 = malloc(len, M_DEVBUF, M_NOWAIT | M_ZERO); @@ -1786,6 +1781,7 @@ mpt_raid_free_mem(mpt); return (EIO); } + mpt2host_config_page_ioc2(mpt->ioc_page2); if (mpt->ioc_page2->CapabilitiesFlags != 0) { uint32_t mask; @@ -2107,11 +2103,8 @@ mpt_core_attach(struct mpt_softc *mpt) { int val; - int error; - LIST_INIT(&mpt->ack_frames); - /* Put all request buffers on the free list */ TAILQ_INIT(&mpt->request_pending_list); TAILQ_INIT(&mpt->request_free_list); @@ -2121,24 +2114,17 @@ req->state = REQ_STATE_ALLOCATED; mpt_free_request(mpt, req); } - for (val = 0; val < MPT_MAX_LUNS; val++) { STAILQ_INIT(&mpt->trt[val].atios); STAILQ_INIT(&mpt->trt[val].inots); } STAILQ_INIT(&mpt->trt_wildcard.atios); STAILQ_INIT(&mpt->trt_wildcard.inots); - mpt->scsi_tgt_handler_id = MPT_HANDLER_ID_NONE; - mpt_sysctl_attach(mpt); - mpt_lprt(mpt, MPT_PRT_DEBUG, "doorbell req = %s\n", mpt_ioc_diag(mpt_read(mpt, MPT_OFFSET_DOORBELL))); - - error = mpt_configure_ioc(mpt); - - return (error); + return (mpt_configure_ioc(mpt, 0, 0)); } int @@ -2197,6 +2183,9 @@ void mpt_core_detach(struct mpt_softc *mpt) { + /* + * XXX: FREE MEMORY + */ mpt_disable_ints(mpt); } @@ -2337,226 +2326,239 @@ * once at instance startup. */ static int -mpt_configure_ioc(struct mpt_softc *mpt) +mpt_configure_ioc(struct mpt_softc *mpt, int tn, int needreset) { - MSG_PORT_FACTS_REPLY pfp; - MSG_IOC_FACTS_REPLY facts; - int try; - int needreset; - uint32_t max_chain_depth; + PTR_MSG_PORT_FACTS_REPLY pfp; + int error, port; + size_t len; - needreset = 0; - for (try = 0; try < MPT_MAX_TRYS; try++) { + if (tn == MPT_MAX_TRYS) { + return (-1); + } - /* - * No need to reset if the IOC is already in the READY state. - * - * Force reset if initialization failed previously. - * Note that a hard_reset of the second channel of a '929 - * will stop operation of the first channel. Hopefully, if the - * first channel is ok, the second will not require a hard - * reset. - */ - if (needreset || MPT_STATE(mpt_rd_db(mpt)) != - MPT_DB_STATE_READY) { - if (mpt_reset(mpt, FALSE) != MPT_OK) { - continue; - } + /* + * No need to reset if the IOC is already in the READY state. + * + * Force reset if initialization failed previously. + * Note that a hard_reset of the second channel of a '929 + * will stop operation of the first channel. Hopefully, if the + * first channel is ok, the second will not require a hard + * reset. + */ + if (needreset || MPT_STATE(mpt_rd_db(mpt)) != MPT_DB_STATE_READY) { + if (mpt_reset(mpt, FALSE) != MPT_OK) { + return (mpt_configure_ioc(mpt, tn++, 1)); } needreset = 0; + } - if (mpt_get_iocfacts(mpt, &facts) != MPT_OK) { - mpt_prt(mpt, "mpt_get_iocfacts failed\n"); - needreset = 1; - continue; - } + if (mpt_get_iocfacts(mpt, &mpt->ioc_facts) != MPT_OK) { + mpt_prt(mpt, "mpt_get_iocfacts failed\n"); + return (mpt_configure_ioc(mpt, tn++, 1)); + } + mpt2host_iocfacts_reply(&mpt->ioc_facts); - mpt->mpt_global_credits = le16toh(facts.GlobalCredits); - mpt->request_frame_size = le16toh(facts.RequestFrameSize); - mpt->ioc_facts_flags = facts.Flags; - mpt_prt(mpt, "MPI Version=%d.%d.%d.%d\n", - le16toh(facts.MsgVersion) >> 8, - le16toh(facts.MsgVersion) & 0xFF, - le16toh(facts.HeaderVersion) >> 8, - le16toh(facts.HeaderVersion) & 0xFF); + mpt_prt(mpt, "MPI Version=%d.%d.%d.%d\n", + mpt->ioc_facts.MsgVersion >> 8, + mpt->ioc_facts.MsgVersion & 0xFF, + mpt->ioc_facts.HeaderVersion >> 8, + mpt->ioc_facts.HeaderVersion & 0xFF); - /* - * Now that we know request frame size, we can calculate - * the actual (reasonable) segment limit for read/write I/O. - * - * This limit is constrained by: - * - * + The size of each area we allocate per command (and how - * many chain segments we can fit into it). - * + The total number of areas we've set up. - * + The actual chain depth the card will allow. - * - * The first area's segment count is limited by the I/O request - * at the head of it. We cannot allocate realistically more - * than MPT_MAX_REQUESTS areas. Therefore, to account for both - * conditions, we'll just start out with MPT_MAX_REQUESTS-2. - * - */ - max_chain_depth = facts.MaxChainDepth; + /* + * Now that we know request frame size, we can calculate + * the actual (reasonable) segment limit for read/write I/O. + * + * This limit is constrained by: + * + * + The size of each area we allocate per command (and how + * many chain segments we can fit into it). + * + The total number of areas we've set up. + * + The actual chain depth the card will allow. + * + * The first area's segment count is limited by the I/O request + * at the head of it. We cannot allocate realistically more + * than MPT_MAX_REQUESTS areas. Therefore, to account for both + * conditions, we'll just start out with MPT_MAX_REQUESTS-2. + * + */ + /* total number of request areas we (can) allocate */ + mpt->max_seg_cnt = MPT_MAX_REQUESTS(mpt) - 2; - /* total number of request areas we (can) allocate */ - mpt->max_seg_cnt = MPT_MAX_REQUESTS(mpt) - 2; + /* converted to the number of chain areas possible */ + mpt->max_seg_cnt *= MPT_NRFM(mpt); - /* converted to the number of chain areas possible */ - mpt->max_seg_cnt *= MPT_NRFM(mpt); + /* limited by the number of chain areas the card will support */ + if (mpt->max_seg_cnt > mpt->ioc_facts.MaxChainDepth) { + mpt_lprt(mpt, MPT_PRT_DEBUG, + "chain depth limited to %u (from %u)\n", + mpt->ioc_facts.MaxChainDepth, mpt->max_seg_cnt); + mpt->max_seg_cnt = mpt->ioc_facts.MaxChainDepth; + } - /* limited by the number of chain areas the card will support */ - if (mpt->max_seg_cnt > max_chain_depth) { - mpt_lprt(mpt, MPT_PRT_DEBUG, - "chain depth limited to %u (from %u)\n", - max_chain_depth, mpt->max_seg_cnt); - mpt->max_seg_cnt = max_chain_depth; - } + /* converted to the number of simple sges in chain segments. */ + mpt->max_seg_cnt *= (MPT_NSGL(mpt) - 1); - /* converted to the number of simple sges in chain segments. */ - mpt->max_seg_cnt *= (MPT_NSGL(mpt) - 1); + mpt_lprt(mpt, MPT_PRT_DEBUG, "Maximum Segment Count: %u\n", + mpt->max_seg_cnt); + mpt_lprt(mpt, MPT_PRT_DEBUG, "MsgLength=%u IOCNumber = %d\n", + mpt->ioc_facts.MsgLength, mpt->ioc_facts.IOCNumber); + mpt_lprt(mpt, MPT_PRT_DEBUG, + "IOCFACTS: GlobalCredits=%d BlockSize=%u bytes " + "Request Frame Size %u bytes Max Chain Depth %u\n", + mpt->ioc_facts.GlobalCredits, mpt->ioc_facts.BlockSize, + mpt->ioc_facts.RequestFrameSize << 2, + mpt->ioc_facts.MaxChainDepth); + mpt_lprt(mpt, MPT_PRT_DEBUG, "IOCFACTS: Num Ports %d, FWImageSize %d, " + "Flags=%#x\n", mpt->ioc_facts.NumberOfPorts, + mpt->ioc_facts.FWImageSize, mpt->ioc_facts.Flags); - mpt_lprt(mpt, MPT_PRT_DEBUG, - "Maximum Segment Count: %u\n", mpt->max_seg_cnt); - mpt_lprt(mpt, MPT_PRT_DEBUG, - "MsgLength=%u IOCNumber = %d\n", - facts.MsgLength, facts.IOCNumber); - mpt_lprt(mpt, MPT_PRT_DEBUG, - "IOCFACTS: GlobalCredits=%d BlockSize=%u bytes " - "Request Frame Size %u bytes Max Chain Depth %u\n", - mpt->mpt_global_credits, facts.BlockSize, - mpt->request_frame_size << 2, max_chain_depth); - mpt_lprt(mpt, MPT_PRT_DEBUG, - "IOCFACTS: Num Ports %d, FWImageSize %d, " - "Flags=%#x\n", facts.NumberOfPorts, - le32toh(facts.FWImageSize), facts.Flags); + len = mpt->ioc_facts.NumberOfPorts * sizeof (MSG_PORT_FACTS_REPLY); + mpt->port_facts = malloc(len, M_DEVBUF, M_NOWAIT | M_ZERO); + if (mpt->port_facts == NULL) { + mpt_prt(mpt, "unable to allocate memory for port facts\n"); + return (ENOMEM); + } - if ((facts.Flags & MPI_IOCFACTS_FLAGS_FW_DOWNLOAD_BOOT) != 0) { - struct mpt_map_info mi; - int error; + if ((mpt->ioc_facts.Flags & MPI_IOCFACTS_FLAGS_FW_DOWNLOAD_BOOT) && + (mpt->fw_uploaded == 0)) { + struct mpt_map_info mi; - /* - * In some configurations, the IOC's firmware is - * stored in a shared piece of system NVRAM that - * is only accessable via the BIOS. In this - * case, the firmware keeps a copy of firmware in - * RAM until the OS driver retrieves it. Once - * retrieved, we are responsible for re-downloading - * the firmware after any hard-reset. - */ - mpt->fw_image_size = le32toh(facts.FWImageSize); - error = mpt_dma_tag_create(mpt, mpt->parent_dmat, - /*alignment*/1, /*boundary*/0, - /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, - /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, - /*filterarg*/NULL, mpt->fw_image_size, - /*nsegments*/1, /*maxsegsz*/mpt->fw_image_size, - /*flags*/0, &mpt->fw_dmat); - if (error != 0) { - mpt_prt(mpt, "cannot create fw dma tag\n"); - return (ENOMEM); - } - error = bus_dmamem_alloc(mpt->fw_dmat, - (void **)&mpt->fw_image, BUS_DMA_NOWAIT, - &mpt->fw_dmap); - if (error != 0) { - mpt_prt(mpt, "cannot allocate fw mem.\n"); - bus_dma_tag_destroy(mpt->fw_dmat); - return (ENOMEM); - } - mi.mpt = mpt; - mi.error = 0; - bus_dmamap_load(mpt->fw_dmat, mpt->fw_dmap, - mpt->fw_image, mpt->fw_image_size, mpt_map_rquest, - &mi, 0); - mpt->fw_phys = mi.phys; - - error = mpt_upload_fw(mpt); - if (error != 0) { - mpt_prt(mpt, "fw upload failed.\n"); - bus_dmamap_unload(mpt->fw_dmat, mpt->fw_dmap); - bus_dmamem_free(mpt->fw_dmat, mpt->fw_image, - mpt->fw_dmap); - bus_dma_tag_destroy(mpt->fw_dmat); - mpt->fw_image = NULL; - return (EIO); - } + /* + * In some configurations, the IOC's firmware is + * stored in a shared piece of system NVRAM that + * is only accessable via the BIOS. In this + * case, the firmware keeps a copy of firmware in + * RAM until the OS driver retrieves it. Once + * retrieved, we are responsible for re-downloading + * the firmware after any hard-reset. + */ + mpt->fw_image_size = mpt->ioc_facts.FWImageSize; + error = mpt_dma_tag_create(mpt, mpt->parent_dmat, 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, + mpt->fw_image_size, 1, mpt->fw_image_size, 0, + &mpt->fw_dmat); + if (error != 0) { + mpt_prt(mpt, "cannot create firmwarew dma tag\n"); + return (ENOMEM); + } + error = bus_dmamem_alloc(mpt->fw_dmat, + (void **)&mpt->fw_image, BUS_DMA_NOWAIT, &mpt->fw_dmap); + if (error != 0) { + mpt_prt(mpt, "cannot allocate firmware memory\n"); + bus_dma_tag_destroy(mpt->fw_dmat); + return (ENOMEM); } + mi.mpt = mpt; + mi.error = 0; + bus_dmamap_load(mpt->fw_dmat, mpt->fw_dmap, + mpt->fw_image, mpt->fw_image_size, mpt_map_rquest, &mi, 0); + mpt->fw_phys = mi.phys; - if (mpt_get_portfacts(mpt, &pfp) != MPT_OK) { - mpt_prt(mpt, "mpt_get_portfacts failed\n"); - needreset = 1; - continue; + error = mpt_upload_fw(mpt); + if (error != 0) { + mpt_prt(mpt, "firmware upload failed.\n"); + bus_dmamap_unload(mpt->fw_dmat, mpt->fw_dmap); + bus_dmamem_free(mpt->fw_dmat, mpt->fw_image, + mpt->fw_dmap); + bus_dma_tag_destroy(mpt->fw_dmat); + mpt->fw_image = NULL; + return (EIO); } + mpt->fw_uploaded = 1; + } - mpt_lprt(mpt, MPT_PRT_DEBUG, - "PORTFACTS: Type %x PFlags %x IID %d MaxDev %d\n", - pfp.PortType, pfp.ProtocolFlags, pfp.PortSCSIID, - pfp.MaxDevices); - - mpt->mpt_port_type = pfp.PortType; - mpt->mpt_proto_flags = le16toh(pfp.ProtocolFlags); - if (pfp.PortType != MPI_PORTFACTS_PORTTYPE_SCSI && - pfp.PortType != MPI_PORTFACTS_PORTTYPE_SAS && - pfp.PortType != MPI_PORTFACTS_PORTTYPE_FC) { - mpt_prt(mpt, "Unsupported Port Type (%x)\n", - pfp.PortType); - return (ENXIO); + for (port = 0; port < mpt->ioc_facts.NumberOfPorts; port++) { + pfp = &mpt->port_facts[port]; + error = mpt_get_portfacts(mpt, 0, pfp); + if (error != MPT_OK) { + mpt_prt(mpt, + "mpt_get_portfacts on port %d failed\n", port); + free(mpt->port_facts, M_DEVBUF); + mpt->port_facts = NULL; + return (mpt_configure_ioc(mpt, tn++, 1)); } - mpt->mpt_max_tgtcmds = le16toh(pfp.MaxPostedCmdBuffers); + mpt2host_portfacts_reply(pfp); - if (pfp.PortType == MPI_PORTFACTS_PORTTYPE_FC) { - mpt->is_fc = 1; - mpt->is_sas = 0; - mpt->is_spi = 0; - } else if (pfp.PortType == MPI_PORTFACTS_PORTTYPE_SAS) { - mpt->is_fc = 0; - mpt->is_sas = 1; - mpt->is_spi = 0; + if (port > 0) { + error = MPT_PRT_INFO; } else { - mpt->is_fc = 0; - mpt->is_sas = 0; - mpt->is_spi = 1; + error = MPT_PRT_DEBUG; } - mpt->mpt_ini_id = pfp.PortSCSIID; - mpt->mpt_max_devices = pfp.MaxDevices; + mpt_lprt(mpt, error, + "PORTFACTS[%d]: Type %x PFlags %x IID %d MaxDev %d\n", + port, pfp->PortType, pfp->ProtocolFlags, pfp->PortSCSIID, + pfp->MaxDevices); + + } + + /* + * XXX: Not yet supporting more than port 0 + */ + pfp = &mpt->port_facts[0]; + if (pfp->PortType == MPI_PORTFACTS_PORTTYPE_FC) { + mpt->is_fc = 1; + mpt->is_sas = 0; + mpt->is_spi = 0; + } else if (pfp->PortType == MPI_PORTFACTS_PORTTYPE_SAS) { + mpt->is_fc = 0; + mpt->is_sas = 1; + mpt->is_spi = 0; + } else if (pfp->PortType == MPI_PORTFACTS_PORTTYPE_SCSI) { + mpt->is_fc = 0; + mpt->is_sas = 0; + mpt->is_spi = 1; + } else if (pfp->PortType == MPI_PORTFACTS_PORTTYPE_ISCSI) { + mpt_prt(mpt, "iSCSI not supported yet\n"); + return (ENXIO); + } else if (pfp->PortType == MPI_PORTFACTS_PORTTYPE_INACTIVE) { + mpt_prt(mpt, "Inactive Port\n"); + return (ENXIO); + } else { + mpt_prt(mpt, "unknown Port Type %#x\n", pfp->PortType); + return (ENXIO); + } - /* - * Set our role with what this port supports. - * - * Note this might be changed later in different modules - * if this is different from what is wanted. - */ - mpt->role = MPT_ROLE_NONE; - if (mpt->mpt_proto_flags & MPI_PORTFACTS_PROTOCOL_INITIATOR) { - mpt->role |= MPT_ROLE_INITIATOR; - } - if (mpt->mpt_proto_flags & MPI_PORTFACTS_PROTOCOL_TARGET) { - mpt->role |= MPT_ROLE_TARGET; - } - if (mpt_enable_ioc(mpt, 0) != MPT_OK) { - mpt_prt(mpt, "unable to initialize IOC\n"); - return (ENXIO); - } + if (pfp->ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LAN) { + mpt_prt(mpt, "not supporting LAN protocol\n"); + return (ENXIO); + } - /* - * Read IOC configuration information. - * - * We need this to determine whether or not we have certain - * settings for Integrated Mirroring (e.g.). - */ - mpt_read_config_info_ioc(mpt); + if (pfp->ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LOGBUSADDR) { + mpt_prt(mpt, "not supporting Logical Bus Address protocol\n"); + return (ENXIO); + } - /* Everything worked */ - break; + /* + * Set our role with what this port supports. + * + * Note this might be changed later in different modules + * if this is different from what is wanted. + */ + mpt->role = MPT_ROLE_NONE; + if (pfp->ProtocolFlags & MPI_PORTFACTS_PROTOCOL_INITIATOR) { + mpt->role |= MPT_ROLE_INITIATOR; + } + if (pfp->ProtocolFlags & MPI_PORTFACTS_PROTOCOL_TARGET) { + mpt->role |= MPT_ROLE_TARGET; } - if (try >= MPT_MAX_TRYS) { - mpt_prt(mpt, "failed to initialize IOC"); - return (EIO); + /* + * Enable the IOC + */ + if (mpt_enable_ioc(mpt, 0) != MPT_OK) { + mpt_prt(mpt, "unable to initialize IOC\n"); + return (ENXIO); } + /* + * Read IOC configuration information. + * + * We need this to determine whether or not we have certain + * settings for Integrated Mirroring (e.g.). + */ + mpt_read_config_info_ioc(mpt); + return (0); } @@ -2588,7 +2590,7 @@ (pptr + MPT_REPLY_SIZE) < (mpt->reply_phys + PAGE_SIZE); pptr += MPT_REPLY_SIZE) { mpt_free_reply(mpt, pptr); - if (++val == mpt->mpt_global_credits - 1) + if (++val == mpt->ioc_facts.GlobalCredits - 1) break; } @@ -2610,3 +2612,92 @@ } return (MPT_OK); } + +/* + * Endian Conversion Functions- only used on Big Endian machines + */ +#if _BYTE_ORDER == _BIG_ENDIAN +void +mpt2host_sge_simple_union(SGE_SIMPLE_UNION *sge) +{ + MPT_2_HOST32(sge, FlagsLength); + MPT_2_HOST64(sge, u.Address64); +}; + +void +mpt2host_iocfacts_reply(MSG_IOC_FACTS_REPLY *rp) +{ + MPT_2_HOST16(rp, MsgVersion); + MPT_2_HOST16(rp, HeaderVersion); + MPT_2_HOST32(rp, MsgContext); + MPT_2_HOST16(rp, IOCExceptions); + MPT_2_HOST16(rp, IOCStatus); + MPT_2_HOST32(rp, IOCLogInfo); + MPT_2_HOST16(rp, ReplyQueueDepth); + MPT_2_HOST16(rp, RequestFrameSize); + MPT_2_HOST16(rp, Reserved_0101_FWVersion); + MPT_2_HOST16(rp, ProductID); + MPT_2_HOST32(rp, CurrentHostMfaHighAddr); + MPT_2_HOST16(rp, GlobalCredits); + MPT_2_HOST32(rp, CurrentSenseBufferHighAddr); + MPT_2_HOST16(rp, CurReplyFrameSize); + MPT_2_HOST32(rp, FWImageSize); + MPT_2_HOST32(rp, IOCCapabilities); + MPT_2_HOST32(rp, FWVersion.Word); + MPT_2_HOST16(rp, HighPriorityQueueDepth); + MPT_2_HOST16(rp, Reserved2); + mpt2host_sge_simple_union(&rp->HostPageBufferSGE); + MPT_2_HOST32(rp, ReplyFifoHostSignalingAddr); +} + +void +mpt2host_portfacts_reply(MSG_PORT_FACTS_REPLY *pfp) +{ + MPT_2_HOST16(pfp, Reserved); + MPT_2_HOST16(pfp, Reserved1); + MPT_2_HOST32(pfp, MsgContext); + MPT_2_HOST16(pfp, Reserved2); + MPT_2_HOST16(pfp, IOCStatus); + MPT_2_HOST32(pfp, IOCLogInfo); + MPT_2_HOST16(pfp, MaxDevices); + MPT_2_HOST16(pfp, PortSCSIID); + MPT_2_HOST16(pfp, ProtocolFlags); + MPT_2_HOST16(pfp, MaxPostedCmdBuffers); + MPT_2_HOST16(pfp, MaxPersistentIDs); + MPT_2_HOST16(pfp, MaxLanBuckets); + MPT_2_HOST16(pfp, Reserved4); + MPT_2_HOST32(pfp, Reserved5); +} +void +mpt2host_config_page_ioc2(CONFIG_PAGE_IOC_2 *ioc2) +{ + int i; + ioc2->CapabilitiesFlags = htole32(ioc2->CapabilitiesFlags); + for (i = 0; i < MPI_IOC_PAGE_2_RAID_VOLUME_MAX; i++) { + MPT_2_HOST16(ioc2->RaidVolume[i].Reserved3); + } +} + +void +mpt2host_config_page_raid_vol_0(CONFIG_PAGE_RAID_VOL_0 *volp) +{ + int i; + MPT_2_HOST16(volp, VolumeStatus.Reserved); + MPT_2_HOST16(volp, VolumeSettings.Settings); + MPT_2_HOST32(volp, MaxLBA); + MPT_2_HOST32(volp, Reserved1); + MPT_2_HOST32(volp, StripeSize); + MPT_2_HOST32(volp, Reserved2); + MPT_2_HOST32(volp, Reserved3); + for (i = 0; i < MPI_RAID_VOL_PAGE_0_PHYSDISK_MAX; i++) { + MPT_2_HOST16(volpd, PhysDisk[i].Reserved); + } +} + +void +mpt2host_mpi_raid_vol_indicator(MPI_RAID_VOL_INDICATOR *vi) +{ + MPT_2_HOST16(vi, TotalBlocks); + MPT_2_HOST16(vi, BlocksRemaining); +} +#endif ==== //depot/projects/newisp/dev/mpt/mpt.h#8 (text+ko) ==== @@ -155,6 +155,9 @@ /* XXX For mpt_debug.c */ #include +#define MPT_S64_2_SCALAR(y) ((((int64_t)y.High) << 32) | (y.Low)) +#define MPT_U64_2_SCALAR(y) ((((uint64_t)y.High) << 32) | (y.Low)) + /****************************** Misc Definitions ******************************/ #define MPT_OK (0) #define MPT_FAIL (0x10000) @@ -272,15 +275,29 @@ #endif /********************************** Endianess *********************************/ -static __inline uint64_t -u64toh(U64 s) -{ - uint64_t result; +#define MPT_2_HOST64(ptr, tag) ptr->tag = le64toh(ptr->tag) +#define MPT_2_HOST32(ptr, tag) ptr->tag = le32toh(ptr->tag) +#define MPT_2_HOST16(ptr, tag) ptr->tag = le16toh(ptr->tag) + +#define HOST_2_MPT64(ptr, tag) ptr->tag = htole64(ptr->tag) +#define HOST_2_MPT32(ptr, tag) ptr->tag = htole32(ptr->tag) +#define HOST_2_MPT16(ptr, tag) ptr->tag = htole16(ptr->tag) - result = le32toh(s.Low); - result |= ((uint64_t)le32toh(s.High)) << 32; - return (result); -} +#if _BYTE_ORDER == _LITTLE_ENDIAN +#define mpt2host_sge_simple_union(x) do { ; } while (0) +#define mpt2host_iocfacts_reply(x) do { ; } while (0) +#define mpt2host_portfacts_reply(x) do { ; } while (0) +#define mpt2host_config_page_ioc2(x) do { ; } while (0) +#define mpt2host_config_page_raid_vol_0(x) do { ; } while (0) +#define mpt2host_mpi_raid_vol_indicator(x) do { ; } while (0) +#else +void mpt2host_sge_simple_union(SGE_SIMPLE_UNION *); +void mpt2host_iocfacts_reply(MSG_IOC_FACTS_REPLY *); +void mpt2host_portfacts_reply(MSG_PORT_FACTS_REPLY *); +void mpt2host_config_page_ioc2(CONFIG_PAGE_IOC_2 *); +void mpt2host_config_page_raid_vol_0(CONFIG_PAGE_RAID_VOL_0 *); +void mpt2host_mpi_raid_vol_indicator(MPI_RAID_VOL_INDICATOR *); +#endif /**************************** MPI Transaction State ***************************/ typedef enum { @@ -495,8 +512,10 @@ #endif uint32_t mpt_pers_mask; uint32_t + : 8, unit : 8, - : 2, + : 1, + fw_uploaded : 1, msi_enable : 1, twildcard : 1, tenabled : 1, @@ -520,20 +539,14 @@ /* * IOC Facts */ - uint16_t mpt_global_credits; - uint16_t request_frame_size; - uint16_t mpt_max_devices; - uint8_t mpt_max_buses; - uint8_t ioc_facts_flags; + MSG_IOC_FACTS_REPLY ioc_facts; /* * Port Facts - * XXX - Add multi-port support!. */ - uint16_t mpt_ini_id; - uint16_t mpt_port_type; - uint16_t mpt_proto_flags; - uint16_t mpt_max_tgtcmds; + MSG_PORT_FACTS_REPLY * port_facts; +#define mpt_ini_id port_facts[0].PortSCSIID +#define mpt_max_tgtcmds port_facts[0].MaxPostedCmdBuffers /* * Device Configuration Information @@ -930,7 +943,7 @@ /************************** Scatter Gather Managment **************************/ /* MPT_RQSL- size of request frame, in bytes */ -#define MPT_RQSL(mpt) (mpt->request_frame_size << 2) +#define MPT_RQSL(mpt) (mpt->ioc_facts.RequestFrameSize << 2) /* MPT_NSGL- how many SG entries can fit in a request frame size */ #define MPT_NSGL(mpt) (MPT_RQSL(mpt) / sizeof (SGE_IO_UNION)) ==== //depot/projects/newisp/dev/mpt/mpt_cam.c#19 (text+ko) ==== @@ -211,8 +211,8 @@ int error; TAILQ_INIT(&mpt->request_timeout_list); - maxq = (mpt->mpt_global_credits < MPT_MAX_REQUESTS(mpt))? - mpt->mpt_global_credits : MPT_MAX_REQUESTS(mpt); + maxq = (mpt->ioc_facts.GlobalCredits < MPT_MAX_REQUESTS(mpt))? + mpt->ioc_facts.GlobalCredits : MPT_MAX_REQUESTS(mpt); handler.reply_handler = mpt_scsi_reply_handler; error = mpt_register_handler(mpt, MPT_HANDLER_REPLY, handler, @@ -3136,7 +3136,7 @@ cpi->version_num = 1; cpi->target_sprt = 0; cpi->hba_eng_cnt = 0; - cpi->max_target = mpt->mpt_max_devices - 1; + cpi->max_target = mpt->port_facts[0].MaxDevices - 1; /* * FC cards report MAX_DEVICES of 512, but * the MSG_SCSI_IO_REQUEST target id field ==== //depot/projects/newisp/dev/mpt/mpt_cam.h#2 (text+ko) ==== ==== //depot/projects/newisp/dev/mpt/mpt_debug.c#2 (text+ko) ==== @@ -819,7 +819,7 @@ mpt_dump_request(struct mpt_softc *mpt, request_t *req) { uint32_t *pReq = req->req_vbuf; - int offset; + int o; #if __FreeBSD_version >= 500000 mpt_prt(mpt, "Send Request %d (%jx):", req->index, (uintmax_t) req->req_pbuf); @@ -827,12 +827,12 @@ mpt_prt(mpt, "Send Request %d (%llx):", req->index, (unsigned long long) req->req_pbuf); #endif - for (offset = 0; offset < mpt->request_frame_size; offset++) { - if ((offset & 0x7) == 0) { + for (o = 0; o < mpt->ioc_facts.RequestFrameSize; o++) { + if ((o & 0x7) == 0) { mpt_prtc(mpt, "\n"); mpt_prt(mpt, " "); } - mpt_prtc(mpt, " %08x", pReq[offset]); + mpt_prtc(mpt, " %08x", pReq[o]); } mpt_prtc(mpt, "\n"); } ==== //depot/projects/newisp/dev/mpt/mpt_raid.c#6 (text+ko) ==== @@ -1229,7 +1229,7 @@ static void mpt_refresh_raid_vol(struct mpt_softc *mpt, struct mpt_raid_volume *mpt_vol, - CONFIG_PAGE_IOC_2_RAID_VOL *ioc_vol) + CONFIG_PAGE_IOC_2_RAID_VOL *ioc_vol) { CONFIG_PAGE_RAID_VOL_0 *vol_pg; struct mpt_raid_action_result *ar; @@ -1239,31 +1239,31 @@ vol_pg = mpt_vol->config_page; mpt_vol->flags &= ~MPT_RVF_UP2DATE; - rv = mpt_read_cfg_header(mpt, MPI_CONFIG_PAGETYPE_RAID_VOLUME, - /*PageNumber*/0, ioc_vol->VolumePageNumber, - &vol_pg->Header, /*sleep_ok*/TRUE, - /*timeout_ms*/5000); + + rv = mpt_read_cfg_header(mpt, MPI_CONFIG_PAGETYPE_RAID_VOLUME, 0, + ioc_vol->VolumePageNumber, &vol_pg->Header, TRUE, 5000); if (rv != 0) { - mpt_vol_prt(mpt, mpt_vol, "mpt_refresh_raid_vol: " - "Failed to read RAID Vol Hdr(%d)\n", - ioc_vol->VolumePageNumber); + mpt_vol_prt(mpt, mpt_vol, + "mpt_refresh_raid_vol: Failed to read RAID Vol Hdr(%d)\n", + ioc_vol->VolumePageNumber); return; } + rv = mpt_read_cur_cfg_page(mpt, ioc_vol->VolumePageNumber, - &vol_pg->Header, mpt->raid_page0_len, - /*sleep_ok*/TRUE, /*timeout_ms*/5000); + &vol_pg->Header, mpt->raid_page0_len, TRUE, 5000); if (rv != 0) { - mpt_vol_prt(mpt, mpt_vol, "mpt_refresh_raid_vol: " - "Failed to read RAID Vol Page(%d)\n", - ioc_vol->VolumePageNumber); + mpt_vol_prt(mpt, mpt_vol, + "mpt_refresh_raid_vol: Failed to read RAID Vol Page(%d)\n", + ioc_vol->VolumePageNumber); return; } + mpt2host_config_page_raid_vol_0(vol_pg); + mpt_vol->flags |= MPT_RVF_ACTIVE; /* Update disk entry array data. */ for (i = 0; i < vol_pg->NumPhysDisks; i++) { struct mpt_raid_disk *mpt_disk; - mpt_disk = mpt->raid_disks + vol_pg->PhysDisk[i].PhysDiskNum; mpt_disk->volume = mpt_vol; mpt_disk->member_number = vol_pg->PhysDisk[i].PhysDiskMap; @@ -1276,19 +1276,18 @@ & MPI_RAIDVOL0_STATUS_FLAG_RESYNC_IN_PROGRESS) == 0) return; - req = mpt_get_request(mpt, /*sleep_ok*/TRUE); + req = mpt_get_request(mpt, TRUE); if (req == NULL) { mpt_vol_prt(mpt, mpt_vol, - "mpt_refresh_raid_vol: Get request failed!\n"); + "mpt_refresh_raid_vol: Get request failed!\n"); return; } - rv = mpt_issue_raid_req(mpt, mpt_vol, /*disk*/NULL, req, - MPI_RAID_ACTION_INDICATOR_STRUCT, - /*ActionWord*/0, /*addr*/0, /*len*/0, - /*write*/FALSE, /*wait*/TRUE); + rv = mpt_issue_raid_req(mpt, mpt_vol, NULL, req, + MPI_RAID_ACTION_INDICATOR_STRUCT, 0, 0, 0, FALSE, TRUE); if (rv == ETIMEDOUT) { - mpt_vol_prt(mpt, mpt_vol, "mpt_refresh_raid_vol: " - "Progress indicator fetch timedout!\n"); + mpt_vol_prt(mpt, mpt_vol, + "mpt_refresh_raid_vol: Progress Indicator fetch timeout\n"); + mpt_free_request(mpt, req); return; } @@ -1299,9 +1298,10 @@ memcpy(&mpt_vol->sync_progress, &ar->action_data.indicator_struct, sizeof(mpt_vol->sync_progress)); + mpt2host_mpi_raid_vol_indicator(&mpt_vol->sync_progress); } else { - mpt_vol_prt(mpt, mpt_vol, "mpt_refresh_raid_vol: " - "Progress indicator fetch failed!\n"); + mpt_vol_prt(mpt, mpt_vol, + "mpt_refresh_raid_vol: Progress indicator fetch failed!\n"); } mpt_free_request(mpt, req); } @@ -1414,8 +1414,9 @@ mpt_vol = &mpt->raid_volumes[i]; - if ((mpt_vol->flags & MPT_RVF_ACTIVE) == 0) + if ((mpt_vol->flags & MPT_RVF_ACTIVE) == 0) { continue; + } vol_pg = mpt_vol->config_page; if ((mpt_vol->flags & (MPT_RVF_REFERENCED|MPT_RVF_ANNOUNCED)) @@ -1426,7 +1427,6 @@ } if ((mpt_vol->flags & MPT_RVF_ANNOUNCED) == 0) { - mpt_announce_vol(mpt, mpt_vol); mpt_vol->flags |= MPT_RVF_ANNOUNCED; } @@ -1440,11 +1440,12 @@ mpt_vol->flags |= MPT_RVF_UP2DATE; mpt_vol_prt(mpt, mpt_vol, "%s - %s\n", - mpt_vol_type(mpt_vol), mpt_vol_state(mpt_vol)); + mpt_vol_type(mpt_vol), mpt_vol_state(mpt_vol)); mpt_verify_mwce(mpt, mpt_vol); - if (vol_pg->VolumeStatus.Flags == 0) + if (vol_pg->VolumeStatus.Flags == 0) { continue; + } mpt_vol_prt(mpt, mpt_vol, "Status ("); for (m = 1; m <= 0x80; m <<= 1) { @@ -1473,8 +1474,8 @@ mpt_verify_resync_rate(mpt, mpt_vol); - left = u64toh(mpt_vol->sync_progress.BlocksRemaining); - total = u64toh(mpt_vol->sync_progress.TotalBlocks); + left = MPT_U64_2_SCALAR(mpt_vol->sync_progress.BlocksRemaining); + total = MPT_U64_2_SCALAR(mpt_vol->sync_progress.TotalBlocks); if (vol_pg->ResyncRate != 0) { prio = ((u_int)vol_pg->ResyncRate * 100000) / 0xFF; From owner-p4-projects@FreeBSD.ORG Wed Dec 6 00:01:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4474116A416; Wed, 6 Dec 2006 00:01:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1E09C16A407 for ; Wed, 6 Dec 2006 00:01:19 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13DCC43CA6 for ; Wed, 6 Dec 2006 00:00:37 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB601IxD011856 for ; Wed, 6 Dec 2006 00:01:18 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB601Igq011850 for perforce@freebsd.org; Wed, 6 Dec 2006 00:01:18 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 6 Dec 2006 00:01:18 GMT Message-Id: <200612060001.kB601Igq011850@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111169 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2006 00:01:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=111169 Change 111169 by zec@zec_tpx32 on 2006/12/06 00:01:10 Set V_loif to point to the ifnet corresponding to the "lo0" interface before calling if_attach() for it. This is important since in rt_dispatch() we mark the looped back mbufs to have m_pkthdr.rcvif set to V_loif, so we should guarantee that V_loif will be valid at the time the first PF_ROUTE message will be generated. Could be also that I'm fixing symptomps here and not the causes, i.e. some kind of leakage between vnet instances. XXX. Affected files ... .. //depot/projects/vimage/src/sys/net/if_loop.c#4 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_loop.c#4 (text+ko) ==== @@ -157,6 +157,11 @@ free(sc, M_LO); return (ENOSPC); } +#ifdef VIMAGE + ifp->if_vnetb = curvnetb; +#endif + if (V_loif == NULL) + V_loif = ifp; if_initname(ifp, ifc->ifc_name, unit); ifp->if_mtu = LOMTU; @@ -170,8 +175,6 @@ mtx_lock(&lo_mtx); LIST_INSERT_HEAD(&V_lo_list, sc, sc_next); mtx_unlock(&lo_mtx); - if (V_loif == NULL) - V_loif = ifp; return (0); } From owner-p4-projects@FreeBSD.ORG Wed Dec 6 05:56:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA60F16A412; Wed, 6 Dec 2006 05:56:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 79EEF16A407 for ; Wed, 6 Dec 2006 05:56:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id E27CE43CA6 for ; Wed, 6 Dec 2006 05:55:17 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB65u1rK092212 for ; Wed, 6 Dec 2006 05:56:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB65u1ca092195 for perforce@freebsd.org; Wed, 6 Dec 2006 05:56:01 GMT (envelope-from jb@freebsd.org) Date: Wed, 6 Dec 2006 05:56:01 GMT Message-Id: <200612060556.kB65u1ca092195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 111179 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2006 05:56:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=111179 Change 111179 by jb@jb_freebsd8 on 2006/12/06 05:54:59 Catch up on a few deletions that p4 couldn't handle. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/elf_flagelf.c#3 delete .. //depot/projects/dtrace/src/lib/libelf/gelf_getphdr.c#2 delete .. //depot/projects/dtrace/src/lib/libelf/gelf_getshdr.c#6 delete .. //depot/projects/dtrace/src/lib/libelf/gelf_getsym.c#2 delete .. //depot/projects/dtrace/src/lib/libelf/gelf_newphdr.c#2 delete .. //depot/projects/dtrace/src/lib/libelf/gelf_update.c#5 delete .. //depot/projects/dtrace/src/lib/libelf/gelf_update_ehdr.c#2 delete .. //depot/projects/dtrace/src/lib/libelf/gelf_update_phdr.c#2 delete .. //depot/projects/dtrace/src/lib/libelf/gelf_update_shdr.c#2 delete .. //depot/projects/dtrace/src/lib/libelf/gelf_update_sym.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Dec 6 06:04:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF5E916A412; Wed, 6 Dec 2006 06:04:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 755C616A407 for ; Wed, 6 Dec 2006 06:04:18 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDB3043CA3 for ; Wed, 6 Dec 2006 06:03:34 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB664IWb094899 for ; Wed, 6 Dec 2006 06:04:18 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB664BXA094888 for perforce@freebsd.org; Wed, 6 Dec 2006 06:04:11 GMT (envelope-from jb@freebsd.org) Date: Wed, 6 Dec 2006 06:04:11 GMT Message-Id: <200612060604.kB664BXA094888@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 111180 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2006 06:04:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=111180 Change 111180 by jb@jb_freebsd8 on 2006/12/06 06:04:09 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#11 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#38 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#26 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#19 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/ceri.key#5 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/gabor.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#19 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#19 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gstreamer.mk#6 integrate .. //depot/projects/dtrace/ports/Mk/bsd.lua.mk#6 integrate .. //depot/projects/dtrace/src/bin/hostname/hostname.1#4 integrate .. //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#13 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/groff/tmac/mdoc.local#7 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_barrier.c#5 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_cancel.c#6 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_cond.c#7 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#12 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_sig.c#8 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_umtx.c#7 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_umtx.h#7 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#1 branch .. //depot/projects/dtrace/src/sbin/restore/main.c#4 integrate .. //depot/projects/dtrace/src/sbin/restore/restore.8#5 integrate .. //depot/projects/dtrace/src/sbin/restore/restore.c#4 integrate .. //depot/projects/dtrace/src/sbin/restore/restore.h#4 integrate .. //depot/projects/dtrace/src/sbin/restore/tape.c#5 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#17 integrate .. //depot/projects/dtrace/src/share/man/man4/ata.4#7 integrate .. //depot/projects/dtrace/src/share/man/man4/man4.arm/Makefile#1 branch .. //depot/projects/dtrace/src/share/man/man4/man4.arm/npe.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/npe.4#2 delete .. //depot/projects/dtrace/src/sys/amd64/amd64/minidump_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#19 integrate .. //depot/projects/dtrace/src/sys/amd64/include/pmap.h#9 integrate .. //depot/projects/dtrace/src/sys/cam/cam_periph.c#5 integrate .. //depot/projects/dtrace/src/sys/cam/cam_xpt.c#10 integrate .. //depot/projects/dtrace/src/sys/cam/cam_xpt.h#4 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_cd.c#6 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_da.c#11 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_pass.c#5 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_targ_bh.c#4 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/dc/if_dc.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/dc/if_dcreg.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/gem/if_gemvar.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/hme/if_hme.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/hme/if_hmevar.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/iicbus/iicbb.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/iicbus/iicbus_if.m#5 integrate .. //depot/projects/dtrace/src/sys/dev/iicbus/iiconf.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/iicbus/iiconf.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_target.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/isp/ispvar.h#9 integrate .. //depot/projects/dtrace/src/sys/dev/le/am7990.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/le/am79900.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/le/lance.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/le/lancevar.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#21 integrate .. //depot/projects/dtrace/src/sys/dev/nve/if_nvereg.h#4 integrate .. //depot/projects/dtrace/src/sys/net/if_ppp.c#8 integrate .. //depot/projects/dtrace/src/sys/net/if_pppvar.h#5 integrate .. //depot/projects/dtrace/src/sys/net/ppp_tty.c#6 integrate .. //depot/projects/dtrace/src/sys/nfsclient/bootp_subr.c#5 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_diskless.c#4 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfsdiskless.h#4 integrate .. //depot/projects/dtrace/src/sys/pci/if_xl.c#6 integrate .. //depot/projects/dtrace/src/sys/pci/if_xlreg.h#5 integrate .. //depot/projects/dtrace/src/tools/regression/pthread/cv_cancel1/Makefile#1 branch .. //depot/projects/dtrace/src/tools/regression/pthread/cv_cancel1/cv_cancel1.c#1 branch .. //depot/projects/dtrace/src/usr.bin/bsdiff/bsdiff/bsdiff.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/bsdiff/bspatch/bspatch.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#9 integrate .. //depot/projects/dtrace/src/usr.sbin/adduser/adduser.8#5 integrate .. //depot/projects/dtrace/src/usr.sbin/adduser/rmuser.8#4 integrate .. //depot/projects/dtrace/src/usr.sbin/asf/asf.8#5 integrate .. //depot/projects/dtrace/src/usr.sbin/eeprom/eeprom.8#5 integrate .. //depot/projects/dtrace/www/en/developers.sgml#16 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#14 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#11 (text+ko) ==== @@ -13,7 +13,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.249 2006/10/09 19:28:30 joel Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.251 2006/12/06 00:38:21 ceri Exp $ 1999 @@ -23,6 +23,7 @@ 2003 2004 2005 + 2006 The FreeBSD Documentation Project @@ -1657,13 +1658,8 @@ If you are using FreeBSD 4.0 or later, OpenSSH is included in the base system. If you are using an earlier release, - update and install one of the SSH ports. In general, - you will probably want to get OpenSSH from the - security/openssh port. You - may also wish to check out the original ssh1 in the - security/ssh port, but make - certain you pay attention to its license. Note that both - of these ports cannot be installed at the same time. + update and install OpenSSH from the + security/openssh port. @@ -3393,6 +3389,20 @@ This location is accessible from any machine on the FreeBSD cluster. + + + + I would like to mentor a new committer. What process + do I need to follow? + + + + See the New + Account Creation Procedure document on the internal + pages. + + ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#38 (text+ko) ==== @@ -1,4 +1,4 @@ - + + aaron@FreeBSD.org"> @@ -314,6 +314,8 @@ furuta@FreeBSD.org"> +gabor@FreeBSD.org"> + gad@FreeBSD.org"> gallatin@FreeBSD.org"> ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.12 2005/11/25 21:55:08 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.13 2006/12/05 12:48:15 blackend Exp $ Original revision: 1.219 --> @@ -2145,7 +2145,7 @@ fin prêt pour tout compiler. Compilez le noyau et le monde sur la machine de compilation comme décrit dans la , mais n'installez rien. La - compilation une fois termninée, allez sur la machine de + compilation une fois terminée, allez sur la machine de test, et installez le noyau que vous venez juste de compiler. Si la machine monte /usr/src et /usr/obj via NFS, quand vous @@ -2156,7 +2156,7 @@ mode mono-utilisateur. Une fois à ce niveau, vous pouvez installer le nouveau noyau et monde puis exécuter mergemaster comme vous le feriez - habituellement. Une fois cela effectué, redémmarez + habituellement. Une fois cela effectué, redémarrez pour retourner en mode multi-utilisateur pour cette machine. ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#4 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.23 2006/08/20 20:18:03 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.24 2006/12/05 12:48:15 blackend Exp $ Original revision: 1.242 --> @@ -1505,7 +1505,7 @@ soyez donc patient. Parfois, un lecteur de CDROM SCSI peut être manquant - parce qu'il n'a pas eu suffisement de temps pour répondre + parce qu'il n'a pas eu suffisamment de temps pour répondre à la réinitialisation du bus. Si vous avez un lecteur de CDROM SCSI, veuillez ajouter l'option suivante à la configuration de votre noyau et ) sur la partition racine de votre premier disque. Si le label du disque est endommagé, utilisez &man.disklabel.8; pour repartitionner et libeller le disque - conformément au lable que vous avez imprimé et mis + conformément au label que vous avez imprimé et mis de côté. Utilisez &man.newfs.8; pour recréer les systèmes de fichiers. Remontez la partition racine de la disquette en lecture/écriture (mount -u -o rw @@ -3372,7 +3372,7 @@ Une fois que le système fonctionne à nouveau, faites une sauvegarde sur de nouvelles bandes. Ce qui - a causé la panne ou l perte de données peut se + a causé la panne ou la perte de données peut se reproduire. Une heure de perdue maintenant peut vous épargner d'autres ennuis plus tard. @@ -3569,7 +3569,7 @@ Le nom de l'unité allouée s'affichera sur la sortie standard comme par exemple md4. Pour plus de détails concernant - &man.mdconfig.8;, réferrez-vous à la page de + &man.mdconfig.8;, référez-vous à la page de manuel. Depuis la version &os; 5.1-RELEASE, @@ -3611,7 +3611,7 @@ automatique de sélection d'unité de &man.md.4; pour choisir un périphérique non utilisé. Pour plus de détails au sujet de &man.mdmfs.8;, - réferrez-vous à la page de manuel. + référez-vous à la page de manuel. @@ -4039,7 +4039,7 @@ devient stricte, et plus aucune allocation ne sera possible. Quand l'utilisateur redescend en dessous de la limite souple, le délai de grâce est à nouveau - réaccorder. + réaccordé. Ce qui suit est un exemple de ce que vous pourrez voir en utilisant la commande &man.edquota.8;. Quand vous invoquez @@ -4196,7 +4196,7 @@ sur un autre système pour copier et analyser les données sensibles. - Indépendament de la manière dont un attaquant s'est + Indépendamment de la manière dont un attaquant s'est trouvé en possession d'un disque dur ou a arrêté un ordinateur, le chiffrage de disque basé sur GEOM (gbde) (“GEOM Based Disk ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#3 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.8 2005/11/23 21:05:11 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.9 2006/12/05 12:48:15 blackend Exp $ Original revision: 1.175 --> @@ -821,7 +821,7 @@ étapes importantes pour le projet C'est une liste pour les gens intéressés - uniquement par les annonces occasionnelles d'évenements + uniquement par les annonces occasionnelles d'évènements FreeBSD importants. Cela inclut les annonces d'instantanés et autres versions. Cela comprend également les annonces de nouvelles @@ -1627,7 +1627,7 @@ Les listes de diffusion &os; sont filtrées de plusieurs façons en vue d'éviter la distribution de SPAM, de virus, et tout autre message non-sollicité. - Les opérations de filtrage décritent dans cette + Les opérations de filtrage décries dans cette section ne comprennent pas toutes celles utilisées pour protéger les listes re diffusion. ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#3 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.3 2005/12/31 12:15:15 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.4 2006/12/05 12:48:15 blackend Exp $ Original revision: 1.20 --> @@ -265,7 +265,7 @@ interruption des activités. Quand un miroir existe, cela signifie que le disque B est une copie du disque A. Ou, autre cas, que les disques C+D sont une copie des disques A+B. - Indépendemment de la configuration des disques, l'aspect + Indépendamment de la configuration des disques, l'aspect important est que les données d'un disque ou d'une partition sont dupliquées. Ultérieurement, ces données pourront être plus facilement ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#5 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml,v 1.28 2006/10/15 18:24:59 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml,v 1.29 2006/12/05 12:48:16 blackend Exp $ Original revision: 1.331 --> @@ -703,7 +703,7 @@ Si vous essayez d'installer FreeBSD et que le programme d'installation “plante”, se bloque, - ou présente d'autres disfonctionnements, + ou présente d'autres dysfonctionnements, les premières choses à suspecter sont les disquettes. Essayez de copier les images sur des disquettes neuves et essayez encore. @@ -2030,7 +2030,7 @@ défaut dans cette boîte de dialogue représente la tranche la plus grande possible que vous pouvez créer, qui peut être le plus grand bloc - d'espace contigüe non alloué ou la taille de + d'espace contiguë non alloué ou la taille de l'intégralité du disque dur. Si vous avez déjà fait de la place pour FreeBSD @@ -3751,7 +3751,7 @@ [ Yes ] No - Confirmez que l'abbréviation pour le fuseau horaire est + Confirmez que l'abréviation pour le fuseau horaire est correcte. Si cela semble bon, appuyez sur Enter pour continuer avec la configuration de post-installation. ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#4 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.15 2006/04/11 20:14:45 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.16 2006/12/05 12:48:16 blackend Exp $ Original revision: 1.114 --> @@ -275,11 +275,11 @@ La seule limite aux domaines d'application auxquels FreeBSD peut satisfaire est votre propre imagination. Du développement de logiciels à la production robotisée, de la gestion - de stocks à la correction d'azimuth pour les antennes + de stocks à la correction d'azimut pour les antennes satellites; si un &unix; commercial peut le faire, il y a de très fortes chances que FreeBSD le puisse aussi! FreeBSD bénéficie aussi de centaines d'applications de haute - qualité developpées par les + qualité développées par les centres de recherche et les universités du monde entier, souvent disponibles gratuitement ou presque. Il existe aussi des applications commerciales et leur nombre croît de jour en @@ -928,7 +928,7 @@ En résumé, notre modèle de développement - est organisé comme un ensemble relaché de cercles + est organisé comme un ensemble relâché de cercles concentriques. Ce modèle centralisé est en place pour la commodité des utilisateurs de FreeBSD, qui disposent ainsi d'un moyen facile de suivre l'évolution d'une @@ -997,7 +997,7 @@ installer, de taper make install, et de laisser le système faire le reste. La distribution originale complète de chaque logiciel est chargée dynamiquement - depuis le CDROM ou un site ftp proche, il vous suffit de disposer de + depuis le CDROM ou un site FTP proche, il vous suffit de disposer de suffisamment d'espace disque pour compiler le logiciel que vous voulez. Presque tous les logiciels sont aussi fournis sous forme pré-compilée (“package”—paquetage) qui peut être ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.11 2006/03/17 18:23:22 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.12 2006/12/05 21:26:37 blackend Exp $ Original revision: 1.147 --> @@ -225,7 +225,7 @@ Par tradition, c'est un nom en majuscules, et si vous maintenez plusieurs machines FreeBSD avec des configurations matérielles différentes, c'est une bonne idée de lui donner le - même nom que la machine. Nous l'appelerons + même nom que la machine. Nous l'appellerons MONNOYAU pour les besoins de cet exemple. @@ -460,7 +460,7 @@ compilé est très important. Les modules qui ne sont pas destinés à fonctionner avec le noyau compilé peuvent être instables et - ne pas donner les resultats escomptés. + ne pas donner les résultats escomptés. Si vous avez ajouté de nouveaux @@ -756,7 +756,7 @@ device npx npx est sous FreeBSD l'interface avec le - coprocesseur mathémathique, qu'il soit matériel + coprocesseur mathématique, qu'il soit matériel ou émulé par logiciel. Cette option n'est pas facultative. @@ -1044,7 +1044,7 @@ options AHD_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~215k to driver. - Ceci aide le déboguage en affichant l'état des + Ceci aide le débogage en affichant l'état des registres de manière plus simple à lire. options ADAPTIVE_GIANT # Giant mutex is adaptive. @@ -1485,7 +1485,7 @@ Cette option autorise à un processus d'obtenir les permissions d'E/S. Ceci est utile pour l'écriture de - programmes en mode utilisateur pouvant gerer directement le + programmes en mode utilisateur pouvant gérer directement le matériel. Ceci est nécessaire pour exécuter le système X Window. @@ -1932,7 +1932,7 @@ à partir duquel vous désirez démarrer, à l'invite du chargeur de FreeBSD. Vous pouvez y accéder quand le système décompte à - partir de 10 au menu de démarrage. Au lieu de d'appuyez sur + partir de 10 au menu de démarrage. Au lieu de d'appuyer sur Entrée, appuyez sur une autre touche, puis tapez unload et ensuite boot /boot/kernel.old/kernel, ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#4 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v 1.11 2006/04/13 18:23:09 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v 1.12 2006/12/05 21:26:37 blackend Exp $ Original revision: 1.130 --> @@ -465,7 +465,7 @@ /compat/linux/bin/sh. Cela permet de garantir que l'installeur est exécuté par la version Linux de &man.sh.1;. Ensuite, remplacez toutes les - occurences de Linux) par + occurrences de Linux) par FreeBSD) à l'aide d'un éditeur de texte ou la procédure proposée dans la section suivante. Cela indique à l'installeur @@ -474,7 +474,7 @@ déterminer le système d'exploitation, de traiter &os; comme un système d'exploitation de type Linux. Lancer maintenant la commande MathInstaller - procèdera à l'installation de + procédera à l'installation de &mathematica;. @@ -544,9 +544,9 @@ de caractères spécifiques pour afficher des caractères qui ne sont pas présents dans l'ensemble standard de polices (caractère - intégrale, somme, lettres grèques, etc.). + intégrale, somme, lettres grecques, etc.). Le protocole X a besoin que ces polices - de caratères soient installées + de caractères soient installées localement. Cela signifie que vous devrez copier sur votre machine locale ces polices à partir du CDROM ou d'une machine avec @@ -1135,7 +1135,7 @@ - Créer l'environment &oracle; + Créer l'environnent &oracle; Avant de pouvoir installer &oracle;, vous devez configurer un @@ -2130,7 +2130,7 @@ ID utilisateur nom d'utilisateur - nom généric + nom générique groupe groupes supplémentaires description @@ -2391,7 +2391,7 @@ Il y a de nombreux CDROMs à monter et démonter lors de l'installation. Si vous disposez de - suffisament de lecteurs de CDROMs, vous pouvez tout + suffisamment de lecteurs de CDROMs, vous pouvez tout simplement les monter tous. Nous avons décidé de copier le contenu des CDROMs dans les répertoires correspondant: @@ -2954,7 +2954,7 @@ Poursuivre l'installation de &sap.r3; Tout d'abord vérifiez le paramétrage des - environements des utilisateurs idsamd + environnements des utilisateurs idsamd (sidadm) et oraids (orasid). Ils devraient avoir, @@ -3435,7 +3435,7 @@ Vous n'avez pas désélectionné la visionneuse de texte en ligne d'&oracle; - avant de débutter l'installation. Elle est + avant de débuter l'installation. Elle est sélectionnée par défaut même si cette option n'est actuellement pas disponible pour Linux. Désélectionnez cet élément dans @@ -3495,7 +3495,7 @@ Redémarrer le système &sap;. Vous pouvez maintenant vous connecter au système, même si les - paramètrages spécifiques à certaines + paramétrages spécifiques à certaines langues peuvent ne pas fonctionner comme attendu. Après la correction des paramétrages de langue (et après avoir fourni les “locales” @@ -3589,7 +3589,7 @@ l'installation d'IDES, pour certaines raisons le processus d'installation n'a pas utilisé le nom correct pour le système &sap; “IDS”, - mais la chaîne de caratère "" + mais la chaîne de caractère "" à la place. Cela conduit à des problèmes mineurs d'accès aux répertoires, comme les chemins sont générés dynamiquement en utilisant @@ -3788,7 +3788,7 @@ Ce que fait maintenant &os; est de parcourir une liste de chargeurs, avec un chargeur #! - générique qui reconnait les noms des + générique qui reconnaît les noms des interpréteurs qui se trouvent après le caractère espace suivant, puis avec un retour possible vers /bin/sh. ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#3 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml,v 1.14 2004/04/19 13:29:09 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml,v 1.15 2006/12/05 21:26:37 blackend Exp $ Original revision: 1.116 --> @@ -307,7 +307,7 @@ un serveur POP ou IMAP. Ces protocoles permettent aux utilisateurs de se connecter aisément à leurs - boîtes aux lettes à partir de machines + boîtes aux lettres à partir de machines distantes. Bien que POP et IMAP permettent, tous les deux, l'accès aux boîtes aux lettres pour les @@ -544,7 +544,7 @@ sendmail avec une erreur donnée. Les machines qui sont listées avec , qui est le comportement par défaut, sont autorisées à envoyer du - courrier à cette machinee dès que la destination finale + courrier à cette machine dès que la destination finale du courrier est la machine locale. Les machines listées avec se verront rejeter pour toute connexion au serveur. Les machines présentes avec l'option @@ -718,7 +718,7 @@ boîte aux lettres postmaster sur la machine noc.exemple.net. Et enfin, si un courrier en provenance de exemple.com n'a pas trouvé de correspondance, il correspondra à la - dernière ligne, qui regira tous les autres messages + dernière ligne, qui régira tous les autres messages adressés à quelqu'un du domaine exemple.com. La correspondance sera la boîte aux lettres locale @@ -1632,7 +1632,7 @@ Pour finir: si vous n'êtes pas certain du bon fonctionnement de certaines configurations de routage du - courrier électronique, rappellez-vous de l'option + courrier électronique, rappelez-vous de l'option de sendmail. Cela lance sendmail dans le mode test d'adresse; entrez simplement @@ -2504,7 +2504,7 @@ - Bien qu'expliquer l'intégralités de fonctions + Bien qu'expliquer l'intégralité des fonctions de fetchmail dépasse le cadre de ce document, certaines fonctions de base seront abordées. L'utilitaire ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#4 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.12 2006/04/16 17:35:13 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.13 2006/12/05 21:26:37 blackend Exp $ Original revision: 1.413 --> @@ -667,7 +667,7 @@ annonces concernant le fonctionnement du système CTM seront faites. Cliquez sur le nom de la liste et suivez les instructions - pour s'incrire à la liste. + pour s'inscrire à la liste. @@ -1160,7 +1160,7 @@ Avec CVSup, vous pouvez obtenir pratiquement n'importe quelle version qui ait - existée des sources. C'est possible parce que le + existé des sources. C'est possible parce que le serveur cvsupd travaille directement à partir du référentiel CVS, qui contient toutes les versions. Vous indiquez quelle @@ -1625,7 +1625,7 @@ toujours mettre à jour le sous-catalogue ports-base! Dès qu'il - y a un changement dans l'infrastucture + y a un changement dans l'infrastructure de compilation des logiciels portés représentée par ports-base, il est certain ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.21 2005/09/24 15:13:46 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.22 2006/12/05 21:26:37 blackend Exp $ Original revision: 1.111 --> @@ -249,7 +249,7 @@ device "snd_emu10k1" Assurez-vous de lire la page de manuel du pilote pour la - syntaxe à utiliser. Des informations concernants la + syntaxe à utiliser. Des informations concernant la syntaxe des pilotes de cartes son dans la configuration du noyau peuvent être également trouvées dans le fichier /usr/src/sys/conf/NOTES @@ -292,9 +292,9 @@ device sbc0 at isa? port 0x220 irq 5 drq 1 flags 0x15 - Les paramétres donnés ci-dessus sont ceux + Les paramètres donnés ci-dessus sont ceux par défaut. Dans certains cas, vous pouvez avoir - besoin de modifier l'IRQ ou tout autre paramétre en + besoin de modifier l'IRQ ou tout autre paramètre en fonction de votre carte son. Consultez la page de manuel &man.snd.sbc.4; pour plus d'informations. @@ -336,7 +336,7 @@ votre système. Si aucun périphérique pcm n'apparaît, retournez en arrière et revoyez ce qui a été fait - précedemment. Contrôlez à nouveau votre + précédemment. Contrôlez à nouveau votre fichier de configuration du noyau et vérifiez que vous avez choisi le périphérique correct. Les problèmes courants sont listés dans la @@ -1537,7 +1537,7 @@ Lectures supplémentaires - Les différents logigiels vidéo pour &os; se développent + Les différents logiciels vidéo pour &os; se développent rapidement. Il est fort possible que dans un futur proche plusieurs des problèmes abordés ici seront résolus. Entre temps ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#3 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.4 2005/01/09 16:47:50 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.5 2006/12/05 21:26:37 blackend Exp $ Original revision: 1.54 --> @@ -122,7 +122,7 @@ On fait souvent référence à &man.inetd.8; comme étant le “super-serveur - Internet” parce qu'il gére les connexions pour + Internet” parce qu'il gère les connexions pour plusieurs services. Quand une connexion est reçue par inetd, ce dernier détermine @@ -898,7 +898,7 @@ /usr/src /usr/ports client - Les propriétes d'un système de fichiers + Les propriétés d'un système de fichiers exporté vers une machine donnée devraient apparaître sur une ligne. Les lignes sans client sont traitées comme destinée à une seule @@ -1165,7 +1165,7 @@ réussir, puis soudain le serveur semblera ne plus répondre au client, bien que les requêtes vers ou en provenance d'autres systèmes continueront à - être traitées normalement. Cela se manisfeste + être traitées normalement. Cela se manifeste sur la machine cliente, que ce soit le système &os; ou la station de travail. Sur de nombreux systèmes, il n'est pas possible d'arrêter le client proprement une @@ -1260,13 +1260,13 @@ pratiquement aussi rapidement que le standard le permet. Sur les cartes les plus petites, de moindre capacité, les derniers paquets d'un même bloc écrasent les - paquets précédents avant qu'ils aient pû + paquets précédents avant qu'ils aient pu être transmis à la machine et le bloc ne peut être réassemblé ou acquitté. Avec pour conséquence, le dépassement du délai d'attente sur la station de travail qui recommence alors la transmission, mais en renvoyant l'intégralité - des 8 K, et ce processus se repète à + des 8 K, et ce processus se répète à l'infini. En définissant la taille de bloc inférieure @@ -1536,7 +1536,7 @@ Dans cette section on suppose que vous utilisez &os; 3.3 ou une version suivante. Les instructions - fournies fonctionneront probabablement + fournies fonctionneront probablement avec n'importe quelle version de &os; supérieure à 3.0, mais il n'y a aucune garantie que cela soit le cas. @@ -1624,7 +1624,7 @@ NIS comme le nom d'un groupe de machines qui sont reliées entre elles. - Certains choississent d'utiliser leur nom de domaine + Certains choisissent d'utiliser leur nom de domaine Internet pour nom de domaine NIS. Ce n'est pas conseillé parce que c'est une source de confusion quand il faut résoudre un problème @@ -1659,7 +1659,7 @@ L'absence d'information sur les utilisateurs et les groupes bloque la plupart des systèmes. Vous devez donc vous assurer de choisir une machine qui ne sera pas - redémarrée fréquement, ni + redémarré fréquemment, ni utilisée pour du développement. Idéalement, le serveur NIS devrait être une machine dont l'unique utilisation serait d'être un @@ -2189,7 +2189,7 @@ préférence avec vipw, puisque vipw contrôlera vos changements au fichier /etc/master.passwd, et - regénérera automatiquement la base de + régénérera automatiquement la base de données à la fin de l'édition. Par exemple, si nous voulions interdire l'ouverture de session à l'utilisateur bill sur la @@ -2372,7 +2372,7 @@ à chaque fichier passwd de chaque système pour chaque utilisateur non-autorisé à ouvrir une session sur le système. Si vous - ometter ne serait-ce qu'une entrée, vous aurez des + omettez ne serait-ce qu'une entrée, vous aurez des problèmes. Il doit être possible de faire cela lors de la configuration initiale, cependant vous finirez par oublier d'ajouter les lignes @@ -2747,7 +2747,7 @@ Sécurisez les serveurs maître - et esclave NIS, et reduisez leur temps + et esclave NIS, et réduisez leur temps d'arrêt. Si quelqu'un tente soit d'attaquer soit de simplement arrêter ces machines, de nombreuses personnes ne pourront plus ouvrir de session dans @@ -2780,7 +2780,7 @@ 2). Notez que bien que les requêtes des clients normaux soient supportées, cette version d'ypserv ne supporte pas les - requêtes de tranfert de tables version 1; par + requêtes de transfert de tables version 1; par conséquent il n'est pas possible de l'utiliser comme serveur maître ou esclave avec des serveurs NIS plus anciens qui ne supportent que la version 1 du protocole. @@ -2797,7 +2797,7 @@ NIS. Il est en général préférable de forcer les serveurs de se rattacher à eux-mêmes plutôt que de les laisser diffuser des - requêtes de rattachement et eventuellement se rattacher + requêtes de rattachement et éventuellement se rattacher réciproquement les uns aux autres. Il peut en résulter de curieux problèmes si l'un des serveurs tombe et que d'autres en dépendent. Tous les @@ -2813,7 +2813,7 @@ ypbind avec l'option . Si vous ne désirez pas faire cela à la main à chaque fois que vous redémarrez votre serveur - NIS, vous pouvez ajouter les lignes quivantes à votre + NIS, vous pouvez ajouter les lignes suivantes à votre fichier /etc/rc.conf: nis_client_enable="YES" # run client stuff as well @@ -2871,7 +2871,7 @@ à jour avant qu'un utilisateur ne change son mot de passe pour la première fois après la - regénération de la base de données des + régénération de la base de données des capacités de classes de session. Ensuite, afin de s'assurer que les mots de passe sont @@ -2926,7 +2926,7 @@ décrit les moyens par lesquels un système peut se connecter à un réseau et obtenir les informations nécessaires pour dialoguer sur ce - réseau. &os; utilise l'implémentaion DHCP de + réseau. &os; utilise l'implémentation DHCP de l'ISC (Internet Software Consortium), aussi toutes les informations spécifiques à l'implémentation, ici, concernent la version @@ -2970,7 +2970,7 @@ Les clients DHCP peuvent obtenir une grande quantité d'informations à partir du serveur. - Une liste eshaustive est donnée dans la page de manuel + Une liste exhaustive est donnée dans la page de manuel &man.dhcp-options.5;. @@ -2997,7 +2997,7 @@ configuration DHCP de l'interface?”. Répondre par l'affirmative à cette question lancera dhclient, et en cas de - succès, complètera automatiquement les + succès, complétera automatiquement les informations de configuration réseau. Vous devez faire deux choses pour que votre système @@ -3369,7 +3369,7 @@ /usr/local/sbin/dhcrelay dhcrelay est - utilisé dans les environements avancés + utilisé dans les environnements avancés où un serveur DHCP fait suivre la requête d'un client vers un autre serveur DHCP sur un réseau séparé. Si vous avez besoin @@ -3841,7 +3841,7 @@ // // Avant de commencer à configurer une zone primaire, il faut // être sûr que vous avez parfaitement compris comment le -// DNS et BIND fonctionnent. Il apparait parfois des pièges +// DNS et BIND fonctionnent. Il apparaît parfois des pièges // peu évidents à saisir. En comparaison, configurer un // serveur secondaire est plus simple. // @@ -4229,7 +4229,7 @@ éléments extérieur au “sandbox” (comme aux bibliothèques partagées, aux “sockets” pour - l'enregistrements des journaux, etc.), il y a un certain + l'enregistrement des journaux, etc.), il y a un certain nombre d'étapes à suivre afin de permettre >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 6 07:43:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD0B916A47B; Wed, 6 Dec 2006 07:43:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9FDF016A403 for ; Wed, 6 Dec 2006 07:43:26 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 96D4643CA2 for ; Wed, 6 Dec 2006 07:42:42 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB67hQZJ015002 for ; Wed, 6 Dec 2006 07:43:26 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB67hQoH014998 for perforce@freebsd.org; Wed, 6 Dec 2006 07:43:26 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 6 Dec 2006 07:43:26 GMT Message-Id: <200612060743.kB67hQoH014998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 111184 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2006 07:43:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=111184 Change 111184 by soc-andrew@soc-andrew_serv on 2006/12/06 07:43:09 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#12 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#1 branch Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.323 2006/11/09 18:10:33 des Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.324 2006/12/05 16:57:10 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -689,6 +689,8 @@ cat4 amd64 .. + arm + .. i386 .. powerpc @@ -726,6 +728,8 @@ cat4 amd64 .. + arm + .. i386 .. powerpc @@ -802,6 +806,8 @@ man4 amd64 .. + arm + .. i386 .. powerpc From owner-p4-projects@FreeBSD.ORG Wed Dec 6 13:23:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8826B16A524; Wed, 6 Dec 2006 13:23:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 646CC16A51A for ; Wed, 6 Dec 2006 13:23:43 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id D88B643CB1 for ; Wed, 6 Dec 2006 13:22:57 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB6DNhnk098615 for ; Wed, 6 Dec 2006 13:23:43 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB6DNgsn098612 for perforce@freebsd.org; Wed, 6 Dec 2006 13:23:42 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 6 Dec 2006 13:23:42 GMT Message-Id: <200612061323.kB6DNgsn098612@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 111194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2006 13:23:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=111194 Change 111194 by rdivacky@rdivacky_witten on 2006/12/06 13:23:04 Add an XXX comment about signal delivery in linux_exit_group. We currently ignore sending a signal if SIGNAL_EXIT_GROUP is set condition. We dont even implement this flag.... Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#44 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#44 (text+ko) ==== @@ -1605,6 +1605,11 @@ EMUL_SHARED_RUNLOCK(&emul_shared_lock); EMUL_UNLOCK(&emul_lock); } + /* + * XXX: we should send a signal to the parent if + * SIGNAL_EXIT_GROUP is set. We ignore that (temporrarily?) + * as it doesnt occur often. + */ exit1(td, W_EXITCODE(args->error_code, 0)); return (0); From owner-p4-projects@FreeBSD.ORG Wed Dec 6 15:31:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0508B16A417; Wed, 6 Dec 2006 15:31:29 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BB13816A412 for ; Wed, 6 Dec 2006 15:31:28 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D20E43C9D for ; Wed, 6 Dec 2006 15:30:42 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB6FVS9F021266 for ; Wed, 6 Dec 2006 15:31:28 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB6FVR67021263 for perforce@freebsd.org; Wed, 6 Dec 2006 15:31:27 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 6 Dec 2006 15:31:27 GMT Message-Id: <200612061531.kB6FVR67021263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2006 15:31:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=111198 Change 111198 by zec@zec_tpx32 on 2006/12/06 15:31:22 Store a pointer back to the owner vnet in struct inpcbinfo, so that whenever an inpcb is directly or indirectly available as an argument to a function, the function-local vnet ptr can be fetched from there, and not via the curvnetb macro. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#6 edit .. //depot/projects/vimage/src/sys/net/bpf.c#4 edit .. //depot/projects/vimage/src/sys/net/if.c#6 edit .. //depot/projects/vimage/src/sys/net/if_loop.c#5 edit .. //depot/projects/vimage/src/sys/net/if_stf.c#4 edit .. //depot/projects/vimage/src/sys/net/if_var.h#4 edit .. //depot/projects/vimage/src/sys/net/rtsock.c#5 edit .. //depot/projects/vimage/src/sys/netgraph/ng_ether.c#4 edit .. //depot/projects/vimage/src/sys/netinet/if_ether.c#5 edit .. //depot/projects/vimage/src/sys/netinet/igmp.c#4 edit .. //depot/projects/vimage/src/sys/netinet/in.c#4 edit .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#4 edit .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#2 edit .. //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#3 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#4 edit .. //depot/projects/vimage/src/sys/netinet/ip_output.c#3 edit .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#4 edit .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#3 edit .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#4 edit .. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#3 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#3 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#3 edit .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#3 edit .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#4 edit .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#4 edit .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#4 edit .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#4 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#3 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#5 edit .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#4 edit .. //depot/projects/vimage/src/sys/netinet6/scope6.c#4 edit .. //depot/projects/vimage/src/sys/netinet6/udp6_output.c#3 edit .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#4 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#5 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#6 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/bpf.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/if.c#6 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/if_loop.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/if_stf.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/if_var.h#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/rtsock.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netgraph/ng_ether.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/if_ether.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/igmp.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/in.c#4 (text+ko) ==== @@ -230,7 +230,7 @@ register struct ifnet *ifp; struct thread *td; { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(curvnetb); /* so and ifp can be 0 ! */ register struct ifreq *ifr = (struct ifreq *)data; register struct in_ifaddr *ia = 0, *iap; register struct ifaddr *ifa; ==== //depot/projects/vimage/src/sys/netinet/in_pcb.c#4 (text+ko) ==== @@ -270,6 +270,7 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr *nam, in_addr_t *laddrp, u_short *lportp, struct ucred *cred) { + INIT_VNET_INET(inp->inp_vnetb); struct socket *so = inp->inp_socket; unsigned short *lastport; struct sockaddr_in *sin; @@ -279,7 +280,6 @@ int wild = 0, reuseport = (so->so_options & SO_REUSEPORT); int error, prison = 0; int dorandom; - INIT_VNET_INET(so->so_vnetb); INP_INFO_WLOCK_ASSERT(pcbinfo); INP_LOCK_ASSERT(inp); @@ -561,7 +561,7 @@ in_addr_t *laddrp, u_short *lportp, in_addr_t *faddrp, u_short *fportp, struct inpcb **oinpp, struct ucred *cred) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(inp->inp_vnetb); struct sockaddr_in *sin = (struct sockaddr_in *)nam; struct in_ifaddr *ia; struct sockaddr_in sa; ==== //depot/projects/vimage/src/sys/netinet/in_pcb.h#2 (text+ko) ==== @@ -119,6 +119,7 @@ void *inp_ppcb; /* pointer to per-protocol pcb */ struct inpcbinfo *inp_pcbinfo; /* PCB list info */ +#define inp_vnetb inp_pcbinfo->vnetb struct socket *inp_socket; /* back pointer to socket */ /* list for this PCB's local port */ struct label *inp_label; /* MAC label */ @@ -235,6 +236,7 @@ u_int ipi_count; /* number of pcbs in this list */ u_quad_t ipi_gencnt; /* current generation count */ struct mtx ipi_mtx; + struct vnet_base *vnetb; }; /* ==== //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#3 (text+ko) ==== @@ -115,7 +115,7 @@ static struct sockaddr_in * ip_findroute(struct route *ro, struct in_addr dest, struct mbuf *m) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(curvnetb); /* XXX perhaps ro->...so_vnetb ? revisit */ struct sockaddr_in *dst; struct rtentry *rt; ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#4 (text+ko) ==== @@ -1501,7 +1501,7 @@ register struct ip *ip; register struct mbuf *m; { - INIT_VNET_NET(curvnetb); + INIT_VNET_NET(inp->inp_vnetb); if (inp->inp_socket->so_options & (SO_BINTIME | SO_TIMESTAMP)) { struct bintime bt; ==== //depot/projects/vimage/src/sys/netinet/ip_output.c#3 (text+ko) ==== @@ -1536,7 +1536,7 @@ static int ip_getmoptions(struct inpcb *inp, struct sockopt *sopt) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(inp->inp_vnetb); struct ip_moptions *imo; struct in_addr addr; struct in_ifaddr *ia; ==== //depot/projects/vimage/src/sys/netinet/raw_ip.c#4 (text+ko) ==== @@ -158,8 +158,10 @@ V_ripcbinfo.hashbase = hashinit(1, M_PCB, &V_ripcbinfo.hashmask); V_ripcbinfo.porthashbase = hashinit(1, M_PCB, &V_ripcbinfo.porthashmask); +/* XXX Marko we don't need a full zone for each stack - revisit this! */ V_ripcbinfo.ipi_zone = uma_zcreate("ripcb", sizeof(struct inpcb), NULL, NULL, rip_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + V_ripcbinfo.vnetb = curvnetb; uma_zone_set_max(V_ripcbinfo.ipi_zone, maxsockets); EVENTHANDLER_REGISTER(maxsockets_change, rip_zone_change, NULL, EVENTHANDLER_PRI_ANY); ==== //depot/projects/vimage/src/sys/netinet/tcp_input.c#3 (text+ko) ==== @@ -240,7 +240,7 @@ int *tlenp; struct mbuf *m; { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(tp->t_inpcb->inp_vnetb); struct tseg_qent *q; struct tseg_qent *p = NULL; struct tseg_qent *nq; @@ -2762,7 +2762,7 @@ register struct tcpcb *tp; int rtt; { - INIT_VNET_INET(curvnetb); /* XXX should be tp->pcb->so->so_vnetb */ + INIT_VNET_INET(tp->t_inpcb->inp_vnetb); register int delta; INP_LOCK_ASSERT(tp->t_inpcb); @@ -2871,7 +2871,7 @@ struct tcpcb *tp; int offer; { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(tp->t_inpcb->inp_vnetb); int rtt, mss; u_long bufsize; u_long maxmtu; @@ -3200,7 +3200,7 @@ struct mbuf *m; int tlen; { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(inp->inp_vnetb); struct tcptw *tw; int thflags; tcp_seq seq; ==== //depot/projects/vimage/src/sys/netinet/tcp_output.c#4 (text+ko) ==== @@ -120,8 +120,8 @@ int tcp_output(struct tcpcb *tp) { + INIT_VNET_INET(tp->t_inpcb->inp_vnetb); struct socket *so = tp->t_inpcb->inp_socket; - INIT_VNET_INET(so->so_vnetb); long len, recwin, sendwin; int off, flags, error; #ifdef TCP_SIGNATURE ==== //depot/projects/vimage/src/sys/netinet/tcp_sack.c#3 (text+ko) ==== @@ -282,7 +282,7 @@ static struct sackhole * tcp_sackhole_alloc(struct tcpcb *tp, tcp_seq start, tcp_seq end) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(tp->t_inpcb->inp_vnetb); struct sackhole *hole; if (tp->snd_numholes >= tcp_sack_maxholes || ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#3 (text+ko) ==== @@ -374,6 +374,7 @@ V_tcbinfo.porthashbase = hashinit(hashsize, M_PCB, &V_tcbinfo.porthashmask); V_tcbinfo.ipi_zone = tcp_ipi_zone; + V_tcbinfo.vnetb = curvnetb; #ifdef INET6 #define TCP_MINPROTOHDR (sizeof(struct ip6_hdr) + sizeof(struct tcphdr)) #else /* INET6 */ @@ -734,7 +735,7 @@ struct tcpcb * tcp_drop(struct tcpcb *tp, int errno) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(tp->t_inpcb->inp_vnetb); struct socket *so = tp->t_inpcb->inp_socket; INP_INFO_WLOCK_ASSERT(&V_tcbinfo); @@ -853,7 +854,7 @@ struct tcpcb * tcp_close(struct tcpcb *tp) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(tp->t_inpcb->inp_vnetb); struct inpcb *inp = tp->t_inpcb; struct socket *so; @@ -930,7 +931,7 @@ static struct inpcb * tcp_notify(struct inpcb *inp, int error) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(inp->inp_vnetb); struct tcpcb *tp; INP_INFO_WLOCK_ASSERT(&V_tcbinfo); @@ -1536,7 +1537,7 @@ struct inpcb * tcp_drop_syn_sent(struct inpcb *inp, int errno) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(inp->inp_vnetb); struct tcpcb *tp; INP_INFO_WLOCK_ASSERT(&V_tcbinfo); @@ -1566,7 +1567,7 @@ struct inpcb * tcp_mtudisc(struct inpcb *inp, int errno) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(inp->inp_vnetb); struct tcpcb *tp; struct socket *so = inp->inp_socket; u_int maxmtu; @@ -1793,7 +1794,7 @@ void tcp_twstart(struct tcpcb *tp) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(tp->t_inpcb->inp_vnetb); struct tcptw *tw; struct inpcb *inp = tp->t_inpcb; int acknow; @@ -1923,7 +1924,7 @@ void tcp_twclose(struct tcptw *tw, int reuse) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(tw->tw_inpcb->inp_vnetb); struct socket *so; struct inpcb *inp; @@ -1991,7 +1992,7 @@ int tcp_twrespond(struct tcptw *tw, int flags) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(tw->tw_inpcb->inp_vnetb); struct inpcb *inp = tw->tw_inpcb; struct tcphdr *th; struct mbuf *m; ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#3 (text+ko) ==== @@ -374,7 +374,7 @@ static void syncache_timer(void *xsch) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(curvnetb); /* XXX this can't work !!! */ struct syncache_head *sch = (struct syncache_head *)xsch; struct syncache *sc, *nsc; int tick = ticks; @@ -553,7 +553,7 @@ static struct socket * syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(lso->so_vnetb); struct inpcb *inp = NULL; struct socket *so; struct tcpcb *tp; @@ -851,7 +851,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, struct inpcb *inp, struct socket **lsop, struct mbuf *m) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(inp->inp_vnetb); struct tcpcb *tp; struct socket *so; struct syncache *sc = NULL; ==== //depot/projects/vimage/src/sys/netinet/tcp_timer.c#3 (text+ko) ==== @@ -146,7 +146,7 @@ struct tcpcb *tp = xtp; struct inpcb *inp; CURVNETB_SET(vnetb_tbl[tp->vnet_id]); - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(vnetb_tbl[tp->vnet_id]); INP_INFO_RLOCK(&V_tcbinfo); inp = tp->t_inpcb; @@ -188,7 +188,7 @@ struct tcpcb *tp = xtp; struct inpcb *inp; CURVNETB_SET(vnetb_tbl[tp->vnet_id]); - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(vnetb_tbl[tp->vnet_id]); #ifdef TCPDEBUG int ostate; @@ -268,7 +268,7 @@ void tcp_timer_2msl_reset(struct tcptw *tw, int rearm) { - INIT_VNET_INET(curvnetb); /* XXX Is this safe? */ + INIT_VNET_INET(tw->tw_inpcb->inp_vnetb); INP_INFO_WLOCK_ASSERT(&V_tcbinfo); INP_LOCK_ASSERT(tw->tw_inpcb); @@ -281,7 +281,7 @@ void tcp_timer_2msl_stop(struct tcptw *tw) { - INIT_VNET_INET(curvnetb); /* XXX is this safe? */ + INIT_VNET_INET(tw->tw_inpcb->inp_vnetb); INP_INFO_WLOCK_ASSERT(&V_tcbinfo); TAILQ_REMOVE(&V_twq_2msl, tw, tw_2msl); @@ -314,7 +314,7 @@ struct tcptemp *t_template; struct inpcb *inp; CURVNETB_SET(vnetb_tbl[tp->vnet_id]); - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(vnetb_tbl[tp->vnet_id]); #ifdef TCPDEBUG int ostate; @@ -412,7 +412,7 @@ struct tcpcb *tp = xtp; struct inpcb *inp; CURVNETB_SET(vnetb_tbl[tp->vnet_id]); - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(vnetb_tbl[tp->vnet_id]); #ifdef TCPDEBUG int ostate; @@ -487,7 +487,7 @@ int headlocked; struct inpcb *inp; CURVNETB_SET(vnetb_tbl[tp->vnet_id]); - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(vnetb_tbl[tp->vnet_id]); #ifdef TCPDEBUG int ostate; ==== //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#4 (text+ko) ==== @@ -1556,7 +1556,7 @@ tcp_usrclosed(tp) register struct tcpcb *tp; { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(tp->t_inpcb->inp_vnetb); INP_INFO_WLOCK_ASSERT(&V_tcbinfo); INP_LOCK_ASSERT(tp->t_inpcb); ==== //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#4 (text+ko) ==== @@ -180,6 +180,7 @@ V_udbinfo.porthashbase = hashinit(UDBHASHSIZE, M_PCB, &V_udbinfo.porthashmask); V_udbinfo.ipi_zone = udp_ipi_zone; + V_udbinfo.vnetb = curvnetb; } void @@ -476,7 +477,7 @@ int off; struct sockaddr_in *udp_in; { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(inp->inp_vnetb); struct sockaddr *append_sa; struct socket *so; struct mbuf *opts = 0; @@ -749,7 +750,7 @@ struct mbuf *control; struct thread *td; { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(inp->inp_vnetb); register struct udpiphdr *ui; register int len = m->m_pkthdr.len; struct in_addr faddr, laddr; ==== //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet6/ip6_input.c#3 (text+ko) ==== @@ -190,9 +190,7 @@ } curvnetb->mod_data[vnet_inet6_modinfo.id] = vnet_inet6; vnet_inet6->parent_vnetb = curvnetb; -#endif -#ifdef VIMAGE /* * Skip global initialization stuff * for non-default instances. ==== //depot/projects/vimage/src/sys/netinet6/nd6.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet6/scope6.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet6/udp6_output.c#3 (text+ko) ==== @@ -126,7 +126,7 @@ struct sockaddr *addr6; struct thread *td; { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(in6p->inp_vnetb); u_int32_t ulen = m->m_pkthdr.len; u_int32_t plen = sizeof(struct udphdr) + ulen; struct ip6_hdr *ip6; ==== //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#4 (text+ko) ==== @@ -128,7 +128,7 @@ udp6_append(struct inpcb *in6p, struct mbuf *n, int off, struct sockaddr_in6 *fromsa) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(in6p->inp_vnetb); struct socket *so; struct mbuf *opts; ==== //depot/projects/vimage/src/sys/sys/vimage.h#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Dec 6 15:38:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0950716A47E; Wed, 6 Dec 2006 15:38:51 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D8C2E16A417 for ; Wed, 6 Dec 2006 15:38:50 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 420B943CB3 for ; Wed, 6 Dec 2006 15:38:03 +0000 (GMT) (envelope-from andre@freebsd.org) Received: (qmail 21105 invoked from network); 6 Dec 2006 15:27:23 -0000 Received: from c00l3r.networx.ch (HELO [127.0.0.1]) ([62.48.2.2]) (envelope-sender ) by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP for ; 6 Dec 2006 15:27:23 -0000 Message-ID: <4576E406.4010108@freebsd.org> Date: Wed, 06 Dec 2006 16:38:46 +0100 From: Andre Oppermann User-Agent: Thunderbird 1.5.0.8 (Windows/20061025) MIME-Version: 1.0 To: Marko Zec References: <200612061531.kB6FVR67021263@repoman.freebsd.org> In-Reply-To: <200612061531.kB6FVR67021263@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 111198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2006 15:38:51 -0000 Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=111198 > > Change 111198 by zec@zec_tpx32 on 2006/12/06 15:31:22 > > Store a pointer back to the owner vnet in struct inpcbinfo, > so that whenever an inpcb is directly or indirectly available > as an argument to a function, the function-local vnet ptr can > be fetched from there, and not via the curvnetb macro. Ugh, this will become locking/refcounting hell. -- Andre From owner-p4-projects@FreeBSD.ORG Wed Dec 6 15:49:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 266CE16A47E; Wed, 6 Dec 2006 15:49:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F293F16A403; Wed, 6 Dec 2006 15:49:03 +0000 (UTC) (envelope-from zec@icir.org) Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9179F43CA7; Wed, 6 Dec 2006 15:48:17 +0000 (GMT) (envelope-from zec@icir.org) Received: by xaqua.tel.fer.hr (Postfix, from userid 20006) id 653EC9B65B; Wed, 6 Dec 2006 16:49:02 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on xaqua.tel.fer.hr X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.7 Received: from [192.168.200.106] (zec2.tel.fer.hr [161.53.19.79]) by xaqua.tel.fer.hr (Postfix) with ESMTP id 903349B656; Wed, 6 Dec 2006 16:49:01 +0100 (CET) From: Marko Zec To: Andre Oppermann Date: Wed, 6 Dec 2006 16:48:58 +0100 User-Agent: KMail/1.9.1 References: <200612061531.kB6FVR67021263@repoman.freebsd.org> <4576E406.4010108@freebsd.org> In-Reply-To: <4576E406.4010108@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200612061648.59255.zec@icir.org> Cc: Perforce Change Reviews , Marko Zec Subject: Re: PERFORCE change 111198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2006 15:49:04 -0000 On Wednesday 06 December 2006 16:38, Andre Oppermann wrote: > Marko Zec wrote: > > http://perforce.freebsd.org/chv.cgi?CH=111198 > > > > Change 111198 by zec@zec_tpx32 on 2006/12/06 15:31:22 > > > > Store a pointer back to the owner vnet in struct inpcbinfo, > > so that whenever an inpcb is directly or indirectly available > > as an argument to a function, the function-local vnet ptr can > > be fetched from there, and not via the curvnetb macro. > > Ugh, this will become locking/refcounting hell. Hmm, why? This change doesn't introduce or need any additional refcounting. Each vnet has its own instance of inpcbinfo, hence inpcbinfo->vnet binding is permanent. A vnet can't be removed until its inpcbinfo->ipi_count tells us there are no inpcbs pointing back to it any more. Marko From owner-p4-projects@FreeBSD.ORG Wed Dec 6 17:42:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE96316A416; Wed, 6 Dec 2006 17:42:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 80C2016A492 for ; Wed, 6 Dec 2006 17:42:17 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48BA343CA2 for ; Wed, 6 Dec 2006 17:41:29 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB6HgFsq053794 for ; Wed, 6 Dec 2006 17:42:15 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB6HgFMD053788 for perforce@freebsd.org; Wed, 6 Dec 2006 17:42:15 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 6 Dec 2006 17:42:15 GMT Message-Id: <200612061742.kB6HgFMD053788@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111204 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2006 17:42:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=111204 Change 111204 by zec@zec_tca51 on 2006/12/06 17:41:53 At creation time assign each vnet a unique positive integer id. The only use for this id so far is to serve as an index into vnetb_tbl[], which stores ptrs to all corresponding vnets. The table indexing method of fetching the appropriate vnet * is used only in tcp timer-triggered functions as an interim hack. In those function it is possible for (struct tcpcb *tp)->t_inpcb to be NULL due to some race conditions that I do not comprehend, but which are documented and handled in the existing code. Given that in timer-triggered functions curvnetb is always NULL, and that we cannot reliably fetch vnet * from tp->t_inpcb->inp_vnet, as an alternative method we fetch vnet * from vnetb_tbl[tp->vnet_id]. NB this whole hassle of going through a table to fetch a ptr to a vnet could be easily avoided if we stored the ptr directly in the struct tcpcb. However, doing so would alter the size of tcpcb and I would have to rebuild my userland as a consequence. OTOH struct tcpcb has enough spare room for a 16-bit index... Hope nobody is actually reading this... Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#7 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#4 edit .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#4 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#6 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#7 (text+ko) ==== @@ -402,6 +402,7 @@ struct vprocg *vprocg; struct vcpu *vcpu; struct domain *dp; + int i; printf("vi_alloc: %s\n", name); /* A brute force check whether there's enough mem for a new vimage */ @@ -421,6 +422,12 @@ bzero(vnetb, sizeof(struct vnet_base)); vip->v_vnetb = vnetb; vnetb->vnet_magic_n = VNET_MAGIC_N; + for (i = 0; i < 100; i++) /* XXX !!! */ + if (vnetb_tbl[i] == NULL) { + vnetb->vnet_id = i; + vnetb_tbl[i] = vnetb; + break; + } vprocg = malloc(sizeof(struct vprocg), M_VPROCG, M_NOWAIT); if (vprocg == NULL) @@ -555,7 +562,9 @@ vimage_0.v_procg = &vprocg_0; vimage_0.v_cpu = &vcpu_0; - vnetb_tbl[0] = &vnetb_0; /* XXX */ + vnetb_0.vnet_id = 1; /* XXX */ + vnetb_tbl[0] = (void *) 0xc0dedead; /* XXX */ + vnetb_tbl[1] = &vnetb_0; /* XXX */ vnetb_0.vnet_magic_n = VNET_MAGIC_N; TAILQ_INIT(&vnet_modlink_head); ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#4 (text+ko) ==== @@ -684,6 +684,9 @@ if (tm == NULL) return (NULL); tp = &tm->tcb; +#ifdef VIMAGE + tp->vnet_id = inp->inp_vnetb->vnet_id; +#endif /* LIST_INIT(&tp->t_segq); */ /* XXX covered by M_ZERO */ tp->t_maxseg = tp->t_maxopd = #ifdef INET6 ==== //depot/projects/vimage/src/sys/netinet/tcp_timer.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/sys/vimage.h#6 (text+ko) ==== @@ -83,6 +83,8 @@ int ifccnt; int sockcnt; + int vnet_id; /* index to vnetb_tbl */ + int vnet_magic_n; }; From owner-p4-projects@FreeBSD.ORG Wed Dec 6 19:48:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBDA316A4C9; Wed, 6 Dec 2006 19:48:10 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EE85316A588 for ; Wed, 6 Dec 2006 19:48:09 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id E0A2544091 for ; Wed, 6 Dec 2006 19:43:27 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB6JhtsG077509 for ; Wed, 6 Dec 2006 19:43:55 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB6Jhspd077506 for perforce@freebsd.org; Wed, 6 Dec 2006 19:43:54 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 6 Dec 2006 19:43:54 GMT Message-Id: <200612061943.kB6Jhspd077506@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111211 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2006 19:48:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=111211 Change 111211 by zec@zec_tca51 on 2006/12/06 19:43:01 In tcp_timer_2msl_stop(), tw->tw_inpcb can be NULL, so attempts to read tw->tw_inpcb->inp_vnetb will not result with the desired outcome. Hence, fetch a vnetb * from curvnetb instead. Affected files ... .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#5 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/tcp_timer.c#5 (text+ko) ==== @@ -260,7 +260,7 @@ void tcp_timer_init(void) { - INIT_VNET_INET(curvnetb); /* XXX Is this safe? */ + INIT_VNET_INET(curvnetb); TAILQ_INIT(&V_twq_2msl); } @@ -281,7 +281,7 @@ void tcp_timer_2msl_stop(struct tcptw *tw) { - INIT_VNET_INET(tw->tw_inpcb->inp_vnetb); + INIT_VNET_INET(curvnetb); INP_INFO_WLOCK_ASSERT(&V_tcbinfo); TAILQ_REMOVE(&V_twq_2msl, tw, tw_2msl); @@ -290,7 +290,7 @@ struct tcptw * tcp_timer_2msl_tw(int reuse) { - INIT_VNET_INET(curvnetb); /* XXX is this safe? */ + INIT_VNET_INET(curvnetb); struct tcptw *tw; INP_INFO_WLOCK_ASSERT(&V_tcbinfo); From owner-p4-projects@FreeBSD.ORG Wed Dec 6 20:31:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F11816A417; Wed, 6 Dec 2006 20:31:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 37E8916A40F for ; Wed, 6 Dec 2006 20:31:08 +0000 (UTC) (envelope-from pjd@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id F01E143CA3 for ; Wed, 6 Dec 2006 20:30:13 +0000 (GMT) (envelope-from pjd@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB6KV0jY091065 for ; Wed, 6 Dec 2006 20:31:00 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB6KUula091029 for perforce@freebsd.org; Wed, 6 Dec 2006 20:30:56 GMT (envelope-from pjd@freebsd.org) Date: Wed, 6 Dec 2006 20:30:56 GMT Message-Id: <200612062030.kB6KUula091029@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek To: Perforce Change Reviews Cc: Subject: PERFORCE change 111215 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2006 20:31:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=111215 Change 111215 by pjd@pjd_anger on 2006/12/06 20:30:11 IFC. Affected files ... .. //depot/projects/crypto/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/crypto/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/crypto/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/crypto/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/crypto/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/crypto/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/crypto/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/crypto/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/crypto/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/crypto/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/crypto/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/crypto/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/crypto/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/crypto/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/crypto/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/crypto/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/crypto/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/crypto/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/crypto/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/crypto/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/crypto/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/crypto/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/crypto/sys/arm/xscale/ixp425/ixdp425reg.h#2 integrate .. //depot/projects/crypto/sys/boot/common/loader.8#2 integrate .. //depot/projects/crypto/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/crypto/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/crypto/sys/cam/cam_periph.c#2 integrate .. //depot/projects/crypto/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/crypto/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/crypto/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/crypto/sys/compat/linsysfs/linsysfs.c#2 integrate .. //depot/projects/crypto/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/crypto/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/crypto/sys/conf/files#5 integrate .. //depot/projects/crypto/sys/conf/files.arm#2 integrate .. //depot/projects/crypto/sys/conf/options#2 integrate .. //depot/projects/crypto/sys/ddb/db_ps.c#2 integrate .. //depot/projects/crypto/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/crypto/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/crypto/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/crypto/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/crypto/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/crypto/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/crypto/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/crypto/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/crypto/sys/dev/flash/at45d.c#1 branch .. //depot/projects/crypto/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/crypto/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/crypto/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/crypto/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/crypto/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/crypto/sys/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/crypto/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/crypto/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/crypto/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/crypto/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/crypto/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/crypto/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/crypto/sys/dev/isp/isp.c#2 integrate .. //depot/projects/crypto/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/crypto/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/crypto/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/crypto/sys/dev/le/am7990.c#2 integrate .. //depot/projects/crypto/sys/dev/le/am79900.c#2 integrate .. //depot/projects/crypto/sys/dev/le/lance.c#2 integrate .. //depot/projects/crypto/sys/dev/le/lancevar.h#2 integrate .. //depot/projects/crypto/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/inphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/miidevs#2 integrate .. //depot/projects/crypto/sys/dev/mii/miivar.h#2 integrate .. //depot/projects/crypto/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/crypto/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/crypto/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/crypto/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/crypto/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/crypto/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/crypto/sys/dev/usb/if_auereg.h#2 integrate .. //depot/projects/crypto/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/crypto/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/crypto/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/crypto/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/crypto/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/crypto/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/crypto/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/crypto/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/crypto/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/crypto/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/crypto/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/crypto/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/crypto/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/crypto/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/crypto/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/crypto/sys/i386/isa/clock.c#2 integrate .. //depot/projects/crypto/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/crypto/sys/kern/init_main.c#2 integrate .. //depot/projects/crypto/sys/kern/kern_clock.c#2 integrate .. //depot/projects/crypto/sys/kern/kern_fork.c#2 integrate .. //depot/projects/crypto/sys/kern/kern_idle.c#2 integrate .. //depot/projects/crypto/sys/kern/kern_intr.c#2 integrate .. //depot/projects/crypto/sys/kern/kern_kse.c#2 integrate .. //depot/projects/crypto/sys/kern/kern_poll.c#2 integrate .. //depot/projects/crypto/sys/kern/kern_proc.c#2 integrate .. //depot/projects/crypto/sys/kern/kern_resource.c#2 integrate .. //depot/projects/crypto/sys/kern/kern_subr.c#2 integrate .. //depot/projects/crypto/sys/kern/kern_switch.c#2 integrate .. //depot/projects/crypto/sys/kern/kern_synch.c#2 integrate .. //depot/projects/crypto/sys/kern/kern_thr.c#2 integrate .. //depot/projects/crypto/sys/kern/kern_thread.c#2 integrate .. //depot/projects/crypto/sys/kern/kern_time.c#2 integrate .. //depot/projects/crypto/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/crypto/sys/kern/ksched.c#2 integrate .. //depot/projects/crypto/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/crypto/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/crypto/sys/kern/sched_ule.c#2 integrate .. //depot/projects/crypto/sys/kern/subr_lock.c#2 integrate .. //depot/projects/crypto/sys/kern/subr_prf.c#2 integrate .. //depot/projects/crypto/sys/kern/subr_rman.c#2 integrate .. //depot/projects/crypto/sys/kern/subr_trap.c#2 integrate .. //depot/projects/crypto/sys/kern/tty.c#2 integrate .. //depot/projects/crypto/sys/modules/Makefile#4 integrate .. //depot/projects/crypto/sys/net/bridgestp.c#2 integrate .. //depot/projects/crypto/sys/net/bridgestp.h#2 integrate .. //depot/projects/crypto/sys/net/ethernet.h#2 integrate .. //depot/projects/crypto/sys/net/if.c#2 integrate .. //depot/projects/crypto/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/crypto/sys/net/if_bridge.c#2 integrate .. //depot/projects/crypto/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/crypto/sys/net/if_llc.h#2 integrate .. //depot/projects/crypto/sys/net/if_ppp.c#2 integrate .. //depot/projects/crypto/sys/net/if_pppvar.h#2 integrate .. //depot/projects/crypto/sys/net/netisr.c#2 integrate .. //depot/projects/crypto/sys/net/ppp_tty.c#2 integrate .. //depot/projects/crypto/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/crypto/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/crypto/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/crypto/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/crypto/sys/netinet/igmp.c#2 integrate .. //depot/projects/crypto/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/crypto/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/crypto/sys/netinet/libalias/alias.c#2 integrate .. //depot/projects/crypto/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/crypto/sys/nfs/nfsproto.h#2 integrate .. //depot/projects/crypto/sys/nfs4client/nfs4_subs.c#2 integrate .. //depot/projects/crypto/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/crypto/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/crypto/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/crypto/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/crypto/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/crypto/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/crypto/sys/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/crypto/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/crypto/sys/pci/if_pcn.c#2 integrate .. //depot/projects/crypto/sys/pci/if_pcnreg.h#2 integrate .. //depot/projects/crypto/sys/pci/if_rl.c#2 integrate .. //depot/projects/crypto/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/crypto/sys/pci/if_xl.c#2 integrate .. //depot/projects/crypto/sys/pci/if_xlreg.h#2 integrate .. //depot/projects/crypto/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/crypto/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/crypto/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/crypto/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/crypto/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/crypto/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/crypto/sys/powerpc/powerpc/uio_machdep.c#2 integrate .. //depot/projects/crypto/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/crypto/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/crypto/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/crypto/sys/sun4v/include/pcb.h#2 integrate .. //depot/projects/crypto/sys/sun4v/include/tsb.h#2 integrate .. //depot/projects/crypto/sys/sun4v/sun4v/exception.S#2 integrate .. //depot/projects/crypto/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/crypto/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/crypto/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/crypto/sys/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/crypto/sys/sys/param.h#2 integrate .. //depot/projects/crypto/sys/sys/pcpu.h#2 integrate .. //depot/projects/crypto/sys/sys/proc.h#2 integrate .. //depot/projects/crypto/sys/sys/rtprio.h#2 integrate .. //depot/projects/crypto/sys/sys/runq.h#2 integrate .. //depot/projects/crypto/sys/sys/sched.h#2 integrate .. //depot/projects/crypto/sys/sys/uio.h#2 integrate .. //depot/projects/crypto/sys/sys/umtx.h#2 integrate .. //depot/projects/crypto/sys/sys/vmmeter.h#2 integrate .. //depot/projects/crypto/sys/vm/vm_glue.c#2 integrate .. //depot/projects/crypto/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/crypto/tools/tools/nanobsd/nanobsd.sh#2 integrate Differences ... ==== //depot/projects/crypto/sys/amd64/amd64/genassym.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.158 2006/11/01 04:54:49 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.159 2006/11/30 04:17:04 jb Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -185,7 +185,6 @@ ASSYM(PC_FPCURTHREAD, offsetof(struct pcpu, pc_fpcurthread)); ASSYM(PC_IDLETHREAD, offsetof(struct pcpu, pc_idlethread)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); -ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); ASSYM(PC_SCRATCH_RSP, offsetof(struct pcpu, pc_scratch_rsp)); ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ==== //depot/projects/crypto/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.664 2006/11/19 20:54:57 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.666 2006/12/06 18:27:17 sobomax Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -514,6 +514,7 @@ * help lock contention somewhat, and this is critical for HTT. -Peter */ static int cpu_idle_hlt = 1; +TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt); SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, &cpu_idle_hlt, 0, "Idle loop HLT enable"); @@ -1121,11 +1122,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); ==== //depot/projects/crypto/sys/amd64/amd64/minidump_machdep.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.1 2006/04/21 04:24:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.2 2006/12/05 11:31:33 ru Exp $"); #include #include @@ -215,7 +215,7 @@ j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) { /* This is an entire 2M page. */ - pa = pd[j] & PG_FRAME & ~PDRMASK; + pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { if (is_dumpable(pa)) dump_add_page(pa); @@ -326,7 +326,7 @@ j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) { /* This is a single 2M block. Generate a fake PTP */ - pa = pd[j] & PG_FRAME & ~PDRMASK; + pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { fakept[k] = (pa + (k * PAGE_SIZE)) | PG_V | PG_RW | PG_A | PG_M; } ==== //depot/projects/crypto/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.576 2006/11/23 21:37:04 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.577 2006/12/05 11:31:33 ru Exp $"); /* * Manages physical address maps. @@ -947,9 +947,7 @@ pde = *pdep; if (pde) { if ((pde & PG_PS) != 0) { - KASSERT((pde & PG_FRAME & PDRMASK) == 0, - ("pmap_extract: bad pde")); - rtval = (pde & PG_FRAME) | (va & PDRMASK); + rtval = (pde & PG_PS_FRAME) | (va & PDRMASK); PMAP_UNLOCK(pmap); return rtval; } @@ -982,9 +980,7 @@ if (pdep != NULL && (pde = *pdep)) { if (pde & PG_PS) { if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { - KASSERT((pde & PG_FRAME & PDRMASK) == 0, - ("pmap_extract_and_hold: bad pde")); - m = PHYS_TO_VM_PAGE((pde & PG_FRAME) | + m = PHYS_TO_VM_PAGE((pde & PG_PS_FRAME) | (va & PDRMASK)); vm_page_hold(m); } @@ -1013,7 +1009,7 @@ } else { pde = vtopde(va); if (*pde & PG_PS) { - pa = (*pde & ~(NBPDR - 1)) | (va & (NBPDR - 1)); + pa = (*pde & PG_PS_FRAME) | (va & PDRMASK); } else { pa = *vtopte(va); pa = (pa & PG_FRAME) | (va & PAGE_MASK); ==== //depot/projects/crypto/sys/amd64/amd64/trap.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.311 2006/10/26 21:42:16 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.312 2006/11/28 20:04:00 ru Exp $"); /* * AMD64 Trap and System call handling @@ -646,9 +646,10 @@ #endif if (type == T_PAGEFLT) { printf("fault virtual address = 0x%lx\n", eva); - printf("fault code = %s %s, %s\n", + printf("fault code = %s %s %s, %s\n", code & PGEX_U ? "user" : "supervisor", code & PGEX_W ? "write" : "read", + code & PGEX_I ? "instruction" : "data", code & PGEX_P ? "protection violation" : "page not present"); } printf("instruction pointer = 0x%lx:0x%lx\n", ==== //depot/projects/crypto/sys/amd64/conf/GENERIC#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.469 2006/11/22 10:34:12 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.470 2006/12/03 21:02:09 netchild Exp $ cpu HAMMER ident GENERIC @@ -71,11 +71,6 @@ # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -# Linux 32-bit ABI support -options COMPAT_LINUX32 # Compatible with i386 linux binaries -options LINPROCFS -options LINSYSFS - # Bus support. device acpi device pci ==== //depot/projects/crypto/sys/amd64/include/pmap.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.137 2006/11/19 20:54:57 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.138 2006/12/05 11:31:33 ru Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -71,6 +71,7 @@ #define PG_W PG_AVAIL1 /* "Wired" pseudoflag */ #define PG_MANAGED PG_AVAIL2 #define PG_FRAME (0x000ffffffffff000ul) +#define PG_PS_FRAME (0x000fffffffe00000ul) #define PG_PROT (PG_RW|PG_U) /* all protection bits . */ #define PG_N (PG_NC_PWT|PG_NC_PCD) /* Non-cacheable */ ==== //depot/projects/crypto/sys/amd64/isa/clock.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.227 2006/10/02 18:23:36 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.228 2006/12/03 03:49:28 bde Exp $"); /* * Routines to handle clock hardware. @@ -115,6 +115,7 @@ static int (*i8254_pending)(struct intsrc *); static int i8254_ticked; static int using_lapic_timer; +static int rtc_reg = -1; static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR; @@ -421,24 +422,30 @@ u_char val; RTC_LOCK; - outb(IO_RTC, reg); - inb(0x84); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } val = inb(IO_RTC + 1); - inb(0x84); RTC_UNLOCK; return (val); } -static __inline void -writertc(u_char reg, u_char val) +static void +writertc(int reg, u_char val) { RTC_LOCK; - inb(0x84); - outb(IO_RTC, reg); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } + outb(IO_RTC + 1, val); inb(0x84); - outb(IO_RTC + 1, val); - inb(0x84); /* XXX work around wrong order in rtcin() */ RTC_UNLOCK; } ==== //depot/projects/crypto/sys/amd64/linux32/linux32_sysvec.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.25 2006/10/31 17:53:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.26 2006/12/03 21:06:07 netchild Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1120,7 +1120,7 @@ printf("Could not deinstall ELF interpreter entry\n"); break; default: - break; + return EOPNOTSUPP; } return error; } ==== //depot/projects/crypto/sys/arm/arm/cpufunc.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.14 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.15 2006/11/30 23:34:07 cognet Exp $"); #include #include @@ -1885,7 +1885,9 @@ xscale_setup(args) char *args; { +#ifndef CPU_XSCALE_CORE3 uint32_t auxctl; +#endif int cpuctrl, cpuctrlmask; /* @@ -1931,6 +1933,7 @@ /* cpu_control(cpuctrlmask, cpuctrl);*/ cpu_control(0xffffffff, cpuctrl); +#ifndef CPU_XSCALE_CORE3 /* Make sure write coalescing is turned on */ __asm __volatile("mrc p15, 0, %0, c1, c0, 1" : "=r" (auxctl)); @@ -1941,6 +1944,7 @@ #endif __asm __volatile("mcr p15, 0, %0, c1, c0, 1" : : "r" (auxctl)); +#endif } #endif /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 CPU_XSCALE_80219 */ ==== //depot/projects/crypto/sys/arm/arm/genassym.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.7 2006/11/01 04:54:50 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.8 2006/11/30 04:17:04 jb Exp $"); #include #include #include @@ -69,7 +69,6 @@ ASSYM(PCB_PC, offsetof(struct pcb, un_32.pcb32_pc)); ASSYM(PCB_SP, offsetof(struct pcb, un_32.pcb32_sp)); -ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread)); ASSYM(M_LEN, offsetof(struct mbuf, m_len)); ==== //depot/projects/crypto/sys/arm/arm/pmap.c#2 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.73 2006/11/12 21:48:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.77 2006/12/04 12:55:00 cognet Exp $"); #include #include #include @@ -585,7 +585,7 @@ #endif /* ARM_MMU_SA1 == 1*/ #if ARM_MMU_XSCALE == 1 -#if (ARM_NMMUS > 1) +#if (ARM_NMMUS > 1) || defined (CPU_XSCALE_CORE3) static u_int xscale_use_minidata; #endif @@ -614,9 +614,11 @@ * is significantly faster than the traditional, write-through * behavior of this case. */ +#ifndef CPU_XSCALE_CORE3 pte_l1_s_cache_mode |= L1_S_XSCALE_TEX(TEX_XSCALE_X); pte_l2_l_cache_mode |= L2_XSCALE_L_TEX(TEX_XSCALE_X); pte_l2_s_cache_mode |= L2_XSCALE_T_TEX(TEX_XSCALE_X); +#endif #endif /* XSCALE_CACHE_READ_WRITE_ALLOCATE */ #ifdef XSCALE_CACHE_WRITE_THROUGH /* @@ -673,8 +675,16 @@ pte_l1_c_proto = L1_C_PROTO_xscale; pte_l2_s_proto = L2_S_PROTO_xscale; +#ifdef CPU_XSCALE_CORE3 + pmap_copy_page_func = pmap_copy_page_generic; + pmap_zero_page_func = pmap_zero_page_generic; + xscale_use_minidata = 0; + pte_l1_s_cache_mode_pt = pte_l2_l_cache_mode_pt = + pte_l2_s_cache_mode_pt = 0; +#else pmap_copy_page_func = pmap_copy_page_xscale; pmap_zero_page_func = pmap_zero_page_xscale; +#endif /* * Disable ECC protection of page table access, for now. @@ -2797,6 +2807,7 @@ if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); pmap_free_pv_entry(pv); + pmap_free_l2_bucket(pmap, l2b, 1); } vm_page_unlock_queues(); cpu_idcache_wbinv_all(); @@ -3136,6 +3147,7 @@ if (TAILQ_EMPTY(&m->md.pv_list)) return; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); curpm = vmspace_pmap(curproc->p_vmspace); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { if (flush == FALSE && (pv->pv_pmap == curpm || @@ -3437,7 +3449,8 @@ else if (!pve && !(m->flags & (PG_UNMANAGED | PG_FICTITIOUS))) pve = pmap_get_pv_entry(); - KASSERT(pve != NULL, ("No pv")); + KASSERT(pve != NULL || m->flags & (PG_UNMANAGED | + PG_FICTITIOUS), ("No pv")); oflags = pve->pv_flags; /* @@ -4005,7 +4018,7 @@ * StrongARM accesses to non-cached pages are non-burst making writing * _any_ bulk data very slow. */ -#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 +#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 || defined(CPU_XSCALE_CORE3) void pmap_zero_page_generic(vm_paddr_t phys, int off, int size) { @@ -4094,7 +4107,7 @@ pt_entry_t *ptep, *sptep, pte; vm_offset_t next_bucket, eva; -#if (ARM_NMMUS > 1) +#if (ARM_NMMUS > 1) || defined(CPU_XSCALE_CORE3) if (xscale_use_minidata == 0) return; #endif @@ -4267,7 +4280,7 @@ * hook points. The same comment regarding cachability as in * pmap_zero_page also applies here. */ -#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 +#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 || defined (CPU_XSCALE_CORE3) void pmap_copy_page_generic(vm_paddr_t src, vm_paddr_t dst) { @@ -4430,6 +4443,9 @@ int pmap_ts_referenced(vm_page_t m) { + + if (m->flags & PG_FICTITIOUS) + return (0); return (pmap_clearbit(m, PVF_REF)); } ==== //depot/projects/crypto/sys/arm/at91/at91_pio.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.3 2006/07/14 22:22:57 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.4 2006/11/29 08:17:40 imp Exp $"); #include #include @@ -154,8 +154,8 @@ AT91_PIO_LOCK_DESTROY(sc); goto out; } - sc->cdev = make_dev(&at91_pio_cdevsw, device_get_unit(dev), UID_ROOT - , GID_WHEEL, 0600, "pio%d", device_get_unit(dev)); + sc->cdev = make_dev(&at91_pio_cdevsw, device_get_unit(dev), UID_ROOT, + GID_WHEEL, 0600, "pio%d", device_get_unit(dev)); if (sc->cdev == NULL) { err = ENOMEM; goto out; ==== //depot/projects/crypto/sys/arm/at91/at91_spi.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.3 2006/10/20 07:10:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.4 2006/11/29 07:57:02 imp Exp $"); #include #include @@ -223,7 +223,7 @@ cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) goto out; WR4(sc, PDC_TNPR, addr); - WR4(sc, PDC_TNCR, cmd->tx_cmd_sz); + WR4(sc, PDC_TNCR, cmd->tx_data_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREWRITE); mode[i++] = BUS_DMASYNC_POSTWRITE; } @@ -234,12 +234,12 @@ WR4(sc, PDC_RCR, cmd->tx_cmd_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); mode[i++] = BUS_DMASYNC_POSTREAD; - if (cmd->tx_data_sz > 0) { + if (cmd->rx_data_sz > 0) { if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->rx_data, cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) goto out; WR4(sc, PDC_RNPR, addr); - WR4(sc, PDC_RNCR, cmd->tx_data_sz); + WR4(sc, PDC_RNCR, cmd->rx_data_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); mode[i++] = BUS_DMASYNC_POSTREAD; } ==== //depot/projects/crypto/sys/arm/at91/at91_twi.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.6 2006/11/22 06:51:59 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.7 2006/11/29 08:15:59 imp Exp $"); #include #include @@ -52,9 +52,7 @@ struct resource *irq_res; /* IRQ resource */ struct resource *mem_res; /* Memory resource */ struct mtx sc_mtx; /* basically a perimeter lock */ - volatile int flags; -#define RXRDY 4 -#define TXRDY 0x10 + volatile uint32_t flags; uint32_t cwgr; int sc_started; int twi_addr; @@ -131,8 +129,6 @@ WR4(sc, TWI_CR, TWI_CR_SWRST); WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); WR4(sc, TWI_CWGR, sc->cwgr); -// WR4(sc, TWI_IER, TWI_SR_RXRDY | TWI_SR_OVRE | TWI_SR_UNRE | -// TWI_SR_NACK); if ((sc->iicbus = device_add_child(dev, "iicbus", -1)) == NULL) device_printf(dev, "could not allocate iicbus instance\n"); @@ -208,17 +204,17 @@ struct at91_twi_softc *sc = xsc; uint32_t status; - /* Reading the status also clears the interrupt */ status = RD4(sc, TWI_SR); - printf("status %x\n", status); if (status == 0) return; - AT91_TWI_LOCK(sc); + sc->flags |= status & (TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); if (status & TWI_SR_RXRDY) - sc->flags |= RXRDY; + sc->flags |= TWI_SR_RXRDY; if (status & TWI_SR_TXRDY) - sc->flags |= TXRDY; - AT91_TWI_UNLOCK(sc); + sc->flags |= TWI_SR_TXRDY; + if (status & TWI_SR_TXCOMP) + sc->flags |= TWI_SR_TXCOMP; + WR4(sc, TWI_IDR, status); wakeup(sc); return; } @@ -228,11 +224,16 @@ { int err = 0; int counter = 100000; + uint32_t sr; - while (!(RD4(sc, TWI_SR) & bit) && counter-- >= 0) + while (!((sr = RD4(sc, TWI_SR)) & bit) && counter-- > 0) continue; if (counter <= 0) - err = EIO; + err = EBUSY; + else if (sr & TWI_SR_NACK) + err = EADDRNOTAVAIL; + if (sr & ~bit) + printf("status is %x\n", sr); return (err); } @@ -240,42 +241,37 @@ at91_twi_rst_card(device_t dev, u_char speed, u_char addr, u_char *oldaddr) { struct at91_twi_softc *sc; - int ckdiv, rate; + int clk; sc = device_get_softc(dev); if (oldaddr) *oldaddr = sc->twi_addr; - if (addr != 0) - sc->twi_addr = 0; - else - sc->twi_addr = addr; + sc->twi_addr = addr; - rate = 1; - /* * speeds are for 1.5kb/s, 45kb/s and 90kb/s. */ switch (speed) { case IIC_SLOW: - ckdiv = AT91C_MASTER_CLOCK / (1500 * 4) - 2; + clk = 1500; break; case IIC_FAST: - ckdiv = AT91C_MASTER_CLOCK / (45000 * 4) - 2; + clk = 45000; break; case IIC_UNKNOWN: case IIC_FASTEST: default: - ckdiv = AT91C_MASTER_CLOCK / (90000 * 4) - 2; + clk = 90000; break; } - - sc->cwgr = TWI_CWGR_CKDIV(ckdiv) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(rate)) | - TWI_CWGR_CLDIV(TWI_CWGR_DIV(rate)); + sc->cwgr = TWI_CWGR_CKDIV(1) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(clk)) | + TWI_CWGR_CLDIV(TWI_CWGR_DIV(clk)); WR4(sc, TWI_CR, TWI_CR_SWRST); WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); WR4(sc, TWI_CWGR, sc->cwgr); + printf("setting cwgr to %#x\n", sc->cwgr); return 0; } @@ -303,32 +299,36 @@ at91_twi_transfer(device_t dev, struct iic_msg *msgs, uint32_t nmsgs) { struct at91_twi_softc *sc; - int i, len; + int i, len, err; uint32_t rdwr; uint8_t *buf; sc = device_get_softc(dev); + err = 0; + AT91_TWI_LOCK(sc); for (i = 0; i < nmsgs; i++) { /* * The linux atmel driver doesn't use the internal device * address feature of twi. A separate i2c message needs to * be written to use this. * See http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/2004-September/024411.html - * for details. + * for details. Upon reflection, we could use this as an + * optimization, but it is unclear the code bloat will + * result in faster/better operations. */ rdwr = (msgs[i].flags & IIC_M_RD) ? TWI_MMR_MREAD : 0; WR4(sc, TWI_MMR, TWI_MMR_DADR(msgs[i].slave) | rdwr); len = msgs[i].len; buf = msgs[i].buf; - if (len == 0 || buf == NULL) + if (len != 0 && buf == NULL) return (EINVAL); WR4(sc, TWI_CR, TWI_CR_START); if (msgs[i].flags & IIC_M_RD) { while (len--) { if (len == 0) WR4(sc, TWI_CR, TWI_CR_STOP); - if (at91_twi_wait(sc, TWI_SR_RXRDY)) - return (EIO); + if ((err = at91_twi_wait(sc, TWI_SR_RXRDY))) + goto out; *buf++ = RD4(sc, TWI_RHR) & 0xff; } } else { @@ -336,14 +336,22 @@ WR4(sc, TWI_THR, *buf++); if (len == 0) WR4(sc, TWI_CR, TWI_CR_STOP); - if (at91_twi_wait(sc, TWI_SR_TXRDY)) - return (EIO); + if ((err = at91_twi_wait(sc, TWI_SR_TXRDY))) { + printf("Len %d\n", len); + goto out; + } } } - if (at91_twi_wait(sc, TWI_SR_TXCOMP)) - return (EIO); + if ((err = at91_twi_wait(sc, TWI_SR_TXCOMP))) + break; + } +out:; + if (err) { + WR4(sc, TWI_CR, TWI_CR_STOP); + printf("Err is %d\n", err); } - return (0); + AT91_TWI_UNLOCK(sc); + return (err); } static device_method_t at91_twi_methods[] = { ==== //depot/projects/crypto/sys/arm/at91/kb920x_machdep.c#2 (text) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.19 2006/11/11 20:57:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.20 2006/12/06 06:34:53 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -455,11 +455,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/crypto/sys/arm/include/cpuconf.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.9 2006/11/07 22:36:56 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.10 2006/11/30 23:30:40 cognet Exp $ * */ @@ -139,4 +139,7 @@ #define ARM_XSCALE_PMU 0 #endif +#if defined(CPU_XSCALE_81342) +#define CPU_XSCALE_CORE3 +#endif #endif /* _MACHINE_CPUCONF_H_ */ ==== //depot/projects/crypto/sys/arm/sa11x0/assabet_machdep.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.20 2006/11/11 20:57:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.21 2006/12/06 06:34:54 julian Exp $"); #include "opt_md.h" @@ -422,11 +422,7 @@ /* Set stack for exception handlers */ -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/crypto/sys/arm/xscale/i80321/ep80219_machdep.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 6 20:43:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E043416A4A7; Wed, 6 Dec 2006 20:43:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BB83216A494 for ; Wed, 6 Dec 2006 20:43:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA05543D45 for ; Wed, 6 Dec 2006 20:42:29 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB6KhHa9093921 for ; Wed, 6 Dec 2006 20:43:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB6KhGaF093918 for perforce@freebsd.org; Wed, 6 Dec 2006 20:43:16 GMT (envelope-from sam@freebsd.org) Date: Wed, 6 Dec 2006 20:43:16 GMT Message-Id: <200612062043.kB6KhGaF093918@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111217 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2006 20:43:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=111217 Change 111217 by sam@sam_ebb on 2006/12/06 20:43:14 purge old cruft Affected files ... .. //depot/projects/crypto/conf/files#3 delete .. //depot/projects/crypto/dev/hifn/hifn7751.c#4 delete .. //depot/projects/crypto/dev/hifn/hifn7751reg.h#2 delete .. //depot/projects/crypto/dev/hifn/hifn7751var.h#3 delete .. //depot/projects/crypto/dev/rndtest/rndtest.c#4 delete .. //depot/projects/crypto/dev/rndtest/rndtest.h#2 delete .. //depot/projects/crypto/dev/ubsec/ubsec.c#4 delete .. //depot/projects/crypto/dev/ubsec/ubsecreg.h#2 delete .. //depot/projects/crypto/dev/ubsec/ubsecvar.h#3 delete .. //depot/projects/crypto/modules/Makefile#5 delete .. //depot/projects/crypto/modules/rndtest/Makefile#2 delete .. //depot/projects/crypto/opencrypto/cast.c#2 delete .. //depot/projects/crypto/opencrypto/cast.h#2 delete .. //depot/projects/crypto/opencrypto/castsb.h#2 delete .. //depot/projects/crypto/opencrypto/criov.c#2 delete .. //depot/projects/crypto/opencrypto/crmbuf.c#2 delete .. //depot/projects/crypto/opencrypto/crypto.c#3 delete .. //depot/projects/crypto/opencrypto/crypto_if.m#2 delete .. //depot/projects/crypto/opencrypto/cryptodev.c#3 delete .. //depot/projects/crypto/opencrypto/cryptodev.h#3 delete .. //depot/projects/crypto/opencrypto/cryptosoft.c#2 delete .. //depot/projects/crypto/opencrypto/cryptosoft.h#2 delete .. //depot/projects/crypto/opencrypto/deflate.c#2 delete .. //depot/projects/crypto/opencrypto/deflate.h#2 delete .. //depot/projects/crypto/opencrypto/rijndael.c#2 delete .. //depot/projects/crypto/opencrypto/rijndael.h#2 delete .. //depot/projects/crypto/opencrypto/rmd160.c#2 delete .. //depot/projects/crypto/opencrypto/rmd160.h#2 delete .. //depot/projects/crypto/opencrypto/skipjack.c#2 delete .. //depot/projects/crypto/opencrypto/skipjack.h#2 delete .. //depot/projects/crypto/opencrypto/xform.c#2 delete .. //depot/projects/crypto/opencrypto/xform.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Dec 6 23:22:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15BBF16A503; Wed, 6 Dec 2006 23:22:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E51B516A4A0 for ; Wed, 6 Dec 2006 23:22:09 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id E036143CB7 for ; Wed, 6 Dec 2006 23:19:03 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB6NJhrO031758 for ; Wed, 6 Dec 2006 23:19:43 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB6NJgsq031755 for perforce@freebsd.org; Wed, 6 Dec 2006 23:19:42 GMT (envelope-from piso@freebsd.org) Date: Wed, 6 Dec 2006 23:19:42 GMT Message-Id: <200612062319.kB6NJgsq031755@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2006 23:22:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=111230 Change 111230 by piso@piso_newluxor on 2006/12/06 23:19:06 To workaround a problem when an mbuf is bigger than MCLBYTES (and thus not handled by m_megapullup()), introduce & use m_jumbo16pullup() that uses 16k jumbo size cluster. This problem only showed up on traffic generated on a box with a nic tso enabled. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#30 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#24 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#8 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#30 (text+ko) ==== @@ -3469,8 +3469,10 @@ ((ipfw_insn_nat *)cmd)->nat = t; } - if ((mcl = m_megapullup(m, m->m_pkthdr.len)) == - NULL) + if (m->m_pkthdr.len > MJUM16BYTES) + printf("fat pkt: %d\n", m->m_pkthdr.len); + if ((mcl = m_jumbo16pullup(m, + m->m_pkthdr.len)) == NULL) goto badnat; ip = mtod(mcl, struct ip *); if (args->eh == NULL) { @@ -3534,10 +3536,10 @@ c = mtod(mcl, char *); if (oif == NULL) retval = LibAliasIn(t->lib, c, - MCLBYTES); + MJUM16BYTES); else retval = LibAliasOut(t->lib, c, - MCLBYTES); + MJUM16BYTES); if (retval != PKT_ALIAS_OK) { /* XXX - should i add some logging? */ m_free(mcl); ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#24 (text+ko) ==== @@ -1656,4 +1656,29 @@ m_freem(m); return (NULL); } + +struct mbuf * +m_jumbo16pullup(struct mbuf *m, int len) { + struct mbuf *mcl; + caddr_t cp; + + if (len > MJUM16BYTES) + goto bad; + + if ((mcl = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, + MJUM16BYTES)) == NULL) + goto bad; + + cp = mtod(mcl, caddr_t); + m_copydata(m, 0, len, cp); + m_move_pkthdr(mcl, m); + mcl->m_len = mcl->m_pkthdr.len; + m_freem(m); + + return (mcl); +bad: + m_freem(m); + return (NULL); +} + #endif ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#8 (text+ko) ==== @@ -191,6 +191,7 @@ /* Mbuf helper function. */ struct mbuf *m_megapullup(struct mbuf *, int); +struct mbuf *m_jumbo16pullup(struct mbuf *, int); /* * Mode flags and other constants. From owner-p4-projects@FreeBSD.ORG Thu Dec 7 07:08:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCFA316A415; Thu, 7 Dec 2006 07:08:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 748FA16A403; Thu, 7 Dec 2006 07:08:56 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from redbull.bpaserver.net (redbullneu.bpaserver.net [213.198.78.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id F10CC43CAA; Thu, 7 Dec 2006 07:08:05 +0000 (GMT) (envelope-from alexander@leidinger.net) Received: from outgoing.leidinger.net (p54A5DDEC.dip.t-dialin.net [84.165.221.236]) by redbull.bpaserver.net (Postfix) with ESMTP id 3C1382E06A; Thu, 7 Dec 2006 08:08:53 +0100 (CET) Received: from webmail.leidinger.net (webmail.Leidinger.net [192.168.1.102]) by outgoing.leidinger.net (Postfix) with ESMTP id 07A4A5B4C6C; Thu, 7 Dec 2006 08:08:30 +0100 (CET) Received: (from www@localhost) by webmail.leidinger.net (8.13.8/8.13.8/Submit) id kB778TJ8088981; Thu, 7 Dec 2006 08:08:29 +0100 (CET) (envelope-from Alexander@Leidinger.net) Received: from pslux.cec.eu.int (pslux.cec.eu.int [158.169.9.14]) by webmail.leidinger.net (Horde MIME library) with HTTP; Thu, 07 Dec 2006 08:08:29 +0100 Message-ID: <20061207080829.1vs0y9xxwsc8kkck@webmail.leidinger.net> X-Priority: 3 (Normal) Date: Thu, 07 Dec 2006 08:08:29 +0100 From: Alexander Leidinger To: Roman Divacky References: <200612061323.kB6DNgsn098612@repoman.freebsd.org> In-Reply-To: <200612061323.kB6DNgsn098612@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit User-Agent: Internet Messaging Program (IMP) H3 (4.1.3) / FreeBSD-7.0 X-BPAnet-MailScanner-Information: Please contact the ISP for more information X-BPAnet-MailScanner: Found to be clean X-BPAnet-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-14.864, required 6, autolearn=not spam, BAYES_00 -15.00, DK_POLICY_SIGNSOME 0.00, FORGED_RCVD_HELO 0.14) X-BPAnet-MailScanner-From: alexander@leidinger.net X-Spam-Status: No Cc: Perforce Change Reviews Subject: Re: PERFORCE change 111194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 07:08:57 -0000 Quoting Roman Divacky (from Wed, 6 Dec 2006 13:23:42 GMT): > http://perforce.freebsd.org/chv.cgi?CH=111194 > > Change 111194 by rdivacky@rdivacky_witten on 2006/12/06 13:23:04 > > Add an XXX comment about signal delivery in linux_exit_group. > We currently ignore sending a signal if SIGNAL_EXIT_GROUP is set > condition. We dont even implement this flag.... What about a printf in case the flag is set? This way we should notice if it is used somewhere. We could also correlate this with application misbehavior. Bye, Alexander. -- Demand the establishment of the government in its rightful home at Disneyland. http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 From owner-p4-projects@FreeBSD.ORG Thu Dec 7 10:41:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FF6116A416; Thu, 7 Dec 2006 10:41:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 28B6916A403; Thu, 7 Dec 2006 10:41:11 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.176.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id 94E0543DBB; Thu, 7 Dec 2006 10:37:07 +0000 (GMT) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (localhost [127.0.0.1]) by eva.fit.vutbr.cz (envelope-from xdivac02@eva.fit.vutbr.cz) (8.13.8/8.13.7) with ESMTP id kB7AbtxG039482 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 7 Dec 2006 11:37:55 +0100 (CET) Received: (from xdivac02@localhost) by eva.fit.vutbr.cz (8.13.8/8.13.3/Submit) id kB7Abt0J039481; Thu, 7 Dec 2006 11:37:55 +0100 (CET) Date: Thu, 7 Dec 2006 11:37:55 +0100 From: Divacky Roman To: Alexander Leidinger Message-ID: <20061207103755.GA38924@stud.fit.vutbr.cz> References: <200612061323.kB6DNgsn098612@repoman.freebsd.org> <20061207080829.1vs0y9xxwsc8kkck@webmail.leidinger.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20061207080829.1vs0y9xxwsc8kkck@webmail.leidinger.net> User-Agent: Mutt/1.4.2.2i X-Scanned-By: MIMEDefang 2.57 on 147.229.176.14 Cc: Roman Divacky , Perforce Change Reviews Subject: Re: PERFORCE change 111194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 10:41:11 -0000 On Thu, Dec 07, 2006 at 08:08:29AM +0100, Alexander Leidinger wrote: > Quoting Roman Divacky (from Wed, 6 Dec 2006 > 13:23:42 GMT): > > >http://perforce.freebsd.org/chv.cgi?CH=111194 > > > >Change 111194 by rdivacky@rdivacky_witten on 2006/12/06 13:23:04 > > > > Add an XXX comment about signal delivery in linux_exit_group. > > We currently ignore sending a signal if SIGNAL_EXIT_GROUP is set > > condition. We dont even implement this flag.... > > What about a printf in case the flag is set? This way we should notice > if it is used somewhere. We could also correlate this with application > misbehavior. we dont even implement the functionality of the flag.. I quickly looked at the linux source and I dont understand much what its good for any when its set... looks like when coredumping etc. From owner-p4-projects@FreeBSD.ORG Thu Dec 7 11:03:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C47B16A4FB; Thu, 7 Dec 2006 11:03:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CF73D16A4D2; Thu, 7 Dec 2006 11:03:15 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from redbull.bpaserver.net (redbullneu.bpaserver.net [213.198.78.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB16A43DE6; Thu, 7 Dec 2006 11:01:14 +0000 (GMT) (envelope-from alexander@leidinger.net) Received: from outgoing.leidinger.net (p54A5DDEC.dip.t-dialin.net [84.165.221.236]) by redbull.bpaserver.net (Postfix) with ESMTP id A4FCD2E06F; Thu, 7 Dec 2006 12:01:50 +0100 (CET) Received: from webmail.leidinger.net (webmail.Leidinger.net [192.168.1.102]) by outgoing.leidinger.net (Postfix) with ESMTP id 756E55B4C6C; Thu, 7 Dec 2006 12:01:27 +0100 (CET) Received: (from www@localhost) by webmail.leidinger.net (8.13.8/8.13.8/Submit) id kB7B1RFl021213; Thu, 7 Dec 2006 12:01:27 +0100 (CET) (envelope-from Alexander@Leidinger.net) Received: from pslux.cec.eu.int (pslux.cec.eu.int [158.169.9.14]) by webmail.leidinger.net (Horde MIME library) with HTTP; Thu, 07 Dec 2006 12:01:27 +0100 Message-ID: <20061207120127.119d4mylpckwwwsg@webmail.leidinger.net> X-Priority: 3 (Normal) Date: Thu, 07 Dec 2006 12:01:27 +0100 From: Alexander Leidinger To: Divacky Roman References: <200612061323.kB6DNgsn098612@repoman.freebsd.org> <20061207080829.1vs0y9xxwsc8kkck@webmail.leidinger.net> <20061207103755.GA38924@stud.fit.vutbr.cz> In-Reply-To: <20061207103755.GA38924@stud.fit.vutbr.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable User-Agent: Internet Messaging Program (IMP) H3 (4.1.3) / FreeBSD-7.0 X-BPAnet-MailScanner-Information: Please contact the ISP for more information X-BPAnet-MailScanner: Found to be clean X-BPAnet-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-14.864, required 6, autolearn=not spam, BAYES_00 -15.00, DK_POLICY_SIGNSOME 0.00, FORGED_RCVD_HELO 0.14) X-BPAnet-MailScanner-From: alexander@leidinger.net X-Spam-Status: No Cc: Roman Divacky , Perforce Change Reviews Subject: Re: PERFORCE change 111194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 11:03:16 -0000 Quoting Divacky Roman (from Thu, 7 Dec =20 2006 11:37:55 +0100): > On Thu, Dec 07, 2006 at 08:08:29AM +0100, Alexander Leidinger wrote: >> Quoting Roman Divacky (from Wed, 6 Dec 2006 >> 13:23:42 GMT): >> >> >http://perforce.freebsd.org/chv.cgi?CH=3D111194 >> > >> >Change 111194 by rdivacky@rdivacky_witten on 2006/12/06 13:23:04 >> > >> >=09Add an XXX comment about signal delivery in linux_exit_group. >> >=09We currently ignore sending a signal if SIGNAL_EXIT_GROUP is set >> >=09condition. We dont even implement this flag.... >> >> What about a printf in case the flag is set? This way we should notice >> if it is used somewhere. We could also correlate this with application >> misbehavior. > > we dont even implement the functionality of the flag. Yes, and to get a glue how important it is, we should print a message. Bye, Alexander. --=20 Coming together is a beginning; =09keeping together is progress; =09=09working together is success. http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID =3D B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID =3D 72077137 From owner-p4-projects@FreeBSD.ORG Thu Dec 7 11:04:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91B4B16A4FF; Thu, 7 Dec 2006 11:04:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4A95616A4FC; Thu, 7 Dec 2006 11:04:41 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.sick.ru (cell.sick.ru [217.72.144.68]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3515243DC3; Thu, 7 Dec 2006 11:01:46 +0000 (GMT) (envelope-from glebius@FreeBSD.org) Received: from cell.sick.ru (glebius@localhost [127.0.0.1]) by cell.sick.ru (8.13.4/8.13.3) with ESMTP id kB7B2Pf7080985 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 7 Dec 2006 14:02:26 +0300 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.sick.ru (8.13.4/8.13.1/Submit) id kB7B2P1W080984; Thu, 7 Dec 2006 14:02:25 +0300 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.sick.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Thu, 7 Dec 2006 14:02:25 +0300 From: Gleb Smirnoff To: Paolo Pisati Message-ID: <20061207110225.GU32700@FreeBSD.org> References: <200612062319.kB6NJgsq031755@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline In-Reply-To: <200612062319.kB6NJgsq031755@repoman.freebsd.org> User-Agent: Mutt/1.5.6i Cc: Perforce Change Reviews Subject: Re: PERFORCE change 111230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 11:04:41 -0000 On Wed, Dec 06, 2006 at 11:19:42PM +0000, Paolo Pisati wrote: P> http://perforce.freebsd.org/chv.cgi?CH=111230 P> P> Change 111230 by piso@piso_newluxor on 2006/12/06 23:19:06 P> P> To workaround a problem when an mbuf is bigger than MCLBYTES P> (and thus not handled by m_megapullup()), introduce & use P> m_jumbo16pullup() that uses 16k jumbo size cluster. P> P> This problem only showed up on traffic generated on a box with P> a nic tso enabled. Paolo, this isn't a fix. Another application will do write(,, 16k + 1) and m_jumbo16pullup() will fail again. Please backout it, it is a hack. We need to fix TSO in such way that real packets, that will be transmitted to wire, will be passed to pfil handlers. -- Totus tuus, Glebius. GLEBIUS-RIPN GLEB-RIPE From owner-p4-projects@FreeBSD.ORG Thu Dec 7 12:22:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D106916A40F; Thu, 7 Dec 2006 12:22:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8E5F816A4FD for ; Thu, 7 Dec 2006 12:22:48 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2CA743DA8 for ; Thu, 7 Dec 2006 12:19:50 +0000 (GMT) (envelope-from andre@freebsd.org) Received: (qmail 33452 invoked from network); 7 Dec 2006 12:08:51 -0000 Received: from c00l3r.networx.ch (HELO [127.0.0.1]) ([62.48.2.2]) (envelope-sender ) by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP for ; 7 Dec 2006 12:08:51 -0000 Message-ID: <4578070A.2030609@freebsd.org> Date: Thu, 07 Dec 2006 13:20:26 +0100 From: Andre Oppermann User-Agent: Thunderbird 1.5.0.8 (Windows/20061025) MIME-Version: 1.0 To: Gleb Smirnoff References: <200612062319.kB6NJgsq031755@repoman.freebsd.org> <20061207110225.GU32700@FreeBSD.org> In-Reply-To: <20061207110225.GU32700@FreeBSD.org> Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews , Paolo Pisati Subject: Re: PERFORCE change 111230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 12:22:49 -0000 Gleb Smirnoff wrote: > On Wed, Dec 06, 2006 at 11:19:42PM +0000, Paolo Pisati wrote: > P> http://perforce.freebsd.org/chv.cgi?CH=111230 > P> > P> Change 111230 by piso@piso_newluxor on 2006/12/06 23:19:06 > P> > P> To workaround a problem when an mbuf is bigger than MCLBYTES > P> (and thus not handled by m_megapullup()), introduce & use > P> m_jumbo16pullup() that uses 16k jumbo size cluster. > P> > P> This problem only showed up on traffic generated on a box with > P> a nic tso enabled. > > Paolo, > > this isn't a fix. Another application will do write(,, 16k + 1) and > m_jumbo16pullup() will fail again. Please backout it, it is a hack. > > We need to fix TSO in such way that real packets, that will be > transmitted to wire, will be passed to pfil handlers. That is not possible. -- Andre From owner-p4-projects@FreeBSD.ORG Thu Dec 7 12:47:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BC4016A4A7; Thu, 7 Dec 2006 12:47:18 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DCCD916A40F; Thu, 7 Dec 2006 12:47:17 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.sick.ru (cell.sick.ru [217.72.144.68]) by mx1.FreeBSD.org (Postfix) with ESMTP id 837B643FD6; Thu, 7 Dec 2006 12:40:24 +0000 (GMT) (envelope-from glebius@FreeBSD.org) Received: from cell.sick.ru (glebius@localhost [127.0.0.1]) by cell.sick.ru (8.13.4/8.13.3) with ESMTP id kB7CfDN8081626 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 7 Dec 2006 15:41:13 +0300 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.sick.ru (8.13.4/8.13.1/Submit) id kB7CfDvv081625; Thu, 7 Dec 2006 15:41:13 +0300 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.sick.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Thu, 7 Dec 2006 15:41:12 +0300 From: Gleb Smirnoff To: Andre Oppermann Message-ID: <20061207124112.GW32700@FreeBSD.org> References: <200612062319.kB6NJgsq031755@repoman.freebsd.org> <20061207110225.GU32700@FreeBSD.org> <4578070A.2030609@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline In-Reply-To: <4578070A.2030609@freebsd.org> User-Agent: Mutt/1.5.6i Cc: Perforce Change Reviews , Paolo Pisati Subject: Re: PERFORCE change 111230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 12:47:18 -0000 On Thu, Dec 07, 2006 at 01:20:26PM +0100, Andre Oppermann wrote: A> Gleb Smirnoff wrote: A> >On Wed, Dec 06, 2006 at 11:19:42PM +0000, Paolo Pisati wrote: A> >P> http://perforce.freebsd.org/chv.cgi?CH=111230 A> >P> A> >P> Change 111230 by piso@piso_newluxor on 2006/12/06 23:19:06 A> >P> A> >P> To workaround a problem when an mbuf is bigger than MCLBYTES A> >P> (and thus not handled by m_megapullup()), introduce & use A> >P> m_jumbo16pullup() that uses 16k jumbo size cluster. A> >P> A> >P> This problem only showed up on traffic generated on a box with A> >P> a nic tso enabled. A> > A> >Paolo, A> > A> >this isn't a fix. Another application will do write(,, 16k + 1) and A> >m_jumbo16pullup() will fail again. Please backout it, it is a hack. A> > A> >We need to fix TSO in such way that real packets, that will be A> >transmitted to wire, will be passed to pfil handlers. A> A> That is not possible. ATM this should be at least documented behavior. And a solution should be thought, because pfil must see real packets, not their precursors. -- Totus tuus, Glebius. GLEBIUS-RIPN GLEB-RIPE From owner-p4-projects@FreeBSD.ORG Thu Dec 7 13:02:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69AB316A517; Thu, 7 Dec 2006 13:02:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0BC1916A511 for ; Thu, 7 Dec 2006 13:02:28 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6698643CAA for ; Thu, 7 Dec 2006 13:00:52 +0000 (GMT) (envelope-from andre@freebsd.org) Received: (qmail 33784 invoked from network); 7 Dec 2006 12:49:57 -0000 Received: from c00l3r.networx.ch (HELO [127.0.0.1]) ([62.48.2.2]) (envelope-sender ) by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP for ; 7 Dec 2006 12:49:57 -0000 Message-ID: <457810AC.9080406@freebsd.org> Date: Thu, 07 Dec 2006 14:01:32 +0100 From: Andre Oppermann User-Agent: Thunderbird 1.5.0.8 (Windows/20061025) MIME-Version: 1.0 To: Gleb Smirnoff References: <200612062319.kB6NJgsq031755@repoman.freebsd.org> <20061207110225.GU32700@FreeBSD.org> <4578070A.2030609@freebsd.org> <20061207124112.GW32700@FreeBSD.org> In-Reply-To: <20061207124112.GW32700@FreeBSD.org> Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews , Paolo Pisati Subject: Re: PERFORCE change 111230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 13:02:28 -0000 Gleb Smirnoff wrote: > On Thu, Dec 07, 2006 at 01:20:26PM +0100, Andre Oppermann wrote: > A> Gleb Smirnoff wrote: > A> >On Wed, Dec 06, 2006 at 11:19:42PM +0000, Paolo Pisati wrote: > A> >P> http://perforce.freebsd.org/chv.cgi?CH=111230 > A> >P> > A> >P> Change 111230 by piso@piso_newluxor on 2006/12/06 23:19:06 > A> >P> > A> >P> To workaround a problem when an mbuf is bigger than MCLBYTES > A> >P> (and thus not handled by m_megapullup()), introduce & use > A> >P> m_jumbo16pullup() that uses 16k jumbo size cluster. > A> >P> > A> >P> This problem only showed up on traffic generated on a box with > A> >P> a nic tso enabled. > A> > > A> >Paolo, > A> > > A> >this isn't a fix. Another application will do write(,, 16k + 1) and > A> >m_jumbo16pullup() will fail again. Please backout it, it is a hack. > A> > > A> >We need to fix TSO in such way that real packets, that will be > A> >transmitted to wire, will be passed to pfil handlers. > A> > A> That is not possible. > > ATM this should be at least documented behavior. And a solution should > be thought, because pfil must see real packets, not their precursors. I fully agree about the documentation. Fixing TSO pass 'packets' to pfil is not possible as that equals disabling TSO in the first place. The user has to chose what he needs more, pfil correctly counting packet, or the performance benefits of TSO. Can't have both at the same time. On routers and firewalls TSO is not much of an issues. -- Andre From owner-p4-projects@FreeBSD.ORG Thu Dec 7 14:23:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40E9716A4A7; Thu, 7 Dec 2006 14:23:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DF2D716A416; Thu, 7 Dec 2006 14:23:12 +0000 (UTC) (envelope-from flag@newluxor.wired.org) Received: from mail.oltrelinux.com (krisma.oltrelinux.com [194.242.226.43]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0507B43CA3; Thu, 7 Dec 2006 14:22:19 +0000 (GMT) (envelope-from flag@newluxor.wired.org) Received: from newluxor.wired.org (ip-64-88.sn2.eutelia.it [83.211.64.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.oltrelinux.com (Postfix) with ESMTP id EBC0311AE43; Thu, 7 Dec 2006 15:23:03 +0100 (CET) Received: (from flag@localhost) by newluxor.wired.org (8.13.8/8.13.8/Submit) id kB7EMs85001985; Thu, 7 Dec 2006 15:22:54 +0100 (CET) (envelope-from flag) Date: Thu, 7 Dec 2006 15:22:54 +0100 From: Paolo Pisati To: Andre Oppermann Message-ID: <20061207142254.GA1195@tin.it> References: <200612062319.kB6NJgsq031755@repoman.freebsd.org> <20061207110225.GU32700@FreeBSD.org> <4578070A.2030609@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4578070A.2030609@freebsd.org> User-Agent: Mutt/1.4.2.2i X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at krisma.oltrelinux.com Cc: Gleb Smirnoff , Perforce Change Reviews , Paolo Pisati Subject: Re: PERFORCE change 111230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 14:23:13 -0000 On Thu, Dec 07, 2006 at 01:20:26PM +0100, Andre Oppermann wrote: > Gleb Smirnoff wrote: > >On Wed, Dec 06, 2006 at 11:19:42PM +0000, Paolo Pisati wrote: > >P> http://perforce.freebsd.org/chv.cgi?CH=111230 > >P> > >P> Change 111230 by piso@piso_newluxor on 2006/12/06 23:19:06 > >P> > >P> To workaround a problem when an mbuf is bigger than MCLBYTES > >P> (and thus not handled by m_megapullup()), introduce & use > >P> m_jumbo16pullup() that uses 16k jumbo size cluster. > >P> > >P> This problem only showed up on traffic generated on a box with > >P> a nic tso enabled. > > > >Paolo, > > > >this isn't a fix. Another application will do write(,, 16k + 1) and > >m_jumbo16pullup() will fail again. Please backout it, it is a hack. > > > >We need to fix TSO in such way that real packets, that will be > >transmitted to wire, will be passed to pfil handlers. > > That is not possible. Then, after a discussion on irc, pull the plug on any present (and future) hackery & half-baked solution, and declare in kernel libalias incompatible with tso. bye -- Paolo Piso's first law: nothing works as expected! From owner-p4-projects@FreeBSD.ORG Thu Dec 7 15:23:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F24C316A58C; Thu, 7 Dec 2006 15:22:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B166F16A52D for ; Thu, 7 Dec 2006 15:22:59 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E74443FE3 for ; Thu, 7 Dec 2006 15:19:23 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB7FK7D5086689 for ; Thu, 7 Dec 2006 15:20:07 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB7FK70q086685 for perforce@freebsd.org; Thu, 7 Dec 2006 15:20:07 GMT (envelope-from piso@freebsd.org) Date: Thu, 7 Dec 2006 15:20:07 GMT Message-Id: <200612071520.kB7FK70q086685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111246 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 15:23:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=111246 Change 111246 by piso@piso_newluxor on 2006/12/07 15:19:58 Backout change 111230. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#31 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#25 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#9 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#31 (text+ko) ==== @@ -3469,10 +3469,8 @@ ((ipfw_insn_nat *)cmd)->nat = t; } - if (m->m_pkthdr.len > MJUM16BYTES) - printf("fat pkt: %d\n", m->m_pkthdr.len); - if ((mcl = m_jumbo16pullup(m, - m->m_pkthdr.len)) == NULL) + if ((mcl = m_megapullup(m, m->m_pkthdr.len)) == + NULL) goto badnat; ip = mtod(mcl, struct ip *); if (args->eh == NULL) { @@ -3536,10 +3534,10 @@ c = mtod(mcl, char *); if (oif == NULL) retval = LibAliasIn(t->lib, c, - MJUM16BYTES); + MCLBYTES); else retval = LibAliasOut(t->lib, c, - MJUM16BYTES); + MCLBYTES); if (retval != PKT_ALIAS_OK) { /* XXX - should i add some logging? */ m_free(mcl); ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#25 (text+ko) ==== @@ -1656,29 +1656,4 @@ m_freem(m); return (NULL); } - -struct mbuf * -m_jumbo16pullup(struct mbuf *m, int len) { - struct mbuf *mcl; - caddr_t cp; - - if (len > MJUM16BYTES) - goto bad; - - if ((mcl = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, - MJUM16BYTES)) == NULL) - goto bad; - - cp = mtod(mcl, caddr_t); - m_copydata(m, 0, len, cp); - m_move_pkthdr(mcl, m); - mcl->m_len = mcl->m_pkthdr.len; - m_freem(m); - - return (mcl); -bad: - m_freem(m); - return (NULL); -} - #endif ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#9 (text+ko) ==== @@ -191,7 +191,6 @@ /* Mbuf helper function. */ struct mbuf *m_megapullup(struct mbuf *, int); -struct mbuf *m_jumbo16pullup(struct mbuf *, int); /* * Mode flags and other constants. From owner-p4-projects@FreeBSD.ORG Thu Dec 7 15:58:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACDEF16A501; Thu, 7 Dec 2006 15:58:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 82D4D16A52F for ; Thu, 7 Dec 2006 15:58:28 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E85B43EE3 for ; Thu, 7 Dec 2006 15:51:43 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB7FpncI092043 for ; Thu, 7 Dec 2006 15:51:49 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB7Fpn3n092038 for perforce@freebsd.org; Thu, 7 Dec 2006 15:51:49 GMT (envelope-from piso@freebsd.org) Date: Thu, 7 Dec 2006 15:51:49 GMT Message-Id: <200612071551.kB7Fpn3n092038@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111248 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 15:58:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=111248 Change 111248 by piso@piso_newluxor on 2006/12/07 15:51:05 Document the incompatibility of ipfw/libalias with TSO. Affected files ... .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw.8#10 edit Differences ... ==== //depot/projects/soc2005/libalias/sbin/ipfw/ipfw.8#10 (text+ko) ==== @@ -2624,3 +2624,10 @@ Rule syntax is subject to the command line environment and some patterns may need to be escaped with the backslash character or quoted appropriately. +.Pp +Due to the architecture of +.Xr libalias 3 , +ipfw nat is not compatible with the tcp segmentation offloading +(TSO). Thus, to reliably nat your network traffic, please disable TSO +on your NICs using +.Xr ifconfig 8 . From owner-p4-projects@FreeBSD.ORG Thu Dec 7 16:28:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64C4116A4C9; Thu, 7 Dec 2006 16:28:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 35A4B16A415; Thu, 7 Dec 2006 16:28:26 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E676E43F12; Thu, 7 Dec 2006 16:13:14 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 9F27B46F9A; Thu, 7 Dec 2006 11:14:06 -0500 (EST) Date: Thu, 7 Dec 2006 16:14:06 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Gleb Smirnoff In-Reply-To: <20061207124112.GW32700@FreeBSD.org> Message-ID: <20061207160859.V50906@fledge.watson.org> References: <200612062319.kB6NJgsq031755@repoman.freebsd.org> <20061207110225.GU32700@FreeBSD.org> <4578070A.2030609@freebsd.org> <20061207124112.GW32700@FreeBSD.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews , Andre Oppermann , Paolo Pisati Subject: Re: PERFORCE change 111230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 16:28:26 -0000 On Thu, 7 Dec 2006, Gleb Smirnoff wrote: > A> >this isn't a fix. Another application will do write(,, 16k + 1) and > A> >m_jumbo16pullup() will fail again. Please backout it, it is a hack. > A> > > A> >We need to fix TSO in such way that real packets, that will be > A> >transmitted to wire, will be passed to pfil handlers. > A> > A> That is not possible. > > ATM this should be at least documented behavior. And a solution should be > thought, because pfil must see real packets, not their precursors. This tension will always exist with offloaded services. tcpdump sees "corrupted" checksums on transmitted packets, and now it sees "long" TCP packets. Likewise, with reassembly offload, they'll come from the card in a reassembled form (this is present in the Neterion cards, which can do fragment reassembly, etc, in hardware, and pass a large datagram up the stack). I don't see any way of getting around the fact that IP processing happens before or after the firewall in the New World Order. If a firewall really wants to see the packets as they will be transmitted, it can always do the fragmentation and checksumming itself. However, this is pretty undesirable from a performance perspective. I think pfil seeing the cards as they transit the IP layer is the right approach. Robert N M Watson Computer Laboratory University of Cambridge From owner-p4-projects@FreeBSD.ORG Thu Dec 7 16:30:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC90516A49E; Thu, 7 Dec 2006 16:30:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6DB8616A40F; Thu, 7 Dec 2006 16:30:54 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E9E844343; Thu, 7 Dec 2006 16:16:01 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id F3E7646FA4; Thu, 7 Dec 2006 11:16:41 -0500 (EST) Date: Thu, 7 Dec 2006 16:16:41 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Paolo Pisati In-Reply-To: <20061207142254.GA1195@tin.it> Message-ID: <20061207161434.O50906@fledge.watson.org> References: <200612062319.kB6NJgsq031755@repoman.freebsd.org> <20061207110225.GU32700@FreeBSD.org> <4578070A.2030609@freebsd.org> <20061207142254.GA1195@tin.it> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Gleb Smirnoff , Andre Oppermann , Perforce Change Reviews Subject: Re: PERFORCE change 111230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 16:30:54 -0000 On Thu, 7 Dec 2006, Paolo Pisati wrote: > Then, after a discussion on irc, pull the plug on any present (and future) > hackery & half-baked solution, and declare in kernel libalias incompatible > with tso. This seems silly -- why is it not compatible? Perhaps I misunderstand, but I thought TSO passed down valid TCP/IP packets, they just happen to be really long, and will be post-processed by the hardware into a series of shorter segments with the same header properties. Imagine the ethernet device as a "router" that's performing TCP fragmentation for you, rather than IP fragmentation. Robert N M Watson Computer Laboratory University of Cambridge From owner-p4-projects@FreeBSD.ORG Thu Dec 7 16:38:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B072816A4A0; Thu, 7 Dec 2006 16:38:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6521216A494 for ; Thu, 7 Dec 2006 16:38:21 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id D37DB43CD2 for ; Thu, 7 Dec 2006 16:36:07 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB7GavpI000746 for ; Thu, 7 Dec 2006 16:36:57 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB7GajOx000725 for perforce@freebsd.org; Thu, 7 Dec 2006 16:36:45 GMT (envelope-from imp@freebsd.org) Date: Thu, 7 Dec 2006 16:36:45 GMT Message-Id: <200612071636.kB7GajOx000725@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 16:38:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=111249 Change 111249 by imp@imp_paco-paco on 2006/12/07 16:36:02 IFC @111248 + merges for mii work Affected files ... .. //depot/projects/arm/src/Makefile#8 integrate .. //depot/projects/arm/src/lib/libarchive/Makefile#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read.3#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_open_file.c#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_open_filename.c#1 branch .. //depot/projects/arm/src/lib/libarchive/archive_write.3#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_open_file.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_open_filename.c#1 branch .. //depot/projects/arm/src/lib/libc/sys/kqueue.2#4 integrate .. //depot/projects/arm/src/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/arm/src/release/picobsd/tinyware/vm/vm.c#2 integrate .. //depot/projects/arm/src/rescue/rescue/Makefile#3 integrate .. //depot/projects/arm/src/sbin/mount_nfs/Makefile#2 integrate .. //depot/projects/arm/src/sbin/mount_nfs/mount_nfs.c#2 integrate .. //depot/projects/arm/src/sbin/sysctl/sysctl.c#8 integrate .. //depot/projects/arm/src/share/man/man5/fdescfs.5#2 integrate .. //depot/projects/arm/src/share/man/man5/mqueuefs.5#3 integrate .. //depot/projects/arm/src/share/man/man7/hier.7#5 integrate .. //depot/projects/arm/src/sys/arm/conf/TS7200#7 edit .. //depot/projects/arm/src/sys/arm/sa11x0/sa11x0_io.c#6 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_space.c#4 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/obio_space.c#3 integrate .. //depot/projects/arm/src/sys/conf/options#34 integrate .. //depot/projects/arm/src/sys/dev/bfe/if_bfe.c#8 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iic.c#11 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/arm/src/sys/dev/pci/pci.c#18 integrate .. //depot/projects/arm/src/sys/dev/re/if_re.c#18 integrate .. //depot/projects/arm/src/sys/dev/rp/rp.c#4 integrate .. //depot/projects/arm/src/sys/dev/rp/rpreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/rp/rpvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/FILES#2 integrate .. //depot/projects/arm/src/sys/fs/ntfs/ntfs_subr.c#5 integrate .. //depot/projects/arm/src/sys/fs/ntfs/ntfs_subr.h#2 integrate .. //depot/projects/arm/src/sys/fs/ntfs/ntfs_vnops.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_event.c#10 integrate .. //depot/projects/arm/src/sys/kern/sched_4bsd.c#12 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#10 integrate .. //depot/projects/arm/src/sys/pc98/pc98/machdep.c#12 integrate .. //depot/projects/arm/src/sys/pci/if_rlreg.h#8 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/genassym.c#6 integrate .. //depot/projects/arm/src/sys/sun4v/conf/NOTES#5 integrate .. //depot/projects/arm/src/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/arm/src/sys/sun4v/include/pmap.h#3 integrate .. //depot/projects/arm/src/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/tsb.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/tte_hash.h#4 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/exception.S#5 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/interrupt.S#3 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/tte.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/projects/arm/src/sys/sys/vmmeter.h#2 integrate .. //depot/projects/arm/src/sys/vm/vm_kern.h#2 integrate .. //depot/projects/arm/src/sys/vm/vm_meter.c#8 integrate .. //depot/projects/arm/src/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles#2 integrate .. //depot/projects/arm/src/tools/tools/tinybsd/conf/default/tinybsd.basefiles#2 integrate .. //depot/projects/arm/src/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles#2 integrate .. //depot/projects/arm/src/tools/tools/tinybsd/conf/minimal/tinybsd.basefiles#2 integrate .. //depot/projects/arm/src/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles#2 integrate .. //depot/projects/arm/src/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles#2 integrate .. //depot/projects/arm/src/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles#2 integrate .. //depot/projects/arm/src/usr.bin/systat/vmstat.c#2 integrate .. //depot/projects/arm/src/usr.bin/vmstat/vmstat.c#3 integrate .. //depot/projects/arm/src/usr.sbin/crunch/examples/really-big.conf#3 integrate .. //depot/projects/arm/src/usr.sbin/jail/jail.8#3 integrate .. //depot/user/imp/freebsd-imp/Makefile#64 integrate .. //depot/user/imp/freebsd-imp/Makefile.inc1#161 integrate .. //depot/user/imp/freebsd-imp/ObsoleteFiles.inc#36 integrate .. //depot/user/imp/freebsd-imp/UPDATING#150 integrate .. //depot/user/imp/freebsd-imp/bin/hostname/hostname.1#6 integrate .. //depot/user/imp/freebsd-imp/bin/pax/cpio.c#7 integrate .. //depot/user/imp/freebsd-imp/bin/pax/tar.c#5 integrate .. //depot/user/imp/freebsd-imp/contrib/pf/pfctl/pfctl_altq.c#6 integrate .. //depot/user/imp/freebsd-imp/contrib/top/sigconv.awk#2 integrate .. //depot/user/imp/freebsd-imp/etc/mtree/BSD.usr.dist#47 integrate .. //depot/user/imp/freebsd-imp/etc/rc.initdiskless#10 integrate .. //depot/user/imp/freebsd-imp/etc/rc.subr#45 integrate .. //depot/user/imp/freebsd-imp/games/fortune/datfiles/fortunes#93 integrate .. //depot/user/imp/freebsd-imp/games/fortune/datfiles/freebsd-tips#16 integrate .. //depot/user/imp/freebsd-imp/gnu/usr.bin/groff/tmac/mdoc.local#29 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/Makefile#44 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive.h.in#17 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_read.3#22 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_read_open_file.c#14 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_read_open_memory.c#1 branch .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_read_support_format_iso9660.c#13 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_write.3#13 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_write.c#18 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_write_open_fd.c#6 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_write_open_file.c#13 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_write_open_memory.c#1 branch .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_write_set_compression_none.c#10 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_write_set_format_pax.c#29 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_write_set_format_ustar.c#15 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/libarchive.3#8 integrate .. //depot/user/imp/freebsd-imp/lib/libc/gen/confstr.3#3 integrate .. //depot/user/imp/freebsd-imp/lib/libc/gen/err.3#4 integrate .. //depot/user/imp/freebsd-imp/lib/libc/net/nscachedcli.c#3 integrate .. //depot/user/imp/freebsd-imp/lib/libc/sys/close.2#5 integrate .. //depot/user/imp/freebsd-imp/lib/libc/sys/sendfile.2#14 integrate .. //depot/user/imp/freebsd-imp/lib/libelf/Makefile#2 integrate .. //depot/user/imp/freebsd-imp/lib/libkvm/kvm_proc.c#27 integrate .. //depot/user/imp/freebsd-imp/lib/libpthread/thread/thr_join.c#9 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/Makefile#19 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/thread/thr_barrier.c#7 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/thread/thr_cancel.c#12 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/thread/thr_cond.c#16 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/thread/thr_create.c#28 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/thread/thr_exit.c#18 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/thread/thr_fork.c#7 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/thread/thr_init.c#34 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/thread/thr_join.c#18 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/thread/thr_list.c#10 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/thread/thr_private.h#50 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/thread/thr_sem.c#7 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/thread/thr_sig.c#17 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/thread/thr_syscalls.c#13 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/thread/thr_umtx.c#6 integrate .. //depot/user/imp/freebsd-imp/lib/libthr/thread/thr_umtx.h#7 integrate .. //depot/user/imp/freebsd-imp/release/Makefile#121 integrate .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/Makefile#6 integrate .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile#2 delete .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#5 delete .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#1 branch .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#220 delete .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent#2 delete .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile#3 delete .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#6 delete .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#2 delete .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#5 delete .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile#2 delete .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#5 delete .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#2 delete .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#2 delete .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile#2 delete .. //depot/user/imp/freebsd-imp/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#5 delete .. //depot/user/imp/freebsd-imp/release/doc/share/examples/Makefile.relnotesng#10 integrate .. //depot/user/imp/freebsd-imp/release/picobsd/tinyware/vm/vm.c#3 integrate .. //depot/user/imp/freebsd-imp/rescue/rescue/Makefile#37 integrate .. //depot/user/imp/freebsd-imp/sbin/Makefile#47 integrate .. //depot/user/imp/freebsd-imp/sbin/camcontrol/camcontrol.c#10 integrate .. //depot/user/imp/freebsd-imp/sbin/ggate/Makefile#7 integrate .. //depot/user/imp/freebsd-imp/sbin/ifconfig/ifbridge.c#6 integrate .. //depot/user/imp/freebsd-imp/sbin/ifconfig/ifconfig.8#53 integrate .. //depot/user/imp/freebsd-imp/sbin/mount/mount_fs.c#2 integrate .. //depot/user/imp/freebsd-imp/sbin/mount_nfs/mount_nfs.c#12 integrate .. //depot/user/imp/freebsd-imp/sbin/mount_unionfs/Makefile#3 integrate .. //depot/user/imp/freebsd-imp/sbin/mount_unionfs/mount_unionfs.8#8 integrate .. //depot/user/imp/freebsd-imp/sbin/mount_unionfs/mount_unionfs.c#6 integrate .. //depot/user/imp/freebsd-imp/sbin/reboot/boot_i386.8#17 integrate .. //depot/user/imp/freebsd-imp/sbin/reboot/reboot.8#7 integrate .. //depot/user/imp/freebsd-imp/sbin/restore/main.c#9 integrate .. //depot/user/imp/freebsd-imp/sbin/restore/restore.8#15 integrate .. //depot/user/imp/freebsd-imp/sbin/restore/restore.c#4 integrate .. //depot/user/imp/freebsd-imp/sbin/restore/restore.h#5 integrate .. //depot/user/imp/freebsd-imp/sbin/restore/tape.c#9 integrate .. //depot/user/imp/freebsd-imp/sbin/sysctl/sysctl.c#28 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/Makefile#141 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/altq.4#19 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/ata.4#30 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/ath.4#36 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/bce.4#3 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/man4.arm/Makefile#1 branch .. //depot/user/imp/freebsd-imp/share/man/man4/man4.arm/npe.4#1 branch .. //depot/user/imp/freebsd-imp/share/man/man4/man4.i386/acpi_ibm.4#14 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/md.4#4 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/pcm.4#21 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/polling.4#20 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/re.4#19 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/snd_atiixp.4#4 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/snd_es137x.4#9 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/snd_hda.4#3 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/snd_via8233.4#6 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/ubsa.4#6 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/ubser.4#6 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/ubtbcmfw.4#7 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/ucycom.4#3 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/udbp.4#4 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/ufm.4#4 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/ufoma.4#4 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/uftdi.4#8 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/ugen.4#4 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/uhid.4#5 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/ukbd.4#6 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/ulpt.4#5 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/umass.4#23 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/umct.4#7 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/umodem.4#7 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/ums.4#6 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/uplcom.4#13 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/urio.4#6 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/usb.4#14 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/uscanner.4#21 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/utopia.4#9 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/uvisor.4#8 integrate .. //depot/user/imp/freebsd-imp/share/man/man4/uvscom.4#4 integrate .. //depot/user/imp/freebsd-imp/share/man/man5/fdescfs.5#5 integrate .. //depot/user/imp/freebsd-imp/share/man/man7/ports.7#21 integrate .. //depot/user/imp/freebsd-imp/share/man/man7/tuning.7#20 integrate .. //depot/user/imp/freebsd-imp/share/man/man8/MAKEDEV.8#3 integrate .. //depot/user/imp/freebsd-imp/share/man/man9/LOCK_PROFILING.9#2 integrate .. //depot/user/imp/freebsd-imp/share/man/man9/Makefile#76 integrate .. //depot/user/imp/freebsd-imp/share/man/man9/config_intrhook.9#2 integrate .. //depot/user/imp/freebsd-imp/share/man/man9/devsw.9#3 delete .. //depot/user/imp/freebsd-imp/share/man/man9/make_dev.9#9 integrate .. //depot/user/imp/freebsd-imp/share/man/man9/style.9#25 integrate .. //depot/user/imp/freebsd-imp/share/man/man9/sysctl.9#4 integrate .. //depot/user/imp/freebsd-imp/share/man/man9/uio.9#7 integrate .. //depot/user/imp/freebsd-imp/share/misc/pci_vendors#14 integrate .. //depot/user/imp/freebsd-imp/sys/Makefile#15 integrate .. //depot/user/imp/freebsd-imp/sys/amd64/amd64/genassym.c#17 integrate .. //depot/user/imp/freebsd-imp/sys/amd64/amd64/machdep.c#61 integrate .. //depot/user/imp/freebsd-imp/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/user/imp/freebsd-imp/sys/amd64/amd64/pmap.c#103 integrate .. //depot/user/imp/freebsd-imp/sys/amd64/amd64/trap.c#49 integrate .. //depot/user/imp/freebsd-imp/sys/amd64/conf/GENERIC#70 integrate .. //depot/user/imp/freebsd-imp/sys/amd64/include/pmap.h#28 integrate .. //depot/user/imp/freebsd-imp/sys/amd64/isa/clock.c#24 integrate .. //depot/user/imp/freebsd-imp/sys/amd64/linux32/linux32_sysvec.c#19 integrate .. //depot/user/imp/freebsd-imp/sys/arm/arm/cpufunc.c#13 integrate .. //depot/user/imp/freebsd-imp/sys/arm/arm/genassym.c#8 integrate .. //depot/user/imp/freebsd-imp/sys/arm/arm/pmap.c#50 integrate .. //depot/user/imp/freebsd-imp/sys/arm/at91/at91_pio.c#4 integrate .. //depot/user/imp/freebsd-imp/sys/arm/at91/at91_spi.c#4 integrate .. //depot/user/imp/freebsd-imp/sys/arm/at91/at91_twi.c#6 integrate .. //depot/user/imp/freebsd-imp/sys/arm/at91/kb920x_machdep.c#15 integrate .. //depot/user/imp/freebsd-imp/sys/arm/at91/uart_dev_at91usart.c#9 integrate .. //depot/user/imp/freebsd-imp/sys/arm/conf/AVILA#2 integrate .. //depot/user/imp/freebsd-imp/sys/arm/include/cpuconf.h#9 integrate .. //depot/user/imp/freebsd-imp/sys/arm/sa11x0/assabet_machdep.c#16 integrate .. //depot/user/imp/freebsd-imp/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/user/imp/freebsd-imp/sys/arm/xscale/i80321/i80321_space.c#7 integrate .. //depot/user/imp/freebsd-imp/sys/arm/xscale/i80321/iq31244_machdep.c#24 integrate .. //depot/user/imp/freebsd-imp/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/user/imp/freebsd-imp/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/user/imp/freebsd-imp/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/user/imp/freebsd-imp/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/user/imp/freebsd-imp/sys/arm/xscale/ixp425/ixdp425reg.h#2 integrate .. //depot/user/imp/freebsd-imp/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/user/imp/freebsd-imp/sys/boot/common/loader.8#27 integrate .. //depot/user/imp/freebsd-imp/sys/boot/i386/btx/btx/btx.S#7 integrate .. //depot/user/imp/freebsd-imp/sys/boot/sparc64/loader/hcall.S#2 delete .. //depot/user/imp/freebsd-imp/sys/cam/cam_ccb.h#11 integrate .. //depot/user/imp/freebsd-imp/sys/cam/cam_periph.c#22 integrate .. //depot/user/imp/freebsd-imp/sys/cam/cam_xpt.c#32 integrate .. //depot/user/imp/freebsd-imp/sys/cam/cam_xpt.h#3 integrate .. //depot/user/imp/freebsd-imp/sys/cam/scsi/scsi_all.h#9 integrate .. //depot/user/imp/freebsd-imp/sys/cam/scsi/scsi_cd.c#35 integrate .. //depot/user/imp/freebsd-imp/sys/cam/scsi/scsi_ch.c#13 integrate .. //depot/user/imp/freebsd-imp/sys/cam/scsi/scsi_da.c#62 integrate .. //depot/user/imp/freebsd-imp/sys/cam/scsi/scsi_pass.c#11 integrate .. //depot/user/imp/freebsd-imp/sys/cam/scsi/scsi_pt.c#11 integrate .. //depot/user/imp/freebsd-imp/sys/cam/scsi/scsi_sa.c#23 integrate .. //depot/user/imp/freebsd-imp/sys/cam/scsi/scsi_ses.c#12 integrate .. //depot/user/imp/freebsd-imp/sys/cam/scsi/scsi_targ_bh.c#10 integrate .. //depot/user/imp/freebsd-imp/sys/cam/scsi/scsi_target.c#22 integrate .. //depot/user/imp/freebsd-imp/sys/compat/linprocfs/linprocfs.c#42 integrate .. //depot/user/imp/freebsd-imp/sys/compat/linsysfs/linsysfs.c#3 integrate .. //depot/user/imp/freebsd-imp/sys/compat/linux/linux_misc.c#48 integrate .. //depot/user/imp/freebsd-imp/sys/compat/linux/linux_stats.c#31 integrate .. //depot/user/imp/freebsd-imp/sys/conf/files#255 integrate .. //depot/user/imp/freebsd-imp/sys/conf/files.arm#12 integrate .. //depot/user/imp/freebsd-imp/sys/conf/files.sun4v#4 integrate .. //depot/user/imp/freebsd-imp/sys/conf/kern.mk#20 integrate .. //depot/user/imp/freebsd-imp/sys/conf/options#144 integrate .. //depot/user/imp/freebsd-imp/sys/ddb/db_ps.c#27 integrate .. //depot/user/imp/freebsd-imp/sys/dev/ath/if_ath.c#74 integrate .. //depot/user/imp/freebsd-imp/sys/dev/ath/if_ath_pci.c#16 integrate .. //depot/user/imp/freebsd-imp/sys/dev/bce/if_bce.c#10 integrate .. //depot/user/imp/freebsd-imp/sys/dev/bge/if_bge.c#91 integrate .. //depot/user/imp/freebsd-imp/sys/dev/bge/if_bgereg.h#48 integrate .. //depot/user/imp/freebsd-imp/sys/dev/ciss/ciss.c#52 integrate .. //depot/user/imp/freebsd-imp/sys/dev/dc/if_dc.c#17 integrate .. //depot/user/imp/freebsd-imp/sys/dev/dc/if_dcreg.h#9 integrate .. //depot/user/imp/freebsd-imp/sys/dev/em/if_em.c#99 integrate .. //depot/user/imp/freebsd-imp/sys/dev/em/if_em.h#42 integrate .. //depot/user/imp/freebsd-imp/sys/dev/ep/if_ep.c#33 integrate .. //depot/user/imp/freebsd-imp/sys/dev/firewire/fwdev.c#33 integrate .. //depot/user/imp/freebsd-imp/sys/dev/flash/at45d.c#1 branch .. //depot/user/imp/freebsd-imp/sys/dev/fxp/if_fxp.c#79 integrate .. //depot/user/imp/freebsd-imp/sys/dev/fxp/if_fxpvar.h#18 integrate .. //depot/user/imp/freebsd-imp/sys/dev/gem/if_gem.c#29 integrate .. //depot/user/imp/freebsd-imp/sys/dev/gem/if_gemvar.h#9 integrate .. //depot/user/imp/freebsd-imp/sys/dev/hme/if_hme.c#35 integrate .. //depot/user/imp/freebsd-imp/sys/dev/hme/if_hmevar.h#9 integrate .. //depot/user/imp/freebsd-imp/sys/dev/iicbus/iic.h#3 integrate .. //depot/user/imp/freebsd-imp/sys/dev/iicbus/iicbb.c#6 integrate .. //depot/user/imp/freebsd-imp/sys/dev/iicbus/iicbus_if.m#4 integrate .. //depot/user/imp/freebsd-imp/sys/dev/iicbus/iiconf.c#4 integrate .. //depot/user/imp/freebsd-imp/sys/dev/iicbus/iiconf.h#4 integrate .. //depot/user/imp/freebsd-imp/sys/dev/ipmi/ipmi.c#6 integrate .. //depot/user/imp/freebsd-imp/sys/dev/isp/isp.c#27 integrate .. //depot/user/imp/freebsd-imp/sys/dev/isp/isp_freebsd.c#34 integrate .. //depot/user/imp/freebsd-imp/sys/dev/isp/isp_target.c#19 integrate .. //depot/user/imp/freebsd-imp/sys/dev/isp/ispvar.h#19 integrate .. //depot/user/imp/freebsd-imp/sys/dev/iwi/if_iwi.c#27 integrate .. //depot/user/imp/freebsd-imp/sys/dev/le/am7990.c#4 integrate .. //depot/user/imp/freebsd-imp/sys/dev/le/am79900.c#4 integrate .. //depot/user/imp/freebsd-imp/sys/dev/le/lance.c#3 integrate .. //depot/user/imp/freebsd-imp/sys/dev/le/lancevar.h#3 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/acphy.c#11 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/amphy.c#11 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/bmtphy.c#11 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/brgphy.c#32 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/ciphy.c#6 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/gentbi.c#2 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/inphy.c#8 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/lxtphy.c#11 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/mii_physubr.c#11 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/miidevs#15 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/miivar.h#4 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/mlphy.c#8 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/nsgphy.c#14 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/nsphy.c#10 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/pnaphy.c#12 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/qsphy.c#10 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/rgephy.c#11 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/rlphy.c#13 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/tdkphy.c#12 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/tlphy.c#11 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mii/xmphy.c#13 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mpt/mpt.c#27 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mpt/mpt.h#24 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mpt/mpt_cam.c#30 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mpt/mpt_raid.c#10 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mxge/if_mxge.c#10 integrate .. //depot/user/imp/freebsd-imp/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/user/imp/freebsd-imp/sys/dev/nfe/if_nfe.c#8 integrate .. //depot/user/imp/freebsd-imp/sys/dev/nfe/if_nfereg.h#5 integrate .. //depot/user/imp/freebsd-imp/sys/dev/nfe/if_nfevar.h#3 integrate .. //depot/user/imp/freebsd-imp/sys/dev/nve/if_nvereg.h#7 integrate .. //depot/user/imp/freebsd-imp/sys/dev/ral/rt2560.c#7 integrate .. //depot/user/imp/freebsd-imp/sys/dev/ral/rt2661.c#7 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pci/atiixp.c#8 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pci/cmi.c#22 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pci/es137x.c#20 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pci/ich.c#39 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pci/via8233.c#22 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/ac97.c#33 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/ac97.h#8 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/buffer.c#18 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/buffer.h#10 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/channel.c#25 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/channel.h#9 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/dsp.c#37 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/fake.c#8 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/feeder.c#16 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/feeder.h#7 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/feeder_fmt.c#15 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/feeder_rate.c#16 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/feeder_volume.c#3 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/mixer.c#21 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/sndstat.c#15 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/sound.c#28 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/sound.h#23 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/pcm/vchan.c#19 integrate .. //depot/user/imp/freebsd-imp/sys/dev/sound/usb/uaudio.c#13 integrate .. //depot/user/imp/freebsd-imp/sys/dev/usb/if_aue.c#35 integrate .. //depot/user/imp/freebsd-imp/sys/dev/usb/if_auereg.h#8 integrate .. //depot/user/imp/freebsd-imp/sys/dev/usb/if_ural.c#26 integrate .. //depot/user/imp/freebsd-imp/sys/dev/usb/ukbd.c#18 integrate .. //depot/user/imp/freebsd-imp/sys/dev/usb/usb_quirks.c#22 integrate .. //depot/user/imp/freebsd-imp/sys/dev/usb/usb_quirks.h#8 integrate .. //depot/user/imp/freebsd-imp/sys/dev/usb/usbdevs#105 integrate .. //depot/user/imp/freebsd-imp/sys/dev/usb/usbdi.c#17 integrate .. //depot/user/imp/freebsd-imp/sys/dev/vge/if_vge.c#21 integrate .. //depot/user/imp/freebsd-imp/sys/fs/msdosfs/msdosfs_conv.c#17 integrate .. //depot/user/imp/freebsd-imp/sys/fs/msdosfs/msdosfs_vnops.c#32 integrate .. //depot/user/imp/freebsd-imp/sys/fs/procfs/procfs_status.c#15 integrate .. //depot/user/imp/freebsd-imp/sys/fs/unionfs/union.h#9 integrate .. //depot/user/imp/freebsd-imp/sys/fs/unionfs/union_subr.c#21 integrate .. //depot/user/imp/freebsd-imp/sys/fs/unionfs/union_vfsops.c#22 integrate .. //depot/user/imp/freebsd-imp/sys/fs/unionfs/union_vnops.c#32 integrate .. //depot/user/imp/freebsd-imp/sys/geom/journal/g_journal.c#3 integrate .. //depot/user/imp/freebsd-imp/sys/i386/i386/genassym.c#23 integrate .. //depot/user/imp/freebsd-imp/sys/i386/i386/locore.s#22 integrate .. //depot/user/imp/freebsd-imp/sys/i386/i386/machdep.c#78 integrate .. //depot/user/imp/freebsd-imp/sys/i386/isa/clock.c#38 integrate .. //depot/user/imp/freebsd-imp/sys/ia64/ia64/machdep.c#79 integrate .. //depot/user/imp/freebsd-imp/sys/kern/init_main.c#55 integrate .. //depot/user/imp/freebsd-imp/sys/kern/kern_clock.c#43 integrate .. //depot/user/imp/freebsd-imp/sys/kern/kern_fork.c#83 integrate .. //depot/user/imp/freebsd-imp/sys/kern/kern_idle.c#18 integrate .. //depot/user/imp/freebsd-imp/sys/kern/kern_intr.c#44 integrate .. //depot/user/imp/freebsd-imp/sys/kern/kern_kse.c#29 integrate .. //depot/user/imp/freebsd-imp/sys/kern/kern_poll.c#18 integrate .. //depot/user/imp/freebsd-imp/sys/kern/kern_proc.c#65 integrate .. //depot/user/imp/freebsd-imp/sys/kern/kern_resource.c#45 integrate .. //depot/user/imp/freebsd-imp/sys/kern/kern_subr.c#33 integrate .. //depot/user/imp/freebsd-imp/sys/kern/kern_switch.c#59 integrate .. //depot/user/imp/freebsd-imp/sys/kern/kern_synch.c#70 integrate .. //depot/user/imp/freebsd-imp/sys/kern/kern_thr.c#38 integrate .. //depot/user/imp/freebsd-imp/sys/kern/kern_thread.c#111 integrate .. //depot/user/imp/freebsd-imp/sys/kern/kern_time.c#40 integrate .. //depot/user/imp/freebsd-imp/sys/kern/kern_umtx.c#35 integrate .. //depot/user/imp/freebsd-imp/sys/kern/ksched.c#2 integrate .. //depot/user/imp/freebsd-imp/sys/kern/link_elf_obj.c#11 integrate .. //depot/user/imp/freebsd-imp/sys/kern/sched_4bsd.c#60 integrate .. //depot/user/imp/freebsd-imp/sys/kern/sched_ule.c#93 integrate .. //depot/user/imp/freebsd-imp/sys/kern/subr_lock.c#4 integrate .. //depot/user/imp/freebsd-imp/sys/kern/subr_prf.c#35 integrate .. //depot/user/imp/freebsd-imp/sys/kern/subr_rman.c#26 integrate .. //depot/user/imp/freebsd-imp/sys/kern/subr_trap.c#47 integrate .. //depot/user/imp/freebsd-imp/sys/kern/tty.c#51 integrate .. //depot/user/imp/freebsd-imp/sys/kern/uipc_socket.c#89 integrate .. //depot/user/imp/freebsd-imp/sys/kern/vfs_export.c#18 integrate .. //depot/user/imp/freebsd-imp/sys/modules/Makefile#164 integrate .. //depot/user/imp/freebsd-imp/sys/modules/wlan_amrr/Makefile#1 branch .. //depot/user/imp/freebsd-imp/sys/net/bridgestp.c#18 integrate .. //depot/user/imp/freebsd-imp/sys/net/bridgestp.h#6 integrate .. //depot/user/imp/freebsd-imp/sys/net/ethernet.h#6 integrate .. //depot/user/imp/freebsd-imp/sys/net/if.c#85 integrate .. //depot/user/imp/freebsd-imp/sys/net/if_atmsubr.c#23 integrate .. //depot/user/imp/freebsd-imp/sys/net/if_bridge.c#50 integrate .. //depot/user/imp/freebsd-imp/sys/net/if_bridgevar.h#14 integrate .. //depot/user/imp/freebsd-imp/sys/net/if_llc.h#5 integrate .. //depot/user/imp/freebsd-imp/sys/net/if_ppp.c#30 integrate .. //depot/user/imp/freebsd-imp/sys/net/if_pppvar.h#7 integrate .. //depot/user/imp/freebsd-imp/sys/net/netisr.c#14 integrate .. //depot/user/imp/freebsd-imp/sys/net/ppp_tty.c#17 integrate .. //depot/user/imp/freebsd-imp/sys/net/route.c#40 integrate .. //depot/user/imp/freebsd-imp/sys/net80211/ieee80211.c#25 integrate .. //depot/user/imp/freebsd-imp/sys/net80211/ieee80211.h#11 integrate .. //depot/user/imp/freebsd-imp/sys/net80211/ieee80211_amrr.c#1 branch .. //depot/user/imp/freebsd-imp/sys/net80211/ieee80211_amrr.h#1 branch .. //depot/user/imp/freebsd-imp/sys/net80211/ieee80211_input.c#38 integrate .. //depot/user/imp/freebsd-imp/sys/net80211/ieee80211_output.c#34 integrate .. //depot/user/imp/freebsd-imp/sys/net80211/ieee80211_var.h#28 integrate .. //depot/user/imp/freebsd-imp/sys/netgraph/ng_nat.c#5 integrate .. //depot/user/imp/freebsd-imp/sys/netinet/igmp.c#17 integrate .. //depot/user/imp/freebsd-imp/sys/netinet/in_pcb.c#60 integrate .. //depot/user/imp/freebsd-imp/sys/netinet/ip_carp.h#3 integrate .. //depot/user/imp/freebsd-imp/sys/netinet/libalias/alias.c#5 integrate .. //depot/user/imp/freebsd-imp/sys/netinet/libalias/alias.h#4 integrate .. //depot/user/imp/freebsd-imp/sys/netinet/tcp_usrreq.c#42 integrate .. //depot/user/imp/freebsd-imp/sys/netinet6/nd6.c#43 integrate .. //depot/user/imp/freebsd-imp/sys/nfs/nfsproto.h#5 integrate .. //depot/user/imp/freebsd-imp/sys/nfs4client/nfs4_subs.c#5 integrate .. //depot/user/imp/freebsd-imp/sys/nfs4client/nfs4_vn_subs.c#5 integrate .. //depot/user/imp/freebsd-imp/sys/nfsclient/bootp_subr.c#24 integrate .. //depot/user/imp/freebsd-imp/sys/nfsclient/nfs_diskless.c#16 integrate .. //depot/user/imp/freebsd-imp/sys/nfsclient/nfs_node.c#26 integrate .. //depot/user/imp/freebsd-imp/sys/nfsclient/nfs_socket.c#47 integrate .. //depot/user/imp/freebsd-imp/sys/nfsclient/nfs_vfsops.c#52 integrate .. //depot/user/imp/freebsd-imp/sys/nfsclient/nfsdiskless.h#5 integrate .. //depot/user/imp/freebsd-imp/sys/nfsserver/nfs.h#14 integrate .. //depot/user/imp/freebsd-imp/sys/nfsserver/nfs_serv.c#42 integrate .. //depot/user/imp/freebsd-imp/sys/nfsserver/nfs_srvsubs.c#27 integrate .. //depot/user/imp/freebsd-imp/sys/pc98/pc98/machdep.c#22 integrate .. //depot/user/imp/freebsd-imp/sys/pci/if_pcn.c#40 integrate .. //depot/user/imp/freebsd-imp/sys/pci/if_pcnreg.h#9 integrate .. //depot/user/imp/freebsd-imp/sys/pci/if_rl.c#67 integrate .. //depot/user/imp/freebsd-imp/sys/pci/if_rlreg.h#32 integrate .. //depot/user/imp/freebsd-imp/sys/pci/if_xl.c#71 integrate .. //depot/user/imp/freebsd-imp/sys/pci/if_xlreg.h#21 integrate .. //depot/user/imp/freebsd-imp/sys/powerpc/include/pmap.h#12 integrate .. //depot/user/imp/freebsd-imp/sys/powerpc/powerpc/genassym.c#13 integrate .. //depot/user/imp/freebsd-imp/sys/powerpc/powerpc/machdep.c#47 integrate .. //depot/user/imp/freebsd-imp/sys/powerpc/powerpc/mmu_if.m#7 integrate .. //depot/user/imp/freebsd-imp/sys/powerpc/powerpc/mmu_oea.c#10 integrate .. //depot/user/imp/freebsd-imp/sys/powerpc/powerpc/pmap_dispatch.c#9 integrate .. //depot/user/imp/freebsd-imp/sys/powerpc/powerpc/uio_machdep.c#5 integrate .. //depot/user/imp/freebsd-imp/sys/sparc64/sparc64/genassym.c#20 integrate .. //depot/user/imp/freebsd-imp/sys/sparc64/sparc64/machdep.c#53 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/cddl/mdesc/mdesc_diff.c#1 branch .. //depot/user/imp/freebsd-imp/sys/sun4v/cddl/mdesc/mdesc_findname.c#1 branch .. //depot/user/imp/freebsd-imp/sys/sun4v/cddl/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/user/imp/freebsd-imp/sys/sun4v/cddl/mdesc/mdesc_fini.c#1 branch .. //depot/user/imp/freebsd-imp/sys/sun4v/cddl/mdesc/mdesc_getbinsize.c#1 branch .. //depot/user/imp/freebsd-imp/sys/sun4v/cddl/mdesc/mdesc_getgen.c#1 branch .. //depot/user/imp/freebsd-imp/sys/sun4v/cddl/mdesc/mdesc_getpropdata.c#1 branch .. //depot/user/imp/freebsd-imp/sys/sun4v/cddl/mdesc/mdesc_getpropstr.c#1 branch .. //depot/user/imp/freebsd-imp/sys/sun4v/cddl/mdesc/mdesc_getpropval.c#1 branch .. //depot/user/imp/freebsd-imp/sys/sun4v/cddl/mdesc/mdesc_init_intern.c#1 branch .. //depot/user/imp/freebsd-imp/sys/sun4v/cddl/mdesc/mdesc_nodecount.c#1 branch .. //depot/user/imp/freebsd-imp/sys/sun4v/cddl/mdesc/mdesc_rootnode.c#1 branch .. //depot/user/imp/freebsd-imp/sys/sun4v/cddl/mdesc/mdesc_scandag.c#1 branch .. //depot/user/imp/freebsd-imp/sys/sun4v/cddl/t1_copy.S#1 branch .. //depot/user/imp/freebsd-imp/sys/sun4v/conf/DEFAULTS#4 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/conf/GENERIC#4 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/include/asm.h#2 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/include/hv_api.h#1 branch .. //depot/user/imp/freebsd-imp/sys/sun4v/include/hypervisor_api.h#3 delete .. //depot/user/imp/freebsd-imp/sys/sun4v/include/hypervisorvar.h#4 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/include/pcb.h#2 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/include/pmap.h#4 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/include/sun4v_cpufunc.h#2 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/include/tsb.h#3 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/mdesc/mdesc_diff.c#2 delete .. //depot/user/imp/freebsd-imp/sys/sun4v/mdesc/mdesc_findname.c#2 delete .. //depot/user/imp/freebsd-imp/sys/sun4v/mdesc/mdesc_findnodeprop.c#2 delete .. //depot/user/imp/freebsd-imp/sys/sun4v/mdesc/mdesc_fini.c#2 delete .. //depot/user/imp/freebsd-imp/sys/sun4v/mdesc/mdesc_getbinsize.c#2 delete .. //depot/user/imp/freebsd-imp/sys/sun4v/mdesc/mdesc_getgen.c#2 delete .. //depot/user/imp/freebsd-imp/sys/sun4v/mdesc/mdesc_getpropdata.c#2 delete .. //depot/user/imp/freebsd-imp/sys/sun4v/mdesc/mdesc_getpropstr.c#2 delete .. //depot/user/imp/freebsd-imp/sys/sun4v/mdesc/mdesc_getpropval.c#2 delete .. //depot/user/imp/freebsd-imp/sys/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/mdesc/mdesc_init_intern.c#2 delete .. //depot/user/imp/freebsd-imp/sys/sun4v/mdesc/mdesc_nodecount.c#2 delete .. //depot/user/imp/freebsd-imp/sys/sun4v/mdesc/mdesc_rootnode.c#2 delete .. //depot/user/imp/freebsd-imp/sys/sun4v/mdesc/mdesc_scandag.c#2 delete .. //depot/user/imp/freebsd-imp/sys/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/exception.S#5 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/hvcons.c#4 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/hviommu.c#2 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/interrupt.S#4 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/mp_locore.S#2 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/nexus.c#2 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/pmap.c#5 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/rtc.c#3 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/simdisk.c#2 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/support.S#4 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/t1_copy.S#3 delete .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/tsb.c#4 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/user/imp/freebsd-imp/sys/sun4v/sun4v/vnex.c#3 integrate .. //depot/user/imp/freebsd-imp/sys/sys/param.h#113 integrate .. //depot/user/imp/freebsd-imp/sys/sys/pcpu.h#10 integrate .. //depot/user/imp/freebsd-imp/sys/sys/proc.h#135 integrate .. //depot/user/imp/freebsd-imp/sys/sys/rtprio.h#5 integrate .. //depot/user/imp/freebsd-imp/sys/sys/runq.h#4 integrate .. //depot/user/imp/freebsd-imp/sys/sys/sched.h#23 integrate .. //depot/user/imp/freebsd-imp/sys/sys/soundcard.h#11 integrate .. //depot/user/imp/freebsd-imp/sys/sys/uio.h#16 integrate .. //depot/user/imp/freebsd-imp/sys/sys/umtx.h#23 integrate .. //depot/user/imp/freebsd-imp/sys/sys/vmmeter.h#6 integrate .. //depot/user/imp/freebsd-imp/sys/vm/vm_glue.c#47 integrate .. //depot/user/imp/freebsd-imp/sys/vm/vm_zeroidle.c#22 integrate .. //depot/user/imp/freebsd-imp/tools/build/mk/OptionalObsoleteFiles.inc#6 integrate .. //depot/user/imp/freebsd-imp/tools/kerneldoc/subsys/Makefile#4 integrate .. //depot/user/imp/freebsd-imp/tools/make_libdeps.sh#7 integrate .. //depot/user/imp/freebsd-imp/tools/regression/pthread/cv_cancel1/Makefile#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/pthread/cv_cancel1/cv_cancel1.c#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.sh#4 integrate .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wX.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wXl.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wc.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wdl.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wdn.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.we.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wf.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wg.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wgd.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wo.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wp1.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wp2.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wp3.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wp4.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wp5.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wp6.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wu.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wwe.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wx.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/jot/regress.wxn.out#1 branch .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/pkill/pgrep-j.t#2 integrate .. //depot/user/imp/freebsd-imp/tools/regression/usr.bin/pkill/pkill-j.t#2 integrate .. //depot/user/imp/freebsd-imp/tools/tools/nanobsd/nanobsd.sh#16 integrate .. //depot/user/imp/freebsd-imp/tools/tools/net80211/wlandebug/wlandebug.c#2 integrate .. //depot/user/imp/freebsd-imp/usr.bin/Makefile#68 integrate .. //depot/user/imp/freebsd-imp/usr.bin/banner/banner.c#2 integrate .. //depot/user/imp/freebsd-imp/usr.bin/bsdiff/bsdiff/bsdiff.c#2 integrate .. //depot/user/imp/freebsd-imp/usr.bin/bsdiff/bspatch/bspatch.c#2 integrate .. //depot/user/imp/freebsd-imp/usr.bin/calendar/calendars/calendar.freebsd#73 integrate .. //depot/user/imp/freebsd-imp/usr.bin/getconf/getconf.c#6 integrate .. //depot/user/imp/freebsd-imp/usr.bin/jot/jot.c#5 integrate .. //depot/user/imp/freebsd-imp/usr.bin/netstat/bpf.c#5 integrate .. //depot/user/imp/freebsd-imp/usr.bin/netstat/ipsec.c#6 integrate .. //depot/user/imp/freebsd-imp/usr.bin/netstat/pfkey.c#3 integrate .. //depot/user/imp/freebsd-imp/usr.bin/netstat/route.c#12 integrate .. //depot/user/imp/freebsd-imp/usr.bin/pkill/pkill.1#11 integrate .. //depot/user/imp/freebsd-imp/usr.bin/pkill/pkill.c#11 integrate .. //depot/user/imp/freebsd-imp/usr.bin/systat/Makefile#6 integrate .. //depot/user/imp/freebsd-imp/usr.bin/systat/convtbl.c#4 integrate .. //depot/user/imp/freebsd-imp/usr.bin/systat/convtbl.h#3 integrate .. //depot/user/imp/freebsd-imp/usr.bin/systat/ifcmds.c#3 integrate .. //depot/user/imp/freebsd-imp/usr.bin/systat/ifstat.c#4 integrate .. //depot/user/imp/freebsd-imp/usr.bin/systat/iostat.c#6 integrate .. //depot/user/imp/freebsd-imp/usr.bin/systat/netstat.c#6 integrate .. //depot/user/imp/freebsd-imp/usr.bin/systat/pigs.c#6 integrate .. //depot/user/imp/freebsd-imp/usr.bin/systat/swap.c#5 integrate .. //depot/user/imp/freebsd-imp/usr.bin/systat/vmstat.c#17 integrate .. //depot/user/imp/freebsd-imp/usr.bin/top/Makefile#2 integrate .. //depot/user/imp/freebsd-imp/usr.bin/top/sigdesc.h#2 delete .. //depot/user/imp/freebsd-imp/usr.bin/usbhidctl/usbhid.c#4 integrate .. //depot/user/imp/freebsd-imp/usr.bin/usbhidctl/usbhidctl.1#4 integrate .. //depot/user/imp/freebsd-imp/usr.bin/vmstat/vmstat.c#26 integrate .. //depot/user/imp/freebsd-imp/usr.sbin/Makefile#105 integrate .. //depot/user/imp/freebsd-imp/usr.sbin/adduser/adduser.8#16 integrate .. //depot/user/imp/freebsd-imp/usr.sbin/adduser/rmuser.8#8 integrate .. //depot/user/imp/freebsd-imp/usr.sbin/asf/asf.8#9 integrate .. //depot/user/imp/freebsd-imp/usr.sbin/bluetooth/bthidd/parser.y#7 integrate .. //depot/user/imp/freebsd-imp/usr.sbin/cached/Makefile#2 integrate .. //depot/user/imp/freebsd-imp/usr.sbin/crunch/crunchgen/crunchgen.c#6 integrate .. //depot/user/imp/freebsd-imp/usr.sbin/eeprom/eeprom.8#5 integrate .. //depot/user/imp/freebsd-imp/usr.sbin/freebsd-update/freebsd-update.sh#4 integrate .. //depot/user/imp/freebsd-imp/usr.sbin/ngctl/Makefile#5 integrate .. //depot/user/imp/freebsd-imp/usr.sbin/rpcbind/rpcbind.8#5 integrate .. //depot/user/imp/freebsd-imp/usr.sbin/sysinstall/config.c#29 integrate .. //depot/user/imp/freebsd-imp/usr.sbin/sysinstall/label.c#26 integrate .. //depot/user/imp/freebsd-imp/usr.sbin/sysinstall/menus.c#54 integrate .. //depot/user/imp/newcard/Makefile#17 integrate .. //depot/user/imp/newcard/amd64/amd64/genassym.c#17 integrate .. //depot/user/imp/newcard/amd64/amd64/machdep.c#64 integrate .. //depot/user/imp/newcard/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/user/imp/newcard/amd64/amd64/pmap.c#113 integrate .. //depot/user/imp/newcard/amd64/amd64/trap.c#49 integrate .. //depot/user/imp/newcard/amd64/conf/GENERIC#72 integrate .. //depot/user/imp/newcard/amd64/include/pmap.h#30 integrate .. //depot/user/imp/newcard/amd64/isa/clock.c#25 integrate .. //depot/user/imp/newcard/amd64/linux32/linux32_sysvec.c#19 integrate .. //depot/user/imp/newcard/arm/arm/cpufunc.c#13 integrate .. //depot/user/imp/newcard/arm/arm/genassym.c#8 integrate .. //depot/user/imp/newcard/arm/arm/pmap.c#55 integrate .. //depot/user/imp/newcard/arm/at91/at91_pio.c#4 integrate .. //depot/user/imp/newcard/arm/at91/at91_spi.c#4 integrate .. //depot/user/imp/newcard/arm/at91/at91_twi.c#6 integrate .. //depot/user/imp/newcard/arm/at91/kb920x_machdep.c#15 integrate .. //depot/user/imp/newcard/arm/at91/uart_dev_at91usart.c#9 integrate .. //depot/user/imp/newcard/arm/conf/AVILA#2 integrate .. //depot/user/imp/newcard/arm/include/cpuconf.h#9 integrate .. //depot/user/imp/newcard/arm/sa11x0/assabet_machdep.c#17 integrate .. //depot/user/imp/newcard/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/user/imp/newcard/arm/xscale/i80321/i80321_space.c#7 integrate .. //depot/user/imp/newcard/arm/xscale/i80321/iq31244_machdep.c#24 integrate .. //depot/user/imp/newcard/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/user/imp/newcard/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/user/imp/newcard/arm/xscale/ixp425/files.avila#2 integrate .. //depot/user/imp/newcard/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/user/imp/newcard/arm/xscale/ixp425/ixdp425reg.h#2 integrate .. //depot/user/imp/newcard/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/user/imp/newcard/boot/common/loader.8#34 integrate .. //depot/user/imp/newcard/boot/i386/btx/btx/btx.S#7 integrate .. //depot/user/imp/newcard/boot/sparc64/loader/hcall.S#2 delete .. //depot/user/imp/newcard/cam/cam_ccb.h#11 integrate .. //depot/user/imp/newcard/cam/cam_periph.c#25 integrate .. //depot/user/imp/newcard/cam/cam_xpt.c#39 integrate .. //depot/user/imp/newcard/cam/cam_xpt.h#3 integrate .. //depot/user/imp/newcard/cam/scsi/scsi_all.h#11 integrate .. //depot/user/imp/newcard/cam/scsi/scsi_cd.c#38 integrate .. //depot/user/imp/newcard/cam/scsi/scsi_ch.c#14 integrate .. //depot/user/imp/newcard/cam/scsi/scsi_da.c#66 integrate .. //depot/user/imp/newcard/cam/scsi/scsi_pass.c#13 integrate .. //depot/user/imp/newcard/cam/scsi/scsi_pt.c#12 integrate .. //depot/user/imp/newcard/cam/scsi/scsi_sa.c#25 integrate .. //depot/user/imp/newcard/cam/scsi/scsi_ses.c#13 integrate .. //depot/user/imp/newcard/cam/scsi/scsi_targ_bh.c#11 integrate .. //depot/user/imp/newcard/cam/scsi/scsi_target.c#24 integrate .. //depot/user/imp/newcard/compat/linprocfs/linprocfs.c#45 integrate .. //depot/user/imp/newcard/compat/linsysfs/linsysfs.c#3 integrate .. //depot/user/imp/newcard/compat/linux/linux_misc.c#55 integrate .. //depot/user/imp/newcard/compat/linux/linux_stats.c#38 integrate .. //depot/user/imp/newcard/conf/files#319 integrate .. //depot/user/imp/newcard/conf/files.arm#12 integrate .. //depot/user/imp/newcard/conf/files.sun4v#4 integrate .. //depot/user/imp/newcard/conf/kern.mk#20 integrate .. //depot/user/imp/newcard/conf/options#177 integrate .. //depot/user/imp/newcard/ddb/db_ps.c#31 integrate .. //depot/user/imp/newcard/dev/ath/if_ath.c#75 integrate .. //depot/user/imp/newcard/dev/ath/if_ath_pci.c#17 integrate .. //depot/user/imp/newcard/dev/bce/if_bce.c#10 integrate .. //depot/user/imp/newcard/dev/bge/if_bge.c#95 integrate .. //depot/user/imp/newcard/dev/bge/if_bgereg.h#51 integrate .. //depot/user/imp/newcard/dev/ciss/ciss.c#57 integrate .. //depot/user/imp/newcard/dev/dc/if_dc.c#24 integrate .. //depot/user/imp/newcard/dev/dc/if_dcreg.h#11 integrate .. //depot/user/imp/newcard/dev/em/if_em.c#102 integrate .. //depot/user/imp/newcard/dev/em/if_em.h#45 integrate .. //depot/user/imp/newcard/dev/ep/if_ep.c#51 integrate .. //depot/user/imp/newcard/dev/firewire/fwdev.c#35 integrate .. //depot/user/imp/newcard/dev/flash/at45d.c#1 branch .. //depot/user/imp/newcard/dev/fxp/if_fxp.c#90 integrate .. //depot/user/imp/newcard/dev/fxp/if_fxpvar.h#21 integrate .. //depot/user/imp/newcard/dev/gem/if_gem.c#30 integrate .. //depot/user/imp/newcard/dev/gem/if_gemvar.h#9 integrate .. //depot/user/imp/newcard/dev/hme/if_hme.c#36 integrate .. //depot/user/imp/newcard/dev/hme/if_hmevar.h#9 integrate .. //depot/user/imp/newcard/dev/iicbus/iic.h#3 integrate .. //depot/user/imp/newcard/dev/iicbus/iicbb.c#7 integrate .. //depot/user/imp/newcard/dev/iicbus/iicbus_if.m#4 integrate .. //depot/user/imp/newcard/dev/iicbus/iiconf.c#5 integrate .. //depot/user/imp/newcard/dev/iicbus/iiconf.h#5 integrate .. //depot/user/imp/newcard/dev/ipmi/ipmi.c#6 integrate .. //depot/user/imp/newcard/dev/isp/isp.c#31 integrate .. //depot/user/imp/newcard/dev/isp/isp_freebsd.c#39 integrate .. //depot/user/imp/newcard/dev/isp/isp_target.c#20 integrate .. //depot/user/imp/newcard/dev/isp/ispvar.h#23 integrate .. //depot/user/imp/newcard/dev/iwi/if_iwi.c#28 integrate .. //depot/user/imp/newcard/dev/le/am7990.c#4 integrate .. //depot/user/imp/newcard/dev/le/am79900.c#4 integrate .. //depot/user/imp/newcard/dev/le/lance.c#3 integrate .. //depot/user/imp/newcard/dev/le/lancevar.h#3 integrate .. //depot/user/imp/newcard/dev/mii/acphy.c#13 integrate .. //depot/user/imp/newcard/dev/mii/amphy.c#13 integrate .. //depot/user/imp/newcard/dev/mii/bmtphy.c#12 integrate .. //depot/user/imp/newcard/dev/mii/brgphy.c#35 integrate .. //depot/user/imp/newcard/dev/mii/ciphy.c#7 integrate .. //depot/user/imp/newcard/dev/mii/gentbi.c#3 integrate .. //depot/user/imp/newcard/dev/mii/inphy.c#10 integrate .. //depot/user/imp/newcard/dev/mii/ip1000phy.c#3 integrate .. //depot/user/imp/newcard/dev/mii/lxtphy.c#13 integrate .. //depot/user/imp/newcard/dev/mii/mii_physubr.c#14 integrate .. //depot/user/imp/newcard/dev/mii/miidevs#18 integrate .. //depot/user/imp/newcard/dev/mii/miivar.h#8 integrate .. //depot/user/imp/newcard/dev/mii/mlphy.c#10 integrate .. //depot/user/imp/newcard/dev/mii/nsgphy.c#17 integrate .. //depot/user/imp/newcard/dev/mii/nsphy.c#12 integrate .. //depot/user/imp/newcard/dev/mii/pnaphy.c#14 integrate .. //depot/user/imp/newcard/dev/mii/qsphy.c#12 integrate .. //depot/user/imp/newcard/dev/mii/rgephy.c#12 integrate .. //depot/user/imp/newcard/dev/mii/rlphy.c#15 integrate .. //depot/user/imp/newcard/dev/mii/tdkphy.c#14 integrate .. //depot/user/imp/newcard/dev/mii/tlphy.c#13 integrate .. //depot/user/imp/newcard/dev/mii/xmphy.c#15 integrate .. //depot/user/imp/newcard/dev/mpt/mpt.c#34 integrate .. //depot/user/imp/newcard/dev/mpt/mpt.h#28 integrate .. //depot/user/imp/newcard/dev/mpt/mpt_cam.c#32 integrate .. //depot/user/imp/newcard/dev/mpt/mpt_raid.c#12 integrate .. //depot/user/imp/newcard/dev/mxge/if_mxge.c#10 integrate .. //depot/user/imp/newcard/dev/mxge/if_mxge_var.h#5 integrate .. //depot/user/imp/newcard/dev/nfe/if_nfe.c#8 integrate .. //depot/user/imp/newcard/dev/nfe/if_nfereg.h#5 integrate .. //depot/user/imp/newcard/dev/nfe/if_nfevar.h#3 integrate .. //depot/user/imp/newcard/dev/nve/if_nvereg.h#7 integrate .. //depot/user/imp/newcard/dev/ral/rt2560.c#7 integrate .. //depot/user/imp/newcard/dev/ral/rt2661.c#7 integrate .. //depot/user/imp/newcard/dev/sound/pci/atiixp.c#8 integrate .. //depot/user/imp/newcard/dev/sound/pci/cmi.c#24 integrate .. //depot/user/imp/newcard/dev/sound/pci/es137x.c#21 integrate .. //depot/user/imp/newcard/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/user/imp/newcard/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/user/imp/newcard/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/user/imp/newcard/dev/sound/pci/ich.c#42 integrate .. //depot/user/imp/newcard/dev/sound/pci/via8233.c#22 integrate .. //depot/user/imp/newcard/dev/sound/pcm/ac97.c#35 integrate .. //depot/user/imp/newcard/dev/sound/pcm/ac97.h#10 integrate .. //depot/user/imp/newcard/dev/sound/pcm/buffer.c#19 integrate .. //depot/user/imp/newcard/dev/sound/pcm/buffer.h#11 integrate .. //depot/user/imp/newcard/dev/sound/pcm/channel.c#27 integrate .. //depot/user/imp/newcard/dev/sound/pcm/channel.h#10 integrate .. //depot/user/imp/newcard/dev/sound/pcm/dsp.c#42 integrate .. //depot/user/imp/newcard/dev/sound/pcm/fake.c#8 integrate .. //depot/user/imp/newcard/dev/sound/pcm/feeder.c#17 integrate .. //depot/user/imp/newcard/dev/sound/pcm/feeder.h#8 integrate .. //depot/user/imp/newcard/dev/sound/pcm/feeder_fmt.c#16 integrate .. //depot/user/imp/newcard/dev/sound/pcm/feeder_rate.c#16 integrate .. //depot/user/imp/newcard/dev/sound/pcm/feeder_volume.c#3 integrate .. //depot/user/imp/newcard/dev/sound/pcm/mixer.c#27 integrate .. //depot/user/imp/newcard/dev/sound/pcm/sndstat.c#17 integrate .. //depot/user/imp/newcard/dev/sound/pcm/sound.c#34 integrate .. //depot/user/imp/newcard/dev/sound/pcm/sound.h#27 integrate .. //depot/user/imp/newcard/dev/sound/pcm/vchan.c#20 integrate .. //depot/user/imp/newcard/dev/sound/usb/uaudio.c#16 integrate .. //depot/user/imp/newcard/dev/usb/if_aue.c#39 integrate .. //depot/user/imp/newcard/dev/usb/if_auereg.h#9 integrate .. //depot/user/imp/newcard/dev/usb/if_ural.c#26 integrate .. //depot/user/imp/newcard/dev/usb/ukbd.c#23 integrate .. //depot/user/imp/newcard/dev/usb/usb_quirks.c#26 integrate .. //depot/user/imp/newcard/dev/usb/usb_quirks.h#8 integrate .. //depot/user/imp/newcard/dev/usb/usbdevs#117 integrate .. //depot/user/imp/newcard/dev/usb/usbdi.c#18 integrate .. //depot/user/imp/newcard/dev/vge/if_vge.c#21 integrate .. //depot/user/imp/newcard/fs/msdosfs/msdosfs_conv.c#18 integrate .. //depot/user/imp/newcard/fs/msdosfs/msdosfs_vnops.c#37 integrate .. //depot/user/imp/newcard/fs/procfs/procfs_status.c#17 integrate .. //depot/user/imp/newcard/fs/unionfs/union.h#10 integrate .. //depot/user/imp/newcard/fs/unionfs/union_subr.c#26 integrate .. //depot/user/imp/newcard/fs/unionfs/union_vfsops.c#24 integrate .. //depot/user/imp/newcard/fs/unionfs/union_vnops.c#38 integrate .. //depot/user/imp/newcard/geom/journal/g_journal.c#3 integrate .. //depot/user/imp/newcard/i386/i386/genassym.c#25 integrate .. //depot/user/imp/newcard/i386/i386/locore.s#25 integrate .. //depot/user/imp/newcard/i386/i386/machdep.c#91 integrate .. //depot/user/imp/newcard/i386/isa/clock.c#42 integrate .. //depot/user/imp/newcard/ia64/ia64/machdep.c#87 integrate .. //depot/user/imp/newcard/kern/init_main.c#64 integrate .. //depot/user/imp/newcard/kern/kern_clock.c#48 integrate .. //depot/user/imp/newcard/kern/kern_fork.c#92 integrate .. //depot/user/imp/newcard/kern/kern_idle.c#22 integrate .. //depot/user/imp/newcard/kern/kern_intr.c#48 integrate .. //depot/user/imp/newcard/kern/kern_kse.c#34 integrate .. //depot/user/imp/newcard/kern/kern_poll.c#20 integrate .. //depot/user/imp/newcard/kern/kern_proc.c#76 integrate .. //depot/user/imp/newcard/kern/kern_resource.c#52 integrate .. //depot/user/imp/newcard/kern/kern_subr.c#37 integrate .. //depot/user/imp/newcard/kern/kern_switch.c#67 integrate .. //depot/user/imp/newcard/kern/kern_synch.c#83 integrate .. //depot/user/imp/newcard/kern/kern_thr.c#40 integrate .. //depot/user/imp/newcard/kern/kern_thread.c#127 integrate .. //depot/user/imp/newcard/kern/kern_time.c#44 integrate .. //depot/user/imp/newcard/kern/kern_umtx.c#36 integrate .. //depot/user/imp/newcard/kern/ksched.c#2 integrate .. //depot/user/imp/newcard/kern/link_elf_obj.c#14 integrate .. //depot/user/imp/newcard/kern/sched_4bsd.c#65 integrate .. //depot/user/imp/newcard/kern/sched_ule.c#99 integrate .. //depot/user/imp/newcard/kern/subr_lock.c#4 integrate .. //depot/user/imp/newcard/kern/subr_prf.c#38 integrate .. //depot/user/imp/newcard/kern/subr_rman.c#34 integrate .. //depot/user/imp/newcard/kern/subr_trap.c#51 integrate .. //depot/user/imp/newcard/kern/tty.c#60 integrate .. //depot/user/imp/newcard/kern/uipc_socket.c#107 integrate .. //depot/user/imp/newcard/kern/vfs_export.c#19 integrate .. //depot/user/imp/newcard/modules/Makefile#195 integrate .. //depot/user/imp/newcard/modules/wlan_amrr/Makefile#1 branch .. //depot/user/imp/newcard/net/bridgestp.c#18 integrate .. //depot/user/imp/newcard/net/bridgestp.h#6 integrate .. //depot/user/imp/newcard/net/ethernet.h#8 integrate .. //depot/user/imp/newcard/net/if.c#93 integrate .. //depot/user/imp/newcard/net/if_atmsubr.c#23 integrate .. //depot/user/imp/newcard/net/if_bridge.c#50 integrate .. //depot/user/imp/newcard/net/if_bridgevar.h#14 integrate .. //depot/user/imp/newcard/net/if_llc.h#7 integrate .. //depot/user/imp/newcard/net/if_ppp.c#38 integrate .. //depot/user/imp/newcard/net/if_pppvar.h#9 integrate .. //depot/user/imp/newcard/net/netisr.c#14 integrate .. //depot/user/imp/newcard/net/ppp_tty.c#21 integrate .. //depot/user/imp/newcard/net/route.c#41 integrate .. //depot/user/imp/newcard/net80211/ieee80211.c#25 integrate .. //depot/user/imp/newcard/net80211/ieee80211.h#11 integrate .. //depot/user/imp/newcard/net80211/ieee80211_amrr.c#1 branch .. //depot/user/imp/newcard/net80211/ieee80211_amrr.h#1 branch .. //depot/user/imp/newcard/net80211/ieee80211_input.c#38 integrate .. //depot/user/imp/newcard/net80211/ieee80211_output.c#34 integrate .. //depot/user/imp/newcard/net80211/ieee80211_var.h#28 integrate .. //depot/user/imp/newcard/netgraph/ng_nat.c#5 integrate .. //depot/user/imp/newcard/netinet/igmp.c#19 integrate .. //depot/user/imp/newcard/netinet/in_pcb.c#64 integrate .. //depot/user/imp/newcard/netinet/ip_carp.h#3 integrate .. //depot/user/imp/newcard/netinet/libalias/alias.c#5 integrate .. //depot/user/imp/newcard/netinet/libalias/alias.h#4 integrate .. //depot/user/imp/newcard/netinet/tcp_usrreq.c#51 integrate .. //depot/user/imp/newcard/netinet6/nd6.c#45 integrate .. //depot/user/imp/newcard/nfs/nfsproto.h#5 integrate .. //depot/user/imp/newcard/nfs4client/nfs4_subs.c#5 integrate .. //depot/user/imp/newcard/nfs4client/nfs4_vn_subs.c#5 integrate .. //depot/user/imp/newcard/nfsclient/bootp_subr.c#28 integrate .. //depot/user/imp/newcard/nfsclient/nfs_diskless.c#16 integrate .. //depot/user/imp/newcard/nfsclient/nfs_node.c#29 integrate .. //depot/user/imp/newcard/nfsclient/nfs_socket.c#54 integrate .. //depot/user/imp/newcard/nfsclient/nfs_vfsops.c#62 integrate .. //depot/user/imp/newcard/nfsclient/nfsdiskless.h#7 integrate .. //depot/user/imp/newcard/nfsserver/nfs.h#16 integrate .. //depot/user/imp/newcard/nfsserver/nfs_serv.c#45 integrate .. //depot/user/imp/newcard/nfsserver/nfs_srvsubs.c#29 integrate .. //depot/user/imp/newcard/pc98/pc98/machdep.c#22 integrate .. //depot/user/imp/newcard/pci/if_pcn.c#46 integrate .. //depot/user/imp/newcard/pci/if_pcnreg.h#10 integrate .. //depot/user/imp/newcard/pci/if_rl.c#79 integrate .. //depot/user/imp/newcard/pci/if_rlreg.h#36 integrate .. //depot/user/imp/newcard/pci/if_xl.c#81 integrate .. //depot/user/imp/newcard/pci/if_xlreg.h#23 integrate .. //depot/user/imp/newcard/powerpc/include/pmap.h#14 integrate .. //depot/user/imp/newcard/powerpc/powerpc/genassym.c#15 integrate .. //depot/user/imp/newcard/powerpc/powerpc/machdep.c#52 integrate .. //depot/user/imp/newcard/powerpc/powerpc/mmu_if.m#7 integrate .. //depot/user/imp/newcard/powerpc/powerpc/mmu_oea.c#10 integrate .. //depot/user/imp/newcard/powerpc/powerpc/pmap_dispatch.c#9 integrate .. //depot/user/imp/newcard/powerpc/powerpc/uio_machdep.c#5 integrate .. //depot/user/imp/newcard/sparc64/sparc64/genassym.c#25 integrate .. //depot/user/imp/newcard/sparc64/sparc64/machdep.c#60 integrate .. //depot/user/imp/newcard/sun4v/cddl/mdesc/mdesc_diff.c#1 branch .. //depot/user/imp/newcard/sun4v/cddl/mdesc/mdesc_findname.c#1 branch .. //depot/user/imp/newcard/sun4v/cddl/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/user/imp/newcard/sun4v/cddl/mdesc/mdesc_fini.c#1 branch .. //depot/user/imp/newcard/sun4v/cddl/mdesc/mdesc_getbinsize.c#1 branch .. //depot/user/imp/newcard/sun4v/cddl/mdesc/mdesc_getgen.c#1 branch .. //depot/user/imp/newcard/sun4v/cddl/mdesc/mdesc_getpropdata.c#1 branch .. //depot/user/imp/newcard/sun4v/cddl/mdesc/mdesc_getpropstr.c#1 branch .. //depot/user/imp/newcard/sun4v/cddl/mdesc/mdesc_getpropval.c#1 branch .. //depot/user/imp/newcard/sun4v/cddl/mdesc/mdesc_init_intern.c#1 branch .. //depot/user/imp/newcard/sun4v/cddl/mdesc/mdesc_nodecount.c#1 branch .. //depot/user/imp/newcard/sun4v/cddl/mdesc/mdesc_rootnode.c#1 branch .. //depot/user/imp/newcard/sun4v/cddl/mdesc/mdesc_scandag.c#1 branch .. //depot/user/imp/newcard/sun4v/cddl/t1_copy.S#1 branch .. //depot/user/imp/newcard/sun4v/conf/DEFAULTS#4 integrate .. //depot/user/imp/newcard/sun4v/conf/GENERIC#4 integrate .. //depot/user/imp/newcard/sun4v/include/asm.h#2 integrate .. //depot/user/imp/newcard/sun4v/include/hv_api.h#1 branch .. //depot/user/imp/newcard/sun4v/include/hypervisor_api.h#3 delete .. //depot/user/imp/newcard/sun4v/include/hypervisorvar.h#4 integrate .. //depot/user/imp/newcard/sun4v/include/pcb.h#2 integrate .. //depot/user/imp/newcard/sun4v/include/pmap.h#4 integrate .. //depot/user/imp/newcard/sun4v/include/sun4v_cpufunc.h#2 integrate .. //depot/user/imp/newcard/sun4v/include/tsb.h#3 integrate .. //depot/user/imp/newcard/sun4v/mdesc/mdesc_diff.c#2 delete .. //depot/user/imp/newcard/sun4v/mdesc/mdesc_findname.c#2 delete .. //depot/user/imp/newcard/sun4v/mdesc/mdesc_findnodeprop.c#2 delete .. //depot/user/imp/newcard/sun4v/mdesc/mdesc_fini.c#2 delete .. //depot/user/imp/newcard/sun4v/mdesc/mdesc_getbinsize.c#2 delete .. //depot/user/imp/newcard/sun4v/mdesc/mdesc_getgen.c#2 delete .. //depot/user/imp/newcard/sun4v/mdesc/mdesc_getpropdata.c#2 delete .. //depot/user/imp/newcard/sun4v/mdesc/mdesc_getpropstr.c#2 delete .. //depot/user/imp/newcard/sun4v/mdesc/mdesc_getpropval.c#2 delete .. //depot/user/imp/newcard/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/user/imp/newcard/sun4v/mdesc/mdesc_init_intern.c#2 delete .. //depot/user/imp/newcard/sun4v/mdesc/mdesc_nodecount.c#2 delete .. //depot/user/imp/newcard/sun4v/mdesc/mdesc_rootnode.c#2 delete .. //depot/user/imp/newcard/sun4v/mdesc/mdesc_scandag.c#2 delete .. //depot/user/imp/newcard/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate .. //depot/user/imp/newcard/sun4v/sun4v/exception.S#5 integrate .. //depot/user/imp/newcard/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/user/imp/newcard/sun4v/sun4v/hvcons.c#4 integrate .. //depot/user/imp/newcard/sun4v/sun4v/hviommu.c#2 integrate .. //depot/user/imp/newcard/sun4v/sun4v/interrupt.S#4 integrate .. //depot/user/imp/newcard/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/user/imp/newcard/sun4v/sun4v/machdep.c#4 integrate .. //depot/user/imp/newcard/sun4v/sun4v/mp_locore.S#2 integrate .. //depot/user/imp/newcard/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/user/imp/newcard/sun4v/sun4v/nexus.c#2 integrate .. //depot/user/imp/newcard/sun4v/sun4v/pmap.c#5 integrate .. //depot/user/imp/newcard/sun4v/sun4v/rtc.c#3 integrate .. //depot/user/imp/newcard/sun4v/sun4v/simdisk.c#2 integrate .. //depot/user/imp/newcard/sun4v/sun4v/support.S#4 integrate .. //depot/user/imp/newcard/sun4v/sun4v/t1_copy.S#3 delete .. //depot/user/imp/newcard/sun4v/sun4v/trap.c#4 integrate .. //depot/user/imp/newcard/sun4v/sun4v/tsb.c#4 integrate .. //depot/user/imp/newcard/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/user/imp/newcard/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/user/imp/newcard/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/user/imp/newcard/sun4v/sun4v/vnex.c#3 integrate .. //depot/user/imp/newcard/sys/param.h#127 integrate .. //depot/user/imp/newcard/sys/pcpu.h#12 integrate .. //depot/user/imp/newcard/sys/proc.h#156 integrate .. //depot/user/imp/newcard/sys/rtprio.h#6 integrate .. //depot/user/imp/newcard/sys/runq.h#5 integrate .. //depot/user/imp/newcard/sys/sched.h#25 integrate .. //depot/user/imp/newcard/sys/soundcard.h#12 integrate .. //depot/user/imp/newcard/sys/uio.h#17 integrate .. //depot/user/imp/newcard/sys/umtx.h#23 integrate .. //depot/user/imp/newcard/sys/vmmeter.h#7 integrate .. //depot/user/imp/newcard/vm/vm_glue.c#55 integrate .. //depot/user/imp/newcard/vm/vm_zeroidle.c#23 integrate Differences ... ==== //depot/projects/arm/src/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.337 2006/11/01 09:05:40 jb Exp $ +# $FreeBSD: src/Makefile,v 1.338 2006/11/21 08:25:28 jb Exp $ # # The user-driven targets are: # @@ -242,7 +242,7 @@ MMAKE= ${MMAKEENV} make \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ - -DNO_CPU_CFLAGS -DNO_WERROR -DNO_CTF + -DNO_CPU_CFLAGS -DNO_WERROR make: .PHONY @echo ==== //depot/projects/arm/src/lib/libarchive/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.52 2006/11/06 00:28:46 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.53 2006/11/20 16:48:04 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -54,7 +54,7 @@ archive_read_data_into_fd.c \ archive_read_extract.c \ archive_read_open_fd.c \ - archive_read_open_file.c \ + archive_read_open_filename.c \ archive_read_support_compression_all.c \ archive_read_support_compression_bzip2.c \ archive_read_support_compression_compress.c \ @@ -70,7 +70,7 @@ archive_util.c \ archive_write.c \ archive_write_open_fd.c \ - archive_write_open_file.c \ + archive_write_open_filename.c \ archive_write_set_compression_bzip2.c \ archive_write_set_compression_gzip.c \ archive_write_set_compression_none.c \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 7 16:38:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 049F916A5C5; Thu, 7 Dec 2006 16:38:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D2A0216A5B9; Thu, 7 Dec 2006 16:38:46 +0000 (UTC) (envelope-from ru@rambler-co.ru) Received: from relay0.rambler.ru (relay0.rambler.ru [81.19.66.187]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78DCB43CBB; Thu, 7 Dec 2006 16:36:48 +0000 (GMT) (envelope-from ru@rambler-co.ru) Received: from relay0.rambler.ru (localhost [127.0.0.1]) by relay0.rambler.ru (Postfix) with ESMTP id ADB036640; Thu, 7 Dec 2006 19:37:33 +0300 (MSK) Received: from edoofus.park.rambler.ru (unknown [81.19.65.108]) by relay0.rambler.ru (Postfix) with ESMTP id 8C3C86542; Thu, 7 Dec 2006 19:37:33 +0300 (MSK) Received: (from ru@localhost) by edoofus.park.rambler.ru (8.13.8/8.13.8) id kB7GbXNg039456; Thu, 7 Dec 2006 19:37:33 +0300 (MSK) (envelope-from ru) Date: Thu, 7 Dec 2006 19:37:33 +0300 From: Ruslan Ermilov To: Robert Watson Message-ID: <20061207163733.GC39204@rambler-co.ru> References: <200612062319.kB6NJgsq031755@repoman.freebsd.org> <20061207110225.GU32700@FreeBSD.org> <4578070A.2030609@freebsd.org> <20061207142254.GA1195@tin.it> <20061207161434.O50906@fledge.watson.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="C1iGAkRnbeBonpVg" Content-Disposition: inline In-Reply-To: <20061207161434.O50906@fledge.watson.org> User-Agent: Mutt/1.5.13 (2006-08-11) X-Virus-Scanned: No virus found Cc: Perforce Change Reviews , Gleb Smirnoff , Andre Oppermann , Paolo Pisati Subject: Re: PERFORCE change 111230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 16:38:47 -0000 --C1iGAkRnbeBonpVg Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Dec 07, 2006 at 04:16:41PM +0000, Robert Watson wrote: > On Thu, 7 Dec 2006, Paolo Pisati wrote: >=20 > >Then, after a discussion on irc, pull the plug on any present (and futur= e)=20 > >hackery & half-baked solution, and declare in kernel libalias incompatib= le=20 > >with tso. >=20 > This seems silly -- why is it not compatible? Perhaps I misunderstand, b= ut=20 > I thought TSO passed down valid TCP/IP packets, they just happen to be=20 > really long, and will be post-processed by the hardware into a series of= =20 > shorter segments with the same header properties. Imagine the ethernet= =20 > device as a "router" that's performing TCP fragmentation for you, rather= =20 > than IP fragmentation. >=20 It's a limitation of the current libalias code which grew up on top of userland version -- it doesn't currently know how to traverse mbufs, and instead requires a contiguous piece of (packet) data to do its job. : #ifdef _KERNEL : /* : * m_megapullup() function is a big hack (only used in ng_nat and ipfw+na= t). : * : * It allocates an mbuf with cluster and copies the whole : * chain into cluster, so that it is all contigous and the : * whole packet can be accessed via char pointer. : * This is required, because libalias doesn't have idea : * about mbufs. : *=20 : * On success, m_megapullup returns an mbuf with cluster : * containing the input packet, on failure NULL. : * In both cases, the input packet is consumed. : */ Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --C1iGAkRnbeBonpVg Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iD8DBQFFeENNqRfpzJluFF4RAgjZAJ9KK4I+XjXBUHw/mRI/AwsSk2DjKACcCTAe 1NPsrs9XfJsrFs0PmjOaPGU= =j54o -----END PGP SIGNATURE----- --C1iGAkRnbeBonpVg-- From owner-p4-projects@FreeBSD.ORG Thu Dec 7 16:54:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E09C916A512; Thu, 7 Dec 2006 16:54:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8A86216A50A for ; Thu, 7 Dec 2006 16:54:42 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A85E43DCD for ; Thu, 7 Dec 2006 16:45:22 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB7Gk9m0002417 for ; Thu, 7 Dec 2006 16:46:10 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB7Gk92U002414 for perforce@freebsd.org; Thu, 7 Dec 2006 16:46:09 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 7 Dec 2006 16:46:09 GMT Message-Id: <200612071646.kB7Gk92U002414@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111250 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 16:54:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=111250 Change 111250 by zec@zec_tca51 on 2006/12/07 16:45:41 Initial attempt at virtualizing tcp_hostcache. Affected files ... .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#3 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.h#1 add .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#5 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#3 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#3 (text+ko) ==== @@ -60,11 +60,6 @@ * memory constrains. */ -/* - * Many thanks to jlemon for basic structure of tcp_syncache which is being - * followed here. - */ - #include "opt_inet6.h" #include "opt_vimage.h" @@ -98,57 +93,14 @@ #ifdef INET6 #include #endif +#include #include -TAILQ_HEAD(hc_qhead, hc_metrics); - -struct hc_head { - struct hc_qhead hch_bucket; - u_int hch_length; - struct mtx hch_mtx; -}; - -struct hc_metrics { - /* housekeeping */ - TAILQ_ENTRY(hc_metrics) rmx_q; - struct hc_head *rmx_head; /* head of bucket tail queue */ - struct in_addr ip4; /* IP address */ - struct in6_addr ip6; /* IP6 address */ - /* endpoint specific values for tcp */ - u_long rmx_mtu; /* MTU for this path */ - u_long rmx_ssthresh; /* outbound gateway buffer limit */ - u_long rmx_rtt; /* estimated round trip time */ - u_long rmx_rttvar; /* estimated rtt variance */ - u_long rmx_bandwidth; /* estimated bandwidth */ - u_long rmx_cwnd; /* congestion window */ - u_long rmx_sendpipe; /* outbound delay-bandwidth product */ - u_long rmx_recvpipe; /* inbound delay-bandwidth product */ - /* tcp hostcache internal data */ - int rmx_expire; /* lifetime for object */ - u_long rmx_hits; /* number of hits */ - u_long rmx_updates; /* number of updates */ -}; - -/* Arbitrary values */ -#define TCP_HOSTCACHE_HASHSIZE 512 -#define TCP_HOSTCACHE_BUCKETLIMIT 30 -#define TCP_HOSTCACHE_EXPIRE 60*60 /* one hour */ -#define TCP_HOSTCACHE_PRUNE 5*60 /* every 5 minutes */ - -struct tcp_hostcache { - struct hc_head *hashbase; - uma_zone_t zone; - u_int hashsize; - u_int hashmask; - u_int bucket_limit; - u_int cache_count; - u_int cache_limit; - int expire; - int purgeall; -}; +#ifndef VIMAGE static struct tcp_hostcache tcp_hostcache; +#endif static struct callout tcp_hc_callout; @@ -157,25 +109,32 @@ static int sysctl_tcp_hc_list(SYSCTL_HANDLER_ARGS); static void tcp_hc_purge(void *); -SYSCTL_NODE(_net_inet_tcp, OID_AUTO, hostcache, CTLFLAG_RW, 0, "TCP Host cache"); +SYSCTL_NODE(_net_inet_tcp, OID_AUTO, hostcache, CTLFLAG_RW, 0, + "TCP Host cache"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, cachelimit, CTLFLAG_RDTUN, - &tcp_hostcache.cache_limit, 0, "Overall entry limit for hostcache"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_hostcache, OID_AUTO, cachelimit, + CTLFLAG_RDTUN, tcp_hostcache.cache_limit, 0, + "Overall entry limit for hostcache"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, hashsize, CTLFLAG_RDTUN, - &tcp_hostcache.hashsize, 0, "Size of TCP hostcache hashtable"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_hostcache, OID_AUTO, hashsize, + CTLFLAG_RDTUN, tcp_hostcache.hashsize, 0, + "Size of TCP hostcache hashtable"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, bucketlimit, CTLFLAG_RDTUN, - &tcp_hostcache.bucket_limit, 0, "Per-bucket hash limit for hostcache"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_hostcache, OID_AUTO, bucketlimit, + CTLFLAG_RDTUN, tcp_hostcache.bucket_limit, 0, + "Per-bucket hash limit for hostcache"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, count, CTLFLAG_RD, - &tcp_hostcache.cache_count, 0, "Current number of entries in hostcache"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_hostcache, OID_AUTO, count, + CTLFLAG_RD, tcp_hostcache.cache_count, 0, + "Current number of entries in hostcache"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, expire, CTLFLAG_RW, - &tcp_hostcache.expire, 0, "Expire time of TCP hostcache entries"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_hostcache, OID_AUTO, expire, + CTLFLAG_RW, tcp_hostcache.expire, 0, + "Expire time of TCP hostcache entries"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, purge, CTLFLAG_RW, - &tcp_hostcache.purgeall, 0, "Expire all entires on next purge run"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_hostcache, OID_AUTO, purge, + CTLFLAG_RW, tcp_hostcache.purgeall, 0, + "Expire all entires on next purge run"); SYSCTL_PROC(_net_inet_tcp_hostcache, OID_AUTO, list, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_SKIP, 0, 0, @@ -186,7 +145,7 @@ #define HOSTCACHE_HASH(ip) \ (((ip)->s_addr ^ ((ip)->s_addr >> 7) ^ ((ip)->s_addr >> 17)) & \ - tcp_hostcache.hashmask) + V_tcp_hostcache.hashmask) /* XXX: What is the recommended hash to get good entropy for IPv6 addresses? */ #define HOSTCACHE_HASH6(ip6) \ @@ -194,7 +153,7 @@ (ip6)->s6_addr32[1] ^ \ (ip6)->s6_addr32[2] ^ \ (ip6)->s6_addr32[3]) & \ - tcp_hostcache.hashmask) + V_tcp_hostcache.hashmask) #define THC_LOCK(lp) mtx_lock(lp) #define THC_UNLOCK(lp) mtx_unlock(lp) @@ -202,59 +161,64 @@ void tcp_hc_init(void) { + INIT_VNET_INET(curvnetb); int i; /* * Initialize hostcache structures */ - tcp_hostcache.cache_count = 0; - tcp_hostcache.hashsize = TCP_HOSTCACHE_HASHSIZE; - tcp_hostcache.bucket_limit = TCP_HOSTCACHE_BUCKETLIMIT; - tcp_hostcache.cache_limit = - tcp_hostcache.hashsize * tcp_hostcache.bucket_limit; - tcp_hostcache.expire = TCP_HOSTCACHE_EXPIRE; + V_tcp_hostcache.cache_count = 0; + V_tcp_hostcache.hashsize = TCP_HOSTCACHE_HASHSIZE; + V_tcp_hostcache.bucket_limit = TCP_HOSTCACHE_BUCKETLIMIT; + V_tcp_hostcache.cache_limit = + V_tcp_hostcache.hashsize * V_tcp_hostcache.bucket_limit; + V_tcp_hostcache.expire = TCP_HOSTCACHE_EXPIRE; TUNABLE_INT_FETCH("net.inet.tcp.hostcache.hashsize", - &tcp_hostcache.hashsize); + &V_tcp_hostcache.hashsize); TUNABLE_INT_FETCH("net.inet.tcp.hostcache.cachelimit", - &tcp_hostcache.cache_limit); + &V_tcp_hostcache.cache_limit); TUNABLE_INT_FETCH("net.inet.tcp.hostcache.bucketlimit", - &tcp_hostcache.bucket_limit); - if (!powerof2(tcp_hostcache.hashsize)) { + &V_tcp_hostcache.bucket_limit); + if (!powerof2(V_tcp_hostcache.hashsize)) { printf("WARNING: hostcache hash size is not a power of 2.\n"); - tcp_hostcache.hashsize = 512; /* safe default */ + V_tcp_hostcache.hashsize = 512; /* safe default */ } - tcp_hostcache.hashmask = tcp_hostcache.hashsize - 1; + V_tcp_hostcache.hashmask = V_tcp_hostcache.hashsize - 1; /* * Allocate the hash table */ - tcp_hostcache.hashbase = (struct hc_head *) - malloc(tcp_hostcache.hashsize * sizeof(struct hc_head), + V_tcp_hostcache.hashbase = (struct hc_head *) + malloc(V_tcp_hostcache.hashsize * sizeof(struct hc_head), M_HOSTCACHE, M_WAITOK | M_ZERO); /* * Initialize the hash buckets */ - for (i = 0; i < tcp_hostcache.hashsize; i++) { - TAILQ_INIT(&tcp_hostcache.hashbase[i].hch_bucket); - tcp_hostcache.hashbase[i].hch_length = 0; - mtx_init(&tcp_hostcache.hashbase[i].hch_mtx, "tcp_hc_entry", + for (i = 0; i < V_tcp_hostcache.hashsize; i++) { + TAILQ_INIT(&V_tcp_hostcache.hashbase[i].hch_bucket); + V_tcp_hostcache.hashbase[i].hch_length = 0; + mtx_init(&V_tcp_hostcache.hashbase[i].hch_mtx, "tcp_hc_entry", NULL, MTX_DEF); } /* * Allocate the hostcache entries. + * + * XXX don't need a separate zone for each hc instance - revisit!!! */ - tcp_hostcache.zone = uma_zcreate("hostcache", sizeof(struct hc_metrics), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); - uma_zone_set_max(tcp_hostcache.zone, tcp_hostcache.cache_limit); + V_tcp_hostcache.zone = + uma_zcreate("hostcache", sizeof(struct hc_metrics), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + uma_zone_set_max(V_tcp_hostcache.zone, V_tcp_hostcache.cache_limit); /* * Set up periodic cache cleanup. */ callout_init(&tcp_hc_callout, CALLOUT_MPSAFE); - callout_reset(&tcp_hc_callout, TCP_HOSTCACHE_PRUNE * hz, tcp_hc_purge, 0); + callout_reset(&tcp_hc_callout, TCP_HOSTCACHE_PRUNE * hz, + tcp_hc_purge, 0); } /* @@ -266,6 +230,7 @@ static struct hc_metrics * tcp_hc_lookup(struct in_conninfo *inc) { + INIT_VNET_INET(curvnetb); int hash; struct hc_head *hc_head; struct hc_metrics *hc_entry; @@ -280,7 +245,7 @@ else hash = HOSTCACHE_HASH(&inc->inc_faddr); - hc_head = &tcp_hostcache.hashbase[hash]; + hc_head = &V_tcp_hostcache.hashbase[hash]; /* * aquire lock for this bucket row @@ -336,7 +301,7 @@ else hash = HOSTCACHE_HASH(&inc->inc_faddr); - hc_head = &tcp_hostcache.hashbase[hash]; + hc_head = &V_tcp_hostcache.hashbase[hash]; /* * aquire lock for this bucket row @@ -348,8 +313,8 @@ /* * If the bucket limit is reached reuse the least used element */ - if (hc_head->hch_length >= tcp_hostcache.bucket_limit || - tcp_hostcache.cache_count >= tcp_hostcache.cache_limit) { + if (hc_head->hch_length >= V_tcp_hostcache.bucket_limit || + V_tcp_hostcache.cache_count >= V_tcp_hostcache.cache_limit) { hc_entry = TAILQ_LAST(&hc_head->hch_bucket, hc_qhead); /* * At first we were dropping the last element, just to @@ -359,17 +324,17 @@ * be "lossy". */ TAILQ_REMOVE(&hc_head->hch_bucket, hc_entry, rmx_q); - tcp_hostcache.hashbase[hash].hch_length--; - tcp_hostcache.cache_count--; + V_tcp_hostcache.hashbase[hash].hch_length--; + V_tcp_hostcache.cache_count--; V_tcpstat.tcps_hc_bucketoverflow++; #if 0 - uma_zfree(tcp_hostcache.zone, hc_entry); + uma_zfree(V_tcp_hostcache.zone, hc_entry); #endif } else { /* * Allocate a new entry, or balk if not possible */ - hc_entry = uma_zalloc(tcp_hostcache.zone, M_NOWAIT); + hc_entry = uma_zalloc(V_tcp_hostcache.zone, M_NOWAIT); if (hc_entry == NULL) { THC_UNLOCK(&hc_head->hch_mtx); return NULL; @@ -385,14 +350,14 @@ else hc_entry->ip4 = inc->inc_faddr; hc_entry->rmx_head = hc_head; - hc_entry->rmx_expire = tcp_hostcache.expire; + hc_entry->rmx_expire = V_tcp_hostcache.expire; /* * Put it upfront */ TAILQ_INSERT_HEAD(&hc_head->hch_bucket, hc_entry, rmx_q); - tcp_hostcache.hashbase[hash].hch_length++; - tcp_hostcache.cache_count++; + V_tcp_hostcache.hashbase[hash].hch_length++; + V_tcp_hostcache.cache_count++; V_tcpstat.tcps_hc_added++; return hc_entry; @@ -406,6 +371,7 @@ void tcp_hc_get(struct in_conninfo *inc, struct hc_metrics_lite *hc_metrics_lite) { + INIT_VNET_INET(curvnetb); struct hc_metrics *hc_entry; /* @@ -421,7 +387,7 @@ return; } hc_entry->rmx_hits++; - hc_entry->rmx_expire = tcp_hostcache.expire; /* start over again */ + hc_entry->rmx_expire = V_tcp_hostcache.expire; /* start over again */ hc_metrics_lite->rmx_mtu = hc_entry->rmx_mtu; hc_metrics_lite->rmx_ssthresh = hc_entry->rmx_ssthresh; @@ -446,6 +412,7 @@ u_long tcp_hc_getmtu(struct in_conninfo *inc) { + INIT_VNET_INET(curvnetb); struct hc_metrics *hc_entry; u_long mtu; @@ -454,7 +421,7 @@ return 0; } hc_entry->rmx_hits++; - hc_entry->rmx_expire = tcp_hostcache.expire; /* start over again */ + hc_entry->rmx_expire = V_tcp_hostcache.expire; /* start over again */ mtu = hc_entry->rmx_mtu; THC_UNLOCK(&hc_entry->rmx_head->hch_mtx); @@ -468,6 +435,7 @@ void tcp_hc_updatemtu(struct in_conninfo *inc, u_long mtu) { + INIT_VNET_INET(curvnetb); struct hc_metrics *hc_entry; /* @@ -484,7 +452,7 @@ return; } hc_entry->rmx_updates++; - hc_entry->rmx_expire = tcp_hostcache.expire; /* start over again */ + hc_entry->rmx_expire = V_tcp_hostcache.expire; /* start over again */ hc_entry->rmx_mtu = mtu; @@ -517,7 +485,7 @@ return; } hc_entry->rmx_updates++; - hc_entry->rmx_expire = tcp_hostcache.expire; /* start over again */ + hc_entry->rmx_expire = V_tcp_hostcache.expire; /* start over again */ if (hcml->rmx_rtt != 0) { if (hc_entry->rmx_rtt == 0) @@ -588,13 +556,14 @@ static int sysctl_tcp_hc_list(SYSCTL_HANDLER_ARGS) { + INIT_VNET_INET(curvnetb); int bufsize; int linesize = 128; char *p, *buf; int len, i, error; struct hc_metrics *hc_entry; - bufsize = linesize * (tcp_hostcache.cache_count + 1); + bufsize = linesize * (V_tcp_hostcache.cache_count + 1); p = buf = (char *)malloc(bufsize, M_TEMP, M_WAITOK|M_ZERO); @@ -604,9 +573,9 @@ p += len; #define msec(u) (((u) + 500) / 1000) - for (i = 0; i < tcp_hostcache.hashsize; i++) { - THC_LOCK(&tcp_hostcache.hashbase[i].hch_mtx); - TAILQ_FOREACH(hc_entry, &tcp_hostcache.hashbase[i].hch_bucket, + for (i = 0; i < V_tcp_hostcache.hashsize; i++) { + THC_LOCK(&V_tcp_hostcache.hashbase[i].hch_mtx); + TAILQ_FOREACH(hc_entry, &V_tcp_hostcache.hashbase[i].hch_bucket, rmx_q) { len = snprintf(p, linesize, "%-15s %5lu %8lu %6lums %6lums %9lu %8lu %8lu %8lu " @@ -632,7 +601,7 @@ hc_entry->rmx_expire); p += len; } - THC_UNLOCK(&tcp_hostcache.hashbase[i].hch_mtx); + THC_UNLOCK(&V_tcp_hostcache.hashbase[i].hch_mtx); } #undef msec error = SYSCTL_OUT(req, buf, p - buf); @@ -648,28 +617,32 @@ tcp_hc_purge(void *arg) { struct hc_metrics *hc_entry, *hc_next; - int all = (intptr_t)arg; + int all = 0; int i; - if (tcp_hostcache.purgeall) { + VNETB_ITERLOOP_BEGIN() + INIT_VNET_INET(curvnetb); + if (V_tcp_hostcache.purgeall) { all = 1; - tcp_hostcache.purgeall = 0; + V_tcp_hostcache.purgeall = 0; } - for (i = 0; i < tcp_hostcache.hashsize; i++) { - THC_LOCK(&tcp_hostcache.hashbase[i].hch_mtx); - TAILQ_FOREACH_SAFE(hc_entry, &tcp_hostcache.hashbase[i].hch_bucket, - rmx_q, hc_next) { + for (i = 0; i < V_tcp_hostcache.hashsize; i++) { + THC_LOCK(&V_tcp_hostcache.hashbase[i].hch_mtx); + TAILQ_FOREACH_SAFE(hc_entry, + &V_tcp_hostcache.hashbase[i].hch_bucket, + rmx_q, hc_next) { if (all || hc_entry->rmx_expire <= 0) { - TAILQ_REMOVE(&tcp_hostcache.hashbase[i].hch_bucket, + TAILQ_REMOVE(&V_tcp_hostcache.hashbase[i].hch_bucket, hc_entry, rmx_q); - uma_zfree(tcp_hostcache.zone, hc_entry); - tcp_hostcache.hashbase[i].hch_length--; - tcp_hostcache.cache_count--; + uma_zfree(V_tcp_hostcache.zone, hc_entry); + V_tcp_hostcache.hashbase[i].hch_length--; + V_tcp_hostcache.cache_count--; } else hc_entry->rmx_expire -= TCP_HOSTCACHE_PRUNE; } - THC_UNLOCK(&tcp_hostcache.hashbase[i].hch_mtx); + THC_UNLOCK(&V_tcp_hostcache.hashbase[i].hch_mtx); } + VNETB_ITERLOOP_END(); callout_reset(&tcp_hc_callout, TCP_HOSTCACHE_PRUNE * hz, tcp_hc_purge, 0); } ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#5 (text+ko) ==== @@ -387,6 +387,7 @@ #undef TCP_MINPROTOHDR tcp_timer_init(); + tcp_hc_init(); #ifdef VIMAGE if (curvnetb != &vnetb_0) @@ -394,7 +395,6 @@ #endif syncache_init(); - tcp_hc_init(); tcp_reass_init(); ISN_LOCK_INIT(); callout_init(&isn_callout, CALLOUT_MPSAFE); ==== //depot/projects/vimage/src/sys/netinet/vinet.h#3 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -66,6 +67,7 @@ struct inpcbinfo _tcbinfo; struct tcpstat _tcpstat; /* tcp statistics */ TAILQ_HEAD(, tcptw) _twq_2msl; + struct tcp_hostcache _tcp_hostcache; struct inpcbhead _udb; struct inpcbinfo _udbinfo; @@ -110,6 +112,7 @@ #define V_tcbinfo VNET_INET(tcbinfo) #define V_tcpstat VNET_INET(tcpstat) #define V_twq_2msl VNET_INET(twq_2msl) +#define V_tcp_hostcache VNET_INET(tcp_hostcache) #define V_udb VNET_INET(udb) #define V_udbinfo VNET_INET(udbinfo) From owner-p4-projects@FreeBSD.ORG Thu Dec 7 17:05:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA3A316A51C; Thu, 7 Dec 2006 17:05:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8990D16A511 for ; Thu, 7 Dec 2006 17:05:37 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5200B43CF8 for ; Thu, 7 Dec 2006 16:52:32 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB7GrKnj011800 for ; Thu, 7 Dec 2006 16:53:20 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB7GrJNw011795 for perforce@freebsd.org; Thu, 7 Dec 2006 16:53:19 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 7 Dec 2006 16:53:19 GMT Message-Id: <200612071653.kB7GrJNw011795@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 17:05:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=111251 Change 111251 by zec@zec_tca51 on 2006/12/07 16:52:23 Only setup the timer to run tcp_hc_callout() once, since tcp_hc_callout() will traverse through all the vnets in a single invocation. Affected files ... .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#4 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#4 (text+ko) ==== @@ -216,9 +216,15 @@ /* * Set up periodic cache cleanup. */ +#ifdef VIMAGE + if (curvnetb == &vnetb_0) { +#endif callout_init(&tcp_hc_callout, CALLOUT_MPSAFE); callout_reset(&tcp_hc_callout, TCP_HOSTCACHE_PRUNE * hz, tcp_hc_purge, 0); +#ifdef VIMAGE + } +#endif } /* From owner-p4-projects@FreeBSD.ORG Thu Dec 7 17:07:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A448616A529; Thu, 7 Dec 2006 17:07:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 80CF616A51F for ; Thu, 7 Dec 2006 17:07:25 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 450AC43CAF for ; Thu, 7 Dec 2006 17:04:44 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB7H5anK015103 for ; Thu, 7 Dec 2006 17:05:36 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB7H5a90015086 for perforce@freebsd.org; Thu, 7 Dec 2006 17:05:36 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 7 Dec 2006 17:05:36 GMT Message-Id: <200612071705.kB7H5a90015086@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111253 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 17:07:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=111253 Change 111253 by zec@zec_tca51 on 2006/12/07 17:05:07 Move some #defines for constant from tcp_hostcache.h back to .c. Given that netinet/vinet.h now includes tcp_hostcache.h, it wouldn't be desirable for tweaking those constants to require the entire INET part of the stack to be recompiled. Affected files ... .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#5 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.h#2 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#5 (text+ko) ==== @@ -97,6 +97,11 @@ #include +/* Arbitrary values */ +#define TCP_HOSTCACHE_HASHSIZE 512 +#define TCP_HOSTCACHE_BUCKETLIMIT 30 +#define TCP_HOSTCACHE_EXPIRE 60*60 /* one hour */ +#define TCP_HOSTCACHE_PRUNE 5*60 /* every 5 minutes */ #ifndef VIMAGE static struct tcp_hostcache tcp_hostcache; ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.h#2 (text+ko) ==== @@ -66,12 +66,6 @@ u_long rmx_updates; /* number of updates */ }; -/* Arbitrary values */ -#define TCP_HOSTCACHE_HASHSIZE 512 -#define TCP_HOSTCACHE_BUCKETLIMIT 30 -#define TCP_HOSTCACHE_EXPIRE 60*60 /* one hour */ -#define TCP_HOSTCACHE_PRUNE 5*60 /* every 5 minutes */ - struct tcp_hostcache { struct hc_head *hashbase; uma_zone_t zone; From owner-p4-projects@FreeBSD.ORG Thu Dec 7 17:30:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB79116A511; Thu, 7 Dec 2006 17:30:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 08D0916A4C2 for ; Thu, 7 Dec 2006 17:30:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21CEE43EB9 for ; Thu, 7 Dec 2006 17:24:41 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB7HP9IE018715 for ; Thu, 7 Dec 2006 17:25:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB7HP1jv018668 for perforce@freebsd.org; Thu, 7 Dec 2006 17:25:01 GMT (envelope-from imp@freebsd.org) Date: Thu, 7 Dec 2006 17:25:01 GMT Message-Id: <200612071725.kB7HP1jv018668@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111255 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 17:30:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=111255 Change 111255 by imp@imp_paco-paco on 2006/12/07 17:24:49 IFC @111248 Affected files ... .. //depot/projects/arm/src/Makefile#9 integrate .. //depot/projects/arm/src/Makefile.inc1#19 integrate .. //depot/projects/arm/src/ObsoleteFiles.inc#13 integrate .. //depot/projects/arm/src/UPDATING#9 integrate .. //depot/projects/arm/src/bin/hostname/hostname.1#2 integrate .. //depot/projects/arm/src/bin/pax/cpio.c#2 integrate .. //depot/projects/arm/src/bin/pax/tar.c#2 integrate .. //depot/projects/arm/src/contrib/pf/pfctl/pfctl_altq.c#2 integrate .. //depot/projects/arm/src/contrib/top/sigconv.awk#2 integrate .. //depot/projects/arm/src/etc/mtree/BSD.usr.dist#7 integrate .. //depot/projects/arm/src/etc/rc.initdiskless#4 integrate .. //depot/projects/arm/src/etc/rc.subr#6 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes#8 integrate .. //depot/projects/arm/src/games/fortune/datfiles/freebsd-tips#3 integrate .. //depot/projects/arm/src/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/arm/src/lib/libarchive/Makefile#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive.h.in#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read.3#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_open_file.c#7 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_open_memory.c#1 branch .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write.3#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write.c#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_open_fd.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_open_file.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_open_memory.c#1 branch .. //depot/projects/arm/src/lib/libarchive/archive_write_set_compression_none.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_pax.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_ustar.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/libarchive.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/confstr.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/err.3#3 integrate .. //depot/projects/arm/src/lib/libc/net/nscachedcli.c#2 integrate .. //depot/projects/arm/src/lib/libc/sys/close.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/arm/src/lib/libelf/Makefile#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_proc.c#4 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_join.c#2 integrate .. //depot/projects/arm/src/lib/libthr/Makefile#4 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_barrier.c#3 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_cancel.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_cond.c#3 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_create.c#4 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_fork.c#4 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_init.c#7 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_join.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_list.c#3 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_private.h#7 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_sem.c#3 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_sig.c#4 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_syscalls.c#3 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_umtx.c#5 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_umtx.h#5 integrate .. //depot/projects/arm/src/release/Makefile#8 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/Makefile#3 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile#2 delete .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#2 delete .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#1 branch .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 delete .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent#2 delete .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile#2 delete .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#2 delete .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#2 delete .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#2 delete .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile#2 delete .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#2 delete .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#2 delete .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile#2 delete .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#2 delete .. //depot/projects/arm/src/release/doc/share/examples/Makefile.relnotesng#3 integrate .. //depot/projects/arm/src/release/picobsd/tinyware/vm/vm.c#3 integrate .. //depot/projects/arm/src/rescue/rescue/Makefile#4 integrate .. //depot/projects/arm/src/sbin/Makefile#4 integrate .. //depot/projects/arm/src/sbin/camcontrol/camcontrol.c#4 integrate .. //depot/projects/arm/src/sbin/ggate/Makefile#3 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifbridge.c#4 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#8 integrate .. //depot/projects/arm/src/sbin/mount/mount_fs.c#2 integrate .. //depot/projects/arm/src/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/arm/src/sbin/mount_unionfs/Makefile#2 integrate .. //depot/projects/arm/src/sbin/mount_unionfs/mount_unionfs.8#2 integrate .. //depot/projects/arm/src/sbin/mount_unionfs/mount_unionfs.c#2 integrate .. //depot/projects/arm/src/sbin/reboot/boot_i386.8#2 integrate .. //depot/projects/arm/src/sbin/reboot/reboot.8#2 integrate .. //depot/projects/arm/src/sbin/restore/main.c#2 integrate .. //depot/projects/arm/src/sbin/restore/restore.8#3 integrate .. //depot/projects/arm/src/sbin/restore/restore.c#2 integrate .. //depot/projects/arm/src/sbin/restore/restore.h#2 integrate .. //depot/projects/arm/src/sbin/restore/tape.c#3 integrate .. //depot/projects/arm/src/sbin/sysctl/sysctl.c#9 integrate .. //depot/projects/arm/src/share/man/man4/Makefile#5 integrate .. //depot/projects/arm/src/share/man/man4/altq.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ata.4#4 integrate .. //depot/projects/arm/src/share/man/man4/ath.4#2 integrate .. //depot/projects/arm/src/share/man/man4/bce.4#3 integrate .. //depot/projects/arm/src/share/man/man4/man4.arm/Makefile#1 branch .. //depot/projects/arm/src/share/man/man4/man4.arm/npe.4#1 branch .. //depot/projects/arm/src/share/man/man4/man4.i386/acpi_ibm.4#2 integrate .. //depot/projects/arm/src/share/man/man4/md.4#2 integrate .. //depot/projects/arm/src/share/man/man4/pcm.4#4 integrate .. //depot/projects/arm/src/share/man/man4/polling.4#2 integrate .. //depot/projects/arm/src/share/man/man4/re.4#2 integrate .. //depot/projects/arm/src/share/man/man4/snd_atiixp.4#2 integrate .. //depot/projects/arm/src/share/man/man4/snd_es137x.4#2 integrate .. //depot/projects/arm/src/share/man/man4/snd_hda.4#3 integrate .. //depot/projects/arm/src/share/man/man4/snd_via8233.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ubsa.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ubser.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ubtbcmfw.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ucycom.4#2 integrate .. //depot/projects/arm/src/share/man/man4/udbp.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ufm.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ufoma.4#3 integrate .. //depot/projects/arm/src/share/man/man4/uftdi.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ugen.4#2 integrate .. //depot/projects/arm/src/share/man/man4/uhid.4#3 integrate .. //depot/projects/arm/src/share/man/man4/ukbd.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ulpt.4#2 integrate .. //depot/projects/arm/src/share/man/man4/umass.4#3 integrate .. //depot/projects/arm/src/share/man/man4/umct.4#2 integrate .. //depot/projects/arm/src/share/man/man4/umodem.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ums.4#2 integrate .. //depot/projects/arm/src/share/man/man4/uplcom.4#3 integrate .. //depot/projects/arm/src/share/man/man4/urio.4#2 integrate .. //depot/projects/arm/src/share/man/man4/usb.4#2 integrate .. //depot/projects/arm/src/share/man/man4/uscanner.4#4 integrate .. //depot/projects/arm/src/share/man/man4/utopia.4#2 integrate .. //depot/projects/arm/src/share/man/man4/uvisor.4#2 integrate .. //depot/projects/arm/src/share/man/man4/uvscom.4#2 integrate .. //depot/projects/arm/src/share/man/man5/fdescfs.5#3 integrate .. //depot/projects/arm/src/share/man/man7/ports.7#4 integrate .. //depot/projects/arm/src/share/man/man7/tuning.7#2 integrate .. //depot/projects/arm/src/share/man/man8/MAKEDEV.8#2 integrate .. //depot/projects/arm/src/share/man/man9/LOCK_PROFILING.9#2 integrate .. //depot/projects/arm/src/share/man/man9/Makefile#5 integrate .. //depot/projects/arm/src/share/man/man9/config_intrhook.9#2 integrate .. //depot/projects/arm/src/share/man/man9/devsw.9#2 delete .. //depot/projects/arm/src/share/man/man9/make_dev.9#2 integrate .. //depot/projects/arm/src/share/man/man9/style.9#2 integrate .. //depot/projects/arm/src/share/man/man9/sysctl.9#4 integrate .. //depot/projects/arm/src/share/man/man9/uio.9#2 integrate .. //depot/projects/arm/src/share/misc/pci_vendors#2 integrate .. //depot/projects/arm/src/sys/Makefile#10 integrate .. //depot/projects/arm/src/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#19 integrate .. //depot/projects/arm/src/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#28 integrate .. //depot/projects/arm/src/sys/amd64/amd64/trap.c#14 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#17 integrate .. //depot/projects/arm/src/sys/amd64/include/pmap.h#11 integrate .. //depot/projects/arm/src/sys/amd64/isa/clock.c#8 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#12 integrate .. //depot/projects/arm/src/sys/arm/arm/cpufunc.c#13 integrate .. //depot/projects/arm/src/sys/arm/arm/genassym.c#5 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#30 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#23 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_spi.c#14 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#36 integrate .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#40 integrate .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#39 integrate .. //depot/projects/arm/src/sys/arm/conf/AVILA#12 integrate .. //depot/projects/arm/src/sys/arm/include/cpuconf.h#6 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/assabet_machdep.c#9 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_space.c#5 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/iq31244_machdep.c#14 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#10 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.avila#8 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#10 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425reg.h#5 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#21 integrate .. //depot/projects/arm/src/sys/boot/common/loader.8#6 integrate .. //depot/projects/arm/src/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/arm/src/sys/boot/sparc64/loader/hcall.S#2 delete .. //depot/projects/arm/src/sys/cam/cam_ccb.h#6 integrate .. //depot/projects/arm/src/sys/cam/cam_periph.c#7 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.c#12 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_all.h#5 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_cd.c#6 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#14 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_targ_bh.c#3 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#12 integrate .. //depot/projects/arm/src/sys/compat/linsysfs/linsysfs.c#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#20 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_stats.c#11 integrate .. //depot/projects/arm/src/sys/conf/files#56 integrate .. //depot/projects/arm/src/sys/conf/files.arm#6 integrate .. //depot/projects/arm/src/sys/conf/files.sun4v#5 integrate .. //depot/projects/arm/src/sys/conf/kern.mk#7 integrate .. //depot/projects/arm/src/sys/conf/options#35 integrate .. //depot/projects/arm/src/sys/ddb/db_ps.c#6 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#21 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bce.c#13 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#25 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bgereg.h#18 integrate .. //depot/projects/arm/src/sys/dev/ciss/ciss.c#10 integrate .. //depot/projects/arm/src/sys/dev/dc/if_dc.c#11 integrate .. //depot/projects/arm/src/sys/dev/dc/if_dcreg.h#7 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#34 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.h#14 integrate .. //depot/projects/arm/src/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwdev.c#3 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxp.c#14 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxpvar.h#4 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gem.c#6 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/hme/if_hme.c#7 integrate .. //depot/projects/arm/src/sys/dev/hme/if_hmevar.h#3 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iic.h#4 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iicbb.c#6 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iicbus_if.m#4 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iiconf.c#4 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iiconf.h#6 integrate .. //depot/projects/arm/src/sys/dev/ipmi/ipmi.c#6 integrate .. //depot/projects/arm/src/sys/dev/isp/isp.c#15 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#18 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_target.c#9 integrate .. //depot/projects/arm/src/sys/dev/isp/ispvar.h#14 integrate .. //depot/projects/arm/src/sys/dev/iwi/if_iwi.c#12 integrate .. //depot/projects/arm/src/sys/dev/le/am7990.c#4 integrate .. //depot/projects/arm/src/sys/dev/le/am79900.c#4 integrate .. //depot/projects/arm/src/sys/dev/le/lance.c#3 integrate .. //depot/projects/arm/src/sys/dev/le/lancevar.h#3 integrate .. //depot/projects/arm/src/sys/dev/mii/acphy.c#4 integrate .. //depot/projects/arm/src/sys/dev/mii/amphy.c#4 integrate .. //depot/projects/arm/src/sys/dev/mii/bmtphy.c#3 integrate .. //depot/projects/arm/src/sys/dev/mii/brgphy.c#11 integrate .. //depot/projects/arm/src/sys/dev/mii/ciphy.c#5 integrate .. //depot/projects/arm/src/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/arm/src/sys/dev/mii/inphy.c#3 integrate .. //depot/projects/arm/src/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/arm/src/sys/dev/mii/lxtphy.c#4 integrate .. //depot/projects/arm/src/sys/dev/mii/mii_physubr.c#5 integrate .. //depot/projects/arm/src/sys/dev/mii/miidevs#7 integrate .. //depot/projects/arm/src/sys/dev/mii/miivar.h#4 integrate .. //depot/projects/arm/src/sys/dev/mii/mlphy.c#3 integrate .. //depot/projects/arm/src/sys/dev/mii/nsgphy.c#5 integrate .. //depot/projects/arm/src/sys/dev/mii/nsphy.c#4 integrate .. //depot/projects/arm/src/sys/dev/mii/pnaphy.c#4 integrate .. //depot/projects/arm/src/sys/dev/mii/qsphy.c#4 integrate .. //depot/projects/arm/src/sys/dev/mii/rgephy.c#7 integrate .. //depot/projects/arm/src/sys/dev/mii/rlphy.c#4 integrate .. //depot/projects/arm/src/sys/dev/mii/tdkphy.c#5 integrate .. //depot/projects/arm/src/sys/dev/mii/tlphy.c#4 integrate .. //depot/projects/arm/src/sys/dev/mii/xmphy.c#4 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.c#20 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.h#21 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#29 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_raid.c#10 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#9 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfe.c#8 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfereg.h#5 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfevar.h#3 integrate .. //depot/projects/arm/src/sys/dev/nve/if_nvereg.h#5 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2560.c#7 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2661.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/atiixp.c#8 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/cmi.c#8 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/es137x.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/ich.c#13 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/via8233.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/ac97.c#8 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/ac97.h#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/buffer.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/buffer.h#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/channel.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/channel.h#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#12 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/fake.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/feeder.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/feeder.h#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/feeder_fmt.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/feeder_rate.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/sndstat.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/sound.c#10 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/sound.h#9 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/vchan.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/usb/uaudio.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/if_aue.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/if_auereg.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#16 integrate .. //depot/projects/arm/src/sys/dev/usb/ukbd.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.c#12 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.h#6 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi.c#8 integrate .. //depot/projects/arm/src/sys/dev/vge/if_vge.c#8 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_conv.c#7 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_status.c#5 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union.h#3 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_vfsops.c#5 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_vnops.c#5 integrate .. //depot/projects/arm/src/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/genassym.c#6 integrate .. //depot/projects/arm/src/sys/i386/i386/locore.s#3 integrate .. //depot/projects/arm/src/sys/i386/i386/machdep.c#23 integrate .. //depot/projects/arm/src/sys/i386/isa/clock.c#8 integrate .. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#11 integrate .. //depot/projects/arm/src/sys/kern/init_main.c#12 integrate .. //depot/projects/arm/src/sys/kern/kern_clock.c#10 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_idle.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_intr.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_kse.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_poll.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_proc.c#10 integrate .. //depot/projects/arm/src/sys/kern/kern_resource.c#13 integrate .. //depot/projects/arm/src/sys/kern/kern_subr.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_switch.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#15 integrate .. //depot/projects/arm/src/sys/kern/kern_thr.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_thread.c#13 integrate .. //depot/projects/arm/src/sys/kern/kern_time.c#13 integrate .. //depot/projects/arm/src/sys/kern/kern_umtx.c#14 integrate .. //depot/projects/arm/src/sys/kern/ksched.c#2 integrate .. //depot/projects/arm/src/sys/kern/link_elf_obj.c#6 integrate .. //depot/projects/arm/src/sys/kern/sched_4bsd.c#13 integrate .. //depot/projects/arm/src/sys/kern/sched_ule.c#12 integrate .. //depot/projects/arm/src/sys/kern/subr_lock.c#4 integrate .. //depot/projects/arm/src/sys/kern/subr_prf.c#9 integrate .. //depot/projects/arm/src/sys/kern/subr_rman.c#11 integrate .. //depot/projects/arm/src/sys/kern/subr_trap.c#8 integrate .. //depot/projects/arm/src/sys/kern/tty.c#12 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#27 integrate .. //depot/projects/arm/src/sys/kern/vfs_export.c#4 integrate .. //depot/projects/arm/src/sys/modules/Makefile#33 integrate .. //depot/projects/arm/src/sys/modules/wlan_amrr/Makefile#1 branch .. //depot/projects/arm/src/sys/net/bridgestp.c#13 integrate .. //depot/projects/arm/src/sys/net/bridgestp.h#6 integrate .. //depot/projects/arm/src/sys/net/ethernet.h#5 integrate .. //depot/projects/arm/src/sys/net/if.c#17 integrate .. //depot/projects/arm/src/sys/net/if_atmsubr.c#5 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#28 integrate .. //depot/projects/arm/src/sys/net/if_bridgevar.h#11 integrate .. //depot/projects/arm/src/sys/net/if_llc.h#3 integrate .. //depot/projects/arm/src/sys/net/if_ppp.c#10 integrate .. //depot/projects/arm/src/sys/net/if_pppvar.h#4 integrate .. //depot/projects/arm/src/sys/net/netisr.c#3 integrate .. //depot/projects/arm/src/sys/net/ppp_tty.c#5 integrate .. //depot/projects/arm/src/sys/net/route.c#5 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.c#10 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.h#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_amrr.c#1 branch .. //depot/projects/arm/src/sys/net80211/ieee80211_amrr.h#1 branch .. //depot/projects/arm/src/sys/net80211/ieee80211_input.c#12 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_output.c#11 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_var.h#11 integrate .. //depot/projects/arm/src/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/arm/src/sys/netinet/igmp.c#5 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#15 integrate .. //depot/projects/arm/src/sys/netinet/ip_carp.h#3 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias.h#3 integrate .. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#12 integrate .. //depot/projects/arm/src/sys/netinet6/nd6.c#10 integrate .. //depot/projects/arm/src/sys/nfs/nfsproto.h#2 integrate .. //depot/projects/arm/src/sys/nfs4client/nfs4_subs.c#2 integrate .. //depot/projects/arm/src/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/arm/src/sys/nfsclient/bootp_subr.c#5 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_diskless.c#6 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_node.c#9 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_socket.c#16 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#11 integrate .. //depot/projects/arm/src/sys/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs.h#5 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#11 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_srvsubs.c#8 integrate .. //depot/projects/arm/src/sys/pc98/pc98/machdep.c#13 integrate .. //depot/projects/arm/src/sys/pci/if_pcn.c#7 integrate .. //depot/projects/arm/src/sys/pci/if_pcnreg.h#5 integrate .. //depot/projects/arm/src/sys/pci/if_rl.c#6 integrate .. //depot/projects/arm/src/sys/pci/if_rlreg.h#9 integrate .. //depot/projects/arm/src/sys/pci/if_xl.c#8 integrate .. //depot/projects/arm/src/sys/pci/if_xlreg.h#4 integrate .. //depot/projects/arm/src/sys/powerpc/include/pmap.h#4 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/genassym.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/machdep.c#10 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/mmu_if.m#7 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/mmu_oea.c#9 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/pmap_dispatch.c#8 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/uio_machdep.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/genassym.c#7 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/machdep.c#7 integrate .. //depot/projects/arm/src/sys/sun4v/cddl/mdesc/mdesc_diff.c#1 branch .. //depot/projects/arm/src/sys/sun4v/cddl/mdesc/mdesc_findname.c#1 branch .. //depot/projects/arm/src/sys/sun4v/cddl/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/arm/src/sys/sun4v/cddl/mdesc/mdesc_fini.c#1 branch .. //depot/projects/arm/src/sys/sun4v/cddl/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/arm/src/sys/sun4v/cddl/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/arm/src/sys/sun4v/cddl/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/arm/src/sys/sun4v/cddl/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/arm/src/sys/sun4v/cddl/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/arm/src/sys/sun4v/cddl/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/arm/src/sys/sun4v/cddl/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/arm/src/sys/sun4v/cddl/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/arm/src/sys/sun4v/cddl/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/arm/src/sys/sun4v/cddl/t1_copy.S#1 branch .. //depot/projects/arm/src/sys/sun4v/conf/DEFAULTS#3 integrate .. //depot/projects/arm/src/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/arm/src/sys/sun4v/include/asm.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/hv_api.h#1 branch .. //depot/projects/arm/src/sys/sun4v/include/hypervisor_api.h#3 delete .. //depot/projects/arm/src/sys/sun4v/include/hypervisorvar.h#3 integrate .. //depot/projects/arm/src/sys/sun4v/include/pcb.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/pmap.h#4 integrate .. //depot/projects/arm/src/sys/sun4v/include/sun4v_cpufunc.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/tsb.h#3 integrate .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_diff.c#2 delete .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_findname.c#2 delete .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_findnodeprop.c#2 delete .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_fini.c#2 delete .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_getbinsize.c#2 delete .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_getgen.c#2 delete .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_getpropdata.c#2 delete .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_getpropstr.c#2 delete .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_getpropval.c#2 delete .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_init_intern.c#2 delete .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_nodecount.c#2 delete .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_rootnode.c#2 delete .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_scandag.c#2 delete .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/exception.S#6 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/hvcons.c#5 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/hviommu.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/interrupt.S#4 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/mp_locore.S#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/nexus.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/pmap.c#7 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/rtc.c#3 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/simdisk.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/support.S#4 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/t1_copy.S#3 delete .. //depot/projects/arm/src/sys/sun4v/sun4v/trap.c#5 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/tsb.c#4 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/tte_hash.c#5 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/vnex.c#3 integrate .. //depot/projects/arm/src/sys/sys/param.h#21 integrate .. //depot/projects/arm/src/sys/sys/pcpu.h#5 integrate .. //depot/projects/arm/src/sys/sys/proc.h#18 integrate .. //depot/projects/arm/src/sys/sys/rtprio.h#4 integrate .. //depot/projects/arm/src/sys/sys/runq.h#2 integrate .. //depot/projects/arm/src/sys/sys/sched.h#8 integrate .. //depot/projects/arm/src/sys/sys/soundcard.h#5 integrate .. //depot/projects/arm/src/sys/sys/uio.h#3 integrate .. //depot/projects/arm/src/sys/sys/umtx.h#9 integrate .. //depot/projects/arm/src/sys/sys/vmmeter.h#3 integrate .. //depot/projects/arm/src/sys/vm/vm_glue.c#7 integrate .. //depot/projects/arm/src/sys/vm/vm_zeroidle.c#7 integrate .. //depot/projects/arm/src/tools/build/mk/OptionalObsoleteFiles.inc#4 integrate .. //depot/projects/arm/src/tools/kerneldoc/subsys/Makefile#3 integrate .. //depot/projects/arm/src/tools/make_libdeps.sh#2 integrate .. //depot/projects/arm/src/tools/regression/pthread/cv_cancel1/Makefile#1 branch .. //depot/projects/arm/src/tools/regression/pthread/cv_cancel1/cv_cancel1.c#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.sh#3 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wX.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wXl.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wc.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wdl.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wdn.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.we.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wf.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wg.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wgd.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wo.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wp1.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wp2.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wp3.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wp4.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wp5.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wp6.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wu.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wwe.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wx.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/jot/regress.wxn.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/pkill/pgrep-j.t#2 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/pkill/pkill-j.t#2 integrate .. //depot/projects/arm/src/tools/tools/nanobsd/nanobsd.sh#5 integrate .. //depot/projects/arm/src/tools/tools/net80211/wlandebug/wlandebug.c#2 integrate .. //depot/projects/arm/src/usr.bin/Makefile#3 integrate .. //depot/projects/arm/src/usr.bin/banner/banner.c#2 integrate .. //depot/projects/arm/src/usr.bin/bsdiff/bsdiff/bsdiff.c#2 integrate .. //depot/projects/arm/src/usr.bin/bsdiff/bspatch/bspatch.c#2 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.freebsd#6 integrate .. //depot/projects/arm/src/usr.bin/getconf/getconf.c#2 integrate .. //depot/projects/arm/src/usr.bin/jot/jot.c#3 integrate .. //depot/projects/arm/src/usr.bin/netstat/bpf.c#3 integrate .. //depot/projects/arm/src/usr.bin/netstat/ipsec.c#3 integrate .. //depot/projects/arm/src/usr.bin/netstat/pfkey.c#3 integrate .. //depot/projects/arm/src/usr.bin/netstat/route.c#3 integrate .. //depot/projects/arm/src/usr.bin/pkill/pkill.1#2 integrate .. //depot/projects/arm/src/usr.bin/pkill/pkill.c#2 integrate .. //depot/projects/arm/src/usr.bin/systat/Makefile#3 integrate .. //depot/projects/arm/src/usr.bin/systat/convtbl.c#2 integrate .. //depot/projects/arm/src/usr.bin/systat/convtbl.h#2 integrate .. //depot/projects/arm/src/usr.bin/systat/ifcmds.c#2 integrate .. //depot/projects/arm/src/usr.bin/systat/ifstat.c#2 integrate .. //depot/projects/arm/src/usr.bin/systat/iostat.c#2 integrate .. //depot/projects/arm/src/usr.bin/systat/netstat.c#2 integrate .. //depot/projects/arm/src/usr.bin/systat/pigs.c#2 integrate .. //depot/projects/arm/src/usr.bin/systat/swap.c#2 integrate .. //depot/projects/arm/src/usr.bin/systat/vmstat.c#3 integrate .. //depot/projects/arm/src/usr.bin/top/Makefile#2 integrate .. //depot/projects/arm/src/usr.bin/top/sigdesc.h#2 delete .. //depot/projects/arm/src/usr.bin/usbhidctl/usbhid.c#2 integrate .. //depot/projects/arm/src/usr.bin/usbhidctl/usbhidctl.1#2 integrate .. //depot/projects/arm/src/usr.bin/vmstat/vmstat.c#4 integrate .. //depot/projects/arm/src/usr.sbin/Makefile#10 integrate .. //depot/projects/arm/src/usr.sbin/adduser/adduser.8#3 integrate .. //depot/projects/arm/src/usr.sbin/adduser/rmuser.8#2 integrate .. //depot/projects/arm/src/usr.sbin/asf/asf.8#3 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/parser.y#4 integrate .. //depot/projects/arm/src/usr.sbin/cached/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/crunch/crunchgen/crunchgen.c#2 integrate .. //depot/projects/arm/src/usr.sbin/eeprom/eeprom.8#3 integrate .. //depot/projects/arm/src/usr.sbin/freebsd-update/freebsd-update.sh#4 integrate .. //depot/projects/arm/src/usr.sbin/ngctl/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/rpcbind/rpcbind.8#2 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/config.c#4 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/label.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/menus.c#2 integrate Differences ... ==== //depot/projects/arm/src/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.338 2006/11/21 08:25:28 jb Exp $ +# $FreeBSD: src/Makefile,v 1.339 2006/11/28 01:03:29 ru Exp $ # # The user-driven targets are: # @@ -268,7 +268,7 @@ @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in amd64 i386 ia64 pc98 sparc64 sun4v +.for target in amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ find [A-Z]*[A-Z] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT ==== //depot/projects/arm/src/Makefile.inc1#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.564 2006/11/13 05:52:11 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.565 2006/11/27 19:38:28 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -874,7 +874,7 @@ .endif .if ${MK_RESCUE} != "no" && \ - ${BOOTSTRAPPING} < 600008 + ${BOOTSTRAPPING} < 700026 _crunchgen= usr.sbin/crunch/crunchgen .endif ==== //depot/projects/arm/src/ObsoleteFiles.inc#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.61 2006/11/16 22:34:17 brueffer Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.67 2006/12/07 01:24:38 avatar Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,39 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20061201: remove symlink to *.so.4 libalias modules +OLD_FILES+=usr/lib/libalias_cuseeme.so +OLD_FILES+=usr/lib/libalias_dummy.so +OLD_FILES+=usr/lib/libalias_ftp.so +OLD_FILES+=usr/lib/libalias_irc.so +OLD_FILES+=usr/lib/libalias_nbt.so +OLD_FILES+=usr/lib/libalias_pptp.so +OLD_FILES+=usr/lib/libalias_skinny.so +OLD_FILES+=usr/lib/libalias_smedia.so +# 20061201: remove old *.so.4 liablias modules +OLD_FILES+=lib/libalias_cuseeme.so.4 +OLD_FILES+=lib/libalias_dummy.so.4 +OLD_FILES+=lib/libalias_ftp.so.4 +OLD_FILES+=lib/libalias_irc.so.4 +OLD_FILES+=lib/libalias_nbt.so.4 +OLD_FILES+=lib/libalias_pptp.so.4 +OLD_FILES+=lib/libalias_skinny.so.4 +OLD_FILES+=lib/libalias_smedia.so.4 +# 20061125: remove old man page +OLD_FILES+=usr/share/man/man9/devsw.9.gz +# 20061122: remove obsolete mount programs +OLD_FILES+=sbin/mount_devfs +OLD_FILES+=sbin/mount_ext2fs +OLD_FILES+=sbin/mount_fdescfs +OLD_FILES+=sbin/mount_linprocfs +OLD_FILES+=sbin/mount_procfs +OLD_FILES+=sbin/mount_std +OLD_FILES+=usr/share/man/man8/mount_devfs.8.gz +OLD_FILES+=usr/share/man/man8/mount_ext2fs.8.gz +OLD_FILES+=usr/share/man/man8/mount_fdescfs.8.gz +OLD_FILES+=usr/share/man/man8/mount_linprocfs.8.gz +OLD_FILES+=usr/share/man/man8/mount_procfs.8.gz +OLD_FILES+=usr/share/man/man8/mount_std.8.gz # 20061116: uhidev.4 removed OLD_FILES+=usr/share/man/man4/uhidev.4.gz .if ${TARGET_ARCH} == "ia64" @@ -570,6 +603,8 @@ OLD_FILES+=usr/bin/kenv OLD_FILES+=usr/sbin/elf2aout # 200210XX +OLD_FILES+=usr/include/libusb.h +OLD_FILES+=usr/include/libusbhid.h OLD_FILES+=usr/share/man/man3/All_FreeBSD.3.gz OLD_FILES+=usr/share/man/man3/CheckRules.3.gz OLD_FILES+=usr/share/man/man3/ChunkCanBeRoot.3.gz @@ -700,6 +735,31 @@ OLD_FILES+=usr/sbin/stlstty OLD_FILES+=usr/sbin/ispppcontrol OLD_FILES+=usr/sbin/rndcontrol +# 20011001: UUCP migration to ports +OLD_FILES+=usr/bin/uucp +OLD_FILES+=usr/bin/uulog +OLD_FILES+=usr/bin/uuname +OLD_FILES+=usr/bin/uupick +OLD_FILES+=usr/bin/uusched +OLD_FILES+=usr/bin/uustat +OLD_FILES+=usr/bin/uuto +OLD_FILES+=usr/bin/uux +OLD_FILES+=usr/libexec/uucp/uucico +OLD_FILES+=usr/libexec/uucp/uuxqt +OLD_FILES+=usr/libexec/uucpd +OLD_FILES+=usr/share/man/man1/uuconv.1.gz +OLD_FILES+=usr/share/man/man1/uucp.1.gz +OLD_FILES+=usr/share/man/man1/uulog.1.gz +OLD_FILES+=usr/share/man/man1/uuname.1.gz +OLD_FILES+=usr/share/man/man1/uupick.1.gz +OLD_FILES+=usr/share/man/man1/uustat.1.gz +OLD_FILES+=usr/share/man/man1/uuto.1.gz +OLD_FILES+=usr/share/man/man1/uux.1.gz +OLD_FILES+=usr/share/man/man8/uuchk.8.gz +OLD_FILES+=usr/share/man/man8/uucico.8.gz +OLD_FILES+=usr/share/man/man8/uucpd.8.gz +OLD_FILES+=usr/share/man/man8/uusched.8.gz +OLD_FILES+=usr/share/man/man8/uuxqt.8.gz # 20010523 mount_portal -> mount_portalfs OLD_FILES+=sbin/mount_portal OLD_FILES+=usr/share/man/man8/mount_portal.8.gz @@ -2775,6 +2835,290 @@ OLD_FILES+=usr/games/wump OLD_FILES+=sbin/mount_reiserfs OLD_FILES+=usr/bin/hesinfo +OLD_FILES+=usr/include/c++/3.4/ext/demangle.h +OLD_FILES+=usr/include/cam/cam_extend.h +OLD_FILES+=usr/include/dev/usb/usbdevs.h +OLD_FILES+=usr/include/dev/usb/usbdevs_data.h +OLD_FILES+=usr/include/dev/wi/wi_hostap.h +OLD_FILES+=usr/include/disktab.h +OLD_FILES+=usr/include/g++/FlexLexer.h +OLD_FILES+=usr/include/g++/PlotFile.h +OLD_FILES+=usr/include/g++/SFile.h +OLD_FILES+=usr/include/g++/_G_config.h +OLD_FILES+=usr/include/g++/algo.h +OLD_FILES+=usr/include/g++/algobase.h +OLD_FILES+=usr/include/g++/algorithm +OLD_FILES+=usr/include/g++/alloc.h +OLD_FILES+=usr/include/g++/bitset +OLD_FILES+=usr/include/g++/builtinbuf.h +OLD_FILES+=usr/include/g++/bvector.h +OLD_FILES+=usr/include/g++/cassert +OLD_FILES+=usr/include/g++/cctype +OLD_FILES+=usr/include/g++/cerrno +OLD_FILES+=usr/include/g++/cfloat +OLD_FILES+=usr/include/g++/ciso646 +OLD_FILES+=usr/include/g++/climits +OLD_FILES+=usr/include/g++/clocale +OLD_FILES+=usr/include/g++/cmath +OLD_FILES+=usr/include/g++/complex +OLD_FILES+=usr/include/g++/complex.h +OLD_FILES+=usr/include/g++/csetjmp +OLD_FILES+=usr/include/g++/csignal +OLD_FILES+=usr/include/g++/cstdarg +OLD_FILES+=usr/include/g++/cstddef +OLD_FILES+=usr/include/g++/cstdio +OLD_FILES+=usr/include/g++/cstdlib +OLD_FILES+=usr/include/g++/cstring +OLD_FILES+=usr/include/g++/ctime +OLD_FILES+=usr/include/g++/cwchar +OLD_FILES+=usr/include/g++/cwctype +OLD_FILES+=usr/include/g++/defalloc.h +OLD_FILES+=usr/include/g++/deque +OLD_FILES+=usr/include/g++/deque.h +OLD_FILES+=usr/include/g++/editbuf.h +OLD_FILES+=usr/include/g++/exception +OLD_FILES+=usr/include/g++/floatio.h +OLD_FILES+=usr/include/g++/fstream +OLD_FILES+=usr/include/g++/fstream.h +OLD_FILES+=usr/include/g++/function.h +OLD_FILES+=usr/include/g++/functional +OLD_FILES+=usr/include/g++/hash_map +OLD_FILES+=usr/include/g++/hash_map.h +OLD_FILES+=usr/include/g++/hash_set +OLD_FILES+=usr/include/g++/hash_set.h +OLD_FILES+=usr/include/g++/hashtable.h +OLD_FILES+=usr/include/g++/heap.h +OLD_FILES+=usr/include/g++/indstream.h +OLD_FILES+=usr/include/g++/iolibio.h +OLD_FILES+=usr/include/g++/iomanip +OLD_FILES+=usr/include/g++/iomanip.h +OLD_FILES+=usr/include/g++/iosfwd +OLD_FILES+=usr/include/g++/iostdio.h +OLD_FILES+=usr/include/g++/iostream +OLD_FILES+=usr/include/g++/iostream.h +OLD_FILES+=usr/include/g++/iostreamP.h +OLD_FILES+=usr/include/g++/istream.h +OLD_FILES+=usr/include/g++/iterator +OLD_FILES+=usr/include/g++/iterator.h +OLD_FILES+=usr/include/g++/libio.h +OLD_FILES+=usr/include/g++/libioP.h +OLD_FILES+=usr/include/g++/list +OLD_FILES+=usr/include/g++/list.h +OLD_FILES+=usr/include/g++/map +OLD_FILES+=usr/include/g++/map.h +OLD_FILES+=usr/include/g++/memory +OLD_FILES+=usr/include/g++/multimap.h +OLD_FILES+=usr/include/g++/multiset.h +OLD_FILES+=usr/include/g++/new +OLD_FILES+=usr/include/g++/new.h +OLD_FILES+=usr/include/g++/numeric +OLD_FILES+=usr/include/g++/ostream.h +OLD_FILES+=usr/include/g++/pair.h +OLD_FILES+=usr/include/g++/parsestream.h +OLD_FILES+=usr/include/g++/pfstream.h +OLD_FILES+=usr/include/g++/procbuf.h +OLD_FILES+=usr/include/g++/pthread_alloc +OLD_FILES+=usr/include/g++/pthread_alloc.h +OLD_FILES+=usr/include/g++/queue +OLD_FILES+=usr/include/g++/rope +OLD_FILES+=usr/include/g++/rope.h +OLD_FILES+=usr/include/g++/ropeimpl.h +OLD_FILES+=usr/include/g++/set +OLD_FILES+=usr/include/g++/set.h +OLD_FILES+=usr/include/g++/slist +OLD_FILES+=usr/include/g++/slist.h +OLD_FILES+=usr/include/g++/sstream +OLD_FILES+=usr/include/g++/stack +OLD_FILES+=usr/include/g++/stack.h +OLD_FILES+=usr/include/g++/std/bastring.cc +OLD_FILES+=usr/include/g++/std/bastring.h +OLD_FILES+=usr/include/g++/std/complext.cc +OLD_FILES+=usr/include/g++/std/complext.h +OLD_FILES+=usr/include/g++/std/dcomplex.h +OLD_FILES+=usr/include/g++/std/fcomplex.h +OLD_FILES+=usr/include/g++/std/gslice.h +OLD_FILES+=usr/include/g++/std/gslice_array.h +OLD_FILES+=usr/include/g++/std/indirect_array.h +OLD_FILES+=usr/include/g++/std/ldcomplex.h +OLD_FILES+=usr/include/g++/std/mask_array.h +OLD_FILES+=usr/include/g++/std/slice.h +OLD_FILES+=usr/include/g++/std/slice_array.h +OLD_FILES+=usr/include/g++/std/std_valarray.h +OLD_FILES+=usr/include/g++/std/straits.h +OLD_FILES+=usr/include/g++/std/valarray_array.h +OLD_FILES+=usr/include/g++/std/valarray_array.tcc +OLD_FILES+=usr/include/g++/std/valarray_meta.h +OLD_FILES+=usr/include/g++/stdexcept +OLD_FILES+=usr/include/g++/stdiostream.h +OLD_FILES+=usr/include/g++/stl.h +OLD_FILES+=usr/include/g++/stl_algo.h +OLD_FILES+=usr/include/g++/stl_algobase.h +OLD_FILES+=usr/include/g++/stl_alloc.h +OLD_FILES+=usr/include/g++/stl_bvector.h +OLD_FILES+=usr/include/g++/stl_config.h +OLD_FILES+=usr/include/g++/stl_construct.h +OLD_FILES+=usr/include/g++/stl_deque.h +OLD_FILES+=usr/include/g++/stl_function.h +OLD_FILES+=usr/include/g++/stl_hash_fun.h +OLD_FILES+=usr/include/g++/stl_hash_map.h +OLD_FILES+=usr/include/g++/stl_hash_set.h +OLD_FILES+=usr/include/g++/stl_hashtable.h +OLD_FILES+=usr/include/g++/stl_heap.h +OLD_FILES+=usr/include/g++/stl_iterator.h +OLD_FILES+=usr/include/g++/stl_list.h +OLD_FILES+=usr/include/g++/stl_map.h +OLD_FILES+=usr/include/g++/stl_multimap.h +OLD_FILES+=usr/include/g++/stl_multiset.h +OLD_FILES+=usr/include/g++/stl_numeric.h +OLD_FILES+=usr/include/g++/stl_pair.h +OLD_FILES+=usr/include/g++/stl_queue.h +OLD_FILES+=usr/include/g++/stl_raw_storage_iter.h +OLD_FILES+=usr/include/g++/stl_relops.h +OLD_FILES+=usr/include/g++/stl_rope.h +OLD_FILES+=usr/include/g++/stl_set.h +OLD_FILES+=usr/include/g++/stl_slist.h +OLD_FILES+=usr/include/g++/stl_stack.h +OLD_FILES+=usr/include/g++/stl_tempbuf.h +OLD_FILES+=usr/include/g++/stl_tree.h +OLD_FILES+=usr/include/g++/stl_uninitialized.h +OLD_FILES+=usr/include/g++/stl_vector.h +OLD_FILES+=usr/include/g++/stream.h +OLD_FILES+=usr/include/g++/streambuf.h +OLD_FILES+=usr/include/g++/strfile.h +OLD_FILES+=usr/include/g++/string +OLD_FILES+=usr/include/g++/strstream +OLD_FILES+=usr/include/g++/strstream.h +OLD_FILES+=usr/include/g++/tempbuf.h +OLD_FILES+=usr/include/g++/tree.h +OLD_FILES+=usr/include/g++/type_traits.h +OLD_FILES+=usr/include/g++/typeinfo +OLD_FILES+=usr/include/g++/utility +OLD_FILES+=usr/include/g++/valarray +OLD_FILES+=usr/include/g++/vector +OLD_FILES+=usr/include/g++/vector.h +OLD_FILES+=usr/include/gmp.h +OLD_FILES+=usr/include/isc/assertions.h +OLD_FILES+=usr/include/isc/ctl.h +OLD_FILES+=usr/include/isc/dst.h +OLD_FILES+=usr/include/isc/eventlib.h +OLD_FILES+=usr/include/isc/heap.h +OLD_FILES+=usr/include/isc/irpmarshall.h +OLD_FILES+=usr/include/isc/list.h +OLD_FILES+=usr/include/isc/logging.h +OLD_FILES+=usr/include/isc/memcluster.h +OLD_FILES+=usr/include/isc/misc.h +OLD_FILES+=usr/include/isc/tree.h +OLD_FILES+=usr/include/machine/ansi.h +OLD_FILES+=usr/include/machine/apic.h +OLD_FILES+=usr/include/machine/asc_ioctl.h +OLD_FILES+=usr/include/machine/asnames.h +OLD_FILES+=usr/include/machine/bus_at386.h +OLD_FILES+=usr/include/machine/bus_memio.h +OLD_FILES+=usr/include/machine/bus_pc98.h +OLD_FILES+=usr/include/machine/bus_pio.h +OLD_FILES+=usr/include/machine/cdk.h +OLD_FILES+=usr/include/machine/comstats.h +OLD_FILES+=usr/include/machine/console.h +OLD_FILES+=usr/include/machine/critical.h +OLD_FILES+=usr/include/machine/cronyx.h +OLD_FILES+=usr/include/machine/dvcfg.h +OLD_FILES+=usr/include/machine/globaldata.h +OLD_FILES+=usr/include/machine/globals.h +OLD_FILES+=usr/include/machine/gsc.h +OLD_FILES+=usr/include/machine/i4b_isppp.h +OLD_FILES+=usr/include/machine/if_wavelan_ieee.h +OLD_FILES+=usr/include/machine/iic.h +OLD_FILES+=usr/include/machine/ioctl_ctx.h +OLD_FILES+=usr/include/machine/ioctl_fd.h +OLD_FILES+=usr/include/machine/ipl.h +OLD_FILES+=usr/include/machine/lock.h +OLD_FILES+=usr/include/machine/mouse.h +OLD_FILES+=usr/include/machine/mpapic.h +OLD_FILES+=usr/include/machine/mtpr.h +OLD_FILES+=usr/include/machine/pc/msdos.h +OLD_FILES+=usr/include/machine/physio_proc.h +OLD_FILES+=usr/include/machine/smb.h +OLD_FILES+=usr/include/machine/spigot.h +OLD_FILES+=usr/include/machine/types.h +OLD_FILES+=usr/include/machine/uc_device.h +OLD_FILES+=usr/include/machine/ultrasound.h +OLD_FILES+=usr/include/machine/wtio.h +OLD_FILES+=usr/include/msdosfs/bootsect.h +OLD_FILES+=usr/include/msdosfs/bpb.h +OLD_FILES+=usr/include/msdosfs/denode.h +OLD_FILES+=usr/include/msdosfs/direntry.h +OLD_FILES+=usr/include/msdosfs/fat.h +OLD_FILES+=usr/include/msdosfs/msdosfsmount.h +OLD_FILES+=usr/include/net/hostcache.h +OLD_FILES+=usr/include/net/if_faith.h +OLD_FILES+=usr/include/net/if_ieee80211.h +OLD_FILES+=usr/include/net/if_tunvar.h +OLD_FILES+=usr/include/net/intrq.h +OLD_FILES+=usr/include/netatm/kern_include.h +OLD_FILES+=usr/include/netinet/if_fddi.h +OLD_FILES+=usr/include/netinet/in_hostcache.h +OLD_FILES+=usr/include/netinet/ip_flow.h +OLD_FILES+=usr/include/netinet/ip_fw2.h +OLD_FILES+=usr/include/netinet6/in6_prefix.h +OLD_FILES+=usr/include/netns/idp.h +OLD_FILES+=usr/include/netns/idp_var.h +OLD_FILES+=usr/include/netns/ns.h +OLD_FILES+=usr/include/netns/ns_error.h +OLD_FILES+=usr/include/netns/ns_if.h +OLD_FILES+=usr/include/netns/ns_pcb.h +OLD_FILES+=usr/include/netns/sp.h +OLD_FILES+=usr/include/netns/spidp.h +OLD_FILES+=usr/include/netns/spp_debug.h +OLD_FILES+=usr/include/netns/spp_timer.h +OLD_FILES+=usr/include/netns/spp_var.h +OLD_FILES+=usr/include/nfs/krpc.h +OLD_FILES+=usr/include/nfs/nfs.h +OLD_FILES+=usr/include/nfs/nfsdiskless.h +OLD_FILES+=usr/include/nfs/nfsm_subs.h +OLD_FILES+=usr/include/nfs/nfsmount.h +OLD_FILES+=usr/include/nfs/nfsnode.h +OLD_FILES+=usr/include/nfs/nfsrtt.h +OLD_FILES+=usr/include/nfs/nfsrvcache.h +OLD_FILES+=usr/include/nfs/nfsv2.h +OLD_FILES+=usr/include/nfs/nqnfs.h +OLD_FILES+=usr/include/ntfs/ntfs.h +OLD_FILES+=usr/include/ntfs/ntfs_compr.h +OLD_FILES+=usr/include/ntfs/ntfs_ihash.h +OLD_FILES+=usr/include/ntfs/ntfs_inode.h +OLD_FILES+=usr/include/ntfs/ntfs_subr.h +OLD_FILES+=usr/include/ntfs/ntfs_vfsops.h +OLD_FILES+=usr/include/ntfs/ntfsmount.h +OLD_FILES+=usr/include/nwfs/nwfs.h +OLD_FILES+=usr/include/nwfs/nwfs_mount.h +OLD_FILES+=usr/include/nwfs/nwfs_node.h +OLD_FILES+=usr/include/nwfs/nwfs_subr.h +OLD_FILES+=usr/include/posix4/aio.h +OLD_FILES+=usr/include/rune.h +OLD_FILES+=usr/include/security/_pam_compat.h +OLD_FILES+=usr/include/security/_pam_macros.h +OLD_FILES+=usr/include/security/_pam_types.h +OLD_FILES+=usr/include/security/pam_malloc.h +OLD_FILES+=usr/include/security/pam_misc.h +OLD_FILES+=usr/include/skey.h +OLD_FILES+=usr/include/strhash.h +OLD_FILES+=usr/include/struct.h +OLD_FILES+=usr/include/sys/_posix.h +OLD_FILES+=usr/include/sys/bus_private.h +OLD_FILES+=usr/include/sys/ccdvar.h +OLD_FILES+=usr/include/sys/diskslice.h +OLD_FILES+=usr/include/sys/dmap.h +OLD_FILES+=usr/include/sys/inttypes.h +OLD_FILES+=usr/include/sys/jumbo.h +OLD_FILES+=usr/include/sys/pbioio.h +OLD_FILES+=usr/include/sys/syscall-hide.h +OLD_FILES+=usr/include/sys/tprintf.h +OLD_FILES+=usr/include/sys/vnioctl.h +OLD_FILES+=usr/include/sys/wormio.h +OLD_FILES+=usr/include/telnet.h +OLD_FILES+=usr/include/ufs/mfs/mfs_extern.h +OLD_FILES+=usr/include/ufs/mfs/mfsnode.h +OLD_FILES+=usr/include/values.h +OLD_FILES+=usr/include/vm/vm_zone.h OLD_FILES+=usr/share/examples/etc/usbd.conf OLD_FILES+=usr/share/examples/meteor/README OLD_FILES+=usr/share/examples/meteor/rgb16.c @@ -3220,5 +3564,14 @@ OLD_DIRS+=usr/share/doc/bind/html OLD_DIRS+=usr/share/doc/bind/misc OLD_DIRS+=usr/share/doc/bind/ +# ??? +OLD_DIRS+=usr/include/g++/std +OLD_DIRS+=usr/include/msdosfs +OLD_DIRS+=usr/include/ntfs +OLD_DIRS+=usr/include/nwfs +OLD_DIRS+=usr/include/ufs/mfs +# 20011001: UUCP migration to ports +OLD_DIRS+=usr/libexec/uucp + .include "tools/build/mk/OptionalObsoleteFiles.inc" ==== //depot/projects/arm/src/UPDATING#9 (text+ko) ==== @@ -21,6 +21,35 @@ developers choose to disable these features on build machines to maximize performance. +20061205: + The removal of several facets of the experimental Threading + system from the kernel means that the proc and thread structures >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 7 17:51:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4894016A50A; Thu, 7 Dec 2006 17:51:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1206716A403; Thu, 7 Dec 2006 17:51:39 +0000 (UTC) (envelope-from flag@newluxor.wired.org) Received: from mail.oltrelinux.com (krisma.oltrelinux.com [194.242.226.43]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10C8343D8D; Thu, 7 Dec 2006 17:48:43 +0000 (GMT) (envelope-from flag@newluxor.wired.org) Received: from newluxor.wired.org (ip-64-88.sn2.eutelia.it [83.211.64.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.oltrelinux.com (Postfix) with ESMTP id 7096811AE56; Thu, 7 Dec 2006 18:49:22 +0100 (CET) Received: (from flag@localhost) by newluxor.wired.org (8.13.8/8.13.8/Submit) id kB7HnIE9002952; Thu, 7 Dec 2006 18:49:18 +0100 (CET) (envelope-from flag) Date: Thu, 7 Dec 2006 18:49:13 +0100 From: Paolo Pisati To: Robert Watson Message-ID: <20061207174913.GB1195@tin.it> References: <200612062319.kB6NJgsq031755@repoman.freebsd.org> <20061207110225.GU32700@FreeBSD.org> <4578070A.2030609@freebsd.org> <20061207142254.GA1195@tin.it> <20061207161434.O50906@fledge.watson.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20061207161434.O50906@fledge.watson.org> User-Agent: Mutt/1.4.2.2i X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at krisma.oltrelinux.com Cc: Perforce Change Reviews , Gleb Smirnoff , Andre Oppermann , Paolo Pisati Subject: Re: PERFORCE change 111230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 17:51:39 -0000 On Thu, Dec 07, 2006 at 04:16:41PM +0000, Robert Watson wrote: > On Thu, 7 Dec 2006, Paolo Pisati wrote: > > >Then, after a discussion on irc, pull the plug on any present (and future) > >hackery & half-baked solution, and declare in kernel libalias incompatible > >with tso. > > This seems silly -- why is it not compatible? Because libalias expects a pkt into a contiguous piece of memory, and to achieve this we previously do a pullup of the entire pkt into an mbuf cluster. This worked fine until libalias met a tso capable nic, and i did a 'cvsup' on that box: TSO created pkts bigger than 2k, the pullup function couldn't handle them and pkts were silently discarded. The real solution here is to make libalias use mbuf chain, but i wanted this code to enter the tree without any further delay, and thus libalias was declared incompatible with tso. bye -- Paolo Piso's first law: nothing works as expected! From owner-p4-projects@FreeBSD.ORG Thu Dec 7 17:52:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E15B16A47B; Thu, 7 Dec 2006 17:52:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BCC0F16A50E; Thu, 7 Dec 2006 17:52:08 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.176.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C34343D36; Thu, 7 Dec 2006 17:49:13 +0000 (GMT) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (localhost [127.0.0.1]) by eva.fit.vutbr.cz (envelope-from xdivac02@eva.fit.vutbr.cz) (8.13.8/8.13.7) with ESMTP id kB7HnxAX033375 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 7 Dec 2006 18:49:59 +0100 (CET) Received: (from xdivac02@localhost) by eva.fit.vutbr.cz (8.13.8/8.13.3/Submit) id kB7HnvWb033371; Thu, 7 Dec 2006 18:49:57 +0100 (CET) Date: Thu, 7 Dec 2006 18:49:57 +0100 From: Divacky Roman To: Alexander Leidinger Message-ID: <20061207174957.GA32960@stud.fit.vutbr.cz> References: <200612061323.kB6DNgsn098612@repoman.freebsd.org> <20061207080829.1vs0y9xxwsc8kkck@webmail.leidinger.net> <20061207103755.GA38924@stud.fit.vutbr.cz> <20061207120127.119d4mylpckwwwsg@webmail.leidinger.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20061207120127.119d4mylpckwwwsg@webmail.leidinger.net> User-Agent: Mutt/1.4.2.2i X-Scanned-By: MIMEDefang 2.57 on 147.229.176.14 Cc: Roman Divacky , Perforce Change Reviews Subject: Re: PERFORCE change 111194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 17:52:09 -0000 On Thu, Dec 07, 2006 at 12:01:27PM +0100, Alexander Leidinger wrote: > Quoting Divacky Roman (from Thu, 7 Dec > 2006 11:37:55 +0100): > > >On Thu, Dec 07, 2006 at 08:08:29AM +0100, Alexander Leidinger wrote: > >>Quoting Roman Divacky (from Wed, 6 Dec 2006 > >>13:23:42 GMT): > >> > >>>http://perforce.freebsd.org/chv.cgi?CH=111194 > >>> > >>>Change 111194 by rdivacky@rdivacky_witten on 2006/12/06 13:23:04 > >>> > >>> Add an XXX comment about signal delivery in linux_exit_group. > >>> We currently ignore sending a signal if SIGNAL_EXIT_GROUP is set > >>> condition. We dont even implement this flag.... > >> > >>What about a printf in case the flag is set? This way we should notice > >>if it is used somewhere. We could also correlate this with application > >>misbehavior. > > > >we dont even implement the functionality of the flag. > > Yes, and to get a glue how important it is, we should print a message. you dont understand.. the flag is not passed in or something. its an internal thing. kernel sets that under some conditions... From owner-p4-projects@FreeBSD.ORG Thu Dec 7 19:33:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 137C916A416; Thu, 7 Dec 2006 19:33:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C614A16A407; Thu, 7 Dec 2006 19:32:59 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from redbull.bpaserver.net (redbullneu.bpaserver.net [213.198.78.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0225743CD1; Thu, 7 Dec 2006 19:32:00 +0000 (GMT) (envelope-from alexander@leidinger.net) Received: from outgoing.leidinger.net (p54A5DDEC.dip.t-dialin.net [84.165.221.236]) by redbull.bpaserver.net (Postfix) with ESMTP id C499C2E23B; Thu, 7 Dec 2006 20:32:50 +0100 (CET) Received: from webmail.leidinger.net (webmail.Leidinger.net [192.168.1.102]) by outgoing.leidinger.net (Postfix) with ESMTP id B432E5B4845; Thu, 7 Dec 2006 20:32:12 +0100 (CET) Received: (from www@localhost) by webmail.leidinger.net (8.13.8/8.13.8/Submit) id kB7JWC48037291; Thu, 7 Dec 2006 20:32:12 +0100 (CET) (envelope-from Alexander@Leidinger.net) Received: from proxy.Leidinger.net (proxy.Leidinger.net [192.168.1.103]) by webmail.leidinger.net (Horde MIME library) with HTTP; Thu, 07 Dec 2006 20:32:12 +0100 Message-ID: <20061207203212.o4ygxr3klc0g44sw@webmail.leidinger.net> X-Priority: 3 (Normal) Date: Thu, 07 Dec 2006 20:32:12 +0100 From: Alexander Leidinger To: Divacky Roman References: <200612061323.kB6DNgsn098612@repoman.freebsd.org> <20061207080829.1vs0y9xxwsc8kkck@webmail.leidinger.net> <20061207103755.GA38924@stud.fit.vutbr.cz> <20061207120127.119d4mylpckwwwsg@webmail.leidinger.net> <20061207174957.GA32960@stud.fit.vutbr.cz> In-Reply-To: <20061207174957.GA32960@stud.fit.vutbr.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable User-Agent: Internet Messaging Program (IMP) H3 (4.1.3) / FreeBSD-7.0 X-BPAnet-MailScanner-Information: Please contact the ISP for more information X-BPAnet-MailScanner: Found to be clean X-BPAnet-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-14.864, required 6, autolearn=not spam, BAYES_00 -15.00, DK_POLICY_SIGNSOME 0.00, FORGED_RCVD_HELO 0.14) X-BPAnet-MailScanner-From: alexander@leidinger.net X-Spam-Status: No Cc: Roman Divacky , Perforce Change Reviews Subject: Re: PERFORCE change 111194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 19:33:00 -0000 Quoting Divacky Roman (from Thu, 7 Dec =20 2006 18:49:57 +0100): > On Thu, Dec 07, 2006 at 12:01:27PM +0100, Alexander Leidinger wrote: >> Quoting Divacky Roman (from Thu, 7 Dec >> 2006 11:37:55 +0100): >> >> >On Thu, Dec 07, 2006 at 08:08:29AM +0100, Alexander Leidinger wrote: >> >>Quoting Roman Divacky (from Wed, 6 Dec 2006 >> >>13:23:42 GMT): >> >> >> >>>http://perforce.freebsd.org/chv.cgi?CH=3D111194 >> >>> >> >>>Change 111194 by rdivacky@rdivacky_witten on 2006/12/06 13:23:04 >> >>> >> >>>=09Add an XXX comment about signal delivery in linux_exit_group. >> >>>=09We currently ignore sending a signal if SIGNAL_EXIT_GROUP is set >> >>>=09condition. We dont even implement this flag.... >> >> >> >>What about a printf in case the flag is set? This way we should notice >> >>if it is used somewhere. We could also correlate this with application >> >>misbehavior. >> > >> >we dont even implement the functionality of the flag. >> >> Yes, and to get a glue how important it is, we should print a message. > > you dont understand.. the flag is not passed in or something. its an > internal thing. kernel sets that under some conditions... I thought this is passed in somewhere... are you sure? This is not =20 related to the failure in the abort01/kill11 test? Bye, Alexander. --=20 Hlade's Law: =09If you have a difficult task, give it to a lazy person -- =09they will find an easier way to do it. http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID =3D B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID =3D 72077137 From owner-p4-projects@FreeBSD.ORG Thu Dec 7 20:20:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6456916A4CE; Thu, 7 Dec 2006 20:20:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1602E16A492 for ; Thu, 7 Dec 2006 20:20:26 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC8C143CCE for ; Thu, 7 Dec 2006 20:18:56 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB7KJoWQ049558 for ; Thu, 7 Dec 2006 20:19:50 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB7KJnQK049555 for perforce@freebsd.org; Thu, 7 Dec 2006 20:19:49 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 7 Dec 2006 20:19:49 GMT Message-Id: <200612072019.kB7KJnQK049555@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111257 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 20:20:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=111257 Change 111257 by zec@zec_tca51 on 2006/12/07 20:19:28 Virtualize tcp_syncache. Affected files ... .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#6 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#4 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#1 add .. //depot/projects/vimage/src/sys/netinet/vinet.h#4 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#6 (text+ko) ==== @@ -387,6 +387,7 @@ #undef TCP_MINPROTOHDR tcp_timer_init(); + syncache_init(); tcp_hc_init(); #ifdef VIMAGE @@ -394,7 +395,6 @@ return; #endif - syncache_init(); tcp_reass_init(); ISN_LOCK_INIT(); callout_init(&isn_callout, CALLOUT_MPSAFE); ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#4 (text+ko) ==== @@ -79,6 +79,7 @@ #include #include #include +#include #ifdef INET6 #include #endif @@ -112,51 +113,6 @@ &tcp_syncookiesonly, 0, "Use only TCP SYN cookies"); -#define SYNCOOKIE_SECRET_SIZE 8 /* dwords */ -#define SYNCOOKIE_LIFETIME 16 /* seconds */ - -struct syncache { - TAILQ_ENTRY(syncache) sc_hash; - struct in_conninfo sc_inc; /* addresses */ - u_long sc_rxttime; /* retransmit time */ - u_int16_t sc_rxmits; /* retransmit counter */ - - u_int32_t sc_tsreflect; /* timestamp to reflect */ - u_int32_t sc_ts; /* our timestamp to send */ - u_int32_t sc_tsoff; /* ts offset w/ syncookies */ - u_int32_t sc_flowlabel; /* IPv6 flowlabel */ - tcp_seq sc_irs; /* seq from peer */ - tcp_seq sc_iss; /* our ISS */ - struct mbuf *sc_ipopts; /* source route */ - - u_int16_t sc_peer_mss; /* peer's MSS */ - u_int16_t sc_wnd; /* advertised window */ - u_int8_t sc_ip_ttl; /* IPv4 TTL */ - u_int8_t sc_ip_tos; /* IPv4 TOS */ - u_int8_t sc_requested_s_scale:4, - sc_requested_r_scale:4; - u_int8_t sc_flags; -#define SCF_NOOPT 0x01 /* no TCP options */ -#define SCF_WINSCALE 0x02 /* negotiated window scaling */ -#define SCF_TIMESTAMP 0x04 /* negotiated timestamps */ - /* MSS is implicit */ -#define SCF_UNREACH 0x10 /* icmp unreachable received */ -#define SCF_SIGNATURE 0x20 /* send MD5 digests */ -#define SCF_SACK 0x80 /* send SACK option */ -}; - -struct syncache_head { - struct mtx sch_mtx; - TAILQ_HEAD(sch_head, syncache) sch_bucket; - struct callout sch_timer; - int sch_nextc; - u_int sch_length; - u_int sch_oddeven; - u_int32_t sch_secbits_odd[SYNCOOKIE_SECRET_SIZE]; - u_int32_t sch_secbits_even[SYNCOOKIE_SECRET_SIZE]; - u_int sch_reseed; /* time_uptime, seconds */ -}; - static void syncache_drop(struct syncache *, struct syncache_head *); static void syncache_free(struct syncache *); static void syncache_insert(struct syncache *, struct syncache_head *); @@ -183,46 +139,42 @@ #define TCP_SYNCACHE_HASHSIZE 512 #define TCP_SYNCACHE_BUCKETLIMIT 30 -struct tcp_syncache { - struct syncache_head *hashbase; - uma_zone_t zone; - u_int hashsize; - u_int hashmask; - u_int bucket_limit; - u_int cache_count; /* XXX: unprotected */ - u_int cache_limit; - u_int rexmt_limit; - u_int hash_secret; -}; +#ifndef VIMAGE static struct tcp_syncache tcp_syncache; +#endif SYSCTL_NODE(_net_inet_tcp, OID_AUTO, syncache, CTLFLAG_RW, 0, "TCP SYN cache"); -SYSCTL_INT(_net_inet_tcp_syncache, OID_AUTO, bucketlimit, CTLFLAG_RDTUN, - &tcp_syncache.bucket_limit, 0, "Per-bucket hash limit for syncache"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_syncache, OID_AUTO, + bucketlimit, CTLFLAG_RDTUN, + tcp_syncache.bucket_limit, 0, "Per-bucket hash limit for syncache"); -SYSCTL_INT(_net_inet_tcp_syncache, OID_AUTO, cachelimit, CTLFLAG_RDTUN, - &tcp_syncache.cache_limit, 0, "Overall entry limit for syncache"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_syncache, OID_AUTO, + cachelimit, CTLFLAG_RDTUN, + tcp_syncache.cache_limit, 0, "Overall entry limit for syncache"); -SYSCTL_INT(_net_inet_tcp_syncache, OID_AUTO, count, CTLFLAG_RD, - &tcp_syncache.cache_count, 0, "Current number of entries in syncache"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_syncache, OID_AUTO, + count, CTLFLAG_RD, + tcp_syncache.cache_count, 0, "Current number of entries in syncache"); -SYSCTL_INT(_net_inet_tcp_syncache, OID_AUTO, hashsize, CTLFLAG_RDTUN, - &tcp_syncache.hashsize, 0, "Size of TCP syncache hashtable"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_syncache, OID_AUTO, + hashsize, CTLFLAG_RDTUN, + tcp_syncache.hashsize, 0, "Size of TCP syncache hashtable"); -SYSCTL_INT(_net_inet_tcp_syncache, OID_AUTO, rexmtlimit, CTLFLAG_RW, - &tcp_syncache.rexmt_limit, 0, "Limit on SYN/ACK retransmissions"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_syncache, OID_AUTO, + rexmtlimit, CTLFLAG_RW, + tcp_syncache.rexmt_limit, 0, "Limit on SYN/ACK retransmissions"); static MALLOC_DEFINE(M_SYNCACHE, "syncache", "TCP syncache"); #define SYNCACHE_HASH(inc, mask) \ - ((tcp_syncache.hash_secret ^ \ + ((V_tcp_syncache.hash_secret ^ \ (inc)->inc_faddr.s_addr ^ \ ((inc)->inc_faddr.s_addr >> 16) ^ \ (inc)->inc_fport ^ (inc)->inc_lport) & mask) #define SYNCACHE_HASH6(inc, mask) \ - ((tcp_syncache.hash_secret ^ \ + ((V_tcp_syncache.hash_secret ^ \ (inc)->inc6_faddr.s6_addr32[0] ^ \ (inc)->inc6_faddr.s6_addr32[3] ^ \ (inc)->inc_fport ^ (inc)->inc_lport) & mask) @@ -258,58 +210,66 @@ static void syncache_free(struct syncache *sc) { + INIT_VNET_INET(curvnetb); + if (sc->sc_ipopts) (void) m_free(sc->sc_ipopts); - uma_zfree(tcp_syncache.zone, sc); + uma_zfree(V_tcp_syncache.zone, sc); } void syncache_init(void) { + INIT_VNET_INET(curvnetb); int i; - tcp_syncache.cache_count = 0; - tcp_syncache.hashsize = TCP_SYNCACHE_HASHSIZE; - tcp_syncache.bucket_limit = TCP_SYNCACHE_BUCKETLIMIT; - tcp_syncache.rexmt_limit = SYNCACHE_MAXREXMTS; - tcp_syncache.hash_secret = arc4random(); + V_tcp_syncache.cache_count = 0; + V_tcp_syncache.hashsize = TCP_SYNCACHE_HASHSIZE; + V_tcp_syncache.bucket_limit = TCP_SYNCACHE_BUCKETLIMIT; + V_tcp_syncache.rexmt_limit = SYNCACHE_MAXREXMTS; + V_tcp_syncache.hash_secret = arc4random(); TUNABLE_INT_FETCH("net.inet.tcp.syncache.hashsize", - &tcp_syncache.hashsize); + &V_tcp_syncache.hashsize); TUNABLE_INT_FETCH("net.inet.tcp.syncache.bucketlimit", - &tcp_syncache.bucket_limit); - if (!powerof2(tcp_syncache.hashsize) || tcp_syncache.hashsize == 0) { + &V_tcp_syncache.bucket_limit); + if (!powerof2(V_tcp_syncache.hashsize) || + V_tcp_syncache.hashsize == 0) { printf("WARNING: syncache hash size is not a power of 2.\n"); - tcp_syncache.hashsize = TCP_SYNCACHE_HASHSIZE; + V_tcp_syncache.hashsize = TCP_SYNCACHE_HASHSIZE; } - tcp_syncache.hashmask = tcp_syncache.hashsize - 1; + V_tcp_syncache.hashmask = V_tcp_syncache.hashsize - 1; /* Set limits. */ - tcp_syncache.cache_limit = - tcp_syncache.hashsize * tcp_syncache.bucket_limit; + V_tcp_syncache.cache_limit = + V_tcp_syncache.hashsize * V_tcp_syncache.bucket_limit; TUNABLE_INT_FETCH("net.inet.tcp.syncache.cachelimit", - &tcp_syncache.cache_limit); + &V_tcp_syncache.cache_limit); /* Allocate the hash table. */ - MALLOC(tcp_syncache.hashbase, struct syncache_head *, - tcp_syncache.hashsize * sizeof(struct syncache_head), + MALLOC(V_tcp_syncache.hashbase, struct syncache_head *, + V_tcp_syncache.hashsize * sizeof(struct syncache_head), M_SYNCACHE, M_WAITOK | M_ZERO); /* Initialize the hash buckets. */ - for (i = 0; i < tcp_syncache.hashsize; i++) { - TAILQ_INIT(&tcp_syncache.hashbase[i].sch_bucket); - mtx_init(&tcp_syncache.hashbase[i].sch_mtx, "tcp_sc_head", + for (i = 0; i < V_tcp_syncache.hashsize; i++) { +#ifdef VIMAGE + V_tcp_syncache.hashbase[i].sch_vnetb = curvnetb; +#endif + TAILQ_INIT(&V_tcp_syncache.hashbase[i].sch_bucket); + mtx_init(&V_tcp_syncache.hashbase[i].sch_mtx, "tcp_sc_head", NULL, MTX_DEF); - callout_init_mtx(&tcp_syncache.hashbase[i].sch_timer, - &tcp_syncache.hashbase[i].sch_mtx, 0); - tcp_syncache.hashbase[i].sch_length = 0; + callout_init_mtx(&V_tcp_syncache.hashbase[i].sch_timer, + &V_tcp_syncache.hashbase[i].sch_mtx, 0); + V_tcp_syncache.hashbase[i].sch_length = 0; } /* Create the syncache entry zone. */ - tcp_syncache.zone = uma_zcreate("syncache", sizeof(struct syncache), + /* XXX one zone for all vnets should do fine - revisit!!! */ + V_tcp_syncache.zone = uma_zcreate("syncache", sizeof(struct syncache), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); - uma_zone_set_max(tcp_syncache.zone, tcp_syncache.cache_limit); + uma_zone_set_max(V_tcp_syncache.zone, V_tcp_syncache.cache_limit); } /* @@ -319,7 +279,7 @@ static void syncache_insert(struct syncache *sc, struct syncache_head *sch) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(sch->sch_vnetb); struct syncache *sc2; SCH_LOCK(sch); @@ -328,7 +288,7 @@ * Make sure that we don't overflow the per-bucket limit. * If the bucket is full, toss the oldest element. */ - if (sch->sch_length >= tcp_syncache.bucket_limit) { + if (sch->sch_length >= V_tcp_syncache.bucket_limit) { KASSERT(!TAILQ_EMPTY(&sch->sch_bucket), ("sch->sch_length incorrect")); sc2 = TAILQ_LAST(&sch->sch_bucket, sch_head); @@ -345,7 +305,7 @@ SCH_UNLOCK(sch); - tcp_syncache.cache_count++; + V_tcp_syncache.cache_count++; V_tcpstat.tcps_sc_added++; } @@ -356,6 +316,7 @@ static void syncache_drop(struct syncache *sc, struct syncache_head *sch) { + INIT_VNET_INET(sch->sch_vnetb); SCH_LOCK_ASSERT(sch); @@ -363,7 +324,7 @@ sch->sch_length--; syncache_free(sc); - tcp_syncache.cache_count--; + V_tcp_syncache.cache_count--; } /* @@ -374,10 +335,10 @@ static void syncache_timer(void *xsch) { - INIT_VNET_INET(curvnetb); /* XXX this can't work !!! */ struct syncache_head *sch = (struct syncache_head *)xsch; struct syncache *sc, *nsc; int tick = ticks; + INIT_VNET_INET(sch->sch_vnetb); /* NB: syncache_head has already been locked by the callout. */ SCH_LOCK_ASSERT(sch); @@ -397,7 +358,7 @@ continue; } - if (sc->sc_rxmits > tcp_syncache.rexmt_limit) { + if (sc->sc_rxmits > V_tcp_syncache.rexmt_limit) { syncache_drop(sc, sch); V_tcpstat.tcps_sc_stale++; continue; @@ -419,13 +380,14 @@ struct syncache * syncache_lookup(struct in_conninfo *inc, struct syncache_head **schp) { + INIT_VNET_INET(curvnetb); struct syncache *sc; struct syncache_head *sch; #ifdef INET6 if (inc->inc_isipv6) { - sch = &tcp_syncache.hashbase[ - SYNCACHE_HASH6(inc, tcp_syncache.hashmask)]; + sch = &V_tcp_syncache.hashbase[ + SYNCACHE_HASH6(inc, V_tcp_syncache.hashmask)]; *schp = sch; SCH_LOCK(sch); @@ -438,8 +400,8 @@ } else #endif { - sch = &tcp_syncache.hashbase[ - SYNCACHE_HASH(inc, tcp_syncache.hashmask)]; + sch = &V_tcp_syncache.hashbase[ + SYNCACHE_HASH(inc, V_tcp_syncache.hashmask)]; *schp = sch; SCH_LOCK(sch); @@ -795,7 +757,7 @@ /* Pull out the entry to unlock the bucket row. */ TAILQ_REMOVE(&sch->sch_bucket, sc, sc_hash); sch->sch_length--; - tcp_syncache.cache_count--; + V_tcp_syncache.cache_count--; SCH_UNLOCK(sch); } @@ -933,7 +895,7 @@ goto done; } - sc = uma_zalloc(tcp_syncache.zone, M_NOWAIT | M_ZERO); + sc = uma_zalloc(V_tcp_syncache.zone, M_NOWAIT | M_ZERO); if (sc == NULL) { /* * The zone allocator couldn't provide more entries. @@ -943,7 +905,7 @@ V_tcpstat.tcps_sc_zonefail++; sc = TAILQ_LAST(&sch->sch_bucket, sch_head); syncache_drop(sc, sch); - sc = uma_zalloc(tcp_syncache.zone, M_NOWAIT | M_ZERO); + sc = uma_zalloc(V_tcp_syncache.zone, M_NOWAIT | M_ZERO); if (sc == NULL) { if (tcp_syncookies) { bzero(&scs, sizeof(scs)); ==== //depot/projects/vimage/src/sys/netinet/vinet.h#4 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include #include +#include #include #include @@ -68,6 +69,7 @@ struct tcpstat _tcpstat; /* tcp statistics */ TAILQ_HEAD(, tcptw) _twq_2msl; struct tcp_hostcache _tcp_hostcache; + struct tcp_syncache _tcp_syncache; struct inpcbhead _udb; struct inpcbinfo _udbinfo; @@ -113,6 +115,7 @@ #define V_tcpstat VNET_INET(tcpstat) #define V_twq_2msl VNET_INET(twq_2msl) #define V_tcp_hostcache VNET_INET(tcp_hostcache) +#define V_tcp_syncache VNET_INET(tcp_syncache) #define V_udb VNET_INET(udb) #define V_udbinfo VNET_INET(udbinfo) From owner-p4-projects@FreeBSD.ORG Thu Dec 7 22:00:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7496816A417; Thu, 7 Dec 2006 22:00:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 048B016A415 for ; Thu, 7 Dec 2006 22:00:05 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C04043CC1 for ; Thu, 7 Dec 2006 21:59:09 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB7M03Km074313 for ; Thu, 7 Dec 2006 22:00:03 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB7M022A074310 for perforce@freebsd.org; Thu, 7 Dec 2006 22:00:02 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 7 Dec 2006 22:00:02 GMT Message-Id: <200612072200.kB7M022A074310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 22:00:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=111260 Change 111260 by mjacob@newisp on 2006/12/07 21:59:19 Err, ahem, don't bounce a card just because it supports LAN or Logical Bus protocol. Affected files ... .. //depot/projects/newisp/dev/mpt/mpt.c#7 edit Differences ... ==== //depot/projects/newisp/dev/mpt/mpt.c#7 (text+ko) ==== @@ -2519,16 +2519,6 @@ return (ENXIO); } - if (pfp->ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LAN) { - mpt_prt(mpt, "not supporting LAN protocol\n"); - return (ENXIO); - } - - if (pfp->ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LOGBUSADDR) { - mpt_prt(mpt, "not supporting Logical Bus Address protocol\n"); - return (ENXIO); - } - /* * Set our role with what this port supports. * From owner-p4-projects@FreeBSD.ORG Thu Dec 7 22:01:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B67D16A47C; Thu, 7 Dec 2006 22:01:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 00FC616A403 for ; Thu, 7 Dec 2006 22:01:08 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28C0543CAE for ; Thu, 7 Dec 2006 22:00:11 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB7M14If074426 for ; Thu, 7 Dec 2006 22:01:04 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB7M14ja074423 for perforce@freebsd.org; Thu, 7 Dec 2006 22:01:04 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 7 Dec 2006 22:01:04 GMT Message-Id: <200612072201.kB7M14ja074423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 22:01:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=111261 Change 111261 by mjacob@newisp on 2006/12/07 22:00:04 *Cough* - put back tagged command support for SAS && FC cards. Affected files ... .. //depot/projects/newisp/dev/mpt/mpt_cam.c#20 edit Differences ... ==== //depot/projects/newisp/dev/mpt/mpt_cam.c#20 (text+ko) ==== @@ -3089,8 +3089,9 @@ break; } case XPT_GET_TRAN_SETTINGS: + { cts = &ccb->cts; - cts->protocol = PROTO_SCSI; + struct ccb_trans_settings_scsi *scsi; if (mpt->is_fc) { struct ccb_trans_settings_fc *fc = &cts->xport_specific.fc; @@ -3108,13 +3109,21 @@ cts->transport_version = 0; sas->valid = CTS_SAS_VALID_SPEED; sas->bitrate = 300000; - } else if (mpt_get_spi_settings(mpt, cts) != 0) { - mpt_set_ccb_status(ccb, CAM_REQ_CMP_ERR); + } else { + if (mpt_get_spi_settings(mpt, cts) != 0) { + mpt_set_ccb_status(ccb, CAM_REQ_CMP_ERR); + } else { + mpt_set_ccb_status(ccb, CAM_REQ_CMP); + } break; } + cts->protocol = PROTO_SCSI; + scsi = &cts->proto_specific.scsi; + scsi->valid = CTS_SCSI_VALID_TQ; + scsi->flags = CTS_SCSI_FLAGS_TAG_ENB; mpt_set_ccb_status(ccb, CAM_REQ_CMP); break; - + } case XPT_CALC_GEOMETRY: { struct ccb_calc_geometry *ccg; From owner-p4-projects@FreeBSD.ORG Thu Dec 7 23:52:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 454A316A628; Thu, 7 Dec 2006 23:52:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E3EA416A612 for ; Thu, 7 Dec 2006 23:52:57 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3A9643E90 for ; Thu, 7 Dec 2006 23:50:39 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB7NpQUW094573 for ; Thu, 7 Dec 2006 23:51:26 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB7NpQSM094564 for perforce@freebsd.org; Thu, 7 Dec 2006 23:51:26 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 7 Dec 2006 23:51:26 GMT Message-Id: <200612072351.kB7NpQSM094564@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 23:52:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=111266 Change 111266 by mjacob@newisp on 2006/12/07 23:51:25 PointyHat Endian Compile Goop. Affected files ... .. //depot/projects/newisp/conf/NOTES#15 edit .. //depot/projects/newisp/conf/options#9 edit .. //depot/projects/newisp/dev/mpt/mpt.c#8 edit .. //depot/projects/newisp/dev/mpt/mpt.h#9 edit .. //depot/projects/newisp/geom/stripe/g_stripe.c#3 edit .. //depot/projects/newisp/geom/stripe/g_stripe.h#2 edit Differences ... ==== //depot/projects/newisp/conf/NOTES#15 (text+ko) ==== @@ -110,6 +110,21 @@ # options BLKDEV_IOSIZE=8192 +# +# MAXPHYS and DFLTPHYS +# +# These are the max and default 'raw' I/O block device access sizes. +# Reads and writes will be split into DFLTPHYS chunks. Some applications +# have better performance with larger raw I/O access sizes. Typically +# MAXPHYS should be twice the size of DFLTPHYS. Note that certain VM +# parameters are derived from these values and making them too large +# can make an an unbootable kernel. +# +# The defaults are 64K and 128K respectively. +options DFLTPHYS=(64*1024) +options MAXPHYS=(128*1024) + + # Options for the VM subsystem # Deprecated options supported for backwards compatibility #options PQ_NOOPT # No coloring ==== //depot/projects/newisp/conf/options#9 (text+ko) ==== @@ -535,6 +535,8 @@ # These cause changes all over the kernel BLKDEV_IOSIZE opt_global.h +MAXPHYS opt_global.h +DFLTPHYS opt_global.h BURN_BRIDGES opt_global.h DEBUG opt_global.h DEBUG_LOCKS opt_global.h ==== //depot/projects/newisp/dev/mpt/mpt.c#8 (text+ko) ==== @@ -2611,8 +2611,9 @@ mpt2host_sge_simple_union(SGE_SIMPLE_UNION *sge) { MPT_2_HOST32(sge, FlagsLength); - MPT_2_HOST64(sge, u.Address64); -}; + MPT_2_HOST32(sge, u.Address64.Low); + MPT_2_HOST32(sge, u.Address64.High); +} void mpt2host_iocfacts_reply(MSG_IOC_FACTS_REPLY *rp) @@ -2664,7 +2665,7 @@ int i; ioc2->CapabilitiesFlags = htole32(ioc2->CapabilitiesFlags); for (i = 0; i < MPI_IOC_PAGE_2_RAID_VOLUME_MAX; i++) { - MPT_2_HOST16(ioc2->RaidVolume[i].Reserved3); + MPT_2_HOST16(ioc2, RaidVolume[i].Reserved3); } } @@ -2680,14 +2681,16 @@ MPT_2_HOST32(volp, Reserved2); MPT_2_HOST32(volp, Reserved3); for (i = 0; i < MPI_RAID_VOL_PAGE_0_PHYSDISK_MAX; i++) { - MPT_2_HOST16(volpd, PhysDisk[i].Reserved); + MPT_2_HOST16(volp, PhysDisk[i].Reserved); } } void mpt2host_mpi_raid_vol_indicator(MPI_RAID_VOL_INDICATOR *vi) { - MPT_2_HOST16(vi, TotalBlocks); - MPT_2_HOST16(vi, BlocksRemaining); + MPT_2_HOST16(vi, TotalBlocks.High); + MPT_2_HOST16(vi, TotalBlocks.Low); + MPT_2_HOST16(vi, BlocksRemaining.High); + MPT_2_HOST16(vi, BlocksRemaining.Low); } #endif ==== //depot/projects/newisp/dev/mpt/mpt.h#9 (text+ko) ==== @@ -283,20 +283,20 @@ #define HOST_2_MPT32(ptr, tag) ptr->tag = htole32(ptr->tag) #define HOST_2_MPT16(ptr, tag) ptr->tag = htole16(ptr->tag) -#if _BYTE_ORDER == _LITTLE_ENDIAN +#if _BYTE_ORDER == _BIG_ENDIAN +void mpt2host_sge_simple_union(SGE_SIMPLE_UNION *); +void mpt2host_iocfacts_reply(MSG_IOC_FACTS_REPLY *); +void mpt2host_portfacts_reply(MSG_PORT_FACTS_REPLY *); +void mpt2host_config_page_ioc2(CONFIG_PAGE_IOC_2 *); +void mpt2host_config_page_raid_vol_0(CONFIG_PAGE_RAID_VOL_0 *); +void mpt2host_mpi_raid_vol_indicator(MPI_RAID_VOL_INDICATOR *); +#else #define mpt2host_sge_simple_union(x) do { ; } while (0) #define mpt2host_iocfacts_reply(x) do { ; } while (0) #define mpt2host_portfacts_reply(x) do { ; } while (0) #define mpt2host_config_page_ioc2(x) do { ; } while (0) #define mpt2host_config_page_raid_vol_0(x) do { ; } while (0) #define mpt2host_mpi_raid_vol_indicator(x) do { ; } while (0) -#else -void mpt2host_sge_simple_union(SGE_SIMPLE_UNION *); -void mpt2host_iocfacts_reply(MSG_IOC_FACTS_REPLY *); -void mpt2host_portfacts_reply(MSG_PORT_FACTS_REPLY *); -void mpt2host_config_page_ioc2(CONFIG_PAGE_IOC_2 *); -void mpt2host_config_page_raid_vol_0(CONFIG_PAGE_RAID_VOL_0 *); -void mpt2host_mpi_raid_vol_indicator(MPI_RAID_VOL_INDICATOR *); #endif /**************************** MPI Transaction State ***************************/ ==== //depot/projects/newisp/geom/stripe/g_stripe.c#3 (text+ko) ==== @@ -839,6 +839,12 @@ gp->softc = sc; sc->sc_geom = gp; sc->sc_provider = NULL; + /* + * Create a devstat entry for this stripe (always unit zero). + * Sectorsize is system block size in this case. + */ + sc->sc_devstat = devstat_new_entry(md->md_name, 0, + 512 /* XXX WHICH DEFINE? XXXX */ , DEVSTAT_ALL_SUPPORTED, DEVSTAT_TYPE_DIRECT, DEVSTAT_PRIORITY_MAX); G_STRIPE_DEBUG(0, "Device %s created (id=%u).", sc->sc_name, sc->sc_id); @@ -880,6 +886,9 @@ KASSERT(sc->sc_provider == NULL, ("Provider still exists? (device=%s)", gp->name)); free(sc->sc_disks, M_STRIPE); + if (sc->sc_devstat) { + devstat_remove_entry(sc->sc_devstat); + } free(sc, M_STRIPE); pp = LIST_FIRST(&gp->provider); ==== //depot/projects/newisp/geom/stripe/g_stripe.h#2 (text+ko) ==== @@ -67,6 +67,7 @@ } \ } while (0) +struct devstat; struct g_stripe_softc { u_int sc_type; /* provider type */ struct g_geom *sc_geom; @@ -76,6 +77,7 @@ uint16_t sc_ndisks; uint32_t sc_stripesize; uint32_t sc_stripebits; + struct devstat *sc_devstat; }; #define sc_name sc_geom->name #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Fri Dec 8 00:05:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA36716A47E; Fri, 8 Dec 2006 00:05:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9D41416A526 for ; Fri, 8 Dec 2006 00:05:12 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8A6643DEF for ; Fri, 8 Dec 2006 00:03:50 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB804iao098152 for ; Fri, 8 Dec 2006 00:04:44 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB804i6o098149 for perforce@freebsd.org; Fri, 8 Dec 2006 00:04:44 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 8 Dec 2006 00:04:44 GMT Message-Id: <200612080004.kB804i6o098149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2006 00:05:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=111268 Change 111268 by mjacob@newisp on 2006/12/08 00:04:01 Undo the damage from an unintended commit. Affected files ... .. //depot/projects/newisp/conf/NOTES#16 edit .. //depot/projects/newisp/conf/options#10 edit .. //depot/projects/newisp/geom/stripe/g_stripe.c#4 edit .. //depot/projects/newisp/geom/stripe/g_stripe.h#3 edit Differences ... ==== //depot/projects/newisp/conf/NOTES#16 (text+ko) ==== @@ -110,21 +110,6 @@ # options BLKDEV_IOSIZE=8192 -# -# MAXPHYS and DFLTPHYS -# -# These are the max and default 'raw' I/O block device access sizes. -# Reads and writes will be split into DFLTPHYS chunks. Some applications -# have better performance with larger raw I/O access sizes. Typically -# MAXPHYS should be twice the size of DFLTPHYS. Note that certain VM -# parameters are derived from these values and making them too large -# can make an an unbootable kernel. -# -# The defaults are 64K and 128K respectively. -options DFLTPHYS=(64*1024) -options MAXPHYS=(128*1024) - - # Options for the VM subsystem # Deprecated options supported for backwards compatibility #options PQ_NOOPT # No coloring ==== //depot/projects/newisp/conf/options#10 (text+ko) ==== @@ -535,8 +535,6 @@ # These cause changes all over the kernel BLKDEV_IOSIZE opt_global.h -MAXPHYS opt_global.h -DFLTPHYS opt_global.h BURN_BRIDGES opt_global.h DEBUG opt_global.h DEBUG_LOCKS opt_global.h ==== //depot/projects/newisp/geom/stripe/g_stripe.c#4 (text+ko) ==== @@ -839,12 +839,6 @@ gp->softc = sc; sc->sc_geom = gp; sc->sc_provider = NULL; - /* - * Create a devstat entry for this stripe (always unit zero). - * Sectorsize is system block size in this case. - */ - sc->sc_devstat = devstat_new_entry(md->md_name, 0, - 512 /* XXX WHICH DEFINE? XXXX */ , DEVSTAT_ALL_SUPPORTED, DEVSTAT_TYPE_DIRECT, DEVSTAT_PRIORITY_MAX); G_STRIPE_DEBUG(0, "Device %s created (id=%u).", sc->sc_name, sc->sc_id); @@ -886,9 +880,6 @@ KASSERT(sc->sc_provider == NULL, ("Provider still exists? (device=%s)", gp->name)); free(sc->sc_disks, M_STRIPE); - if (sc->sc_devstat) { - devstat_remove_entry(sc->sc_devstat); - } free(sc, M_STRIPE); pp = LIST_FIRST(&gp->provider); ==== //depot/projects/newisp/geom/stripe/g_stripe.h#3 (text+ko) ==== @@ -67,7 +67,6 @@ } \ } while (0) -struct devstat; struct g_stripe_softc { u_int sc_type; /* provider type */ struct g_geom *sc_geom; @@ -77,7 +76,6 @@ uint16_t sc_ndisks; uint32_t sc_stripesize; uint32_t sc_stripebits; - struct devstat *sc_devstat; }; #define sc_name sc_geom->name #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Fri Dec 8 07:04:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0370116A417; Fri, 8 Dec 2006 07:04:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D36D716A415 for ; Fri, 8 Dec 2006 07:04:38 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6326243C9D for ; Fri, 8 Dec 2006 07:03:42 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB874cBL091496 for ; Fri, 8 Dec 2006 07:04:38 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB874cL3091493 for perforce@freebsd.org; Fri, 8 Dec 2006 07:04:38 GMT (envelope-from imp@freebsd.org) Date: Fri, 8 Dec 2006 07:04:38 GMT Message-Id: <200612080704.kB874cL3091493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111274 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2006 07:04:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=111274 Change 111274 by imp@imp_lighthouse on 2006/12/08 07:03:57 Put the candle back: add back the ifdef for TSC # Note: we need to likely transition to a board.h that defines things # more generically given the proliferation of designs in the wild. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#10 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Dec 8 09:24:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4438C16A417; Fri, 8 Dec 2006 09:24:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 05C4E16A407 for ; Fri, 8 Dec 2006 09:24:38 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id E78A643C9D for ; Fri, 8 Dec 2006 09:23:40 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB89ObUw026138 for ; Fri, 8 Dec 2006 09:24:37 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB89ObVk026135 for perforce@freebsd.org; Fri, 8 Dec 2006 09:24:37 GMT (envelope-from imp@freebsd.org) Date: Fri, 8 Dec 2006 09:24:37 GMT Message-Id: <200612080924.kB89ObVk026135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2006 09:24:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=111279 Change 111279 by imp@imp_lighthouse on 2006/12/08 09:24:13 Fix EMERGE Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#37 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#37 (text+ko) ==== @@ -342,11 +342,6 @@ break; } out:; - if (err) { - WR4(sc, TWI_CR, TWI_CR_STOP); - printf("Err is %d\n", err); - } -out:; if (err) WR4(sc, TWI_CR, TWI_CR_STOP); AT91_TWI_UNLOCK(sc); From owner-p4-projects@FreeBSD.ORG Fri Dec 8 09:24:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D96716A55E; Fri, 8 Dec 2006 09:24:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3A8D116A412 for ; Fri, 8 Dec 2006 09:24:38 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B5DC43CA7 for ; Fri, 8 Dec 2006 09:23:41 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB89ObG9026144 for ; Fri, 8 Dec 2006 09:24:37 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB89Obp6026141 for perforce@freebsd.org; Fri, 8 Dec 2006 09:24:37 GMT (envelope-from imp@freebsd.org) Date: Fri, 8 Dec 2006 09:24:37 GMT Message-Id: <200612080924.kB89Obp6026141@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2006 09:24:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=111280 Change 111280 by imp@imp_lighthouse on 2006/12/08 09:24:33 Fix comentary Affected files ... .. //depot/projects/arm/src/sys/arm/conf/TSC4370#18 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/TSC4370#18 (text+ko) ==== @@ -1,5 +1,4 @@ -# KB920X -- Custom kernel configuration for the KB9200, 9201 and 9202 -# AT91RM9200 evaluation boards from kwikbyte.com. +# TSC4370 -- Kernel # # For more information on this file, please read the handbook section on # Kernel Configuration Files: From owner-p4-projects@FreeBSD.ORG Fri Dec 8 09:25:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE7AE16A417; Fri, 8 Dec 2006 09:25:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B489516A40F for ; Fri, 8 Dec 2006 09:25:39 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB57B43CA2 for ; Fri, 8 Dec 2006 09:24:42 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB89Pdx2026273 for ; Fri, 8 Dec 2006 09:25:39 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB89PdPP026270 for perforce@freebsd.org; Fri, 8 Dec 2006 09:25:39 GMT (envelope-from imp@freebsd.org) Date: Fri, 8 Dec 2006 09:25:39 GMT Message-Id: <200612080925.kB89PdPP026270@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111281 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2006 09:25:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=111281 Change 111281 by imp@imp_lighthouse on 2006/12/08 09:25:16 Add icee part on kb9202 mobos. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KB920X#41 edit .. //depot/projects/arm/src/sys/arm/conf/KB920X.hints#1 add Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#41 (text+ko) ==== @@ -25,7 +25,7 @@ include "../at91/std.kb920x" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. -#hints "KB920X.hints" #Default places to look for devices. +hints "KB920X.hints" #Default places to look for devices. #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options DDB @@ -43,11 +43,12 @@ #options MD_ROOT #MD is a potential root device #options MD_ROOT_SIZE=4096 # 4MB ram disk #options ROOTDEVNAME=\"ufs:md0\" +options ROOTDEVNAME=\"ufs:mmcsd0s1a\" options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server -options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options BOOTP_NFSROOT -options BOOTP +#options NFS_ROOT #NFS usable as /, requires NFSCLIENT +#options BOOTP_NFSROOT +#options BOOTP #options MSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem @@ -91,10 +92,16 @@ device mem # Memory and kernel memory devices device md -device at91_twi # TWI: Two Wire Interface +device at91_tc device at91_spi # SPI: device spibus device at91_ssc # iic +device at91_twi # TWI: Two Wire Interface device iic device iicbus +device icee +# MMC/SD +device at91_mci +device mmc # mmc/sd bus +device mmcsd # mmc/sd flash cards From owner-p4-projects@FreeBSD.ORG Fri Dec 8 09:25:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 644F216A60D; Fri, 8 Dec 2006 09:25:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4174616A608 for ; Fri, 8 Dec 2006 09:25:40 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A8E843CA2 for ; Fri, 8 Dec 2006 09:24:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB89Pd1j026279 for ; Fri, 8 Dec 2006 09:25:39 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB89Pd52026276 for perforce@freebsd.org; Fri, 8 Dec 2006 09:25:39 GMT (envelope-from imp@freebsd.org) Date: Fri, 8 Dec 2006 09:25:39 GMT Message-Id: <200612080925.kB89Pd52026276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111282 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2006 09:25:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=111282 Change 111282 by imp@imp_lighthouse on 2006/12/08 09:25:32 Us a different magic number Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/kb920x_board.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/kb920x_board.c#7 (text+ko) ==== @@ -41,7 +41,7 @@ uint32_t sig; sig = 0; ReadEEPROM(12 * 1024, (uint8_t *)&sig, sizeof(sig)); - if (sig != 0xaa55aa55) + if (sig != 0x92021054) return; ReadEEPROM(12 * 1024 + 4, mac, 6); printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0], From owner-p4-projects@FreeBSD.ORG Fri Dec 8 12:07:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D39D016A503; Fri, 8 Dec 2006 12:07:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A3F4316A4FC for ; Fri, 8 Dec 2006 12:07:30 +0000 (UTC) (envelope-from pjd@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13CC243CD3 for ; Fri, 8 Dec 2006 12:06:07 +0000 (GMT) (envelope-from pjd@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB8C74do038907 for ; Fri, 8 Dec 2006 12:07:04 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB8C74hR038904 for perforce@freebsd.org; Fri, 8 Dec 2006 12:07:04 GMT (envelope-from pjd@freebsd.org) Date: Fri, 8 Dec 2006 12:07:04 GMT Message-Id: <200612081207.kB8C74hR038904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek To: Perforce Change Reviews Cc: Subject: PERFORCE change 111284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2006 12:07:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=111284 Change 111284 by pjd@pjd_anger on 2006/12/08 12:06:23 We need to pass static buffer to device_set_desc(). Affected files ... .. //depot/projects/crypto/sys/crypto/via/padlock.c#3 edit Differences ... ==== //depot/projects/crypto/sys/crypto/via/padlock.c#3 (text+ko) ==== @@ -80,7 +80,7 @@ static int padlock_probe(device_t dev) { - char capp[256]; + static char capp[256]; #if defined(__i386__) && !defined(PC98) /* If there is no AES support, we has nothing to do here. */ From owner-p4-projects@FreeBSD.ORG Fri Dec 8 13:39:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0415716A416; Fri, 8 Dec 2006 13:39:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C675016A412 for ; Fri, 8 Dec 2006 13:39:04 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DBD343CB0 for ; Fri, 8 Dec 2006 13:38:06 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB8Dd43B062302 for ; Fri, 8 Dec 2006 13:39:04 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB8Dd4Jk062299 for perforce@freebsd.org; Fri, 8 Dec 2006 13:39:04 GMT (envelope-from kevlo@freebsd.org) Date: Fri, 8 Dec 2006 13:39:04 GMT Message-Id: <200612081339.kB8Dd4Jk062299@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 111285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2006 13:39:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=111285 Change 111285 by kevlo@kevlo_rtsl on 2006/12/08 13:38:17 BCM43XX driver. Affected files ... .. //depot/projects/user/kevlo/bcw/src/sys/dev/bcw/bcw.c#1 add .. //depot/projects/user/kevlo/bcw/src/sys/dev/bcw/bcwreg.h#1 add .. //depot/projects/user/kevlo/bcw/src/sys/dev/bcw/bcwvar.h#1 add .. //depot/projects/user/kevlo/bcw/src/sys/dev/bcw/if_bcw_pci.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Dec 8 17:52:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAA6816A415; Fri, 8 Dec 2006 17:52:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AF66D16A403 for ; Fri, 8 Dec 2006 17:52:41 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7ECCE43CAE for ; Fri, 8 Dec 2006 17:51:42 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB8Hqfap017647 for ; Fri, 8 Dec 2006 17:52:41 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB8HqdWZ017635 for perforce@freebsd.org; Fri, 8 Dec 2006 17:52:39 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 8 Dec 2006 17:52:39 GMT Message-Id: <200612081752.kB8HqdWZ017635@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2006 17:52:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=111293 Change 111293 by mjacob@newisp on 2006/12/08 17:52:04 IFC Affected files ... .. //depot/projects/newisp/amd64/amd64/machdep.c#9 integrate .. //depot/projects/newisp/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/newisp/amd64/amd64/pmap.c#5 integrate .. //depot/projects/newisp/amd64/include/pmap.h#4 integrate .. //depot/projects/newisp/arm/at91/kb920x_machdep.c#6 integrate .. //depot/projects/newisp/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/newisp/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/newisp/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/newisp/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/newisp/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/newisp/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/newisp/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/newisp/ddb/db_ps.c#3 integrate .. //depot/projects/newisp/dev/bce/if_bce.c#10 integrate .. //depot/projects/newisp/dev/dc/if_dc.c#5 integrate .. //depot/projects/newisp/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/newisp/dev/firewire/fwdev.c#2 integrate .. //depot/projects/newisp/dev/gem/if_gem.c#3 integrate .. //depot/projects/newisp/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/newisp/dev/hme/if_hme.c#3 integrate .. //depot/projects/newisp/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/newisp/dev/ipmi/ipmi.c#5 integrate .. //depot/projects/newisp/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/newisp/dev/le/am7990.c#2 integrate .. //depot/projects/newisp/dev/le/am79900.c#2 integrate .. //depot/projects/newisp/dev/le/lance.c#2 integrate .. //depot/projects/newisp/dev/le/lancevar.h#2 integrate .. //depot/projects/newisp/dev/mpt/mpt.c#9 integrate .. //depot/projects/newisp/dev/mpt/mpt.h#10 integrate .. //depot/projects/newisp/dev/mpt/mpt_cam.c#21 integrate .. //depot/projects/newisp/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/newisp/dev/mpt/mpt_raid.c#7 integrate .. //depot/projects/newisp/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/newisp/dev/ral/rt2560.c#2 integrate .. //depot/projects/newisp/dev/ral/rt2661.c#2 integrate .. //depot/projects/newisp/dev/sound/pcm/channel.c#5 integrate .. //depot/projects/newisp/dev/sound/pcm/dsp.c#7 integrate .. //depot/projects/newisp/fs/procfs/procfs_status.c#3 integrate .. //depot/projects/newisp/i386/i386/machdep.c#8 integrate .. //depot/projects/newisp/ia64/ia64/machdep.c#5 integrate .. //depot/projects/newisp/isofs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/newisp/kern/init_main.c#6 integrate .. //depot/projects/newisp/kern/kern_clock.c#3 integrate .. //depot/projects/newisp/kern/kern_fork.c#5 integrate .. //depot/projects/newisp/kern/kern_idle.c#4 integrate .. //depot/projects/newisp/kern/kern_intr.c#4 integrate .. //depot/projects/newisp/kern/kern_kse.c#3 integrate .. //depot/projects/newisp/kern/kern_poll.c#3 integrate .. //depot/projects/newisp/kern/kern_proc.c#6 integrate .. //depot/projects/newisp/kern/kern_resource.c#6 integrate .. //depot/projects/newisp/kern/kern_subr.c#3 integrate .. //depot/projects/newisp/kern/kern_switch.c#3 integrate .. //depot/projects/newisp/kern/kern_thr.c#7 integrate .. //depot/projects/newisp/kern/kern_thread.c#4 integrate .. //depot/projects/newisp/kern/kern_umtx.c#12 integrate .. //depot/projects/newisp/kern/ksched.c#2 integrate .. //depot/projects/newisp/kern/sched_4bsd.c#6 integrate .. //depot/projects/newisp/kern/sched_ule.c#4 integrate .. //depot/projects/newisp/kern/subr_trap.c#5 integrate .. //depot/projects/newisp/kern/tty.c#8 integrate .. //depot/projects/newisp/kern/vfs_export.c#3 integrate .. //depot/projects/newisp/net/if_ethersubr.c#4 integrate .. //depot/projects/newisp/net/if_ppp.c#6 integrate .. //depot/projects/newisp/net/if_pppvar.h#3 integrate .. //depot/projects/newisp/net/ppp_tty.c#3 integrate .. //depot/projects/newisp/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/newisp/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/newisp/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/newisp/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/newisp/pc98/pc98/machdep.c#6 integrate .. //depot/projects/newisp/pci/if_xl.c#3 integrate .. //depot/projects/newisp/pci/if_xlreg.h#3 integrate .. //depot/projects/newisp/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/newisp/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/newisp/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/newisp/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate .. //depot/projects/newisp/sun4v/sun4v/machdep.c#5 integrate .. //depot/projects/newisp/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/newisp/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/newisp/sun4v/sun4v/vnex.c#3 integrate .. //depot/projects/newisp/sys/proc.h#6 integrate .. //depot/projects/newisp/sys/rtprio.h#4 integrate .. //depot/projects/newisp/sys/runq.h#2 integrate .. //depot/projects/newisp/sys/sched.h#4 integrate .. //depot/projects/newisp/vm/vm_glue.c#3 integrate .. //depot/projects/newisp/vm/vm_page.c#7 integrate .. //depot/projects/newisp/vm/vm_zeroidle.c#3 integrate Differences ... ==== //depot/projects/newisp/amd64/amd64/machdep.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.664 2006/11/19 20:54:57 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.666 2006/12/06 18:27:17 sobomax Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -514,6 +514,7 @@ * help lock contention somewhat, and this is critical for HTT. -Peter */ static int cpu_idle_hlt = 1; +TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt); SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, &cpu_idle_hlt, 0, "Idle loop HLT enable"); @@ -1121,11 +1122,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); ==== //depot/projects/newisp/amd64/amd64/minidump_machdep.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.1 2006/04/21 04:24:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.2 2006/12/05 11:31:33 ru Exp $"); #include #include @@ -215,7 +215,7 @@ j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) { /* This is an entire 2M page. */ - pa = pd[j] & PG_FRAME & ~PDRMASK; + pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { if (is_dumpable(pa)) dump_add_page(pa); @@ -326,7 +326,7 @@ j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) { /* This is a single 2M block. Generate a fake PTP */ - pa = pd[j] & PG_FRAME & ~PDRMASK; + pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { fakept[k] = (pa + (k * PAGE_SIZE)) | PG_V | PG_RW | PG_A | PG_M; } ==== //depot/projects/newisp/amd64/amd64/pmap.c#5 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.576 2006/11/23 21:37:04 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.577 2006/12/05 11:31:33 ru Exp $"); /* * Manages physical address maps. @@ -947,9 +947,7 @@ pde = *pdep; if (pde) { if ((pde & PG_PS) != 0) { - KASSERT((pde & PG_FRAME & PDRMASK) == 0, - ("pmap_extract: bad pde")); - rtval = (pde & PG_FRAME) | (va & PDRMASK); + rtval = (pde & PG_PS_FRAME) | (va & PDRMASK); PMAP_UNLOCK(pmap); return rtval; } @@ -982,9 +980,7 @@ if (pdep != NULL && (pde = *pdep)) { if (pde & PG_PS) { if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { - KASSERT((pde & PG_FRAME & PDRMASK) == 0, - ("pmap_extract_and_hold: bad pde")); - m = PHYS_TO_VM_PAGE((pde & PG_FRAME) | + m = PHYS_TO_VM_PAGE((pde & PG_PS_FRAME) | (va & PDRMASK)); vm_page_hold(m); } @@ -1013,7 +1009,7 @@ } else { pde = vtopde(va); if (*pde & PG_PS) { - pa = (*pde & ~(NBPDR - 1)) | (va & (NBPDR - 1)); + pa = (*pde & PG_PS_FRAME) | (va & PDRMASK); } else { pa = *vtopte(va); pa = (pa & PG_FRAME) | (va & PAGE_MASK); ==== //depot/projects/newisp/amd64/include/pmap.h#4 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.137 2006/11/19 20:54:57 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.138 2006/12/05 11:31:33 ru Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -71,6 +71,7 @@ #define PG_W PG_AVAIL1 /* "Wired" pseudoflag */ #define PG_MANAGED PG_AVAIL2 #define PG_FRAME (0x000ffffffffff000ul) +#define PG_PS_FRAME (0x000fffffffe00000ul) #define PG_PROT (PG_RW|PG_U) /* all protection bits . */ #define PG_N (PG_NC_PWT|PG_NC_PCD) /* Non-cacheable */ ==== //depot/projects/newisp/arm/at91/kb920x_machdep.c#6 (text) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.19 2006/11/11 20:57:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.20 2006/12/06 06:34:53 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -455,11 +455,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/newisp/arm/at91/uart_dev_at91usart.c#2 (text) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.9 2006/07/20 21:03:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.10 2006/12/07 00:24:15 cognet Exp $"); #include "opt_comconsole.h" @@ -323,7 +323,10 @@ static int at91_usart_bus_attach(struct uart_softc *sc) { - int err, i; +#ifndef SKYEYE_WORKAROUNDS + int err; + int i; +#endif uint32_t cr; struct at91_usart_softc *atsc; @@ -345,6 +348,7 @@ sc->sc_rxfifosz = USART_BUFFER_SIZE; sc->sc_hwiflow = 0; +#ifndef SKYEYE_WORKAROUNDS /* * Allocate DMA tags and maps */ @@ -374,6 +378,7 @@ atsc->ping = &atsc->ping_pong[0]; atsc->pong = &atsc->ping_pong[1]; } +#endif /* * Prime the pump with the RX buffer. We use two 64 byte bounce @@ -407,9 +412,13 @@ WR4(&sc->sc_bas, USART_IER, USART_CSR_RXRDY); } WR4(&sc->sc_bas, USART_IER, USART_CSR_RXBRK); +#ifndef SKYEYE_WORKAROUNDS errout:; // XXX bad return (err); +#else + return (0); +#endif } static int ==== //depot/projects/newisp/arm/sa11x0/assabet_machdep.c#4 (text+ko) ==== @@ -47,7 +47,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.20 2006/11/11 20:57:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.21 2006/12/06 06:34:54 julian Exp $"); #include "opt_md.h" @@ -422,11 +422,7 @@ /* Set stack for exception handlers */ -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/newisp/arm/xscale/i80321/ep80219_machdep.c#5 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.4 2006/11/17 00:53:39 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.5 2006/12/06 06:34:54 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -429,11 +429,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/newisp/arm/xscale/i80321/iq31244_machdep.c#4 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.25 2006/11/17 00:53:39 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.26 2006/12/06 06:34:54 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -427,11 +427,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/newisp/arm/xscale/ixp425/avila_machdep.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.2 2006/12/06 06:34:54 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -493,11 +493,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/newisp/arm/xscale/ixp425/files.ixp425#2 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.1 2006/11/19 23:55:23 sam Exp $ +#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.2 2006/12/07 00:49:33 sam Exp $ arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard arm/xscale/ixp425/ixp425.c standard @@ -18,7 +18,11 @@ # # NPE-based Ethernet support (requires qmgr also). Note the # firmware images must be downloaded from the Intel web site. +# The URL seems to change frequently; try this as a starting +# place: # +# http://www.intel.com/design/network/products/npfamily/download_ixp400.htm +# arm/xscale/ixp425/if_npe.c optional npe arm/xscale/ixp425/ixp425_npe.c optional npe ixp425_npe_fw.c optional npe_fw \ @@ -31,10 +35,15 @@ # get known values for reference in the _fw.c file. # IxNpeMicrocode.fwo optional npe_fw \ - dependency "$S/arm/xscale/ixp425/IxNpeMicrocode.dat" \ - compile-with "ln -sf $S/arm/xscale/ixp425/IxNpeMicrocode.dat ${.OBJDIR}; ${LD} -b binary -d -warn-common -r -d -o ${.TARGET} IxNpeMicrocode.dat" \ + dependency "IxNpeMicrocode.dat" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} IxNpeMicrocode.dat" \ no-implicit-rule \ - clean "IxNpeMicrocode.dat IxNpeMicrocode.fwo" + clean "IxNpeMicrocode.fwo" +IxNpeMicrocode.dat optional npe_fw \ + dependency ".PHONY" \ + compile-with "if [ -e $S/arm/xscale/ixp425/IxNpeMicrocode.dat ]; then ln -sf $S/arm/xscale/ixp425/IxNpeMicrocode.dat .; else echo 'WARNING, no IxNpeMicrocode.dat file; you must obtain this from the Intel web site'; false; fi" \ + no-obj no-implicit-rule \ + clean "IxNpeMicrocode.dat" # # Q-Manager support # ==== //depot/projects/newisp/boot/i386/btx/btx/btx.S#4 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.43 2006/10/05 15:30:51 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.44 2006/12/06 17:45:35 jhb Exp $ */ /* @@ -499,6 +499,8 @@ je v86cli # Yes cmpb $0xfb,%al # STI? je v86sti # Yes + cmpb $0xcc,%al # INT3? + je v86mon.7 # Yes, ignore movzwl 0x38(%ebp),%ebx # Load V86 SS shll $0x4,%ebx # To offset pushl %ebx # Save ==== //depot/projects/newisp/ddb/db_ps.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.64 2006/10/26 21:42:17 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.65 2006/12/06 06:34:54 julian Exp $"); #include #include @@ -292,12 +292,7 @@ td = kdb_thread; db_printf("Thread %d at %p:\n", td->td_tid, td); -#ifdef KSE - db_printf(" proc (pid %d): %p ", td->td_proc->p_pid, td->td_proc); - db_printf(" ksegrp: %p\n", td->td_ksegrp); -#else db_printf(" proc (pid %d): %p\n", td->td_proc->p_pid, td->td_proc); -#endif if (td->td_name[0] != '\0') db_printf(" name: %s\n", td->td_name); db_printf(" flags: %#x ", td->td_flags); ==== //depot/projects/newisp/dev/bce/if_bce.c#10 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.21 2006/11/16 06:28:54 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.22 2006/12/06 22:53:22 jhb Exp $"); /* * The following controllers are supported by this driver: @@ -4566,7 +4566,7 @@ /* Try to defrag the mbuf if there are too many segments. */ DBPRINT(sc, BCE_WARN, "%s(): fragmented mbuf (%d pieces)\n", - __FUNCTION__, map_arg.maxsegs); + __FUNCTION__, nsegs); m0 = m_defrag(*m_head, M_DONTWAIT); if (m0 == NULL) { @@ -4619,7 +4619,7 @@ DBPRINT(sc, BCE_INFO_SEND, "%s(): Start: prod = 0x%04X, chain_prod = %04X, " "prod_bseq = 0x%08X\n", - __FUNCTION__, *prod, chain_prod, prod_bseq); + __FUNCTION__, prod, chain_prod, prod_bseq); /* * Cycle through each mbuf segment that makes up @@ -4646,7 +4646,7 @@ /* Set the END flag on the last TX buffer descriptor. */ txbd->tx_bd_flags |= htole16(TX_BD_FLAGS_END); - DBRUN(BCE_INFO_SEND, bce_dump_tx_chain(sc, debug_prod, nseg)); + DBRUN(BCE_INFO_SEND, bce_dump_tx_chain(sc, debug_prod, nsegs)); DBPRINT(sc, BCE_INFO_SEND, "%s(): End: prod = 0x%04X, chain_prod = %04X, " @@ -6163,7 +6163,7 @@ else /* Normal tx_bd entry. */ BCE_PRINTF(sc, "tx_bd[0x%04X]: haddr = 0x%08X:%08X, nbytes = 0x%08X, " - "vlan tag= 0x%4X, "flags = 0x%04X\n", idx, + "vlan tag= 0x%4X, flags = 0x%04X\n", idx, txbd->tx_bd_haddr_hi, txbd->tx_bd_haddr_lo, txbd->tx_bd_mss_nbytes, txbd->tx_bd_vlan_tag, txbd->tx_bd_flags); ==== //depot/projects/newisp/dev/dc/if_dc.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.188 2006/11/02 00:05:15 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.189 2006/12/06 01:56:38 marius Exp $"); /* * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 @@ -247,7 +247,7 @@ static void dc_init(void *); static void dc_init_locked(struct dc_softc *); static void dc_stop(struct dc_softc *); -static void dc_watchdog(struct ifnet *); +static void dc_watchdog(void *); static void dc_shutdown(device_t); static int dc_ifmedia_upd(struct ifnet *); static void dc_ifmedia_sts(struct ifnet *, struct ifmediareq *); @@ -1138,7 +1138,7 @@ */ DELAY(10000); - ifp->if_timer = 5; + sc->dc_wdog_timer = 5; } static void @@ -1340,7 +1340,7 @@ */ DELAY(1000); - ifp->if_timer = 5; + sc->dc_wdog_timer = 5; } static void @@ -2077,9 +2077,10 @@ } /* Allocate a busdma tag and DMA safe memory for TX/RX descriptors. */ - error = bus_dma_tag_create(NULL, PAGE_SIZE, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, sizeof(struct dc_list_data), 1, - sizeof(struct dc_list_data), 0, NULL, NULL, &sc->dc_ltag); + error = bus_dma_tag_create(bus_get_dma_tag(dev), PAGE_SIZE, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, + sizeof(struct dc_list_data), 1, sizeof(struct dc_list_data), + 0, NULL, NULL, &sc->dc_ltag); if (error) { device_printf(dev, "failed to allocate busdma tag\n"); error = ENXIO; @@ -2105,9 +2106,10 @@ * Allocate a busdma tag and DMA safe memory for the multicast * setup frame. */ - error = bus_dma_tag_create(NULL, PAGE_SIZE, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, DC_SFRAME_LEN + DC_MIN_FRAMELEN, 1, - DC_SFRAME_LEN + DC_MIN_FRAMELEN, 0, NULL, NULL, &sc->dc_stag); + error = bus_dma_tag_create(bus_get_dma_tag(dev), PAGE_SIZE, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, + DC_SFRAME_LEN + DC_MIN_FRAMELEN, 1, DC_SFRAME_LEN + DC_MIN_FRAMELEN, + 0, NULL, NULL, &sc->dc_stag); if (error) { device_printf(dev, "failed to allocate busdma tag\n"); error = ENXIO; @@ -2129,8 +2131,9 @@ } /* Allocate a busdma tag for mbufs. */ - error = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, DC_TX_LIST_CNT, MCLBYTES, + error = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, + MCLBYTES, DC_TX_LIST_CNT, MCLBYTES, 0, NULL, NULL, &sc->dc_mtag); if (error) { device_printf(dev, "failed to allocate busdma tag\n"); @@ -2172,12 +2175,9 @@ } ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - /* XXX: bleah, MTU gets overwritten in ether_ifattach() */ - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = dc_ioctl; ifp->if_start = dc_start; - ifp->if_watchdog = dc_watchdog; ifp->if_init = dc_init; IFQ_SET_MAXLEN(&ifp->if_snd, DC_TX_LIST_CNT - 1); ifp->if_snd.ifq_drv_maxlen = DC_TX_LIST_CNT - 1; @@ -2256,6 +2256,7 @@ #endif callout_init_mtx(&sc->dc_stat_ch, &sc->dc_mtx, 0); + callout_init_mtx(&sc->dc_wdog_ch, &sc->dc_mtx, 0); /* * Call MI attach routine. @@ -2309,6 +2310,7 @@ dc_stop(sc); DC_UNLOCK(sc); callout_drain(&sc->dc_stat_ch); + callout_drain(&sc->dc_wdog_ch); ether_ifdetach(ifp); } if (sc->dc_miibus) @@ -2869,7 +2871,7 @@ sc->dc_cdata.dc_tx_cons = idx; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; } - ifp->if_timer = (sc->dc_cdata.dc_tx_cnt == 0) ? 0 : 5; + sc->dc_wdog_timer = (sc->dc_cdata.dc_tx_cnt == 0) ? 0 : 5; } static void @@ -3338,7 +3340,7 @@ /* * Set a timeout in case the chip goes out to lunch. */ - ifp->if_timer = 5; + sc->dc_wdog_timer = 5; } } @@ -3525,6 +3527,9 @@ else callout_reset(&sc->dc_stat_ch, hz, dc_tick, sc); } + + sc->dc_wdog_timer = 0; + callout_reset(&sc->dc_wdog_ch, hz, dc_watchdog, sc); } /* @@ -3659,16 +3664,21 @@ } static void -dc_watchdog(struct ifnet *ifp) +dc_watchdog(void *xsc) { - struct dc_softc *sc; + struct dc_softc *sc = xsc; + struct ifnet *ifp; - sc = ifp->if_softc; + DC_LOCK_ASSERT(sc); - DC_LOCK(sc); + if (sc->dc_wdog_timer == 0 || --sc->dc_wdog_timer != 0) { + callout_reset(&sc->dc_wdog_ch, hz, dc_watchdog, sc); + return; + } + ifp = sc->dc_ifp; ifp->if_oerrors++; - if_printf(ifp, "watchdog timeout\n"); + device_printf(sc->dc_dev, "watchdog timeout\n"); dc_stop(sc); dc_reset(sc); @@ -3676,8 +3686,6 @@ if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) dc_start_locked(ifp); - - DC_UNLOCK(sc); } /* @@ -3696,11 +3704,12 @@ DC_LOCK_ASSERT(sc); ifp = sc->dc_ifp; - ifp->if_timer = 0; ld = sc->dc_ldata; cd = &sc->dc_cdata; callout_stop(&sc->dc_stat_ch); + callout_stop(&sc->dc_wdog_ch); + sc->dc_wdog_timer = 0; ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); ==== //depot/projects/newisp/dev/dc/if_dcreg.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/dc/if_dcreg.h,v 1.52 2006/09/15 15:16:10 glebius Exp $ + * $FreeBSD: src/sys/dev/dc/if_dcreg.h,v 1.53 2006/12/06 01:56:38 marius Exp $ */ /* @@ -749,9 +749,8 @@ struct dc_list_data *dc_ldata; struct dc_chain_data dc_cdata; struct callout dc_stat_ch; -#ifdef SRM_MEDIA - int dc_srm_media; -#endif + struct callout dc_wdog_ch; + int dc_wdog_timer; struct mtx dc_mtx; #ifdef DEVICE_POLLING int rxcycles; /* ... when polling */ ==== //depot/projects/newisp/dev/firewire/fwdev.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.47 2005/08/08 19:55:30 rwatson Exp $ + * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.48 2006/12/06 09:13:24 cperciva Exp $ * */ @@ -712,7 +712,7 @@ else len = fwdev->rommax - CSRROMOFF + 4; } - if (crom_buf->len < len) + if (crom_buf->len < len && crom_buf->len >= 0) len = crom_buf->len; else crom_buf->len = len; ==== //depot/projects/newisp/dev/gem/if_gem.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.39 2006/09/03 00:27:41 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.40 2006/12/06 02:04:25 marius Exp $"); /* * Driver for Sun GEM ethernet controllers. @@ -83,16 +83,16 @@ static void gem_txdma_callback(void *, bus_dma_segment_t *, int, bus_size_t, int); static void gem_tick(void *); -static void gem_watchdog(struct ifnet *); +static int gem_watchdog(struct gem_softc *); static void gem_init(void *); -static void gem_init_locked(struct gem_softc *sc); -static void gem_init_regs(struct gem_softc *sc); +static void gem_init_locked(struct gem_softc *); +static void gem_init_regs(struct gem_softc *); static int gem_ringsize(int sz); static int gem_meminit(struct gem_softc *); static int gem_load_txmbuf(struct gem_softc *, struct mbuf *); static void gem_mifinit(struct gem_softc *); -static int gem_bitwait(struct gem_softc *sc, bus_addr_t r, - u_int32_t clr, u_int32_t set); +static int gem_bitwait(struct gem_softc *, bus_addr_t, u_int32_t, + u_int32_t); static int gem_reset_rx(struct gem_softc *); static int gem_reset_tx(struct gem_softc *); static int gem_disable_rx(struct gem_softc *); @@ -268,11 +268,9 @@ ifp->if_softc = sc; if_initname(ifp, device_get_name(sc->sc_dev), device_get_unit(sc->sc_dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_start = gem_start; ifp->if_ioctl = gem_ioctl; - ifp->if_watchdog = gem_watchdog; ifp->if_init = gem_init; ifp->if_snd.ifq_maxlen = GEM_TXQUEUELEN; /* @@ -544,6 +542,9 @@ GEM_LOCK_ASSERT(sc, MA_OWNED); mii_tick(sc->sc_mii); + if (gem_watchdog(sc) == EJUSTRETURN) + return; + callout_reset(&sc->sc_tick_ch, hz, gem_tick, sc); } @@ -657,7 +658,7 @@ * Mark the interface down and cancel the watchdog timer. */ ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); - ifp->if_timer = 0; + sc->sc_wdog_timer = 0; } /* @@ -982,11 +983,11 @@ bus_space_write_4(t, h, GEM_RX_KICK, GEM_NRXDESC-4); /* Start the one second timer. */ + sc->sc_wdog_timer = 0; callout_reset(&sc->sc_tick_ch, hz, gem_tick, sc); ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - ifp->if_timer = 0; sc->sc_ifflags = ifp->if_flags; } @@ -1223,10 +1224,10 @@ #endif /* Set a watchdog timer in case the chip flakes out. */ - ifp->if_timer = 5; + sc->sc_wdog_timer = 5; #ifdef GEM_DEBUG CTR2(KTR_GEM, "%s: gem_start: watchdog %d", - device_get_name(sc->sc_dev), ifp->if_timer); + device_get_name(sc->sc_dev), sc->sc_wdog_timer); #endif } } @@ -1355,13 +1356,12 @@ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; gem_start_locked(ifp); - if (STAILQ_EMPTY(&sc->sc_txdirtyq)) - ifp->if_timer = 0; + sc->sc_wdog_timer = STAILQ_EMPTY(&sc->sc_txdirtyq) ? 0 : 5; } #ifdef GEM_DEBUG CTR2(KTR_GEM, "%s: gem_tint: watchdog %d", - device_get_name(sc->sc_dev), ifp->if_timer); + device_get_name(sc->sc_dev), sc->sc_wdog_timer); #endif } @@ -1616,14 +1616,13 @@ GEM_UNLOCK(sc); } +static int +gem_watchdog(sc) + struct gem_softc *sc; +{ -static void -gem_watchdog(ifp) - struct ifnet *ifp; -{ - struct gem_softc *sc = ifp->if_softc; + GEM_LOCK_ASSERT(sc, MA_OWNED); - GEM_LOCK(sc); #ifdef GEM_DEBUG CTR3(KTR_GEM, "gem_watchdog: GEM_RX_CONFIG %x GEM_MAC_RX_STATUS %x " "GEM_MAC_RX_CONFIG %x", @@ -1637,12 +1636,15 @@ bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_MAC_TX_CONFIG)); #endif + if (sc->sc_wdog_timer == 0 || --sc->sc_wdog_timer != 0) + return (0); + device_printf(sc->sc_dev, "device timeout\n"); - ++ifp->if_oerrors; + ++sc->sc_ifp->if_oerrors; /* Try to get more packets going. */ gem_init_locked(sc); - GEM_UNLOCK(sc); + return (EJUSTRETURN); } /* ==== //depot/projects/newisp/dev/gem/if_gemvar.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * * from: NetBSD: gemvar.h,v 1.8 2002/05/15 02:36:12 matt Exp * - * $FreeBSD: src/sys/dev/gem/if_gemvar.h,v 1.11 2005/07/24 18:45:15 marius Exp $ + * $FreeBSD: src/sys/dev/gem/if_gemvar.h,v 1.12 2006/12/06 02:04:25 marius Exp $ */ #ifndef _IF_GEMVAR_H @@ -130,6 +130,7 @@ u_char sc_enaddr[6]; struct callout sc_tick_ch; /* tick callout */ struct callout sc_rx_ch; /* delayed rx callout */ + int sc_wdog_timer; /* watchdog timer */ /* The following bus handles are to be provided by the bus front-end */ bus_space_tag_t sc_bustag; /* bus tag */ ==== //depot/projects/newisp/dev/hme/if_hme.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.51 2006/12/04 01:53:40 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.52 2006/12/06 02:07:19 marius Exp $"); /* * HME Ethernet module driver. @@ -104,7 +104,7 @@ static void hme_stop(struct hme_softc *); static int hme_ioctl(struct ifnet *, u_long, caddr_t); static void hme_tick(void *); -static void hme_watchdog(struct ifnet *); +static int hme_watchdog(struct hme_softc *); static void hme_init(void *); static void hme_init_locked(struct hme_softc *); static int hme_add_rxbuf(struct hme_softc *, unsigned int, int); @@ -214,9 +214,10 @@ */ size = 4096; - error = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, size, HME_NTXDESC + HME_NRXDESC + 1, - BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->sc_pdmatag); + error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, size, + HME_NTXDESC + HME_NRXDESC + 1, BUS_SPACE_MAXSIZE_32BIT, 0, + NULL, NULL, &sc->sc_pdmatag); if (error) goto fail_ifnet; @@ -290,12 +291,10 @@ ifp->if_softc = sc; if_initname(ifp, device_get_name(sc->sc_dev), device_get_unit(sc->sc_dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_start = hme_start; ifp->if_ioctl = hme_ioctl; ifp->if_init = hme_init; - ifp->if_watchdog = hme_watchdog; IFQ_SET_MAXLEN(&ifp->if_snd, HME_NTXQ); ifp->if_snd.ifq_drv_maxlen = HME_NTXQ; IFQ_SET_READY(&ifp->if_snd); @@ -467,6 +466,9 @@ mii_tick(sc->sc_mii); + if (hme_watchdog(sc) == EJUSTRETURN) + return; + callout_reset(&sc->sc_tick_ch, hz, hme_tick, sc); } @@ -477,6 +479,7 @@ int n; callout_stop(&sc->sc_tick_ch); + sc->sc_wdog_timer = 0; sc->sc_ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); /* Mask all interrupts */ @@ -876,11 +879,11 @@ hme_mediachange_locked(sc); /* Start the one second timer. */ + sc->sc_wdog_timer = 0; callout_reset(&sc->sc_tick_ch, hz, hme_tick, sc); ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - ifp->if_timer = 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 8 17:59:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5410216A412; Fri, 8 Dec 2006 17:59:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 15F0F16A407 for ; Fri, 8 Dec 2006 17:59:57 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5A4843CC2 for ; Fri, 8 Dec 2006 17:58:52 +0000 (GMT) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB8Hxpao018152 for ; Fri, 8 Dec 2006 17:59:51 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB8HxpnS018149 for perforce@freebsd.org; Fri, 8 Dec 2006 17:59:51 GMT (envelope-from ticso@freebsd.org) Date: Fri, 8 Dec 2006 17:59:51 GMT Message-Id: <200612081759.kB8HxpnS018149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 111294 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2006 17:59:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=111294 Change 111294 by ticso@ticso on 2006/12/08 17:59:00 add BWCT BOOT_FLAVOR Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#30 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/bwct_board.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/arm_init.S#6 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#10 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#38 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#11 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#19 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.h#9 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#30 (text+ko) ==== @@ -5,7 +5,7 @@ __at91_boot_Makefile.inc__: -# tsc, kb920x are the supported flavors +# tsc, bwct, kb920x are the supported flavors BOOT_FLAVOR=kb920x CFLAGS=-Os -mcpu=arm9 -ffreestanding \ ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/arm_init.S#6 (text+ko) ==== @@ -61,8 +61,12 @@ #ifdef BOOT_IIC .long (TWI_EEPROM_SIZE >> 9) #else +#ifdef BOOT_BWCT + .long ((528 << 17) | (13 << 13) | (12 * 2)) +#else .long ((1056 << 17) | (13 << 13) | (12 * 2)) #endif +#endif irqvec: ldr pc, [pc,#-0xF20] @; IRQ : read the AIC fiqvec: @@ -110,10 +114,10 @@ .string " " #else #if 1 - .string "m 42 53 44 0 0 1" - .string "ip 206 168 13 194" - .string "server_ip 206 168 13 207" - .string "tftp 0x20000000 kernel.bin" + .string "m 00 0e 42 02 00 21 " + .string "ip 10 1 1 4 " + .string "server_ip 10 1 1 9 " + .string "tftp 0x20000000 kernel.bin " .string "e 0x20000000" #else .string "m 42 53 44 0 0 1" ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#10 (text) ==== @@ -39,6 +39,14 @@ #define OSC_MAIN_MULT 90 #endif +#ifdef BOOT_BWCT +/* The following divisor sets PLLA frequency: e.g. 16/4 * 45 = 180MHz */ +#define OSC_MAIN_FREQ_DIV 4 /* for 16MHz osc */ +#define SDRAM_WIDTH AT91C_SDRC_DBW_32_BITS +typedef unsigned int sdram_size_t; +#define OSC_MAIN_MULT 45 +#endif + #ifdef BOOT_TSC /* The following divisor sets PLLA frequency: e.g. 16/4 * 45 = 180MHz */ #define OSC_MAIN_FREQ_DIV 4 /* for 16MHz osc */ ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#38 (text+ko) ==== @@ -337,6 +337,7 @@ * This private function reads the PHY device. * .KB_C_FN_DEFINITION_END */ +#ifndef BOOT_BWCT static unsigned short AT91F_MII_ReadPhy (AT91PS_EMAC pEmac, unsigned char addr) { @@ -348,6 +349,7 @@ pEmac->EMAC_CTL &= ~AT91C_EMAC_MPE; return (pEmac->EMAC_MAN & 0x0000ffff); } +#endif /* * .KB_C_FN_DEFINITION_START @@ -378,12 +380,20 @@ static void MII_GetLinkSpeed(AT91PS_EMAC pEmac) { +#if defined(BOOT_TSC) | defined(BOOT_KB920X) unsigned short stat2; +#endif unsigned update; #ifdef BOOT_TSC unsigned sec; int i; #endif +#ifdef BOOT_BWCT + /* hardcoded link speed since we connect a switch via MII */ + update = pEmac->EMAC_CFG & ~(AT91C_EMAC_SPD | AT91C_EMAC_FD); + update |= AT91C_EMAC_SPD; + update |= AT91C_EMAC_FD; +#endif #ifdef BOOT_KB920X stat2 = AT91F_MII_ReadPhy(pEmac, MII_STS2_REG); if (!(stat2 & MII_STS2_LINK)) ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#11 (text+ko) ==== @@ -94,7 +94,7 @@ AT91C_PA8_ETXEN | AT91C_PA16_EMDIO | AT91C_PA9_ETX0 | AT91C_PA10_ETX1 | AT91C_PA11_ECRS_ECRSDV | AT91C_PA15_EMDC | AT91C_PA7_ETXCK_EREFCK; -#ifdef BOOT_KB920X /* Really !RMII */ +#if defined(BOOT_KB920X) | defined(BOOT_BWCT) /* Really !RMII */ AT91C_BASE_PIOB->PIO_BSR = AT91C_PB12_ETX2 | AT91C_PB13_ETX3 | AT91C_PB14_ETXER | AT91C_PB15_ERX2 | AT91C_PB16_ERX3 | AT91C_PB17_ERXDV | ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#19 (text+ko) ==== @@ -119,6 +119,23 @@ byteAddress = flash_addr % FLASH_PAGE_SIZE; p_memset(tx_commandBuffer, 0, 8); +#ifdef BOOT_BWCT + tx_commandBuffer[0] = 0xd2; + tx_commandBuffer[1] = ((pageAddress >> 6) & 0xFF); + tx_commandBuffer[2] = ((pageAddress << 2) & 0xFC) | + ((byteAddress >> 8) & 0x3); + tx_commandBuffer[3] = byteAddress & 0xFF; + spi_command.tx_cmd = tx_commandBuffer; + spi_command.tx_cmd_size = 8; + spi_command.tx_data_size = size; + spi_command.tx_data = dest_addr; + + p_memset(rx_commandBuffer, 0, 8); + spi_command.rx_cmd = rx_commandBuffer; + spi_command.rx_cmd_size = 8; + spi_command.rx_data_size = size; + spi_command.rx_data = dest_addr; +#else tx_commandBuffer[0] = CONTINUOUS_ARRAY_READ_HF; tx_commandBuffer[1] = ((pageAddress >> 5) & 0xFF); tx_commandBuffer[2] = ((pageAddress << 3) & 0xF8) | @@ -134,6 +151,7 @@ spi_command.rx_cmd_size = 5; spi_command.rx_data_size = size; spi_command.rx_data = dest_addr; +#endif SendCommand(&spi_command); } @@ -159,11 +177,19 @@ byteAddress = flash_addr % FLASH_PAGE_SIZE; p_memset(tx_commandBuffer, 0, 8); +#ifdef BOOT_BWCT + tx_commandBuffer[0] = 0x82; + tx_commandBuffer[1] = ((pageAddress >> 6) & 0xFF); + tx_commandBuffer[2] = ((pageAddress << 2) & 0xFC) | + ((byteAddress >> 8) & 0x3); + tx_commandBuffer[3] = (byteAddress & 0xFF); +#else tx_commandBuffer[0] = PROGRAM_THROUGH_BUFFER; tx_commandBuffer[1] = ((pageAddress >> 5) & 0xFF); tx_commandBuffer[2] = ((pageAddress << 3) & 0xF8) | ((byteAddress >> 8) & 0x7); tx_commandBuffer[3] = (byteAddress & 0xFF); +#endif p_memset(rx_commandBuffer, 0, 8); @@ -233,6 +259,11 @@ // Increment real time counter every SLCK AT91C_BASE_ST->ST_RTMR = 1; +#ifdef BOOT_BWCT + if (((value = GetFlashStatus()) & 0xFC) != 0xB4) + printf(" Bad SPI status: 0x%x\n", value); +#else if (((value = GetFlashStatus()) & 0xFC) != 0xBC) printf(" Bad SPI status: 0x%x\n", value); +#endif } ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.h#9 (text+ko) ==== @@ -40,7 +40,11 @@ void SPI_GetId(unsigned *id); +#ifdef BOOT_BWCT +#define FLASH_PAGE_SIZE 528 +#else #define FLASH_PAGE_SIZE 1056 +#endif // Flash commands From owner-p4-projects@FreeBSD.ORG Fri Dec 8 18:03:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEE3F16A417; Fri, 8 Dec 2006 18:03:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6D13816A40F for ; Fri, 8 Dec 2006 18:03:57 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 234FE43CA8 for ; Fri, 8 Dec 2006 18:02:58 +0000 (GMT) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB8I3ve2020585 for ; Fri, 8 Dec 2006 18:03:57 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB8I3uif020582 for perforce@freebsd.org; Fri, 8 Dec 2006 18:03:56 GMT (envelope-from ticso@freebsd.org) Date: Fri, 8 Dec 2006 18:03:56 GMT Message-Id: <200612081803.kB8I3uif020582@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 111295 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2006 18:03:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=111295 Change 111295 by ticso@ticso on 2006/12/08 18:03:48 Fix comment Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#39 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#39 (text+ko) ==== @@ -353,7 +353,7 @@ /* * .KB_C_FN_DEFINITION_START - * unsigned short AT91F_MII_ReadPhy (AT91PS_EMAC pEmac, unsigned char addr) + * unsigned short AT91F_MII_WritePhy (AT91PS_EMAC pEmac, unsigned char addr) * This private function reads the PHY device. * .KB_C_FN_DEFINITION_END */ From owner-p4-projects@FreeBSD.ORG Fri Dec 8 18:07:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BC8316A412; Fri, 8 Dec 2006 18:07:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4CD7D16A47B for ; Fri, 8 Dec 2006 18:07:05 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BE8143CB1 for ; Fri, 8 Dec 2006 18:06:02 +0000 (GMT) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB8I71M6020920 for ; Fri, 8 Dec 2006 18:07:01 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB8I713C020917 for perforce@freebsd.org; Fri, 8 Dec 2006 18:07:01 GMT (envelope-from ticso@freebsd.org) Date: Fri, 8 Dec 2006 18:07:01 GMT Message-Id: <200612081807.kB8I713C020917@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 111296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2006 18:07:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=111296 Change 111296 by ticso@ticso on 2006/12/08 18:06:35 Fix more points in comment Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#40 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#40 (text+ko) ==== @@ -353,8 +353,8 @@ /* * .KB_C_FN_DEFINITION_START - * unsigned short AT91F_MII_WritePhy (AT91PS_EMAC pEmac, unsigned char addr) - * This private function reads the PHY device. + * unsigned short AT91F_MII_WritePhy (AT91PS_EMAC pEmac, unsigned char addr, unsigned short s) + * This private function writes the PHY device. * .KB_C_FN_DEFINITION_END */ #ifdef BOOT_TSC From owner-p4-projects@FreeBSD.ORG Fri Dec 8 20:01:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2AC616A492; Fri, 8 Dec 2006 20:01:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7BBF316A47B; Fri, 8 Dec 2006 20:01:57 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id C71A943CA7; Fri, 8 Dec 2006 20:00:56 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id kB8K1qu5082968; Fri, 8 Dec 2006 15:01:52 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Pawel Jakub Dawidek Date: Fri, 8 Dec 2006 14:53:11 -0500 User-Agent: KMail/1.9.1 References: <200612081207.kB8C74hR038904@repoman.freebsd.org> In-Reply-To: <200612081207.kB8C74hR038904@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200612081453.12227.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Fri, 08 Dec 2006 15:01:52 -0500 (EST) X-Virus-Scanned: ClamAV 0.88.3/2308/Fri Dec 8 11:10:24 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 111284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2006 20:01:58 -0000 On Friday 08 December 2006 07:07, Pawel Jakub Dawidek wrote: > http://perforce.freebsd.org/chv.cgi?CH=111284 > > Change 111284 by pjd@pjd_anger on 2006/12/08 12:06:23 > > We need to pass static buffer to device_set_desc(). Or use device_set_desc_copy(). This change below won't work if you ever have 2 padlock devices with different descriptions. > Affected files ... > > .. //depot/projects/crypto/sys/crypto/via/padlock.c#3 edit > > Differences ... > > ==== //depot/projects/crypto/sys/crypto/via/padlock.c#3 (text+ko) ==== > > @@ -80,7 +80,7 @@ > static int > padlock_probe(device_t dev) > { > - char capp[256]; > + static char capp[256]; > > #if defined(__i386__) && !defined(PC98) > /* If there is no AES support, we has nothing to do here. */ > -- John Baldwin From owner-p4-projects@FreeBSD.ORG Fri Dec 8 21:24:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1F6A16A416; Fri, 8 Dec 2006 21:24:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BD07F16A403 for ; Fri, 8 Dec 2006 21:24:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88A7643CB9 for ; Fri, 8 Dec 2006 21:23:18 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB8LOIWk065468 for ; Fri, 8 Dec 2006 21:24:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB8LOI9Q065465 for perforce@freebsd.org; Fri, 8 Dec 2006 21:24:18 GMT (envelope-from sam@freebsd.org) Date: Fri, 8 Dec 2006 21:24:18 GMT Message-Id: <200612082124.kB8LOI9Q065465@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 111299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2006 21:24:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=111299 Change 111299 by sam@sam_ebb on 2006/12/08 21:23:36 o check for device existence before attaching so we don't get duplicates o use device_set_desc_copy instead of a static buffer; from jhb Affected files ... .. //depot/projects/crypto/sys/crypto/via/padlock.c#4 edit Differences ... ==== //depot/projects/crypto/sys/crypto/via/padlock.c#4 (text+ko) ==== @@ -73,14 +73,15 @@ padlock_identify(device_t *dev, device_t parent) { /* NB: order 10 is so we get attached after h/w devices */ - if (BUS_ADD_CHILD(parent, 10, "padlock", -1) == 0) + if (device_find_child(parent, "padlock", -1) == NULL && + BUS_ADD_CHILD(parent, 10, "padlock", -1) == 0) panic("padlock: could not attach"); } static int padlock_probe(device_t dev) { - static char capp[256]; + char capp[256]; #if defined(__i386__) && !defined(PC98) /* If there is no AES support, we has nothing to do here. */ @@ -104,7 +105,7 @@ if (via_feature_xcrypt & VIA_HAS_MM) strlcat(capp, ",RSA", sizeof(capp)); #endif - device_set_desc(dev, capp); + device_set_desc_copy(dev, capp); #else return (EINVAL); #endif From owner-p4-projects@FreeBSD.ORG Sat Dec 9 01:20:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7A9D16A415; Sat, 9 Dec 2006 01:20:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 811F516A407 for ; Sat, 9 Dec 2006 01:20:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 614D943CA7 for ; Sat, 9 Dec 2006 01:19:28 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB91KTTx017421 for ; Sat, 9 Dec 2006 01:20:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB91KQuF017418 for perforce@freebsd.org; Sat, 9 Dec 2006 01:20:26 GMT (envelope-from jb@freebsd.org) Date: Sat, 9 Dec 2006 01:20:26 GMT Message-Id: <200612090120.kB91KQuF017418@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 111306 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Dec 2006 01:20:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=111306 Change 111306 by jb@jb_freebsd8 on 2006/12/09 01:19:49 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#39 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/nivit.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#20 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#20 integrate .. //depot/projects/dtrace/ports/LEGAL#16 integrate .. //depot/projects/dtrace/ports/MOVED#35 integrate .. //depot/projects/dtrace/ports/Mk/bsd.database.mk#6 integrate .. //depot/projects/dtrace/ports/Mk/bsd.python.mk#8 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#14 integrate .. //depot/projects/dtrace/ports/UPDATING#27 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#19 integrate .. //depot/projects/dtrace/src/UPDATING#12 integrate .. //depot/projects/dtrace/src/bin/hostname/hostname.1#5 integrate .. //depot/projects/dtrace/src/bin/hostname/hostname.c#4 integrate .. //depot/projects/dtrace/src/contrib/libbegemot/rpoll.c#4 integrate .. //depot/projects/dtrace/src/contrib/libbegemot/rpoll.h#4 integrate .. //depot/projects/dtrace/src/contrib/libbegemot/rpoll.man#4 integrate .. //depot/projects/dtrace/src/etc/pccard_ether#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/auto_linklocal#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_platform.h#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/config_freebsd.h#1 branch .. //depot/projects/dtrace/src/lib/libkvm/kvm_proc.c#7 integrate .. //depot/projects/dtrace/src/release/Makefile#10 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/Makefile#6 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/Makefile.inc#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#26 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#3 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#3 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/share/examples/Makefile.relnotesng#6 integrate .. //depot/projects/dtrace/src/sbin/fdisk/fdisk.8#4 integrate .. //depot/projects/dtrace/src/sbin/mount/mount_fs.c#4 integrate .. //depot/projects/dtrace/src/share/man/man4/ath.4#6 integrate .. //depot/projects/dtrace/src/share/man/man9/mbuf.9#5 integrate .. //depot/projects/dtrace/src/share/misc/pci_vendors#4 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#17 integrate .. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#16 integrate .. //depot/projects/dtrace/src/sys/arm/at91/uart_dev_at91usart.c#6 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/assabet_machdep.c#10 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/iq31244_machdep.c#10 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/dtrace/src/sys/boot/i386/btx/btx/btx.S#6 integrate .. //depot/projects/dtrace/src/sys/ddb/db_ps.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ipmi/ipmi.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#16 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.h#18 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#22 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_debug.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_raid.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/ral/rt2560.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ral/rt2661.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pcm/channel.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pcm/dsp.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/procfs/procfs_status.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#16 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/isofs/cd9660/cd9660_node.h#4 integrate .. //depot/projects/dtrace/src/sys/kern/init_main.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/kern_clock.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_fork.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/kern_idle.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_intr.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_kse.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_poll.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_proc.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_resource.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_subr.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_switch.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_thr.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/kern_thread.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/kern_umtx.c#15 integrate .. //depot/projects/dtrace/src/sys/kern/ksched.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#19 integrate .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/subr_trap.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/tty.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_export.c#5 integrate .. //depot/projects/dtrace/src/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#14 integrate .. //depot/projects/dtrace/src/sys/pci/if_xl.c#7 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_vdevfindval.c#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/machdep.c#11 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/uio_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/vnex.c#7 integrate .. //depot/projects/dtrace/src/sys/sys/proc.h#19 integrate .. //depot/projects/dtrace/src/sys/sys/rtprio.h#8 integrate .. //depot/projects/dtrace/src/sys/sys/runq.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/sched.h#10 integrate .. //depot/projects/dtrace/src/sys/vm/vm_glue.c#8 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.c#18 integrate .. //depot/projects/dtrace/src/sys/vm/vm_zeroidle.c#8 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#10 integrate .. //depot/projects/dtrace/src/usr.bin/getconf/getconf.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt#1 branch .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#2 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#19 integrate .. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#14 integrate .. //depot/projects/dtrace/www/en/releases/4.11R/errata.html#7 integrate .. //depot/projects/dtrace/www/en/releases/5.5R/errata.html#8 integrate .. //depot/projects/dtrace/www/en/releases/6.1R/errata.html#12 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#18 integrate .. //depot/projects/dtrace/www/en/relnotes.sgml#4 integrate .. //depot/projects/dtrace/www/share/sgml/advisories.xml#10 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#15 integrate .. //depot/projects/dtrace/www/zh_CN/releases/6.1R/errata.html#7 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#39 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -317,9 +317,9 @@ run the following commands: &prompt.root; ln -s /usr/local/lib/npapi/linux-flashplugin/libflashplayer.so \ - /usr/X11R6/lib/browser_plugins/ + /usr/local/lib/browser_plugins/ &prompt.root; ln -s /usr/local/lib/npapi/linux-flashplugin/flashplayer.xpt \ - /usr/X11R6/lib/browser_plugins/ + /usr/local/lib/browser_plugins/ If you restart your browser the plugin should now appears in the previously mentioned list. Your browser may also crash ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -809,6 +809,63 @@ to format and create partitions on the USB drive if needed. + To make this device mountable as a normal user, certain + steps have to be taken. First, the devices that are created + when a USB storage device is connected need to be accessible + by the user. A solution is to make all users of these devices + a member of the operator group. This + is done with &man.pw.8;. Second, when the devices are + created, the operator group should be + able to read and write them. This is accomplished by adding a + line for these devices to + /etc/devfs.rules: + + add path 'da*' mode 0660 group operator + + + If there already are SCSI disks in the system, it must + be done a bit different. E.g., if the system already + contains disks da0 through + da2 attached to the system, change + the line as follows: + + add path 'da[3-9]*' mode 0660 group operator + + This will exclude the already existing disks from + belonging to the operator + group. + + + Next, the kernel has to be configured to allow regular + users to mount file systems. The easiest way is to add the + following line to + /etc/sysctl.conf: + + vfs.usermount="1" + + Note that this only takes effect after the next reboot. + Alternatively, one can also use &man.sysctl.8; to set this + variable. + + The final step is to create a directory where the file + system is to be mounted. This directory needs to be owned by + the user that is to mount the file system. One way to do that + is for root to create a subdirectory + owned by that user as + /mnt/$USER + (replace $USER by the login name of + the actual user): + + &prompt.root; mkdir /mnt/$USER +&prompt.root; chown $USER:$USER /mnt/$USER + + Suppose a USB thumbdrive is plugged in, and a device + /dev/da0s1 appears. Since these devices + usually come preformatted with a FAT file system, one can + mount them like this: + + &prompt.user; mount_msdosfs -m 644 -M 755 /dev/da0s1 /mnt/$USER + If you unplug the device (the disk must be unmounted before), you should see, in the system message buffer, something like the following: ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2356,11 +2356,11 @@ The address block being used for this local area - network is a Class C block - (192.168.0.0 - - 192.168.0.255). - The default netmask is for a Class C network - (255.255.255.0). + network is + 192.168.0.0 - + 192.168.0.255 + with a netmask of + 255.255.255.0. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1486,7 +1486,7 @@ scanner is supported by SANE prior to performing any configuration. SANE has a supported + url="http://www.sane-project.org/sane-supported-devices.html">supported devices list that can provide you with information about the support for a scanner and its status. The &man.uscanner.4; manual page also provides a list of supported ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -760,7 +760,7 @@ For example, if you have three dialup customers, fred, sam, and - mary, that you route class C networks + mary, that you route /24 CIDR networks for, you would type the following: &prompt.root; ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-fred @@ -826,8 +826,8 @@ The file /etc/ppp/ppp.linkup should also contain routing information for each static IP user if required. The line below would add a route - for the 203.14.101.0 - class C via the client's ppp link. + for the 203.14.101.0/24 + network via the client's ppp link. fred: add 203.14.101.0 netmask 255.255.255.0 HISADDR ==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#20 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1039,6 +1039,11 @@ &pgpkey.nectar; + + &a.nivit; + &pgpkey.nivit; + + &a.stefan; &pgpkey.stefan; ==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#20 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -169,6 +169,7 @@ + ==== //depot/projects/dtrace/ports/LEGAL#16 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.512 2006/12/04 16:28:34 vd Exp $ +# $FreeBSD: ports/LEGAL,v 1.513 2006/12/07 10:06:07 ale Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -357,7 +357,8 @@ jmf-*-alljava.zip java/jmf Redistribution of pre-compiled binaries is not permitted john-* security/john Crypto; export-controlled -jpgraph-* graphics/jpgraph Not for commercial use +jpgraph-1.* graphics/jpgraph Not for commercial use +jpgraph-2.* graphics/jpgraph2 Not for commercial use jre*i_ELF.*.tar.gz java/jre License does not allow distribution with fee jre118_v3-glibc-* java/linux-blackdown-jre11 License does not allow ==== //depot/projects/dtrace/ports/MOVED#35 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1197 2006/12/04 16:28:34 vd Exp $ +# $FreeBSD: ports/MOVED,v 1.1198 2006/12/07 10:52:37 ade Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2558,3 +2558,4 @@ editors/gedit-autocomplete-plugin||2006-12-04|Has expired: Not compatible with gedit versions >= 2.14 emulators/vmware2||2006-12-04|Has expired: Unfetchable finance/ccard||2006-12-04|Has expired: Project disappeared from the internet +devel/autoconf26|devel/autoconf261|2006-12-07|Move to correct location ==== //depot/projects/dtrace/ports/Mk/bsd.database.mk#6 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.database.mk,v 1.16 2006/10/07 10:22:24 miwi Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.17 2006/12/06 16:48:56 girgen Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -152,6 +152,7 @@ PGSQL74_LIBVER= 3 PGSQL80_LIBVER= 4 PGSQL81_LIBVER= 4 +PGSQL82_LIBVER= 5 # Setting/finding PostgreSQL version we want. .if exists(${LOCALBASE}/bin/pg_config) ==== //depot/projects/dtrace/ports/Mk/bsd.python.mk#8 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.python.mk,v 1.86 2006/11/30 13:51:28 pav Exp $ +# $FreeBSD: ports/Mk/bsd.python.mk,v 1.88 2006/12/08 21:50:19 alexbl Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include) @@ -99,10 +99,17 @@ # PYNUMERIC - Dependency line for the numeric extension. Py-Numeric-17 # is the last release that works with Python versions older # than 1.6. +# PYNUMPY - Dependency line for the new numeric extension.# py-numpy, Py-Numeric is deprecated. # # PYXML - Dependency line for the XML extension. As of Python-2.0, # this extension is in the base distribution. # +# PYEXPAT - Dependency line for the Expat XML Parser. As of Python-2.3.2, +# this module is in the base distribution. +# +# PYCTYPES - Dependency line for the ctypes package. As of Python-2.5, +# this module is in the base distribution. +# # USE_PYTHON_PREFIX - Says that the port installs in ${PYTHONBASE}. # # USE_PYDISTUTILS - Use distutils as do-configure, do-build and do-install @@ -419,6 +426,7 @@ # Python 3rd-party modules PYDISTUTILS= ${PYTHON_LIBDIR}/distutils/core.py:${PYTHON_PORTSDIR} PYNUMERIC= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric +PYNUMPY= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy PYXML= ${PYTHON_SITELIBDIR}/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml .if defined(PYTHON_REL) && ${PYTHON_REL} < 232 @@ -427,6 +435,12 @@ PYEXPAT= ${PYTHON_LIBDIR}/lib-dynload/pyexpat.so:${PYTHON_PORTSDIR} .endif +.if defined(PYTHON_REL) && ${PYTHON_REL} < 250 +PYCTYPES= ${PYTHON_SITELIBDIR}/ctypes/__init__.py:${PORTSDIR}/devel/py-ctypes +.else +PYCTYPES= ${PYTHON_LIBDIR}/ctypes/__init__py:${PYTHON_PORTSDIR} +.endif + # dependencies PYTHON_NO_DEPENDS?= NO ==== //depot/projects/dtrace/ports/Mk/bsd.sites.mk#14 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.403 2006/12/02 21:57:05 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.405 2006/12/06 14:37:53 acm Exp $ # # Where to put distfiles that don't have any other master site @@ -165,6 +165,17 @@ ${MASTER_SITE_DEBIAN:C|(/%SUBDIR%/)|/pool/main/${PORTNAME:C/^(.).*$/\1/}/${PORTNAME}/|} .endif +.if !defined(IGNORE_MASTER_SITE_EASYSW) +MASTER_SITE_EASYSW+= \ + http://ftp.easysw.com/pub/%SUBDIR%/ \ + ftp://ftp.easysw.com/pub/%SUBDIR%/ \ + ftp://ftp2.easysw.com/pub/%SUBDIR%/ \ + ftp://ftp3.easysw.com/pub/%SUBDIR%/ \ + http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/%SUBDIR%/ \ + ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/%SUBDIR%/ \ + ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/%SUBDIR%/ +.endif + .if !defined(IGNORE_MASTER_SITE_ECLIPSE) MASTER_SITE_ECLIPSE+= \ http://download.eclipse.org/eclipse/downloads/drops/%SUBDIR%/ \ @@ -708,6 +719,17 @@ ftp://melanoma.cs.rmit.edu.au/pub/NetBSD/packages/distfiles/%SUBDIR%/ .endif +.if !defined(IGNORE_MASTER_SITE_NVIDIA) +MASTER_SITE_NVIDIA+= \ + http://jp.download.nvidia.com/%SUBDIR%/ \ + http://us.download.nvidia.com/%SUBDIR%/ \ + http://tw.download.nvidia.com/%SUBDIR%/ \ + http://download.nvidia.com/%SUBDIR%/ \ + http://download1.nvidia.com/%SUBDIR%/ \ + ftp://download.nvidia.com/%SUBDIR%/ \ + ftp://download1.nvidia.com/%SUBDIR%/ +.endif + .if !defined(IGNORE_MASTER_SITE_OSSP) MASTER_SITE_OSSP+= \ ftp://ftp.ossp.org/pkg/%SUBDIR%/ \ ==== //depot/projects/dtrace/ports/UPDATING#27 (text+ko) ==== @@ -6,6 +6,24 @@ time you update your ports collection, before attempting any port upgrades. +20061207: + AFFECTS: users of devel/p5-PAR + AUTHOR: rafan@FreeBSD.org + + As of version 0.97.0, all PAR::Packer logic, i.e. pp, parl and + all packaging tools are moved to another distribution. You can + install devel/p5-PAR-Packer to get them. + +20061207: + AFFECTS: users of net/samba3 + AUTHOR: timur@gnu.org + + Version 3.0.23d of net/samba3 finally got ability to conditionaly + link smbd daemon against FAM libraries. If you don't need this + support make sure that it's not selected in the options menu - + run 'make config' to verify it. You can remove FAM package if it + was installed before as a part of Samba dependencies. + 20061201: AFFECTS: users of mail/assp AUTHOR: fbsd@opal.com @@ -4440,4 +4458,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.429 2006/12/01 08:14:19 miwi Exp $ +$FreeBSD: ports/UPDATING,v 1.431 2006/12/08 03:27:47 rafan Exp $ ==== //depot/projects/dtrace/src/ObsoleteFiles.inc#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.66 2006/12/01 16:23:25 piso Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.67 2006/12/07 01:24:38 avatar Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -735,6 +735,31 @@ OLD_FILES+=usr/sbin/stlstty OLD_FILES+=usr/sbin/ispppcontrol OLD_FILES+=usr/sbin/rndcontrol +# 20011001: UUCP migration to ports +OLD_FILES+=usr/bin/uucp +OLD_FILES+=usr/bin/uulog +OLD_FILES+=usr/bin/uuname +OLD_FILES+=usr/bin/uupick +OLD_FILES+=usr/bin/uusched +OLD_FILES+=usr/bin/uustat +OLD_FILES+=usr/bin/uuto +OLD_FILES+=usr/bin/uux +OLD_FILES+=usr/libexec/uucp/uucico +OLD_FILES+=usr/libexec/uucp/uuxqt +OLD_FILES+=usr/libexec/uucpd +OLD_FILES+=usr/share/man/man1/uuconv.1.gz +OLD_FILES+=usr/share/man/man1/uucp.1.gz +OLD_FILES+=usr/share/man/man1/uulog.1.gz +OLD_FILES+=usr/share/man/man1/uuname.1.gz +OLD_FILES+=usr/share/man/man1/uupick.1.gz +OLD_FILES+=usr/share/man/man1/uustat.1.gz +OLD_FILES+=usr/share/man/man1/uuto.1.gz +OLD_FILES+=usr/share/man/man1/uux.1.gz +OLD_FILES+=usr/share/man/man8/uuchk.8.gz +OLD_FILES+=usr/share/man/man8/uucico.8.gz +OLD_FILES+=usr/share/man/man8/uucpd.8.gz +OLD_FILES+=usr/share/man/man8/uusched.8.gz +OLD_FILES+=usr/share/man/man8/uuxqt.8.gz # 20010523 mount_portal -> mount_portalfs OLD_FILES+=sbin/mount_portal OLD_FILES+=usr/share/man/man8/mount_portal.8.gz @@ -3545,6 +3570,8 @@ OLD_DIRS+=usr/include/ntfs OLD_DIRS+=usr/include/nwfs OLD_DIRS+=usr/include/ufs/mfs +# 20011001: UUCP migration to ports +OLD_DIRS+=usr/libexec/uucp .include "tools/build/mk/OptionalObsoleteFiles.inc" ==== //depot/projects/dtrace/src/UPDATING#12 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20061205: + The removal of several facets of the experimental Threading + system from the kernel means that the proc and thread structures + have changed quite a bit. I suggest all kernel modules that might + reference these structures be recompiled.. Especially the + linux module. + 20061126: Sound infrastructure has been updated with various fixes and improvements. Most of the changes are pretty much transparent, @@ -675,4 +682,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.466 2006/11/26 12:24:04 ariff Exp $ +$FreeBSD: src/UPDATING,v 1.467 2006/12/06 06:39:47 julian Exp $ ==== //depot/projects/dtrace/src/bin/hostname/hostname.1#5 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)hostname.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.19 2006/12/05 12:09:50 ru Exp $ +.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.21 2006/12/08 07:47:08 kientzle Exp $ .\" -.Dd December 5, 2006 +.Dd December 7, 2006 .Dt HOSTNAME 1 .Os .Sh NAME @@ -37,7 +37,7 @@ .Nd set or print name of current host system .Sh SYNOPSIS .Nm -.Op Fl s +.Op Fl fs .Op Ar name-of-host .Sh DESCRIPTION The @@ -56,6 +56,9 @@ .Pp Options: .Bl -tag -width flag +.It Fl f +Include domain information in the printed name. +This is the default behavior. .It Fl s Trim off any domain information from the printed name. ==== //depot/projects/dtrace/src/bin/hostname/hostname.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.17 2005/01/10 08:39:22 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.19 2006/12/08 07:47:08 kientzle Exp $"); #include @@ -58,8 +58,15 @@ char *p, hostname[MAXHOSTNAMELEN]; sflag = 0; - while ((ch = getopt(argc, argv, "s")) != -1) + while ((ch = getopt(argc, argv, "fs")) != -1) switch (ch) { + case 'f': + /* + * On Linux, "hostname -f" prints FQDN. + * BSD "hostname" always prints FQDN by + * default, so we accept but ignore -f. + */ + break; case 's': sflag = 1; break; @@ -93,6 +100,6 @@ usage(void) { - (void)fprintf(stderr, "usage: hostname [-s] [name-of-host]\n"); + (void)fprintf(stderr, "usage: hostname [-fs] [name-of-host]\n"); exit(1); } ==== //depot/projects/dtrace/src/contrib/libbegemot/rpoll.c#4 (text+ko) ==== @@ -101,16 +101,16 @@ # endif -typedef signed long long tval_t; +typedef int64_t tval_t; -static inline tval_t GETMSECS(void); +static inline tval_t GETUSECS(void); static inline tval_t -GETMSECS(void) { +GETUSECS(void) { struct timeval tval; (void)gettimeofday(&tval, NULL); - return (tval_t)tval.tv_sec*1000+tval.tv_usec/1000; + return (tval_t)tval.tv_sec * 1000000 + tval.tv_usec; } /* @@ -170,11 +170,11 @@ * Now for timers */ typedef struct { - u_int msecs; /* millisecond value of the timer */ + uint64_t usecs; /* microsecond value of the timer */ int repeat; /* one shot or repeat? */ void *arg; /* client arg */ timer_f func; /* handler, 0 means disfunct */ - tval_t when; /* next time to trigger in msecs! */ + tval_t when; /* next time to trigger in usecs! */ } PollTim_t; /* how many records should our table grow at once? */ @@ -296,8 +296,8 @@ poll_unblocksig(); if(rpoll_trace) - fprintf(stderr, "poll_register(%d, %#lx, %#lx, %#x)->%d", - fd, (u_long)func, (u_long)arg, mask, p - regs); + fprintf(stderr, "poll_register(%d, %p, %p, %#x)->%tu", + fd, (void *)func, (void *)arg, mask, p - regs); return p - regs; } @@ -373,6 +373,13 @@ int poll_start_timer(u_int msecs, int repeat, timer_f func, void *arg) { + return (poll_start_utimer((unsigned long long)msecs * 1000, + repeat, func, arg)); +} + +int +poll_start_utimer(unsigned long long usecs, int repeat, timer_f func, void *arg) +{ PollTim_t *p; /* find unused entry */ @@ -392,19 +399,19 @@ } /* create entry */ - p->msecs = msecs; + p->usecs = usecs; p->repeat = repeat; p->arg = arg; p->func = func; - p->when = GETMSECS() + msecs; + p->when = GETUSECS() + usecs; tims_used++; resort = 1; if(rpoll_trace) - fprintf(stderr, "poll_start_timer(%u, %d, %#lx, %#lx)->%u", - msecs, repeat, (u_long)func, (u_long)arg, p - tims); + fprintf(stderr, "poll_start_utimer(%llu, %d, %p, %p)->%tu", + usecs, repeat, (void *)func, (void *)arg, p - tims); return p - tims; } @@ -497,7 +504,7 @@ u_int i, idx; int ret; tval_t now; - int tout; + tval_t tout; static u_int last_index; # ifdef USE_SELECT @@ -519,12 +526,13 @@ /* in wait mode - compute the timeout */ if(wait) { if(tfd_used) { - now = GETMSECS(); + now = GETUSECS(); # ifdef DEBUG { - fprintf(stderr, "now=%"QUADFMT"u", now); + fprintf(stderr, "now=%llu", now); for(i = 0; i < tims_used; i++) - fprintf(stderr, "timers[%2d] = %"QUADFMT"d", i, tfd[i]->when - now); + fprintf(stderr, "timers[%2d] = %lld", + i, tfd[i]->when - now); } # endif if((tout = tims[tfd[0]].when - now) < 0) @@ -539,7 +547,7 @@ # endif # ifdef USE_POLL - ret = poll(pfd, regs_used, tout); + ret = poll(pfd, regs_used, tout == INFTIM ? INFTIM : (tout / 1000)); # endif # ifdef USE_SELECT @@ -547,13 +555,13 @@ nwset = wset; nxset = xset; if(tout != INFTIM) { - tv.tv_sec = tout / 1000; - tv.tv_usec = (tout % 1000) * 1000; + tv.tv_sec = tout / 1000000; + tv.tv_usec = tout % 1000000; } ret = select(maxfd+1, SELECT_CAST(&nrset), SELECT_CAST(&nwset), - SELECT_CAST(&nxset), (tout==INFTIM) ? 0 : &tv); + SELECT_CAST(&nxset), (tout==INFTIM) ? NULL : &tv); # endif if(ret == -1) { @@ -574,20 +582,26 @@ # ifdef USE_POLL if(regs[idx].pfd) { - if(regs[idx].pfd->revents & poll_in) + if ((regs[idx].mask & POLL_IN) && + (regs[idx].pfd->revents & poll_in)) mask |= POLL_IN; - if(regs[idx].pfd->revents & poll_out) + if ((regs[idx].mask & POLL_OUT) && + (regs[idx].pfd->revents & poll_out)) mask |= POLL_OUT; - if(regs[idx].pfd->revents & poll_except) + if((regs[idx].mask & POLL_EXCEPT) && + (regs[idx].pfd->revents & poll_except)) mask |= POLL_EXCEPT; } # endif # ifdef USE_SELECT - if(FD_ISSET(regs[idx].fd, &nrset)) + if ((regs[idx].mask & POLL_IN) && + FD_ISSET(regs[idx].fd, &nrset)) mask |= POLL_IN; - if(FD_ISSET(regs[idx].fd, &nwset)) + if ((regs[idx].mask & POLL_OUT) && + FD_ISSET(regs[idx].fd, &nwset)) mask |= POLL_OUT; - if(FD_ISSET(regs[idx].fd, &nxset)) + if ((regs[idx].mask & POLL_EXCEPT) && + FD_ISSET(regs[idx].fd, &nxset)) mask |= POLL_EXCEPT; # endif assert(idx < regs_alloc); @@ -595,8 +609,8 @@ if(mask) { if(rpoll_trace) fprintf(stderr, "poll_dispatch() -- " - "file %d/%d", - regs[idx].fd, idx); + "file %d/%d %x", + regs[idx].fd, idx, mask); (*regs[idx].func)(regs[idx].fd, mask, regs[idx].arg); } } @@ -607,7 +621,7 @@ /* dispatch timeouts */ if(tfd_used) { - now = GETMSECS(); + now = GETUSECS(); for(i = 0; i < tfd_used; i++) { if(tfd[i] < 0) continue; @@ -619,7 +633,7 @@ if(tfd[i] < 0) continue; if(tims[tfd[i]].repeat) - tims[tfd[i]].when = now + tims[tfd[i]].msecs; + tims[tfd[i]].when = now + tims[tfd[i]].usecs; else { tims[tfd[i]].func = NULL; tims_used--; @@ -644,8 +658,8 @@ { gettimeofday(&now, NULL); - return (double)(10 * now.tv_sec + now.tv_usec / 100000 - 10 * start.tv_sec - start.tv_usec / 100000) - / 10; + return (double)(10 * now.tv_sec + now.tv_usec / 100000 - + 10 * start.tv_sec - start.tv_usec / 100000) / 10; } void @@ -675,6 +689,14 @@ { printf("%4.1f -- %d: %s\n", elaps(), tid, (char *)arg); } +void +tfunc2(int tid, void *arg) +{ + static u_int count = 0; + + if (++count % 10000 == 0) + printf("%4.1f -- %d\n", elaps(), tid); +} void first(int tid, void *arg); void second(int tid, void *arg); @@ -683,7 +705,7 @@ second(int tid, void *arg) { printf("%4.1f -- %d: %s\n", elaps(), tid, (char *)arg); - poll_start_timer(5500, 0, first, "first"); + poll_start_utimer(5500000, 0, first, "first"); poll_stop_timer(t1); t0 = poll_start_timer(1000, 1, tfunc0, "1 second"); } @@ -699,12 +721,16 @@ int main(int argc, char *argv[]) { - argc = argc; argv = argv; gettimeofday(&start, NULL); poll_register(0, infunc, NULL, POLL_IN); - t0 = poll_start_timer(1000, 1, tfunc0, "1 second"); - poll_start_timer(2500, 0, first, "first"); + + if (argc < 2) { + t0 = poll_start_timer(1000, 1, tfunc0, "1 second"); + poll_start_timer(2500, 0, first, "first"); + } else { + t0 = poll_start_utimer(300, 1, tfunc2, NULL); + } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 9 01:30:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CBEE16A492; Sat, 9 Dec 2006 01:30:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E71CB16A47B for ; Sat, 9 Dec 2006 01:30:48 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 708C243CC0 for ; Sat, 9 Dec 2006 01:29:43 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB91UhdW019012 for ; Sat, 9 Dec 2006 01:30:43 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB91Uhd0019009 for perforce@freebsd.org; Sat, 9 Dec 2006 01:30:43 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 9 Dec 2006 01:30:43 GMT Message-Id: <200612090130.kB91Uhd0019009@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111307 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Dec 2006 01:30:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=111307 Change 111307 by mjacob@newisp on 2006/12/09 01:30:28 Fix tagged queueing nukage. Affected files ... .. //depot/projects/newisp/dev/isp/isp_freebsd.c#33 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_freebsd.c#33 (text+ko) ==== @@ -2744,6 +2744,8 @@ CAMLOCK_2_ISPLOCK(isp); if (IS_FC(isp)) { fcparam *fcp = isp->isp_param; + struct ccb_trans_settings_scsi *scsi = + &cts->proto_specific.scsi; struct ccb_trans_settings_fc *fc = &cts->xport_specific.fc; @@ -2752,11 +2754,14 @@ cts->transport = XPORT_FC; cts->transport_version = 0; + scsi->valid = CTS_SCSI_VALID_TQ; + scsi->flags = CTS_SCSI_FLAGS_TAG_ENB; fc->valid = CTS_FC_VALID_SPEED; - if (fcp->isp_gbspeed == 2) + if (fcp->isp_gbspeed == 2) { fc->bitrate = 200000; - else + } else { fc->bitrate = 100000; + } if (tgt > 0 && tgt < MAX_FC_TARG) { fcportdb_t *lp = &fcp->portdb[tgt]; fc->wwnn = lp->node_wwn; From owner-p4-projects@FreeBSD.ORG Sat Dec 9 04:34:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22F9616A417; Sat, 9 Dec 2006 04:34:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B688016A403 for ; Sat, 9 Dec 2006 04:34:04 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDF9543CA3 for ; Sat, 9 Dec 2006 04:33:02 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB94Y4Cu051837 for ; Sat, 9 Dec 2006 04:34:04 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB94Vvfi050969 for perforce@freebsd.org; Sat, 9 Dec 2006 04:31:57 GMT (envelope-from marcel@freebsd.org) Date: Sat, 9 Dec 2006 04:31:57 GMT Message-Id: <200612090431.kB94Vvfi050969@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 111312 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Dec 2006 04:34:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=111312 Change 111312 by marcel@marcel_cluster on 2006/12/09 04:28:32 IFC @111311 Affected files ... .. //depot/projects/powerpc/sys/Makefile#3 integrate .. //depot/projects/powerpc/sys/alpha/Makefile#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/alpha-gdbstub.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/api_up1000.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/atomic.s#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/autoconf.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/busdma_machdep.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/busspace.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/clock.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/clock_if.m#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/cpuconf.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/critical.c#2 delete .. //depot/projects/powerpc/sys/alpha/alpha/db_disasm.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/db_instruction.h#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/db_interface.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/db_trace.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/dec_1000a.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/dec_2100_a50.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/dec_2100_a500.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/dec_3000_300.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/dec_3000_500.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/dec_axppci_33.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/dec_eb164.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/dec_eb64plus.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/dec_kn20aa.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/dec_kn300.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/dec_kn8ae.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/dec_st550.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/dec_st6600.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/divrem.m4#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/dump_machdep.c#2 delete .. //depot/projects/powerpc/sys/alpha/alpha/elf_machdep.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/exception.s#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/fp_emulate.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/genassym.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/ieee_float.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/ieee_float.h#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/in_cksum.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/interrupt.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/locore.s#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/machdep.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/mem.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/mp_machdep.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/pal.s#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/pmap.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/procfs_machdep.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/prom.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/prom_disp.s#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/promcons.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/setdef0.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/setdef1.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/sgmap.c#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/support.s#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/swtch.s#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/sys_machdep.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/timerreg.h#3 delete .. //depot/projects/powerpc/sys/alpha/alpha/trap.c#4 delete .. //depot/projects/powerpc/sys/alpha/alpha/vm_machdep.c#4 delete .. //depot/projects/powerpc/sys/alpha/compile/.cvsignore#3 delete .. //depot/projects/powerpc/sys/alpha/conf/GENERIC#4 delete .. //depot/projects/powerpc/sys/alpha/conf/GENERIC.hints#3 delete .. //depot/projects/powerpc/sys/alpha/conf/SIMOS#4 delete .. //depot/projects/powerpc/sys/alpha/conf/gethints.pl#3 delete .. //depot/projects/powerpc/sys/alpha/include/_inttypes.h#2 delete .. //depot/projects/powerpc/sys/alpha/include/alpha_cpu.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/ansi.h#4 delete .. //depot/projects/powerpc/sys/alpha/include/asm.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/atomic.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/bootinfo.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/bus.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/bus_memio.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/bus_pio.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/bwx.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/chipset.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/clock.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/clockvar.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/cpu.h#4 delete .. //depot/projects/powerpc/sys/alpha/include/cpuconf.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/cpufunc.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/critical.h#2 delete .. //depot/projects/powerpc/sys/alpha/include/db_machdep.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/elf.h#4 delete .. //depot/projects/powerpc/sys/alpha/include/endian.h#4 delete .. //depot/projects/powerpc/sys/alpha/include/exec.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/float.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/floatingpoint.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/fpu.h#4 delete .. //depot/projects/powerpc/sys/alpha/include/frame.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/globaldata.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/globals.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/ieee.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/ieeefp.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/in_cksum.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/inst.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/intr.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/intrcnt.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/ioctl_bt848.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/ioctl_meteor.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/limits.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/md_var.h#4 delete .. //depot/projects/powerpc/sys/alpha/include/mutex.h#4 delete .. //depot/projects/powerpc/sys/alpha/include/pal.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/param.h#4 delete .. //depot/projects/powerpc/sys/alpha/include/pc/bios.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/pc/display.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/pc/msdos.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/pc/vesa.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/pcb.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/pcpu.h#2 delete .. //depot/projects/powerpc/sys/alpha/include/pmap.h#4 delete .. //depot/projects/powerpc/sys/alpha/include/proc.h#4 delete .. //depot/projects/powerpc/sys/alpha/include/profile.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/prom.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/psl.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/pte.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/ptrace.h#4 delete .. //depot/projects/powerpc/sys/alpha/include/reg.h#4 delete .. //depot/projects/powerpc/sys/alpha/include/reloc.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/resource.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/rpb.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/runq.h#2 delete .. //depot/projects/powerpc/sys/alpha/include/setjmp.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/sgmap.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/sigframe.h#4 delete .. //depot/projects/powerpc/sys/alpha/include/signal.h#4 delete .. //depot/projects/powerpc/sys/alpha/include/smp.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/stdarg.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/swiz.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/sysarch.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/types.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/ucontext.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/varargs.h#3 delete .. //depot/projects/powerpc/sys/alpha/include/vmparam.h#4 delete .. //depot/projects/powerpc/sys/alpha/isa/isa.c#3 delete .. //depot/projects/powerpc/sys/alpha/isa/isa_dma.c#3 delete .. //depot/projects/powerpc/sys/alpha/isa/isavar.h#3 delete .. //depot/projects/powerpc/sys/alpha/isa/mcclock_isa.c#3 delete .. //depot/projects/powerpc/sys/alpha/linux/Makefile#3 delete .. //depot/projects/powerpc/sys/alpha/linux/linux.h#4 delete .. //depot/projects/powerpc/sys/alpha/linux/linux_dummy.c#4 delete .. //depot/projects/powerpc/sys/alpha/linux/linux_genassym.c#4 delete .. //depot/projects/powerpc/sys/alpha/linux/linux_ioctl.h#2 delete .. //depot/projects/powerpc/sys/alpha/linux/linux_locore.s#3 delete .. //depot/projects/powerpc/sys/alpha/linux/linux_machdep.c#4 delete .. //depot/projects/powerpc/sys/alpha/linux/linux_proto.h#4 delete .. //depot/projects/powerpc/sys/alpha/linux/linux_syscall.h#4 delete .. //depot/projects/powerpc/sys/alpha/linux/linux_sysent.c#4 delete .. //depot/projects/powerpc/sys/alpha/linux/linux_sysvec.c#4 delete .. //depot/projects/powerpc/sys/alpha/linux/syscalls.conf#3 delete .. //depot/projects/powerpc/sys/alpha/linux/syscalls.master#4 delete .. //depot/projects/powerpc/sys/alpha/mcbus/mcbus.c#3 delete .. //depot/projects/powerpc/sys/alpha/mcbus/mcbusreg.h#3 delete .. //depot/projects/powerpc/sys/alpha/mcbus/mcbusvar.h#3 delete .. //depot/projects/powerpc/sys/alpha/mcbus/mcmem.c#3 delete .. //depot/projects/powerpc/sys/alpha/mcbus/mcpcia.c#3 delete .. //depot/projects/powerpc/sys/alpha/mcbus/mcpciareg.h#3 delete .. //depot/projects/powerpc/sys/alpha/mcbus/mcpciavar.h#3 delete .. //depot/projects/powerpc/sys/alpha/osf1/Makefile#3 delete .. //depot/projects/powerpc/sys/alpha/osf1/README.mach-traps#3 delete .. //depot/projects/powerpc/sys/alpha/osf1/exec_ecoff.h#3 delete .. //depot/projects/powerpc/sys/alpha/osf1/imgact_osf1.c#4 delete .. //depot/projects/powerpc/sys/alpha/osf1/osf1.h#3 delete .. //depot/projects/powerpc/sys/alpha/osf1/osf1_ioctl.c#4 delete .. //depot/projects/powerpc/sys/alpha/osf1/osf1_misc.c#4 delete .. //depot/projects/powerpc/sys/alpha/osf1/osf1_mount.c#4 delete .. //depot/projects/powerpc/sys/alpha/osf1/osf1_proto.h#4 delete .. //depot/projects/powerpc/sys/alpha/osf1/osf1_signal.c#4 delete .. //depot/projects/powerpc/sys/alpha/osf1/osf1_signal.h#3 delete .. //depot/projects/powerpc/sys/alpha/osf1/osf1_syscall.h#4 delete .. //depot/projects/powerpc/sys/alpha/osf1/osf1_sysent.c#4 delete .. //depot/projects/powerpc/sys/alpha/osf1/osf1_sysvec.c#3 delete .. //depot/projects/powerpc/sys/alpha/osf1/osf1_util.h#4 delete .. //depot/projects/powerpc/sys/alpha/osf1/syscalls.conf#3 delete .. //depot/projects/powerpc/sys/alpha/osf1/syscalls.master#4 delete .. //depot/projects/powerpc/sys/alpha/pci/alphapci_if.m#3 delete .. //depot/projects/powerpc/sys/alpha/pci/apecs.c#3 delete .. //depot/projects/powerpc/sys/alpha/pci/apecs_pci.c#3 delete .. //depot/projects/powerpc/sys/alpha/pci/apecsreg.h#3 delete .. //depot/projects/powerpc/sys/alpha/pci/apecsvar.h#3 delete .. //depot/projects/powerpc/sys/alpha/pci/bwx.c#3 delete .. //depot/projects/powerpc/sys/alpha/pci/cia.c#3 delete .. //depot/projects/powerpc/sys/alpha/pci/cia_pci.c#3 delete .. //depot/projects/powerpc/sys/alpha/pci/ciareg.h#3 delete .. //depot/projects/powerpc/sys/alpha/pci/ciavar.h#3 delete .. //depot/projects/powerpc/sys/alpha/pci/irongate.c#3 delete .. //depot/projects/powerpc/sys/alpha/pci/irongate_pci.c#3 delete .. //depot/projects/powerpc/sys/alpha/pci/irongatereg.h#3 delete .. //depot/projects/powerpc/sys/alpha/pci/irongatevar.h#3 delete .. //depot/projects/powerpc/sys/alpha/pci/lca.c#3 delete .. //depot/projects/powerpc/sys/alpha/pci/lca_pci.c#3 delete .. //depot/projects/powerpc/sys/alpha/pci/lcareg.h#3 delete .. //depot/projects/powerpc/sys/alpha/pci/lcavar.h#3 delete .. //depot/projects/powerpc/sys/alpha/pci/pci_eb164_intr.s#3 delete .. //depot/projects/powerpc/sys/alpha/pci/pci_eb64plus_intr.s#3 delete .. //depot/projects/powerpc/sys/alpha/pci/pcibus.c#3 delete .. //depot/projects/powerpc/sys/alpha/pci/pcibus.h#3 delete .. //depot/projects/powerpc/sys/alpha/pci/swiz.c#3 delete .. //depot/projects/powerpc/sys/alpha/pci/t2.c#3 delete .. //depot/projects/powerpc/sys/alpha/pci/t2_pci.c#3 delete .. //depot/projects/powerpc/sys/alpha/pci/t2reg.h#3 delete .. //depot/projects/powerpc/sys/alpha/pci/t2var.h#3 delete .. //depot/projects/powerpc/sys/alpha/pci/tsunami.c#3 delete .. //depot/projects/powerpc/sys/alpha/pci/tsunami_pci.c#3 delete .. //depot/projects/powerpc/sys/alpha/pci/tsunamireg.h#3 delete .. //depot/projects/powerpc/sys/alpha/pci/tsunamivar.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/am7990.c#3 delete .. //depot/projects/powerpc/sys/alpha/tc/am7990reg.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/am7990var.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/ascvar.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/esp.c#3 delete .. //depot/projects/powerpc/sys/alpha/tc/espreg.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/espvar.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/if_le_dec.c#3 delete .. //depot/projects/powerpc/sys/alpha/tc/if_le_ioasic.c#3 delete .. //depot/projects/powerpc/sys/alpha/tc/if_levar.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/ioasic.c#3 delete .. //depot/projects/powerpc/sys/alpha/tc/ioasicreg.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/ioasicvar.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/mcclock_ioasic.c#3 delete .. //depot/projects/powerpc/sys/alpha/tc/sticreg.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/sticvar.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/tc.c#3 delete .. //depot/projects/powerpc/sys/alpha/tc/tcasic.c#3 delete .. //depot/projects/powerpc/sys/alpha/tc/tcdevs.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/tcdevs_data.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/tcds.c#3 delete .. //depot/projects/powerpc/sys/alpha/tc/tcds_dma.c#3 delete .. //depot/projects/powerpc/sys/alpha/tc/tcdsreg.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/tcdsvar.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/tcreg.h#3 delete .. //depot/projects/powerpc/sys/alpha/tc/tcvar.h#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/dwlpx.c#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/dwlpxreg.h#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/dwlpxvar.h#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/gbus.c#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/gbusreg.h#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/gbusvar.h#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/kftxx.c#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/kftxxreg.h#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/kftxxvar.h#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/mcclock_tlsb.c#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/tlsb.c#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/tlsbcpu.c#4 delete .. //depot/projects/powerpc/sys/alpha/tlsb/tlsbmem.c#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/tlsbreg.h#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/tlsbvar.h#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/zs_tlsb.c#4 delete .. //depot/projects/powerpc/sys/alpha/tlsb/zsreg.h#3 delete .. //depot/projects/powerpc/sys/alpha/tlsb/zsvar.h#3 delete .. //depot/projects/powerpc/sys/amd64/Makefile#1 branch .. //depot/projects/powerpc/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/powerpc/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/powerpc/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/io.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/support.S#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/powerpc/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/powerpc/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/powerpc/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/powerpc/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/powerpc/sys/amd64/conf/MAC#1 branch .. //depot/projects/powerpc/sys/amd64/conf/Makefile#1 branch .. //depot/projects/powerpc/sys/amd64/conf/NOTES#1 branch .. //depot/projects/powerpc/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/powerpc/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/powerpc/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/powerpc/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/powerpc/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/powerpc/sys/amd64/include/_bus.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/_limits.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/_types.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/asm.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/atomic.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/bus.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/clock.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/cpu.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/elf.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/endian.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/exec.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/float.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/fpu.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/frame.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/iodev.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/kdb.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/limits.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/md_var.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/memdev.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/metadata.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/minidump.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/mptable.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/mutex.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/param.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/pcb.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/pmap.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/proc.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/profile.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/psl.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/reg.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/reloc.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/resource.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/runq.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/segments.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/signal.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/smp.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/trap.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/tss.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/varargs.h#1 branch .. //depot/projects/powerpc/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/powerpc/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/powerpc/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/powerpc/sys/amd64/isa/clock.c#1 branch .. //depot/projects/powerpc/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/powerpc/sys/amd64/isa/icu.h#1 branch .. //depot/projects/powerpc/sys/amd64/isa/isa.c#1 branch .. //depot/projects/powerpc/sys/amd64/isa/isa.h#1 branch .. //depot/projects/powerpc/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/powerpc/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/powerpc/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/powerpc/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/powerpc/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/powerpc/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/powerpc/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/powerpc/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/powerpc/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/powerpc/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/powerpc/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/powerpc/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/powerpc/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/powerpc/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/powerpc/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/powerpc/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/blockio.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/copystr.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/disassem.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/exception.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/fiq.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/fusu.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/genassym.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/inckern.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/intr.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/locore.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/machdep.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/mem.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/nexus.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/pmap.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/setstack.s#1 branch .. //depot/projects/powerpc/sys/arm/arm/support.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/swtch.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/trap.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/undefined.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/vectors.S#1 branch .. //depot/projects/powerpc/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91.c#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/at91var.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/files.at91#1 branch .. //depot/projects/powerpc/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/powerpc/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/powerpc/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/powerpc/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/powerpc/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/powerpc/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/powerpc/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/powerpc/sys/arm/at91/std.at91#1 branch .. //depot/projects/powerpc/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/powerpc/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/powerpc/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/powerpc/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/powerpc/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/powerpc/sys/arm/conf/AVILA#1 branch .. //depot/projects/powerpc/sys/arm/conf/EP80219#1 branch .. //depot/projects/powerpc/sys/arm/conf/IQ31244#1 branch .. //depot/projects/powerpc/sys/arm/conf/KB920X#1 branch .. //depot/projects/powerpc/sys/arm/conf/SIMICS#1 branch .. //depot/projects/powerpc/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/powerpc/sys/arm/include/_bus.h#1 branch .. //depot/projects/powerpc/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/powerpc/sys/arm/include/_limits.h#1 branch .. //depot/projects/powerpc/sys/arm/include/_stdint.h#1 branch .. //depot/projects/powerpc/sys/arm/include/_types.h#1 branch .. //depot/projects/powerpc/sys/arm/include/ansi.h#4 delete .. //depot/projects/powerpc/sys/arm/include/armreg.h#1 branch .. //depot/projects/powerpc/sys/arm/include/asm.h#1 branch .. //depot/projects/powerpc/sys/arm/include/asmacros.h#1 branch .. //depot/projects/powerpc/sys/arm/include/atomic.h#1 branch .. //depot/projects/powerpc/sys/arm/include/blockio.h#1 branch .. //depot/projects/powerpc/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/powerpc/sys/arm/include/bus.h#1 branch .. //depot/projects/powerpc/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/powerpc/sys/arm/include/clock.h#1 branch .. //depot/projects/powerpc/sys/arm/include/cpu.h#1 branch .. //depot/projects/powerpc/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/powerpc/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/powerpc/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/powerpc/sys/arm/include/disassem.h#1 branch .. //depot/projects/powerpc/sys/arm/include/elf.h#4 integrate .. //depot/projects/powerpc/sys/arm/include/endian.h#3 integrate .. //depot/projects/powerpc/sys/arm/include/exec.h#3 integrate .. //depot/projects/powerpc/sys/arm/include/fiq.h#1 branch .. //depot/projects/powerpc/sys/arm/include/float.h#1 branch .. //depot/projects/powerpc/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/powerpc/sys/arm/include/fp.h#1 branch .. //depot/projects/powerpc/sys/arm/include/frame.h#1 branch .. //depot/projects/powerpc/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/powerpc/sys/arm/include/ieee.h#1 branch .. //depot/projects/powerpc/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/powerpc/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/powerpc/sys/arm/include/intr.h#1 branch .. //depot/projects/powerpc/sys/arm/include/katelib.h#1 branch .. //depot/projects/powerpc/sys/arm/include/kdb.h#1 branch .. //depot/projects/powerpc/sys/arm/include/limits.h#2 integrate .. //depot/projects/powerpc/sys/arm/include/machdep.h#1 branch .. //depot/projects/powerpc/sys/arm/include/md_var.h#1 branch .. //depot/projects/powerpc/sys/arm/include/memdev.h#1 branch .. //depot/projects/powerpc/sys/arm/include/metadata.h#1 branch .. //depot/projects/powerpc/sys/arm/include/mutex.h#1 branch .. //depot/projects/powerpc/sys/arm/include/param.h#3 integrate .. //depot/projects/powerpc/sys/arm/include/pcb.h#1 branch .. //depot/projects/powerpc/sys/arm/include/pcpu.h#1 branch .. //depot/projects/powerpc/sys/arm/include/pmap.h#1 branch .. //depot/projects/powerpc/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/powerpc/sys/arm/include/proc.h#1 branch .. //depot/projects/powerpc/sys/arm/include/profile.h#1 branch .. //depot/projects/powerpc/sys/arm/include/psl.h#1 branch .. //depot/projects/powerpc/sys/arm/include/pte.h#1 branch .. //depot/projects/powerpc/sys/arm/include/ptrace.h#1 branch .. //depot/projects/powerpc/sys/arm/include/reg.h#1 branch .. //depot/projects/powerpc/sys/arm/include/reloc.h#1 branch .. //depot/projects/powerpc/sys/arm/include/resource.h#1 branch .. //depot/projects/powerpc/sys/arm/include/runq.h#1 branch .. //depot/projects/powerpc/sys/arm/include/setjmp.h#1 branch .. //depot/projects/powerpc/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/powerpc/sys/arm/include/sigframe.h#1 branch .. //depot/projects/powerpc/sys/arm/include/signal.h#2 integrate .. //depot/projects/powerpc/sys/arm/include/smp.h#1 branch .. //depot/projects/powerpc/sys/arm/include/stdarg.h#1 branch .. //depot/projects/powerpc/sys/arm/include/swi.h#1 branch .. //depot/projects/powerpc/sys/arm/include/sysarch.h#1 branch .. //depot/projects/powerpc/sys/arm/include/trap.h#1 branch .. //depot/projects/powerpc/sys/arm/include/types.h#2 delete .. //depot/projects/powerpc/sys/arm/include/ucontext.h#2 integrate .. //depot/projects/powerpc/sys/arm/include/undefined.h#1 branch .. //depot/projects/powerpc/sys/arm/include/utrap.h#1 branch .. //depot/projects/powerpc/sys/arm/include/vmparam.h#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/powerpc/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/powerpc/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/powerpc/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/powerpc/sys/boot/Makefile#4 integrate .. //depot/projects/powerpc/sys/boot/README#3 integrate .. //depot/projects/powerpc/sys/boot/alpha/Makefile#3 delete .. //depot/projects/powerpc/sys/boot/alpha/Makefile.inc#3 delete .. //depot/projects/powerpc/sys/boot/alpha/boot1/Makefile#3 delete .. //depot/projects/powerpc/sys/boot/alpha/boot1/boot1.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/boot1/sys.c#2 delete .. //depot/projects/powerpc/sys/boot/alpha/cdboot/Makefile#3 delete .. //depot/projects/powerpc/sys/boot/alpha/cdboot/version#3 delete .. //depot/projects/powerpc/sys/boot/alpha/common/Makefile.common#4 delete .. //depot/projects/powerpc/sys/boot/alpha/common/conf.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/common/help.alpha#3 delete .. //depot/projects/powerpc/sys/boot/alpha/common/main.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/Makefile#4 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/OSFpal.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/alpha_copy.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/alpha_module.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/bbinfo.h#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/bootinfo.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/common.h#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/delay.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/devicename.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/elf_freebsd.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/getsecs.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/libalpha.h#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/pal.S#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/prom.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/prom_disp.S#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/prom_swpal.S#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/reboot.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/srmdisk.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/srmnet.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/start.S#3 delete .. //depot/projects/powerpc/sys/boot/alpha/libalpha/time.c#3 delete .. //depot/projects/powerpc/sys/boot/alpha/loader/Makefile#3 delete .. //depot/projects/powerpc/sys/boot/alpha/loader/version#3 delete .. //depot/projects/powerpc/sys/boot/alpha/netboot/Makefile#3 delete .. //depot/projects/powerpc/sys/boot/alpha/netboot/version#3 delete .. //depot/projects/powerpc/sys/boot/arc/Makefile#3 delete .. //depot/projects/powerpc/sys/boot/arc/Makefile.inc#3 delete .. //depot/projects/powerpc/sys/boot/arc/include/arcfuncs.h#3 delete .. //depot/projects/powerpc/sys/boot/arc/include/arctypes.h#3 delete .. //depot/projects/powerpc/sys/boot/arc/include/libarc.h#3 delete .. //depot/projects/powerpc/sys/boot/arc/lib/Makefile#4 delete .. //depot/projects/powerpc/sys/boot/arc/lib/abort.c#3 delete .. //depot/projects/powerpc/sys/boot/arc/lib/arcconsole.c#3 delete .. //depot/projects/powerpc/sys/boot/arc/lib/arcdisk.c#3 delete .. //depot/projects/powerpc/sys/boot/arc/lib/arch/alpha/copy.c#3 delete .. //depot/projects/powerpc/sys/boot/arc/lib/arch/alpha/rpb.c#3 delete .. //depot/projects/powerpc/sys/boot/arc/lib/arch/alpha/setjmp.S#3 delete .. //depot/projects/powerpc/sys/boot/arc/lib/arch/alpha/start.S#3 delete .. //depot/projects/powerpc/sys/boot/arc/lib/bootinfo.c#3 delete .. //depot/projects/powerpc/sys/boot/arc/lib/delay.c#3 delete .. //depot/projects/powerpc/sys/boot/arc/lib/devicename.c#3 delete .. //depot/projects/powerpc/sys/boot/arc/lib/elf_freebsd.c#3 delete .. //depot/projects/powerpc/sys/boot/arc/lib/module.c#3 delete .. //depot/projects/powerpc/sys/boot/arc/lib/prom.c#3 delete .. //depot/projects/powerpc/sys/boot/arc/lib/setjmperr.c#3 delete .. //depot/projects/powerpc/sys/boot/arc/lib/time.c#3 delete .. //depot/projects/powerpc/sys/boot/arc/loader/Makefile#3 delete .. //depot/projects/powerpc/sys/boot/arc/loader/conf.c#3 delete .. //depot/projects/powerpc/sys/boot/arc/loader/help.alpha#3 delete .. //depot/projects/powerpc/sys/boot/arc/loader/main.c#3 delete .. //depot/projects/powerpc/sys/boot/arc/loader/version#3 delete .. //depot/projects/powerpc/sys/boot/arm/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/powerpc/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/powerpc/sys/boot/common/Makefile.inc#3 integrate .. //depot/projects/powerpc/sys/boot/common/bcache.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/boot.c#4 integrate .. //depot/projects/powerpc/sys/boot/common/bootstrap.h#4 integrate .. //depot/projects/powerpc/sys/boot/common/commands.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/console.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/devopen.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/help.common#3 integrate .. //depot/projects/powerpc/sys/boot/common/interp.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/interp_backslash.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/interp_forth.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/interp_parse.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/isapnp.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/load.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/load_aout.c#4 delete .. //depot/projects/powerpc/sys/boot/common/load_elf.c#4 integrate .. //depot/projects/powerpc/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/powerpc/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/powerpc/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/powerpc/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/powerpc/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/powerpc/sys/boot/common/loader.8#4 integrate .. //depot/projects/powerpc/sys/boot/common/ls.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/merge_help.awk#3 integrate .. //depot/projects/powerpc/sys/boot/common/misc.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/module.c#4 integrate .. //depot/projects/powerpc/sys/boot/common/newvers.sh#3 integrate .. //depot/projects/powerpc/sys/boot/common/panic.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/pnp.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/powerpc/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/powerpc/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/powerpc/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/powerpc/sys/boot/efi/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/efi/Makefile.inc#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/README#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efi.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efi_nii.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efiapi.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/eficon.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efidebug.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efidef.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efidevp.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efierr.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efifs.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efilib.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efinet.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efipart.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efiprot.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efipxebc.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efiser.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efistdarg.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/i386/efibind.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/i386/pe.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/ia64/efibind.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/include/ia64/pe.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/Makefile#4 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#4 delete .. //depot/projects/powerpc/sys/boot/efi/libefi/arch/ia64/start.S#3 delete .. //depot/projects/powerpc/sys/boot/efi/libefi/bootinfo.c#3 delete .. //depot/projects/powerpc/sys/boot/efi/libefi/copy.c#4 delete .. //depot/projects/powerpc/sys/boot/efi/libefi/delay.c#3 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/devicename.c#4 delete .. //depot/projects/powerpc/sys/boot/efi/libefi/efi_console.c#3 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/efiboot.h#4 delete .. //depot/projects/powerpc/sys/boot/efi/libefi/efifpswa.c#2 delete .. //depot/projects/powerpc/sys/boot/efi/libefi/efifs.c#3 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/efinet.c#3 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/elf_freebsd.c#4 delete .. //depot/projects/powerpc/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/powerpc/sys/boot/efi/libefi/exit.c#3 delete .. //depot/projects/powerpc/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/powerpc/sys/boot/efi/libefi/libefi.c#3 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/module.c#3 delete .. //depot/projects/powerpc/sys/boot/efi/libefi/time.c#4 integrate .. //depot/projects/powerpc/sys/boot/efi/loader/Makefile#4 delete .. //depot/projects/powerpc/sys/boot/efi/loader/conf.c#4 delete .. //depot/projects/powerpc/sys/boot/efi/loader/main.c#4 delete .. //depot/projects/powerpc/sys/boot/efi/loader/version#3 delete .. //depot/projects/powerpc/sys/boot/ficl/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/ficl/alpha/sysdep.c#3 delete .. //depot/projects/powerpc/sys/boot/ficl/alpha/sysdep.h#3 delete .. //depot/projects/powerpc/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/powerpc/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/powerpc/sys/boot/ficl/ficl.h#3 integrate .. //depot/projects/powerpc/sys/boot/ficl/ficlstring.c#2 delete .. //depot/projects/powerpc/sys/boot/ficl/loader.c#4 integrate .. //depot/projects/powerpc/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/powerpc/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/powerpc/sys/boot/ficl/prefix.c#3 integrate .. //depot/projects/powerpc/sys/boot/ficl/words.c#4 integrate .. //depot/projects/powerpc/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/powerpc/sys/boot/forth/frames.4th#1 branch .. //depot/projects/powerpc/sys/boot/forth/loader.4th#3 integrate .. //depot/projects/powerpc/sys/boot/forth/loader.4th.8#3 integrate .. //depot/projects/powerpc/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/powerpc/sys/boot/forth/loader.conf.5#3 integrate .. //depot/projects/powerpc/sys/boot/forth/loader.rc#3 integrate .. //depot/projects/powerpc/sys/boot/forth/screen.4th#1 branch .. //depot/projects/powerpc/sys/boot/forth/support.4th#3 integrate .. //depot/projects/powerpc/sys/boot/i386/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/i386/Makefile.inc#3 integrate .. //depot/projects/powerpc/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/powerpc/sys/boot/i386/boot0/boot0.s#3 delete .. //depot/projects/powerpc/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/powerpc/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/powerpc/sys/boot/i386/boot2/boot1.s#3 delete .. //depot/projects/powerpc/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/boot2/lib.h#3 integrate .. //depot/projects/powerpc/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/powerpc/sys/boot/i386/boot2/sio.s#3 delete .. //depot/projects/powerpc/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/powerpc/sys/boot/i386/btx/btx/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/powerpc/sys/boot/i386/btx/btx/btx.s#3 delete .. //depot/projects/powerpc/sys/boot/i386/btx/btxldr/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/powerpc/sys/boot/i386/btx/btxldr/btxldr.s#3 delete .. //depot/projects/powerpc/sys/boot/i386/btx/lib/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/i386/btx/lib/btxcsu.s#3 integrate .. //depot/projects/powerpc/sys/boot/i386/cdboot/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/powerpc/sys/boot/i386/cdldr/Makefile#2 delete .. //depot/projects/powerpc/sys/boot/i386/cdldr/cdldr.s#2 delete .. //depot/projects/powerpc/sys/boot/i386/kgzldr/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/i386/kgzldr/boot.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/kgzldr/crt.s#3 integrate .. //depot/projects/powerpc/sys/boot/i386/kgzldr/kgzldr.m4#3 delete .. //depot/projects/powerpc/sys/boot/i386/kgzldr/lib.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/kgzldr/sio.s#3 integrate .. //depot/projects/powerpc/sys/boot/i386/kgzldr/start.s#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/Makefile#4 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/powerpc/sys/boot/i386/libi386/aout_freebsd.c#3 delete .. //depot/projects/powerpc/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/biosmem.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/biospci.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/biospnp.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/powerpc/sys/boot/i386/libi386/bootinfo.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/powerpc/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/powerpc/sys/boot/i386/libi386/comconsole.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/devicename.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/powerpc/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/powerpc/sys/boot/i386/libi386/elf_freebsd.c#3 delete .. //depot/projects/powerpc/sys/boot/i386/libi386/gatea20.c#3 delete .. //depot/projects/powerpc/sys/boot/i386/libi386/i386_copy.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/i386_module.c#4 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/libi386.h#4 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/nullconsole.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/pread.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/pxe.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/pxe.h#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/powerpc/sys/boot/i386/libi386/time.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/vidconsole.c#4 integrate .. //depot/projects/powerpc/sys/boot/i386/liloldr/Makefile#3 delete .. //depot/projects/powerpc/sys/boot/i386/liloldr/lilobsect.s#3 delete .. //depot/projects/powerpc/sys/boot/i386/liloldr/liloldr.s#3 delete .. //depot/projects/powerpc/sys/boot/i386/loader/Makefile#4 integrate .. //depot/projects/powerpc/sys/boot/i386/loader/conf.c#4 integrate .. //depot/projects/powerpc/sys/boot/i386/loader/help.i386#4 integrate .. //depot/projects/powerpc/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/powerpc/sys/boot/i386/loader/main.c#4 integrate .. //depot/projects/powerpc/sys/boot/i386/mbr/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/i386/mbr/mbr.s#3 integrate .. //depot/projects/powerpc/sys/boot/i386/pxeldr/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/i386/pxeldr/pxeboot.8#3 integrate .. //depot/projects/powerpc/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/powerpc/sys/boot/i386/pxeldr/pxeldr.s#3 delete .. //depot/projects/powerpc/sys/boot/ia64/Makefile#4 integrate .. //depot/projects/powerpc/sys/boot/ia64/Makefile.inc#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/powerpc/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/powerpc/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/powerpc/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/powerpc/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/powerpc/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/powerpc/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/powerpc/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/powerpc/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/powerpc/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/powerpc/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/powerpc/sys/boot/ia64/efi/version#1 branch .. //depot/projects/powerpc/sys/boot/ia64/libski/Makefile#3 delete .. //depot/projects/powerpc/sys/boot/ia64/libski/bootinfo.c#3 delete .. //depot/projects/powerpc/sys/boot/ia64/libski/copy.c#3 delete .. //depot/projects/powerpc/sys/boot/ia64/libski/delay.c#3 delete .. //depot/projects/powerpc/sys/boot/ia64/libski/devicename.c#3 delete .. //depot/projects/powerpc/sys/boot/ia64/libski/elf_freebsd.c#3 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 9 04:52:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCF0016A416; Sat, 9 Dec 2006 04:52:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 953EE16A403 for ; Sat, 9 Dec 2006 04:52:29 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D5C243C9D for ; Sat, 9 Dec 2006 04:51:27 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB94qTaH062922 for ; Sat, 9 Dec 2006 04:52:29 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB94qTUX062919 for perforce@freebsd.org; Sat, 9 Dec 2006 04:52:29 GMT (envelope-from marcel@freebsd.org) Date: Sat, 9 Dec 2006 04:52:29 GMT Message-Id: <200612090452.kB94qTUX062919@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 111313 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Dec 2006 04:52:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=111313 Change 111313 by marcel@marcel_cluster on 2006/12/09 04:51:28 Fix merge botch. Affected files ... .. //depot/projects/powerpc/sys/dev/sound/midi/midi.h#4 edit .. //depot/projects/powerpc/sys/dev/sound/midi/sequencer.h#4 edit Differences ... ==== //depot/projects/powerpc/sys/dev/sound/midi/midi.h#4 (text+ko) ==== @@ -1,334 +1,55 @@ -/* - * Include file for midi driver. +/*- + * (c) 2003 Mathew Kanner * - * Copyright by Seigo Tanimura 1999. - * * 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 + * 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. * - * $FreeBSD: src/sys/dev/sound/midi/midi.h,v 1.10 2002/03/25 09:23:41 mike Exp $ - * + * $FreeBSD: src/sys/dev/sound/midi/midi.h,v 1.14 2006/05/27 16:32:05 netchild Exp $ */ -/* - * first, include kernel header files. - */ +#ifndef MIDI_H +#define MIDI_H -#ifndef _MIDI_H_ -#define _MIDI_H_ - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include /* for DATA_SET */ - -#include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include -#include -#include -#include /* for DELAY */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +MALLOC_DECLARE(M_MIDI); -#define MIDI_CDEV_MAJOR 30 +#define M_RX 0x01 +#define M_TX 0x02 +#define M_RXEN 0x04 +#define M_TXEN 0x08 -/*#define MIDI_OUTOFGIANT*/ +#define MIDI_TYPE unsigned char -/* - * The order of mutex lock (from the first to the last) - * - * 1. sequencer flags, queues, timer and device list - * 2. midi synth voice and channel - * 3. midi synth status - * 4. generic midi flags and queues - * 5. midi device - */ +struct snd_midi; -/* - * descriptor of midi operations ... - * - */ +struct snd_midi *midi_init(kobj_class_t _mpu_cls, int _unit, int _channel, + void *cookie); +int midi_uninit(struct snd_midi * _m); +int midi_out(struct snd_midi * _m, MIDI_TYPE * _buf, int _size); +int midi_in(struct snd_midi * _m, MIDI_TYPE * _buf, int _size); -struct _mididev_info { +kobj_t midimapper_addseq(void *arg1, int *unit, void **cookie); +int midimapper_open(void *arg1, void **cookie); +int midimapper_close(void *arg1, void *cookie); +kobj_t midimapper_fetch_synth(void *arg, void *cookie, int unit); - /* - * the first part of the descriptor is filled up from a - * template. - */ - char name[64]; - - int type; - - d_open_t *open; - d_close_t *close; - d_ioctl_t *ioctl; - midi_callback_t *callback; - - /* - * combinations of the following flags are used as second argument in - * the callback from the dma module to the device-specific routines. - */ - -#define MIDI_CB_RD 0x100 /* read callback */ -#define MIDI_CB_WR 0x200 /* write callback */ -#define MIDI_CB_REASON_MASK 0xff -#define MIDI_CB_START 0x01 /* start dma op */ -#define MIDI_CB_STOP 0x03 /* stop dma op */ -#define MIDI_CB_ABORT 0x04 /* abort dma op */ -#define MIDI_CB_INIT 0x05 /* init board parameters */ - - /* - * callback extensions - */ -#define MIDI_CB_DMADONE 0x10 -#define MIDI_CB_DMAUPDATE 0x11 -#define MIDI_CB_DMASTOP 0x12 - - /* init can only be called with int enabled and - * no pending DMA activity. - */ - - /* - * whereas from here, parameters are set at runtime. - * resources are stored in the softc of the device, - * not in the common structure. - */ - - int unit; /* unit number of the device */ - int midiunit; /* unit number for midi devices */ - int synthunit; /* unit number for synth devices */ - int mdtype; /* MDT_MIDI or MDT_SYNTH */ - void *softc; /* softc for the device */ - device_t dev; /* device_t for the device */ - - int bd_id; /* used to hold board-id info, eg. sb version, - * mss codec type, etc. etc. - */ - - struct mtx flagqueue_mtx; /* Mutex to protect flags and queues */ - - /* Queues */ - midi_dbuf midi_dbuf_in; /* midi input event/message queue */ - midi_dbuf midi_dbuf_out; /* midi output event/message queue */ - midi_dbuf midi_dbuf_passthru; /* midi passthru event/message queue */ - - /* - * these parameters describe the operation of the board. - * Generic things like busy flag, speed, etc are here. - */ - - /* Flags */ - volatile u_long flags; /* 32 bits, used for various purposes. */ - int fflags; /* file flag */ - - /* - * we have separate flags for read and write, although in some - * cases this is probably not necessary (e.g. because we cannot - * know how many processes are using the device, we cannot - * distinguish if open, close, abort are for a write or for a - * read). - */ - - /* - * the following flag is used by open-close routines - * to mark the status of the device. - */ -#define MIDI_F_BUSY 0x0001 /* has been opened */ - /* - * the next two are used to allow only one pending operation of - * each type. - */ -#define MIDI_F_READING 0x0004 /* have a pending read */ -#define MIDI_F_WRITING 0x0008 /* have a pending write */ - - /* - * flag used to mark a pending close. - */ -#define MIDI_F_CLOSING 0x0040 /* a pending close */ - - /* - * if user has not set block size, then make it adaptive - * (0.25s, or the perhaps last read/write ?) - */ -#define MIDI_F_HAS_SIZE 0x0080 /* user set block size */ - /* - * assorted flags related to operating mode. - */ -#define MIDI_F_STEREO 0x0100 /* doing stereo */ -#define MIDI_F_NBIO 0x0200 /* do non-blocking i/o */ -#define MIDI_F_PASSTHRU 0x0400 /* pass received data to output port */ - - /* - * these flags mark a pending abort on a r/w operation. - */ -#define MIDI_F_ABORTING 0x1000 /* a pending abort */ - - /* - * this is used to mark that board initialization is needed, e.g. - * because of a change in sampling rate, format, etc. -- It will - * be done at the next convenient time. - */ -#define MIDI_F_INIT 0x4000 /* changed parameters. need init */ - - int play_blocksize, rec_blocksize; /* blocksize for io and dma ops */ - -#define mwsel midi_dbuf_out.sel -#define mrsel midi_dbuf_in.sel - u_long nterrupts; /* counter of interrupts */ - u_long magic; -#define MAGIC(unit) ( 0xa4d10de0 + unit ) - void *device_data ; /* just in case it is needed...*/ - - midi_intr_t *intr; /* interrupt handler of the upper layer (ie sequencer) */ - void *intrarg; /* argument to interrupt handler */ - - /* The following is the interface from a midi sequencer to a midi device. */ - synthdev_info synth; - - /* This is the status message to display via /dev/midistat */ - char midistat[128]; - - /* The tailq entry of the next midi device. */ - TAILQ_ENTRY(_mididev_info) md_link; - - /* The tailq entry of the next midi device opened by a sequencer. */ - TAILQ_ENTRY(_mididev_info) md_linkseq; -} ; - -/* - * then ioctls and other stuff - */ - -#define NMIDI_MAX 16 /* Number of supported devices */ - -/* - * many variables should be reduced to a range. Here define a macro - */ - -#define RANGE(var, low, high) (var) = \ -((var)<(low)?(low) : (var)>(high)?(high) : (var)) - -/* - * convert dev_t to unit and dev - */ -#define MIDIMINOR(x) (minor(x)) -#define MIDIUNIT(x) ((MIDIMINOR(x) & 0x000000f0) >> 4) -#define MIDIDEV(x) (MIDIMINOR(x) & 0x0000000f) -#define MIDIMKMINOR(u, d) (((u) & 0x0f) << 4 | ((d) & 0x0f)) -#define MIDIMKDEV(m, u, d) (makedev((m), MIDIMKMINOR((u), (d)))) - -/* - * see if the device is configured - */ -#define MIDICONFED(x) ((x)->ioctl != NULL) - -/* - * finally, all default parameters - */ -#define MIDI_BUFFSIZE (1024) /* XXX */ - -#ifdef _KERNEL - -/* This is the generic midi drvier initializer. */ - int midiinit(mididev_info *d, device_t dev); - -/* This provides an access to the mididev_info. */ - mididev_info *get_mididev_info(dev_t i_dev, int *unit); - mididev_info *get_mididev_info_unit(int unit); - mididev_info *get_mididev_midi_unit(int unit); - mididev_info *get_mididev_synth_unit(int unit); - mididev_info *create_mididev_info_unit(int type, mididev_info *mdinf, synthdev_info *syninf); - int mididev_info_number(void); - int mididev_midi_number(void); - int mididev_synth_number(void); -#define MDT_MIDI (0) -#define MDT_SYNTH (1) - -/* These are the generic methods for a midi driver. */ - d_open_t midi_open; - d_close_t midi_close; - d_ioctl_t midi_ioctl; - d_read_t midi_read; - d_write_t midi_write; - d_poll_t midi_poll; - -/* Common interrupt handler */ -void midi_intr(mididev_info *); - -/* Sync output */ -int midi_sync(mididev_info *); - -struct _midi_cmdtab { - int cmd; - char * name; -}; -typedef struct _midi_cmdtab midi_cmdtab; - -char *midi_cmdname(int cmd, midi_cmdtab *tab); - -SYSCTL_DECL(_hw_midi); - -extern int midi_debug; -#define MIDI_DEBUG(x) \ - do { \ - if (midi_debug) { \ - (x); \ - } \ - } while(0) - -extern midi_cmdtab cmdtab_midiioctl[]; - -#endif /* _KERNEL */ - -/* - * Minor numbers for the midi driver. - */ - -#define MIDI_DEV_MIDIN 2 /* Raw midi access */ -#define MIDI_DEV_STATUS 15 /* /dev/midistat */ - -#endif /* _MIDI_H_ */ +#endif ==== //depot/projects/powerpc/sys/dev/sound/midi/sequencer.h#4 (text+ko) ==== @@ -1,6 +1,6 @@ -/* +/*- * Include file for midi sequencer driver. - * + * (c) 2003 Mathew Kanner * Copyright by Seigo Tanimura 1999. * * Redistribution and use in source and binary forms, with or without @@ -24,249 +24,62 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/midi/sequencer.h,v 1.5 2002/01/04 01:13:47 tanimura Exp $ - * - */ - -/* - * first, include kernel header files. + * $FreeBSD: src/sys/dev/sound/midi/sequencer.h,v 1.7 2006/05/27 16:32:05 netchild Exp $ */ #ifndef _SEQUENCER_H_ #define _SEQUENCER_H_ -#include -#include -#include -#include -#include -#include -#include -#include - -#include /* for DATA_SET */ - -#include -#include -#include -#include -#include -#include -#include -#include /* for DELAY */ -#include +#define NSEQ_MAX 16 -#include - -#define SEQ_CDEV_MAJOR MIDI_CDEV_MAJOR - /* - * the following assumes that FreeBSD 3.X uses poll(2) instead of select(2). - * This change dates to late 1997. - */ -#include -#define d_select_t d_poll_t - -/* Return value from seq_playevent and timer event handers. */ -enum { - MORE, - TIMERARMED, - QUEUEFULL -}; - -typedef struct _seqdev_info seqdev_info; - -/* - * The order of mutex lock (from the first to the last) - * - * 1. sequencer flags, queues, timer and device list - * 2. midi synth voice and channel - * 3. midi synth status - * 4. generic midi flags and queues - * 5. midi device - */ - -/* - * descriptor of sequencer operations ... - * - */ - -struct _seqdev_info { - - /* - * the first part of the descriptor is filled up from a - * template. - */ - char name[64]; - - int type ; - - d_open_t *open; - d_close_t *close; - d_read_t *read; - d_write_t *write; - d_ioctl_t *ioctl; - d_poll_t *poll; - midi_callback_t *callback; - - /* - * combinations of the following flags are used as second argument in - * the callback from the dma module to the device-specific routines. - */ - -#define SEQ_CB_RD 0x100 /* read callback */ -#define SEQ_CB_WR 0x200 /* write callback */ -#define SEQ_CB_REASON_MASK 0xff -#define SEQ_CB_START 0x01 /* start dma op */ -#define SEQ_CB_STOP 0x03 /* stop dma op */ -#define SEQ_CB_ABORT 0x04 /* abort dma op */ -#define SEQ_CB_INIT 0x05 /* init board parameters */ - - /* - * callback extensions - */ -#define SEQ_CB_DMADONE 0x10 -#define SEQ_CB_DMAUPDATE 0x11 -#define SEQ_CB_DMASTOP 0x12 - - /* init can only be called with int enabled and - * no pending DMA activity. - */ - - /* - * whereas from here, parameters are set at runtime. - * io_base == 0 means that the board is not configured. - */ - - int unit; /* unit number of the device */ - void *softc; /* softc for a device */ - - int bd_id ; /* used to hold board-id info, eg. sb version, - * mss codec type, etc. etc. - */ - - struct mtx flagqueue_mtx; /* Mutex to protect flags and queues */ - struct cv insync_cv; /* Conditional variable for sync */ - - /* Queues */ - midi_dbuf midi_dbuf_in; /* midi input event/message queue */ - midi_dbuf midi_dbuf_out; /* midi output event/message queue */ - - - /* - * these parameters describe the operation of the board. - * Generic things like busy flag, speed, etc are here. - */ - - /* Flags */ - volatile u_long flags ; /* 32 bits, used for various purposes. */ - - /* - * we have separate flags for read and write, although in some - * cases this is probably not necessary (e.g. because we cannot - * know how many processes are using the device, we cannot - * distinguish if open, close, abort are for a write or for a - * read). - */ - - /* - * the following flag is used by open-close routines - * to mark the status of the device. - */ -#define SEQ_F_BUSY 0x0001 /* has been opened */ - /* - * the next two are used to allow only one pending operation of - * each type. - */ -#define SEQ_F_READING 0x0004 /* have a pending read */ -#define SEQ_F_WRITING 0x0008 /* have a pending write */ - - /* - * flag used to mark a pending close. - */ -#define SEQ_F_CLOSING 0x0040 /* a pending close */ - - /* - * if user has not set block size, then make it adaptive - * (0.25s, or the perhaps last read/write ?) - */ -#define SEQ_F_HAS_SIZE 0x0080 /* user set block size */ - /* - * assorted flags related to operating mode. - */ -#define SEQ_F_STEREO 0x0100 /* doing stereo */ -#define SEQ_F_NBIO 0x0200 /* do non-blocking i/o */ - - /* - * these flags mark a pending abort on a r/w operation. - */ -#define SEQ_F_ABORTING 0x1000 /* a pending abort */ - - /* - * this is used to mark that board initialization is needed, e.g. - * because of a change in sampling rate, format, etc. -- It will - * be done at the next convenient time. - */ -#define SEQ_F_INIT 0x4000 /* changed parameters. need init */ - -#define SEQ_F_INSYNC 0x8000 /* a pending sync */ - - int play_blocksize, rec_blocksize; /* blocksize for io and dma ops */ - -#define swsel midi_dbuf_out.sel -#define srsel midi_dbuf_in.sel - u_long interrupts; /* counter of interrupts */ - u_long magic; -#define MAGIC(unit) ( 0xa4d10de0 + unit ) - void *device_data ; /* just in case it is needed...*/ - - /* The tailq entry of the next sequencer device. */ - TAILQ_ENTRY(_seqdev_info) sd_link; -}; - - -/* - * then ioctls and other stuff - */ -#define NSEQ_MAX 16 /* Number of supported devices */ - -/* * many variables should be reduced to a range. Here define a macro */ #define RANGE(var, low, high) (var) = \ ((var)<(low)?(low) : (var)>(high)?(high) : (var)) -/* - * finally, all default parameters - */ -#define SEQ_BUFFSIZE (1024) /* XXX */ - -#define MIDI_DEV_SEQ 1 /* Sequencer output /dev/sequencer (FM - synthesizer and MIDI output) */ -#define MIDI_DEV_MUSIC 8 /* Sequencer output /dev/music (FM - synthesizer and MIDI output) */ - #ifdef _KERNEL -extern midi_cmdtab cmdtab_seqioctl[]; -extern midi_cmdtab cmdtab_timer[]; - void seq_timer(void *arg); -int seq_copytoinput(void *arg, u_char *event, int len); SYSCTL_DECL(_hw_midi_seq); extern int seq_debug; -#define SEQ_DEBUG(x) \ +#define SEQ_DEBUG(y, x) \ do { \ - if (seq_debug) { \ + if (seq_debug >= y) { \ (x); \ } \ } while(0) +SYSCTL_DECL(_hw_midi); + #endif /* _KERNEL */ +#define SYNTHPROP_MIDI 1 +#define SYNTHPROP_SYNTH 2 +#define SYNTHPROP_RX 4 +#define SYNTHPROP_TX 8 -#endif /* _SEQUENCER_H_ */ +struct _midi_cmdtab { + int cmd; + char * name; +}; +typedef struct _midi_cmdtab midi_cmdtab; +extern midi_cmdtab cmdtab_seqevent[]; +extern midi_cmdtab cmdtab_seqioctl[]; +extern midi_cmdtab cmdtab_timer[]; +extern midi_cmdtab cmdtab_seqcv[]; +extern midi_cmdtab cmdtab_seqccmn[]; + +char *midi_cmdname(int cmd, midi_cmdtab *tab); + +enum { + MORE, + TIMERARMED, + QUEUEFULL +}; + +#endif From owner-p4-projects@FreeBSD.ORG Sat Dec 9 17:26:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 607C116A4CA; Sat, 9 Dec 2006 17:26:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 22E5B16A47E for ; Sat, 9 Dec 2006 17:26:03 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78A3543C9D for ; Sat, 9 Dec 2006 17:24:57 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB9HQ2Oh029478 for ; Sat, 9 Dec 2006 17:26:02 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB9HQ2tW029475 for perforce@freebsd.org; Sat, 9 Dec 2006 17:26:02 GMT (envelope-from piso@freebsd.org) Date: Sat, 9 Dec 2006 17:26:02 GMT Message-Id: <200612091726.kB9HQ2tW029475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111336 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Dec 2006 17:26:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=111336 Change 111336 by piso@piso_newluxor on 2006/12/09 17:25:17 Add a private per handler ithread for every filtered driver. Affected files ... .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#16 edit .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#18 edit .. //depot/projects/soc2006/intr_filter/sys/interrupt.h#7 edit Differences ... ==== //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#16 (text+ko) ==== @@ -235,6 +235,7 @@ { struct thread *td; struct intr_event *ie; + struct intr_thread *ithd = NULL; int error, vector, thread; td = curthread; @@ -275,9 +276,9 @@ } td->td_intr_nesting_level++; - thread = 0; + thread = 0; critical_enter(); - thread = intr_filter_loop(ie, frame); + thread = intr_filter_loop(ie, frame, &ithd); /* * If the interrupt was fully served, send it an EOI but leave it @@ -299,9 +300,9 @@ mtx_unlock_spin(&intr_table_lock); } - /* Schedule the ithread if needed. */ + /* Schedule an ithread if needed. */ if (thread & FILTER_SCHEDULE_THREAD) { - error = intr_event_schedule_thread(ie); + error = intr_event_schedule_thread(ie, ithd); KASSERT(error == 0, ("bad stray interrupt")); } td->td_intr_nesting_level--; ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#18 (text+ko) ==== @@ -96,9 +96,12 @@ TAILQ_HEAD_INITIALIZER(event_list); static void intr_event_update(struct intr_event *ie); -static struct intr_thread *ithread_create(const char *name); +static struct intr_thread *ithread_create(const char *name, + struct intr_handler *ih); static void ithread_destroy(struct intr_thread *ithread); static void ithread_execute_handlers(struct proc *p, struct intr_event *ie); +static void priv_ithread_execute_handler(struct proc *p, + struct intr_handler *ih); static void ithread_loop(void *); static void ithread_update(struct intr_thread *ithd); static void start_softintr(void *); @@ -286,7 +289,7 @@ } static struct intr_thread * -ithread_create(const char *name) +ithread_create(const char *name, struct intr_handler *ih) { struct intr_thread *ithd; struct thread *td; @@ -295,7 +298,7 @@ ithd = malloc(sizeof(struct intr_thread), M_ITHREAD, M_WAITOK | M_ZERO); - error = kthread_create(ithread_loop, ithd, &p, RFSTOPPED | RFHIGHPID, + error = kthread_create(ithread_loop, ih, &p, RFSTOPPED | RFHIGHPID, 0, "%s", name); if (error) panic("kthread_create() failed with %d", error); @@ -378,20 +381,29 @@ TAILQ_INSERT_BEFORE(temp_ih, ih, ih_next); intr_event_update(ie); - /* Create a thread if we need one. */ - while (ie->ie_thread == NULL && handler != NULL) { - if (ie->ie_flags & IE_ADDING_THREAD) - msleep(ie, &ie->ie_lock, 0, "ithread", 0); - else { - ie->ie_flags |= IE_ADDING_THREAD; - mtx_unlock(&ie->ie_lock); - it = ithread_create("intr: newborn"); - mtx_lock(&ie->ie_lock); - ie->ie_flags &= ~IE_ADDING_THREAD; - ie->ie_thread = it; - it->it_event = ie; - ithread_update(it); - wakeup(ie); + /* For filtered handlers, create a private ithread to run on. */ + if (filter != NULL && handler != NULL) { + mtx_unlock(&ie->ie_lock); + it = ithread_create("intr: newborn", ih); + mtx_lock(&ie->ie_lock); + it->it_event = ie; + ih->ih_thread = it; + ithread_update(it); // XXX - do we really need this?!?!? + } else { /* Create the global per-event thread if we need one. */ + while (ie->ie_thread == NULL && handler != NULL) { + if (ie->ie_flags & IE_ADDING_THREAD) + msleep(ie, &ie->ie_lock, 0, "ithread", 0); + else { + ie->ie_flags |= IE_ADDING_THREAD; + mtx_unlock(&ie->ie_lock); + it = ithread_create("intr: newborn", ih); + mtx_lock(&ie->ie_lock); + ie->ie_flags &= ~IE_ADDING_THREAD; + ie->ie_thread = it; + it->it_event = ie; + ithread_update(it); + wakeup(ie); + } } } CTR3(KTR_INTR, "%s: added %s to %s", __func__, ih->ih_name, @@ -408,6 +420,7 @@ { struct intr_handler *handler = (struct intr_handler *)cookie; struct intr_event *ie; + struct intr_thread *it; #ifdef INVARIANTS struct intr_handler *ih; #endif @@ -434,17 +447,19 @@ ok: #endif /* - * If there is no ithread, then just remove the handler and return. - * XXX: Note that an INTR_FAST handler might be running on another - * CPU! + * If there are no ithreads (per event and per handler), then + * just remove the handler and return. + * XXX: Note that an INTR_FAST handler might be running on another CPU! */ - if (ie->ie_thread == NULL) { + if (ie->ie_thread == NULL && handler->ih_thread == NULL) { TAILQ_REMOVE(&ie->ie_handlers, handler, ih_next); mtx_unlock(&ie->ie_lock); free(handler, M_ITHREAD); return (0); } + /* Private or global ithread? */ + it = (handler->ih_thread) ? handler->ih_thread : ie->ie_thread; /* * If the interrupt thread is already running, then just mark this * handler as being dead and let the ithread do the actual removal. @@ -454,7 +469,7 @@ * thread do it. */ mtx_lock_spin(&sched_lock); - if (!TD_AWAITING_INTR(ie->ie_thread->it_thread) && !cold) { + if (!TD_AWAITING_INTR(it->it_thread) && !cold) { handler->ih_flags |= IH_DEAD; /* @@ -462,12 +477,20 @@ * again and remove this handler if it has already passed * it on the list. */ - ie->ie_thread->it_need = 1; + it->it_need = 1; } else TAILQ_REMOVE(&ie->ie_handlers, handler, ih_next); mtx_unlock_spin(&sched_lock); while (handler->ih_flags & IH_DEAD) msleep(handler, &ie->ie_lock, 0, "iev_rmh", 0); + /* + * At this point, the handler has been disconnected from the event, + * so we can kill the private ithread if any. + */ + if (handler->ih_thread) { + ithread_destroy(handler->ih_thread); + handler->ih_thread = NULL; + } intr_event_update(ie); #ifdef notyet /* @@ -493,10 +516,9 @@ } int -intr_event_schedule_thread(struct intr_event *ie) +intr_event_schedule_thread(struct intr_event *ie, struct intr_thread *it) { struct intr_entropy entropy; - struct intr_thread *it; struct thread *td; struct thread *ctd; struct proc *p; @@ -504,12 +526,10 @@ /* * If no ithread or no handlers, then we have a stray interrupt. */ - if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers) || - ie->ie_thread == NULL) + if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers) || it == NULL) return (EINVAL); ctd = curthread; - it = ie->ie_thread; td = it->it_thread; p = td->td_proc; @@ -603,7 +623,7 @@ if (!(flags & SWI_DELAY)) { PCPU_LAZY_INC(cnt.v_soft); - error = intr_event_schedule_thread(ie); + error = intr_event_schedule_thread(ie, ie->ie_thread); KASSERT(error == 0, ("stray software interrupt")); } } @@ -622,6 +642,37 @@ } static void +priv_ithread_execute_handler(struct proc *p, struct intr_handler *ih) +{ + struct intr_event *ie; + + ie = ih->ih_event; + /* + * If this handler is marked for death, remove it from + * the list of handlers and wake up the sleeper. + */ + if (ih->ih_flags & IH_DEAD) { + mtx_lock(&ie->ie_lock); + TAILQ_REMOVE(&ie->ie_handlers, ih, ih_next); + ih->ih_flags &= ~IH_DEAD; + wakeup(ih); + mtx_unlock(&ie->ie_lock); + return; + } + + /* Execute this handler. */ + CTR6(KTR_INTR, "%s: pid %d exec %p(%p) for %s flg=%x", + __func__, p->p_pid, (void *)ih->ih_handler, ih->ih_argument, + ih->ih_name, ih->ih_flags); + + if (!(ih->ih_flags & IH_MPSAFE)) + mtx_lock(&Giant); + ih->ih_handler(ih->ih_argument); + if (!(ih->ih_flags & IH_MPSAFE)) + mtx_unlock(&Giant); +} + +static void ithread_execute_handlers(struct proc *p, struct intr_event *ie) { struct intr_handler *ih, *ihn; @@ -645,12 +696,16 @@ } /* - * Execute handlers that have their need flag set. - */ - if (!ih->ih_need) - continue; - else - atomic_store_rel_int(&ih->ih_need, 0); + * For software interrupt threads, we only execute + * handlers that have their need flag set. Hardware + * interrupt threads always invoke all of their handlers. + */ + if (ie->ie_flags & IE_SOFT) { + if (!ih->ih_need) + continue; + else + atomic_store_rel_int(&ih->ih_need, 0); + } /* Execute this handler. */ CTR6(KTR_INTR, "%s: pid %d exec %p(%p) for %s flg=%x", @@ -702,13 +757,17 @@ ithread_loop(void *arg) { struct intr_thread *ithd; + struct intr_handler *ih; struct intr_event *ie; struct thread *td; struct proc *p; + int priv; td = curthread; p = td->td_proc; - ithd = (struct intr_thread *)arg; + ih = (struct intr_handler *)arg; + priv = (ih->ih_thread != NULL) ? 1 : 0; + ithd = (priv) ? ih->ih_thread : ih->ih_event->ie_thread; KASSERT(ithd->it_thread == td, ("%s: ithread and proc linkage out of sync", __func__)); ie = ithd->it_event; @@ -742,7 +801,10 @@ * handlers. */ atomic_store_rel_int(&ithd->it_need, 0); - ithread_execute_handlers(p, ie); + if (priv) + priv_ithread_execute_handler(p, ih); + else + ithread_execute_handlers(p, ie); } WITNESS_WARN(WARN_PANIC, NULL, "suspending ithread"); mtx_assert(&Giant, MA_NOTOWNED); @@ -768,13 +830,30 @@ * Some architectures (i386, amd64 and arm) require the optional frame * parameter, and use it as the main argument for fast handler execution * when ih_argument == NULL. + * + * Return value: + * o FILTER_STRAY: No filter recognized the event, and no + * filter-less handler is registered on this + * line. + * o FILTER_HANDLED: A filter claimed the event and served it. + * o FILTER_SCHEDULE_THREAD: No filter claimed the event, but there's at + * least one filter-less handler on this line. + * o FILTER_HANDLED | + * FILTER_SCHEDULE_THREAD: A filter claimed the event, and asked for + * scheduling the per-handler ithread. + * + * In case an ithread has to be scheduled, in *ithd there will be a + * pointer to a struct intr_thread containing the thread to be + * scheduled. */ int -intr_filter_loop(struct intr_event *ie, struct trapframe *frame) { +intr_filter_loop(struct intr_event *ie, struct trapframe *frame, + struct intr_thread **ithd) +{ struct intr_handler *ih; void *arg; - int ret, ret2, thread_only; + int ret, thread_only; ret = 0; thread_only = 0; @@ -791,45 +870,30 @@ ih->ih_filter, ih->ih_handler, arg, ih->ih_name); if (ih->ih_filter != NULL) - ret2 = ih->ih_filter(arg); - else { - /* Legacy ithread only handler. */ + ret = ih->ih_filter(arg); + else { thread_only = 1; continue; } - /* Mark handler for later execution in ithread. */ - if (ret2 & FILTER_SCHEDULE_THREAD) { - ih->ih_need = 1; - ret |= FILTER_SCHEDULE_THREAD; + KASSERT(ret != FILTER_SCHEDULE_THREAD, + "intr_filter_loop: FILTER_SCHEDULE_THREAD from filter"); + + if (ret & FILTER_STRAY) continue; - } - - /* Interrupt served in filter. */ - if (ret2 & FILTER_HANDLED) { - ret |= FILTER_HANDLED; + else { + *ithd = ih->ih_thread; return (ret); } } /* - * A filter did claim the interrupt but didn't shut it up - * fully, so schedule the ithread. - */ - if (ret != 0) - return (ret); - - /* * No filters handled the interrupt and we have at least * one handler without a filter. In this case, we schedule * all of the filter-less handlers to run in the ithread. */ if (thread_only) { - TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { - if (ih->ih_filter != NULL) - continue; - ih->ih_need = 1; - } + *ithd = ie->ie_thread; return (FILTER_SCHEDULE_THREAD); } return (FILTER_STRAY); @@ -839,6 +903,7 @@ void stray_detection(void *_arg) { + struct intr_thread *ithd = NULL; struct intr_event *ie; void *(*walk_src)(void) = _arg; int thread; @@ -852,7 +917,7 @@ /* * yes, it's still pending: call filters... */ - thread = intr_filter_loop(ie, NULL /* XXX frame */ ); + thread = intr_filter_loop(ie, NULL /* XXX frame */, &ithd); if (thread & FILTER_STRAY) { /* * no filter claimed the intr, ==== //depot/projects/soc2006/intr_filter/sys/interrupt.h#7 (text+ko) ==== @@ -52,6 +52,7 @@ int ih_need; /* Needs service. */ TAILQ_ENTRY(intr_handler) ih_next; /* Next handler for this event. */ u_char ih_pri; /* Priority of this handler. */ + struct intr_thread *ih_thread; /* Ithread for filtered handler. */ }; #define IS_FAST(filter, handler) (filter != NULL && handler == NULL) @@ -115,7 +116,8 @@ #ifdef DDB void db_dump_intr_event(struct intr_event *ie, int handlers); #endif -int intr_filter_loop(struct intr_event *ie, struct trapframe *frame); +int intr_filter_loop(struct intr_event *ie, struct trapframe *frame, + struct intr_thread **ithd); void stray_detection(void *_arg); u_char intr_priority(enum intr_type flags); int intr_event_add_handler(struct intr_event *ie, const char *name, @@ -127,7 +129,7 @@ __printflike(6, 7); int intr_event_destroy(struct intr_event *ie); int intr_event_remove_handler(void *cookie); -int intr_event_schedule_thread(struct intr_event *ie); +int intr_event_schedule_thread(struct intr_event *ie, struct intr_thread *ithd); int swi_add(struct intr_event **eventp, const char *name, driver_intr_t handler, void *arg, int pri, enum intr_type flags, void **cookiep); From owner-p4-projects@FreeBSD.ORG Sat Dec 9 17:49:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BF1716A407; Sat, 9 Dec 2006 17:49:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0AB0C16A4A7 for ; Sat, 9 Dec 2006 17:49:55 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.184]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60A4043CAC for ; Sat, 9 Dec 2006 17:48:46 +0000 (GMT) (envelope-from asmrookie@gmail.com) Received: by nf-out-0910.google.com with SMTP id x37so1412533nfc for ; Sat, 09 Dec 2006 09:49:46 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=ZCLezfW6QFqoliDyMYJ1dSCTtc2Ch3gVgrgZezYKawY9GCpJCp5MrRGTT6S5vs+C1ZQdurpCsjXHxvgVr6GcUuwM1JkYa6vLyli3EYMn6gSddedB9zP9hYeN1owzCRFmBRZK0pYWGJPba5HU8rJyYGQd9ebGXrC1LoWsfkhAjJo= Received: by 10.82.105.13 with SMTP id d13mr724192buc.1165686586310; Sat, 09 Dec 2006 09:49:46 -0800 (PST) Received: by 10.82.189.18 with HTTP; Sat, 9 Dec 2006 09:49:46 -0800 (PST) Message-ID: <3bbf2fe10612090949m57552a6bp8c5026bee1206b35@mail.gmail.com> Date: Sat, 9 Dec 2006 18:49:46 +0100 From: "Attilio Rao" Sender: asmrookie@gmail.com To: perforce@freebsd.org, "Paolo Pisati" In-Reply-To: <200612091726.kB9HQ2tW029475@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200612091726.kB9HQ2tW029475@repoman.freebsd.org> X-Google-Sender-Auth: 3b86dd4f9e4e6f37 Cc: Subject: Re: PERFORCE change 111336 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Dec 2006 17:49:55 -0000 2006/12/9, Paolo Pisati : > http://perforce.freebsd.org/chv.cgi?CH=111336 > > Change 111336 by piso@piso_newluxor on 2006/12/09 17:25:17 > > Add a private per handler ithread for every filtered driver. Nice shot. When piso@ and I spoke about this I was suggested, if empirically we see a possible form of parallelism not happening too seldomly for the handlers, to use group of handlers which can run concurrently and to give a kthread for any group. The "split & group" operation might be done by the driver developer and I don't really know if it is worth it. Attilio -- Peace can only be achieved by understanding - A. Einstein From owner-p4-projects@FreeBSD.ORG Sat Dec 9 21:01:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6852816A417; Sat, 9 Dec 2006 21:01:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F349A16A40F for ; Sat, 9 Dec 2006 21:01:46 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id F243043CBF for ; Sat, 9 Dec 2006 21:00:33 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB9L1duQ078129 for ; Sat, 9 Dec 2006 21:01:39 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB9L1dW1078125 for perforce@freebsd.org; Sat, 9 Dec 2006 21:01:39 GMT (envelope-from piso@freebsd.org) Date: Sat, 9 Dec 2006 21:01:39 GMT Message-Id: <200612092101.kB9L1dW1078125@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111341 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Dec 2006 21:01:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=111341 Change 111341 by piso@piso_newluxor on 2006/12/09 21:01:37 Introduce LibAliasInLocked() & LibAliasOutLocked() for the PKT_ALIAS_REVERSE case: using these functions we avoid a dangerous drop and reacquire of the lock around a call to LibAliasIn*()/LibAliasOut*(). Suggested by: glebius Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#26 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#26 (text+ko) ==== @@ -1211,20 +1211,35 @@ LIBALIAS_UNLOCK(la); } +/* Local prototypes */ +static int +LibAliasOutLocked(struct libalias *la, char *ptr, + int maxpacketsize); +static int +LibAliasInLocked(struct libalias *la, char *ptr, + int maxpacketsize); int LibAliasIn(struct libalias *la, char *ptr, int maxpacketsize) { + int res; + + LIBALIAS_LOCK(la); + res = LibAliasInLocked(la, ptr, maxpacketsize); + LIBALIAS_LOCK(la); + return (res); +} + +static int +LibAliasInLocked(struct libalias *la, char *ptr, int maxpacketsize) +{ struct in_addr alias_addr; struct ip *pip; int iresult; - - LIBALIAS_LOCK(la); + if (la->packetAliasMode & PKT_ALIAS_REVERSE) { la->packetAliasMode &= ~PKT_ALIAS_REVERSE; - LIBALIAS_UNLOCK(la); - iresult = LibAliasOut(la, ptr, maxpacketsize); - LIBALIAS_LOCK(la); + iresult = LibAliasOutLocked(la, ptr, maxpacketsize); la->packetAliasMode |= PKT_ALIAS_REVERSE; goto getout; } @@ -1293,7 +1308,6 @@ } getout: - LIBALIAS_UNLOCK(la); return (iresult); } @@ -1314,31 +1328,31 @@ #define UNREG_ADDR_C_UPPER 0xc0a8ffff int -LibAliasOut(struct libalias *la, char *ptr, /* valid IP packet */ - int maxpacketsize /* How much the packet data may grow (FTP - * and IRC inline changes) */ -) +LibAliasOut(struct libalias *la, char *ptr, int maxpacketsize) { - return (LibAliasOutTry(la, ptr, maxpacketsize, 1)); + int res; + + LIBALIAS_LOCK(la); + res = LibAliasOutLocked(la, ptr, maxpacketsize); + LIBALIAS_UNLOCK(la); + return (res); } -int -LibAliasOutTry(struct libalias *la, char *ptr, /* valid IP packet */ - int maxpacketsize, /* How much the packet data may grow (FTP +static int +LibAliasOutLocked(struct libalias *la, char *ptr, /* valid IP packet */ + int maxpacketsize /* How much the packet data may grow (FTP * and IRC inline changes) */ - int create /* Create new entries ? */ ) { int iresult; + int create; /* Create new entries ? */ struct in_addr addr_save; struct ip *pip; - LIBALIAS_LOCK(la); + create = 1; if (la->packetAliasMode & PKT_ALIAS_REVERSE) { la->packetAliasMode &= ~PKT_ALIAS_REVERSE; - LIBALIAS_UNLOCK(la); - iresult = LibAliasIn(la, ptr, maxpacketsize); - LIBALIAS_LOCK(la); + iresult = LibAliasInLocked(la, ptr, maxpacketsize); la->packetAliasMode |= PKT_ALIAS_REVERSE; goto getout; } @@ -1414,7 +1428,6 @@ SetDefaultAliasAddress(la, addr_save); getout: - LIBALIAS_UNLOCK(la); return (iresult); } From owner-p4-projects@FreeBSD.ORG Sat Dec 9 22:00:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 130D416A47E; Sat, 9 Dec 2006 22:00:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B2D8E16A47B for ; Sat, 9 Dec 2006 22:00:54 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DA5143CAD for ; Sat, 9 Dec 2006 21:59:48 +0000 (GMT) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB9M0sql087948 for ; Sat, 9 Dec 2006 22:00:54 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB9M0sTL087944 for perforce@freebsd.org; Sat, 9 Dec 2006 22:00:54 GMT (envelope-from ticso@freebsd.org) Date: Sat, 9 Dec 2006 22:00:54 GMT Message-Id: <200612092200.kB9M0sTL087944@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 111343 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Dec 2006 22:00:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=111343 Change 111343 by ticso@ticso on 2006/12/09 22:00:08 Add BWCT board config Affected files ... .. //depot/projects/arm/src/sys/arm/conf/BWCT#1 add .. //depot/projects/arm/src/sys/arm/conf/BWCT.hints#1 add .. //depot/projects/arm/src/sys/conf/options.arm#18 edit Differences ... ==== //depot/projects/arm/src/sys/conf/options.arm#18 (text+ko) ==== @@ -19,5 +19,6 @@ XSCALE_CACHE_READ_WRITE_ALLOCATE opt_global.h XSACLE_DISABLE_CCNT opt_timer.h VERBOSE_INIT_ARM opt_global.h +AT91_BWCT opt_at91.h AT91_TSC opt_at91.h AT91_KWIKBYTE opt_at91.h From owner-p4-projects@FreeBSD.ORG Sat Dec 9 22:47:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED65F16A4C9; Sat, 9 Dec 2006 22:47:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AA07A16A4C8 for ; Sat, 9 Dec 2006 22:47:02 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2218543C9E for ; Sat, 9 Dec 2006 22:45:47 +0000 (GMT) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB9MksJR096748 for ; Sat, 9 Dec 2006 22:46:54 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB9MksKr096745 for perforce@freebsd.org; Sat, 9 Dec 2006 22:46:54 GMT (envelope-from ticso@freebsd.org) Date: Sat, 9 Dec 2006 22:46:54 GMT Message-Id: <200612092246.kB9MksKr096745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 111346 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Dec 2006 22:47:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=111346 Change 111346 by ticso@ticso on 2006/12/09 22:46:33 make at91_rtc an optional driver to allow selection of other RTCs.s MFP4 after: 1 week Ok'ed by: imp Affected files ... .. //depot/projects/arm/src/sys/arm/at91/files.at91#13 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/files.at91#13 (text) ==== @@ -6,7 +6,7 @@ arm/at91/at91_mci.c optional at91_mci arm/at91/at91_pio.c standard arm/at91/at91_pmc.c standard -arm/at91/at91_rtc.c standard +arm/at91/at91_rtc.c optional at91_rtc arm/at91/at91_ssc.c optional at91_ssc arm/at91/at91_spi.c optional at91_spi \ dependency "spibus_if.h"