From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 09:25:37 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 375221065670; Sun, 11 Oct 2009 09:25:37 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EC96E1065676
	for <perforce@FreeBSD.org>; Sun, 11 Oct 2009 09:25:36 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D9FC78FC0C
	for <perforce@FreeBSD.org>; Sun, 11 Oct 2009 09:25:36 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9B9Pagi096844
	for <perforce@FreeBSD.org>; Sun, 11 Oct 2009 09:25:36 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9B9PaEU096842
	for perforce@freebsd.org; Sun, 11 Oct 2009 09:25:36 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sun, 11 Oct 2009 09:25:36 GMT
Message-Id: <200910110925.n9B9PaEU096842@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169379 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 09:25:37 -0000

http://perforce.freebsd.org/chv.cgi?CH=169379

Change 169379 by pgj@beehive on 2009/10/11 09:24:54

	IFC

Affected files ...

.. //depot/projects/docproj_hu/www/en/news/status/report-2009-04-2009-09.xml#2 integrate
.. //depot/projects/docproj_hu/www/hu/administration.sgml#21 integrate

Differences ...

==== //depot/projects/docproj_hu/www/en/news/status/report-2009-04-2009-09.xml#2 (text+ko) ====

@@ -2,7 +2,7 @@
 <!DOCTYPE report PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Status
 Report//EN"
 "http://www.FreeBSD.org/XML/www/share/sgml/statusreport.dtd">
-<!-- $FreeBSD: www/en/news/status/report-2009-04-2009-09.xml,v 1.6 2009/10/07 19:52:24 gabor Exp $ -->
+<!-- $FreeBSD: www/en/news/status/report-2009-04-2009-09.xml,v 1.13 2009/10/09 13:19:54 danger Exp $ -->
 <report>
   <date>
     <month>April-September</month>
@@ -16,10 +16,11 @@
     <p>This report covers FreeBSD related projects between April and
     September 2009.  During that time a lot of work has been done on
     wide variety of projects, including the Google Summer of Code
-    projects. The BSDCan and EuroBSDCon conferences were held in Ottawa,
-    CA, and Cambridge, UK which were both very successful.
+    projects.  The BSDCan conference was held in Ottawa, CA, in May.
+    The EuroBSDCon conference was held in Cambridge, UK, in September.
+    Both events were very successful.
     A new major version of FreeBSD, 8.0 is to be released soon.
-    If you are wondering what's new in this long awaited release, read
+    If you are wondering what's new in this long-awaited release, read
     Ivan Voras' excellent <a
     href="http://ivoras.sharanet.org/freebsd/freebsd8.html">summary</a>.</p>
 
@@ -28,7 +29,7 @@
 
     <p>Please note that the next deadline for submissions covering
     reports between October and December 2009 is January 15th,
-    2011.</p>
+    2010.</p>
   </section>
 
   <category>
@@ -68,12 +69,6 @@
   </category>
 
   <category>
-    <name>bin</name>
-
-    <description>Userland Programs</description>
-  </category>
-
-  <category>
     <name>arch</name>
 
     <description>Architectures</description>
@@ -97,8 +92,8 @@
     <contact>
       <person>
         <name>
-	  <given>Gábor</given>
- 	  <common>Páli</common>
+	  <given>G&aacute;bor</given>
+ 	  <common>P&aacute;li</common>
         </name>
 
         <email>pgj@FreeBSD.org</email>
@@ -111,7 +106,7 @@
     </links>
 
     <body>
-      <p>libnetstat(3) provides a user-space library API to monitor
+      <p>The libnetstat(3) project provides a user-space library API to monitor
         networking functions with the following benefits:</p>
 
       <ul>
@@ -129,12 +124,12 @@
       <p>The supported abstractions are as follows:</p>
 
       <ul>
-        <li>Active sockets and socket buffers.</li>
-        <li>Network interfaces and multicast interfaces.</li>
-        <li>mbuf(9) statistics.</li>
-        <li>bpf(4) statistics.</li>
-        <li>Routing statistics, routing tables, multicast routing.</li>
-        <li>Protocol-dependent statistics.</li>
+        <li>Active sockets and socket buffers</li>
+        <li>Network interfaces and multicast interfaces</li>
+        <li>mbuf(9) statistics</li>
+        <li>bpf(4) statistics</li>
+        <li>Routing statistics, routing tables, multicast routing</li>
+        <li>Protocol-dependent statistics</li>
       </ul>
 
       <p>There is a sample application, called nettop(8), which provides a
@@ -178,11 +173,11 @@
 
     <body>
       <p>Pefs is a kernel level filesystem for transparently encrypting
-      files on top of other filesystems (like zfs or ufs). It adds no
+      files on top of other filesystems (like zfs or ufs).  It adds no
       extra information into files (unlike others), doesn't require
       cipher block sized io operations, supports per directory/file keys
       and key chaining, uses unique per file tweak for encryption.
-      Supported algorithms: AES, Camellia, Salsa20. The code is ready for
+      Supported algorithms: AES, Camellia, Salsa20.  The code is ready for
       testing.</p>
     </body>
 
@@ -223,12 +218,12 @@
       <p>During the past year, the BSD# Team continued to track the Mono
       development and the lang/mono port have almost always been
       up-to-date (we however had to skip mono-2.2 because of some
-      regression issues in this release). Most of our patches have been
+      regression issues in this release).  Most of our patches have been
       merged in the mono trunk upstream, and should be included in the
       upcoming mono-2.6 release.</p>
 
       <p>In the meantime, a few more .NET related ports have been updated
-      or added to the FreeBSD ports tree. These ports include:</p>
+      or added to the FreeBSD ports tree.  These ports include:</p>
 
       <ul>
         <li>www/xsp and www/mod_mono that make it possible to use FreeBSD
@@ -249,9 +244,9 @@
     </body>
 
     <help>
-      <task>Test mono ports and send feedback (a special attention to
-      environments where NOPORTDOCS / WITH_DEBUG is set has to be
-      taken).</task>
+      <task>Test mono ports and send feedback (we are especially
+      interested in tests where NOPORTDOCS / WITH_DEBUG is
+      enabled).</task>
 
       <task>Port the mono-debugger to FreeBSD.</task>
 
@@ -285,13 +280,13 @@
 
     <body>
       <p>Some time ago I started writing a new driver for the FreeBSD
-      kernel called vt(4), which is basically a replacement for Syscons.
-      There is still a lot of work that needs to be done, but it is
-      probably useful to mention what it does (and what not).</p>
+      kernel called vt(4), which is basically a replacement of syscons.
+      There is still a lot of work that needs to be done but it is
+      probably useful to mention what it does (and what does not).</p>
 
       <p>Right now there are just two graphics drivers for vt(4), namely
       a VGA driver for i386 and amd64 and a Microsoft Xbox graphics
-      driver (because it was so easy to write). I still have to figure
+      driver (because it was so easy to implement).  I still have to figure
       out what I am going to do with VESA, because maybe it is better to
       just ignore VESA and figure out how hard it is to extend DRM to
       interact with vt(4).</p>
@@ -331,35 +326,74 @@
     </contact>
 
     <links>
-      <url href="http://svn.freebsd.org/viewvc/base/projects/libprocstat/">libprocstat's repository</url>
+      <url href="http://svn.freebsd.org/viewvc/base/projects/libprocstat/">libprocstat repository</url>
     </links>
 
     <body>
-      <p>Libprocstat is an ongoing effort to develop a library that can
-        be used to retrieve the information about running processes and
+      <p>The libprocstat project is an ongoing effort to develop a library that can
+        be used to retrieve information about running processes and
 	open files in the uniform and platform-independent way both from
 	a running system or from core files.  This will facilitate the
-	implementation of files/process monitoring applications like
-	lsof/fstat/fuser/etc. The libprocstat repository contents the
-	preliminary version of the library as well as fstat and fuser
-	utilities ported to use this library instead of retriving all
-	the required information by hand via kvm(3) interface, which
-	makes them ABI independent as the result.</p>
+	implementation of file- or process-monitoring applications like
+	lsof(1), fstat(1), fuser, etc.  The libprocstat repository contains a
+	preliminary version of the library.  It also includes rewrites
+	of the fstat and the fuser
+	utilities ported to use this library instead of retrieving all
+	the required information via the kvm(3) interface; one of the
+	important advantages of the versions that use libprocstat is
+	that these utilities are ABI independent.</p>
     </body>
 
     <help>
       <task>
         Implement KVM-based namecache lookup to retrieve filesystem paths
-	associated with file descriptors/VM objects.
+	associated with file descriptors and VM objects.
       </task>
       <task>
-        Ananlyze possible ways of exporting files/processes information
-	from the kernel in the extensible ABI-independend way.
+        Analyze possible ways of exporting file and process information
+	from the kernel in an extensible and ABI-independent way.
       </task>
     </help>
   </project>
 
   <project cat='proj'>
+    <title>New BSD licensed debugger</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Doug</given>
+	  <common>Rabson</common>
+	</name>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://wiki.freebsd.org/TheBsdDebugger">Wiki page</url>
+      <url href="http://people.freebsd.org/~dfr/ngdb.git">Repository</url>
+      <url href="http://wiki.freebsd.org/200909DevSummit?action=AttachFile&amp;do=view&amp;target=NGDB-200909.pdf">Slides</url>
+    </links>
+
+    <body>
+      <p>I have been working recently on writing a new debugger,
+	primarily for the FreeBSD platform.  For various reasons, I have
+	been writing it in a relatively obscure C-like language called
+	D.</p>
+
+      <p>So far, I have a pretty useful (if a little raw at the edges)
+	command line debugger which supports ELF, Dwarf debugging
+	information and (currently) 32 bit FreeBSD and Linux.  The
+	engine includes parsing and evaluation of arbitrary C expressions
+	along with the usual debugging tools such as breakpoints, source
+	code listing, single-step etc.  All the code is new and BSD
+	licensed.  Currently, the thing supports userland debugging of
+	i386 targets via ptrace and post-mortem core file debugging of
+	the same.  I will be adding amd64 support real soon (TM) and
+	maybe support for GDB's remote debugging protocol later.</p>
+    </body>
+  </project>
+
+  <project cat='proj'>
     <title>Clang replacing GCC in the base system</title>
 
     <contact>
@@ -410,8 +444,7 @@
 
     <body>
       <p>The clang@FreeBSD team presents the status of clang/LLVM being
-      able to compile FreeBSD system. The situation as of today (early
-      October) is:</p>
+      able to compile FreeBSD system.  The current status is:</p>
 
       <ul>
         <li>i386 - kernel boots, world needs little hacks but works</li>
@@ -425,27 +458,103 @@
 
       <p>All other platforms are untested.</p>
 
-      <p>A lot has happened over the spring/summer - amd64 got proper
-      mcmodel=kernel support, compiler-rt was introduced (paving the way
-      for libgcc replacement), we ran two experimental ports build to see
-      how clang does there, C++ support is able to parse devd.cc without
-      warnings, we got kernel working with -O2, we promoted FreeBSD to be
-      officially supported plaform in LLVM, many parts of FreeBSD sources
-      that we could not compile before we can compile now etc.</p>
+      <p>A lot has happened over the spring/summer: amd64 got proper
+      mcmodel=kernel support, compiler-rt has been introduced (paving the way
+      for libgcc replacement), we have run two experimental port builds to see
+      how clang does there.  The C++ support is able to parse devd.cc without
+      warnings.  We have got the kernel working with -O2.  FreeBSD has been promoted
+      to be an officially supported plaform in LLVM.  As a result of all this
+      work, many parts of FreeBSD that did not compile before now build
+      without problems.</p>
     </body>
 
     <help>
-      <task>ClangBSD branch of FreeBSD got a little stale and has not
+      <task>The "ClangBSD" branch of FreeBSD got a little stale and has not
       been updated for a while.</task>
+
       <task>We also need to get some important fixes
       into LLVM to get libc compiling and some other smaller issues.</task>
-      <task>We
-      can still appreciate more testers on minor platforms (arm, ppc and
-      mips mostly).</task>
+
+      <task>We can still appreciate more testers on minor platforms (mostly on
+      ARM, PPC and MIPS, but testing on other platforms is also welcome).</task>
     </help>
   </project>
 
   <project cat='proj'>
+    <title>Grand Central Dispatch - FreeBSD port</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Robert</given>
+	  <common>Watson</common>
+	</name>
+	<email>rwatson@FreeBSD.org</email>
+      </person>
+      <person>
+	<name>
+	  <given>Stacey</given>
+	  <common>Son</common>
+	</name>
+	<email>sson@FreeBSD.org</email>
+      </person>
+      <person>
+	<name>
+	  <given>libdispatch mailing list</given>
+	</name>
+	<email>libdispatch-dev@lists.macosforge.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://libdispatch.macosforge.org/">GCD / libdispatch web page</url>
+    </links>
+
+    <body>
+      <p>We have ported libdispatch, Apple's Grand Central Dispatch event
+	and concurrency framework to FreeBSD:</p>
+
+      <ul>
+	<li>Added new kqueue primitives required to support GCD, such
+	  as EVFILT_USER and EV_TRIGGER</li>
+	<li>Created autoconf and automake build framework for libdispatch</li>
+	<li>Modified libdispatch to use POSIX semaphores instead of
+	  Mach semaphores</li>
+	<li>Adapted libdispatch to use portable POSIX time routines</li>
+      </ul>
+
+      <p>Jordan Hubbard has also prepared a blocks-aware clang compiler
+	package for FreeBSD.  When compiled with clang, libdispatch
+	provides blocks-based, as well as function-based callbacks.</p>
+
+      <p>The port was presented at the FreeBSD Developer Summit in
+	Cambridge, UK in September, and slides are online on the devsummit
+	wiki page.  A FreeBSD port is now available in the Ports Collection.
+	After FreeBSD 8.0-RELEASE has shipped, the new kqueue primitives will be
+	MFC'd so that libdispatch works out of the box on FreeBSD 8.1-RELEASE.</p>
+    </body>
+
+    <help>
+      <task>
+	Complete porting of libdispatch test suite to FreeBSD.
+      </task>
+      <task>
+	Investigate pthread work queue implementation for FreeBSD.
+      </task>
+      <task>
+	Evaluate performance impact of some machine-dependent and
+	OS-dependent optimizations present in the Mac OS X version of
+	libdispatch to decide if they should be done for other
+	platforms and OS's.
+      </task>
+      <task>
+	Explore whether FreeBSD base operating system tools would benefit
+	from being modified to use libdispatch.
+      </task>
+    </help>
+  </project> 
+
+  <project cat='proj'>
     <title>VirtualBox on FreeBSD</title>
 
     <contact>
@@ -491,11 +600,11 @@
     </links>
 
     <body>
-      <p>VirtualBox has been committed to the Ports tree and synced
-        with the latest trunk version from SUN. A lot of known 
-        problems are already fixed and some new features have been 
+      <p>VirtualBox has been committed to the Ports tree and synchronized
+        with the latest trunk version from Sun.  Several known
+        problems are already fixed and some new features have been
         added:</p>
-      
+
       <ul>
         <li>VT-x support</li>
         <li>Bridging support (Big Thanks to Fredrik Lindberg)</li>
@@ -504,9 +613,11 @@
         <li>Host DVD/CD access</li>
         <li>SMP Support</li>
       </ul>
-         
-      <p>We would like to say thanks to all helpers/reporters and of course
-        to the VirtualBox developers.</p>
+
+      <p>We would like to say thanks to all the people who helped us by
+      reporting bugs and submitting fixes.  We also thank the VirtualBox
+      developers for their help with the ongoing effort to port
+      VirtualBox on FreeBSD.</p>
     </body>
   </project>
 
@@ -542,7 +653,7 @@
 
     <body>
       <p>The current translations (Handbook and some articles) are kept
-      up to date with the English versions. Some parts of the website
+      up to date with the English versions.  Some parts of the website
       have been 
       <url href="http://www.freebsd.org/nl">translated</url>, more work
       is in progress.</p>
@@ -599,25 +710,25 @@
     <body>
       <p>In May 2009, Benedict Reuschling received his commit bit to the
       www/de and doc/de_DE.ISO8859-1 trees under the mentorship of Johann
-      Kois. Since then, he has been working primarily on the Handbook, updating
-      existing chapters and translating new ones. Most notably, the
-      filesystems and DTrace chapters have been recently translated. Bugs found
+      Kois.  Since then, he has been working primarily on the Handbook, updating
+      existing chapters and translating new ones.  Most notably, the
+      filesystems and DTrace chapters have been recently translated.  Bugs found
       in the original documents along the way were reported back so that
       the other translation teams could incorporate them, as well.</p>
 
       <p>Christoph Sold has put his time in translating the wiki pages of
-      the BSD Certification Group into the German language. This is a
-      great help for German people, who want to take the exam and like to read
-      the information about it in their native language. Daniel Seuffert
-      has sent valuable corrections and bugfixes. Thanks to both for
+      the BSD Certification Group into the German language.  This is very
+      helpful for all German people who want to take the exam and like to read
+      the information about it in their native language.  Daniel Seuffert
+      has sent valuable corrections and bugfixes.  Thanks to both of them for
       their time and efforts!</p>
 
-      <p>The website is translated and updated constantly. Missing parts
+      <p>The website is translated and updated constantly.  Missing parts
       will be translated as time permits.</p>
 
       <p>We appreciate any help from volunteers in proofreading
-      documents, translating new ones and keeping them up to date. Even
-      small error reports are of great help for us. You can find
+      documents, translating new ones and keeping them up to date.  Even
+      small error reports are of great help for us.  You can find
       contact information at the above URL.</p>
     </body>
 
@@ -627,14 +738,14 @@
 
       <task>Translate more articles to German.</task>
 
-      <task>Read the translations. Check for problems/mistakes. Send
+      <task>Read the translations.  Check for problems and mistakes.  Send
       feedback.</task>
     </help>
   </project>
 
   <project cat="team">
     <title>The FreeBSD Foundation Status Report</title>
-   
+
     <contact>
       <person>
 	<name>
@@ -654,23 +765,204 @@
 	<a href="http://www.freebsdfoundation.org/donate/">http://www.freebsdfoundation.org/donate/</a>.</p>
 
       <p>We were a sponsor for EuroBSDCon 2009, and provided travel
-	grants to 8 FreeBSD developers and users. We sponsored Kyiv BSD
-	2009, in Kiev Ukraine. We were also a sponsor of BSDCan, and
-	sponsored 7 developers. We funded three new projects, New Console
+	grants to 8 FreeBSD developers and users.  We sponsored Kyiv BSD
+	2009, in Kiev Ukraine.  We were also a sponsor of BSDCan, and
+	sponsored 7 developers.  We funded three new projects, New Console
 	Driver by Ed Schouten, AVR32 Support by Arnar Mar Sig, and
 	Wireless Mesh Support by Rui Paulo, which has completed.
 	We continued funding a project that is making improvements to the
-	FreeBSD TCP Stack by Lawrence Stewart. The project that made
+	FreeBSD TCP Stack by Lawrence Stewart.  The project that made
 	removing disk devices with mounted filesystems on them safe, by
-	Edward Napierala, completed.</p>
+	Edward Napierala, is now complete.</p>
 
       <p>We recognized the following FreeBSD developers at EuroBSDCon
-	2009: Poul-Henning Kamp, Bjoern Zeeb, and Simon Nielsen. These
+	2009: Poul-Henning Kamp, Bjoern Zeeb, and Simon Nielsen.  These
 	developers received limited edition FreeBSD Foundation vests.</p>
 
       <p>Follow us on <a
-	href="https://twitter.com/freebsdfndationTwitter">Twitter</a> now!</p>
+	href="https://twitter.com/freebsdfndation">Twitter</a> now!</p>
+    </body>
+  </project>
+
+  <project cat='team'>
+    <title>FreeBSD Bugbusting Team</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Gavin</given>
+	  <common>Atkinson</common>
+	</name>
+	<email>gavin@FreeBSD.org</email>
+      </person>
+      <person>
+	<name>
+	  <given>Mark</given>
+	  <common>Linimon</common>
+	</name>
+	<email>linimon@FreeBSD.org</email>
+      </person>
+      <person>
+	<name>
+	  <given>Remko</given>
+	  <common>Lodder</common>
+	</name>
+	<email>remko@FreeBSD.org</email>
+      </person>
+      <person>
+	<name>
+	  <given>Volker</given>
+	  <common>Werth</common>
+	</name>
+	<email>vwe@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://www.FreeBSD.org/support.html#gnats" />
+      <url href="http://wiki.FreeBSD.org/BugBusting" />
+      <url href="http://people.FreeBSD.org/~linimon/studies/prs/" />
+      <url href="http://people.FreeBSD.org/~linimon/studies/prs/recommended_prs.html" />
+    </links>
+
+    <body>
+      <p>We continue to classify PRs as they arrive, adding 'tags' to
+	the subject lines corresponding to the kernel subsystem
+	involved, or man page references for userland PRs.  These tags,
+	in turn, produce lists of PRs sorted both by tag and by
+	manpage.</p>
+
+      <p>The list of PRs recommended for committer evaluation by the
+	Bugbusting Team continues to receive new additions.  This list
+	contains PRs, mostly with patches, that the Bugbusting Team
+	feel are probably ready to be committed as-is, or are probably
+	trivially resolved in the hands of a committer with knowledge
+	of the particular subsystem.  All committers are invited to take
+	a look at this list whenever they have a spare 5 minutes and
+	wish to close a PR.</p>
+
+      <p>A full list of all the automatically generated reports is also
+	available at one of the cited URLs.  Any recommendations for
+	reports which not currently exist but which would be
+	beneficial are welcomed.</p>
+
+      <p>Gavin Atkinson gave a presentation on "The PR Collection
+	Status" at the EuroBSDCon 2009 DevSummit, and discussed with
+	other participants several other ideas to make the PR database
+	more useful and usable.  Several good ideas came from this, and
+	will hopefully lead to more useful tools in the near future.
+	Discussions also took place on how it may be possible to
+	automatically classify non-ports PRs with a view towards
+	notifying interested parties, although investigations into this
+	have not yet begun.</p>
+
+      <p>Mark Linimon also continues attempting to define the general
+	problem and investigating possible new workflow models, and
+	presented work on this at BSDCan 2009.</p>
+
+      <p>Since the last status report, the number of open bugs has
+	increased to around the 5900 mark, partially because of an
+	increased focus on getting more information into the existing
+	PRs, in an attempt to make sure all the information required is
+	now available.  As a result, although the number of open PRs has
+	increased, they are hopefully of better quality.</p>
+
+      <p>As always, more help is appreciated, and committers and
+	non-committers alike are always invited to join us on
+	#freebsd-bugbusters on EFnet and help close stale PRs or commit
+	patches from valid PRs.</p>
+    </body>
+
+    <help>
+      <task>
+	Work on suggestions from developers who were at the EuroBSDCon
+	DevSummit.
+      </task>
+      <task>
+	Try to find ways to get more committers helping us with closing
+	the PRs that the team has already analyzed.
+      </task>
+    </help>
+  </project>
+
+  <project cat='team'>
+    <title>FreeBSD Ports Management Team</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Mark</given>
+	  <common>Linimon</common>
+	</name>
+	<email>linimon@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://www.freebsd.org/ports/">The FreeBSD Ports
+	  Collection</url>
+      <url href="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/contributing-ports/">
+	  Contributing to the FreeBSD Ports Collection</url>
+      <url href="http://portsmon.FreeBSD.org/index.html">The FreeBSD
+	  ports monitoring system</url>
+      <url href="http://www.freebsd.org/portmgr/index.html">The
+	  FreeBSD Ports Management Team</url>
+      <url href="http://tinderbox.marcuscom.com">marcuscom Tinderbox</url>
+    </links>
+
+    <body>
+      <p>The ports count has soared to over 20,700.  The PR count had
+	been driven below 800 by some extraordinary effort, but once
+	again is back to its usual count of around 900.</p>
+
+      <p>We are currently building packages for amd64-6, amd64-7,
+	amd64-8, i386-6, i386-7, i386-8, sparc64-7, and sparc64-8.
+	There have been preliminary runs of i386-9; however, to be able
+	to continue builds on -9, we will either need to find places to
+	host a number of new machines, or drop package building for -6.
+	The mailing list discussion of the latter proved quite
+	controversial.</p>
+
+      <p>We have added some new i386 machines to help speed up the
+	builds, but this only makes up for the disk failures on some
+	of our older, slower, i386 nodes.</p>
+
+      <p>We also appreciate the loan of more package build machines from
+	several committers, including pgollucci@, gahr@, erwin@, Boris
+	Kochergin, and Craig Butler.</p>
+
+      <p>The portmgr@ team has also welcomed new members Ion-Mihai Tetcu
+	(itetcu@) and Martin Wilke (miwi@).  We also thank departing
+	member Kirill Ponomarew (krion@) for his long service.</p>
+
+      <p>Ion-Mihai has spent much time working on a system that does
+	automatic Quality Assurance on new commits, called QATty.
+	This has helped us to fix many problems, especially those
+	involving custom LOCALBASE settings, and documentation inclusion
+	options.</p>
+
+      <p>Between pav and miwi, over 2 dozen experimental ports runs have
+	been completed and committed.</p>
+
+      <p>We have added 5 new committers since the last report, and 2
+	older ones have rejoined.</p>
     </body>
+
+    <help>
+      <task>We are currently trying to set up ports tinderboxes that
+	can be made available to committers for pre-testing.</task>
+      <task>Most of the remaining ports PRs are "existing port/PR
+	assigned to committer".  Although the maintainer-timeout policy
+	is helping to keep the backlog down, we are going to need to do
+	more to get the ports in the shape they really need to be
+	in.</task>
+      <task>Although we have added many maintainers, we still have
+	almost 4,700 unmaintained ports (see, for instance, the list on
+	portsmon).  (The percentage is down to 22%.)  We are always
+	looking for dedicated volunteers to adopt at least a few
+	unmaintained ports.  As well, the packages on amd64 and sparc64
+	lag behind i386, and we need more testers for those.</task>
+    </help>
   </project>
 
   <project cat='team'>
@@ -718,20 +1010,20 @@
 
     <body>
       <p>Since the spring, the FreeBSD KDE team has been busy upgrading
-      KDE from 4.2.0 up through to 4.3.1. As part of the ongoing
+      KDE from 4.2.0 up through to 4.3.1.  As part of the ongoing
       maintenance of KDE, the team also updated Qt4 from 4.4.3 through to
       4.5.2</p>
 
       <p>We added two new committers/maintainers to the team, Kris Moore
-      (kmoore@) and Dima Panov (fluffy@). We also granted enhanced area51
+      (kmoore@) and Dima Panov (fluffy@).  We also granted enhanced area51
       access to contributors Alberto Villa and Raphael Kubo da Costa.
       Alberto has been our key contributor updating and testing Qt
-      4.6.0-tp1. Raphael is a KDE developer, who has become our Gitorious
+      4.6.0-tp1.  Raphael is a KDE developer, who has become our Gitorious
       liaison, he has been responsible for getting FreeBSD Qt patches
       merged in upstream.</p>
 
       <p>Markus Br&uuml;ffer (markus@) spent a lot of time patching widgets
-      and system plugins so they would work under FreeBSD. We would like
+      and system plugins so they would work under FreeBSD.  We would like
       to thank him for all his effort!</p>
     </body>
 
@@ -746,6 +1038,40 @@
   </project>
 
   <project cat='misc'>
+    <title>FreeBSD Developer Summit, Cambridge UK</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Robert</given>
+	  <common>Watson</common>
+	</name>
+	<email>rwatson@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://wiki.FreeBSD.org/200909DevSummit" />
+    </links>
+
+    <body>
+      <p>Around 70 FreeBSD developers and guests attended the FreeBSD
+	developer summit prior to EuroBSDCon 2009 in Cambridge, UK.
+	Hosted at the University of Cambridge Computer Laboratory, the
+	workshop-style event consisted of prepared presentations, as well
+	as group hacking and discussion sessions.  Talks covered topics
+	including 802.11 mesh networking, virtual network stacks and
+	kernels, a new BSD-licensed debugger, benchmarking, bugbusting,
+	NetFPGA, a port of Apple's GCD (Grand Central Dispatch) to
+	FreeBSD, security policy work, cryptographic signatures,
+	FreeBSD.org system administration, time geeks, a new console
+	driver, and the FreeBSD subversion migration.  Slides for many
+	talks are now available on the wiki page.  A good time was had by
+	all, including a punting outing on the River Cam!</p>
+    </body>
+  </project>
+
+  <project cat='misc'>
     <title>EuroBSDcon 2009</title>
 
     <contact>
@@ -778,13 +1104,12 @@
 
     <body>
       <p>EuroBSDcon 2009 happened in Cambridge, with over 160 users,
-      developers, friends and others. Slides, papers and audio are now up
-      on the website for those who could not make it to Cambridge. Next
+      developers, friends and others.  Slides, papers and audio are now up
+      on the website for those who could not make it to Cambridge.  Next
       year's event in 2010 will take place in Karlsruhe from 8 to 10 October
-      2010. If you are interested in what you missed in 2009, or to join
-      the mailing list so you do not miss out next year, visit 
-      <a href="http://2009.eurobsdcon.org/">
-      http://2009.eurosbsdcon.org</a>.
+      2010.  If you are interested in what you missed in 2009, or to join
+      the mailing list so you do not miss out next year, visit
+      <a href="http://2009.eurobsdcon.org/">http://2009.eurosbsdcon.org</a>.
 
       </p>
     </body>
@@ -822,31 +1147,31 @@
     <body>
       <p>Since their public launch in November 2008, the FreeBSD Forums
       (the most recent addition to the user community and support
-      channels for the FreeBSD Operating System), have witnessed a
+      channels for the FreeBSD Operating System) have witnessed a
       healthy and steady growth.</p>
 
       <p>The user population is now at over 8,000 registered users, who
       have participated in over 6,000 topics, containing over 40,000
-      posts in total. The sign-up rate hovers between 50-100 each week.
+      posts in total.  The sign-up rate hovers between 50-100 each week.
       The total number of visitors (including 'guests') is hard to gauge
       but is likely to be a substantial multiple of the registered
       userbase.</p>
 
       <p>New topics and posts are actively 'pushed out' to search
-      engines. This in turn makes the Forums show up in search results
+      engines.  This in turn makes the Forums show up in search results
       more and more often, making it a valuable and very accessible
       source of information for the FreeBSD community.</p>
 
-      <p>One of the contributing factors to the Forum's success is its
+      <p>One of the contributing factors to the Forums' success is their
       'BSD-style' approach when it comes to administration and
-      moderation. The Forums have a strong and unified identity, they are
+      moderation.  The Forums have a strong and unified identity, they are
       neatly divided into sub-forums (like 'Networking', 'Installing
       &amp; Upgrading', etc.), very actively moderated, spam-free, and
       with a core group of very active and helpful members, dispensing
       many combined decades' worth of knowledge to starting, intermediate
       and professional users of FreeBSD.</p>
 
-      <p>We expect the Forums te be, and to remain, a central hub in
+      <p>We expect the Forums to be, and to remain, a central hub in
       FreeBSD's community and support efforts.</p>
     </body>
   </project>
@@ -887,24 +1212,28 @@
       <p>Problem: Over the years the FreeBSD locale database
       (share/colldef, share/monetdef, share/msgdef, share/numericdef,
       share/timedef) has accumulated a total of 165 definitions (language
-      - country-code - character-set triplets). The contents of the files
-      is for Western European languages often low-ASCII but for Eastern
-      European and Asian languages partly or fully high-ASCII. Without
+      - country-code - character-set triplets).  The contents of the files
+      for Western European languages are often low-ASCII but for Eastern
+      European and Asian languages partly or fully high-ASCII.  Without
       knowing how to display or interpret the character-sets, it is
       difficult to make sure by the general audience that the local
-      languages (language - country-code) definitions is displayed
-      properly in various character-sets. Suggested approach: With the
-      combination of the data in the Unicode project (which goal is to
+      language (language - country-code) definitions are displayed
+      properly in various character-sets.</p>
+
+      <p>Suggested approach: With the
+      combination of the data in the Unicode project (whose goal is to
       define all the possible written characters and symbols on this
-      planet) and the Common Locale Data Repository (which goal is to
+      planet) and the Common Locale Data Repository (whose goal is to
       document all the different data and definitions needed for the
       locale database), we can easily keep track of the data, without the
       need of being able to display the data in the required
-      charactersets or understand them fully when updates are submitted
-      by third parties. Current status: Conversion of share/monetdef,
+      character sets or understand them fully when updates are submitted
+      by third parties.</p>
+
+      <p>Current status: Conversion of share/monetdef,
       share/msgdef, share/numericdef, share/timedef to the new design is
-      completed. The Makefile infrastructure is converted. Regression
-      checks are done. Most of the tools are in place, waiting on the
+      completed.  The Makefile infrastructure is converted.  Regression
+      checks are done.  Most of the tools are in place, waiting on the
       import of bsdiconv to the base system.</p>
     </body>
 
@@ -912,9 +1241,9 @@
       <task>At this moment the system is not self-hosted yet, because of
       the lack of an iconv-kind of program in the base operating system.
       Gabor@ is working on bsdiconv as a GSoC project and once that has been
-      imported we will be able to clean install from the definitions in
+      imported we will be able to perform a clean install from the definitions in
       Unicode text format to the required formats and
-      charactersets.</task>
+      character sets.</task>
     </help>
   </project>
 
@@ -945,9 +1274,9 @@
 	(foo -&gt; UTF-32) are compatible with GNU but the reverse ones
 	are not so accurate because of GNU's advanced transliteration.
 	Some extra encodings have also been added.  There are two modules,
-	which segfault, they need some debugging.  I can keep working on this
+	which segfault; they need some debugging.  I can keep working on this
 	project as part of my BSc thesis, so I hope to be able to solve
-	the remaining issues.  An improved GNU compatibility is also very
+	the remaining issues.  Improved GNU compatibility is also very
 	desired (extra command line options for iconv(1), iconvctl(),
 	private interfaces, etc.).</p>
     </body>
@@ -968,7 +1297,7 @@
   </project>
 
   <project cat="soc">
-    <title>Ext2fs Status report (Summer of Code 2009)</title> 
+    <title>Ext2fs Status report (Summer of Code 2009)</title>
 
     <contact>
       <person>
@@ -1048,7 +1377,7 @@
       <p>In the last months, we have not added new translations, although we
 	have been working on the existing ones to have them updated.  We need
 	more translators and volunteers to keep the amount of the translated
-	documentation growing, so feel free to contribute, every line of
+	documentation growing, so feel free to contribute.  Every line of
 	submission or feedback is appreciated and highly welcome.</p>
 
       <p>If you want to join our work, please read the <a
@@ -1111,7 +1440,6 @@
 	existing translations have not been updated, though.  We need
 	more human resources to keep up with the work and keep the
 	translations up-to-date.</p>
-
     </body>
 
     <help>
@@ -1121,8 +1449,8 @@
     </help>
   </project>
 
-  <project cat='bin'>
-    <title>BSD-licensed text-processing tools</title>
+  <project cat='soc'>
+    <title>BSD-licensed text-processing tools (Summer of Code 2008)</title>
 
     <contact>
       <person>
@@ -1141,12 +1469,13 @@
 
     <body>
       <p>This project was started as part of Google Summer of Code 2008 but
-	there is still an ongoing work to complete some missing parts.
+	there is still a bit of work to complete some missing parts.
 	The BSD-licensed grep implementation is feature-complete and
-	has a good level of GNU compatibility.  The only concern is the
+	has a good level of GNU compatibility.  Our only current concern about
+	the BSD-licensed version is to improve its
 	performance.  The GNU variant is much more complex, has about
 	8 KSLOC, while BSD grep is tiny, has only 1.5 KSLOC.  GNU uses
-	some shortcuts and optimizations to trick out the regex library,
+	some shortcuts and optimizations to speed-up calls to the regex library;
 	that is why it is significantly faster.  My point of view is that
 	such optimizations must be implemented in the regex library,
 	keeping the dependent utilities clean and easy to read.  BSD
@@ -1173,7 +1502,6 @@
       <p>The bc/dc utilities have been ported from OpenBSD.  They pass
 	OpenBSD's and GNU's regression tests but they arrived too late to
 	catch 8.X, so they will go to HEAD after the release.</p>
-
     </body>
 
     <help>
@@ -1186,6 +1514,83 @@
   </project>
 
   <project cat='net'>
+    <title>Network Stack Virtualization</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Bjoern A.</given>
+	  <common>Zeeb</common>
+	</name>
+	<email>bz@FreeBSD.ORG</email>
+      </person>
+      <person>
+	<name>
+	  <given>Marko</given>
+	  <common>Zec</common>
+	</name>
+	<email>zec@FreeBSD.ORG</email>
+      </person>
+      <person>
+	<name>
+	  <given>Robert</given>
+	  <common>Watson</common>
+	</name>
+	<email>rwatson@FreeBSD.ORG</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://wiki.freebsd.org/Image">Wiki VImage overview
+	page (incl. TODO).</url>
+      <url href="http://wiki.freebsd.org/200909DevSummit">FreeBSD
+	Developer Summit, 2009, Cambridge, UK.</url>
+    </links>
+
+    <body>
+      <p>The network stack virtualization project aims at extending the
+	FreeBSD kernel to maintain multiple independent instances of
+	networking state.  This allows for networking independence
+	between jail environment, each maintaining its private network
+	interfaces, IPv4 and IPv6 network and port address space, routing
+	tables, IPSec configuration, firewalls, and more.</p>
+
+      <p>During the last months the remaining pieces of the VIMAGE work
+	were merged by Marko, Julian and Bjoern.  Robert Watson developed
+	a vnet allocator to overcome ABI issues.  Jamie Gritton merged
+	his hierachical jail framework that now also is the management
+	interface for virtual network stacks.</p>
+
+      <p>During the FreeBSD Developer Summit that took place at
+	EuroBSDCon 2009 in Cambridge, UK, people virtualized more code.
+	As a result SCTP and another accept filter were virtualized and
+	more people became familiar with the design of VImage and the underlying concepts.
+	Finally getting more hands involved was a crucial first step for
+	the long term success of kernel virtualization.</p>
+
+      <p>The next steps will be to finish the network stack
+	virtualization, generalize the allocator framework before
+	thinking of virtualizing further subsystems and to update the related
+	documentation.  Along with that a proper jail management
+	framework will be worked on.  Long term goals, amongst others,
+	will be to virtualize more subsystems like SYS-V IPC, better
+	privilege handling, and resource limits.</p>
+
+      <p>In the upcoming FreeBSD 8.0 Release, vnets are treated as an
+	experimental feature.  As a result, they are not yet recommended for use in
+	production environments.  There was lots of time spent to
+	finalize the infrastructure for vnets though, so that further
+	changes can be merged and we are aiming to have things
+	production ready for 8.2.</p>
+
+      <p>In case you want to help to achieve this goal, feel free to
+	contact us and support or help virtualizing outstanding parts
+	like two firewalls, appletalk, netipx, ... as well as generating

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 09:32:45 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 58022106568F; Sun, 11 Oct 2009 09:32:45 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1C7591065679
	for <perforce@FreeBSD.org>; Sun, 11 Oct 2009 09:32:45 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0B9DF8FC19
	for <perforce@FreeBSD.org>; Sun, 11 Oct 2009 09:32:45 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9B9WiAX097293
	for <perforce@FreeBSD.org>; Sun, 11 Oct 2009 09:32:44 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9B9WiOP097291
	for perforce@freebsd.org; Sun, 11 Oct 2009 09:32:44 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sun, 11 Oct 2009 09:32:44 GMT
Message-Id: <200910110932.n9B9WiOP097291@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169380 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 09:32:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=169380

Change 169380 by pgj@beehive on 2009/10/11 09:32:18

	MFen (doc):
		1.1116     -> 1.1117     hu_HU.ISO8859-2/books/faq/book.sgml

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#51 edit

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#51 (text+ko) ====

@@ -9,7 +9,7 @@
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
      %SOURCE%	en_US.ISO8859-1/books/faq/book.sgml
-     %SRCID%	1.1116
+     %SRCID%	1.1117
 -->
 
 <book lang="hu">
@@ -377,14 +377,12 @@
 	</question>
 
 	<answer>
-	  <para>James Howard a <ulink
-	    url="http://www.daemonnews.org/">DaemonNews</ulink>
-	    oldal&aacute;n <ulink
-	    url="http://ezine.daemonnews.org/200104/bsd_family.html">The
-	    BSD Family Tree</ulink> c&iacute;mmel (angolul)
-	    k&eacute;sz&iacute;tett alapos le&iacute;r&aacute;st a
-	    k&uuml;l&ouml;nb&ouml;z&#245; projektek k&ouml;zti
-	    elt&eacute;r&eacute;sek bemutat&aacute;s&aacute;ra.</para>
+	  <para>James Howard <ulink
+	      url="http://www-personal.si.umich.edu/~dhogan/documentation/unix/bsd-family.html">The BSD Family Tree</ulink>
+	    c&iacute;mmel (angolul) k&eacute;sz&iacute;tett egy alapos
+	    le&iacute;r&aacute;st a k&uuml;l&ouml;nb&ouml;z&#245;
+	    projektek k&ouml;zti elt&eacute;r&eacute;sek
+	    bemutat&aacute;s&aacute;ra.</para>
 	</answer>
       </qandaentry>
 

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 09:33:46 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 922151065672; Sun, 11 Oct 2009 09:33:46 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3E075106566B
	for <perforce@FreeBSD.org>; Sun, 11 Oct 2009 09:33:46 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2BA508FC0A
	for <perforce@FreeBSD.org>; Sun, 11 Oct 2009 09:33:46 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9B9Xknu097398
	for <perforce@FreeBSD.org>; Sun, 11 Oct 2009 09:33:46 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9B9XjFr097396
	for perforce@freebsd.org; Sun, 11 Oct 2009 09:33:45 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sun, 11 Oct 2009 09:33:45 GMT
Message-Id: <200910110933.n9B9XjFr097396@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169381 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 09:33:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=169381

Change 169381 by rene@rene_self on 2009/10/11 09:33:25

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#34 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#30 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#23 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#46 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#25 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#29 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/jh.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#27 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#24 integrate
.. //depot/projects/docproj_nl/www/en/administration.sgml#8 integrate
.. //depot/projects/docproj_nl/www/en/developers.sgml#23 integrate
.. //depot/projects/docproj_nl/www/en/news/status/Makefile#6 integrate
.. //depot/projects/docproj_nl/www/en/news/status/report-2009-04-2009-09.xml#1 branch
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#52 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#34 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.876 2009/09/17 13:25:51 glarkin Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.877 2009/10/07 19:56:20 glarkin Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -3400,6 +3400,11 @@
     </listitem>
 
     <listitem>
+      <para>Grzegorz Blach
+	<email>magik@roorback.net</email></para>
+    </listitem>
+
+    <listitem>
       <para>Guido Falsi
 	<email>mad@madpilot.net</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#30 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.273 2009/09/16 15:02:14 wen Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.274 2009/10/04 14:47:10 jh Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -511,6 +511,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.jh;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.ghelmer;</para>
     </listitem>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#23 (text+ko) ====

@@ -12,7 +12,7 @@
 
     <corpauthor>The &os; Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1116 2009/06/08 19:43:01 bcr Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1117 2009/10/04 05:42:00 manolis Exp $</pubdate>
 
     <copyright>
       <year>1995</year>
@@ -275,10 +275,9 @@
 
 	<answer>
 	  <para>James Howard wrote a good explanation of the history and
-	    differences between the various projects for <ulink
-	      url="http://www.daemonnews.org/">DaemonNews</ulink>,
+	    differences between the various projects,
 	    called <ulink
-	      url="http://ezine.daemonnews.org/200104/bsd_family.html">The BSD Family Tree</ulink>
+	      url="http://www-personal.si.umich.edu/~dhogan/documentation/unix/bsd-family.html">The BSD Family Tree</ulink>
 	    which goes a fair way to answering this question.</para>
 	</answer>
       </qandaentry>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#46 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1030 2009/09/30 15:06:38 tabthorpe Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1032 2009/10/04 17:56:34 keramida Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -5885,11 +5885,21 @@
 
 	<para>KDE 4.x ports are installed into <literal>&dollar;{KDE4_PREFIX}</literal>,
 	  which is <filename>/usr/local/kde4</filename> currently, to avoid conflicts
-	  with KDE 3.x ports. This is achieved by specifying <literal>kdeprefix</literal>
-	  component, which overrides default <makevar>PREFIX</makevar>. The ports however
-	  respect <makevar>PREFIX</makevar> set via <envar>MAKEFLAGS</envar> environment
+	  with KDE 3.x ports.  This is achieved by specifying the <literal>kdeprefix</literal>
+	  component, which overrides the default <makevar>PREFIX</makevar>.  The ports however
+	  respect any <makevar>PREFIX</makevar> set via <envar>MAKEFLAGS</envar> environment
 	  variable and/or <application>make</application> arguments.</para>
 
+	<para>KDE 4.x ports may conflict with KDE 3.x ports, so when the
+	  <literal>kdeprefix</literal> component is enabled, they are installed in
+	  <literal>&dollar;{KDE4_PREFIX}</literal>.  The default value of
+	  <literal>KDE4_PREFIX</literal> is currently
+	  <filename>/usr/local/kde4</filename>.  Installing the KDE 4.x ports into
+	  a custom <literal>PREFIX</literal> is also possible.  When
+	  <literal>PREFIX</literal> is set via the <envar>MAKEFLAGS</envar>
+	  environment variable or via <application>make</application> options it
+	  overrides the value configured by <literal>kdeprefix</literal>.</para>
+
 	<example id="kde4-components-example">
 	  <title><makevar>USE_KDE4</makevar> example</title>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#25 (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.489 2009/09/16 14:58:25 wen Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.490 2009/10/04 14:47:10 jh Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>">
@@ -500,6 +500,8 @@
 
 <!ENTITY a.jgreco "Joe Greco <email>jgreco@FreeBSD.org</email>">
 
+<!ENTITY a.jh "Jaakko Heinonen <email>jh@FreeBSD.org</email>">
+
 <!ENTITY a.jhay "John Hay <email>jhay@FreeBSD.org</email>">
 
 <!ENTITY a.jhb "John Baldwin <email>jhb@FreeBSD.org</email>">

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#29 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.18 2009/08/26 06:04:09 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.19 2009/10/04 14:06:59 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
      %SRCID%	1.245

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#27 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.109 2009/09/30 22:43:26 csjp Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.110 2009/10/04 14:47:10 jh Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -481,6 +481,11 @@
       &pgpkey.niels;
     </sect2>
 
+    <sect2 id="pgpkey-jh">
+      <title>&a.jh;</title>
+      &pgpkey.jh;
+    </sect2>
+
     <sect2 id="pgpkey-ghelmer">
       <title>&a.ghelmer;</title>
       &pgpkey.ghelmer;

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#24 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.202 2009/09/30 22:43:26 csjp Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.203 2009/10/04 14:47:10 jh Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -127,6 +127,7 @@
 <!ENTITY pgpkey.jdp SYSTEM "jdp.key">
 <!ENTITY pgpkey.jedgar SYSTEM "jedgar.key">
 <!ENTITY pgpkey.jesper SYSTEM "jesper.key">
+<!ENTITY pgpkey.jh SYSTEM "jh.key">
 <!ENTITY pgpkey.jhay SYSTEM "jhay.key">
 <!ENTITY pgpkey.jhb SYSTEM "jhb.key">
 <!ENTITY pgpkey.jilles SYSTEM "jilles.key">

==== //depot/projects/docproj_nl/www/en/administration.sgml#8 (text+ko) ====

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.25 2009/06/04 09:21:29 linimon Exp $">
+<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.26 2009/10/06 08:03:43 danger Exp $">
 <!ENTITY title "FreeBSD Project Administration and Management">
 <!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "developers.sgml"> %developers;
@@ -169,6 +169,7 @@
     <li>&a.murray; &lt;<a href="mailto:murray@FreeBSD.org">murray@FreeBSD.org</a>&gt;</li>
     <li>&a.rwatson; &lt;<a href="mailto:rwatson@FreeBSD.org">rwatson@FreeBSD.org</a>&gt;</li>
     <li>&a.dwhite; &lt;<a href="mailto:dwhite@FreeBSD.org">dwhite@FreeBSD.org</a>&gt;</li>
+    <li>&a.bz; &lt;<a href="mailto:bz@FreeBSD.org">bz@FreeBSD.org</a>&gt;</li>
   </ul>
 
   <h3><a name="t-re-alpha">FreeBSD/alpha Release Engineering Team</a>

==== //depot/projects/docproj_nl/www/en/developers.sgml#23 (text+ko) ====

@@ -6,7 +6,7 @@
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.230 2009/09/16 15:05:12 wen Exp $
+$FreeBSD: www/en/developers.sgml,v 1.231 2009/10/04 15:00:07 jh Exp $
 
 -->
 
@@ -248,6 +248,7 @@
 <!ENTITY a.jfitz "James FitzGibbon">
 <!ENTITY a.jfv "Jack F. Vogel">
 <!ENTITY a.jgreco "Joe Greco">
+<!ENTITY a.jh "Jaakko Heinonen">
 <!ENTITY a.jhay "John Hay">
 <!ENTITY a.jhb "John Baldwin">
 <!ENTITY a.jhs "Julian Stacey">

==== //depot/projects/docproj_nl/www/en/news/status/Makefile#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/news/status/Makefile,v 1.46 2009/05/07 18:12:15 brd Exp $
+# $FreeBSD: www/en/news/status/Makefile,v 1.47 2009/10/05 12:49:16 danger Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -44,6 +44,7 @@
 XMLDOCS+=	report-2008-07-2008-09
 XMLDOCS+=	report-2008-10-2008-12
 XMLDOCS+=	report-2009-01-2009-03
+#XMLDOCS+=	report-2009-04-2009-09
 
 XSLT.DEFAULT=	report.xsl
 

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#52 (text+ko) ====

@@ -25,7 +25,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/news.xml,v 1.271 2009/09/21 20:05:13 blackend Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.272 2009/10/04 15:00:07 jh Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -33,6 +33,18 @@
     <name>2009</name>
 
     <month>
+      <name>10</name>
+      <day>
+        <name>4</name>
+
+        <event>
+          <p>New committer: <a href="mailto:jh@FreeBSD.org">Jaakko
+	    Heinonen</a> (src)</p>
+        </event>
+      </day>
+    </month>
+
+    <month>
       <name>9</name>
 
       <day>

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 09:40:54 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5C2131065692; Sun, 11 Oct 2009 09:40:54 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 20B39106568D
	for <perforce@FreeBSD.org>; Sun, 11 Oct 2009 09:40:54 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 101968FC28
	for <perforce@FreeBSD.org>; Sun, 11 Oct 2009 09:40:54 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9B9erOI097987
	for <perforce@FreeBSD.org>; Sun, 11 Oct 2009 09:40:53 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9B9ervb097985
	for perforce@freebsd.org; Sun, 11 Oct 2009 09:40:53 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sun, 11 Oct 2009 09:40:53 GMT
Message-Id: <200910110940.n9B9ervb097985@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169382 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 09:40:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=169382

Change 169382 by rene@rene_self on 2009/10/11 09:40:51

	[website]
	MFen administration.sgml 1.25 -> 1.26	

Affected files ...

.. //depot/projects/docproj_nl/www/nl/administration.sgml#9 edit

Differences ...

==== //depot/projects/docproj_nl/www/nl/administration.sgml#9 (text+ko) ====

@@ -7,7 +7,7 @@
 <!--
      Vertaald door: Rene Ladan
      %SOURCE%	en/administration.sgml
-     %SRCID%	1.25
+     %SRCID%	1.26
 -->
 <html>
   &header;
@@ -163,6 +163,7 @@
     <li>&a.murray; &lt;<a href="mailto:murray@FreeBSD.org">murray@FreeBSD.org</a>&gt;</li>
     <li>&a.rwatson; &lt;<a href="mailto:rwatson@FreeBSD.org">rwatson@FreeBSD.org</a>&gt;</li>
     <li>&a.dwhite; &lt;<a href="mailto:dwhite@FreeBSD.org">dwhite@FreeBSD.org</a>&gt;</li>
+    <li>&a.bz; &lt;<a href="mailto:bz@FreeBSD.org">bz@FreeBSD.org</a>&gt;</li>
   </ul>
 
   <h3><a name="t-re-alpha">&os;/alpha Uitgave Beheerteam</a>

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 10:38:58 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D8A711065676; Sun, 11 Oct 2009 10:38:57 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 841D4106566B
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 10:38:57 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 71F318FC19
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 10:38:57 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BAcvEK003303
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 10:38:57 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BAcvVu003301
	for perforce@freebsd.org; Sun, 11 Oct 2009 10:38:57 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 11 Oct 2009 10:38:57 GMT
Message-Id: <200910111038.n9BAcvVu003301@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169384 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 10:38:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=169384

Change 169384 by trasz@trasz_victim on 2009/10/11 10:38:24

	Get rid of per-group limits.  The code implementing them was bad
	in the first place, and then got horribly broken after Brooks
	changed the way group ids are stored in the ucred.
	
	Some of the infrastructure - 'struct gidinfo', giwhatever()
	routines etc - are left alone; they are ok and will be reused
	when per-group limits support get reimplemented.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/TODO#13 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#16 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exec.c#9 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#16 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#65 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#24 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/ucred.h#10 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/TODO#13 (text+ko) ====

@@ -2,10 +2,9 @@
  - Make the limits lists protected by the subjects lock (e.g. process lock)
    instead of hrl_lock.
 
- - Make sure we have all the gidinfos we need in the 'struct ucred'.
+ - Bring back per-group limits.
 
  - Fix up (add/remove resource counters) when:
-   - Adding a group to a process,
    - Removing a group from a process,
    - Moving a process into a jail.
    - Changing [re]uid;

==== //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#16 (text+ko) ====

@@ -465,8 +465,6 @@
 	/* Create credentials. */
 	p->p_ucred = crget();
 	p->p_ucred->cr_ngroups = 1;	/* group 0 */
-	if (p->p_ucred->cr_gidinfos != NULL)
-		p->p_ucred->cr_gidinfos[0] = gifind(0);
 	p->p_ucred->cr_uidinfo = uifind(0);
 	p->p_ucred->cr_ruidinfo = uifind(0);
 	p->p_ucred->cr_prison = &prison0;

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_exec.c#9 (text+ko) ====

@@ -325,7 +325,6 @@
 	struct nameidata nd;
 	struct ucred *newcred = NULL, *oldcred;
 	struct uidinfo *euip;
-	struct gidinfo *egip;
 	register_t *stack_base;
 	int error, len = 0, i;
 	struct image_params image_params, *imgp;
@@ -564,7 +563,6 @@
 	 */
 	newcred = crget();
 	euip = uifind(attr.va_uid);
-	egip = gifind(attr.va_gid);
 	i = imgp->args->begin_envv - imgp->args->begin_argv;
 	/* Cache arguments if they fit inside our allowance */
 	if (ps_arg_cache_limit >= i + sizeof(struct pargs)) {
@@ -693,7 +691,7 @@
 		if (attr.va_mode & S_ISUID)
 			change_euid(newcred, euip);
 		if (attr.va_mode & S_ISGID)
-			change_egid(newcred, egip);
+			change_egid(newcred, attr.va_gid);
 #ifdef MAC
 		if (will_transition) {
 			mac_vnode_execve_transition(oldcred, newcred, imgp->vp,
@@ -822,7 +820,6 @@
 	 * Free any resources malloc'd earlier that we didn't use.
 	 */
 	uifree(euip);
-	gifree(egip);
 	if (newcred == NULL)
 		crfree(oldcred);
 	else

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#16 (text+ko) ====

@@ -770,7 +770,7 @@
 	hrl_proc_exiting(p);
 
 	/*
-	 * Free credentials, arguments and sigacts.
+	 * Free credentials, arguments, and sigacts.
 	 */
 	crfree(p->p_ucred);
 	p->p_ucred = NULL;

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#65 (text+ko) ====

@@ -59,12 +59,6 @@
 #define	HRL_DEFAULT_BUFSIZE	4096
 #define	HRL_LOG_BUFSIZE		128
 
-int hrl_group_accounting = 0;
-
-TUNABLE_INT("kern.hrl_group_accounting", &hrl_group_accounting);
-SYSCTL_INT(_kern, OID_AUTO, hrl_group_accounting, CTLFLAG_RD,
-    &hrl_group_accounting, 0, "");
-
 struct dict {
 	const char	*d_name;
 	int		d_value;
@@ -127,7 +121,7 @@
 static void
 hrl_assert_proc(const struct proc *p __unused)
 {
-	int i, resource;
+	int resource;
 	struct ucred *cred;
 	struct prison *pr;
 	
@@ -148,17 +142,6 @@
 	    	    p->p_usage.hu_resources[resource],
 		    ("resource usage propagation meltdown"));
 	}
-	if (hrl_group_accounting) {
-		for (i = 0; i < cred->cr_ngroups; i++) {
-			for (resource = 0; resource <= HRL_RESOURCE_MAX; resource++) {
-				KASSERT(cred->cr_gidinfos[i]->gi_usage.hu_resources[resource] >= 0,
-				    ("resource usage propagation meltdown"));
-				KASSERT(cred->cr_gidinfos[i]->gi_usage.hu_resources[resource] >=
-	    	    		    p->p_usage.hu_resources[resource],
-				    ("resource usage propagation meltdown"));
-			}
-		}
-	}
 }
 #endif /* DIAGNOSTIC */
 
@@ -258,8 +241,8 @@
 static int64_t
 hrl_available_resource(const struct proc *p, const struct hrl_rule *rule)
 {
-	int resource, i;
-	int64_t available = INT64_MAX, found = 0;
+	int resource;
+	int64_t available = INT64_MAX;
 	struct ucred *cred = p->p_ucred;
 
 	mtx_assert(&hrl_lock, MA_OWNED);
@@ -274,20 +257,6 @@
 		available = rule->hr_amount -
 		    cred->cr_ruidinfo->ui_usage.hu_resources[resource];
 		break;
-	case HRL_SUBJECT_TYPE_GROUP:
-		if (hrl_group_accounting) {
-			for (i = 0; i < cred->cr_ngroups; i++) {
-				if (cred->cr_gidinfos[i] !=
-				    rule->hr_subject.hs_gip)
-					continue;
-
-				found = 1;
-				available = rule->hr_amount -
-				    cred->cr_gidinfos[i]->gi_usage.hu_resources[resource];
-			}
-			KASSERT(found, ("hrl_available_resource: group not found"));
-		}
-		break;
 	case HRL_SUBJECT_TYPE_LOGINCLASS:
 		available = rule->hr_amount -
 		    cred->cr_loginclass->lc_usage.hu_resources[resource];
@@ -475,7 +444,7 @@
 int
 hrl_alloc(struct proc *p, int resource, uint64_t amount)
 {
-	int i, j, error;
+	int error;
 	struct ucred *cred;
 	struct prison *pr;
 
@@ -498,25 +467,6 @@
 	for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
 		pr->pr_usage.hu_resources[resource] += amount;
 	cred->cr_loginclass->lc_usage.hu_resources[resource] += amount;
-	/*
-	 * XXX: Slow.
-	 */
-	if (hrl_group_accounting) {
-		for (i = 0; i < cred->cr_ngroups; i++) {
-			/*
-			 * Make sure we don't account a group more than once
-			 * if it appears in cr_groups[] more than once.
-			 */
-			for (j = 0; j < i; j++) {
-				if (cred->cr_groups[i] == cred->cr_groups[j])
-					goto skip_group;
-			}
-			cred->cr_gidinfos[i]->gi_usage.hu_resources[resource] +=
-			    amount;
-skip_group:
-			continue;
-		}
-	}
 #ifdef DIAGNOSTIC
 	hrl_assert_proc(p);
 #endif
@@ -535,7 +485,7 @@
 int
 hrl_allocated(struct proc *p, int resource, uint64_t amount)
 {
-	int i, j, error;
+	int error;
 	int64_t diff;
 	struct ucred *cred;
 	struct prison *pr;
@@ -562,25 +512,6 @@
 	for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
 		pr->pr_usage.hu_resources[resource] += diff;
 	cred->cr_loginclass->lc_usage.hu_resources[resource] += diff;
-	/*
-	 * XXX: Slow.
-	 */
-	if (hrl_group_accounting) {
-		for (i = 0; i < cred->cr_ngroups; i++) {
-			/*
-			 * Make sure we don't account a group more than once
-			 * if it appears in cr_groups[] more than once.
-			 */
-			for (j = 0; j < i; j++) {
-				if (cred->cr_groups[i] == cred->cr_groups[j])
-					goto skip_group;
-			}
-			cred->cr_gidinfos[i]->gi_usage.hu_resources[resource] +=
-			    diff;
-skip_group:
-			continue;
-		}
-	}
 #ifdef DIAGNOSTIC
 	hrl_assert_proc(p);
 #endif
@@ -595,7 +526,6 @@
 void
 hrl_free(struct proc *p, int resource, uint64_t amount)
 {
-	int i, j;
 	struct ucred *cred;
 	struct prison *pr;
 
@@ -617,25 +547,6 @@
 	for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
 		pr->pr_usage.hu_resources[resource] -= amount;
 	cred->cr_loginclass->lc_usage.hu_resources[resource] -= amount;
-	/*
-	 * XXX: Slow.
-	 */
-	if (hrl_group_accounting) {
-		for (i = 0; i < cred->cr_ngroups; i++) {
-			/*
-			 * Make sure we don't account a group more than once
-			 * if it appears in cr_groups[] more than once.
-			 */
-			for (j = 0; j < i; j++) {
-				if (cred->cr_groups[i] == cred->cr_groups[j])
-					goto skip_group;
-			}
-			cred->cr_gidinfos[i]->gi_usage.hu_resources[resource] -=
-			    amount;
-skip_group:
-			continue;
-		}
-	}
 #ifdef DIAGNOSTIC
 	hrl_assert_proc(p);
 #endif
@@ -1149,7 +1060,6 @@
 	return (rule);
 }
 
-
 /*
  * Link a rule with subjects to which it applies.
  */
@@ -1165,8 +1075,8 @@
 
 	KASSERT(hrl_rule_fully_specified(rule), ("rule not fully specified"));
 
-	if ((rule->hr_subject_type == HRL_SUBJECT_TYPE_GROUP ||
-	    rule->hr_per == HRL_SUBJECT_TYPE_GROUP) && !hrl_group_accounting)
+	if (rule->hr_subject_type == HRL_SUBJECT_TYPE_GROUP ||
+	    rule->hr_per == HRL_SUBJECT_TYPE_GROUP)
 		return (EOPNOTSUPP);
 
 	if (rule->hr_action == HRL_ACTION_DELAY)
@@ -1734,7 +1644,7 @@
 void
 hrl_proc_ucred_changing(struct proc *p, struct ucred *newcred)
 {
-	int error, i;
+	int error;
 	struct hrl_limit *limit;
 	struct uidinfo *olduip, *newuip;
 	struct loginclass *oldlc, *newlc;
@@ -1765,17 +1675,6 @@
 		error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule);
 		KASSERT(error == 0, ("XXX: better error handling needed"));
 	}
-	if (hrl_group_accounting) {
-		for (i = 0; i < newcred->cr_ngroups; i++) {
-			LIST_FOREACH(limit,
-			    &newcred->cr_gidinfos[i]->gi_limits, hl_next) {
-				error = hrl_limit_add_locked(&p->p_limits,
-				    limit->hl_rule);
-				KASSERT(error == 0,
-				    ("XXX: better error handling needed"));
-			}
-		}
-	}
 
 	/*
 	 * Add rules for the current loginclass.
@@ -1798,18 +1697,6 @@
 	}
 
 	/*
-	 * Fix up per-group resource consumption.
-	 */
-	if (hrl_group_accounting) {
-		for (i = 0; i < p->p_ucred->cr_ngroups; i++)
-			hrl_usage_subtract(
-			    &p->p_ucred->cr_gidinfos[i]->gi_usage, &p->p_usage);
-		for (i = 0; i < newcred->cr_ngroups; i++)
-			hrl_usage_add(
-			    &newcred->cr_gidinfos[i]->gi_usage, &p->p_usage);
-	}
-
-	/*
 	 * Adjust loginclass resource usage information.
 	 */
 	newlc = newcred->cr_loginclass;

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#24 (text+ko) ====

@@ -79,8 +79,6 @@
 #include <security/audit/audit.h>
 #include <security/mac/mac_framework.h>
 
-extern int hrl_group_accounting;
-
 static MALLOC_DEFINE(M_CRED, "cred", "credentials");
 
 SYSCTL_NODE(_security, OID_AUTO, bsd, CTLFLAG_RW, 0, "BSD security policy");
@@ -655,13 +653,11 @@
 	struct proc *p = td->td_proc;
 	struct ucred *newcred, *oldcred;
 	gid_t gid;
-	struct gidinfo *gip;
 	int error;
 
 	gid = uap->gid;
 	AUDIT_ARG_GID(gid);
 	newcred = crget();
-	gip = gifind(gid);
 	PROC_LOCK(p);
 	oldcred = crcopysafe(p, newcred);
 
@@ -729,18 +725,16 @@
 	 * Copy credentials so other references do not see our changes.
 	 */
 	if (oldcred->cr_groups[0] != gid) {
-		change_egid(newcred, gip);
+		change_egid(newcred, gid);
 		setsugid(p);
 	}
 	change_cred(p, newcred);
 	PROC_UNLOCK(p);
-	gifree(gip);
 	crfree(oldcred);
 	return (0);
 
 fail:
 	PROC_UNLOCK(p);
-	gifree(gip);
 	crfree(newcred);
 	return (error);
 }
@@ -757,13 +751,11 @@
 	struct proc *p = td->td_proc;
 	struct ucred *newcred, *oldcred;
 	gid_t egid;
-	struct gidinfo *egip;
 	int error;
 
 	egid = uap->egid;
 	AUDIT_ARG_EGID(egid);
 	newcred = crget();
-	egip = gifind(egid);
 	PROC_LOCK(p);
 	oldcred = crcopysafe(p, newcred);
 
@@ -779,18 +771,16 @@
 		goto fail;
 
 	if (oldcred->cr_groups[0] != egid) {
-		change_egid(newcred, egip);
+		change_egid(newcred, egid);
 		setsugid(p);
 	}
 	change_cred(p, newcred);
 	PROC_UNLOCK(p);
-	gifree(egip);
 	crfree(oldcred);
 	return (0);
 
 fail:
 	PROC_UNLOCK(p);
-	gifree(egip);
 	crfree(newcred);
 	return (error);
 }
@@ -825,8 +815,6 @@
 {
 	struct proc *p = td->td_proc;
 	struct ucred *newcred, *oldcred;
-	struct gidinfo **gidinfos = NULL, **oldgidinfos = NULL;
-	int i, oldngroups = 0;
 	int error;
 
 	if (ngrp > NGROUPS)
@@ -834,12 +822,6 @@
 	AUDIT_ARG_GROUPSET(groups, ngrp);
 	newcred = crget();
 	crextend(newcred, ngrp);
-	if (hrl_group_accounting) {
-		gidinfos = malloc(ngrp * sizeof(struct gidinfo *), M_CRED,
-		    M_WAITOK | M_ZERO);
-		for (i = 0; i < ngrp; i++)
-			gidinfos[i] = gifind(groups[i]);
-	}
 	PROC_LOCK(p);
 	oldcred = crcopysafe(p, newcred);
 
@@ -860,53 +842,19 @@
 		 * have the egid in the groups[0]).  We risk security holes
 		 * when running non-BSD software if we do not do the same.
 		 */
-		if (hrl_group_accounting) {
-			oldngroups = newcred->cr_ngroups - 1;
-			for (i = 0; i < oldngroups; i++)
-				oldgidinfos[i] = newcred->cr_gidinfos[i + 1];
-		}
 		newcred->cr_ngroups = 1;
 	} else {
 		crsetgroups_locked(newcred, ngrp, groups);
-		if (hrl_group_accounting) {
-			oldngroups = newcred->cr_ngroups;
-			for (i = 0; i < oldngroups; i++)
-				oldgidinfos[i] = newcred->cr_gidinfos[i];
-			newcred->cr_ngroups = ngrp;
-			for (i = 0; i < newcred->cr_ngroups; i++)
-				newcred->cr_gidinfos[i] = gidinfos[i];
-		}
 	}
 	setsugid(p);
 	change_cred(p, newcred);
 	PROC_UNLOCK(p);
-	if (hrl_group_accounting) {
-		for (i = 0; i < oldngroups; i++)
-			gifree(oldgidinfos[i]);
-	}
-	/* Don't free gidinfos[]. */
 	crfree(oldcred);
-	if (hrl_group_accounting) {
-		for (i = 0; i < newcred->cr_ngroups; i++)
-			KASSERT(newcred->cr_gidinfos[i]->gi_gid == newcred->cr_groups[i], ("Whoops."));
-	}
 	return (0);
 
 fail:
 	PROC_UNLOCK(p);
-	if (hrl_group_accounting) {
-		for (i = 0; i < oldngroups; i++)
-			gifree(oldgidinfos[i]);
-		free(oldgidinfos, M_CRED);
-		for (i = 0; i < ngrp; i++)
-			gifree(gidinfos[i]);
-		free(gidinfos, M_CRED);
-	}
 	crfree(newcred);
-	if (hrl_group_accounting) {
-		for (i = 0; i < newcred->cr_ngroups; i++)
-			KASSERT(newcred->cr_gidinfos[i]->gi_gid == newcred->cr_groups[i], ("Whoops."));
-	}
 	return (error);
 }
 
@@ -990,7 +938,6 @@
 	struct proc *p = td->td_proc;
 	struct ucred *newcred, *oldcred;
 	gid_t egid, rgid;
-	struct gidinfo *egip;
 	int error;
 
 	egid = uap->egid;
@@ -998,7 +945,6 @@
 	AUDIT_ARG_EGID(egid);
 	AUDIT_ARG_RGID(rgid);
 	newcred = crget();
-	egip = gifind(egid);
 	PROC_LOCK(p);
 	oldcred = crcopysafe(p, newcred);
 
@@ -1016,7 +962,7 @@
 		goto fail;
 
 	if (egid != (gid_t)-1 && oldcred->cr_groups[0] != egid) {
-		change_egid(newcred, egip);
+		change_egid(newcred, egid);
 		setsugid(p);
 	}
 	if (rgid != (gid_t)-1 && oldcred->cr_rgid != rgid) {
@@ -1030,13 +976,11 @@
 	}
 	change_cred(p, newcred);
 	PROC_UNLOCK(p);
-	gifree(egip);
 	crfree(oldcred);
 	return (0);
 
 fail:
 	PROC_UNLOCK(p);
-	gifree(egip);
 	crfree(newcred);
 	return (error);
 }
@@ -1138,7 +1082,6 @@
 	struct proc *p = td->td_proc;
 	struct ucred *newcred, *oldcred;
 	gid_t egid, rgid, sgid;
-	struct gidinfo *egip;
 	int error;
 
 	egid = uap->egid;
@@ -1148,7 +1091,6 @@
 	AUDIT_ARG_RGID(rgid);
 	AUDIT_ARG_SGID(sgid);
 	newcred = crget();
-	egip = gifind(egid);
 	PROC_LOCK(p);
 	oldcred = crcopysafe(p, newcred);
 
@@ -1171,7 +1113,7 @@
 		goto fail;
 
 	if (egid != (gid_t)-1 && oldcred->cr_groups[0] != egid) {
-		change_egid(newcred, egip);
+		change_egid(newcred, egid);
 		setsugid(p);
 	}
 	if (rgid != (gid_t)-1 && oldcred->cr_rgid != rgid) {
@@ -1184,13 +1126,11 @@
 	}
 	change_cred(p, newcred);
 	PROC_UNLOCK(p);
-	gifree(egip);
 	crfree(oldcred);
 	return (0);
 
 fail:
 	PROC_UNLOCK(p);
-	gifree(egip);
 	crfree(newcred);
 	return (error);
 }
@@ -1875,7 +1815,6 @@
 void
 crfree(struct ucred *cr)
 {
-	int i;
 
 	KASSERT(cr->cr_ref > 0, ("bad ucred refcount: %d", cr->cr_ref));
 	KASSERT(cr->cr_ref != 0xdeadc0de, ("dangling reference to ucred"));
@@ -1889,10 +1828,6 @@
 			uifree(cr->cr_uidinfo);
 		if (cr->cr_ruidinfo != NULL)
 			uifree(cr->cr_ruidinfo);
-		if (hrl_group_accounting) {
-			for (i = 0; i < cr->cr_ngroups; i++)
-				gifree(cr->cr_gidinfos[i]);
-		}
 		/*
 		 * Free a prison, if any.
 		 */
@@ -1926,7 +1861,6 @@
 void
 crcopy(struct ucred *dest, struct ucred *src)
 {
-	int i;
 
 	KASSERT(crshared(dest) == 0, ("crcopy of shared ucred"));
 	bcopy(&src->cr_startcopy, &dest->cr_startcopy,
@@ -1935,10 +1869,6 @@
 	crsetgroups(dest, src->cr_ngroups, src->cr_groups);
 	uihold(dest->cr_uidinfo);
 	uihold(dest->cr_ruidinfo);
-	if (hrl_group_accounting) {
-		for (i = 0; i < dest->cr_ngroups; i++)
-			gihold(dest->cr_gidinfos[i]);
-	}
 	prison_hold(dest->cr_prison);
 	loginclass_acquire(dest->cr_loginclass);
 #ifdef AUDIT
@@ -2053,16 +1983,10 @@
 		cnt = roundup2(n, PAGE_SIZE / sizeof(gid_t));
 
 	/* Free the old array. */
-	if (cr->cr_groups) {
+	if (cr->cr_groups)
 		free(cr->cr_groups, M_CRED);
-		if (hrl_group_accounting)
-			free(cr->cr_gidinfos, M_CRED);
-	}
 
 	cr->cr_groups = malloc(cnt * sizeof(gid_t), M_CRED, M_WAITOK | M_ZERO);
-	if (hrl_group_accounting)
-		cr->cr_gidinfos = malloc(cnt * sizeof(struct gidinfo *), M_CRED,
-		    M_WAITOK | M_ZERO);
 	cr->cr_agroups = cnt;
 }
 
@@ -2222,15 +2146,10 @@
  *             duration of the call.
  */
 void
-change_egid(struct ucred *newcred, struct gidinfo *egip)
+change_egid(struct ucred *newcred, gid_t egid)
 {
 
-	newcred->cr_groups[0] = egip->gi_gid;
-	if (hrl_group_accounting) {
-		gihold(egip);
-		gifree(newcred->cr_gidinfos[0]);
-		newcred->cr_gidinfos[0] = egip;
-	}
+	newcred->cr_groups[0] = egid;
 }
 
 /*-

==== //depot/projects/soc2009/trasz_limits/sys/sys/ucred.h#10 (text+ko) ====

@@ -63,7 +63,6 @@
 	struct label	*cr_label;	/* MAC label */
 	struct auditinfo_addr	cr_audit;	/* Audit properties. */
 	gid_t	*cr_groups;		/* groups */
-	struct gidinfo	**cr_gidinfos;	/* per group resource consumption */
 	int	cr_agroups;		/* Available groups */
 };
 #define	NOCRED	((struct ucred *)0)	/* no credential available */
@@ -93,7 +92,7 @@
 struct proc;
 
 void	change_cred(struct proc *p, struct ucred *newcred);
-void	change_egid(struct ucred *newcred, struct gidinfo *egip);
+void	change_egid(struct ucred *newcred, gid_t egid);
 void	change_euid(struct ucred *newcred, struct uidinfo *euip);
 void	change_rgid(struct ucred *newcred, gid_t rgid);
 void	change_ruid(struct ucred *newcred, struct uidinfo *ruip);

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 10:41:00 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1A2631065672; Sun, 11 Oct 2009 10:41:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D2DB9106566B
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 10:40:59 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C1ED68FC16
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 10:40:59 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BAexx4003509
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 10:40:59 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BAexEi003507
	for perforce@freebsd.org; Sun, 11 Oct 2009 10:40:59 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 11 Oct 2009 10:40:59 GMT
Message-Id: <200910111040.n9BAexEi003507@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169385 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 10:41:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=169385

Change 169385 by trasz@trasz_victim on 2009/10/11 10:40:24

	Get rid of unused routines.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#25 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/resourcevar.h#12 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#25 (text+ko) ====

@@ -1327,23 +1327,6 @@
 	return (uip);
 }
 
-struct uidinfo *
-uifind_existing(uid)
-	uid_t uid;
-{
-	struct uidinfo *uip;
-
-	rw_rlock(&uihashtbl_lock);
-	uip = uilookup(uid);
-	if (uip == NULL) {
-		rw_unlock(&uihashtbl_lock);
-		return (NULL);
-	}
-	uihold(uip);
-	rw_unlock(&uihashtbl_lock);
-	return (uip);
-}
-
 /*
  * Place another refcount on a uidinfo struct.
  */
@@ -1507,23 +1490,6 @@
 	return (gip);
 }
 
-struct gidinfo *
-gifind_existing(gid)
-	gid_t gid;
-{
-	struct gidinfo *gip;
-
-	rw_rlock(&gihashtbl_lock);
-	gip = gilookup(gid);
-	if (gip == NULL) {
-		rw_unlock(&gihashtbl_lock);
-		return (NULL);
-	}
-	gihold(gip);
-	rw_unlock(&gihashtbl_lock);
-	return (gip);
-}
-
 /*
  * Place another refcount on a gidinfo struct.
  */

==== //depot/projects/soc2009/trasz_limits/sys/sys/resourcevar.h#12 (text+ko) ====

@@ -154,8 +154,6 @@
 int	 suswintr(void *base, int word);
 struct uidinfo
 	*uifind(uid_t uid);
-struct uidinfo
-	*uifind_existing(uid_t uid);
 void	 uifree(struct uidinfo *uip);
 void	 uihashinit(void);
 void	 uihold(struct uidinfo *uip);
@@ -164,8 +162,6 @@
 	    const struct hrl_rule *filter, void *arg3);
 struct gidinfo
 	*gifind(gid_t gid);
-struct gidinfo
-	*gifind_existing(gid_t gid);
 void	 gifree(struct gidinfo *gip);
 void	 gihashinit(void);
 void	 gihold(struct gidinfo *gip);

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 12:18:47 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0CEB51065695; Sun, 11 Oct 2009 12:18:47 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ACB701065693
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 12:18:46 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9A9478FC25
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 12:18:46 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BCIklG012321
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 12:18:46 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BCIkAb012319
	for perforce@freebsd.org; Sun, 11 Oct 2009 12:18:46 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 11 Oct 2009 12:18:46 GMT
Message-Id: <200910111218.n9BCIkAb012319@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169386 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 12:18:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=169386

Change 169386 by trasz@trasz_victim on 2009/10/11 12:17:57

	First step in removing strict 1:1 relationship between subjects
	(uidinfo, prison etc) and resource containers: a little renaming.
	What was hrl_usage becomes hrl_container.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#66 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#15 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#14 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#26 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#37 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#10 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/loginclass.h#5 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#13 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/resourcevar.h#13 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#66 (text+ko) ====

@@ -128,18 +128,18 @@
 	cred = p->p_ucred;
 	mtx_assert(&hrl_lock, MA_OWNED);
 	for (resource = 0; resource <= HRL_RESOURCE_MAX; resource++)
-		KASSERT(p->p_usage.hu_resources[resource] >= 0,
+		KASSERT(p->p_container.hc_resources[resource] >= 0,
 		    ("resource usage propagation meltdown"));
-	KASSERT(cred->cr_ruidinfo->ui_usage.hu_resources[resource] >= 0,
+	KASSERT(cred->cr_ruidinfo->ui_container.hc_resources[resource] >= 0,
 	    ("resource usage propagation meltdown"));
-	KASSERT(cred->cr_ruidinfo->ui_usage.hu_resources[resource] >=
-	    p->p_usage.hu_resources[resource],
+	KASSERT(cred->cr_ruidinfo->ui_container.hc_resources[resource] >=
+	    p->p_container.hc_resources[resource],
 	    ("resource usage propagation meltdown"));
 	for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent) {
-		KASSERT(pr->pr_usage.hu_resources[resource] >= 0,
+		KASSERT(pr->pr_container.hc_resources[resource] >= 0,
 		    ("resource usage propagation meltdown"));
-		KASSERT(pr->pr_usage.hu_resources[resource] >=
-	    	    p->p_usage.hu_resources[resource],
+		KASSERT(pr->pr_container.hc_resources[resource] >=
+	    	    p->p_container.hc_resources[resource],
 		    ("resource usage propagation meltdown"));
 	}
 }
@@ -159,7 +159,7 @@
 
 	mtx_lock(&hrl_lock);
 	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
-		KASSERT(p->p_usage.hu_resources[i] == 0,
+		KASSERT(p->p_container.hc_resources[i] == 0,
 			    ("dead process still holding resources"));
 	}
 	mtx_unlock(&hrl_lock);
@@ -251,20 +251,20 @@
 	switch (rule->hr_per) {
 	case HRL_SUBJECT_TYPE_PROCESS:
 		available = rule->hr_amount -
-		    p->p_usage.hu_resources[resource];
+		    p->p_container.hc_resources[resource];
 		break;
 	case HRL_SUBJECT_TYPE_USER:
 		available = rule->hr_amount -
-		    cred->cr_ruidinfo->ui_usage.hu_resources[resource];
+		    cred->cr_ruidinfo->ui_container.hc_resources[resource];
 		break;
 	case HRL_SUBJECT_TYPE_LOGINCLASS:
 		available = rule->hr_amount -
-		    cred->cr_loginclass->lc_usage.hu_resources[resource];
+		    cred->cr_loginclass->lc_container.hc_resources[resource];
 		available = INT64_MAX; /* XXX */
 		break;
 	case HRL_SUBJECT_TYPE_JAIL:
 		available = rule->hr_amount -
-		    cred->cr_prison->pr_usage.hu_resources[resource];
+		    cred->cr_prison->pr_container.hc_resources[resource];
 		break;
 	default:
 		panic("hrl_compute_available: unknown per %d",
@@ -437,6 +437,31 @@
 	}
 }
 
+void
+hrl_container_create(struct hrl_container *container)
+{
+	int i;
+
+	for (i = 0; i <= HRL_RESOURCE_MAX; i++)
+		KASSERT(container->hc_resources[i] == 0,
+		    ("container not zeroed"));
+}
+
+void
+hrl_container_destroy(struct hrl_container *container)
+{
+	int i;
+
+	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
+		if (container->hc_resources[i] != 0)
+			printf("destroying non-empty container: "
+			    "%ju allocated for resource %s",
+			    container->hc_resources[i],
+			    hrl_resource_name(i));
+		container->hc_resources[i] = 0;
+	}
+}
+
 /*
  * Increase allocation of 'resource' by 'amount' for process 'p'.
  * Return 0 if it's below limits, or errno, if it's not.
@@ -461,12 +486,12 @@
 		mtx_unlock(&hrl_lock);
 		return (error);
 	}
-	p->p_usage.hu_resources[resource] += amount;
+	p->p_container.hc_resources[resource] += amount;
 	cred = p->p_ucred;
-	cred->cr_ruidinfo->ui_usage.hu_resources[resource] += amount;
+	cred->cr_ruidinfo->ui_container.hc_resources[resource] += amount;
 	for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
-		pr->pr_usage.hu_resources[resource] += amount;
-	cred->cr_loginclass->lc_usage.hu_resources[resource] += amount;
+		pr->pr_container.hc_resources[resource] += amount;
+	cred->cr_loginclass->lc_container.hc_resources[resource] += amount;
 #ifdef DIAGNOSTIC
 	hrl_assert_proc(p);
 #endif
@@ -498,7 +523,7 @@
 #endif
 
 	mtx_lock(&hrl_lock);
-	diff = amount - p->p_usage.hu_resources[resource];
+	diff = amount - p->p_container.hc_resources[resource];
 	if (diff > 0) {
 		error = hrl_enforce_proc(p, resource, diff);
 		if (error) {
@@ -506,12 +531,12 @@
 			return (error);
 		}
 	}
-	p->p_usage.hu_resources[resource] = amount;
+	p->p_container.hc_resources[resource] = amount;
 	cred = p->p_ucred;
-	cred->cr_ruidinfo->ui_usage.hu_resources[resource] += diff;
+	cred->cr_ruidinfo->ui_container.hc_resources[resource] += diff;
 	for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
-		pr->pr_usage.hu_resources[resource] += diff;
-	cred->cr_loginclass->lc_usage.hu_resources[resource] += diff;
+		pr->pr_container.hc_resources[resource] += diff;
+	cred->cr_loginclass->lc_container.hc_resources[resource] += diff;
 #ifdef DIAGNOSTIC
 	hrl_assert_proc(p);
 #endif
@@ -537,16 +562,16 @@
 #endif
 
 	mtx_lock(&hrl_lock);
-	KASSERT(amount <= p->p_usage.hu_resources[resource],
+	KASSERT(amount <= p->p_container.hc_resources[resource],
 	    ("hrl_free: freeing %ju of %s, which is more than allocated "
 	    "%ld for %s (pid %d)", amount, hrl_resource_name(resource),
-	    p->p_usage.hu_resources[resource], p->p_comm, p->p_pid));
-	p->p_usage.hu_resources[resource] -= amount;
+	    p->p_container.hc_resources[resource], p->p_comm, p->p_pid));
+	p->p_container.hc_resources[resource] -= amount;
 	cred = p->p_ucred;
-	cred->cr_ruidinfo->ui_usage.hu_resources[resource] -= amount;
+	cred->cr_ruidinfo->ui_container.hc_resources[resource] -= amount;
 	for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
-		pr->pr_usage.hu_resources[resource] -= amount;
-	cred->cr_loginclass->lc_usage.hu_resources[resource] -= amount;
+		pr->pr_container.hc_resources[resource] -= amount;
+	cred->cr_loginclass->lc_container.hc_resources[resource] -= amount;
 #ifdef DIAGNOSTIC
 	hrl_assert_proc(p);
 #endif
@@ -554,38 +579,38 @@
 }
 
 static void
-hrl_usage_add(struct hrl_usage *dest, const struct hrl_usage *src)
+hrl_container_add(struct hrl_container *dest, const struct hrl_container *src)
 {
 	int i;
 
 	mtx_lock(&hrl_lock);
 	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
-		KASSERT(dest->hu_resources[i] >= 0,
+		KASSERT(dest->hc_resources[i] >= 0,
 		    ("resource usage propagation meltdown"));
-		KASSERT(src->hu_resources[i] >= 0,
+		KASSERT(src->hc_resources[i] >= 0,
 		    ("resource usage propagation meltdown"));
-		dest->hu_resources[i] += src->hu_resources[i];
-		KASSERT(dest->hu_resources[i] >= 0,
+		dest->hc_resources[i] += src->hc_resources[i];
+		KASSERT(dest->hc_resources[i] >= 0,
 		    ("resource usage propagation meltdown"));
 	}
 	mtx_unlock(&hrl_lock);
 }
 
 static void
-hrl_usage_subtract(struct hrl_usage *dest, const struct hrl_usage *src)
+hrl_container_subtract(struct hrl_container *dest, const struct hrl_container *src)
 {
 	int i;
 
 	mtx_lock(&hrl_lock);
 	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
-		KASSERT(dest->hu_resources[i] >= 0,
+		KASSERT(dest->hc_resources[i] >= 0,
 		    ("resource usage propagation meltdown"));
-		KASSERT(src->hu_resources[i] >= 0,
+		KASSERT(src->hc_resources[i] >= 0,
 		    ("resource usage propagation meltdown"));
-		KASSERT(src->hu_resources[i] <= dest->hu_resources[i],
+		KASSERT(src->hc_resources[i] <= dest->hc_resources[i],
 		    ("resource usage propagation meltdown"));
-		dest->hu_resources[i] -= src->hu_resources[i];
-		KASSERT(dest->hu_resources[i] >= 0,
+		dest->hc_resources[i] -= src->hc_resources[i];
+		KASSERT(dest->hc_resources[i] >= 0,
 		    ("resource usage propagation meltdown"));
 	}
 	mtx_unlock(&hrl_lock);
@@ -1314,7 +1339,7 @@
 }
 
 static struct sbuf *
-hrl_usage_to_sbuf(struct hrl_usage *usage)
+hrl_container_to_sbuf(struct hrl_container *container)
 {
 	int i;
 	struct sbuf *sb;
@@ -1322,7 +1347,7 @@
 	sb = sbuf_new_auto();
 	for (i = 1; i <= HRL_RESOURCE_MAX; i++) {
 		sbuf_printf(sb, "%s=%jd,", hrl_resource_name(i),
-		    usage->hu_resources[i]);
+		    container->hc_resources[i]);
 	}
 	sbuf_setpos(sb, sbuf_len(sb) - 1);
 	return (sb);
@@ -1357,7 +1382,7 @@
 			error = EINVAL;
 			goto out;
 		}
-		outputsbuf = hrl_usage_to_sbuf(&p->p_usage);
+		outputsbuf = hrl_container_to_sbuf(&p->p_container);
 		break;
 	case HRL_SUBJECT_TYPE_USER:
 		uip = filter->hr_subject.hs_uip;
@@ -1365,7 +1390,7 @@
 			error = EINVAL;
 			goto out;
 		}
-		outputsbuf = hrl_usage_to_sbuf(&uip->ui_usage);
+		outputsbuf = hrl_container_to_sbuf(&uip->ui_container);
 		break;
 	case HRL_SUBJECT_TYPE_GROUP:
 		gip = filter->hr_subject.hs_gip;
@@ -1373,7 +1398,7 @@
 			error = EINVAL;
 			goto out;
 		}
-		outputsbuf = hrl_usage_to_sbuf(&gip->gi_usage);
+		outputsbuf = hrl_container_to_sbuf(&gip->gi_container);
 		break;
 	case HRL_SUBJECT_TYPE_LOGINCLASS:
 		lc = filter->hr_subject.hs_loginclass;
@@ -1381,7 +1406,7 @@
 			error = EINVAL;
 			goto out;
 		}
-		outputsbuf = hrl_usage_to_sbuf(&lc->lc_usage);
+		outputsbuf = hrl_container_to_sbuf(&lc->lc_container);
 		break;
 	case HRL_SUBJECT_TYPE_JAIL:
 		pr = filter->hr_subject.hs_prison;
@@ -1389,7 +1414,7 @@
 			error = EINVAL;
 			goto out;
 		}
-		outputsbuf = hrl_usage_to_sbuf(&pr->pr_usage);
+		outputsbuf = hrl_container_to_sbuf(&pr->pr_container);
 		break;
 	default:
 		error = EINVAL;
@@ -1692,8 +1717,8 @@
 	newuip = newcred->cr_ruidinfo;
 	olduip = p->p_ucred->cr_ruidinfo;
 	if (newuip != olduip) {
-		hrl_usage_subtract(&olduip->ui_usage, &p->p_usage);
-		hrl_usage_add(&newuip->ui_usage, &p->p_usage);
+		hrl_container_subtract(&olduip->ui_container, &p->p_container);
+		hrl_container_add(&newuip->ui_container, &p->p_container);
 	}
 
 	/*
@@ -1702,8 +1727,8 @@
 	newlc = newcred->cr_loginclass;
 	oldlc = p->p_ucred->cr_loginclass;
 	if (newlc != oldlc) {
-		hrl_usage_subtract(&oldlc->lc_usage, &p->p_usage);
-		hrl_usage_add(&newlc->lc_usage, &p->p_usage);
+		hrl_container_subtract(&oldlc->lc_container, &p->p_container);
+		hrl_container_add(&newlc->lc_container, &p->p_container);
 	}
 }
 
@@ -1724,10 +1749,10 @@
 	mtx_lock(&hrl_lock);
 
 	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
-		if (parent->p_usage.hu_resources[i] != 0 &&
+		if (parent->p_container.hc_resources[i] != 0 &&
 		    hrl_resource_inheritable(i))
 			hrl_allocated(child, i,
-			    parent->p_usage.hu_resources[i]);
+			    parent->p_container.hc_resources[i]);
 	}
 
 	LIST_FOREACH(limit, &parent->p_limits, hl_next) {

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#15 (text+ko) ====

@@ -1156,6 +1156,7 @@
 			root = mypr->pr_root;
 			vref(root);
 		}
+		hrl_container_create(&pr->pr_container);
 		strlcpy(pr->pr_hostuuid, DEFAULT_HOSTUUID, HOSTUUIDLEN);
 		pr->pr_flags |= PR_HOST;
 #if defined(INET) || defined(INET6)
@@ -2408,7 +2409,7 @@
 prison_deref(struct prison *pr, int flags)
 {
 	struct prison *ppr, *tpr;
-	int vfslocked, i;
+	int vfslocked;
 
 	if (!(flags & PD_LOCKED))
 		mtx_lock(&pr->pr_mtx);
@@ -2485,11 +2486,7 @@
 		if (pr->pr_cpuset != NULL)
 			cpuset_rel(pr->pr_cpuset);
 		osd_jail_exit(pr);
-		for (i = 0; i < HRL_RESOURCE_MAX; i++) {
-			if (pr->pr_usage.hu_resources[i] != 0)
-				printf("prison_deref: resource %d = %ju\n",
-				    i, pr->pr_usage.hu_resources[i]);
-		}
+		hrl_container_destroy(&pr->pr_container);
 		free(pr, M_PRISON);
 
 		/* Removing a prison frees a reference on its parent. */

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#14 (text+ko) ====

@@ -83,16 +83,10 @@
 void
 loginclass_release(struct loginclass *lc)
 {
-	int i;
 
 	mtx_lock(&loginclasses_lock);
 	if (refcount_release(&lc->lc_refcount)) {
-		for (i = 0; i < HRL_RESOURCE_MAX; i++) {
-			KASSERT(lc->lc_usage.hu_resources[i] == 0,
-			    ("loginclass_release: freeing "
-			    "loginclass \"%s\", resource %d = %ju\n",
-			    lc->lc_name, i, lc->lc_usage.hu_resources[i]));
-		}
+		hrl_container_destroy(&lc->lc_container);
 		LIST_REMOVE(lc, lc_next);
 		mtx_unlock(&loginclasses_lock);
 		free(lc, M_LOGINCLASS);
@@ -132,6 +126,7 @@
 	}
 
 	/* Add new loginclass. */
+	hrl_container_create(&newlc->lc_container);
 	strcpy(newlc->lc_name, name);
 	refcount_init(&newlc->lc_refcount, 1);
 	LIST_INSERT_HEAD(&loginclasses, newlc, lc_next);

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#26 (text+ko) ====

@@ -1320,6 +1320,7 @@
 			mtx_init(&uip->ui_vmsize_mtx, "ui_vmsize", NULL,
 			    MTX_DEF);
 			LIST_INSERT_HEAD(UIHASH(uid), uip, ui_hash);
+			hrl_container_create(&uip->ui_container);
 		}
 	}
 	uihold(uip);
@@ -1357,7 +1358,7 @@
 uifree(uip)
 	struct uidinfo *uip;
 {
-	int old, i;
+	int old;
 
 	/* Prepare for optimal case. */
 	old = uip->ui_ref;
@@ -1367,6 +1368,7 @@
 	/* Prepare for suboptimal case. */
 	rw_wlock(&uihashtbl_lock);
 	if (refcount_release(&uip->ui_ref)) {
+		hrl_container_destroy(&uip->ui_container);
 		LIST_REMOVE(uip, ui_hash);
 		rw_wunlock(&uihashtbl_lock);
 		if (uip->ui_sbsize != 0)
@@ -1379,12 +1381,6 @@
 			printf("freeing uidinfo: uid = %d, swapuse = %lld\n",
 			    uip->ui_uid, (unsigned long long)uip->ui_vmsize);
 		mtx_destroy(&uip->ui_vmsize_mtx);
-		for (i = 0; i < HRL_RESOURCE_MAX; i++) {
-			KASSERT(uip->ui_usage.hu_resources[i] == 0,
-			    ("uifree: freeing uidinfo: uid = %d, "
-			    "resource %d = %ju\n", uip->ui_uid, i,
-			    uip->ui_usage.hu_resources[i]));
-		}
 		free(uip, M_UIDINFO);
 		return;
 	}
@@ -1483,6 +1479,7 @@
 			refcount_init(&gip->gi_ref, 0);
 			gip->gi_gid = gid;
 			LIST_INSERT_HEAD(GIHASH(gid), gip, gi_hash);
+			hrl_container_create(&gip->gi_container);
 		}
 	}
 	gihold(gip);
@@ -1520,7 +1517,7 @@
 gifree(gip)
 	struct gidinfo *gip;
 {
-	int old, i;
+	int old;
 
 	/* Prepare for optimal case. */
 	old = gip->gi_ref;
@@ -1530,14 +1527,9 @@
 	/* Prepare for suboptimal case. */
 	rw_wlock(&gihashtbl_lock);
 	if (refcount_release(&gip->gi_ref)) {
+		hrl_container_destroy(&gip->gi_container);
 		LIST_REMOVE(gip, gi_hash);
 		rw_wunlock(&gihashtbl_lock);
-		for (i = 0; i < HRL_RESOURCE_MAX; i++) {
-			KASSERT(gip->gi_usage.hu_resources[i] == 0,
-			    ("gifree: freeing gidinfo: gid = %d, "
-			    "resource %d = %ju\n", gip->gi_gid, i,
-			    gip->gi_usage.hu_resources[i]));
-		}
 		free(gip, M_GIDINFO);
 		return;
 	}

==== //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#37 (text+ko) ====

@@ -38,6 +38,7 @@
 struct gidinfo;
 struct loginclass;
 struct prison;
+struct ucred;
 
 /*
  * Hierarchical Resource Limits.
@@ -123,11 +124,22 @@
 #define	HRL_AMOUNT_UNDEFINED		-1
 
 /*
- * 'hrl_usage' defines resource consumption for a particular
- * object, such as process or user.
+ * 'hrl_container' defines resource consumption for a particular
+ * subject, such as process or jail. Containers form a graph - each
+ * container has zero or more subcontainers and zero or more
+ * "containing" containers (parents).  For example, container for
+ * an uidinfo can have several subcontainers for processes for that
+ * user.  On the other hand, each process can have several containing
+ * containers, one per every group this process belongs to.
+ *
+ * Every process has exactly one container assigned to it.  Containers
+ * for other objects are created when there is a rule which requires it.
+ * For example, uidinfo will have container assigned only if there
+ * is a rule this uidinfo is subject to, and 'hr_per' for this rule
+ * is HRL_SUBJECT_TYPE_USER.
  */
-struct hrl_usage {
-	int64_t	hu_resources[HRL_RESOURCE_MAX + 1];
+struct hrl_container {
+	int64_t	hc_resources[HRL_RESOURCE_MAX + 1];
 };
 
 /*
@@ -144,10 +156,6 @@
 
 #ifdef _KERNEL
 
-struct loginclass;
-struct proc;
-struct ucred;
-
 int	hrl_alloc(struct proc *p, int object, uint64_t amount);
 int	hrl_allocated(struct proc *p, int object, uint64_t amount);
 void	hrl_free(struct proc *p, int object, uint64_t amount);
@@ -162,6 +170,10 @@
 void	hrl_rule_release(struct hrl_rule *rule);
 int	hrl_rule_add(struct hrl_rule *rule);
 int	hrl_rule_remove(const struct hrl_rule *filter);
+
+void	hrl_container_create(struct hrl_container *container);
+void	hrl_container_destroy(struct hrl_container *container);
+
 #else /* !_KERNEL */
 
 /*

==== //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#10 (text+ko) ====

@@ -181,7 +181,7 @@
 	char		 pr_hostname[MAXHOSTNAMELEN];	/* (p) jail hostname */
 	char		 pr_domainname[MAXHOSTNAMELEN];	/* (p) jail domainname */
 	char		 pr_hostuuid[HOSTUUIDLEN];	/* (p) jail hostuuid */
-	struct hrl_usage pr_usage;			/* (*) HRL resource accounting */
+	struct hrl_container pr_container;		/* (*) HRL resource accounting */
 	struct hrl_limits_head	pr_limits;		/* (*) HRL rules applicable to the prison */
 };
 #endif /* _KERNEL || _WANT_PRISON */

==== //depot/projects/soc2009/trasz_limits/sys/sys/loginclass.h#5 (text+ko) ====

@@ -36,7 +36,7 @@
 	LIST_ENTRY(loginclass)	lc_next;
 	char			lc_name[MAXLOGNAME];
 	u_int			lc_refcount;
-	struct hrl_usage	lc_usage;
+	struct hrl_container	lc_container;
 	struct hrl_limits_head	lc_limits;
 };
 

==== //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#13 (text+ko) ====

@@ -511,7 +511,7 @@
 	int		p_boundary_count;/* (c) Num threads at user boundary */
 	int		p_pendingcnt;	/* how many signals are pending */
 	struct itimers	*p_itimers;	/* (c) POSIX interval timers. */
-	struct hrl_usage p_usage;	/* (*) HRL resource accounting */
+	struct hrl_container p_container;	/* (*) HRL resource accounting */
 	struct hrl_limits_head p_limits;/* (*) HRL rules applicable to the proccess */
 /* End area that is zeroed on creation. */
 #define	p_endzero	p_magic

==== //depot/projects/soc2009/trasz_limits/sys/sys/resourcevar.h#13 (text+ko) ====

@@ -98,7 +98,7 @@
 	long	ui_ptscnt;		/* (b) number of pseudo-terminals */
 	uid_t	ui_uid;			/* (a) uid */
 	u_int	ui_ref;			/* (b) reference count */
-	struct hrl_usage ui_usage;	/* (*) HRL resource accounting */
+	struct hrl_container ui_container;	/* (*) HRL resource accounting */
 	struct hrl_limits_head	ui_limits;/* (*) HRL rules applicable to the uid */
 };
 
@@ -117,7 +117,7 @@
 	LIST_ENTRY(gidinfo) gi_hash;	/* (c) hash chain of gidinfos */
 	gid_t	gi_gid;			/* (a) gid */
 	u_int	gi_ref;			/* (b) reference count */
-	struct hrl_usage gi_usage;	/* (*) HRL resource accounting */
+	struct hrl_container gi_container;	/* (*) HRL resource accounting */
 	struct hrl_limits_head	gi_limits;/* (*) HRL rules applicable to the gid */
 };
 

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 12:50:21 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B0DF1106568D; Sun, 11 Oct 2009 12:50:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7406D1065679
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 12:50:21 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6303C8FC0C
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 12:50:21 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BCoLVU025248
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 12:50:21 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BCoLUt025246
	for perforce@freebsd.org; Sun, 11 Oct 2009 12:50:21 GMT
	(envelope-from mav@freebsd.org)
Date: Sun, 11 Oct 2009 12:50:21 GMT
Message-Id: <200910111250.n9BCoLUt025246@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169389 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 12:50:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=169389

Change 169389 by mav@mav_mavtest on 2009/10/11 12:49:46

	Add ATA-specific done handler, resetting bus on heavy errors.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#39 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#39 (text+ko) ====

@@ -179,11 +179,12 @@
 				struct cam_ed *device,
 				void *async_arg);
 static void	 ata_action(union ccb *start_ccb);
+static void	 ata_done(union ccb *done_ccb);
 
 static struct xpt_xport ata_xport = {
 	.alloc_device = ata_alloc_device,
 	.action = ata_action,
-	.done = xpt_done_default,
+	.done = ata_done,
 	.async = ata_dev_async,
 };
 
@@ -1244,6 +1245,36 @@
 }
 
 static void
+ata_done(union ccb *done_ccb)
+{
+	struct	cam_path *path;
+	union	ccb *work_ccb;
+
+	switch (done_ccb->ccb_h.status & CAM_STATUS_MASK) {
+	case CAM_CMD_TIMEOUT:
+	case CAM_UNCOR_PARITY:
+		work_ccb = xpt_alloc_ccb_nowait();
+		if (work_ccb == NULL)
+			break;
+		if (xpt_create_path(&path, xpt_periph, done_ccb->ccb_h.path_id,
+		    CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
+			xpt_free_ccb(work_ccb);
+			break;
+		}
+		xpt_setup_ccb(&work_ccb->ccb_h, path, CAM_PRIORITY_NORMAL);
+		work_ccb->ccb_h.func_code = XPT_RESET_BUS;
+		work_ccb->ccb_h.cbfcnp = NULL;
+		CAM_DEBUG(path, CAM_DEBUG_SUBTRACE, ("Resetting Bus\n"));
+		xpt_action(work_ccb);
+		xpt_free_ccb(work_ccb);
+		break;
+	}	
+	
+	/* Call default done handler. */
+	xpt_done_default(done_ccb);
+}
+
+static void
 scsi_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device,
 			   int async_update)
 {

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 13:55:33 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 281541065697; Sun, 11 Oct 2009 13:55:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C86611065692
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 13:55:32 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B70958FC19
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 13:55:32 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BDtWPD031286
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 13:55:32 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BDtWYb031284
	for perforce@freebsd.org; Sun, 11 Oct 2009 13:55:32 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 11 Oct 2009 13:55:32 GMT
Message-Id: <200910111355.n9BDtWYb031284@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169392 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 13:55:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=169392

Change 169392 by trasz@trasz_victim on 2009/10/11 13:55:02

	Optimize things a little.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#67 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#67 (text+ko) ====

@@ -1662,9 +1662,8 @@
 }
 
 /*
- * Called after credentials change, to adjust p_limits.
- *
- * XXX: What about jails?
+ * Called before credentials change, to adjust HRL data structures
+ * assigned to the process.
  */
 void
 hrl_proc_ucred_changing(struct proc *p, struct ucred *newcred)
@@ -1673,20 +1672,42 @@
 	struct hrl_limit *limit;
 	struct uidinfo *olduip, *newuip;
 	struct loginclass *oldlc, *newlc;
+	struct prison *oldpr, *newpr;
 
 	PROC_LOCK_ASSERT(p, MA_OWNED);
 
+	newuip = newcred->cr_ruidinfo;
+	olduip = p->p_ucred->cr_ruidinfo;
+	newlc = newcred->cr_loginclass;
+	oldlc = p->p_ucred->cr_loginclass;
+	newpr = newcred->cr_prison;
+	oldpr = p->p_ucred->cr_prison;
+
 	mtx_lock(&hrl_lock);
 
 	/*
-	 * Remove rules for the old user credentials - per-user, per-group
-	 * and per-loginclass.
+	 * Remove rules that are no longer applicable with the new ucred.
 	 */
 	LIST_FOREACH(limit, &p->p_limits, hl_next) {
-		if (limit->hl_rule->hr_subject_type != HRL_SUBJECT_TYPE_USER &&
-		    limit->hl_rule->hr_subject_type != HRL_SUBJECT_TYPE_GROUP &&
-		    limit->hl_rule->hr_subject_type != HRL_SUBJECT_TYPE_LOGINCLASS)
+		switch (limit->hl_rule->hr_subject_type) {
+		case HRL_SUBJECT_TYPE_PROCESS:
 			continue;
+		case HRL_SUBJECT_TYPE_USER:
+			if (newuip == olduip)
+				continue;
+			break;
+		case HRL_SUBJECT_TYPE_LOGINCLASS:
+			if (newlc == oldlc)
+				continue;
+			break;
+		case HRL_SUBJECT_TYPE_JAIL:
+			if (newpr == oldpr)
+				continue;
+			break;
+		default:
+			panic("hrl_proc_ucred_changing: unknown subject %d",
+			    limit->hl_rule->hr_subject_type);
+		}
 
 		LIST_REMOVE(limit, hl_next);
 		hrl_rule_release(limit->hl_rule);
@@ -1694,19 +1715,25 @@
 	}
 	
 	/*
-	 * Now add rules for the current user credentials.
+	 * Add rules for the new ucred.
 	 */
-	LIST_FOREACH(limit, &newcred->cr_ruidinfo->ui_limits, hl_next) {
-		error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule);
-		KASSERT(error == 0, ("XXX: better error handling needed"));
+	if (newuip != olduip) {
+		LIST_FOREACH(limit, &newuip->ui_limits, hl_next) {
+			error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule);
+			KASSERT(error == 0, ("XXX: better error handling needed"));
+		}
+	}
+	if (newlc != oldlc) {
+		LIST_FOREACH(limit, &newlc->lc_limits, hl_next) {
+			error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule);
+			KASSERT(error == 0, ("XXX: better error handling needed"));
+		}
 	}
-
-	/*
-	 * Add rules for the current loginclass.
-	 */
-	LIST_FOREACH(limit, &newcred->cr_loginclass->lc_limits, hl_next) {
-		error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule);
-		KASSERT(error == 0, ("XXX: better error handling needed"));
+	if (newpr != newpr) {
+		LIST_FOREACH(limit, &newpr->pr_limits, hl_next) {
+			error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule);
+			KASSERT(error == 0, ("XXX: better error handling needed"));
+		}
 	}
 
 	mtx_unlock(&hrl_lock);
@@ -1714,8 +1741,6 @@
 	/*
 	 * Fix up per-ruid resource consumption.
 	 */
-	newuip = newcred->cr_ruidinfo;
-	olduip = p->p_ucred->cr_ruidinfo;
 	if (newuip != olduip) {
 		hrl_container_subtract(&olduip->ui_container, &p->p_container);
 		hrl_container_add(&newuip->ui_container, &p->p_container);
@@ -1724,12 +1749,14 @@
 	/*
 	 * Adjust loginclass resource usage information.
 	 */
-	newlc = newcred->cr_loginclass;
-	oldlc = p->p_ucred->cr_loginclass;
 	if (newlc != oldlc) {
 		hrl_container_subtract(&oldlc->lc_container, &p->p_container);
 		hrl_container_add(&newlc->lc_container, &p->p_container);
 	}
+
+	/*
+	 * XXX: Jail resource consumption.
+	 */
 }
 
 /*

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 13:55:34 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DE633106573C; Sun, 11 Oct 2009 13:55:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E9FAC1065694
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 13:55:32 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D8FBA8FC1E
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 13:55:32 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BDtWrf031291
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 13:55:32 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BDtWbm031289
	for perforce@freebsd.org; Sun, 11 Oct 2009 13:55:32 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 11 Oct 2009 13:55:32 GMT
Message-Id: <200910111355.n9BDtWbm031289@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169393 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 13:55:34 -0000

http://perforce.freebsd.org/chv.cgi?CH=169393

Change 169393 by trasz@trasz_victim on 2009/10/11 13:55:26

	Add missing change_cred() (untested) and a little cleanup.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#16 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#15 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#16 (text+ko) ====

@@ -2252,7 +2252,7 @@
 	setsugid(p);
 	crcopy(newcred, oldcred);
 	newcred->cr_prison = pr;
-	p->p_ucred = newcred;
+	change_cred(p, newcred);
 	PROC_UNLOCK(p);
 	crfree(oldcred);
 	prison_deref(ppr, PD_DEREF | PD_DEUREF);

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#15 (text+ko) ====

@@ -198,8 +198,7 @@
 	PROC_LOCK(p);
 	oldcred = crcopysafe(p, newcred);
 	newcred->cr_loginclass = newlc;
-	hrl_proc_ucred_changing(p, newcred);
-	p->p_ucred = newcred;
+	change_cred(p, newcred);
 	PROC_UNLOCK(p);
 
 	loginclass_release(oldcred->cr_loginclass);

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 14:26:07 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EE79B10656A4; Sun, 11 Oct 2009 14:26:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7E6A31065698
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 14:26:06 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6C3528FC21
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 14:26:06 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BEQ6ox034502
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 14:26:06 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BEQ6jh034500
	for perforce@freebsd.org; Sun, 11 Oct 2009 14:26:06 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Oct 2009 14:26:06 GMT
Message-Id: <200910111426.n9BEQ6jh034500@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169395 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 14:26:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=169395

Change 169395 by rwatson@rwatson_freebsd_capabilities on 2009/10/11 14:25:15

	Rename rtld_caplibindex to rtld_libcache to better reflect what is
	going on.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#18 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_caplibindex.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_caplibindex.h#3 delete
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_libcache.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_libcache.h#1 branch

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#18 (text+ko) ====

@@ -1,5 +1,5 @@
 # $FreeBSD$
-# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#17 $
+# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#18 $
 
 WITHOUT_SSP=
 
@@ -9,7 +9,7 @@
 SRCS=		rtld_start.S \
 		reloc.c rtld.c rtld_lock.c map_object.c \
 		malloc.c xmalloc.c debug.c \
-		crtbrand.c rtld_caplibindex.c rtld_sandbox.c
+		crtbrand.c rtld_libcache.c rtld_sandbox.c
 MAN=		rtld-elf-cap.1
 CSTD?=		gnu99
 CFLAGS+=	-Wall -DFREEBSD_ELF -DIN_RTLD -DIN_RTLD_CAP -g

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 14:30:11 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4E05410656A7; Sun, 11 Oct 2009 14:30:11 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1314510656A4
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 14:30:11 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 00EA68FC13
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 14:30:11 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BEUArl034789
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 14:30:10 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BEUAuX034787
	for perforce@freebsd.org; Sun, 11 Oct 2009 14:30:10 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Oct 2009 14:30:10 GMT
Message-Id: <200910111430.n9BEUAuX034787@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169396 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 14:30:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=169396

Change 169396 by rwatson@rwatson_freebsd_capabilities on 2009/10/11 14:30:10

	Rename caplibindex -> libcache.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Makefile.inc#13 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/ld_caplibindex.c#3 delete
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/ld_libcache.c#1 branch

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Makefile.inc#13 (text+ko) ====

@@ -19,7 +19,7 @@
 	getpeereid.c getprogname.c getpwent.c getttyent.c \
 	getusershell.c getvfsbyname.c glob.c \
 	initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \
-	ld_caplibindex.c ld_sandbox.c \
+	ld_libcache.c ld_sandbox.c \
 	lockf.c lrand48.c mrand48.c nftw.c nice.c \
 	nlist.c nrand48.c opendir.c \
 	pause.c pmadvise.c popen.c posix_spawn.c pselect.c \

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 15:15:00 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9D4D71065694; Sun, 11 Oct 2009 15:15:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 54831106568B
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 15:15:00 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0CA238FC12
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 15:15:00 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BFExJf038984
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 15:14:59 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BFEx45038982
	for perforce@freebsd.org; Sun, 11 Oct 2009 15:14:59 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 11 Oct 2009 15:14:59 GMT
Message-Id: <200910111514.n9BFEx45038982@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169398 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 15:15:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=169398

Change 169398 by trasz@trasz_victim on 2009/10/11 15:14:24

	Maintain containers hierarchy.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#68 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#38 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#68 (text+ko) ====

@@ -437,6 +437,93 @@
 	}
 }
 
+static void
+hrl_container_add(struct hrl_container *dest, const struct hrl_container *src)
+{
+	int i;
+
+	mtx_assert(&hrl_lock, MA_OWNED);
+
+	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
+		KASSERT(dest->hc_resources[i] >= 0,
+		    ("resource usage propagation meltdown"));
+		KASSERT(src->hc_resources[i] >= 0,
+		    ("resource usage propagation meltdown"));
+		dest->hc_resources[i] += src->hc_resources[i];
+		KASSERT(dest->hc_resources[i] >= 0,
+		    ("resource usage propagation meltdown"));
+	}
+}
+
+static void
+hrl_container_subtract(struct hrl_container *dest, const struct hrl_container *src)
+{
+	int i;
+
+	mtx_assert(&hrl_lock, MA_OWNED);
+
+	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
+		KASSERT(dest->hc_resources[i] >= 0,
+		    ("resource usage propagation meltdown"));
+		KASSERT(src->hc_resources[i] >= 0,
+		    ("resource usage propagation meltdown"));
+		KASSERT(src->hc_resources[i] <= dest->hc_resources[i],
+		    ("resource usage propagation meltdown"));
+		dest->hc_resources[i] -= src->hc_resources[i];
+		KASSERT(dest->hc_resources[i] >= 0,
+		    ("resource usage propagation meltdown"));
+	}
+}
+
+static void
+hrl_container_join(struct hrl_container *child, struct hrl_container *parent)
+{
+	struct hrl_container *container;
+
+	mtx_assert(&hrl_lock, MA_OWNED);
+	KASSERT(child != NULL, ("child != NULL"));
+	KASSERT(parent != NULL, ("parent != NULL"));
+
+	LIST_FOREACH(container, &child->hc_parents, hc_next)
+		KASSERT(container != parent, ("container already joined"));
+
+	LIST_INSERT_HEAD(&child->hc_parents, parent, hc_next);
+	hrl_container_add(parent, child);
+}
+
+static void
+hrl_container_leave(struct hrl_container *child, struct hrl_container *parent)
+{
+	struct hrl_container *container, *containertmp;
+
+	mtx_assert(&hrl_lock, MA_OWNED);
+	KASSERT(child != NULL, ("child != NULL"));
+	KASSERT(parent != NULL, ("parent != NULL"));
+
+	hrl_container_subtract(parent, child);
+	LIST_FOREACH_SAFE(container, &child->hc_parents, hc_next, containertmp) {
+		if (container != parent)
+			continue;
+		LIST_REMOVE(container, hc_next);
+		break;
+	}
+}
+
+static void
+hrl_container_leave_parents(struct hrl_container *child)
+{
+	struct hrl_container *parent;
+
+	mtx_assert(&hrl_lock, MA_OWNED);
+	KASSERT(child != NULL, ("child != NULL"));
+
+	while (!LIST_EMPTY(&child->hc_parents)) {
+		parent = LIST_FIRST(&child->hc_parents);
+		hrl_container_subtract(parent, child);
+		LIST_REMOVE(parent, hc_next);
+	}
+}
+
 void
 hrl_container_create(struct hrl_container *container)
 {
@@ -445,6 +532,8 @@
 	for (i = 0; i <= HRL_RESOURCE_MAX; i++)
 		KASSERT(container->hc_resources[i] == 0,
 		    ("container not zeroed"));
+
+	LIST_INIT(&container->hc_parents);
 }
 
 void
@@ -452,6 +541,7 @@
 {
 	int i;
 
+	mtx_lock(&hrl_lock);
 	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
 		if (container->hc_resources[i] != 0)
 			printf("destroying non-empty container: "
@@ -460,6 +550,9 @@
 			    hrl_resource_name(i));
 		container->hc_resources[i] = 0;
 	}
+
+	hrl_container_leave_parents(container);
+	mtx_unlock(&hrl_lock);
 }
 
 /*
@@ -578,44 +671,6 @@
 	mtx_unlock(&hrl_lock);
 }
 
-static void
-hrl_container_add(struct hrl_container *dest, const struct hrl_container *src)
-{
-	int i;
-
-	mtx_lock(&hrl_lock);
-	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
-		KASSERT(dest->hc_resources[i] >= 0,
-		    ("resource usage propagation meltdown"));
-		KASSERT(src->hc_resources[i] >= 0,
-		    ("resource usage propagation meltdown"));
-		dest->hc_resources[i] += src->hc_resources[i];
-		KASSERT(dest->hc_resources[i] >= 0,
-		    ("resource usage propagation meltdown"));
-	}
-	mtx_unlock(&hrl_lock);
-}
-
-static void
-hrl_container_subtract(struct hrl_container *dest, const struct hrl_container *src)
-{
-	int i;
-
-	mtx_lock(&hrl_lock);
-	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
-		KASSERT(dest->hc_resources[i] >= 0,
-		    ("resource usage propagation meltdown"));
-		KASSERT(src->hc_resources[i] >= 0,
-		    ("resource usage propagation meltdown"));
-		KASSERT(src->hc_resources[i] <= dest->hc_resources[i],
-		    ("resource usage propagation meltdown"));
-		dest->hc_resources[i] -= src->hc_resources[i];
-		KASSERT(dest->hc_resources[i] >= 0,
-		    ("resource usage propagation meltdown"));
-	}
-	mtx_unlock(&hrl_lock);
-}
-
 static int
 hrl_rule_matches(const struct hrl_rule *rule, const struct hrl_rule *filter)
 {
@@ -1715,48 +1770,37 @@
 	}
 	
 	/*
-	 * Add rules for the new ucred.
+	 * Add rules for the new ucred and move between containers where applicable.
 	 */
 	if (newuip != olduip) {
 		LIST_FOREACH(limit, &newuip->ui_limits, hl_next) {
 			error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule);
 			KASSERT(error == 0, ("XXX: better error handling needed"));
 		}
+
+		hrl_container_leave(&p->p_container, &olduip->ui_container);
+		hrl_container_join(&p->p_container, &newuip->ui_container);
 	}
 	if (newlc != oldlc) {
 		LIST_FOREACH(limit, &newlc->lc_limits, hl_next) {
 			error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule);
 			KASSERT(error == 0, ("XXX: better error handling needed"));
 		}
+
+		hrl_container_leave(&p->p_container, &oldlc->lc_container);
+		hrl_container_join(&p->p_container, &newlc->lc_container);
 	}
-	if (newpr != newpr) {
+	if (newpr != oldpr) {
 		LIST_FOREACH(limit, &newpr->pr_limits, hl_next) {
 			error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule);
 			KASSERT(error == 0, ("XXX: better error handling needed"));
 		}
+
+		hrl_container_leave(&p->p_container, &oldpr->pr_container);
+		hrl_container_join(&p->p_container, &newpr->pr_container);
 	}
 
 	mtx_unlock(&hrl_lock);
-
-	/*
-	 * Fix up per-ruid resource consumption.
-	 */
-	if (newuip != olduip) {
-		hrl_container_subtract(&olduip->ui_container, &p->p_container);
-		hrl_container_add(&newuip->ui_container, &p->p_container);
-	}
-
-	/*
-	 * Adjust loginclass resource usage information.
-	 */
-	if (newlc != oldlc) {
-		hrl_container_subtract(&oldlc->lc_container, &p->p_container);
-		hrl_container_add(&newlc->lc_container, &p->p_container);
-	}
-
-	/*
-	 * XXX: Jail resource consumption.
-	 */
 }
 
 /*

==== //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#38 (text+ko) ====

@@ -139,7 +139,9 @@
  * is HRL_SUBJECT_TYPE_USER.
  */
 struct hrl_container {
-	int64_t	hc_resources[HRL_RESOURCE_MAX + 1];
+	LIST_ENTRY(hrl_container)	hc_next;
+	int64_t				hc_resources[HRL_RESOURCE_MAX + 1];
+	LIST_HEAD(, hrl_container)	hc_parents;
 };
 
 /*

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 15:48:37 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BDF1B106568B; Sun, 11 Oct 2009 15:48:37 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 68C241065670
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 15:48:37 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 222188FC13
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 15:48:37 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BFmaf0041476
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 15:48:36 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BFmapx041474
	for perforce@freebsd.org; Sun, 11 Oct 2009 15:48:36 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 11 Oct 2009 15:48:36 GMT
Message-Id: <200910111548.n9BFmapx041474@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169399 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 15:48:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=169399

Change 169399 by trasz@trasz_victim on 2009/10/11 15:48:10

	Move two routines; no functional changes.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#69 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#69 (text+ko) ====

@@ -114,57 +114,6 @@
 
 MALLOC_DEFINE(M_HRL, "hrl", "Hierarchical Resource Limits");
 
-#ifdef DIAGNOSTIC
-/*
- * Go through the resource usage info and verify that it makes sense.
- */
-static void
-hrl_assert_proc(const struct proc *p __unused)
-{
-	int resource;
-	struct ucred *cred;
-	struct prison *pr;
-	
-	cred = p->p_ucred;
-	mtx_assert(&hrl_lock, MA_OWNED);
-	for (resource = 0; resource <= HRL_RESOURCE_MAX; resource++)
-		KASSERT(p->p_container.hc_resources[resource] >= 0,
-		    ("resource usage propagation meltdown"));
-	KASSERT(cred->cr_ruidinfo->ui_container.hc_resources[resource] >= 0,
-	    ("resource usage propagation meltdown"));
-	KASSERT(cred->cr_ruidinfo->ui_container.hc_resources[resource] >=
-	    p->p_container.hc_resources[resource],
-	    ("resource usage propagation meltdown"));
-	for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent) {
-		KASSERT(pr->pr_container.hc_resources[resource] >= 0,
-		    ("resource usage propagation meltdown"));
-		KASSERT(pr->pr_container.hc_resources[resource] >=
-	    	    p->p_container.hc_resources[resource],
-		    ("resource usage propagation meltdown"));
-	}
-}
-#endif /* DIAGNOSTIC */
-
-void
-hrl_proc_exiting(struct proc *p)
-{
-	int i;
-
-	/*
-	 * XXX: Free these three some other way.
-	 */
-	hrl_allocated(p, HRL_RESOURCE_FILESIZE, 0);
-	hrl_allocated(p, HRL_RESOURCE_COREDUMPSIZE, 0);
-	hrl_allocated(p, HRL_RESOURCE_PTY, 0);
-
-	mtx_lock(&hrl_lock);
-	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
-		KASSERT(p->p_container.hc_resources[i] == 0,
-			    ("dead process still holding resources"));
-	}
-	mtx_unlock(&hrl_lock);
-}
-
 static int
 hrl_resource_inheritable(int resource)
 {
@@ -437,7 +386,38 @@
 	}
 }
 
+#ifdef DIAGNOSTIC
+/*
+ * Go through the resource usage info and verify that it makes sense.
+ */
 static void
+hrl_assert_proc(const struct proc *p __unused)
+{
+	int resource;
+	struct ucred *cred;
+	struct prison *pr;
+	
+	cred = p->p_ucred;
+	mtx_assert(&hrl_lock, MA_OWNED);
+	for (resource = 0; resource <= HRL_RESOURCE_MAX; resource++)
+		KASSERT(p->p_container.hc_resources[resource] >= 0,
+		    ("resource usage propagation meltdown"));
+	KASSERT(cred->cr_ruidinfo->ui_container.hc_resources[resource] >= 0,
+	    ("resource usage propagation meltdown"));
+	KASSERT(cred->cr_ruidinfo->ui_container.hc_resources[resource] >=
+	    p->p_container.hc_resources[resource],
+	    ("resource usage propagation meltdown"));
+	for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent) {
+		KASSERT(pr->pr_container.hc_resources[resource] >= 0,
+		    ("resource usage propagation meltdown"));
+		KASSERT(pr->pr_container.hc_resources[resource] >=
+	    	    p->p_container.hc_resources[resource],
+		    ("resource usage propagation meltdown"));
+	}
+}
+#endif /* DIAGNOSTIC */
+
+static void
 hrl_container_add(struct hrl_container *dest, const struct hrl_container *src)
 {
 	int i;
@@ -1847,6 +1827,26 @@
 	PROC_UNLOCK(parent);
 }
 
+void
+hrl_proc_exiting(struct proc *p)
+{
+	int i;
+
+	/*
+	 * XXX: Free these three some other way.
+	 */
+	hrl_allocated(p, HRL_RESOURCE_FILESIZE, 0);
+	hrl_allocated(p, HRL_RESOURCE_COREDUMPSIZE, 0);
+	hrl_allocated(p, HRL_RESOURCE_PTY, 0);
+
+	mtx_lock(&hrl_lock);
+	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
+		KASSERT(p->p_container.hc_resources[i] == 0,
+			    ("dead process still holding resources"));
+	}
+	mtx_unlock(&hrl_lock);
+}
+
 /*
  * Go through the process' limits, freeing them.
  */

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 15:52:41 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C5FA7106568F; Sun, 11 Oct 2009 15:52:41 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A768106568B
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 15:52:41 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 771EC8FC0C
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 15:52:41 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BFqfCA041764
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 15:52:41 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BFqff5041762
	for perforce@freebsd.org; Sun, 11 Oct 2009 15:52:41 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Oct 2009 15:52:41 GMT
Message-Id: <200910111552.n9BFqff5041762@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169400 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 15:52:42 -0000

http://perforce.freebsd.org/chv.cgi?CH=169400

Change 169400 by rwatson@rwatson_freebsd_capabilities on 2009/10/11 15:52:34

	Rename many references to caplibinde to libcache, as that's a more
	accurate name for the functionality.  This changes the host<->sandbox
	ABI so requires recompiling/reinstalling rtld/libcapability.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#14 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/ld_libcache.c#2 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#25 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#23 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Symbol.map#5 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld-elf-cap.1#9 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_libcache.c#2 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_libcache.h#2 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#26 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#14 (text) ====

@@ -369,7 +369,7 @@
 FBSD_1.2 {
 	basename_r;
 	getpagesizes;
-	ld_caplibindex_lookup;
+	ld_libcache_lookup;
 	ld_insandbox;
 };
 

==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/ld_libcache.c#2 (text+ko) ====

@@ -33,9 +33,9 @@
 
 #include <errno.h>
 
-#pragma weak ld_caplibindex_lookup
+#pragma weak ld_libcache_lookup
 int
-ld_caplibindex_lookup(const char *libname, int *fdp)
+ld_libcache_lookup(const char *libname, int *fdp)
 {
 
 	errno = EOPNOTSUPP;

==== //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#25 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#24 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#25 $
  */
 
 #ifndef _LIBCAPABILITY_H_
@@ -148,7 +148,7 @@
  * Actually an rtld-elf-cap symbol, but declared here so it is available to
  * applications.
  */
-int	ld_caplibindex_lookup(const char *libname, int *fdp);
+int	ld_libcache_lookup(const char *libname, int *fdp);
 int	ld_insandbox(void);
 
 /*

==== //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#23 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#22 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#23 $
  */
 
 #include <sys/param.h>
@@ -214,7 +214,7 @@
 	sbuf_finish(sbufp);
 	if (sbuf_overflowed(sbufp))
 		return;
-	if (setenv("LD_CAPLIBINDEX", sbuf_data(sbufp), 1) == -1)
+	if (setenv("LD_LIBCACHE", sbuf_data(sbufp), 1) == -1)
 		return;
 	sbuf_delete(sbufp);
 
@@ -255,16 +255,16 @@
 	bzero(lcsp, sizeof(*lcsp));
 
 	if (ld_insandbox()) {
-		if (ld_caplibindex_lookup(LD_ELF_CAP_SO, &fd_ldso) < 0)
+		if (ld_libcache_lookup(LD_ELF_CAP_SO, &fd_ldso) < 0)
 			goto out_error;
-		if (ld_caplibindex_lookup(LIBC_SO, &fd_libc) < 0)
+		if (ld_libcache_lookup(LIBC_SO, &fd_libc) < 0)
 			goto out_error;
-		if (ld_caplibindex_lookup(LIBCAPABILITY_SO,
+		if (ld_libcache_lookup(LIBCAPABILITY_SO,
 		    &fd_libcapability) < 0)
 			goto out_error;
-		if (ld_caplibindex_lookup(LIBSBUF_SO, &fd_libsbuf) < 0)
+		if (ld_libcache_lookup(LIBSBUF_SO, &fd_libsbuf) < 0)
 			goto out_error;
-		if (ld_caplibindex_lookup(_PATH_DEVNULL, &fd_devnull) < 0)
+		if (ld_libcache_lookup(_PATH_DEVNULL, &fd_devnull) < 0)
 			goto out_error;
 	} else {
 		fd_ldso = open(PATH_LD_ELF_CAP_SO "/" LD_ELF_CAP_SO,

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Symbol.map#5 (text+ko) ====

@@ -3,6 +3,6 @@
  */
 
 FBSD_1.1 {
-    ld_caplibindex_lookup;
+    ld_libcache_lookup;
     ld_insandbox;
 };

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld-elf-cap.1#9 (text+ko) ====

@@ -68,7 +68,7 @@
 Interprets the
 .Dv LD_CAPLIBINDEX
 environmental variable set by sandbox start routines, and implements
-.Fn ld_caplibindex_lookup ,
+.Fn ld_libcache_lookup ,
 allowing file descriptors for binaries and libraries passed across
 .Xr fexecve 2
 to be used by

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_libcache.c#2 (text+ko) ====

@@ -55,21 +55,21 @@
 #include <string.h>
 
 #include "rtld.h"
-#include "rtld_caplibindex.h"
+#include "rtld_libcache.h"
 
-struct libindex_entry {
+struct libcache_entry {
 	char				*lie_name;
 	int				 lie_fd;
-	TAILQ_ENTRY(libindex_entry)	 lie_list;
+	TAILQ_ENTRY(libcache_entry)	 lie_list;
 };
 
-static TAILQ_HEAD(, libindex_entry)	ld_caplibindex_list =
-    TAILQ_HEAD_INITIALIZER(ld_caplibindex_list);
+static TAILQ_HEAD(, libcache_entry)	ld_libcache_list =
+    TAILQ_HEAD_INITIALIZER(ld_libcache_list);
 
 static void
-ld_caplibindex_add(const char *name, const char *fdnumber)
+ld_libcache_add(const char *name, const char *fdnumber)
 {
-	struct libindex_entry *liep;
+	struct libcache_entry *liep;
 	long long l;
 	char *endp;
 
@@ -83,15 +83,15 @@
 	liep = xmalloc(sizeof(*liep));
 	liep->lie_name = xstrdup(name);
 	liep->lie_fd = l;
-	TAILQ_INSERT_TAIL(&ld_caplibindex_list, liep, lie_list);
+	TAILQ_INSERT_TAIL(&ld_libcache_list, liep, lie_list);
 }
 
 int
-ld_caplibindex_lookup(const char *libname, int *fdp)
+ld_libcache_lookup(const char *libname, int *fdp)
 {
-	struct libindex_entry *liep;
+	struct libcache_entry *liep;
 
-	TAILQ_FOREACH(liep, &ld_caplibindex_list, lie_list) {
+	TAILQ_FOREACH(liep, &ld_libcache_list, lie_list) {
 		if (strcmp(liep->lie_name, libname) == 0) {
 			*fdp = liep->lie_fd;
 			return (0);
@@ -101,17 +101,17 @@
 }
 
 void
-ld_caplibindex_init(const char *caplibindex)
+ld_libcache_init(const char *libcache)
 {
-	char *caplibindex_copy, *caplibindex_tofree;
+	char *libcache_copy, *libcache_tofree;
 	char *entry, *fdnumber;
 
-	caplibindex_copy = caplibindex_tofree = xstrdup(caplibindex);
-	while ((entry = strsep(&caplibindex_copy, ",")) != NULL) {
+	libcache_copy = libcache_tofree = xstrdup(libcache);
+	while ((entry = strsep(&libcache_copy, ",")) != NULL) {
 		fdnumber = strsep(&entry, ":");
 		if (fdnumber == NULL)
 			continue;
-		ld_caplibindex_add(entry, fdnumber);
+		ld_libcache_add(entry, fdnumber);
 	}
-	free(caplibindex_tofree);
+	free(libcache_tofree);
 }

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_libcache.h#2 (text+ko) ====

@@ -34,7 +34,7 @@
 #ifndef RTLD_CAPLIBINDEX_H
 #define	RTLD_CAPLIBINDEX_H
 
-int	ld_caplibindex_lookup(const char *libname, int *fdp);
-void	ld_caplibindex_init(const char *caplibindex);
+int	ld_libcache_lookup(const char *libname, int *fdp);
+void	ld_libcache_init(const char *libcache);
 
 #endif /* !RTLD_CAPLIBINDEX_H */

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#26 (text+ko) ====

@@ -60,7 +60,7 @@
 #include "rtld_tls.h"
 
 #ifdef IN_RTLD_CAP
-#include "rtld_caplibindex.h"
+#include "rtld_libcache.h"
 #include "rtld_sandbox.h"
 #endif
 
@@ -192,7 +192,7 @@
 static char *ld_tracing;	/* Called from ldd to print libs */
 static char *ld_utrace;		/* Use utrace() to log events. */
 #ifdef IN_RTLD_CAP
-static char *ld_caplibindex;
+static char *ld_libcache;
 #endif
 static Obj_Entry *obj_list;	/* Head of linked list of shared objects */
 static Obj_Entry **obj_tail;	/* Link field of last object in list */
@@ -245,7 +245,7 @@
     (func_ptr_type) &_rtld_atfork_pre,
     (func_ptr_type) &_rtld_atfork_post,
 #ifdef IN_RTLD_CAP
-    (func_ptr_type) &ld_caplibindex_lookup,
+    (func_ptr_type) &ld_libcache_lookup,
     (func_ptr_type) &ld_insandbox,
 #endif
     NULL
@@ -443,7 +443,7 @@
     }
     ld_debug = getenv(LD_ "DEBUG");
 #ifdef IN_RTLD_CAP
-    ld_caplibindex = getenv(LD_ "CAPLIBINDEX");
+    ld_libcache = getenv(LD_ "LIBCACHE");
 #else
     libmap_disable = getenv(LD_ "LIBMAP_DISABLE") != NULL;
     libmap_override = getenv(LD_ "LIBMAP");
@@ -557,8 +557,8 @@
     sym_zero.st_shndx = SHN_UNDEF;
 
 #ifdef IN_RTLD_CAP
-    if (ld_caplibindex != NULL)
-	ld_caplibindex_init(ld_caplibindex);
+    if (ld_libcache != NULL)
+	ld_libcache_init(ld_libcache);
 #endif
 
 #ifndef IN_RTLD_CAP
@@ -1633,8 +1633,8 @@
 	return NULL;
     }
     path = xstrdup(name);
-    if (ld_caplibindex_lookup(path, &fd) < 0) {
-	_rtld_error("Unable to find \"%s\" in LD_CAPLIBINDEX", path);
+    if (ld_libcache_lookup(path, &fd) < 0) {
+	_rtld_error("Unable to find \"%s\" in LD_LIBCACHE", path);
 	return NULL;
     }
 #else

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 16:08:59 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ADCEF106568B; Sun, 11 Oct 2009 16:08:59 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 724EE106566B
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 16:08:59 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5F82D8FC13
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 16:08:59 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BG8xpO043842
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 16:08:59 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BG8xSv043840
	for perforce@freebsd.org; Sun, 11 Oct 2009 16:08:59 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Oct 2009 16:08:59 GMT
Message-Id: <200910111608.n9BG8xSv043840@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169401 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 16:09:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=169401

Change 169401 by rwatson@rwatson_freebsd_capabilities on 2009/10/11 16:08:15

	Update further reference to LD_CAPLIBINDEX -> LD_LIBCACHE.
	
	Add public interface for inserting libraries into the library cache:
	ld_libcache_add(3), which is implemented by rtld when in a sandbox,
	and returns EOPNOTSUPP if not.
	
	Comment on two known limitations of the libcache code.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#15 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/ld_libcache.c#3 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Symbol.map#6 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_libcache.c#3 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#27 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#15 (text) ====

@@ -369,6 +369,7 @@
 FBSD_1.2 {
 	basename_r;
 	getpagesizes;
+	ld_libcache_add;
 	ld_libcache_lookup;
 	ld_insandbox;
 };

==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/ld_libcache.c#3 (text+ko) ====

@@ -33,6 +33,15 @@
 
 #include <errno.h>
 
+#pragma weak ld_libcache_add
+int
+ld_libcache_add(const char *libname, int fd)
+{
+
+	errno = EOPNOTSUPP;
+	return (-1);
+}
+
 #pragma weak ld_libcache_lookup
 int
 ld_libcache_lookup(const char *libname, int *fdp)

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Symbol.map#6 (text+ko) ====

@@ -3,6 +3,7 @@
  */
 
 FBSD_1.1 {
+    ld_libcache_add;
     ld_libcache_lookup;
     ld_insandbox;
 };

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_libcache.c#3 (text+ko) ====

@@ -35,15 +35,20 @@
 __FBSDID("$FreeBSD$");
 
 /*
- * When running in a capability sandbox, rtld-elf-cap will be passed a set of
- * open file descriptors to potentially useful libraries, along with an index
- * to these in the LD_CAPLIBINDEX environmental variable.  These routines
- * parse that index, and allow lookups by library name.  A typical string
- * might be:
+ * rtld maintains a cache of library file descriptors, which is passed from
+ * host to sandbox at exec()-time in order to avoid the need for direct file
+ * system access from within sandboxes.  When rtld starts, it inspects
+ * LD_LIBCACHE to find library descriptors passed from the host.  This
+ * variable maps file descriptor numbers to library names:
  *
  * 6:libc.so.7,7:libm.so.5
  *
  * In the event of ambiguity, the earliest entry will be matched.
+ *
+ * XXXRW: There should be locking around the libcache list.
+ *
+ * XXXRW: ld_libcache_lookup() should dup the fd before returning it so that
+ * the caller is responsible for managing the returned fd reference.
  */
 
 #include <sys/types.h>
@@ -66,10 +71,27 @@
 static TAILQ_HEAD(, libcache_entry)	ld_libcache_list =
     TAILQ_HEAD_INITIALIZER(ld_libcache_list);
 
+/*
+ * Add a library to the library cache.
+ */
+void
+ld_libcache_add(const char *name, int fd)
+{
+	struct libcache_entry *liep;
+
+	liep = xmalloc(sizeof(*liep));
+	liep->lie_name = xstrdup(name);
+	liep->lie_fd = fd;
+	TAILQ_INSERT_TAIL(&ld_libcache_list, liep, lie_list);
+}
+
+/*
+ * Add a library to the library cache, with file descriptor passed as a
+ * string.  Used internally when parsing LD_LIBCACHE.
+ */
 static void
-ld_libcache_add(const char *name, const char *fdnumber)
+ld_libcache_add_string(const char *name, const char *fdnumber)
 {
-	struct libcache_entry *liep;
 	long long l;
 	char *endp;
 
@@ -80,12 +102,14 @@
 	if (l < 0 || l > INT_MAX || *endp != '\0')
 		return;
 
-	liep = xmalloc(sizeof(*liep));
-	liep->lie_name = xstrdup(name);
-	liep->lie_fd = l;
-	TAILQ_INSERT_TAIL(&ld_libcache_list, liep, lie_list);
+	ld_libcache_add(name, l);
 }
 
+/*
+ * Given a library name, return its file descriptor (if defined).  Arguably,
+ * we should dup the cache-owned fd rather than returning it directly to the
+ * caller.
+ */
 int
 ld_libcache_lookup(const char *libname, int *fdp)
 {
@@ -100,6 +124,9 @@
 	return (-1);
 }
 
+/*
+ * Initialize the library cache given the LD_LIBCACHE environmental variable.
+ */
 void
 ld_libcache_init(const char *libcache)
 {
@@ -111,7 +138,7 @@
 		fdnumber = strsep(&entry, ":");
 		if (fdnumber == NULL)
 			continue;
-		ld_libcache_add(entry, fdnumber);
+		ld_libcache_add_string(entry, fdnumber);
 	}
 	free(libcache_tofree);
 }

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#27 (text+ko) ====

@@ -245,6 +245,7 @@
     (func_ptr_type) &_rtld_atfork_pre,
     (func_ptr_type) &_rtld_atfork_post,
 #ifdef IN_RTLD_CAP
+    (func_ptr_type) &ld_libcache_add,
     (func_ptr_type) &ld_libcache_lookup,
     (func_ptr_type) &ld_insandbox,
 #endif

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 16:21:13 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5B7531065693; Sun, 11 Oct 2009 16:21:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1FE37106568B
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 16:21:13 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D8DB8FC08
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 16:21:13 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BGLC2k044744
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 16:21:12 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BGLCPS044742
	for perforce@freebsd.org; Sun, 11 Oct 2009 16:21:12 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Oct 2009 16:21:12 GMT
Message-Id: <200910111621.n9BGLCPS044742@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169402 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 16:21:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=169402

Change 169402 by rwatson@rwatson_freebsd_capabilities on 2009/10/11 16:20:15

	Convert more references to caplibindex into libcache references.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld-elf-cap.1#10 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_libcache.h#3 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#28 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld-elf-cap.1#10 (text+ko) ====

@@ -66,7 +66,7 @@
 the different environments.
 .It
 Interprets the
-.Dv LD_CAPLIBINDEX
+.Dv LD_LIBCACHE
 environmental variable set by sandbox start routines, and implements
 .Fn ld_libcache_lookup ,
 allowing file descriptors for binaries and libraries passed across
@@ -106,7 +106,7 @@
 PRODUCTION SYSTEMS.  IT WILL BREAK YOUR SOFTWARE IN NEW AND UNEXPECTED WAYS.
 .Pp
 The format of
-.Dv LD_CAPLIBINDEX
+.Dv LD_LIBCACHE
 is not documented, and may change.
 .Sh AUTHORS
 .Nm

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_libcache.h#3 (text+ko) ====

@@ -31,10 +31,11 @@
  * SUCH DAMAGE.
  */
 
-#ifndef RTLD_CAPLIBINDEX_H
-#define	RTLD_CAPLIBINDEX_H
+#ifndef RTLD_LIBCACHE_H
+#define	RTLD_LIBCACHE_H
 
+int	ld_libcache_add(const char *libname, int fd);
 int	ld_libcache_lookup(const char *libname, int *fdp);
 void	ld_libcache_init(const char *libcache);
 
-#endif /* !RTLD_CAPLIBINDEX_H */
+#endif /* !RTLD_LIBCACHE_H */

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#28 (text+ko) ====

@@ -439,7 +439,7 @@
         unsetenv(LD_ "ELF_HINTS_PATH");
 #endif
 #ifdef IN_RTLD_CAP
-	unsetenv(LD_ "CAPLIBINDEX");
+	unsetenv(LD_ "LIBCACHE");
 #endif
     }
     ld_debug = getenv(LD_ "DEBUG");

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 16:42:36 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AC45C1065692; Sun, 11 Oct 2009 16:42:36 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 706E31065676
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 16:42:36 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5DA258FC15
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 16:42:36 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BGgaLw046333
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 16:42:36 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BGgadb046331
	for perforce@freebsd.org; Sun, 11 Oct 2009 16:42:36 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Oct 2009 16:42:36 GMT
Message-Id: <200910111642.n9BGgadb046331@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169404 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 16:42:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=169404

Change 169404 by rwatson@rwatson_freebsd_capabilities on 2009/10/11 16:41:43

	In FreeBSD 9, need to use FBSD_1.2.
	
	Do offer a return code from ld_libcache_add(), as the caller will
	expect it when coming from outside of rtld.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Symbol.map#7 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_libcache.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Symbol.map#7 (text+ko) ====

@@ -2,7 +2,7 @@
  * $FreeBSD$
  */
 
-FBSD_1.1 {
+FBSD_1.2 {
     ld_libcache_add;
     ld_libcache_lookup;
     ld_insandbox;

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_libcache.c#4 (text+ko) ====

@@ -74,7 +74,7 @@
 /*
  * Add a library to the library cache.
  */
-void
+int
 ld_libcache_add(const char *name, int fd)
 {
 	struct libcache_entry *liep;
@@ -83,6 +83,7 @@
 	liep->lie_name = xstrdup(name);
 	liep->lie_fd = fd;
 	TAILQ_INSERT_TAIL(&ld_libcache_list, liep, lie_list);
+	return (0);
 }
 
 /*

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 16:53:49 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5AC32106568B; Sun, 11 Oct 2009 16:53:49 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 20BDB1065670
	for <perforce@FreeBSD.org>; Sun, 11 Oct 2009 16:53:49 +0000 (UTC)
	(envelope-from zjriggl@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EA4E28FC17
	for <perforce@FreeBSD.org>; Sun, 11 Oct 2009 16:53:48 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BGrmqE057497
	for <perforce@FreeBSD.org>; Sun, 11 Oct 2009 16:53:48 GMT
	(envelope-from zjriggl@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BGrmFN057495
	for perforce@freebsd.org; Sun, 11 Oct 2009 16:53:48 GMT
	(envelope-from zjriggl@FreeBSD.org)
Date: Sun, 11 Oct 2009 16:53:48 GMT
Message-Id: <200910111653.n9BGrmFN057495@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zjriggl@FreeBSD.org using -f
From: Zachariah Riggle <zjriggl@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169407 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 16:53:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=169407

Change 169407 by zjriggl@zjriggl_tcpregression on 2009/10/11 16:52:55

	Added PCS-0.5 diff.

Affected files ...

.. //depot/projects/soc2009/zjriggl_tcpregression/diff/pcs-0.5.diff#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 17:29:28 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 87D641065676; Sun, 11 Oct 2009 17:29:28 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4C6AB1065672
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 17:29:28 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 197FB8FC20
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 17:29:28 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BHTRkU061011
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 17:29:27 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BHTRdY061009
	for perforce@freebsd.org; Sun, 11 Oct 2009 17:29:27 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 11 Oct 2009 17:29:27 GMT
Message-Id: <200910111729.n9BHTRdY061009@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169409 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 17:29:28 -0000

http://perforce.freebsd.org/chv.cgi?CH=169409

Change 169409 by trasz@trasz_victim on 2009/10/11 17:28:33

	Fix language errors.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.8#2 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.8#2 (text+ko) ====

@@ -76,10 +76,10 @@
 Syntax for a rule is subject:subject-id:resource:action=amount/per.
 .Pp
 Subject defines the kind of entity the rule applies to.
-It can be either process, user, group, loginclass, or jail.
+It can be either process, user, group, login class, or jail.
 .Pp
 Subject ID identifies the subject.  It can be user name, group name,
-loginclass name, or a numerical UID, GID, or JID.
+login class name, or a numerical UID, GID, or JID.
 .Pp
 Resource identifies the resource the rule controls.
 .Pp
@@ -92,19 +92,21 @@
 .Pp
 The per field defines what entity the limit gets accounted for.
 For example, rule "loginclass:users:memoryuse:deny=100M/process" means
-that each process of a user belonging to loginclass "users" may use up to 100MB
+that each process of any user belonging to login class "users" may use up to 100MB
 of memory.
 Rule "loginclass:users:memoryuse:deny=100M/user" would mean that the sum of
-memory used by all processes of that user will not exceed 100MB.
+memory used by all processes of any user belonging to the login class "users"
+will not exceed 100MB.
 Rule "loginclass:users:memoryuse:deny=100M/loginclass" would mean that the sum of
-memory used by all processes of all users with that loginclass will not exceed 100MB.
+memory used by all processes of all users belonging to that login class will
+not exceed 100MB.
 .Pp
 Valid rule has all of these fields specified, except for the per, which defaults
 to the value of subject.
 .Pp
 A filter is a rule for which one of more fields other than per is left empty.
 For example, a filter that matches every rule could be written as ":::=/",
-or, in short, ":".  A filter that matchess all the login classes would be
+or, in short, ":".  A filter that matches all the login classes would be
 "loginclass:".  A filter that matches all defined limits for maxprocesses
 resource would be "::maxprocesses".
 .Sh EXIT STATUS

From owner-p4-projects@FreeBSD.ORG  Mon Oct 12 02:23:11 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4B7D11065676
	for <p4-projects@freebsd.org>; Mon, 12 Oct 2009 02:23:11 +0000 (UTC)
	(envelope-from streamsendbouncer@me21507.mailengine1.com)
Received: from me21507.mailengine1.com (me21507.mailengine1.com [66.59.24.112])
	by mx1.freebsd.org (Postfix) with ESMTP id 34EA08FC1A
	for <p4-projects@freebsd.org>; Mon, 12 Oct 2009 02:23:11 +0000 (UTC)
Received: by me21507.mailengine1.com (PowerMTA(TM) v3.5r14) id hqa9gu0j0pko
	for <p4-projects@freebsd.org>;
	Sun, 11 Oct 2009 19:00:23 -0700 (envelope-from
	<streamsendbouncer@me21507.mailengine1.com>)
MIME-Version: 1.0
X-Mailer: StreamSend - 3326
X-Report-Abuse-At: abuse@streamsend.com
X-Report-Abuse-Info: It is important to please include full email headers in
	the report
X-Campaign-ID: 362
X-Streamsendid: 3326+192+8442692+362+me21507.mailengine1.com
Date: Sun, 11 Oct 2009 19:00:22 -0700
From: "CISSE 2009" <cisse@cisse2009.org>
To: p4-projects@freebsd.org
Message-Id: <20091012022311.4B7D11065676@hub.freebsd.org>
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
X-Content-Filtered-By: Mailman/MimeDel 2.1.5
Subject: CISSE 2009 - Paper Submission Deadline Extended to October 26, 2009.
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2009 02:23:11 -0000

Dear Colleagues,

Due to numerous deadline extension requests from potential CISSE 2009
authors, the CISSE organizing committee has decided to extend the paper
submission deadline to 10/26/2009. Please note that this is a hard
deadline, so that the technical committees can perform their paper
reviewing duties in a timely manner.

If you received this email in error, please forward it to the appropriate
department at your institution. If you wish to unsubscribe please follow
the unsubscribe link at bottom of the email.

Please do not reply to this message. If you need to contact us please email
us at info@cisse2009.org


*********************************************************************
*     The Fifth International Joint Conferences on Computer,        *
*  Information, and Systems Sciences, and Engineering (CISSE 2009)  *
*                                                                   *
*                                                                   *
*                                                                   *
*                   http://www.cisse2009.org                        *
*                                                                   *
*                                                                   *
*                                                                   *
*********************************************************************

December 4-12, 2009




Sponsored by the University of Bridgeport
Technically co-sponsored by the IEEE Computer Society, Communications
Society and Education Society (Connecticut Section)


---------------------------------------------------------------------
CONFERENCE OVERVIEW
---------------------------------------------------------------------


CISSE 2009 provides a virtual forum for presentation and discussion of the
state-of the-art research on computers, information and systems sciences
and engineering. CISSE 2009 is the fifth conference of the CISSE series of
e-conferences. CISSE is the World's first Engineering/Computing and Systems
Research E-Conference. CISSE 2005 was the first high-caliber Research
Conference in the world to be completely conducted online in real-time via
the internet. CISSE 2005 received 255 research paper submissions and the
final program included 140 accepted papers, from more than 45 countries.
CISSE 2006 received 691 research paper submissions and the final program
included 390 accepted papers, from more than 70 countries. CISSE 2007
received 750 research paper submissions and the final program included 406
accepted papers. A total of 948 paper submissions were received for CISSE
2008 and the final program included 382 accepted papers, from more than 80
countries.

The virtual conference will be conducted through the Internet using
web-conferencing tools, made available by the conference. Authors will be
presenting their PowerPoint, audio or video presentations using
web-conferencing tools without the need for travel. Conference sessions
will be broadcast to all the conference participants, where session
participants can interact with the presenter during the presentation and
(or) during the Q&A slot that follows the presentation. This international
conference will be held entirely on-line. The accepted and presented
papers will be made available and sent to the authors after the conference
both on a DVD (including all papers, powerpoint presentations and audio
presentations) and as a book publication. Springer, the official publisher
for CISSE, published the 2005 proceedings in 2 books and the CISSE 2006,
CISSE 2007 and CISSE 2008 proceedings in four books each.

Conference participants - authors, presenters and attendees - only need an
internet connection and sound available on their computers in order to be
able to contribute and participate in this international ground-breaking
conference. The on-line structure of this high-quality event will allow
academic professionals and industry participants to contribute their work
and attend world-class technical presentations based on rigorously refereed
submissions, live, without the need for investing significant travel funds
or time out of the office.

The concept and format of CISSE is ground-breaking. The PowerPoint
presentations, final paper manuscripts and time schedule for live
presentations over the web are available for two weeks prior to the start
of the conference for all registrants, so that the participants can choose
the presentations they want to attend and think about questions that they
might want to ask. The live audio presentations were also recorded and are
part of the permanent CISSE on-line archive - accessible to all
registrants- which also includes all the papers, PowerPoint and audio
presentations.

Potential non-author conference attendees who cannot make the on-line
conference dates are encouraged to register, as the entire joint
conferences will be archived for future viewing. 

The CISSE conference audio room provides superb audio even over low speed
internet connections, the ability to display PowerPoint presentations, and
cross-platform compatibility (the conferencing software runs on Windows,
Mac, and any other operating system that supports Java). In addition, the
conferencing system allows for an unlimited number of participants, which
in turn granted us the opportunity to allow all CISSE participants to
attend all presentations, as opposed to limiting the number of available
seats for each session.

Prospective authors are invited to submit full papers electronically in
Microsoft Word or Adobe PDF format through the website of the conference at
 http://www.cisse2009.org. Accepted papers must be presented in the virtual
conference by one of the authors. To submit your paper, please visit
http://www.cisse2009.org


CISSE 2009 is composed of the following four conferences:

International Conference on Systems, Computing Sciences and Software
Engineering (SCSS 09)

Topics: Grid Computing, Internet-based Computing Models, Resource
Discovery, Programming Models and tools, e-Science and Virtual
Instrumentation, Biometric Authentication, Computers for People of Special
Needs, Human Computer Interaction, Information and Knowledge Engineering,
Algorithms, Parallel and Distributed processing, Modeling and Simulation,
Services and Applications, Embedded Systems and Applications, Databases,
Programming Languages, Signal Processing Theory and Methods, Signal
Processing for Communication, Signal Processing Architectures and
Implementation, Information Processing, Geographical Information Systems,
Object Based Software Engineering, Parallel and Distributed Computing, Real
Time Systems,
Multiprocessing, File Systems and I/O, Kernel and OS Structures.


International Conference on Telecommunications and Networking (TeNe 09)

Topics: Optical Networks and Switching, Computer Networks, Network
architectures and Equipment, Access Technologies, Telecommunication
Technology, Coding and Modulation technique, Modeling and Simulation,
Spread Spectrum and CDMA Systems, OFDM technology, Space-time Coding, Ultra
Wideband Communications, Medium Access Control, Spread Spectrum, Wireless
LAN: IEEE 802.11, HIPERLAN, Bluetooth, Cellular Wireless Networks, Cordless
Systems and Wireless Local Loop, Mobile Network Layer, Mobile Transport
Layer, Support for Mobility, Conventional Encryption and Message
Confidentiality, Block Ciphers Design Principles, Block Ciphers Modes of
Operation, Public-Key Cryptography and Message Authentication,
Authentication Application, Stenography, Electronic Mail Security, Web
Security, IP Security, Firewalls, Computer Forensics.


International Conference on Engineering Education, Instructional
Technology, Assessment, and E-learning (EIAE 09)

Topics: Instructional Design, Accreditation, Curriculum Design, Educational
Tools, 2-2-2 Platforms, Teaching Capstone Design, Teaching Design at the
Lower Levels, Design and Development of e-Learning tools, Assessment
Methods in Engineering, Development and Implementation of E-learning tools,
Ethics in Education, Economical and Social Impacts of E-learning.


International Conference on Industrial Electronics, Technology & Automation
(IETA 09)

Topics: Advanced and Distributed Control Systems, Intelligent Control
Systems (NN, FL, GA, .etc), Expert Systems, Man Machine Interaction, Data
Fusion, Factory Automation, Robotics, Motion Control, Machine Vision, MEMS
Sensors and Actuators, Sensors Fusion, Power Electronics, High Frequency
Converters, Motors and Drives, Power Converters, Power Devices and
Components, Electric Vehicles and Intelligent Transportation, Process
Automation, Factory Communication, Manufacturing Information System
Advances in Manufacturing Systems, Industrial Applications of Multi Media,
Intelligent Systems Instrumentation, Industrial Instrumentation, Modeling
and Simulation, Signal Processing, Image and Data Processing, VR and
Parallel systems..

Paper Submission
=================

Prospective authors are invited to submit full papers electronically in
Microsoft Word or Adobe PDF format through the website of the conference at
http://www.cisse2009.org.

Accepted papers must be presented in the virtual conference by one of the
authors. To submit your paper, visit http://www.cisse2009.org


New Paper submission Deadline:       October 26th, 2009
Notification of Acceptance:          November 12th, 2009
Final Manuscript and Registration:   November 26th, 2009

------------------------------------------------------------------------
S. Patel 
CISSE 2009 Support Team 
University of Bridgeport                         e-mail:
info@cisse2009.org
Bridgeport, CT 06604, U.S.A.                     http://www.cisse2009.org
------------------------------------------------------------------------


Click here on http://server1.streamsend.com/streamsend/unsubscribe.php?cd=3326&md=362&ud=2e7aaf127fa07e33b2a077dfd368e5f1 <http://server1.streamsend.com/streamsend/unsubscribe.php?cd=3326&md=362&ud=2e7aaf127fa07e33b2a077dfd368e5f1> to update your profile or Unsubscribe

From owner-p4-projects@FreeBSD.ORG  Mon Oct 12 08:17:38 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 490C61065679; Mon, 12 Oct 2009 08:17:38 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 01635106566B
	for <perforce@FreeBSD.org>; Mon, 12 Oct 2009 08:17:38 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E3BED8FC0C
	for <perforce@FreeBSD.org>; Mon, 12 Oct 2009 08:17:37 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9C8Hb18072724
	for <perforce@FreeBSD.org>; Mon, 12 Oct 2009 08:17:37 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9C8HbeE072722
	for perforce@freebsd.org; Mon, 12 Oct 2009 08:17:37 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Mon, 12 Oct 2009 08:17:37 GMT
Message-Id: <200910120817.n9C8HbeE072722@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169416 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2009 08:17:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=169416

Change 169416 by pgj@beehive on 2009/10/12 08:17:15

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#52 integrate
.. //depot/projects/docproj_hu/www/en/news/status/Makefile#7 integrate
.. //depot/projects/docproj_hu/www/en/news/status/report-2009-04-2009-09.xml#3 integrate
.. //depot/projects/docproj_hu/www/en/news/status/status.sgml#8 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#71 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#52 (text+ko) ====

@@ -20,7 +20,7 @@
 
     <corpauthor>A &os; Dokument&aacute;ci&oacute;s Projekt</corpauthor>
 
-    <pubdate>$FreeBSD: doc/hu_HU.ISO8859-2/books/faq/book.sgml,v 1.14 2009/06/14 22:28:17 pgj Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/hu_HU.ISO8859-2/books/faq/book.sgml,v 1.15 2009/10/11 12:24:11 pgj Exp $</pubdate>
 
     <copyright>
       <year>1995</year>

==== //depot/projects/docproj_hu/www/en/news/status/Makefile#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/news/status/Makefile,v 1.47 2009/10/05 12:49:16 danger Exp $
+# $FreeBSD: www/en/news/status/Makefile,v 1.48 2009/10/11 17:49:28 danger Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -44,7 +44,7 @@
 XMLDOCS+=	report-2008-07-2008-09
 XMLDOCS+=	report-2008-10-2008-12
 XMLDOCS+=	report-2009-01-2009-03
-#XMLDOCS+=	report-2009-04-2009-09
+XMLDOCS+=	report-2009-04-2009-09
 
 XSLT.DEFAULT=	report.xsl
 

==== //depot/projects/docproj_hu/www/en/news/status/report-2009-04-2009-09.xml#3 (text+ko) ====

@@ -2,7 +2,7 @@
 <!DOCTYPE report PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Status
 Report//EN"
 "http://www.FreeBSD.org/XML/www/share/sgml/statusreport.dtd">
-<!-- $FreeBSD: www/en/news/status/report-2009-04-2009-09.xml,v 1.13 2009/10/09 13:19:54 danger Exp $ -->
+<!-- $FreeBSD: www/en/news/status/report-2009-04-2009-09.xml,v 1.14 2009/10/11 17:31:46 danger Exp $ -->
 <report>
   <date>
     <month>April-September</month>
@@ -936,10 +936,11 @@
 	member Kirill Ponomarew (krion@) for his long service.</p>
 
       <p>Ion-Mihai has spent much time working on a system that does
-	automatic Quality Assurance on new commits, called QATty.
-	This has helped us to fix many problems, especially those
-	involving custom LOCALBASE settings, and documentation inclusion
-	options.</p>
+	automatic Quality Assurance on new commits, called QAT.  A
+	second tinderbox called QATty has helped us to fix many problems,
+	especially those involving custom PREFIX and LOCALBASE settings,
+	and documentation inclusion options.  Ports conformance to
+	documented features / non-default configuration will follow.</p>
 
       <p>Between pav and miwi, over 2 dozen experimental ports runs have
 	been completed and committed.</p>
@@ -950,7 +951,10 @@
 
     <help>
       <task>We are currently trying to set up ports tinderboxes that
-	can be made available to committers for pre-testing.</task>
+	can be made available to committers for pre-testing; those
+	who can loan machines for this should contact Ion-Mihai
+	(itetcu@) with details regarding the hardware and
+	bandwidth.</task>
       <task>Most of the remaining ports PRs are "existing port/PR
 	assigned to committer".  Although the maintainer-timeout policy
 	is helping to keep the backlog down, we are going to need to do

==== //depot/projects/docproj_hu/www/en/news/status/status.sgml#8 (text+ko) ====

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/news/status/status.sgml,v 1.57 2009/05/07 18:12:15 brd Exp $">
+<!ENTITY date "$FreeBSD: www/en/news/status/status.sgml,v 1.58 2009/10/11 17:49:28 danger Exp $">
 <!ENTITY title "FreeBSD Quarterly Status Reports">
 <!ENTITY % navinclude.about "INCLUDE">
 ]>
@@ -8,7 +8,7 @@
 <html>
   &header;
 
-  <h2>Next submissions due: July 14, 2009</h2>
+  <h2>Next submissions due: January 15, 2010</h2>
 
   <p>Use the <a href="http://www.FreeBSD.org/cgi/monthly.cgi">xml
       generator</a> or download and edit the <a href="report-sample.xml">
@@ -37,11 +37,13 @@
     reports, a short description may precede the status information.</p>
 
   <p>These status reports may be reproduced in whole or in part, as long as the
-    source is clearly identified and appropriate credit given. </p>
+    source is clearly identified and appropriate credit given.</p>
 
   <h2>2009</h2>
 
   <ul>
+    <li><a href="report-2009-04-2009-09.html">April, 2009 -
+      September, 2009</a></li>
     <li><a href="report-2009-01-2009-03.html">January, 2009 -
       March, 2009</a></li>
   </ul>

==== //depot/projects/docproj_hu/www/share/sgml/news.xml#71 (text+ko) ====

@@ -25,7 +25,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/news.xml,v 1.272 2009/10/04 15:00:07 jh Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.273 2009/10/11 17:49:27 danger Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -34,6 +34,19 @@
 
     <month>
       <name>10</name>
+
+      <day>
+	<name>11</name>
+
+	<event>
+	  <title>April-September, 2009 Status Report</title>
+
+	  <p>The April-September, 2009 Status Report is <a
+	      href="&base;/news/status/report-2009-04-2009-09.html">now
+	      available</a> with 38 entries.</p>
+	</event>
+      </day>
+
       <day>
         <name>4</name>
 

From owner-p4-projects@FreeBSD.ORG  Mon Oct 12 08:30:53 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F2234106568F; Mon, 12 Oct 2009 08:30:52 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B680F106566B
	for <perforce@FreeBSD.org>; Mon, 12 Oct 2009 08:30:52 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A57A48FC28
	for <perforce@FreeBSD.org>; Mon, 12 Oct 2009 08:30:52 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9C8Uqsh073658
	for <perforce@FreeBSD.org>; Mon, 12 Oct 2009 08:30:52 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9C8UqsY073656
	for perforce@freebsd.org; Mon, 12 Oct 2009 08:30:52 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Mon, 12 Oct 2009 08:30:52 GMT
Message-Id: <200910120830.n9C8UqsY073656@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169417 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2009 08:30:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=169417

Change 169417 by pgj@beehive on 2009/10/12 08:30:46

	MFen (www):
		1.272      -> 1.273      hu/share/sgml/news.xml

Affected files ...

.. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#56 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#56 (text+ko) ====

@@ -5,7 +5,7 @@
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
      %SOURCE%   share/sgml/news.xml
-     %SRCID%    1.272
+     %SRCID%    1.273
 -->
 
 <news>
@@ -22,6 +22,22 @@
       <name>10</name>
 
       <day>
+	<name>11</name>
+
+	<event>
+	  <title>2009 m&aacute;sodik &eacute;s harmadik
+	    negyed&eacute;ves (&aacute;prilis - szeptember)
+	    helyzetjelent&eacute;sek</title>
+
+	  <p>A 2009 &aacute;prilisa &eacute;s szeptembere k&ouml;zt
+	    eltelt id&#245;szakr&oacute;l tud&oacute;s&iacute;t&oacute;
+	    38 helyzetjelent&eacute;s <a
+	      href="&enbase;/news/status/report-2009-04-2009-09.html">mostant&oacute;l
+	      el&eacute;rhet&#245;</a>.</p>
+	</event>
+      </day>
+
+      <day>
 	<name>4</name>
 
 	<event>

From owner-p4-projects@FreeBSD.ORG  Mon Oct 12 09:16:42 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AE11D106568D; Mon, 12 Oct 2009 09:16:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 720981065670
	for <perforce@freebsd.org>; Mon, 12 Oct 2009 09:16:42 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 611EF8FC1B
	for <perforce@freebsd.org>; Mon, 12 Oct 2009 09:16:42 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9C9Gglt088097
	for <perforce@freebsd.org>; Mon, 12 Oct 2009 09:16:42 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9C9GgVX088095
	for perforce@freebsd.org; Mon, 12 Oct 2009 09:16:42 GMT
	(envelope-from mav@freebsd.org)
Date: Mon, 12 Oct 2009 09:16:42 GMT
Message-Id: <200910120916.n9C9GgVX088095@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169418 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2009 09:16:42 -0000

http://perforce.freebsd.org/chv.cgi?CH=169418

Change 169418 by mav@mav_mavtest on 2009/10/12 09:16:05

	Look for bus only when it is needed.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#105 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#105 (text+ko) ====

@@ -4156,8 +4156,6 @@
 
 		sendq->qfrozen_cnt--;
 		if (sendq->qfrozen_cnt == 0) {
-			struct cam_eb *bus;
-
 			/*
 			 * If there is a timeout scheduled to release this
 			 * sim queue, remove it.  The queue frozen count is
@@ -4167,15 +4165,17 @@
 				callout_stop(&sim->callout);
 				sim->flags &= ~CAM_SIM_REL_TIMEOUT_PENDING;
 			}
-			bus = xpt_find_bus(sim->path_id);
 
 			if (run_queue) {
+				struct cam_eb *bus;
+
 				/*
 				 * Now that we are unfrozen run the send queue.
 				 */
+				bus = xpt_find_bus(sim->path_id);
 				xpt_run_dev_sendq(bus);
+				xpt_release_bus(bus);
 			}
-			xpt_release_bus(bus);
 		}
 	}
 }

From owner-p4-projects@FreeBSD.ORG  Mon Oct 12 12:57:44 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6C3AC10656AA; Mon, 12 Oct 2009 12:57:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2FE6310656A8
	for <perforce@freebsd.org>; Mon, 12 Oct 2009 12:57:44 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D8EF8FC2B
	for <perforce@freebsd.org>; Mon, 12 Oct 2009 12:57:44 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9CCvihK020816
	for <perforce@freebsd.org>; Mon, 12 Oct 2009 12:57:44 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9CCvi9r020814
	for perforce@freebsd.org; Mon, 12 Oct 2009 12:57:44 GMT
	(envelope-from gabor@freebsd.org)
Date: Mon, 12 Oct 2009 12:57:44 GMT
Message-Id: <200910121257.n9CCvi9r020814@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169422 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2009 12:57:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=169422

Change 169422 by gabor@gabor_aspire on 2009/10/12 12:57:32

	MFHg:
		GENERAL
		============================================================
		- Add a top-level Makefile to make the upgrade easier.  For
		  first-time installation it is still required to follow
		  TESTING-HOWTO to resolve the dependencies between the
		  various components. [1]
	
		LIBRARY
		============================================================
		- Hook up mapper_parallel to the build, which was forgotten
		- Fix a typo in _iconv.c
		- Add GNU-specific iconvctl(). Currently, the following
		  iconvctl() operations are supported:
			- ICONV_GET_TRIVIALP
			- ICONV_GET_TRANSLITERATION
			- ICONV_SET_TRANSLITERATION
			- ICONV_GET_DISCARD_ILSEQ
			- ICONV_SET_DISCARD_ILSEQ
		- Along with ICONV_*_DISCARD_ILSEQ, add support for //IGNORE
		  prefix of the destination encoding in iconv_open()
		- Implement GNU's _iconv_canonalize()
		- Make iconvctl() return -1 and set errno to EBADF if
		  conversion descriptor is invalid
		- Speed up build of modules by linking them to the library
		- Implement GNU-specific iconvlist()
		- Some style changes [1]
		- Define historical GNU function names: libiconv_open(),
		  libiconv(), libiconv_close() [1]
		- Add support for listing canonical - alias conversion
		  name pairs [1]
		- Fix installation of iconv.3 [1]
	
		BIN
		============================================================
		- Add -ll for iconv(1) to list supported encodings as
		  canonical - alias name pairs [1]
		- C99-ify iconv(1) a bit
	
		REGRESSION-TEST
		=============================================================
		- Turn on some more test cases in the conversion table
		  comparing tests
		- Add a target to generate reference data from GNU iconv
		- Add -l to tablegen so that we can make longer
		  (but more time-consuming) tests
		- Add a simple POSIX test for some basic cases
		- Add a simple GNU compatibility test for some implemented
		  GNU-specific features
	
		DOCS
		=============================================================
		- Add a sketchy iconvctl.3 man page
	
	
	Submitted by:	edwin [1]

Affected files ...

.. //depot/projects/soc2009/gabor_iconv/extracted/include/iconv.h#2 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/Makefile#7 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/_iconv.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_esdb.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_esdb.h#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_iconv.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_iconv.h#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_iconv_local.h#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_module.h#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_prop.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/GBK2K/citrus_gbk2k.c#7 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/MSKanji/citrus_mskanji.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/Makefile.inc#4 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UES/citrus_ues.c#7 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF1632/citrus_utf1632.c#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_none/citrus_iconv_none.c#7 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_std/citrus_iconv_std.c#7 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/iconv/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/Makefile#5 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/tablegen/tablegen.c#3 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/Makefile#5 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/Makefile#7 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/iconv.1#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/iconv.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkcsmapper/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkesdb/Makefile#8 edit

Differences ...

==== //depot/projects/soc2009/gabor_iconv/extracted/include/iconv.h#2 (text+ko) ====

@@ -30,6 +30,9 @@
 #ifndef _ICONV_H_
 #define _ICONV_H_
 
+#include <stdbool.h>
+#include <wchar.h>
+
 #include <sys/cdefs.h>
 #include <sys/types.h>
 
@@ -50,11 +53,48 @@
 /*
  * non-portable interfaces for iconv
  */
-int	__iconv_get_list(char ***, size_t *);
+int	__iconv_get_list(char ***, size_t *, bool);
 void	__iconv_free_list(char **, size_t);
 size_t	__iconv(iconv_t, const char **, size_t *, char **,
 		     size_t *, __uint32_t, size_t *);
 #define __ICONV_F_HIDE_INVALID	0x0001
+
+/*
+ * GNU interfaces for iconv
+ */
+
+/* Historical versions */
+#define	libiconv_open	iconv_open
+#define libiconv_close	iconv_close
+#define libiconv	iconv
+
+/* We have iconvctl() */
+#define _LIBICONV_VERSION	0x0108
+
+/*
+ * iconvctl() request macros
+ */
+#define ICONV_TRIVIALP		0
+#define	ICONV_GET_TRANSLITERATE	1
+#define	ICONV_SET_TRANSLITERATE	2
+#define ICONV_GET_DISCARD_ILSEQ	3
+#define ICONV_SET_DISCARD_ILSEQ	4
+#define ICONV_SET_HOOKS		5
+#define ICONV_SET_FALLBACKS	6
+
+typedef void (*iconv_unicode_char_hook) (unsigned int mbr, void *data);
+typedef void (*iconv_wide_char_hook) (wchar_t wc, void *data);
+
+struct iconv_hooks {
+	iconv_unicode_char_hook		 uc_hook;
+	iconv_wide_char_hook		 wc_hook;
+	void				*data;
+};
+
+void		 iconvlist(int (*do_one) (unsigned int, const char * const *,
+		    void *), void *);
+const char	*_iconv_canonalize(const char *);
+int		 iconvctl(iconv_t, int, void *);
 __END_DECLS
 
 #endif /* !_ICONV_H_ */

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/Makefile#7 (text+ko) ====

@@ -2,6 +2,8 @@
 
 LIB=		iconv
 SHLIB_MAJOR=	4
+MAN=		iconv.3 \
+		iconvctl.3
 SRCS=		_iconv.c \
 		citrus_bcs.c \
 		citrus_bcs_strtol.c \
@@ -26,7 +28,7 @@
 		citrus_prop.c \
 		citrus_stdenc.c
 
-CFLAGS+=	--param max-inline-insns-single=128
+CFLAGS+=	--param max-inline-insns-single=128 -I ${.CURDIR}/../../include
 WARNS?=		3
 
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/_iconv.c#6 (text+ko) ====

@@ -30,10 +30,11 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <iconv.h>
 #include <paths.h>
+#include <stdbool.h>
 #include <sys/queue.h>
 
-#include "iconv.h"
 #include "netbsdism.h"
 
 #ifdef __weak_alias
@@ -64,7 +65,7 @@
 	/*
 	 * Remove anything following a //, as these are options (like
 	 * //ignore, //translate, etc) and we just don't handle them.
-	 * This is for compatibilty wiht software that uses thees
+	 * This is for compatibilty with software that uses thees
 	 * blindly.
 	 */
 	out_truncated = strdup(out);
@@ -85,10 +86,15 @@
 	ret = _citrus_iconv_open(&handle, _PATH_ICONV, in, out_truncated);
 	free(out_truncated);
 	if (ret) {
-		errno = ret == ENOENT? EINVAL : ret;
+		errno = ret == ENOENT ? EINVAL : ret;
 		return ((iconv_t)-1);
 	}
 
+	if (strcasestr(out, "//IGNORE"))
+		handle->cv_shared->ci_discard_ilseq = true;
+	else
+		handle->cv_shared->ci_discard_ilseq = false;
+
 	return ((iconv_t)(void *)handle);
 }
 
@@ -153,11 +159,11 @@
 }
 
 int
-__iconv_get_list(char ***rlist, size_t *rsz)
+__iconv_get_list(char ***rlist, size_t *rsz, bool l)
 {
 	int ret;
 
-	ret = _citrus_esdb_get_list(rlist, rsz);
+	ret = _citrus_esdb_get_list(rlist, rsz, l);
 	if (ret) {
 		errno = ret;
 		return -1;
@@ -171,3 +177,80 @@
 {
 	_citrus_esdb_free_list(list, sz);
 }
+
+/*
+ * GNU-compatibile non-standard interfaces.
+ */
+void
+iconvlist(int (*do_one) (unsigned int, const char * const *,
+    void *), void *data)
+{
+	char		**list;
+	size_t		 sz;
+
+	if (__iconv_get_list(&list, &sz, true))
+		list = NULL;
+
+	const char * const *	names = (const char * const *)list;
+	unsigned int		i = sz;
+	do_one(i, names, data);
+
+	__iconv_free_list(list, sz);
+}
+
+__inline const char
+*_iconv_canonalize(const char *name)
+{
+	return (_citrus_iconv_canonalize(name));
+}
+
+int
+iconvctl(iconv_t cd, int request, void *argument)
+{
+	int			*i = (int *)argument;
+	struct iconv_hooks	*hooks = (struct iconv_hooks *)argument;
+	struct _citrus_iconv	*cv = (struct _citrus_iconv *)(void *)cd;
+	const char		*convname;
+	char			*src, *dst;
+
+	if (ISBADF(cd)) {
+		errno = EBADF;
+		return (-1);
+	}
+
+	switch (request) {
+	case ICONV_TRIVIALP:
+		convname = cv->cv_shared->ci_convname;
+		dst = strchr(convname, '/');
+
+		strlcpy(src, convname, dst - convname + 1);
+		dst++;
+		if ((convname == NULL) || (src == NULL) || (dst == NULL))
+			return (-1);
+		*i = strcmp(src, dst) == 0 ? 1 : 0;
+		return (0);
+	case ICONV_GET_TRANSLITERATE:
+		*i = 1;
+		return (0);
+	case ICONV_SET_TRANSLITERATE:
+		return  ((*i == 1) ? 0 : -1);
+	case ICONV_GET_DISCARD_ILSEQ:
+		*i = cv->cv_shared->ci_discard_ilseq ? 1 : 0;
+		return (0);
+	case ICONV_SET_DISCARD_ILSEQ:
+		cv->cv_shared->ci_discard_ilseq = *i;
+		return (0);
+	case ICONV_SET_HOOKS:
+		if (hooks != NULL)
+			cv->cv_shared->ci_hooks = *hooks;
+		else {
+			cv->cv_shared->ci_hooks.uc_hook = NULL;
+			cv->cv_shared->ci_hooks.wc_hook = NULL;
+			cv->cv_shared->ci_hooks.data = NULL;
+		}
+		return (0);
+	default:
+		errno = EINVAL;
+		return (-1);
+	}
+}

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_esdb.c#6 (text+ko) ====

@@ -29,6 +29,7 @@
 #include <sys/cdefs.h>
 
 #include <assert.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -254,10 +255,10 @@
  *	get esdb entries.
  */
 int
-_citrus_esdb_get_list(char ***rlist, size_t *rnum)
+_citrus_esdb_get_list(char ***rlist, size_t *rnum, bool l)
 {
 	int ret;
-	struct _region key;
+	struct _region key, data;
 	size_t num;
 	struct _citrus_lookup *cla, *cld;
 	char **list, **q;
@@ -290,10 +291,17 @@
 	}
 
 	/* get alias entries */
-	while ((ret = _lookup_seq_next(cla, &key, NULL)) == 0) {
-		snprintf(buf, sizeof(buf), "%.*s",
-			 (int)_region_size(&key),
-			 (const char *)_region_head(&key));
+	while ((ret = _lookup_seq_next(cla, &key, &data)) == 0) {
+		if (!l)
+			snprintf(buf, sizeof(buf), "%.*s",
+				 (int)_region_size(&key),
+				 (const char *)_region_head(&key));
+		else
+			snprintf(buf, sizeof(buf), "%.*s/%.*s",
+				 (int)_region_size(&data),
+				 (const char *)_region_head(&data),
+				 (int)_region_size(&key),
+				 (const char *)_region_head(&key));
 		_bcs_convert_to_lower(buf);
 		list[num] = strdup(buf);
 		if (list[num] == NULL) {
@@ -305,11 +313,28 @@
 	if (ret != ENOENT)
 		goto quit3;
 	/* get dir entries */
-	while ((ret = _lookup_seq_next(cld, &key, NULL)) == 0) {
+	while ((ret = _lookup_seq_next(cld, &key, &data)) == 0) {
 		/* check duplicated entry */
-		snprintf(buf, sizeof(buf), "%.*s",
-			 (int)_region_size(&key),
-			 (const char *)_region_head(&key));
+		if (!l)
+			snprintf(buf, sizeof(buf), "%.*s",
+				 (int)_region_size(&key),
+				 (const char *)_region_head(&key));
+		else {
+			char buf1[PATH_MAX];
+			char *p;
+
+			snprintf(buf1, sizeof(buf1), "%.*s",
+				 (int)_region_size(&data),
+				 (const char *)_region_head(&data));
+			if ((p = strchr(buf1, '/')) != NULL)
+				memcpy(buf1, p + 1, strlen(p) - 1);
+			if ((p = strstr(buf1, ".esdb")) != NULL)
+				*p = '\0';
+			snprintf(buf, sizeof(buf), "%s/%.*s",
+				 buf1,
+				 (int)_region_size(&key),
+				 (const char *)_region_head(&key));
+		}
 		_bcs_convert_to_lower(buf);
 		ret = _lookup_seq_lookup(cla, buf, NULL);
 		if (ret) {

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_esdb.h#6 (text+ko) ====

@@ -49,7 +49,7 @@
 int		_citrus_esdb_open(struct _citrus_esdb *, const char *);
 void		_citrus_esdb_close(struct _citrus_esdb *);
 void		_citrus_esdb_free_list(char **, size_t);
-int		_citrus_esdb_get_list(char ***, size_t *);
+int		_citrus_esdb_get_list(char ***, size_t *, bool);
 __END_DECLS
 
 #endif

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_iconv.c#6 (text+ko) ====

@@ -30,10 +30,12 @@
 
 #include <assert.h>
 #include <pthread.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <iconv.h>
 #include <limits.h>
 #include <unistd.h>
 #include <paths.h>
@@ -378,3 +380,14 @@
 		free(cv);
 	}
 }
+
+const char
+*_citrus_iconv_canonalize(const char *name)
+{
+	char buf[PATH_MAX], path[PATH_MAX];
+ 
+	snprintf(path, sizeof(path), "%s/%s", _PATH_ICONV, _CITRUS_ICONV_ALIAS);
+	return (_citrus_lookup_simple(path, name, buf, (size_t)PATH_MAX,
+	    _LOOKUP_CASE_IGNORE));
+}
+

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_iconv.h#6 (text+ko) ====

@@ -34,10 +34,11 @@
 struct _citrus_iconv;
 
 __BEGIN_DECLS
-int	_citrus_iconv_open(struct _citrus_iconv * __restrict * __restrict,
+int		 _citrus_iconv_open(struct _citrus_iconv * __restrict * __restrict,
 			   const char * __restrict,
 			   const char * __restrict, const char * __restrict);
-void	_citrus_iconv_close(struct _citrus_iconv *);
+void		 _citrus_iconv_close(struct _citrus_iconv *);
+const char	*_citrus_iconv_canonalize(const char *);
 __END_DECLS
 
 

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_iconv_local.h#6 (text+ko) ====

@@ -29,6 +29,8 @@
 #ifndef _CITRUS_ICONV_LOCAL_H_
 #define _CITRUS_ICONV_LOCAL_H_
 
+#include <iconv.h>
+
 #define _CITRUS_ICONV_GETOPS_FUNC_BASE(_n_)				\
 int _n_(struct _citrus_iconv_ops *, size_t, uint32_t)
 #define _CITRUS_ICONV_GETOPS_FUNC(_n_)					\
@@ -97,6 +99,8 @@
 	_citrus_module_t				ci_module;
 	unsigned int					ci_used_count;
 	char						*ci_convname;
+	bool						ci_discard_ilseq;
+	struct iconv_hooks				ci_hooks;
 };
 
 struct _citrus_iconv {

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_module.h#6 (text+ko) ====

@@ -30,6 +30,16 @@
 #ifndef _CITRUS_MODULE_H_
 #define _CITRUS_MODULE_H_
 
+#define MATCH(x, act)						\
+do {								\
+	if (lenvar >= (sizeof(#x)-1) &&				\
+	    _bcs_strncasecmp(p, #x, sizeof(#x)-1) == 0) {	\
+		act;						\
+		lenvar -= sizeof(#x)-1;				\
+		p += sizeof(#x)-1;				\
+	}							\
+} while (/*CONSTCOND*/0)
+
 typedef struct _citrus_module_rec *_citrus_module_t;
 
 __BEGIN_DECLS

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_prop.c#6 (text+ko) ====

@@ -160,11 +160,11 @@
 		case 'r': *result = '\r'; break;
 		case 't': *result = '\t'; break;
 		case 'v': *result = '\v'; break;
-		/*FALLTHROUGH*/
 		case '0': case '1': case '2': case '3':
 		case '4': case '5': case '6': case '7':
 			_memstream_ungetc(ms, ch);
 			base -= 8;
+			/*FALLTHROUGH*/
 		case 'x':
 			return _citrus_prop_read_chr_common(ms, result, base);
 			
@@ -247,7 +247,7 @@
 	case '\\':
 		_memstream_ungetc(ms, quot);
 		quot = EOF;
-	/*FALLTHROUGH*/
+		/*FALLTHROUGH*/
 	case '\"': case '\'':
 		break;
 	default:

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/GBK2K/citrus_gbk2k.c#7 (text+ko) ====

@@ -405,15 +405,6 @@
 	const char *p;
 
 	p = var;
-#define MATCH(x, act)                                           \
-do {                                                            \
-        if (lenvar >= (sizeof(#x)-1) &&                         \
-            _bcs_strncasecmp(p, #x, sizeof(#x)-1) == 0) {       \
-                act;                                            \
-                lenvar -= sizeof(#x)-1;                         \
-                p += sizeof(#x)-1;                              \
-        }                                                       \
-} while (/*CONSTCOND*/0)
 	memset((void *)ei, 0, sizeof(*ei));
 	ei->mb_cur_max = 4;
 	while (lenvar>0) {

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/MSKanji/citrus_mskanji.c#6 (text+ko) ====

@@ -479,15 +479,6 @@
 	const char *p;
 
 	p = var;
-#define MATCH(x, act)						\
-do {								\
-	if (lenvar >= (sizeof(#x)-1) &&				\
-	    _bcs_strncasecmp(p, #x, sizeof(#x)-1) == 0) {	\
-		act;						\
-		lenvar -= sizeof(#x)-1;				\
-		p += sizeof(#x)-1;				\
-	}							\
-} while (/*CONSTCOND*/0)
 	memset((void *)ei, 0, sizeof(*ei));
 	while (lenvar > 0) {
 		switch (_bcs_toupper(*p)) {

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/Makefile#6 (text+ko) ====

@@ -21,6 +21,7 @@
 	iconv_std \
 	mapper_646 \
 	mapper_none \
+	mapper_parallel \
 	mapper_serial \
 	mapper_std \
 	mapper_zone

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/Makefile.inc#4 (text+ko) ====

@@ -3,28 +3,9 @@
 .PATH: ${.CURDIR}/../../libiconv
 
 SHLIB_MAJOR=	4
-CFLAGS+=	-I${.CURDIR}/../../libiconv
+CFLAGS+=	-I${.CURDIR}/../../libiconv -I/usr/include -L/usr/lib
 DEBUG_FLAGS=	-g -ggdb
 LIBDIR=		/usr/lib/i18n
-SRCS+=		_iconv.c \
-		citrus_bcs.c \
-		citrus_bcs_strtol.c \
-		citrus_bcs_strtoul.c \
-		citrus_csmapper.c \
-		citrus_ctype.c \
-		citrus_ctype_fallback.c \
-		citrus_db.c \
-		citrus_db_hash.c \
-		citrus_esdb.c \
-		citrus_hash.c \
-		citrus_iconv.c \
-		citrus_lookup.c \
-		citrus_mapper.c \
-		citrus_memstream.c \
-		citrus_mmap.c \
-		citrus_module.c \
-		citrus_none.c \
-		citrus_prop.c \
-		citrus_stdenc.c
-
+LDADD+=		-liconv
+DPADD+=		/usr/lib/libiconv.a
 NO_PROFILE=

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UES/citrus_ues.c#7 (text+ko) ====

@@ -400,15 +400,6 @@
 	const char *p;
 
 	p = var;
-#define MATCH(x, act)						\
-do {								\
-        if (lenvar >= (sizeof(#x)-1) &&				\
-            _bcs_strncasecmp(p, #x, sizeof(#x)-1) == 0) {	\
-                act;						\
-                lenvar -= sizeof(#x)-1;				\
-                p += sizeof(#x)-1;				\
-        }							\
-} while (/*CONSTCOND*/0)
 	memset((void *)ei, 0, sizeof(*ei));
 	while (lenvar > 0) {
 		switch (_bcs_toupper(*p)) {

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF1632/citrus_utf1632.c#8 (text+ko) ====

@@ -346,15 +346,6 @@
 parse_variable(_UTF1632EncodingInfo * __restrict ei,
 	       const void * __restrict var, size_t lenvar)
 {
-#define MATCH(x, act)						\
-do {								\
-	if (lenvar >= (sizeof(#x)-1) &&				\
-	    _bcs_strncasecmp(p, #x, sizeof(#x)-1) == 0) {	\
-		act;						\
-		lenvar -= sizeof(#x)-1;				\
-		p += sizeof(#x)-1;				\
-	}							\
-} while (/*CONSTCOND*/0)
 	const char *p;
 	p = var;
 	while (lenvar>0) {

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_none/citrus_iconv_none.c#7 (text+ko) ====

@@ -30,6 +30,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/queue.h>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_std/citrus_iconv_std.c#7 (text+ko) ====

@@ -31,6 +31,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -300,7 +301,8 @@
 static int
 /*ARGSUSED*/
 do_conv(const struct _citrus_iconv_std_shared *is,
-	struct _citrus_iconv_std_context *sc, _csid_t *csid, _index_t *idx)
+	struct _citrus_iconv_std_context *sc, _csid_t *csid, _index_t *idx,
+	bool discard_ilseq)
 {
 	_index_t tmpidx;
 	int ret;
@@ -322,11 +324,12 @@
 				case _MAPPER_CONVERT_SRC_MORE:
 					/*FALLTHROUGH*/
 				case _MAPPER_CONVERT_DST_MORE:
-					/*FALLTHROUGH*/
+					if (discard_ilseq)
+						continue;
+				case _MAPPER_CONVERT_ILSEQ:
+					return EILSEQ;
 				case _MAPPER_CONVERT_FATAL:
 					return EINVAL;
-				case _MAPPER_CONVERT_ILSEQ:
-					return EILSEQ;
 				}
 			}
 			break;
@@ -537,7 +540,7 @@
 			goto err;
 		}
 		/* convert the character */
-		ret = do_conv(is, sc, &csid, &idx);
+		ret = do_conv(is, sc, &csid, &idx, cv->cv_shared->ci_discard_ilseq);
 		if (ret) {
 			if (ret == E_NO_CORRESPONDING_CHAR) {
 				inval++;

==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/Makefile#6 (text+ko) ====

@@ -1,5 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2003/06/27 08:39:59 tshiozak Exp $
 
+.include <bsd.own.mk>
+
 SUBDIR=	csmapper \
 	esdb \
 	iconv

==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/iconv/Makefile#6 (text+ko) ====

@@ -3,4 +3,9 @@
 FILESDIR=	/usr/share/i18n/iconv
 FILES+=		iconv.dir
 
+.if !target(beforeinstall)
+beforeinstall:
+	mkdir -p ${FILESDIR}
+.endif
+
 .include <bsd.prog.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/Makefile#5 (text+ko) ====

@@ -1,6 +1,9 @@
 # FreeBSD
 
 SUBDIR=		tablegen
+SUBDIR+=	refgen
+SUBDIR+=	posix
+SUBDIR+=	gnu
 
 ENCODING=	ASCII
 
@@ -34,33 +37,65 @@
 ENCODING+=	CP1251
 ENCODING+=	CP866
 #ENCODING+=	CP949
-#ENCODING+=	GB18030
+ENCODING+=	GB18030
 ENCODING+=	GB2312
-#ENCODING+=	GBK
+ENCODING+=	GBK
 ENCODING+=	VISCII
-#ENCODING+=	KOI8-R
-#ENCODING+=	KOI8-U
+ENCODING+=	KOI8-R
+ENCODING+=	KOI8-U
 ENCODING+=	PT154
 ENCODING+=	SHIFT_JIS
 ENCODING+=	EUC-CN
-#ENCODING+=	EUC-JP
+ENCODING+=	EUC-JP
 #ENCODING+=	EUC-KR
 
 GEN_FWD?=	${.CURDIR}/tablegen/tablegen
 GEN_REV?=	${.CURDIR}/tablegen/tablegen -r
+REF_FWD?=	${.CURDIR}/refgen/refgen
+REF_REV?=	${.CURDIR}/refgen/refgen -r
 CMP?=		${.CURDIR}/tablegen/cmp.sh
 
-check: ${SUBDIR}
+make-ref: refgen
+	mkdir -p ref
+.for enc in ${ENCODING}
+	@echo "Generating ${enc} --> UTF-32 ..."
+	-@${REF_FWD} ${enc} >ref/${enc}
+	@echo "Generating UTF-32 --> ${enc} ..."
+	-@${REF_REV} ${enc} >ref/${enc}-rev
+.endfor
+
+check: tablegen
 	mkdir -p output
 .for enc in ${ENCODING}
 	@echo "Checking ${enc} --> UTF-32 ..."
-	@${GEN_FWD} ${enc} >output/${enc}
+	-@${GEN_FWD} ${enc} >output/${enc}
 	@${CMP} ref/${enc} output/${enc}
 	@echo "Checking UTF-32 --> ${enc} ..."
-	@${GEN_REV} ${enc} >output/${enc}-rev
+	-@${GEN_REV} ${enc} >output/${enc}-rev
 	@${CMP} ref/${enc}-rev output/${enc}-rev
 .endfor
 
+perftest: refgen tablegen
+.for enc in ${ENCODING}
+	@echo "Checking ${enc} --> UTF-32 ..."
+	@echo "GNU runtime:"
+	@/usr/bin/time -h ${REF_FWD} ${enc} >/dev/null
+	@echo "BSD runtime:"
+	@/usr/bin/time -h ${GEN_FWD} ${enc} >/dev/null
+	@echo "Checking UTF-32 --> ${enc} ..."
+	@echo "GNU runtime:"
+	@/usr/bin/time -h ${REF_REV} ${enc} >/dev/null
+	@echo "BSD runtime:"
+	@/usr/bin/time -h ${GEN_REV} ${enc} >/dev/null
+.endfor
+
+posixtest: posix
+	@${.CURDIR}/posix/posix
+
+gnutest: gnu
+
+test-everything: check perftest posixtest gnutest
+
 CLEANDIRS+=	output
 
 .include <bsd.prog.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/tablegen/tablegen.c#3 (text+ko) ====

@@ -24,15 +24,11 @@
  * SUCH DAMAGE.
  */
 
-#ifdef __FreeBSD__
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/endian.h>
 #include <sys/types.h>
-#else
-#include <stdint.h>
-#endif
 
 #include <err.h>
 #include <errno.h>
@@ -44,7 +40,8 @@
 
 extern char	*__progname;
 
-static const char	*optstr = "r";
+static const char	*optstr = "lr";
+bool			 lflag;
 bool			 rflag;
 
 static void		 do_rev(iconv_t cd);
@@ -52,13 +49,14 @@
 
 struct option long_options[] =
 {
+	{"long",	no_argument,	NULL,	'l'},
 	{"reverse",	no_argument,	NULL,	'r'},
 	{NULL,		no_argument,	NULL,	0}
 };
  
 static void
 usage(void) {
-	fprintf(stderr, "Usage: %s [-r] ENCODING\n", __progname);
+	fprintf(stderr, "Usage: %s [-lr] ENCODING\n", __progname);
 	exit(EXIT_FAILURE);
 }
 
@@ -106,6 +104,9 @@
 
 	while (((c = getopt_long(argc, argv, optstr, long_options, NULL)) != -1)) {
 		switch (c) {
+		case 'l':
+			lflag = true;
+			break;
 		case 'r':
 			rflag = true;
 			break;
@@ -160,7 +161,7 @@
 	char		*outbuf_;
 	const char	*inbuf_;
 
-	for (inbuf = 0; inbuf < 0x10000; inbuf += 1) {
+	for (inbuf = 0; inbuf < (lflag ? 0x100000 : 0x10000); inbuf += 1) {
 		inbytesleft = outbytesleft = 4;
 		CONVERT;
 	}
@@ -184,4 +185,11 @@
 		inbytesleft = 2;
 		CONVERT;
 	}
+	if (lflag) {
+		for (inbuf = 0x10000; inbuf < 0x100000; inbuf += 1) {
+			outbytesleft = 4;
+			inbytesleft = 3;
+			CONVERT;
+		}
+	}
 }

==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/Makefile#5 (text+ko) ====

@@ -1,3 +1,7 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
 SUBDIR=	iconv \
 	mkcsmapper \
 	mkesdb

==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/Makefile#7 (text+ko) ====

@@ -7,6 +7,7 @@
 MAN=		iconv.1
 
 WARNS?=		6
+BINDIR?=	/usr/bin
 
 LDADD+= -lcrypt -liconv
 DPADD+= ${LIBCRYPT} /usr/lib/libiconv.a

==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/iconv.1#6 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 20, 2008
+.Dd October 12, 2009
 .Dt ICONV 1
 .Os
 .Sh NAME
@@ -52,6 +52,7 @@
 .Op Ar file ...
 .Nm
 .Fl l
+.Op Fl l
 .Sh DESCRIPTION
 The
 .Nm
@@ -89,6 +90,9 @@
 and
 .Ar to_name
 are valid.
+If
+.Fl l
+is specified twice, it will print out all codesets names and aliass.
 .It Fl s
 Silent.
 By default,

==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/iconv.c#6 (text+ko) ====

@@ -32,6 +32,7 @@
 #include <errno.h>
 #include <langinfo.h>
 #include <locale.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,8 +42,8 @@
 
 static void usage(void) __unused;
 static int scmp(const void *, const void *);
-static void show_codesets(void);
-static void do_conv(FILE *, const char *, const char *, int, int);
+static void show_codesets(bool);
+static void do_conv(FILE *, const char *, const char *, bool, bool);
 
 static void
 usage(void)
@@ -51,7 +52,7 @@
 	    "Usage:\t%1$s [-cs] -f <from_code> -t <to_code> [file ...]\n"
 	    "\t%1$s -f <from_code> [-cs] [-t <to_code>] [file ...]\n"
 	    "\t%1$s -t <to_code> [-cs] [-f <from_code>] [file ...]\n"
-	    "\t%1$s -l\n", getprogname());
+	    "\t%1$s -l [-l]\n", getprogname());
 	exit(1);
 }
 
@@ -68,12 +69,12 @@
 }
 
 static void
-show_codesets(void)
+show_codesets(bool l)
 {
 	char **list;
 	size_t sz, i;
 
-	if (__iconv_get_list(&list, &sz))
+	if (__iconv_get_list(&list, &sz, l))
 		err(EXIT_FAILURE, "__iconv_get_list()");
 
 	qsort(list, sz, sizeof(char *), scmp);
@@ -87,8 +88,8 @@
 #define INBUFSIZE 1024
 #define OUTBUFSIZE (INBUFSIZE * 2)
 static void
-do_conv(FILE *fp, const char *from, const char *to, int silent,
-    int hide_invalid)
+do_conv(FILE *fp, const char *from, const char *to, bool silent,
+    bool hide_invalid)
 {
 	char inbuf[INBUFSIZE], outbuf[OUTBUFSIZE], *out;
 	const char *in;
@@ -163,25 +164,25 @@
 int
 main(int argc, char **argv)
 {
-	int ch, i;
-	int opt_l = 0, opt_s = 0, opt_c = 0;
+	int ch, i, opt_l = 0;
+	bool opt_s = false, opt_c = false;

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Mon Oct 12 13:03:51 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 32D221065679; Mon, 12 Oct 2009 13:03:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EB7C81065670
	for <perforce@freebsd.org>; Mon, 12 Oct 2009 13:03:50 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D8C968FC0C
	for <perforce@freebsd.org>; Mon, 12 Oct 2009 13:03:50 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9CD3oGM022397
	for <perforce@freebsd.org>; Mon, 12 Oct 2009 13:03:50 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9CD3ou2022395
	for perforce@freebsd.org; Mon, 12 Oct 2009 13:03:50 GMT
	(envelope-from gabor@freebsd.org)
Date: Mon, 12 Oct 2009 13:03:50 GMT
Message-Id: <200910121303.n9CD3ou2022395@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169423 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2009 13:03:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=169423

Change 169423 by gabor@gabor_aspire on 2009/10/12 13:03:00

	MFHg:
		- Follow-up to previous change adding new files

Affected files ...

.. //depot/projects/soc2009/gabor_iconv/extracted/Makefile#1 add
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/iconvctl.3#1 add
.. //depot/projects/soc2009/gabor_iconv/extracted/share/Makefile#1 add
.. //depot/projects/soc2009/gabor_iconv/extracted/share/man/Makefile#1 add
.. //depot/projects/soc2009/gabor_iconv/extracted/share/man/man5/Makefile#1 add
.. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/gnu/Makefile#1 add
.. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/gnu/gnu.c#1 add
.. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/posix/Makefile#1 add
.. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/posix/posix.c#1 add
.. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/refgen/Makefile#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Mon Oct 12 20:35:06 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1B2A9106568B; Mon, 12 Oct 2009 20:35:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D3E061065676
	for <perforce@freebsd.org>; Mon, 12 Oct 2009 20:35:05 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B841A8FC0A
	for <perforce@freebsd.org>; Mon, 12 Oct 2009 20:35:05 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9CKZ5EW078014
	for <perforce@freebsd.org>; Mon, 12 Oct 2009 20:35:05 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9CKZ5xo078012
	for perforce@freebsd.org; Mon, 12 Oct 2009 20:35:05 GMT
	(envelope-from mav@freebsd.org)
Date: Mon, 12 Oct 2009 20:35:05 GMT
Message-Id: <200910122035.n9CKZ5xo078012@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169438 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2009 20:35:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=169438

Change 169438 by mav@mav_mavtest on 2009/10/12 20:34:35

	Freeze devices CCB queues on errors. Previos approach with just SIM
	freeze is not enough for proper recovery, as it dropped just before
	recovery, not after, creating window for another request to run before.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#67 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#30 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#67 (text+ko) ====

@@ -987,12 +987,14 @@
 	}
 	/* On error, complete the rest of commands with error statuses. */
 	if (err) {
-		if (!ch->readlog)
-			xpt_freeze_simq(ch->sim, ch->numrslots);
 		if (ch->frozen) {
 			union ccb *fccb = ch->frozen;
 			ch->frozen = NULL;
 			fccb->ccb_h.status = CAM_REQUEUE_REQ | CAM_RELEASE_SIMQ;
+			if (!(fccb->ccb_h.status & CAM_DEV_QFRZN)) {
+				xpt_freeze_devq(fccb->ccb_h.path, 1);
+				fccb->ccb_h.status |= CAM_DEV_QFRZN;
+			}
 			xpt_done(fccb);
 		}
 		for (i = 0; i < ch->numslots; i++) {
@@ -1125,8 +1127,6 @@
 
 	if (error) {
 		device_printf(slot->dev, "DMA load error\n");
-		if (!ch->readlog)
-			xpt_freeze_simq(ch->sim, 1);
 		ahci_end_transaction(slot, AHCI_ERR_INVALID);
 		return;
 	}
@@ -1165,8 +1165,6 @@
 	/* Setup the FIS for this request */
 	if (!(fis_size = ahci_setup_fis(ctp, ccb, slot->slot))) {
 		device_printf(ch->dev, "Setting up SATA FIS failed\n");
-		if (!ch->readlog)
-			xpt_freeze_simq(ch->sim, 1);
 		ahci_end_transaction(slot, AHCI_ERR_INVALID);
 		return;
 	}
@@ -1233,7 +1231,6 @@
 			/* Kick controller into sane state */
 			ahci_stop(ch->dev);
 			ahci_start(ch->dev);
-			xpt_freeze_simq(ch->sim, 1);
 		}
 		ahci_end_transaction(slot, et);
 		return;
@@ -1266,13 +1263,15 @@
 	ahci_stop(ch->dev);
 	ahci_start(ch->dev);
 
-	if (!ch->readlog)
-		xpt_freeze_simq(ch->sim, ch->numrslots);
 	/* Handle frozen command. */
 	if (ch->frozen) {
 		union ccb *fccb = ch->frozen;
 		ch->frozen = NULL;
 		fccb->ccb_h.status = CAM_REQUEUE_REQ | CAM_RELEASE_SIMQ;
+		if (!(fccb->ccb_h.status & CAM_DEV_QFRZN)) {
+			xpt_freeze_devq(fccb->ccb_h.path, 1);
+			fccb->ccb_h.status |= CAM_DEV_QFRZN;
+		}
 		xpt_done(fccb);
 	}
 	/* Handle command with timeout. */
@@ -1330,10 +1329,14 @@
 		    BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(ch->dma.data_tag, slot->dma.data_map);
 	}
+	/* In case of error, freeze device for proper recovery. */
+	if ((et != AHCI_ERR_NONE) && (!ch->readlog) &&
+	    !(ccb->ccb_h.status & CAM_DEV_QFRZN)) {
+		xpt_freeze_devq(ccb->ccb_h.path, 1);
+		ccb->ccb_h.status |= CAM_DEV_QFRZN;
+	}
 	/* Set proper result status. */
 	ccb->ccb_h.status &= ~CAM_STATUS_MASK;
-	if (et != AHCI_ERR_NONE)
-		ccb->ccb_h.status |= CAM_RELEASE_SIMQ;
 	switch (et) {
 	case AHCI_ERR_NONE:
 		ccb->ccb_h.status |= CAM_REQ_CMP;
@@ -1347,6 +1350,7 @@
 		ccb->ccb_h.status |= CAM_REQUEUE_REQ;
 		break;
 	case AHCI_ERR_TFE:
+	case AHCI_ERR_NCQ:
 		if (ccb->ccb_h.func_code == XPT_SCSI_IO) {
 			ccb->ccb_h.status |= CAM_SCSI_STATUS_ERROR;
 			ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND;
@@ -1355,13 +1359,19 @@
 		}
 		break;
 	case AHCI_ERR_SATA:
-			ccb->ccb_h.status |= CAM_UNCOR_PARITY;
+		if (!ch->readlog) {
+			xpt_freeze_simq(ch->sim, 1);
+			ccb->ccb_h.status |= CAM_RELEASE_SIMQ;
+		}
+		ccb->ccb_h.status |= CAM_UNCOR_PARITY;
 		break;
 	case AHCI_ERR_TIMEOUT:
+		if (!ch->readlog) {
+			xpt_freeze_simq(ch->sim, 1);
+			ccb->ccb_h.status |= CAM_RELEASE_SIMQ;
+		}
 		ccb->ccb_h.status |= CAM_CMD_TIMEOUT;
 		break;
-	case AHCI_ERR_NCQ:
-		ccb->ccb_h.status |= CAM_ATA_STATUS_ERROR;
 	default:
 		ccb->ccb_h.status |= CAM_REQ_CMP_ERR;
 	}
@@ -1445,7 +1455,8 @@
 	ataio->cmd.lba_low = 0x10;
 	ataio->cmd.lba_mid = 0;
 	ataio->cmd.lba_mid_exp = 0;
-	
+	/* Freeze SIM while doing READ LOG EXT. */
+	xpt_freeze_simq(ch->sim, 1);
 	ahci_begin_transaction(dev, ccb);
 }
 
@@ -1500,6 +1511,7 @@
 	}
 	free(ccb->ataio.data_ptr, M_AHCI);
 	xpt_free_ccb(ccb);
+	xpt_release_simq(ch->sim, TRUE);
 }
 
 static void
@@ -1624,12 +1636,15 @@
 
 	if (bootverbose)
 		device_printf(dev, "AHCI reset...\n");
-	xpt_freeze_simq(ch->sim, ch->numrslots);
 	/* Requeue freezed command. */
 	if (ch->frozen) {
 		union ccb *fccb = ch->frozen;
 		ch->frozen = NULL;
 		fccb->ccb_h.status = CAM_REQUEUE_REQ | CAM_RELEASE_SIMQ;
+		if (!(fccb->ccb_h.status & CAM_DEV_QFRZN)) {
+			xpt_freeze_devq(fccb->ccb_h.path, 1);
+			fccb->ccb_h.status |= CAM_DEV_QFRZN;
+		}
 		xpt_done(fccb);
 	}
 	/* Kill the engine and requeue all running commands. */
@@ -1641,6 +1656,8 @@
 		/* XXX; Commands in loading state. */
 		ahci_end_transaction(&ch->slot[i], AHCI_ERR_INNOCENT);
 	}
+	/* Tell the XPT about the event */
+	xpt_async(AC_BUS_RESET, ch->path, NULL);
 	/* Disable port interrupts */
 	ATA_OUTL(ch->r_mem, AHCI_P_IE, 0);
 	/* Reset and reconnect PHY, */
@@ -1670,8 +1687,6 @@
 	      AHCI_P_IX_DS | AHCI_P_IX_PS | (ctlr->ccc ? 0 : AHCI_P_IX_DHR)));
 	if (bootverbose)
 		device_printf(dev, "AHCI reset done: device found\n");
-	/* Tell the XPT about the event */
-	xpt_async(AC_BUS_RESET, ch->path, NULL);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#30 (text+ko) ====

@@ -1299,9 +1299,11 @@
 	union ccb *ccb = request->ccb;
 
 	ccb->ccb_h.status &= ~CAM_STATUS_MASK;
-	if (request->flags & ATA_R_TIMEOUT)
-			ccb->ccb_h.status |= CAM_CMD_TIMEOUT;
-	else if (request->status & ATA_S_ERROR) {
+	if (request->flags & ATA_R_TIMEOUT) {
+		xpt_freeze_simq(ch->sim, 1);
+		ccb->ccb_h.status &= ~CAM_STATUS_MASK;
+		ccb->ccb_h.status |= CAM_CMD_TIMEOUT | CAM_RELEASE_SIMQ;
+	} else if (request->status & ATA_S_ERROR) {
 		if (ccb->ccb_h.func_code == XPT_ATA_IO) {
 			ccb->ccb_h.status |= CAM_ATA_STATUS_ERROR;
 		} else {
@@ -1314,9 +1316,10 @@
 		ccb->ccb_h.status |= CAM_REQ_CMP_ERR;
 	else
 		ccb->ccb_h.status |= CAM_REQ_CMP;
-	if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
-		xpt_freeze_simq(ch->sim, 1);
-		ccb->ccb_h.status |= CAM_RELEASE_SIMQ;
+	if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP &&
+	    !(ccb->ccb_h.status & CAM_DEV_QFRZN)) {
+		xpt_freeze_devq(ccb->ccb_h.path, 1);
+		ccb->ccb_h.status |= CAM_DEV_QFRZN;
 	}
 	if (ccb->ccb_h.func_code == XPT_ATA_IO &&
 	    ((request->status & ATA_S_ERROR) ||

From owner-p4-projects@FreeBSD.ORG  Mon Oct 12 20:44:16 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E79A4106568F; Mon, 12 Oct 2009 20:44:15 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB863106566B
	for <perforce@FreeBSD.org>; Mon, 12 Oct 2009 20:44:15 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B2C38FC0A
	for <perforce@FreeBSD.org>; Mon, 12 Oct 2009 20:44:15 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9CKiFbT078688
	for <perforce@FreeBSD.org>; Mon, 12 Oct 2009 20:44:15 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9CKiFQC078686
	for perforce@freebsd.org; Mon, 12 Oct 2009 20:44:15 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Mon, 12 Oct 2009 20:44:15 GMT
Message-Id: <200910122044.n9CKiFQC078686@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi <truncs@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169439 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2009 20:44:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=169439

Change 169439 by truncs@aditya on 2009/10/12 20:43:31

	Add mutex for protecting the mount struct and fs.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_mount.h#3 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_mount.h#3 (text+ko) ====

@@ -54,10 +54,16 @@
 	u_long	um_bptrtodb;			/* indir ptr to disk block */
 	u_long	um_seqinc;			/* inc between seq blocks */
 
+	struct mtx um_lock;			/* Protects ext2mount & fs */
+
 	struct g_consumer *um_cp;
 	struct bufobj *um_bo;
 };
 
+#define EXT2_LOCK(aa)	mtx_lock(&(aa)->um_lock)
+#define EXT2_UNLOCK(aa)	mtx_unlock(&(aa)->um_lock)
+#define EXT2_MTX(aa)	(&(aa)->um_lock)
+
 /* Convert mount ptr to ext2fsmount ptr. */
 #define VFSTOEXT2(mp)	((struct ext2mount *)((mp)->mnt_data))
 

From owner-p4-projects@FreeBSD.ORG  Mon Oct 12 20:48:20 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ADA891065676; Mon, 12 Oct 2009 20:48:20 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 724CB1065670
	for <perforce@FreeBSD.org>; Mon, 12 Oct 2009 20:48:20 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6202E8FC19
	for <perforce@FreeBSD.org>; Mon, 12 Oct 2009 20:48:20 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9CKmKIq089196
	for <perforce@FreeBSD.org>; Mon, 12 Oct 2009 20:48:20 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9CKmKwU089194
	for perforce@freebsd.org; Mon, 12 Oct 2009 20:48:20 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Mon, 12 Oct 2009 20:48:20 GMT
Message-Id: <200910122048.n9CKmKwU089194@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi <truncs@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169440 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2009 20:48:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=169440

Change 169440 by truncs@aditya on 2009/10/12 20:47:44

	Fix indentation.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_mount.h#4 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_mount.h#4 (text+ko) ====

@@ -60,9 +60,9 @@
 	struct bufobj *um_bo;
 };
 
-#define EXT2_LOCK(aa)	mtx_lock(&(aa)->um_lock)
-#define EXT2_UNLOCK(aa)	mtx_unlock(&(aa)->um_lock)
-#define EXT2_MTX(aa)	(&(aa)->um_lock)
+#define EXT2_LOCK(aa)		mtx_lock(&(aa)->um_lock)
+#define EXT2_UNLOCK(aa)		mtx_unlock(&(aa)->um_lock)
+#define EXT2_MTX(aa)		(&(aa)->um_lock)
 
 /* Convert mount ptr to ext2fsmount ptr. */
 #define VFSTOEXT2(mp)	((struct ext2mount *)((mp)->mnt_data))

From owner-p4-projects@FreeBSD.ORG  Mon Oct 12 22:14:55 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2BB691065676; Mon, 12 Oct 2009 22:14:55 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C9E081065670
	for <perforce@FreeBSD.org>; Mon, 12 Oct 2009 22:14:54 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B81D88FC1F
	for <perforce@FreeBSD.org>; Mon, 12 Oct 2009 22:14:54 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9CMEsU9097257
	for <perforce@FreeBSD.org>; Mon, 12 Oct 2009 22:14:54 GMT
	(envelope-from gk@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9CMEsTS097255
	for perforce@freebsd.org; Mon, 12 Oct 2009 22:14:54 GMT
	(envelope-from gk@FreeBSD.org)
Date: Mon, 12 Oct 2009 22:14:54 GMT
Message-Id: <200910122214.n9CMEsTS097255@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gk@FreeBSD.org using -f
From: Gleb Kurtsou <gk@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169442 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2009 22:14:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=169442

Change 169442 by gk@gk_h1 on 2009/10/12 22:14:48

	implement dircache (enabled by default)
	rename node hash routines

Affected files ...

.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#15 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#15 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_dircache.c#1 add
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_dircache.h#1 add
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#16 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#22 edit
.. //depot/projects/soc2009/gk_pefs/sys/modules/pefs/Makefile#8 edit

Differences ...

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#15 (text+ko) ====

@@ -36,6 +36,7 @@
 #define PEFS_KEY_SIZE			(PEFS_KEY_BITS / 8)
 #define PEFS_KEYID_SIZE			8
 #define PEFS_NAME_CSUM_SIZE		8
+#define PEFS_NAME_BLOCK_SIZE		16
 
 struct pefs_xkey {
 	uint32_t pxk_index;
@@ -60,6 +61,8 @@
 
 struct pefs_alg;
 struct pefs_ctx;
+struct pefs_dircache;
+struct vfsconf;
 
 TAILQ_HEAD(pefs_key_head, pefs_key);
 
@@ -91,6 +94,7 @@
 	struct vnode *pn_lowervp;	/* VREFed once */
 	struct vnode *pn_lowervp_dead;	/* VREFed once */
 	struct vnode *pn_vnode;		/* Back pointer */
+	struct pefs_dircache *pn_dircache;
 	void *pn_buf_small;
 	void *pn_buf_large;
 	int pn_flags;
@@ -165,10 +169,6 @@
 		return (&pn->pn_buf_large);
 }
 
-struct vfsconf;
-struct vop_generic_args;
-struct pefs_ctx;
-
 int pefs_init(struct vfsconf *vfsp);
 int pefs_uninit(struct vfsconf *vfsp);
 void pefs_crypto_init(void);
@@ -252,8 +252,27 @@
 	    pefs_rootkey(VFS_TO_PEFS(vp->v_mount)) == NULL);
 }
 
+static inline uint32_t
+pefs_hash_mixptr(void *ptr)
+{
+	uintptr_t h = (uintptr_t)ptr;
+
+	h = (~h) + (h << 18);
+	h = h ^ (h >> 31);
+	h = h * 21;
+	h = h ^ (h >> 11);
+	h = h + (h << 6);
+	h = h ^ (h >> 22);
+	return (h);
+}
+
+#ifdef SYSCTL_DECL
+SYSCTL_DECL(_vfs_pefs);
+#endif
+
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_PEFSBUF);
+MALLOC_DECLARE(M_PEFSHASH);
 #endif
 
 #ifdef PEFS_DEBUG

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#15 (text+ko) ====

@@ -49,7 +49,6 @@
 #include <fs/pefs/vmac.h>
 
 #define PEFS_CTR_BLOCK_SIZE		16
-#define PEFS_NAME_BLOCK_SIZE		16
 
 CTASSERT(PEFS_KEY_SIZE <= SHA512_DIGEST_LENGTH);
 CTASSERT(PEFS_TWEAK_SIZE == 64/8);

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#16 (text+ko) ====

@@ -71,13 +71,15 @@
 #include <sys/queue.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
+#include <sys/sx.h>
 #include <sys/uio.h>
 #include <sys/taskqueue.h>
 #include <sys/vnode.h>
 
 #include <fs/pefs/pefs.h>
+#include <fs/pefs/pefs_dircache.h>
 
-static SYSCTL_NODE(_vfs, OID_AUTO, pefs, CTLFLAG_RW, 0, "PEFS filesystem");
+SYSCTL_NODE(_vfs, OID_AUTO, pefs, CTLFLAG_RW, 0, "PEFS filesystem");
 
 typedef int (pefs_node_init_fn)(struct mount *mp, struct pefs_node *pn,
     void *context);
@@ -91,10 +93,10 @@
 static struct mtx pefs_node_listmtx;
 
 static struct pefs_node_listhead pefs_node_freelist;
-static struct pefs_node_listhead *pefs_node_hashtbl;
-static u_long pefs_node_hashmask;
+static struct pefs_node_listhead *pefs_nodehash_tbl;
+static u_long pefs_nodehash_mask;
 
-static MALLOC_DEFINE(M_PEFSHASH, "pefs_hash", "PEFS hash table");
+MALLOC_DEFINE(M_PEFSHASH, "pefs_hash", "PEFS hash table");
 MALLOC_DEFINE(M_PEFSBUF, "pefs_buf", "PEFS buffers");
 
 static uma_zone_t pefs_node_zone;
@@ -121,11 +123,12 @@
 	pefs_node_zone = uma_zcreate("pefs_node", sizeof(struct pefs_node),
 	    NULL, NULL, NULL, (uma_fini) bzero, UMA_ALIGN_PTR, 0);
 
-	pefs_node_hashtbl = hashinit(desiredvnodes / 8, M_PEFSHASH,
-	    &pefs_node_hashmask);
+	pefs_nodehash_tbl = hashinit(desiredvnodes / 8, M_PEFSHASH,
+	    &pefs_nodehash_mask);
 	pefs_nodes = 0;
 	mtx_init(&pefs_node_listmtx, "pefs_node_list", NULL, MTX_DEF);
 
+	pefs_dircache_init();
 	pefs_crypto_init();
 
 	return (0);
@@ -137,26 +140,21 @@
 	taskqueue_enqueue(pefs_taskq, &pefs_task_freenode);
 	taskqueue_drain(pefs_taskq, &pefs_task_freenode);
 	taskqueue_free(pefs_taskq);
+	pefs_dircache_uninit();
 	pefs_crypto_uninit();
 	mtx_destroy(&pefs_node_listmtx);
-	free(pefs_node_hashtbl, M_PEFSHASH);
+	free(pefs_nodehash_tbl, M_PEFSHASH);
 	uma_zdestroy(pefs_node_zone);
 	return (0);
 }
 
 static inline struct pefs_node_listhead *
-pefs_node_hashlookup(struct vnode *vp)
+pefs_nodehash_gethead(struct vnode *vp)
 {
-	uintptr_t v = (uintptr_t)vp;
+	uint32_t v;
 
-	v = (~v) + (v << 18);
-	v = v ^ (v >> 31);
-	v = v * 21;
-	v = v ^ (v >> 11);
-	v = v + (v << 6);
-	v = v ^ (v >> 22);
-
-	return (&pefs_node_hashtbl[v & pefs_node_hashmask]);
+	v = pefs_hash_mixptr(vp);
+	return (&pefs_nodehash_tbl[v & pefs_nodehash_mask]);
 }
 
 /*
@@ -164,13 +162,13 @@
  * Lower vnode should be locked on entry and will be left locked on exit.
  */
 static struct vnode *
-pefs_hashget(struct mount *mp, struct vnode *lowervp)
+pefs_nodehash_get(struct mount *mp, struct vnode *lowervp)
 {
 	struct pefs_node_listhead *hd;
 	struct pefs_node *a;
 	struct vnode *vp;
 
-	ASSERT_VOP_LOCKED(lowervp, "pefs_hashget");
+	ASSERT_VOP_LOCKED(lowervp, "pefs_nodehash_get");
 
 	/*
 	 * Find hash base, and then search the (two-way) linked
@@ -178,7 +176,7 @@
 	 * the lower vnode.  If found, the increment the pefs_node
 	 * reference count (but NOT the lower vnode's VREF counter).
 	 */
-	hd = pefs_node_hashlookup(lowervp);
+	hd = pefs_nodehash_gethead(lowervp);
 	mtx_lock(&pefs_node_listmtx);
 	LIST_FOREACH(a, hd, pn_listentry) {
 		if (a->pn_lowervp == lowervp && PN_TO_VP(a)->v_mount == mp) {
@@ -199,23 +197,23 @@
 }
 
 /*
- * Act like pefs_hashget, but add passed pefs_node to hash if no existing
+ * Act like pefs_nodehash_get, but add passed pefs_node to hash if no existing
  * node found.
  */
 static struct vnode *
-pefs_hashins(struct mount *mp, struct pefs_node *pn)
+pefs_nodehash_insert(struct mount *mp, struct pefs_node *pn)
 {
 	struct pefs_node_listhead *hd;
 	struct pefs_node *oxp;
 	struct vnode *ovp;
 
-	hd = pefs_node_hashlookup(pn->pn_lowervp);
+	hd = pefs_nodehash_gethead(pn->pn_lowervp);
 	mtx_lock(&pefs_node_listmtx);
 	LIST_FOREACH(oxp, hd, pn_listentry) {
 		if (oxp->pn_lowervp == pn->pn_lowervp &&
 		    PN_TO_VP(oxp)->v_mount == mp) {
 			/*
-			 * See pefs_hashget for a description of this
+			 * See pefs_nodehash_get for a description of this
 			 * operation.
 			 */
 			ovp = PN_TO_VP(oxp);
@@ -370,8 +368,8 @@
  * ldvp is the lower directory vnode, used if no key specified
  *
  * The lvp assumed to be locked and having "spare" reference. This routine
- * vrele lvp if pefs node was taken from hash. Otherwise it "transfers"
- * the caller's "spare" reference to created pefs vnode.
+ * vrele lvp if pefs node was taken from hash. Otherwise it "transfers" the
+ * caller's "spare" reference to created pefs vnode.
  */
 static int
 pefs_node_get(struct mount *mp, struct vnode *lvp, struct vnode **vpp,
@@ -382,7 +380,7 @@
 	int error;
 
 	/* Lookup the hash firstly */
-	*vpp = pefs_hashget(mp, lvp);
+	*vpp = pefs_nodehash_get(mp, lvp);
 	if (*vpp != NULL) {
 		vrele(lvp);
 		return (0);
@@ -437,7 +435,7 @@
 	 * Atomically insert our new node into the hash or vget existing
 	 * if someone else has beaten us to it.
 	 */
-	*vpp = pefs_hashins(mp, pn);
+	*vpp = pefs_nodehash_insert(mp, pn);
 	if (*vpp != NULL) {
 		vrele(lvp);
 		vp->v_vnlock = &vp->v_lock;
@@ -445,6 +443,8 @@
 		vrele(vp);
 		return (0);
 	}
+	if (vp->v_type == VDIR)
+		pn->pn_dircache = pefs_dircache_get();
 	*vpp = vp;
 
 	return (0);
@@ -512,6 +512,7 @@
 {
 	PEFSDEBUG("pefs_node_asyncfree: free node %p\n", pn);
 	pefs_key_release(pn->pn_tkey.ptk_key);
+	pefs_dircache_free(pn->pn_dircache);
 	mtx_lock(&pefs_node_listmtx);
 	pefs_nodes--;
 	LIST_REMOVE(pn, pn_listentry);

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#22 (text+ko) ====

@@ -72,6 +72,7 @@
 #include <sys/namei.h>
 #include <sys/sf_buf.h>
 #include <sys/sysctl.h>
+#include <sys/sx.h>
 #include <sys/vnode.h>
 #include <sys/dirent.h>
 #include <sys/limits.h>
@@ -86,6 +87,7 @@
 #include <vm/vnode_pager.h>
 
 #include <fs/pefs/pefs.h>
+#include <fs/pefs/pefs_dircache.h>
 
 #define DIRENT_MINSIZE (sizeof(struct dirent) - (MAXNAMLEN + 1))
 #define DIRENT_MAXSIZE (sizeof(struct dirent))
@@ -96,6 +98,43 @@
 	struct pefs_tkey pec_tkey;
 };
 
+static inline u_long
+pefs_getgen(struct vnode *vp, struct ucred *cred)
+{
+	struct vattr va;
+	int error;
+
+	error = VOP_GETATTR(PEFS_LOWERVP(vp), &va, cred);
+	if (error != 0)
+		return (0);
+
+	return (va.va_gen);
+}
+
+static struct pefs_dircache_entry *
+pefs_cache_dirent(struct pefs_dircache *pd, struct dirent *de,
+    struct pefs_ctx *ctx, struct pefs_key *pk)
+{
+	struct pefs_dircache_entry *cache;
+	struct pefs_tkey ptk;
+	char buf[MAXNAMLEN + 1];
+	int name_len;
+
+	cache = pefs_dircache_enclookup(pd, de->d_name, de->d_namlen);
+	if (cache != NULL) {
+		pefs_dircache_update(cache);
+	} else {
+		name_len = pefs_name_decrypt(ctx, pk, &ptk,
+		    de->d_name, de->d_namlen, buf, sizeof(buf));
+		if (name_len <= 0)
+			return (NULL);
+		cache = pefs_dircache_insert(pd, &ptk,
+		    buf, name_len, de->d_name, de->d_namlen);
+	}
+
+	return (cache);
+}
+
 static inline int
 pefs_name_skip(char *name, int namelen)
 {
@@ -205,17 +244,16 @@
 	return (error);
 }
 
-static struct dirent*
-pefs_enccn_lookup_dirent(struct pefs_key *pk, struct pefs_tkey *ptk,
-    void *mem, size_t sz, char *name, size_t namelen)
+static void
+pefs_enccn_parsedir(struct pefs_dircache *pd, struct pefs_ctx *ctx,
+    struct pefs_key *pk, void *mem, size_t sz, char *name, size_t name_len,
+    struct pefs_dircache_entry **retval)
 {
-	struct pefs_ctx *ctx;
+	struct pefs_dircache_entry *cache;
 	struct dirent *de;
-	char buf[MAXNAMLEN + 1];
-	int d_namelen;
 
-	PEFSDEBUG("pefs_enccn_lookup_dirent: lookup %.*s\n", (int)namelen, name);
-	ctx = pefs_ctx_get();
+	PEFSDEBUG("pefs_enccn_parsedir: lookup %.*s\n", (int)name_len, name);
+	cache = NULL;
 	for (de = (struct dirent*) mem; sz > DIRENT_MINSIZE;
 			sz -= de->d_reclen,
 			de = (struct dirent *)(((caddr_t)de) + de->d_reclen)) {
@@ -224,29 +262,29 @@
 			continue;
 		if (pefs_name_skip(de->d_name, de->d_namlen))
 			continue;
-		d_namelen = pefs_name_decrypt(ctx, pk, ptk, de->d_name,
-		    de->d_namlen, buf, sizeof(buf));
-		if (d_namelen == namelen && memcmp(name, buf, namelen) == 0) {
-			pefs_ctx_free(ctx);
-			return (de);
+
+		cache = pefs_cache_dirent(pd, de, ctx, pk);
+		if (cache != NULL && *retval == NULL &&
+		    cache->pde_namelen == name_len &&
+		    memcmp(name, cache->pde_name, name_len) == 0) {
+			*retval = cache;
 		}
 	}
-	pefs_ctx_free(ctx);
-	return (NULL);
 }
 
 static int
 pefs_enccn_lookup(struct pefs_enccn *pec, struct vnode *dvp,
     struct componentname *cnp)
 {
-	struct dirent *de;
 	struct uio *uio;
 	struct vnode *ldvp = PEFS_LOWERVP(dvp);
 	struct pefs_node *dpn = VP_TO_PN(dvp);
 	struct pefs_chunk pc;
+	struct pefs_ctx *ctx;
+	struct pefs_dircache_entry *cache;
 	struct pefs_key *dpn_key;
-	struct pefs_tkey ptk;
 	off_t offset;
+	u_long dgen;
 	int eofflag, error;
 
 	MPASS(pec != NULL && dvp != NULL && cnp != NULL);
@@ -261,13 +299,23 @@
 	PEFSDEBUG("pefs_enccn_lookup: name=%.*s op=%d\n",
 	    (int)cnp->cn_namelen, cnp->cn_nameptr, (int) cnp->cn_nameiop);
 
-	pefs_chunk_create(&pc, dpn, PAGE_SIZE);
+	error = 0;
+	dgen = pefs_getgen(dvp, cnp->cn_cred);
+	pefs_dircache_lock(dpn->pn_dircache);
+	if (pefs_dircache_enable &&
+	    pefs_dircache_valid(dpn->pn_dircache, dgen)) {
+		cache = pefs_dircache_lookup(dpn->pn_dircache,
+		    cnp->cn_nameptr, cnp->cn_namelen);
+		goto out;
+	}
+
 	offset = 0;
 	eofflag = 0;
-	error = 0;
-	de = NULL;
-	ptk.ptk_key = NULL;
+	cache = NULL;
+	ctx = pefs_ctx_get();
+	pefs_chunk_create(&pc, dpn, PAGE_SIZE);
 	dpn_key = pefs_node_key(dpn);
+	pefs_dircache_beginupdate(dpn->pn_dircache, dgen);
 	while (!eofflag) {
 		uio = pefs_chunk_uio(&pc, offset, UIO_READ);
 		error = VOP_READDIR(ldvp, uio, cnp->cn_cred, &eofflag,
@@ -277,23 +325,25 @@
 		offset = uio->uio_offset;
 
 		pefs_chunk_setsize(&pc, pc.pc_size - uio->uio_resid);
-		de = pefs_enccn_lookup_dirent(dpn_key, &ptk,
-		    pc.pc_base, pc.pc_size,
-		    cnp->cn_nameptr, cnp->cn_namelen);
-		if (de != NULL)
-			break;
+		pefs_enccn_parsedir(dpn->pn_dircache, ctx, dpn_key,
+		    pc.pc_base, pc.pc_size, cnp->cn_nameptr, cnp->cn_namelen,
+		    &cache);
 		pefs_chunk_restore(&pc);
 	}
+	pefs_dircache_endupdate(dpn->pn_dircache);
 
-	if (de != NULL && error == 0) {
-		pefs_enccn_set(pec, &ptk, de->d_name, de->d_namlen, cnp);
-	}
-
+	pefs_ctx_free(ctx);
 	pefs_key_release(dpn_key);
 	pefs_chunk_free(&pc, dpn);
+out:
+	if (cache != NULL && error == 0)
+		pefs_enccn_set(pec, &cache->pde_tkey,
+		    cache->pde_encname, cache->pde_encnamelen, cnp);
+	else if (cache == NULL && error == 0)
+		error = ENOENT;
+
+	pefs_dircache_unlock(dpn->pn_dircache);
 
-	if (de == NULL && error == 0)
-		return (ENOENT);
 	return (error);
 }
 
@@ -1132,15 +1182,13 @@
 }
 
 static void
-pefs_readdir_decrypt(struct pefs_key *pk, int dflags, void *mem, size_t *psize)
+pefs_readdir_decrypt(struct pefs_dircache *pd, struct pefs_ctx *ctx,
+    struct pefs_key *pk, int dflags, void *mem, size_t *psize)
 {
-	struct pefs_ctx *ctx;
+	struct pefs_dircache_entry *cache;
 	struct dirent *de, *de_next;
-	char buf[MAXNAMLEN + 1];
 	size_t sz;
-	int d_namelen;
 
-	ctx = pefs_ctx_get();
 	for (de = (struct dirent*) mem, sz = *psize; sz > DIRENT_MINSIZE;
 	    de = de_next) {
 		MPASS(de->d_reclen <= sz);
@@ -1148,22 +1196,20 @@
 		de_next = (struct dirent *)(((caddr_t)de) + de->d_reclen);
 		if (de->d_type == DT_WHT)
 			continue;
-
 		if (pefs_name_skip(de->d_name, de->d_namlen))
 			continue;
-		d_namelen = pefs_name_decrypt(ctx, pk, NULL,
-		    de->d_name, de->d_namlen, buf, sizeof(buf));
-		if (d_namelen > 0) {
+		cache = pefs_cache_dirent(pd, de, ctx, pk);
+		if (cache != NULL) {
 			/* Do not change d_reclen */
-			strlcpy(de->d_name, buf, de->d_namlen + 1);
-			de->d_namlen = d_namelen;
+			MPASS(cache->pde_namelen <= de->d_namlen);
+			memcpy(de->d_name, cache->pde_name, cache->pde_namelen + 1);
+			de->d_namlen = cache->pde_encnamelen;
 		} else if (dflags & PN_HASKEY) {
 			*psize -= de->d_reclen;
 			memcpy(de, de_next, sz);
 			de_next = de;
 		}
 	}
-	pefs_ctx_free(ctx);
 }
 
 static int
@@ -1178,8 +1224,10 @@
 	struct pefs_node *pn = VP_TO_PN(vp);
 	struct pefs_key *pn_key;
 	struct pefs_chunk pc;
+	struct pefs_ctx *ctx;
+	size_t mem_size;
+	u_long gen;
 	int error;
-	size_t mem_size;
 	int r_ncookies = 0, r_ncookies_max = 0, ncookies = 0;
 	u_long *r_cookies = NULL, *cookies = NULL;
 	int *a_ncookies;
@@ -1199,8 +1247,14 @@
 		a_cookies = &cookies;
 	}
 
+	gen = pefs_getgen(vp, cred);
+	ctx = pefs_ctx_get();
 	pefs_chunk_create(&pc, pn, qmin(uio->uio_resid, DFLTPHYS));
 	pn_key = pefs_node_key(pn);
+	pefs_dircache_lock(pn->pn_dircache);
+	if (!pefs_dircache_valid(pn->pn_dircache, gen) && uio->uio_offset != 0)
+		gen = 0;
+	pefs_dircache_beginupdate(pn->pn_dircache, gen);
 	while (1) {
 		if (uio->uio_resid < pc.pc_size)
 			pefs_chunk_setsize(&pc, uio->uio_resid);
@@ -1214,7 +1268,9 @@
 			break;
 		pefs_chunk_setsize(&pc, pc.pc_size - puio->uio_resid);
 		mem_size = pc.pc_size;
-		pefs_readdir_decrypt(pn_key, pn->pn_flags,
+		if (!*eofflag)
+			pefs_dircache_abortupdate(pn->pn_dircache);
+		pefs_readdir_decrypt(pn->pn_dircache, ctx, pn_key, pn->pn_flags,
 		    pc.pc_base, &mem_size);
 		pefs_chunk_setsize(&pc, mem_size);
 		pefs_chunk_copy(&pc, uio);
@@ -1253,6 +1309,10 @@
 
 		pefs_chunk_restore(&pc);
 	}
+	if (*eofflag && error == 0)
+		pefs_dircache_endupdate(pn->pn_dircache);
+	else
+		pefs_dircache_abortupdate(pn->pn_dircache);
 
 	if (error == 0 && a_cookies != NULL) {
 		if (r_cookies != NULL) {
@@ -1264,6 +1324,8 @@
 		}
 	}
 
+	pefs_dircache_unlock(pn->pn_dircache);
+	pefs_ctx_free(ctx);
 	pefs_key_release(pn_key);
 	pefs_chunk_free(&pc, pn);
 

==== //depot/projects/soc2009/gk_pefs/sys/modules/pefs/Makefile#8 (text+ko) ====

@@ -5,6 +5,7 @@
 KMOD=	pefs
 SRCS=	vnode_if.h \
 	pefs_subr.c pefs_vfsops.c pefs_vnops.c pefs_xbase64.c pefs_crypto.c \
+	pefs_dircache.c \
 	pefs_hmac.c vmac.c
 DEBUG_FLAGS+= -g
 #DEBUG_FLAGS+= -DPEFS_DEBUG

From owner-p4-projects@FreeBSD.ORG  Tue Oct 13 00:24:16 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 76AD51065679; Tue, 13 Oct 2009 00:24:16 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A8B51065672
	for <perforce@FreeBSD.org>; Tue, 13 Oct 2009 00:24:16 +0000 (UTC)
	(envelope-from yohanes@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 291458FC0A
	for <perforce@FreeBSD.org>; Tue, 13 Oct 2009 00:24:16 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9D0OGqu008584
	for <perforce@FreeBSD.org>; Tue, 13 Oct 2009 00:24:16 GMT
	(envelope-from yohanes@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9D0OGZs008582
	for perforce@freebsd.org; Tue, 13 Oct 2009 00:24:16 GMT
	(envelope-from yohanes@FreeBSD.org)
Date: Tue, 13 Oct 2009 00:24:16 GMT
Message-Id: <200910130024.n9D0OGZs008582@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	yohanes@FreeBSD.org using -f
From: Yohanes Nugroho <yohanes@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169443 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Oct 2009 00:24:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=169443

Change 169443 by yohanes@econa on 2009/10/13 00:23:59

	dmamap sync

Affected files ...

.. //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#6 edit

Differences ...

==== //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#6 (text+ko) ====

@@ -67,8 +67,8 @@
 #include "miibus_if.h"
 
 
-#define ECE_MAX_TX_BUFFERS 256
-#define ECE_MAX_RX_BUFFERS 256
+#define ECE_MAX_TX_BUFFERS 128
+#define ECE_MAX_RX_BUFFERS 128
 
 
 #define MAX_FRAGMENT 32
@@ -99,11 +99,10 @@
 
 	struct callout tick_ch;		/* Tick callout */
 
-	bus_dmamap_t		dmamap_tx;
-	bus_dmamap_t		dmamap_rx;
+	bus_dmamap_t		dmamap_ring_tx;
+	bus_dmamap_t		dmamap_ring_rx;
 
 
-	bus_dmamap_t		sparemap_rx;
 
 
 	eth_tx_desc_t*	        desc_tx;
@@ -112,6 +111,10 @@
 	bus_dma_tag_t	dmatag_ring_tx;
 	bus_dma_tag_t	dmatag_ring_rx;
 
+	bus_dma_tag_t	dmatag_data_tx;
+	bus_dma_tag_t	dmatag_data_rx;
+
+
 	bus_addr_t		ring_paddr_tx;
 	bus_addr_t		ring_paddr_rx;
 	bus_dmamap_t		dmap_tx[ECE_MAX_TX_BUFFERS];
@@ -120,8 +123,6 @@
 	struct mbuf*		buffer_tx[ECE_MAX_TX_BUFFERS];
 	struct mbuf*		buffer_rx[ECE_MAX_RX_BUFFERS];
 
-	bus_dma_tag_t	dmatag_tx;
-	bus_dma_tag_t	dmatag_rx;
 
 
 	uint32_t	desc_curr_tx;
@@ -627,27 +628,27 @@
 	    sizeof(eth_tx_desc_t)*ECE_MAX_TX_BUFFERS, 1,		/* maxsize, nsegments */
 	    sizeof(eth_tx_desc_t)*ECE_MAX_TX_BUFFERS, 0,		/* maxsegsz, flags */
 	    NULL, NULL,				/* lockfunc, lockfuncarg */
-	    &sc->dmatag_tx);		/* dmat */
+	    &sc->dmatag_data_tx);		/* dmat */
 
 
-	error = bus_dmamem_alloc(sc->dmatag_tx,
+	error = bus_dmamem_alloc(sc->dmatag_data_tx,
 				 (void**)&(sc->desc_tx),
 				 BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_COHERENT,
-				 &(sc->dmamap_tx));
+				 &(sc->dmamap_ring_tx));
 	
 	if (error) {
 		if_printf(sc->ifp, "failed to allocate DMA memory\n");
 		return (ENXIO);
 	}
 
-	error = bus_dmamap_load(sc->dmatag_tx, sc->dmamap_tx,
+	error = bus_dmamap_load(sc->dmatag_data_tx, sc->dmamap_ring_tx,
 				sc->desc_tx, sizeof(eth_tx_desc_t)*ECE_MAX_TX_BUFFERS, ece_getaddr,
 				&(sc->ring_paddr_tx), BUS_DMA_NOWAIT);
 
 	if (error) {
 		if_printf(sc->ifp, "can't load descriptor\n");
-		bus_dmamem_free(sc->dmatag_tx, sc->desc_tx,
-				sc->dmamap_tx);
+		bus_dmamem_free(sc->dmatag_data_tx, sc->desc_tx,
+				sc->dmamap_ring_tx);
 		sc->desc_tx = NULL;
 		return (ENXIO);
 	}
@@ -699,17 +700,17 @@
 		}
 	}
 	
-	if (sc->dmamap_tx) {		
-		bus_dmamap_unload(sc->dmatag_tx, sc->dmamap_tx);
+	if (sc->dmamap_ring_tx) {		
+		bus_dmamap_unload(sc->dmatag_data_tx, sc->dmamap_ring_tx);
 		if (sc->desc_tx) {
-			bus_dmamem_free(sc->dmatag_tx, sc->desc_tx, sc->dmamap_tx);
+			bus_dmamem_free(sc->dmatag_data_tx, sc->desc_tx, sc->dmamap_ring_tx);
 		}
-		sc->dmamap_tx = 0;
+		sc->dmamap_ring_tx = 0;
 	}
 
-	if (sc->dmatag_tx) {
-		bus_dma_tag_destroy(sc->dmatag_tx);
-		sc->dmatag_tx = 0;
+	if (sc->dmatag_data_tx) {
+		bus_dma_tag_destroy(sc->dmatag_data_tx);
+		sc->dmatag_data_tx = 0;
 	}
 
 	if (sc->dmatag_ring_tx) {
@@ -744,27 +745,27 @@
 	    sizeof(eth_rx_desc_t)*ECE_MAX_RX_BUFFERS, 1,		/* maxsize, nsegments */
 	    sizeof(eth_rx_desc_t)*ECE_MAX_RX_BUFFERS, 0,		/* maxsegsz, flags */
 	    NULL, NULL,				/* lockfunc, lockfuncarg */
-	    &sc->dmatag_rx);		/* dmat */
+	    &sc->dmatag_data_rx);		/* dmat */
 
 
-	error = bus_dmamem_alloc(sc->dmatag_rx,
+	error = bus_dmamem_alloc(sc->dmatag_data_rx,
 				 (void**)&(sc->desc_rx),
 				 BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_COHERENT,
-				 &(sc->dmamap_rx));
+				 &(sc->dmamap_ring_rx));
 	
 	if (error) {
 		if_printf(sc->ifp, "failed to allocate DMA memory\n");
 		return (ENXIO);
 	}
 
-	error = bus_dmamap_load(sc->dmatag_rx, sc->dmamap_rx,
+	error = bus_dmamap_load(sc->dmatag_data_rx, sc->dmamap_ring_rx,
 				sc->desc_rx, sizeof(eth_rx_desc_t)*ECE_MAX_RX_BUFFERS, ece_getaddr,
 				&(sc->ring_paddr_rx), BUS_DMA_NOWAIT);
 
 	if (error) {
 		if_printf(sc->ifp, "can't load descriptor\n");
-		bus_dmamem_free(sc->dmatag_rx, sc->desc_rx,
-				sc->dmamap_rx);
+		bus_dmamem_free(sc->dmatag_data_rx, sc->desc_rx,
+				sc->dmamap_ring_rx);
 		sc->desc_rx = NULL;
 		return (ENXIO);
 	}
@@ -791,8 +792,6 @@
 	}
 	
 
-	error = bus_dmamap_create(sc->dmatag_ring_rx, 0, &sc->sparemap_rx);
-
 	for (int i =0; i<ECE_MAX_RX_BUFFERS; i++) {
 		error = bus_dmamap_create(sc->dmatag_ring_rx, 0, &sc->dmap_rx[i]);
 		if (error) {
@@ -820,13 +819,13 @@
 		}
 	}
 
-	if (sc->dmatag_rx) {
-		bus_dmamap_unload(sc->dmatag_rx, sc->dmamap_rx);
-		bus_dmamem_free(sc->dmatag_rx, sc->desc_rx,
-			sc->dmamap_rx);
-		bus_dma_tag_destroy(sc->dmatag_rx);
-		sc->dmatag_rx = 0;
-		sc->dmamap_rx = 0;
+	if (sc->dmatag_data_rx) {
+		bus_dmamap_unload(sc->dmatag_data_rx, sc->dmamap_ring_rx);
+		bus_dmamem_free(sc->dmatag_data_rx, sc->desc_rx,
+			sc->dmamap_ring_rx);
+		bus_dma_tag_destroy(sc->dmatag_data_rx);
+		sc->dmatag_data_rx = 0;
+		sc->dmamap_ring_rx = 0;
 		sc->desc_rx = 0;
 	}
 
@@ -928,7 +927,7 @@
 	for (i = 0; i < ECE_MAX_RX_BUFFERS; i++) {
 		descrx = (eth_rx_desc_t *)&(sc->desc_rx[i]);
 		memset(descrx, 0, sizeof(eth_rx_desc_t));
-		ece_new_rxbuf(sc->dmatag_ring_rx, &sc->sparemap_rx, 
+		ece_new_rxbuf(sc->dmatag_ring_rx, &sc->dmap_rx[i], 
 			      &(sc->buffer_rx[i]),
 			      (bus_addr_t *)&(descrx->data_ptr));
 		descrx->length = sc->buffer_rx[i]->m_len;
@@ -1580,6 +1579,11 @@
 		}
 	}
 
+	bus_dmamap_sync(sc->dmatag_ring_rx,
+	    sc->dmamap_ring_rx,
+	    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+
+
 	for (i= 0; i<rxcount; i++) {
 		/* Get status */
 		status = desc->cown;
@@ -1588,13 +1592,12 @@
 
 			int idx = sc->desc_curr_rx;
 
-			bus_dmamap_sync(sc->dmatag_rx, sc->dmap_rx[idx],
-					BUS_DMASYNC_PREREAD);
+			bus_dmamap_sync(sc->dmatag_data_rx, sc->dmap_rx[idx],
+					BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
 
 			mb = m_devget((void *)sc->buffer_rx[idx]->m_data,
 				      desc->length+16,
-				      0, ifp, NULL);
-			
+				      0, ifp, NULL);			
 
 			if (mb) {
 				mb->m_data += 2;
@@ -1628,6 +1631,10 @@
 			desc++;
 		}
 	}
+	bus_dmamap_sync(sc->dmatag_ring_rx,
+	    sc->dmamap_ring_rx,
+	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+
 	return;
 }
 
@@ -1701,6 +1708,10 @@
 	int start = sc->curr_tx_mbuf - 1;
 	if (start<0) start = ECE_MAX_TX_BUFFERS-1;
 	
+	bus_dmamap_sync(sc->dmatag_ring_tx,
+	    sc->dmamap_ring_tx,
+	    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+
 	desc_idx = sc->sent_position[start];
 	while (desc_idx!=-1) {
 		//bus_dmamap_sync(sc->dmatag_ring_tx, sc->dmap_tx[desc_idx],  BUS_DMASYNC_PREREAD);
@@ -1708,6 +1719,9 @@
 		if (desc->cown != 0) {
 			if (sc->buffer_tx[start]) {
 				//printf("freeing\n");
+				bus_dmamap_sync(sc->dmatag_data_tx, sc->dmap_tx[desc_idx],
+						BUS_DMASYNC_POSTWRITE);
+				bus_dmamap_unload(sc->dmatag_data_tx, sc->dmap_tx[desc_idx]);
 				m_freem(sc->buffer_tx[start]);
 				sc->buffer_tx[start] = 0;
 
@@ -1816,7 +1830,7 @@
        
 	/* Fetch unused map */
 	desc_no = sc->desc_curr_tx;
-	mapp = sc->dmamap_tx;
+	mapp = sc->dmap_tx[desc_no];
 	//cpu_dcache_wbinv_all();
 	/* Create mapping in DMA memory */
 	error = bus_dmamap_load_mbuf_sg(sc->dmatag_ring_tx, mapp, m0, segs, &nsegs,
@@ -1905,7 +1919,8 @@
 
 	}
 
-	bus_dmamap_sync(sc->dmatag_ring_tx, mapp,    BUS_DMASYNC_PREWRITE);
+	bus_dmamap_sync(sc->dmatag_data_tx, mapp,    BUS_DMASYNC_PREWRITE);
+
 
 	return (0);
 }
@@ -1928,6 +1943,10 @@
 	    IFF_DRV_RUNNING)
 		return;
 
+	bus_dmamap_sync(sc->dmatag_ring_tx,
+	    sc->dmamap_ring_tx,
+	    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+
 	//WR4(sc, TS_DMA_CONTROL, 0);
 	for (;;) {
 		/* Get packet from the queue */
@@ -1944,6 +1963,7 @@
 		BPF_MTAP(ifp, m0);
 	}
 	if (queued) {
+		bus_dmamap_sync(sc->dmatag_ring_tx, sc->dmamap_ring_tx,    BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
 		WR4(sc, TS_DMA_CONTROL, 1);
 	}
 }

From owner-p4-projects@FreeBSD.ORG  Tue Oct 13 07:42:14 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B1D6F1065676; Tue, 13 Oct 2009 07:42:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 765661065670
	for <perforce@freebsd.org>; Tue, 13 Oct 2009 07:42:14 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 49D0D8FC12
	for <perforce@freebsd.org>; Tue, 13 Oct 2009 07:42:14 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9D7gElE067209
	for <perforce@freebsd.org>; Tue, 13 Oct 2009 07:42:14 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9D7gEpX067207
	for perforce@freebsd.org; Tue, 13 Oct 2009 07:42:14 GMT
	(envelope-from mav@freebsd.org)
Date: Tue, 13 Oct 2009 07:42:14 GMT
Message-Id: <200910130742.n9D7gEpX067207@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169445 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Oct 2009 07:42:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=169445

Change 169445 by mav@mav_mavtest on 2009/10/13 07:42:01

	Freeze devices CCB queues on errors. Previos approach with just SIM
	freeze is not enough for proper recovery, as it dropped just before
	recovery, not after, creating window for another request to run between.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#8 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#8 (text+ko) ====

@@ -752,7 +752,12 @@
 		if (ch->frozen) {
 			union ccb *fccb = ch->frozen;
 			ch->frozen = NULL;
-			fccb->ccb_h.status = CAM_REQUEUE_REQ | CAM_RELEASE_SIMQ;
+			fccb->ccb_h.status &= ~CAM_STATUS_MASK;
+			fccb->ccb_h.status |= CAM_REQUEUE_REQ | CAM_RELEASE_SIMQ;
+			if (!(fccb->ccb_h.status & CAM_DEV_QFRZN)) {
+				xpt_freeze_devq(fccb->ccb_h.path, 1);
+				fccb->ccb_h.status |= CAM_DEV_QFRZN;
+			}
 			xpt_done(fccb);
 		}
 		if (estatus == SIIS_P_CMDERR_DEV ||
@@ -986,7 +991,12 @@
 	if (ch->frozen) {
 		union ccb *fccb = ch->frozen;
 		ch->frozen = NULL;
-		fccb->ccb_h.status = CAM_REQUEUE_REQ | CAM_RELEASE_SIMQ;
+		fccb->ccb_h.status &= ~CAM_STATUS_MASK;
+		fccb->ccb_h.status |= CAM_REQUEUE_REQ | CAM_RELEASE_SIMQ;
+		if (!(fccb->ccb_h.status & CAM_DEV_QFRZN)) {
+			xpt_freeze_devq(fccb->ccb_h.path, 1);
+			fccb->ccb_h.status |= CAM_DEV_QFRZN;
+		}
 		xpt_done(fccb);
 	}
 	/* Handle command with timeout. */
@@ -1044,11 +1054,17 @@
 		bus_dmamap_unload(ch->dma.data_tag, slot->dma.data_map);
 	}
 	/* Set proper result status. */
-	ccb->ccb_h.status &= ~CAM_STATUS_MASK;
 	if (et != SIIS_ERR_NONE || ch->recovery) {
 		ch->eslots |= (1 << slot->slot);
 		ccb->ccb_h.status |= CAM_RELEASE_SIMQ;
 	}
+	/* In case of error, freeze device for proper recovery. */
+	if (et != SIIS_ERR_NONE &&
+	    !(ccb->ccb_h.status & CAM_DEV_QFRZN)) {
+		xpt_freeze_devq(ccb->ccb_h.path, 1);
+		ccb->ccb_h.status |= CAM_DEV_QFRZN;
+	}
+	ccb->ccb_h.status &= ~CAM_STATUS_MASK;
 	switch (et) {
 	case SIIS_ERR_NONE:
 		ccb->ccb_h.status |= CAM_REQ_CMP;
@@ -1062,6 +1078,7 @@
 		ccb->ccb_h.status |= CAM_REQUEUE_REQ;
 		break;
 	case SIIS_ERR_TFE:
+	case SIIS_ERR_NCQ:
 		if (ccb->ccb_h.func_code == XPT_SCSI_IO) {
 			ccb->ccb_h.status |= CAM_SCSI_STATUS_ERROR;
 			ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND;
@@ -1075,9 +1092,6 @@
 	case SIIS_ERR_TIMEOUT:
 		ccb->ccb_h.status |= CAM_CMD_TIMEOUT;
 		break;
-	case SIIS_ERR_NCQ:
-		ccb->ccb_h.status |= CAM_ATA_STATUS_ERROR;
-		break;
 	default:
 		ccb->ccb_h.status |= CAM_REQ_CMP_ERR;
 	}
@@ -1281,7 +1295,12 @@
 	if (ch->frozen) {
 		union ccb *fccb = ch->frozen;
 		ch->frozen = NULL;
-		fccb->ccb_h.status = CAM_REQUEUE_REQ | CAM_RELEASE_SIMQ;
+		fccb->ccb_h.status &= ~CAM_STATUS_MASK;
+		fccb->ccb_h.status |= CAM_REQUEUE_REQ | CAM_RELEASE_SIMQ;
+		if (!(fccb->ccb_h.status & CAM_DEV_QFRZN)) {
+			xpt_freeze_devq(fccb->ccb_h.path, 1);
+			fccb->ccb_h.status |= CAM_DEV_QFRZN;
+		}
 		xpt_done(fccb);
 	}
 	/* Disable port interrupts */

From owner-p4-projects@FreeBSD.ORG  Tue Oct 13 09:13:55 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CC8451065672; Tue, 13 Oct 2009 09:13:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9103F106566B
	for <perforce@freebsd.org>; Tue, 13 Oct 2009 09:13:54 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7EBCE8FC0C
	for <perforce@freebsd.org>; Tue, 13 Oct 2009 09:13:54 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9D9DsbV085869
	for <perforce@freebsd.org>; Tue, 13 Oct 2009 09:13:54 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9D9DsMD085867
	for perforce@freebsd.org; Tue, 13 Oct 2009 09:13:54 GMT
	(envelope-from mav@freebsd.org)
Date: Tue, 13 Oct 2009 09:13:54 GMT
Message-Id: <200910130913.n9D9DsMD085867@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169446 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Oct 2009 09:13:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=169446

Change 169446 by mav@mav_mavtest on 2009/10/13 09:13:48

	Improve timeout handling to avoid false positives, when command
	with small timeout waiting one with bigger.
	Submitted by:	avg

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#68 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#23 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#68 (text+ko) ====

@@ -1236,7 +1236,7 @@
 		return;
 	}
 	/* Start command execution timeout */
-	callout_reset(&slot->timeout, (int)ccb->ccb_h.timeout * hz / 1000,
+	callout_reset(&slot->timeout, (int)ccb->ccb_h.timeout * hz / 2000,
 	    (timeout_t*)ahci_timeout, slot);
 	return;
 }
@@ -1247,11 +1247,28 @@
 {
 	device_t dev = slot->dev;
 	struct ahci_channel *ch = device_get_softc(dev);
+	uint32_t sstatus;
+	int ccs;
 	int i;
 
 	/* Check for stale timeout. */
-	if (slot->state != AHCI_SLOT_RUNNING)
+	if (slot->state < AHCI_SLOT_RUNNING)
+		return;
+
+	/* Check if slot was not being executed last time we checked. */
+	if (slot->state < AHCI_SLOT_EXECUTING) {
+		/* Check if slot started executing. */
+		sstatus = ATA_INL(ch->r_mem, AHCI_P_SACT);
+		ccs = (ATA_INL(ch->r_mem, AHCI_P_CMD) & AHCI_P_CMD_CCS_MASK)
+		    >> AHCI_P_CMD_CCS_SHIFT;
+		if ((sstatus & (1 << slot->slot)) != 0 || ccs == slot->slot)
+			slot->state = AHCI_SLOT_EXECUTING;
+
+		callout_reset(&slot->timeout,
+		    (int)slot->ccb->ccb_h.timeout * hz / 2000,
+		    (timeout_t*)ahci_timeout, slot);
 		return;
+	}
 
 	device_printf(dev, "Timeout on slot %d\n", slot->slot);
 device_printf(dev, "%s is %08x cs %08x ss %08x rs %08x tfd %02x serr %08x\n",

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#23 (text+ko) ====

@@ -328,7 +328,7 @@
 	AHCI_SLOT_EMPTY,
 	AHCI_SLOT_LOADING,
 	AHCI_SLOT_RUNNING,
-	AHCI_SLOT_WAITING
+	AHCI_SLOT_EXECUTING
 };
 
 struct ahci_slot {

From owner-p4-projects@FreeBSD.ORG  Tue Oct 13 20:32:17 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1A5DE1065679; Tue, 13 Oct 2009 20:32:17 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D33C91065670
	for <perforce@freebsd.org>; Tue, 13 Oct 2009 20:32:16 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A6EFF8FC1C
	for <perforce@freebsd.org>; Tue, 13 Oct 2009 20:32:16 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9DKWG8g066867
	for <perforce@freebsd.org>; Tue, 13 Oct 2009 20:32:16 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9DKWGpg066865
	for perforce@freebsd.org; Tue, 13 Oct 2009 20:32:16 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 13 Oct 2009 20:32:16 GMT
Message-Id: <200910132032.n9DKWGpg066865@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169466 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Oct 2009 20:32:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=169466

Change 169466 by rwatson@rwatson_freebsd_capabilities on 2009/10/13 20:31:45

	printf() size_t's using %zu to please 64-bit builds.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzsandbox.c#9 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzsandbox.c#9 (text+ko) ====

@@ -145,7 +145,7 @@
 	    fdarray, 2, &iov_rep, 1, &len, NULL, NULL) < 0)
 		err(-1, "lch_rpc_rights");
 	if (len != sizeof(rep))
-		errx(-1, "lch_rpc_rights len %d", len);
+		errx(-1, "lch_rpc_rights len %zu", len);
 	if (gsizep != NULL)
 		*gsizep = rep.hgc_rep_gsize;
 	close(fdarray[0]);
@@ -162,7 +162,7 @@
 	struct iovec iov;
 
 	if (len != sizeof(req))
-		err(-1, "sandbox_gz_compress_buffer: len %d", len);
+		err(-1, "sandbox_gz_compress_buffer: len %zu", len);
 
 	bcopy(buffer, &req, sizeof(req));
 	bzero(&rep, sizeof(rep));
@@ -226,7 +226,7 @@
 	    fdarray, 2, &iov_rep, 1, &len, NULL, NULL) < 0)
 		err(-1, "lch_rpc_rights");
 	if (len != sizeof(rep))
-		errx(-1, "lch_rpc_rights len %d", len);
+		errx(-1, "lch_rpc_rights len %zu", len);
 	if (gsizep != NULL)
 		*gsizep = rep.hgu_rep_gsize;
 	close(fdarray[0]);
@@ -244,7 +244,7 @@
 	char *pre;
 
 	if (len != sizeof(req))
-		err(-1, "sandbox_gz_uncompress_buffer: len %d", len);
+		err(-1, "sandbox_gz_uncompress_buffer: len %zu", len);
 
 	bcopy(buffer, &req, sizeof(req));
 	pre = buffer + sizeof(req);
@@ -306,7 +306,7 @@
 	    fdarray, 2, &iov_rep, 1, &len, NULL, NULL) < 0)
 		err(-1, "lch_rpc_rights");
 	if (len != sizeof(rep))
-		errx(-1, "lch_rpc_rights len %d", len);
+		errx(-1, "lch_rpc_rights len %zu", len);
 	if (bytes_in != NULL)
 		*bytes_in = rep.hub_rep_bytes_in;
 	close(fdarray[0]);
@@ -324,7 +324,7 @@
 	char *pre;
 
 	if (len != sizeof(req))
-		err(-1, "sandbox_gz_uncompress_buffer: len %d", len);
+		err(-1, "sandbox_gz_uncompress_buffer: len %zu", len);
 
 	bcopy(buffer, &req, sizeof(req));
 	pre = buffer + sizeof(req);

From owner-p4-projects@FreeBSD.ORG  Tue Oct 13 22:26:21 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 89E2C106568D; Tue, 13 Oct 2009 22:26:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4E7E61065672
	for <perforce@freebsd.org>; Tue, 13 Oct 2009 22:26:21 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3BFE48FC14
	for <perforce@freebsd.org>; Tue, 13 Oct 2009 22:26:21 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9DMQLgY011077
	for <perforce@freebsd.org>; Tue, 13 Oct 2009 22:26:21 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9DMQLO5011075
	for perforce@freebsd.org; Tue, 13 Oct 2009 22:26:21 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 13 Oct 2009 22:26:21 GMT
Message-Id: <200910132226.n9DMQLO5011075@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169468 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Oct 2009 22:26:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=169468

Change 169468 by rwatson@rwatson_cinnamon on 2009/10/13 22:26:18

	Declare new cap/procdesc system calls NOPROTO in the compat32
	syscall table.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/syscalls.master#15 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/syscalls.master#15 (text+ko) ====

@@ -901,13 +901,13 @@
 512	AUE_SHMCTL	STD	{ int freebsd32_shmctl(int shmid, int cmd, \
 				    struct shmid_ds32 *buf); }
 513	AUE_LPATHCONF	NOPROTO	{ int lpathconf(char *path, int name); }
-514	AUE_CAP_NEW	STD	{ int cap_new(int fd, u_int64_t rights); }
-515	AUE_CAP_GETRIGHTS	STD	{ int cap_getrights(int fd, \
+514	AUE_CAP_NEW	NOPROTO	{ int cap_new(int fd, u_int64_t rights); }
+515	AUE_CAP_GETRIGHTS	NOPROTO	{ int cap_getrights(int fd, \
 				    u_int64_t *rightsp); }
-516	AUE_CAP_ENTER	STD	{ int cap_enter(void); }
-517	AUE_CAP_GETMODE	STD	{ int cap_getmode(u_int *modep); }
-518	AUE_NULL	STD	{ int pdfork(int *fdp); }
-519	AUE_NULL	STD	{ int pdkill(int fd, int signum); }
-520	AUE_NULL	STD	{ int pdgetpid(int fd, pid_t *pidp); }
-521	AUE_NULL	STD	{ int pdwait(int fd, int *status, \
+516	AUE_CAP_ENTER	NOPROTO	{ int cap_enter(void); }
+517	AUE_CAP_GETMODE	NOPROTO	{ int cap_getmode(u_int *modep); }
+518	AUE_NULL	NOPROTO	{ int pdfork(int *fdp); }
+519	AUE_NULL	NOPROTO	{ int pdkill(int fd, int signum); }
+520	AUE_NULL	NOPROTO	{ int pdgetpid(int fd, pid_t *pidp); }
+521	AUE_NULL	NOPROTO	{ int pdwait(int fd, int *status, \
 				    int options, struct rusage *rusage); }

From owner-p4-projects@FreeBSD.ORG  Tue Oct 13 22:27:23 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DC4171065672; Tue, 13 Oct 2009 22:27:22 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 88840106568D
	for <perforce@freebsd.org>; Tue, 13 Oct 2009 22:27:22 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7607B8FC17
	for <perforce@freebsd.org>; Tue, 13 Oct 2009 22:27:22 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9DMRMrW011136
	for <perforce@freebsd.org>; Tue, 13 Oct 2009 22:27:22 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9DMRM46011134
	for perforce@freebsd.org; Tue, 13 Oct 2009 22:27:22 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 13 Oct 2009 22:27:22 GMT
Message-Id: <200910132227.n9DMRM46011134@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169469 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Oct 2009 22:27:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=169469

Change 169469 by rwatson@rwatson_cinnamon on 2009/10/13 22:26:54

	Regenerate.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#19 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#19 (text+ko) ====

@@ -453,37 +453,6 @@
 	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
 	char buf_l_[PADL_(struct shmid_ds32 *)]; struct shmid_ds32 * buf; char buf_r_[PADR_(struct shmid_ds32 *)];
 };
-struct cap_new_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char rights_l_[PADL_(u_int64_t)]; u_int64_t rights; char rights_r_[PADR_(u_int64_t)];
-};
-struct cap_getrights_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char rightsp_l_[PADL_(u_int64_t *)]; u_int64_t * rightsp; char rightsp_r_[PADR_(u_int64_t *)];
-};
-struct cap_enter_args {
-	register_t dummy;
-};
-struct cap_getmode_args {
-	char modep_l_[PADL_(u_int *)]; u_int * modep; char modep_r_[PADR_(u_int *)];
-};
-struct pdfork_args {
-	char fdp_l_[PADL_(int *)]; int * fdp; char fdp_r_[PADR_(int *)];
-};
-struct pdkill_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)];
-};
-struct pdgetpid_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char pidp_l_[PADL_(pid_t *)]; pid_t * pidp; char pidp_r_[PADR_(pid_t *)];
-};
-struct pdwait_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)];
-	char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)];
-	char rusage_l_[PADL_(struct rusage *)]; struct rusage * rusage; char rusage_r_[PADR_(struct rusage *)];
-};
 int	freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *);
 int	freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *);
 int	freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *);
@@ -567,14 +536,6 @@
 int	freebsd32_semctl(struct thread *, struct freebsd32_semctl_args *);
 int	freebsd32_msgctl(struct thread *, struct freebsd32_msgctl_args *);
 int	freebsd32_shmctl(struct thread *, struct freebsd32_shmctl_args *);
-int	cap_new(struct thread *, struct cap_new_args *);
-int	cap_getrights(struct thread *, struct cap_getrights_args *);
-int	cap_enter(struct thread *, struct cap_enter_args *);
-int	cap_getmode(struct thread *, struct cap_getmode_args *);
-int	pdfork(struct thread *, struct pdfork_args *);
-int	pdkill(struct thread *, struct pdkill_args *);
-int	pdgetpid(struct thread *, struct pdgetpid_args *);
-int	pdwait(struct thread *, struct pdwait_args *);
 
 #ifdef COMPAT_43
 
@@ -853,14 +814,6 @@
 #define	FREEBSD32_SYS_AUE_freebsd32_semctl	AUE_SEMCTL
 #define	FREEBSD32_SYS_AUE_freebsd32_msgctl	AUE_MSGCTL
 #define	FREEBSD32_SYS_AUE_freebsd32_shmctl	AUE_SHMCTL
-#define	FREEBSD32_SYS_AUE_cap_new	AUE_CAP_NEW
-#define	FREEBSD32_SYS_AUE_cap_getrights	AUE_CAP_GETRIGHTS
-#define	FREEBSD32_SYS_AUE_cap_enter	AUE_CAP_ENTER
-#define	FREEBSD32_SYS_AUE_cap_getmode	AUE_CAP_GETMODE
-#define	FREEBSD32_SYS_AUE_pdfork	AUE_NULL
-#define	FREEBSD32_SYS_AUE_pdkill	AUE_NULL
-#define	FREEBSD32_SYS_AUE_pdgetpid	AUE_NULL
-#define	FREEBSD32_SYS_AUE_pdwait	AUE_NULL
 
 #undef PAD_
 #undef PADL_

From owner-p4-projects@FreeBSD.ORG  Wed Oct 14 09:41:47 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 890C7106566C; Wed, 14 Oct 2009 09:41:47 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4DB1B1065670
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 09:41:47 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3ABD48FC1A
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 09:41:47 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9E9flKU001292
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 09:41:47 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9E9fl8D001290
	for perforce@freebsd.org; Wed, 14 Oct 2009 09:41:47 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 14 Oct 2009 09:41:47 GMT
Message-Id: <200910140941.n9E9fl8D001290@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169482 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2009 09:41:47 -0000

http://p4web.freebsd.org/chv.cgi?CH=169482

Change 169482 by rwatson@rwatson_cinnamon on 2009/10/14 09:41:06

	Add missing capability.h include for amd64 build.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_machdep.c#7 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_machdep.c#7 (text+ko) ====

@@ -34,6 +34,7 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
+#include <sys/capability.h>
 #include <sys/file.h>
 #include <sys/fcntl.h>
 #include <sys/clock.h>

From owner-p4-projects@FreeBSD.ORG  Wed Oct 14 10:17:23 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6733A1065696; Wed, 14 Oct 2009 10:17:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2B99D106568D
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 10:17:23 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 19A778FC18
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 10:17:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9EAHMYc004754
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 10:17:22 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9EAHMDN004752
	for perforce@freebsd.org; Wed, 14 Oct 2009 10:17:22 GMT
	(envelope-from mav@freebsd.org)
Date: Wed, 14 Oct 2009 10:17:22 GMT
Message-Id: <200910141017.n9EAHMDN004752@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169483 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2009 10:17:23 -0000

http://p4web.freebsd.org/chv.cgi?CH=169483

Change 169483 by mav@mav_mavbook on 2009/10/14 10:16:51

	Remove stale comments.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#27 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#46 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#27 (text+ko) ====

@@ -327,12 +327,6 @@
 	cam_periph_lock(periph);
 
 	/*
-	 * Mask interrupts so that the pack cannot be invalidated until
-	 * after we are in the queue.  Otherwise, we might not properly
-	 * clean up one of the buffers.
-	 */
-	
-	/*
 	 * If the device has been made invalid, error out
 	 */
 	if ((softc->flags & ADA_FLAG_PACK_INVALID)) {

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#46 (text+ko) ====

@@ -821,12 +821,6 @@
 #endif
 
 	/*
-	 * Mask interrupts so that the pack cannot be invalidated until
-	 * after we are in the queue.  Otherwise, we might not properly
-	 * clean up one of the buffers.
-	 */
-	
-	/*
 	 * If the device has been made invalid, error out
 	 */
 	if ((softc->flags & DA_FLAG_PACK_INVALID)) {

From owner-p4-projects@FreeBSD.ORG  Wed Oct 14 11:18:24 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 179BD106568B; Wed, 14 Oct 2009 11:18:24 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CFA4A10656A5
	for <perforce@FreeBSD.org>; Wed, 14 Oct 2009 11:18:23 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BCA538FC30
	for <perforce@FreeBSD.org>; Wed, 14 Oct 2009 11:18:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9EBINeL010317
	for <perforce@FreeBSD.org>; Wed, 14 Oct 2009 11:18:23 GMT
	(envelope-from gk@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9EBINbn010315
	for perforce@freebsd.org; Wed, 14 Oct 2009 11:18:23 GMT
	(envelope-from gk@FreeBSD.org)
Date: Wed, 14 Oct 2009 11:18:23 GMT
Message-Id: <200910141118.n9EBINbn010315@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gk@FreeBSD.org using -f
From: Gleb Kurtsou <gk@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169484 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2009 11:18:24 -0000

http://p4web.freebsd.org/chv.cgi?CH=169484

Change 169484 by gk@gk_h1 on 2009/10/14 11:17:55

	introduce pefs tests (runs tests on top of tmpfs)
	various fixes spotted by tests: pefs_lookup, pefs_rename, pefs_write
	add pefs showkeys -t option (only test. do not print)
	fix i386 warning

Affected files ...

.. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#11 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#16 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#17 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#23 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/vmac.c#2 edit
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/Makefile#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/h_funcs.subr#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/h_tools.c#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_create#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_dots#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_exec#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_link#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_mkdir#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_mount#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_pipes#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_read_write#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_readdir#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_remove#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_rename#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_rmdir#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_setattr#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_sizes#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_sockets#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_statvfs#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_symlink#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_times#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_trail_slash#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_truncate#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_vnd#1 add
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_vnode_leak#1 add

Differences ...

==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#11 (text+ko) ====

@@ -407,10 +407,14 @@
 pefs_showkeys(int argc, char *argv[])
 {
 	struct pefs_xkey k;
+	int testonly = 0;
 	int fd, i;
 
-	while ((i = getopt(argc, argv, "")) != -1)
+	while ((i = getopt(argc, argv, "t")) != -1)
 		switch(i) {
+		case 't':
+			testonly = 1;
+			break;
 		case '?':
 		default:
 			pefs_usage();
@@ -428,11 +432,19 @@
 
 	bzero(&k, sizeof(k));
 	if (ioctl(fd, PEFS_GETKEY, &k) == -1) {
+		if (testonly) {
+			close(fd);
+			return (EX_DATAERR);
+		}
 		if (errno == ENOENT)
 			printf("No keys specified\n");
 		else
 			err(EX_IOERR, "cannot list keys");
 	} else {
+		if (testonly) {
+			close(fd);
+			return (0);
+		}
 		printf("Keys:\n");
 		while (1) {
 			pefs_key_show(&k, k.pxk_index);
@@ -833,7 +845,7 @@
 "	pefs setkey [-cCpvx] [-a alg] [-i iterations] [-k keyfile] directory\n"
 "	pefs delkey [-cCpv] [-i iterations] [-k keyfile] filesystem\n"
 "	pefs flushkeys filesystem\n"
-"	pefs showkeys filesystem\n"
+"	pefs showkeys [-t] filesystem\n"
 "	pefs addchain [-pPvZ] [-a alg] [-i iterations] [-k keyfile]\n"
 "		[-A alg] [-I iterations] [-K keyfile] filesystem\n"
 "	pefs delchain [-pv] [-i iterations] [-k keyfile] filesystem\n"

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#16 (text+ko) ====

@@ -558,8 +558,8 @@
 		return (-ENAMETOOLONG);
 	}
 	if (enc_size < r) {
-		printf("pefs: name encryption buffer is too small: length %ld, required %d\n",
-		    enc_size, r);
+		printf("pefs: name encryption buffer is too small: length %jd, required %d\n",
+		    (intmax_t)enc_size, r);
 		return (-EOVERFLOW);
 	}
 
@@ -610,8 +610,8 @@
 	    (r - PEFS_NAME_CSUM_SIZE) % PEFS_NAME_BLOCK_SIZE != 0)
 		return (-EINVAL);
 	if (plain_size < r) {
-		printf("pefs: name decryption buffer is too small: length %ld, required %d\n",
-		    plain_size, r);
+		printf("pefs: name decryption buffer is too small: length %jd, required %d\n",
+		    (intmax_t)plain_size, r);
 		return (-EOVERFLOW);
 	}
 

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#17 (text+ko) ====

@@ -561,7 +561,7 @@
 
 	if (size > DFLTPHYS)
 		panic("pefs_chunk_create: requested buffer is too large %jd",
-		    size);
+		    (intmax_t)size);
 
 	nodebuf = 0;
 	wantbufsize = (size <= PAGE_SIZE ? PAGE_SIZE : DFLTPHYS);

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#23 (text+ko) ====

@@ -458,8 +458,8 @@
 	int nokey_lookup, skip_lookup;
 	int error;
 
-	PEFSDEBUG("pefs_lookup: cn_nameiop=%lx, cn_nameptr=%.*s %p\n",
-	    cnp->cn_nameiop, (int)cnp->cn_namelen, cnp->cn_nameptr, cnp->cn_nameptr);
+	PEFSDEBUG("pefs_lookup: op=%lx, name=%.*s\n",
+	    cnp->cn_nameiop, (int)cnp->cn_namelen, cnp->cn_nameptr);
 
 	pefs_enccn_init(&enccn);
 
@@ -474,8 +474,6 @@
 	if (((dpn->pn_flags & PN_HASKEY) == 0 || skip_lookup)) {
 		error = VOP_LOOKUP(ldvp, &lvp, cnp);
 		if (skip_lookup || error == 0 ||
-		    (error == EJUSTRETURN &&
-		    !((flags & ISLASTCN) && cnp->cn_nameiop == CREATE)) ||
 		    pefs_no_keys(dvp))
 			nokey_lookup = 1;
 	}
@@ -557,8 +555,9 @@
 	if (!nokey_lookup)
 		pefs_enccn_free(&enccn);
 
-	PEFSDEBUG("pefs_lookup: cn_nameiop=%lx, cn_nameptr=%.*s %p\n",
-	    cnp->cn_nameiop, (int)cnp->cn_namelen, cnp->cn_nameptr, cnp->cn_nameptr);
+	PEFSDEBUG("pefs_lookup: op=%lx, name=%.*s error=%d vp=%p\n",
+	    cnp->cn_nameiop, (int)cnp->cn_namelen, cnp->cn_nameptr, error,
+	    *ap->a_vpp);
 
 	return (error);
 }
@@ -639,7 +638,7 @@
 		pefs_data_encrypt_update(ctx, &pn->pn_tkey, &pc);
 		puio = pefs_chunk_uio(&pc, offset, UIO_WRITE);
 		PEFSDEBUG("pefs_tryextend: resizing file; filling with zeros: offset=0x%jx, resid=0x%jx\n",
-		    offset, bsize);
+		    offset, (intmax_t)bsize);
 		error = VOP_WRITE(lvp, puio, 0, cred);
 		if (error != 0) {
 			/* try to reset */
@@ -798,6 +797,19 @@
 }
 
 static int
+pefs_close(struct vop_close_args *ap)
+{
+	struct vnode *vp = ap->a_vp;
+	struct vnode *lvp = PEFS_LOWERVP(vp);
+	int error;
+
+	ap->a_vp = lvp;
+	error = VOP_CLOSE_AP(ap);
+	ap->a_vp = vp;
+	return (error);
+}
+
+static int
 pefs_rename(struct vop_rename_args *ap)
 {
 	struct vnode *fdvp = ap->a_fdvp;
@@ -808,7 +820,6 @@
 	struct vnode *ltdvp = PEFS_LOWERVP(tdvp);
 	struct vnode *tvp = ap->a_tvp;
 	struct vnode *ltvp = (tvp == NULL ? NULL : PEFS_LOWERVP(tvp));
-	struct vnode *tovp = NULL;
 	struct componentname *fcnp = ap->a_fcnp;
 	struct componentname *tcnp = ap->a_tcnp;
 	struct pefs_enccn fenccn;
@@ -826,6 +837,14 @@
 		goto bad;
 	}
 
+	/* Handle '.' and '..' rename attempt */
+	if ((fcnp->cn_namelen == 1 && fcnp->cn_nameptr[0] == '.') ||
+	    (fcnp->cn_flags & ISDOTDOT) || (tcnp->cn_flags & ISDOTDOT) ||
+	    fdvp == fvp) {
+			error = EINVAL;
+			goto bad;
+		}
+
 	if (pefs_no_keys(tdvp)) {
 		error = EROFS;
 		goto bad;
@@ -859,55 +878,108 @@
 	if (error != 0) {
 		goto bad;
 	}
-	error = pefs_enccn_create(&tenccn, fenccn.pec_tkey.ptk_key,
-	    fenccn.pec_tkey.ptk_tweak, tcnp);
-	if (error != 0) {
-		pefs_enccn_free(&fenccn);
-		goto bad;
-	}
+#ifdef PEFS_DEBUG_EXTRA
 	if (tvp == NULL) {
 		tcnp->cn_nameiop = DELETE;
-		error = VOP_LOOKUP(tdvp, &tovp, tcnp);
+		error = VOP_LOOKUP(tdvp, &tvp, tcnp);
 		tcnp->cn_nameiop = RENAME;
-		PEFSDEBUG("pefs_rename: lookup target vnode: %s: error=%d, tovp=%p\n",
-		    tcnp->cn_nameptr, error, tovp);
-		if (error == ENOENT)
+		MPASS(error != 0);
+		if (error == ENOENT) {
 			error = 0;
+		} else {
+			PEFSDEBUG("pefs_rename: lookup target vnode: %s: error=%d, tvp=%p\n",
+			    tcnp->cn_nameptr, error, tvp);
+			if (error == 0)
+				vput(tvp);
+			tvp = NULL;
+			error = EINVAL;
+			pefs_enccn_free(&fenccn);
+			goto bad;
+		}
 	}
+#endif
+	if (tvp != NULL) {
+		if (fvp->v_type == VDIR && tvp->v_type == VDIR) {
+			/*
+			 *   Lower level is to check if tvp directory is empty.
+			 *   After rename fvp will contain invalid key/tweak
+			 *   because it is rename of fvp.
+			 */
+			error = pefs_enccn_get(&tenccn, tvp, tcnp);
+		} else if (fvp->v_type == VDIR && tvp->v_type != VDIR) {
+			error = ENOTDIR;
+		} else if (fvp->v_type != VDIR && tvp->v_type == VDIR) {
+			error = EISDIR;
+		} else {
+			/*
+			 * (fvp->v_type != VDIR && tvp->v_type != VDIR):
+			 * We end up having 2 files with same name but
+			 * different tweaks/keys. Remove the old one.
+			 * Set ltvp to zero here because we rename to new name
+			 * and then remove old one
+			 */
+			error = pefs_enccn_create(&tenccn,
+			    fenccn.pec_tkey.ptk_key, fenccn.pec_tkey.ptk_tweak,
+			    tcnp);
+			if (error == 0)
+				ltvp = NULL;
+		}
+	} else {
+		error = pefs_enccn_create(&tenccn, fenccn.pec_tkey.ptk_key,
+		    fenccn.pec_tkey.ptk_tweak, tcnp);
+	}
 	if (error != 0) {
 		pefs_enccn_free(&fenccn);
-		pefs_enccn_free(&tenccn);
 		goto bad;
 	}
 
 	vref(lfdvp);
 	vref(lfvp);
 	vref(ltdvp);
-	if (ltvp != NULL)
+	ASSERT_VOP_LOCKED(ltdvp, "pefs_rename");
+	if (ltvp != NULL) {
+		ASSERT_VOP_LOCKED(ltvp, "pefs_rename");
 		vref(ltvp);
+	}
 	error = VOP_RENAME(lfdvp, lfvp, &fenccn.pec_cn, ltdvp, ltvp,
 	    &tenccn.pec_cn);
 
-	pefs_enccn_free(&fenccn);
-	pefs_enccn_free(&tenccn);
-
 	if (error == 0) {
-		if (tovp != NULL) {
-			MPASS(tovp->v_type == VREG);
+		if (tvp != NULL && tvp->v_type != VDIR) {
+			/*
+			 * Remove old file. Double rename is not performed to
+			 * save data in case of error
+			 */
+			pefs_enccn_free(&tenccn);
+			ASSERT_VOP_UNLOCKED(tdvp, "pefs_rename");
+			ASSERT_VOP_LOCKED(tvp, "pefs_rename");
 			vn_lock(tdvp, LK_EXCLUSIVE | LK_RETRY);
-			tcnp->cn_nameiop = DELETE;
-			error = VOP_REMOVE(tdvp, tovp, tcnp);
-			tcnp->cn_nameiop = RENAME;
+			error = pefs_enccn_get(&tenccn, tvp, tcnp);
+			if (error == 0) {
+				error = VOP_REMOVE(ltdvp, PEFS_LOWERVP(tvp),
+				    &tenccn.pec_cn);
+				PEFSDEBUG("pefs_rename: remove old: %s\n",
+				    tenccn.pec_cn.cn_nameptr);
+				VP_TO_PN(tvp)->pn_flags |= PN_WANTRECYCLE;
+				cache_purge(tvp);
+				vgone(tvp);
+			}
 			VOP_UNLOCK(tdvp, 0);
-			vput(tovp);
+			VOP_UNLOCK(tvp, 0);
 		}
 		cache_purge(fdvp);
 		cache_purge(fvp);
-	} else {
-		if (tovp != NULL)
-			vput(tovp);
+		if (tvp != NULL && tvp->v_type == VDIR) {
+			vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY);
+			VP_TO_PN(fvp)->pn_flags |= PN_WANTRECYCLE;
+			vgone(fvp);
+			VOP_UNLOCK(fvp, 0);
+		}
 	}
 
+	pefs_enccn_free(&tenccn);
+	pefs_enccn_free(&fenccn);
+
 done:
 	ASSERT_VOP_UNLOCKED(tdvp, "pefs_rename");
 	vrele(fdvp);
@@ -1691,7 +1763,7 @@
 				vm_page_busy(m);
 				VM_OBJECT_UNLOCK(vp->v_object);
 				PEFSDEBUG("pefs_read: mapped: offset=0x%jx moffset=0x%jx msize=0x%jx\n",
-				    uio->uio_offset, moffset, msize);
+				    uio->uio_offset, (intmax_t)moffset, (intmax_t)msize);
 				error = uiomove_fromphys(&m, moffset, msize, uio);
 				VM_OBJECT_LOCK(vp->v_object);
 				vm_page_wakeup(m);
@@ -1711,7 +1783,7 @@
 		}
 
 		PEFSDEBUG("pefs_read: mapped=%d m=%d offset=0x%jx size=0x%jx\n",
-		    mapped, m != NULL, uio->uio_offset, pc.pc_size);
+		    mapped, m != NULL, uio->uio_offset, (intmax_t)pc.pc_size);
 		puio = pefs_chunk_uio(&pc, uio->uio_offset, uio->uio_rw);
 		error = VOP_READ(lvp, puio, ioflag, cred);
 		if (error != 0)
@@ -1829,7 +1901,7 @@
 				vm_page_unlock_queues();
 				VM_OBJECT_UNLOCK(vp->v_object);
 				PEFSDEBUG("pefs_write: mapped: offset=0x%jx moffset=0x%jx msize=0x%jx\n",
-				    offset, moffset, msize);
+				    offset, (intmax_t)moffset, (intmax_t)msize);
 				sched_pin();
 				sf = sf_buf_alloc(m, SFB_CPUPRIVATE);
 				ma = (char *)sf_buf_kva(sf);
@@ -1866,7 +1938,7 @@
 		pefs_chunk_copy(&pc, uio);
 lower_update:
 		PEFSDEBUG("pefs_write: mapped=%d m=%d offset=0x%jx size=0x%jx\n",
-		    mapped, m != NULL, offset, pc.pc_size);
+		    mapped, m != NULL, offset, (intmax_t)pc.pc_size);
 		if (restart_encrypt) {
 			restart_encrypt = 0;
 			pefs_data_encrypt_start(ctx, &pn->pn_tkey, offset);
@@ -1876,13 +1948,29 @@
 
 		/* IO_APPEND handled above to prevent offset change races. */
 		error = VOP_WRITE(lvp, puio, ioflag, cred);
-		if (error != 0)
+		if (error != 0) {
+			/*
+			 * XXX Original uio is not preserved thus can't be
+			 * restored. Cloning entire uio structure is too
+			 * inefficient. uio shouldn't be reused after error, but
+			 * uid_resid and uio_offset should remain valid.
+			 * Partially destroy uio, so that using it further
+			 * would result in panic.
+			 *
+			 * Correct solution is to implement uiocopy that
+			 * doesn't change uio and iovec.
+			 */
+			uio->uio_iov = NULL;
+			uio->uio_iovcnt = 0;
+			uio->uio_rw = -1;
+			uio->uio_resid += pc.pc_size;
+			uio->uio_offset -= pc.pc_size;
 			break;
+		}
 
 		MPASS(puio->uio_resid == 0);
 		resid -= pc.pc_size;
 		offset += pc.pc_size;
-
 	}
 	pefs_ctx_free(ctx);
 	pefs_chunk_free(&pc, pn);
@@ -2085,6 +2173,7 @@
 	.vop_default =		&default_vnodeops,
 	.vop_access =		pefs_access,
 	.vop_accessx =		pefs_accessx,
+	.vop_close =		pefs_close,
 	.vop_getattr =		pefs_getattr,
 	.vop_getwritemount =	pefs_getwritemount,
 	.vop_inactive =		pefs_inactive,

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/vmac.c#2 (text+ko) ====

@@ -251,17 +251,17 @@
 #define a1 *(((uint32_t*)alo)+INDEX_HIGH)
 #define a2 *(((uint32_t*)ahi)+INDEX_LOW)
 #define a3 *(((uint32_t*)ahi)+INDEX_HIGH)
-#define k0 *(((uint32_t*)kl)+INDEX_LOW)
-#define k1 *(((uint32_t*)kl)+INDEX_HIGH)
-#define k2 *(((uint32_t*)kh)+INDEX_LOW)
-#define k3 *(((uint32_t*)kh)+INDEX_HIGH)
+#define k0 *(((const uint32_t*)kl)+INDEX_LOW)
+#define k1 *(((const uint32_t*)kl)+INDEX_HIGH)
+#define k2 *(((const uint32_t*)kh)+INDEX_LOW)
+#define k3 *(((const uint32_t*)kh)+INDEX_HIGH)
 
     uint64_t p, q, t;
     uint32_t t2;
 
     p = MUL32(a3, k3);
     p += p;
-	p += *(uint64_t *)mh;
+	p += *(const uint64_t *)mh;
     p += MUL32(a0, k2);
     p += MUL32(a1, k1);
     p += MUL32(a2, k0);
@@ -273,7 +273,7 @@
     p += MUL32(a3, k0);
     t |= ((uint64_t)((uint32_t)p & 0x7fffffff)) << 32;
     p >>= 31;
-    p += (uint64_t)(((uint32_t*)ml)[INDEX_LOW]);
+    p += (uint64_t)(((const uint32_t*)ml)[INDEX_LOW]);
     p += MUL32(a0, k0);
     q =  MUL32(a1, k3);
     q += MUL32(a2, k2);
@@ -282,7 +282,7 @@
     p += q;
     t2 = (uint32_t)(p);
     p >>= 32;
-    p += (uint64_t)(((uint32_t*)ml)[INDEX_HIGH]);
+    p += (uint64_t)(((const uint32_t*)ml)[INDEX_HIGH]);
     p += MUL32(a0, k1);
     p += MUL32(a1, k0);
     q =  MUL32(a2, k3);

From owner-p4-projects@FreeBSD.ORG  Wed Oct 14 11:21:27 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 43898106568D; Wed, 14 Oct 2009 11:21:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0789D106566B
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 11:21:27 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E9BBE8FC1D
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 11:21:26 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9EBLQxA010577
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 11:21:26 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9EBLQFW010575
	for perforce@freebsd.org; Wed, 14 Oct 2009 11:21:26 GMT
	(envelope-from mav@freebsd.org)
Date: Wed, 14 Oct 2009 11:21:26 GMT
Message-Id: <200910141121.n9EBLQFW010575@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169485 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2009 11:21:27 -0000

http://p4web.freebsd.org/chv.cgi?CH=169485

Change 169485 by mav@mav_mavbook on 2009/10/14 11:20:29

	No need to lock PMP, just reference it. We can't lock it in async
	handler, as it may try to sleep.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#7 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#7 (text+ko) ====

@@ -252,7 +252,7 @@
 		if (code == AC_SENT_BDR || code == AC_BUS_RESET)
 			softc->found = 0; /* We have to reset everything. */
 		softc->state = PMP_STATE_PORTS;
-		(void)cam_periph_hold(periph, PRIBIO);
+		cam_periph_acquire(periph);
 		xpt_schedule(periph, CAM_PRIORITY_BUS);
 		break;
 	default:
@@ -348,7 +348,7 @@
 	 * to finish the probe.  The reference will be dropped in pmpdone at
 	 * the end of probe.
 	 */
-	(void)cam_periph_hold(periph, PRIBIO);
+	(void)cam_periph_acquire(periph);
 	xpt_schedule(periph, CAM_PRIORITY_BUS);
 
 	return(CAM_REQ_CMP);
@@ -682,7 +682,7 @@
 		break;
 	}
 	softc->state = PMP_STATE_NORMAL;
-	cam_periph_unhold(periph);
+	cam_periph_release_locked(periph);
 }
 
 #endif /* _KERNEL */

From owner-p4-projects@FreeBSD.ORG  Wed Oct 14 11:33:39 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8EE881065692; Wed, 14 Oct 2009 11:33:39 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 534481065676
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 11:33:39 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 415C88FC17
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 11:33:39 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9EBXdma011390
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 11:33:39 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9EBXdbB011388
	for perforce@freebsd.org; Wed, 14 Oct 2009 11:33:39 GMT
	(envelope-from mav@freebsd.org)
Date: Wed, 14 Oct 2009 11:33:39 GMT
Message-Id: <200910141133.n9EBXdbB011388@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169486 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2009 11:33:39 -0000

http://p4web.freebsd.org/chv.cgi?CH=169486

Change 169486 by mav@mav_mavbook on 2009/10/14 11:33:00

	Compact comments.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#28 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#28 (text+ko) ====

@@ -933,14 +933,10 @@
 			
 			error = adaerror(done_ccb, 0, 0);
 			if (error == ERESTART) {
-				/*
-				 * A retry was scheuled, so
-				 * just return.
-				 */
+				/* A retry was scheduled, so just return. */
 				return;
 			}
 			if (error != 0) {
-
 				if (error == ENXIO) {
 					/*
 					 * Catastrophic error.  Mark our pack as
@@ -1010,10 +1006,7 @@
 
 			error = adaerror(done_ccb, 0, 0);
 			if (error == ERESTART) {
-				/*
-				 * A retry was scheuled, so
-				 * just return.
-				 */
+				/* A retry was scheduled, so just return. */
 				return;
 			}
 		}

From owner-p4-projects@FreeBSD.ORG  Wed Oct 14 11:49:56 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EA1501065672; Wed, 14 Oct 2009 11:49:55 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AE906106566C
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 11:49:55 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B5C58FC16
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 11:49:55 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9EBntl9012646
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 11:49:55 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9EBnt2E012644
	for perforce@freebsd.org; Wed, 14 Oct 2009 11:49:55 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 14 Oct 2009 11:49:55 GMT
Message-Id: <200910141149.n9EBnt2E012644@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169487 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2009 11:49:56 -0000

http://p4web.freebsd.org/chv.cgi?CH=169487

Change 169487 by rwatson@rwatson_cinnamon on 2009/10/14 11:49:26

	Add missing capability argument to fget(9) for 32-bit FreeBSD
	compatibility code.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_ioctl.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_ioctl.c#3 (text+ko) ====

@@ -33,6 +33,7 @@
 #include "opt_compat.h"
 
 #include <sys/param.h>
+#include <sys/capability.h>
 #include <sys/cdio.h>
 #include <sys/fcntl.h>
 #include <sys/filio.h>
@@ -207,7 +208,7 @@
 	struct file *fp;
 	int error;
 
-	if ((error = fget(td, uap->fd, &fp)) != 0)
+	if ((error = fget(td, uap->fd, CAP_IOCTL, &fp)) != 0)
 		return (error);
 	if ((fp->f_flag & (FREAD | FWRITE)) == 0) {
 		fdrop(fp, td);

From owner-p4-projects@FreeBSD.ORG  Wed Oct 14 15:28:35 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4522C1065693; Wed, 14 Oct 2009 15:28:35 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 09AC6106568F
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 15:28:35 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E9E238FC17
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 15:28:34 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9EFSYSf043883
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 15:28:34 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9EFSYEb043881
	for perforce@freebsd.org; Wed, 14 Oct 2009 15:28:34 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 14 Oct 2009 15:28:34 GMT
Message-Id: <200910141528.n9EFSYEb043881@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169494 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2009 15:28:35 -0000

http://p4web.freebsd.org/chv.cgi?CH=169494

Change 169494 by rwatson@rwatson_cinnamon on 2009/10/14 15:28:30

	Align 64-bit capability field at a 64-bit offset in struct
	kinfo_file, otherwise the compiler will introduce additional
	padding, changing the size of the overall structure.
	
	Spotted by:	Jonathan Anderson

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/sys/user.h#15 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/sys/user.h#15 (text+ko) ====

@@ -333,8 +333,9 @@
 	struct sockaddr_storage kf_sa_local;	/* Socket address. */
 	struct sockaddr_storage	kf_sa_peer;	/* Peer address. */
 	pid_t	kf_pid;				/* Process identifier. */
+	int	_kf_ispare0;			/* Space for more stuff. */
 	cap_rights_t	kf_cap_rights;		/* Capabiity rights. */
-	int	_kf_ispare[13];			/* Space for more stuff. */
+	int	_kf_ispare[12];			/* Space for more stuff. */
 	/* Truncated before copyout in sysctl */
 	char	kf_path[PATH_MAX];		/* Path to file, if any. */
 };

From owner-p4-projects@FreeBSD.ORG  Wed Oct 14 19:21:28 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 378D11065692; Wed, 14 Oct 2009 19:21:28 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EBF0D106568B
	for <perforce@FreeBSD.org>; Wed, 14 Oct 2009 19:21:27 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D91A48FC14
	for <perforce@FreeBSD.org>; Wed, 14 Oct 2009 19:21:27 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9EJLR50075533
	for <perforce@FreeBSD.org>; Wed, 14 Oct 2009 19:21:27 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9EJLRnO075531
	for perforce@freebsd.org; Wed, 14 Oct 2009 19:21:27 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Wed, 14 Oct 2009 19:21:27 GMT
Message-Id: <200910141921.n9EJLRnO075531@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169498 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2009 19:21:28 -0000

http://p4web.freebsd.org/chv.cgi?CH=169498

Change 169498 by pgj@beehive on 2009/10/14 19:20:48

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/share/pgpkeys/philip.key#2 integrate
.. //depot/projects/docproj_hu/www/en/news/status/report-2009-04-2009-09.xml#4 integrate
.. //depot/projects/docproj_hu/www/en/platforms/ppc.sgml#4 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#57 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/share/pgpkeys/philip.key#2 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/share/pgpkeys/philip.key,v 1.5 2007/11/18 11:36:54 philip Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/philip.key,v 1.6 2009/10/14 09:01:13 philip Exp $ -->
 <!--
 sh addkey.sh philip C5D34D05;
 -->
@@ -10,8 +10,8 @@
 uid                  Philip Paeps <philip@fosdem.org>
 uid                  Philip Paeps <philip@freebsd.org>
 uid                  Philip Paeps <philip@pub.telenet.be>
-sub   1024D/035EFC58 2006-10-22 [expires: 2008-10-21]
-sub   2048g/6E5FD7D6 2006-10-22 [expires: 2008-11-17]
+sub   1024D/035EFC58 2006-10-22 [expires: 2010-10-13]
+sub   2048g/6E5FD7D6 2006-10-22 [expires: 2010-10-14]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -236,744 +236,1874 @@
 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
-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
-eAAKCRBfLIShPrYEbejZAJ4/cA1B4JmqR5g5jvooGSZvya8liACfbzZLKezZAFdp
-F2HfYJKjA6NVQraIjQQQEQIATQUCRfGDJUYUgAAAAAAOAC8gZmFsY29AbTR4Lm9y
-Z2h0dHA6Ly9mYWxjYWwubmV0L2dwZy8weDAyMUM1QkQyLTB4QzVEMzREMDUuYXNj
-AAoJEKd8S94CHFvSBbIAn0O9v7RMedOfOOm6MrjqrHfDgaNuAKCTv7WyO28RpxHP
-OwVelEHUa1E2ZYi8BBABAgAGBQJF776SAAoJEO2iHpS1ZXFvHjUE/2qc1qF9Vx2g
-hTH5JbSqCeIK+mSol74wRmRb5Ry2ZzUwcx3Qix+a8vCw0ktVIq9uydaGugakcpqz
-4v4hDj9z8id9D7ZyBTaVi56p8k1B4vkpdVa9+7DxOwsM7z1Y1ZFrGo8CaHzOarSD
-dIy9l5gYd9ShNqYJsYgV0/olO0P/smvm7QD9VDU20cU6cqfJB4vEqJQTpVyqQKsf
-BkNTT6Q1zdGI9QQQEQIAtQUCRT5aDIcUgAAAAAAQAG5zaWdub3Rlc0BncmVwLmJl
-Imh0dHA6Ly93d3cuZ3JlcC5iZS9ncGcvNDI2NzEwMTNGOTRBMEFCRUI0Q0U5QjZE
-M0RGQzJDNjJBRjc5RDI5RS8zNTZCQUUwMjQ3NjNGNzM5MkZBMkU0MzgyNjQ5RTYy
-OEM1RDM0RDA1LmFzYyImGmh0dHA6Ly93d3cuZ3JlcC5iZS9ncGcvY2VydC1wb2xp
-Y3ktdjIACgkQPfwsYq950p7y+ACglRn+/KomOH070ny/dYKfw64G9R8Amwak44Dv
-Ob5zW1Qr9OEAnUsDpg8fiQEcBBABAgAGBQJFPLwsAAoJEILS9urEu56ffNMIAIK5
-ZdSglCpL6lfgJfqB+UpZ/1nhod8eiO1omWju09Ct7d07ZgH7lSkHKJghU2CCuTwi
-bScecvgLC3k4SZYGXVTHvro0fUi5ZBaDjDAE4y2XijY2vN1hfbf4BmxGWc1Aj+vV
-v0TYcHMOujUuHW02QEDrU6kZM6b0x+t37IBGqrwaqRJgBwMW0CIy5phNhoISOZwI
-rJ6GuOIctcYFR0AvYYwrKqEXUXJCaEvDVaI15oOipbhUbN2s7cgCruWTO3b/ayn/
-5aiyXOHTTyuS169laiVNZp2o+NzzmdJSs61Ax48bQyVkvpwIwl1Mr+BZgD1maifY
-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
-CgkQXyyEoT62BG0z/wCfUz0NkUHdQFAByg0Z5ld5qsZXC1wAn01/a40+PqeYLNlp
-CSba9mD88sLNiI0EEBECAE0FAkXxgyVGFIAAAAAADgAvIGZhbGNvQG00eC5vcmdo
-dHRwOi8vZmFsY2FsLm5ldC9ncGcvMHgwMjFDNUJEMi0weEM1RDM0RDA1LmFzYwAK
-CRCnfEveAhxb0ozMAKCSkVIWJt4NxkHOwMeTL4nvTKLP3ACgiR7dwRhFOLF62UHK
-uOpm/P8/6eCI9QQQEQIAtQUCRT5aDIcUgAAAAAAQAG5zaWdub3Rlc0BncmVwLmJl
-Imh0dHA6Ly93d3cuZ3JlcC5iZS9ncGcvNDI2NzEwMTNGOTRBMEFCRUI0Q0U5QjZE
-M0RGQzJDNjJBRjc5RDI5RS8zNTZCQUUwMjQ3NjNGNzM5MkZBMkU0MzgyNjQ5RTYy
-OEM1RDM0RDA1LmFzYyImGmh0dHA6Ly93d3cuZ3JlcC5iZS9ncGcvY2VydC1wb2xp
-Y3ktdjIACgkQPfwsYq950p4mugCfVjyHTpSiCMDnkggcdLmJTFDNrUAAn0Cm6oc2
-yjPEcjt0FzuFxNwsmyfGiQEcBBABAgAGBQJFPLwsAAoJEILS9urEu56fudwH/0Uj
-WYWlAtAfg9OnKzCH5KnwNnNiuhCWrXJvXO5lx+VS1ypJKox+8fNMDrQ4txis2Szs
-ApMJZOnfPHiEqcfXQTIqcVFJSamAvmvRTFjGmYHC3exD7g07qpB3wh0C6T5DA1xS
-I/lz/E+Kbd6XRtWvnqBlHc9NCsqUs9hZOuMpc53dVxxHXsZVvyOBNWQJVhJnCxDa
-G42q14iB83LySY/RkFywsTvm+h/THsNDgS8XCWSc67q3JaOzYTcIdCUhMJKAe8Uu
-o3q30p3W3ioOpidXxppoZMr4XtPP87+Gcsz967QKwaiauLDyd8wl/4KqpH5ukODj
-A/LHGggrOfcen3bmz0+JARwEEAECAAYFAkVXTTwACgkQLtRdZmGgc+lshgf/U66C
-+Oog9mGt+ZPv3kFRCc6UbTV2WegZEorJpFmNdabDRomBckybige9rPIPgQIo/F5l
-58sK2WLpM+yHR8FmtGr5DBkO5J3uQE59utvVE270Mvf3HkrU2Zlo6kz9foNhEQzJ
-lzPN+HEopmxSQQltUmZZUQanIUwQbUqwS0aJgTqrhIWvsH36XpjERuxe3dwERhbF
-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
-Z0km5dISlMJ9iJwEEAECAAYFAkVVzKsACgkQH3+pCANY/L2QuAP9EgKkqwfjWozW
-a3pdl47roBleOjQ7XIH02XldIE+IT5GznAN8syF4VtuAA7CF9O/AziDt4GItvRTv
-sM/m4Ir/yu+wijCElibAlppCtzhLNC6Igep7bbJtQ45w/rw0FGjMBK55yDbeGWZw
-028fPQjoiZflCXRCmBPlFhLG6l6O6g+IvAQQAQIABgUCRe++kwAKCRDtoh6UtWVx
-b08CBP9xgVRDdGx08+mJ3OqnTeG2zLHhGP3W6AqYxJDe5yJQqY52kl8Cv0+MTh5A
-QyD+rUoc7EsaU4eOlh2U2AY6wRkdcgbI0Vsp0LLqI9vf+6F8RZdwpUwSSva4o31u
-BDfEwdHcueaojCvz9/vbJhfHQxdg3lN+wN0baCeV8ICOZZ5kOF2gFHA6cR0LYjoS
-HZAoKVuAZK7ndX9JKySmWvKkyf++iPUEEBECALUFAkU+WgyHFIAAAAAAEABuc2ln
-bm90ZXNAZ3JlcC5iZSJodHRwOi8vd3d3LmdyZXAuYmUvZ3BnLzQyNjcxMDEzRjk0
-QTBBQkVCNENFOUI2RDNERkMyQzYyQUY3OUQyOUUvMzU2QkFFMDI0NzYzRjczOTJG
-QTJFNDM4MjY0OUU2MjhDNUQzNEQwNS5hc2MiJhpodHRwOi8vd3d3LmdyZXAuYmUv
-Z3BnL2NlcnQtcG9saWN5LXYyAAoJED38LGKvedKenTkAn3QOdXkMFPfJhiBm4i/o
-hXqO4F2pAJ4n7zcGVpJQsAbveLYY3c+8tyeNUIkBHAQQAQIABgUCRTy8LAAKCRCC
-0vbqxLuenwG3CACYPg1kOuAhcWcfMUutsWbZZcQkNGke3IsP9lCyDlr8pk/emtg+
-jwTosrGFZr13smjdcKc5nHqvNT7JgNc7xs9p6MTjSdltYT8ouVLgl9lH40bL/3+G
-xj01R5wBxpoyiVg72Qi1USivu683xsGgC6rrYKOTTrWdUn0L308178fFPoBSuItF
-KYF/AZI+FLdei8gmEogo6cP+4Q0K3nP7XE+yYEp/od2RYcnuVHqHcB3D9x0FHubQ
-nQ0jMZZYOmoeXFO1WcIb79Tb8Dmw6sVdekn37o/tfpFFYt9roj6RtMGMxDk/Uwi4
-1VdQtrO0ljEfxQYUeFAq89Ul8aDf11C2sPcriQEcBBABAgAGBQJFV008AAoJEC7U
-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
+UCxhU7XrF/b18HIQOXvQunw2CTsK/BTniQI6BBMBAgAkAhsDAh4BAheAAhkBBQJK
+1Y0bBQsJCAcDBRUKCQgLBRYCAwEAAAoJECZJ5ijF000FiCUP/i3H3wLRl7K/RR8H
+oOVLVhINBS69JqXu2INIu1kzzBRR6JyYcJJ+t2Z+4li4tzsB8gRkgkOUgd2ClIaO
+uYAQ9Ac+WJFNe9oyRjqUPKSmIQfH2KKuqFZhw7nAfgoT1zDAgWrAAyOROogCn9nX
+P2h/eQyhSk8U8Vp8CJo6aOqzDXCzY3NrRBr5iHGaj0pXHJ7hxjRl1AyoM84aDieq
+NZp/cp1hU4KEyYodZRziQc724z6J80I8DtAj5qU2v5xjJTgqCEa2XIa0DwGscqki
+7AATQgAL2mxz2oNqCN89YMFsLhGEOCt0Q2PhX1gQIRdrIrqFGTm2062RaqKO9HQb
+lugMecdYck/8Ld6Uclk30vi4eebi130K6wC4NZNgypykgCU/sYEnSIykVkKaVBjL
+xlX087wwPRIE5LJhMF8DLDqUhj2JVq7ycruq91ssBoJVisyXkyDJlu9rKWLiHotz
+QnfCml9ZzLvYRp1I/nPgOkH7534AKBjWg1c7SLe9YIpwR/0YkV+5DaVFD9ht7hIj
+y80bSirAA3En2ZzsNN0/Fii6Q3yD6xAcTcpZf0oo/BGXYruE7OQM0tcM9aVmjlsr
+BJw6IDPofOpeigWJIgybCOjSslFp8a1dzTizOfS3q1HiLoXtbgjMJpPQlnx7zXgc
+dhh+Lnec1p5+hGvhIDi+LF04f3MSiQJABBMBAgAqBQJF7beqIxpodHRwOi8vd3d3
+LmVsaG8ubmV0L2NyeXB0by9wb2xpY3kvAAoJEJV5UtfPNAGp0K0P+wfuCev+lP+t
+SWGhJ1rwBiZQnhxLUtI4LPWunPkmhcm1dUpO+Ekc7LzZvTrabJuMgi/WzpYzuc2h
+5IBQEdr7GgASeGZG8EKuwEuj8BCrRx9owyWB9dt9JZXIbVryR7hZYpFnXE1dF/pt
+wjz4z4qBcg8kK0/lorzjQMhPj7iUuzlKTFNylQq9et+6pmKD8zBY/+Q0aCrb+fvT
+c356C8X8eUNfS+hSnL9W3Bc4i1Ku36m2hbXV5FTFE7I1uMbMDVsmUbFCYjU0gjVR
+h0IYCXxRlPhcGXUxflCLLIwEvZOg+1Wr5YBXJR0hybojh5oQ6qdSyVUmuZ1R0gDd
+iqt2j8+H5JpbEWAKHAnTuuqSm/d+v7YH7pdvTb5FdwKTSayFc25UeF6KKF5VOzBk
+UT7U5t9zfZgUhjD+4PNi4HvlPfVmWXgMpIzniCAXLTUyrlvcv0Vz0PNBTV4zJB18
+k59AUK41SoYevWDR/oVtaPNEtF7k1xC2fjrO8/E07EHIRgVFghlilGeS8DqeAbtK
+TqvYzipvsPmkNMAcnFoeuRwlHaP4nmlhxb0sNx1nNpg5x4ngUkmRkB8JmxlMWgii
+X18SdiYiJuop0SoU1UbWIjqg9qSvb7h10GrMcfPzGQ+JWRwB2sixSECxtJCWqN21
+S3uH8cwEmzRgqacwlP6PrQabVZAbZkzGiEYEEBECAAYFAkZS+5oACgkQIhjIHo58
+A/9x0QCgjFsk/rm92RNXFpfSd6kkNTXVLfwAnRqHcjyxe/DGrRWl9GyL15m15Hj5
+iEYEEBECAAYFAkZugMQACgkQj6mKb+7tcPO9YgCg02Im9SBmCA5vVdJk0Qu7CLz6
+Q7MAmwWMjkxh1iGeQGBtQMPLBm61IMbaiEYEEBECAAYFAkaR9uEACgkQqbb3MLg9
+dhybOwCeMc41XvUDvO9axF+KQGUULh6GqJgAoO5UGQmI4Xy3K/giIQZ9/JpSL38U
+iEYEExECAAYFAkae8PUACgkQmGINRbWBGCwAYQCeMe38aMQPIkzt6CptSAJ31hZ/
+J1oAnimR2ejWj4SL0kf+doQ8dGednKhiiEYEEBECAAYFAkaksi8ACgkQmLReZmY5
+NBU50wCfXs0dmHq07ABgIy8tZfYWzzN8dyYAoLST7KZkYjPCOKLBcafoCvIPEPsr
+iEYEEBECAAYFAkakskcACgkQos7wqTrZvacrAwCdHmoWox54H6VpVTYVYVhNDNoj
+ZlYAn0tfZZZz1Pk3PjAd6L4UNilJ4mLdiEYEEhECAAYFAkbRq20ACgkQSVDhKrJy
+kfKsHACeN03rDXdWEwVyV3f3oEs8kKiF07AAni/RIKYpf7uLxd45XA/5kfRzJkBN
+iEYEEhECAAYFAkbVe9cACgkQ9sjpnGdoHTzfHQCgiPTeAJ1TZOv/82tw++8XOglP
+/1AAmweJpoecIcHpJaYklsyPXETDRzCniEYEEhECAAYFAkeCcEgACgkQ3nqvbpTA
+nH88+ACcDHdllyMIeitxZrkrCXKcAYkQEb0An1VgsGsxI4tyQOb1USsHZ5j38I/P
+iQEcBBABAgAGBQJHwcw6AAoJEFcaYqhmP4grWfMH/AzhhnLYVe5kHN6r+FPAVDbZ
+ITZZ7TPlSRc0qpqXch5ErzWHMo60XhFj9lT958xrIfGTlcSrurZRkFB/gtddk2//
+RvPOk2tdZNm19ggRuHYqRxmjZ4ndfVa2jpZi69pxZmjz7eVeH3pgdmVHXCAldekm
+5+GopRa5MtnjmKKcVdaUTDaOCMlgkVbMpVJXdTVgwLUJLuY7Klc1XF1Pr+sGUJWT
+vndPYCGeE7RcanHnWLqSbS32qS3eRg37kaVM6uHNh2kZB+2C30aASJBU2T8pEnK6
+BDt0wEV6gctM/efibC+fmTcWc+/owO/nJr1MCLEvIHFFsPzRWn3Yc6rHJtuZ7qqI
+RgQSEQIABgUCR8GrSgAKCRAb/jMyONooR5b7AKC01aMNx+6NBF+8k5uzGZ1xrqVT
+/wCeN7WV8JZv/jyEP43xd8/QdzKpYc+IRgQQEQIABgUCR8GgGwAKCRBsxprCaGj0
+H9xTAKDoU1QEM2wN8ToPyNEUSXXlsEJbWgCgv+4QmdvgSRm9X8+DqLJJ1aNY4HyI
+RgQQEQIABgUCR8KUfAAKCRDtWBwmQwsmV6JiAJ9PlV1hA6Mf1iGHot5MozSYCl4g
+MQCfdrktVz00y5yp7gUKchgRACkQUz2IRgQQEQIABgUCR8IUOwAKCRDO5A6gYki6
+EqVsAJ0ZquWtDcLEQAA5nX8gMK1fAG1EjwCdFCix0PaluSLNx2Z4fQJQNIyAUvyI
+RgQQEQIABgUCR8KvUwAKCRB4NVvUpILuJKUpAKCaBDJv0ZTTQUQnRxzazFwUsNi6
+nQCgpsF9l3Y8O7NLhGEVFkfT9gnxDvyIRgQTEQIABgUCR8Kq7AAKCRA7v893vYsF
+DcllAJ0bQovfEITs4X5kuAjxwIcOj5PKBQCgs525ZIYDGyImCE55Yv8rs8v7ZRKI
+RgQQEQIABgUCR8LCKwAKCRBpwjG5mqVqbfZ/AJ4joMZLAUrMhGXlgyVdQcAsGtjh
+NACfTZckx3OI/gPmoGFyXZacGymok2uIRgQQEQIABgUCR8Kl4wAKCRDDdqja8bzb
+c+N2AKCE959eiY9QFglnqBlt+dzcje0hdwCfWisGEfMRyp3El5wCcGC4BmiurFyI
+RgQQEQIABgUCR8LYgAAKCRCfN6X6TafFRrDKAKCGXuBuz7ThCRuxm47MbwDWnPU7
+pwCglez5+WPnM8J8DTYG7v6z2ZWIqDaIfQQTEQIAPQUCR8Lp/jIaaHR0cDovL3d3
+dy5uaWMtbmFjLXByb2plY3Qub3JnL35ibGFhcC9wb2xpY3kuaHRtbAMFAXgACgkQ
+ctTf+NTD8Zd66QCdFL1BPw4LomqI98ccVRf0hDZLb0oAn0uhMHw0cLpaSmdW/bEb
+bKKsDPUZiEYEEBECAAYFAkfC9bYACgkQacI4LQTe9EUT1gCfaYUBAp6QTgi00rgu
+NRyb+9oc4s4AoN+eVtpcd+9I9cY1mtwqKsyhVOaKiEYEEBECAAYFAkfB6VgACgkQ
+UEZ9DhGwDuj5fgCeMvsJ87DX0MynteawRkewFG6zV+UAnjQk4dkuRDlZ6VlbVYHr
+JHgWvoOTiEYEEBECAAYFAkfDGZcACgkQk7DVr6iX/QLlbwCfba5D2Cl6QKKTvfwx
+FISebZ7D6hIAn1bfO4iSFrs5pQjY4h9p955dAqdciEYEEBECAAYFAkfDMdoACgkQ
+JpinDvQhQ0s7pACfbNrlfoBQrG8r9FEsIJSqDzcZO1YAnjfOzgKlrEkXpJXZnDoJ
+3W3/2cBQiEYEEBECAAYFAkfDNiIACgkQiAEJSii8s+OrcQCaA1wFn46NgxVuQDgc
+/V6SJYmdQMkAnj2q5Gy6xoYkstSr2MjcIvuIJlPBiEYEEBECAAYFAkfDuAkACgkQ
+YUppBSnxahhddACgzlGnkiZZt7wXRdqEGlsZClOdLqkAn3EyV7Xc967yqSBj1P22
+9+nUci2AiEYEEBECAAYFAkfDQTYACgkQMk3u9zuMaK0E2gCfZ1Hyd5covJ8sQIhM
+oS1D8CmFHaIAn3AtzpzZ5giPdvY4QezSgA5dtD7qiEYEEBECAAYFAkfDOtkACgkQ
+JikNJSAyef8pEwCgkESLkzOtZjy9V3mdjgjiNNPuK0AAoKd5HNkEeFN13V/giJm/
+mPQ75d6WiEYEEBECAAYFAkfBz1QACgkQfgdWmy5gTVGTRQCgvFvfF/dDdewbpce5
+392GwxjaIJQAn0jZtVFCE2k+jWO1aULHCHUVbdDMiEYEEBECAAYFAkfD7AUACgkQ
+PqD4a3lPnXypEgCfergjs/vcm7KzsyIOI7lxAUvEtFUAmwW5VRxypfi0ol6b2bJ3
+gAdDT+zWiEYEEBECAAYFAkfECXsACgkQ5/8uW2NPmiAo2gCfd1KUfC4j2pFw1c9Y
+ct1cdrxMpyUAnitawTKNVC6P2dOUHvy2dbLHNNbciEYEEBECAAYFAkfEhXIACgkQ
+LxrQcyk8Bf1JMwCeO5G2gYgflWQEJuSR8jh5EHrS9XQAn17VrJLaUCSqH+ECI9Hz
+i6KnNvXHiEYEEBECAAYFAkfEk/8ACgkQiiforNL6Bew9eQCeNjfFSzbrGtCMlxO6
+qhGl6FTkur4AnA6+YIjE6NWbUUdk2qUEzHmqGrrCiEYEEBECAAYFAkfEnAIACgkQ
+MrUzSZHhU8We6gCgkecyHE+5duy2qN+E+qGjr1+8TVoAoIQbjBamMVWhz7xhTene
+zKiyVlJziEYEEBECAAYFAkfEtnQACgkQPuBX/6ogjZ4KXgCfaF3NROn6TX8Bdhwc
+rSwfconSfBYAnAwN9eaCxkuI9yXlYUivOWCX4FQliEYEEBECAAYFAkfEtnUACgkQ
+3AO6o9NJKipwugCeIbimo0l3LriS65+sG/w08FLSeK8An0uF9I2e+E3dqzjyfJ7P
+czOsxGFUiEYEEBECAAYFAkfB4IEACgkQb9E93NfN6ebaBQCgsnBJMEnF2JCMHID6
+/6kKPQW8gPcAoKFwLekz6YImHVmaaE7tVxMOs418iEYEEBECAAYFAkfFzvEACgkQ
+qWndc26pXmcf2wCgnJY5Mz0c5oYEuJkUNZflXnhS6loAn0UHiEdCmbiK0VtW9hQi
+r+N7He3PiEYEEBECAAYFAkfF1BkACgkQJGLEG1jrYMgaUgCcCglK+57R+BR0GpRP
+CTcYOIxIfRIAn0c848ryXrWxUFzZRT4rbHMLwimyiHoEExECADoFAkfGfN4zGmh0
+dHA6Ly93d3cuc2MtZGVscGhpbi1lc2Nod2VpbGVyLmRlL3BncC9pbmRleC5odG1s
+AAoJELR14ge6tYIptOoAniMvfTUfY22jHuJ2RpGTvSa/+x/JAJ4nqTTX+eRJ9fgl
+jXL6483Hr0FNeoh5BBMRAgA6BQJHxnzhMxpodHRwOi8vd3d3LnNjLWRlbHBoaW4t
+ZXNjaHdlaWxlci5kZS9wZ3AvaW5kZXguaHRtbAAKCRCUj9ag4Q9QLt/dAJd+FrrD
++duL74uvcmYMaXLZ58n7AJ9x217XtxfDEbvbYOKZCfwjLukrqYhGBBARAgAGBQJH
+xm6gAAoJEAYPKHb84D2qsG0An3CJNKfOug0GIw6FbkpTZls0eM0lAJ4rzOxNDOxx
+0js3tSJlnaBDwKR/9IhGBBMRAgAGBQJHwmvbAAoJEO6BkqbkQ9bYuCwAoJWsZfy0
+A7/rtJzXwDIN/9F2K2pyAJ95hzvrA2IDc/pQj8G1s50JXoCoj4hGBBARAgAGBQJH
+xq7ZAAoJEKl1mHsfn6fuh6AAnimSOPtKqrJsYDrcLsMtrwCvZqAvAJ9ooZlqV+/7
+AyXg+93LCXyZnketaIhGBBARAgAGBQJHxxoaAAoJEIwesrv9C+3ll+YAmQGroKsB
+mhZgiHaKeN40/J3NSZ28AJ9BvvftC9Dm6GIJUUWGKx08A8cK2YhGBBARAgAGBQJH
+yELmAAoJEEIN8DDqKyKPfecAnAhuWgKFweMSZOI0TkISFeWLcBg0AKCIH+JhoTFQ
+z0sYzOmWeJ4y/TQCz4hGBBARAgAGBQJHyN6LAAoJECCZtky/FUkLjLkAoPXwFxK9
+OpQEIk09nOqHwRKETAJKAJ4zjF/ZSJe+k8FPUD/UymsUtX/Ug4hGBBARAgAGBQJH
+ysAYAAoJEKGFT53laztO7MsAn17cIBhrQ+0lrLCAhESSupcK5nsYAJ42fOjsSCfS
+w5qVUGUDm867Gu2F5YhGBBARAgAGBQJHytZtAAoJEKTiiAOJv34rWqsAoOEJLkL7
+5eQAD7I2XCXhsoMLGw6sAJ9T2wBFn1mEg3G4yzZMdVQ0PuNIeYhGBBARAgAGBQJH
+zxKIAAoJEE2lKq2uZCGG8JcAnj4eM2m3MlqsHvns+/vohxqgQF89AKCSC20oxoUf
+00g36c4VHYRNaEpn6IhGBBARAgAGBQJHzxF2AAoJEIIBS0bEePB0KO0AoMY4CLe3
+sEzhDyytJc2tTSNmDPv8AKDHquFeJGLfpD9ARMSupmqE7RN47IhGBBARAgAGBQJH
+0X6cAAoJEB6KMFMhJ/ha2dsAoKgx5FMV/DE38D2vKdq+Ajpg2flhAKCXji6d+QbN
+dIMLkAAgu4OI174KaYhGBBARAgAGBQJH0x88AAoJEGMWtjA1gDLh7aYAnjjXZ2n5
+v91eP+S9bz6qj1gFJphfAKCJJ3EAx9JRhi6LlApNaGtXK3Z1X4hGBBARAgAGBQJH
+1V9FAAoJEEFLhCNv7M3gS1UAnA0KAxL4wUOwsJg7X+3MfKw7v65UAJ47qt0wGxKT
+tCMFSkBPj6Ajcklz/IhGBBARAgAGBQJH2QUGAAoJEGHUmAeJCxWysEUAoICTwP3w
+7iqPe8IDL5M7uoDlCcQ2AJwJdOgmKJ/NMIJZhGKlbToCBikyFYhGBBMRAgAGBQJH
+7uUHAAoJED7VcfToBI0IqasAoONxchvG9umHER/qvcgcPdpXoc4DAKCr0FPVI1TQ
+TLEF6pN1jygGXmC9SIhGBBMRAgAGBQJH7ueJAAoJELn3yIZpF8O5KrEAoK2sYr7g
+9q2y1sK5ZJ+c3gEH6xV2AJ9lHiw8DpuGUd0TF+IVCbQOvmMSN4hGBBARAgAGBQJI
+C8wBAAoJELdRFAn8Fdvsf3IAnRI105A6ljYe/fDlmiHVG7g6Z9JsAKDyfnMk2su3
+0c4LtQ7P7UIg0F1UlYhGBBARAgAGBQJIJ0aVAAoJECCss75RXCONy9cAmwc0NEbM
+boJ9bA1PxDHR9jvjN6/fAJ4hJ2zM0y/0XlI9m5a8BaSRF5/RrIhGBBARAgAGBQJI
+O8WIAAoJELs9VLZH6oS0qWYAnipsZ6OQa85hTojtBECtHV+Cx6EFAJ9AUqUxaLBN
+5nUAIHhJS7jxpDoMaIhGBBARAgAGBQJIPALAAAoJEJYs2vc7xAgf+wgAoIjysUge
+Hk21X55/Q3R5lHAL36fEAJ0WWtqT6qxqBgsbUrAEi0yVB2sBp4hGBBARAgAGBQJI
+TanNAAoJEM6KedeYAW3HgHMAn2H1M1c7eSv0FIInYnBGRMXE6Su0AJ4lu03vXb+3
+O6qCtfs/sRt4/COav4hGBBARAgAGBQJIU5nhAAoJEDxN6MDktIxIxxsAniD9B9TE
+nzX3cJe5ACUbHs9YjygGAJ9oGLsFTLEv5nkRw7JC7pmjF8D6K4hrBBARAgArBQJI
+86p+BYMB4oUAHhpodHRwOi8vd3d3LmNhY2VydC5vcmcvY3BzLnBocAAKCRDSuw0B
+ZdD9WImXAJ4oFp6ortJSbt7o/jmB1PNgNkpaAgCeLrk3lqkU9rAjklWG2NeqeNFB
++l6InAQQAQIABgUCSPmwjgAKCRBNVigheQUMETTZA/4pbL1mABqmAB32DWEmWNpJ
+DqNoNZqF/uHtiltiDWpG56HKzgmkgNjKuZpnqJOmIxrHFFBTWO8uqckcZgiuP2Vk
+D/+BdMAjjPJwAXdem/j8o2NeLZZ4DNEPPySaclARiNTn5PUb+ItmKyKgEF/wGMD3
+4bWaiuPZ+6LrU8SHH2hjjYhGBBARAgAGBQJJXmPIAAoJEM7tH5zitbiofKwAn1Fp
+aQV6oGNTtEQG//RnFRWOew00AKCmiyTmlODqBiw7Nn1AbUHgbzYaM4hGBBMRAgAG
+BQJJYUCdAAoJEA0SKW5juNd93WgAn38e/7yKn6AAUKFbPBjTo7FBNUHzAJ9nqydl
++0x9iNK7nnVVNZXX8MOaVIhGBBARAgAGBQJJj5c7AAoJEL7jPaOCb3f/eMgAn1df
+CPJ/qm+1uHeSLh0UjgdYCURlAJ0QYD4Ik79CYSMxOEM5PzF/g5XX/IhGBBARAgAG
+BQJJj1Y7AAoJECx/azoYo3D+piwAnRilt2m0ciPPqw26Y3FzYsZZA1rwAJ0Zzm6z
+/85XBFOh6VdG++gFbhM82IhGBBMRAgAGBQJJjzuOAAoJEA0HLpMqmrnDlmcAni+E
+KS6VmyLoaGi2ld3N0686wfRVAKCwbkNIQ+hk7p7qBDp3y3M4RDeYNohGBBARAgAG
+BQJJj/+3AAoJEIqjYq/pcjLNU+8AnjA3IJ9yQh5N5Qq89yWbD1hpUrP+AJ4sDt+y
+/QrrvDAzxR4esWtXdzLonYhGBBARAgAGBQJJj//AAAoJEKffWHJw1EwjH84Ani7N
+QvqrCyfWisde2hLCxSLttI8+AJ4iyfPK8p//65YIrb+/AjFSZTbFzohGBBARAgAG
+BQJJj//MAAoJEOIBHCeUhBl+Lx4AniV/gvmv4UPmoHLM8QK+e9c9VqenAKCuDG3z
+vyp4vwvyiFw/hJdg2dw3gYhGBBARAgAGBQJJkACCAAoJEC+VFQiq5gIuucgAnjoi
+KzqkMVm+k4ceubuP8Gn3OkI/AKCzYvIuJmN/tuInjpF2faPbk2DmoohGBBARAgAG
+BQJJkB6iAAoJEAMS6MNdjNp70m0An1KikJwlxsgqjxMAme0Vkyd8VALGAJ4lAehY
+EZO3v04TAwvBw8sGKG9FHIhGBBARAgAGBQJJkEoPAAoJEAdl1W4aDNCCKTsAnAny
+YWsXZOxO2TxR+zm4DQ240vVAAKCM424qX2e4SABPFvUI8oFDVei9s4hGBBARAgAG
+BQJJkFqnAAoJEIE/6Dp0l0gkEUwAn3VFW8r4ehm1nBqRPClkOnTvuQHzAKCW6BaP
+/bzXw/8OPqoMoRl6dZuhV4hGBBARAgAGBQJJkGSTAAoJEGiYgizI8lL7iv4AnRDm
+4Z50SCGL2ETloCu0x4Z6M5RWAKDTW8DrB+BPTQyXkEScZfOCEx0OKIhGBBARAgAG
+BQJJkFfpAAoJEDQvtTmq0gO13FkAni4bTz6rsjoUBxiDwzL/Wd0AEO4OAKCjHgv4
+wqJfZ+LygRKv4i2iDceli4kBHAQQAQIABgUCSZBViAAKCRCLHlBfQgkwtETvB/9x
+FtutXhNV0qqq7vWRHlCNdD22WHEwDsDNyO7jVQVAIqhAl/Gl1bAWAhCiGc8gzwUl
+gB5seZdywKOOOvbBh6yhZ0BgjYu6G/Iu9pCFdP3994FZ+UFYNV0W8qk/sRE3vO69
+6BKZTOLvcvPNUujCdJWlE23ypjXFodmBHzP6rqoupZVqI6YLw3XjE7FWTZ/HCOzO
+oBetmV23zyXs7XQ2UKmNl6fgVOtBCCHOkOp2Yryhx1gioqSbz1Sb85xVDnf4eYY+
+blxaTrFbE3RnQonlTE8DDod4ELFGWUGS9LDOAXPy0CrQ+DbjPVcOrUX+x+pg8br4
+JrA6UU10ZKcYlZak4OVKiQIcBBABAgAGBQJJkFWcAAoJEJ0qdiGtR7WDShUQAIzj
+A/cHtadYtknTSE5uieawMvAumGlC+KHQnLX8KX0tRBD4OSyhgmwxKLFICGLXZqaE
+Na9HLGZK12CAsKt3I6qFN819nE5EmYIsAy4Sl73VXqNubRzgLo0HCrWIJamKhvmk
+FmnhFAwAH8ivK3Y4XdWk+cwRdnkWDCw4+268ZIbdIm1KDj4tfmlO09Y92AZV1Azr
+eAMOYwLskeOMfYRfnlFU3bN12F+M2OkKFJDJF9/EKvFQRb63xpd5ce8fxFEEy1SX
+flA6n6FUk10s3OZxxQZGIJDGnQp3PQJzyhG49YROmpQfX6BPLLf20CaAoioUonW0
+tOUvhUNqs3G+azd4le8Oah+YSgPuBmz7jjZmuCxzT12eebe6r68dKZ+MbCqA3Crl
++BIoOgpfJfZoOFXXNh+/hoXMy8xjzi7FDN20777aDe7X/wult8/gmKOblYwGzzXj
+/yZluA/9NSVsYFQv0WyNJK4eGKwLv+fWVnOnKhikpB6hkXmBPnuIhagDljB3tG3z
+FebWce3K+6tTlyS7ZI3nC5t31JpSwQmbqe/7W+zLSHWr4J2DnnnxwAKUjjYHppSY
+UHc0mj2n4dngt3gYm84lX+lzCnHsncvZniSczw+WcB6yJLwZcKre47Fu2YKc4TM4
+PR7wOr8VD5RCAVzA1n2OoEJiPNr8u+4t4kiCMZDIiQIcBBABAgAGBQJJkFWzAAoJ
+EBCB2c3BM6C2MFIP/3YnLMnWF8jMGzX4jz2GRu9Y7AbjtqEPYZjrgcWUgcWuRmmw
+wPY4VDCUZiDVEIqZEVUvfdyz0GpqhK/Eg5BsS63AWx5LEgCYcXSdAmIDF9TcJch+
+1+qa2yuPK3BTqwEIEXeL5DRhkNTVyVZeLPfttZXdoZplOYoZrO7a6OoHeUNFyphQ
+300+9ABpIAxEoWoGnxgsbbNHsNoukrDtIwKINE6KFUcr9qQzZh5wer/TJ22mEG7W
+pjx8CjhSuBDKB54KNMacRVkLk9lTn+f4tcYsOF1UbgvrmnG9t8+sv2Uh6LmUUAQL
+h61Ap0nuG9rm4dWV6pOKPvO0ZX5q5bF+wMGbHftLBnaMTCeHRPoJBzN3+Ubwgj6j
+RS2E2xsNHGiCITFYvuVlQhvVRSYmxPNDPV11wxZtOlE7rKFBIDh1mEvDfRDm1DHA
+MbJMj7vo6IjAdL8HwcbYUYV1anzbkBSPwW9uHwadb6pVtBNj+3pCGYbfgXCl3sAD
+wTq4kJQ7a5J1jE+JIAP6mX6sZTmkIftvWNw5uaSI9YcqZv0Ubsu+05qZ3tm07uHH
+dxCDR2q/zHB8GE4o8e31iT2k26PS6wTlBOaq4QDwPE/tfdDt2092FawPLkDEAmve
+S0wKB6aoJtrrlQf779nDfFhHU+YE8Dueq4Pd3T7LyemeGS5nUAYS4HoqHtnjiHwE
+EAECAAYFAkmQdIsACgkQO8MYrvoYpjng8wL/XaNc8N1ge+GyiPaQ6abJG6AqEnFW
+ZNSA3smdCiWqO5kr6hoYImZLvHOhsHFPS2lsUo9zQPZaFj6fBOtUonLcQagr7sTd
+89tagVT1E1wrowcPmYniAhMssJBf8lSaqUIviQEcBBABAgAGBQJJkHSPAAoJEMt3
+MT+S71QldsgIALHBAD523nnwPkC1LXK620Wx+robt3YayibwO9y1EVtr7xXc7sGH
+70O+7e+3pYNt1XI5Fnwq/V8Nrdx/AqCfSvKfNkVnFQbee3URu+zkf6XqExaitrJV
+LRlHMpU5bYdV5uGPacY8si8GTttS8duyjX4korALO+/+zQqitY0A3ueKvXrnzmJL
+jtembckOtVNyzq6g10btpVbE8wtYYLr8sqMvE7IccSOh4c/Vsq5U19ZIVkIjnOCe
+4KBBULuWEVwpBgXktyqpQT+HEUi5ZmCfhKnqP9AdOGBNXu6bN4vPzfoBpfzrHJDv
+mQXRKx58/yRYN9Wz98IajYL1CF7MLAQIG8uIRgQQEQIABgUCSZB0kgAKCRDgBF1y
+++rZF9o6AJ927P0jbIDz51Bwpp+DcIV6IEiEeACgoAXtgKE9rXfkZW063TLYbATP
+WXmIRgQQEQIABgUCSZB9pAAKCRAI7PbU1UsWZ7jYAKCSZUIr2dcA08XGEI/3xBH2
+8pMi+gCdEzK5XKzhXx+rMUu42jMWpDWweouIRgQQEQIABgUCSZCe4QAKCRA7Mpid
+APPP5PXmAKCPqWCwGu/6FXUf0RVobfd/Cjn1/ACgmE0hRqmaUtQeyyA/lmCOJDjN
+rTuIRgQQEQIABgUCSZCd2QAKCRARRkM2u20voNTvAKCASa4cfqIHMsu8z4ISPUZH
+ybphBACfcGV20N49pcmN/QoNVxKMOPyV00uIRgQQEQIABgUCSZDB1AAKCRDAnh2J
+lZMO3gIoAJ9WYumCyoYbBUS91d/hsbfUa7YiwQCcDdoYxAWXYDetsNI581PPZEEI
+6e2IRgQQEQIABgUCSZDB8AAKCRAEBGuFSi4WK2qfAJ9SUC/6irYOZrZLN7o69iTI
+GlCo4gCgp75EjPZ+vyZ6moxRrwjfscL+nh6JAhwEEAECAAYFAkmQsfEACgkQ3vkU
+KEBF0ZvjAQ//esCTmKrExlojKMX8Z0DvYRQanrpjxp8FBNjL6fYNE2h14l0pYHX9
+RlyM506HjDS9SotUXkBgiCX/t3LXAln25d9KNf6XnV6G/6/OvZbFx5VkdICiudA9
+qBH27YDPbIobU/KB73RaGx2A/bTAXdvMLS6Aykaq8YV9McJhPJtZI1us2FxtoXTn
+lkUe3jMVOh9UYvpJFmWyKw4tGt+huoG8cFCr1T5Pl+fuHioaJzdND4MXYStnKXZ7
+Tuz7cvktnMZzcEF0bm3OBsHXRTk+CD8MvLTGE2WPVTSsQFHz9sEtYyTRN/Ow8wzD
+h/9Cl7GkZlb6oY8fDF1AFFKpOHwIr3M7Un9U+oXB/iOkporWa5B0+QYI4JQXL9y8
+Xr1SLGVjjAID8DZkRLdYXqAwWIh1R3bvVBLmZWxRAb+k9oqOx0nEGB+wZuDzSMuk
+xHv+pLNno5Jd05qHXf33b51h2t/mG4Ft1iAYSbRuUYQ9J3zN/DYSDNxdkG1bp+86
+++iCs+El0Hih5Pg72ygPz79chebY+7GTLqyDTKA4tioJIdt5LqIWIgIh9gpuN+c9
+nIIiTk98bySEkchKocJNzgwTspXvPmCU1ui9C2JDvTLQQmk9Xfh1B6raRwmHYeTK
+5GpxC+wsgi6jnf2bdFbj0t4uKU8NZrLB6nIaIOUDVgJAZNZmIvUPbZ6JAhwEEAEC
+AAYFAkmQsfQACgkQ3d85xsX+betygBAAwYoH1Bxm0Zw9LVQAJUNdDCTSLyXTrHdH
+jvqamjRRZjXRLznWNTsnxp2jQrLQVxtVn79W0Fdv61UNPSE3PNrkMpODO910chCj
+GHJV1qOE6MFLCkPLmDorU44FdCf8jW1pfpSCzsAcNRT6A4HIPPtEqJ6U5qNXwr/R
+1OJHThjHBo4BeCCMJuO169UNSCHhlOtP8rkO1jsDizJxTTOjJ2xZqFLm0rtWWQh/
+jJMWamQGjKRFyQ9vAt7tt0fmSuUcimgk2O8H6+B3oTx/T+nT3BEb/uJtZK1QoKCi
+Uug32/PLWLdY/RVa4cFzcx0Qoqahmm/130ctDPr8bhLmLUFGSLuYn8o2fc9ZmSz/
+nRXpT3oCvsKe5D3iTYZoYudk7Y9tNITUoHtsQVrOwcHA6q9abU4DR0t4vyHg+ZyI
+o+MBk8aDbjuadCAfsLekKYqaTJ8Jq9nfw+qT434XeIZkM1S+uHIiuZGZJ1Lqpr05
+60EnQGWv3mbdmER6Z9kF818ikDWio6CIBrEGE1ron7Zv+Sg1Q5bOiaOghluRgymE
+QOzHHNrbHMd+LhOZDCfrf7f0e5/zNvw/eS5nIoZrpVjAZhk4Yd7aFLxRTZHjVR9j
+WDzMko/Y9J2TZDPEuUvGjtcznYUB4yelXjePwBs2Yg4dhO1VIcdB1aL/UuTRECy0
+P8ZFiVF3+JOIRgQQEQIABgUCSZE8+gAKCRDIJlPztMU+6PWCAKC/xYdfL66zyhu5
+oNTAr7W/5CSa/ACeIvZberG7kEnCPGLZhcSI8+NHbcWIRgQQEQIABgUCSZFtIQAK
+CRB89UdI2hQGpgmfAKCtA8ClwuQC6eoVRNarzNoyAU/CWACguYKlvXdcuZGuRlbg
+SqejgeCjIo6IRgQQEQIABgUCSZFpqwAKCRCIjOHkLi/0HDfNAKCEHvf5uC6p7Vrq

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Oct 14 20:06:13 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 38DDC10656A3; Wed, 14 Oct 2009 20:06:13 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F13381065692
	for <perforce@FreeBSD.org>; Wed, 14 Oct 2009 20:06:12 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C64138FC22
	for <perforce@FreeBSD.org>; Wed, 14 Oct 2009 20:06:12 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9EK6CTp079754
	for <perforce@FreeBSD.org>; Wed, 14 Oct 2009 20:06:12 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9EK6CnK079752
	for perforce@freebsd.org; Wed, 14 Oct 2009 20:06:12 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Wed, 14 Oct 2009 20:06:12 GMT
Message-Id: <200910142006.n9EK6CnK079752@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169500 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2009 20:06:13 -0000

http://p4web.freebsd.org/chv.cgi?CH=169500

Change 169500 by pgj@beehive on 2009/10/14 20:05:21

	MFen (www):
		1.22       -> 1.23       hu/platforms/ppc.sgml

Affected files ...

.. //depot/projects/docproj_hu/www/hu/platforms/ppc.sgml#13 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/platforms/ppc.sgml#13 (text+ko) ====

@@ -10,7 +10,7 @@
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
      %SOURCE%	en/platforms/ppc.sgml
-     %SRCID%	1.22
+     %SRCID%	1.23
 -->
  
 <html>
@@ -111,7 +111,8 @@
   <h3><a name="hardware">T&aacute;mogatott hardverek</a></h3>
 
   <p>A &os;/ppc portnak m&#251;k&ouml;dnie kell minden &uacute;j
-    sz&aacute;m&iacute;t&oacute;g&eacute;pen.  A
+    (teh&aacute;t b&aacute;rmilyen be&eacute;p&iacute;tett USB porttal
+    rendelkez&#245; Apple) sz&aacute;m&iacute;t&oacute;g&eacute;pen.  A
     felhaszn&aacute;l&oacute;k a k&ouml;vetkez&#245;
     sz&aacute;m&iacute;t&oacute;g&eacute;peken futtatt&aacute;k
     sikeresen a &os;-t:</p>
@@ -183,14 +184,16 @@
   <h3><a name="issues">Ismert probl&eacute;m&aacute;k</a></h3>
 
   <ul>
-    <li>Nincs AltiVec t&aacute;mogat&aacute;s.</li>
-    <li>A G5 processzorokat nem t&aacute;mogatjuk.</li>
-    <li>Az SMP t&aacute;mogat&aacute;sa egyel&#245;re csak a -CURRENT
-      &aacute;gban &eacute;rhet&#245; el.</li>
-    <li>Az fdisk nem m&#251;k&ouml;dik.</li>
+    <li>A G5 processzorok csak a 8.0-RELEASE &eacute;s
+      k&eacute;s&#245;bbi kiad&aacute;sokban t&aacute;mogatottak.</li>
+    <li>Az SMP t&aacute;mogat&aacute;sa egyel&#245;re csak G4
+      rendszerekre, &eacute;s csak a 8.0-RELEASE &eacute;s
+      k&eacute;s&#245;bbi kiad&aacute;sokban &eacute;rhet&#245; el.</li>
+    <li>A sysinstall nem tud rendesen lemezeket
+      particion&aacute;lni.</li>
     <li>Az ADB billenty&#251;zetek (hasonl&oacute;an az Apple
-      laptopok&eacute;hoz) jelenleg csak a -CURRENT &aacute;gban
-      t&aacute;mogatottak.</li>
+      laptopok&eacute;hoz) csak a 8.0-RELEASE &eacute;s
+      k&eacute;s&#245;bbi kiad&aacute;sokban t&aacute;mogatottak.</li>
     <li>Az ATI k&aacute;rty&aacute;s g&eacute;pek eset&eacute;n vissza
       kell fogni az ofw syscons m&#251;k&ouml;d&eacute;s&eacute;hez
       k&ouml;t&#245;d&#245; ellen&#245;rz&eacute;seket a

From owner-p4-projects@FreeBSD.ORG  Wed Oct 14 21:06:57 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 697991065679; Wed, 14 Oct 2009 21:06:57 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 157C61065670
	for <perforce@FreeBSD.org>; Wed, 14 Oct 2009 21:06:57 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 031D38FC0C
	for <perforce@FreeBSD.org>; Wed, 14 Oct 2009 21:06:57 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9EL6txF095341
	for <perforce@FreeBSD.org>; Wed, 14 Oct 2009 21:06:55 GMT
	(envelope-from gk@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9EL6tGU095339
	for perforce@freebsd.org; Wed, 14 Oct 2009 21:06:55 GMT
	(envelope-from gk@FreeBSD.org)
Date: Wed, 14 Oct 2009 21:06:55 GMT
Message-Id: <200910142106.n9EL6tGU095339@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gk@FreeBSD.org using -f
From: Gleb Kurtsou <gk@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169505 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2009 21:06:57 -0000

http://p4web.freebsd.org/chv.cgi?CH=169505

Change 169505 by gk@gk_h1 on 2009/10/14 21:06:44

	support ioctls on read-only filesystem
	enable ro mount test

Affected files ...

.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#24 edit
.. //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_mount#2 edit

Differences ...

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#24 (text+ko) ====

@@ -70,6 +70,7 @@
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/namei.h>
+#include <sys/priv.h>
 #include <sys/sf_buf.h>
 #include <sys/sysctl.h>
 #include <sys/sx.h>
@@ -753,11 +754,8 @@
 		case VDIR:
 		case VLNK:
 		case VREG:
-			/*
-			 * Do not check pefs_no_keys(vp) here because ioctls
-			 * expect filesystem to be writable right after mount
-			 */
-			if (vp->v_mount->mnt_flag & MNT_RDONLY)
+			if ((vp->v_mount->mnt_flag & MNT_RDONLY) != 0 ||
+			    pefs_no_keys(vp))
 				return (EROFS);
 			break;
 		default:
@@ -2029,17 +2027,19 @@
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	vdrop(dvp); /* vhold by vn_vptocnp */
 
-	error = pefs_enccn_get(&fenccn, vp, &cn);
+	error = VOP_ACCESS(vp, VWRITE, cred, td);
+	if (error == 0)
+		error = pefs_enccn_get(&fenccn, vp, &cn);
 	if (error != 0) {
-		VOP_UNLOCK(lvp, 0);
-		VOP_UNLOCK(ldvp, 0);
+		VOP_UNLOCK(vp, 0);
+		VOP_UNLOCK(dvp, 0);
 		PEFSDEBUG("pefs_setkey: pefs_enccn_get failed: %d\n", error);
 		goto out;
 	}
 	error = pefs_enccn_create(&tenccn, pk, NULL, &cn);
 	if (error != 0) {
-		VOP_UNLOCK(lvp, 0);
-		VOP_UNLOCK(ldvp, 0);
+		VOP_UNLOCK(vp, 0);
+		VOP_UNLOCK(dvp, 0);
 		pefs_enccn_free(&fenccn);
 		goto out;
 	}
@@ -2072,16 +2072,24 @@
 pefs_ioctl(struct vop_ioctl_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
-	struct pefs_mount *pm = VFS_TO_PEFS(vp->v_mount);
 	struct pefs_xkey *xk = ap->a_data;
+	struct ucred *cred = ap->a_cred;
+	struct thread *td = ap->a_td;
+	struct mount *mp = vp->v_mount;
+	struct pefs_mount *pm = VFS_TO_PEFS(mp);
 	struct pefs_key *pk;
-	int error, i;
+	int error = 0, i;
 
-	vn_lock(pm->pm_rootvp, LK_SHARED | LK_RETRY);
-	error = VOP_ACCESS(pm->pm_rootvp, VWRITE, ap->a_cred, ap->a_td);
-	VOP_UNLOCK(pm->pm_rootvp, 0);
-	if (error != 0)
-		return (error);
+	if (mp->mnt_cred->cr_uid != cred->cr_uid) {
+		error = priv_check_cred(cred, PRIV_VFS_ADMIN, 0);
+		if (error != 0 && (mp->mnt_flag & MNT_RDONLY) == 0) {
+			vn_lock(pm->pm_rootvp, LK_SHARED | LK_RETRY);
+			error = VOP_ACCESS(mp->mnt_vnodecovered, VWRITE, cred, td);
+			VOP_UNLOCK(pm->pm_rootvp, 0);
+		}
+		if (error != 0)
+			return (error);
+	}
 
 	/*
 	 * Recycle all unused vnodes after adding/deleting keys to cleanup
@@ -2114,7 +2122,7 @@
 			pefs_key_ref(pk);
 		mtx_unlock(&pm->pm_keys_lock);
 		if (pk != NULL) {
-			error = pefs_setkey(vp, pk, ap->a_cred, ap->a_td);
+			error = pefs_setkey(vp, pk, cred, td);
 			pefs_key_release(pk);
 		} else {
 			PEFSDEBUG("pefs_ioctl: key not found\n");
@@ -2132,7 +2140,7 @@
 		}
 		error = pefs_key_add(pm, xk->pxk_index, pk);
 		if (error == 0)
-			pefs_flushkey(vp->v_mount, ap->a_td, 0, NULL);
+			pefs_flushkey(mp, td, 0, NULL);
 		else
 			pefs_key_release(pk);
 		break;
@@ -2144,7 +2152,7 @@
 			pefs_key_ref(pk);
 			pefs_key_remove(pm, pk);
 			mtx_unlock(&pm->pm_keys_lock);
-			pefs_flushkey(vp->v_mount, ap->a_td, 0, pk);
+			pefs_flushkey(mp, td, 0, pk);
 			pefs_key_release(pk);
 		} else {
 			mtx_unlock(&pm->pm_keys_lock);
@@ -2154,8 +2162,7 @@
 	case PEFS_FLUSHKEYS:
 		PEFSDEBUG("pefs_ioctl: flush keys\n");
 		if (pefs_key_remove_all(pm)) {
-			pefs_flushkey(vp->v_mount, ap->a_td,
-			    PEFS_FLUSHKEY_ALL, NULL);
+			pefs_flushkey(mp, td, PEFS_FLUSHKEY_ALL, NULL);
 		}
 		break;
 	default:

==== //depot/projects/soc2009/gk_pefs/tools/regression/pefs/t_mount#2 (text+ko) ====

@@ -55,11 +55,10 @@
 	test_name "File-system can be unmounted"
 	test_unmount
 
-	# XXX
-	#test_name "File-system mount options work"
-	#test_mount -o ro
-	#mount | grep ${Work_Dir} | grep -q read-only || die
-	#test_unmount
+	test_name "File-system mount options work"
+	test_mount -o ro
+	mount | grep ${Work_Dir} | grep -q read-only || die
+	test_unmount
 
 	test_name "Root directory attributes are set correctly"
 	test_mount -o "uid=1000,gid=100,mode=755"

From owner-p4-projects@FreeBSD.ORG  Wed Oct 14 21:26:15 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7640D10656C5; Wed, 14 Oct 2009 21:26:15 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3AE0810656C3
	for <perforce@FreeBSD.org>; Wed, 14 Oct 2009 21:26:15 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 28A248FC15
	for <perforce@FreeBSD.org>; Wed, 14 Oct 2009 21:26:15 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9ELQF54096736
	for <perforce@FreeBSD.org>; Wed, 14 Oct 2009 21:26:15 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9ELQF4d096734
	for perforce@freebsd.org; Wed, 14 Oct 2009 21:26:15 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Wed, 14 Oct 2009 21:26:15 GMT
Message-Id: <200910142126.n9ELQF4d096734@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi <truncs@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169506 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2009 21:26:15 -0000

http://p4web.freebsd.org/chv.cgi?CH=169506

Change 169506 by truncs@aditya on 2009/10/14 21:25:28

	Initialize the mutex has done in FFS.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#8 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#8 (text+ko) ====

@@ -577,6 +577,7 @@
 		M_EXT2MNT, M_WAITOK);
 	ump->um_e2fs->e2fs = malloc(sizeof(struct ext2fs),
 		M_EXT2MNT, M_WAITOK);
+	mtx_init(EXT2_MTX(ump), "EXT2FS", "EXT2FS Lock", MTX_DEF);
 	bcopy(es, ump->um_e2fs->e2fs, (u_int)sizeof(struct ext2fs));
 	if ((error = compute_sb_data(devvp, ump->um_e2fs->e2fs, ump->um_e2fs)))
 		goto out;
@@ -629,6 +630,7 @@
 		PICKUP_GIANT();
 	}
 	if (ump) {
+	  	mtx_destroy(EXT2_MTX(ump));
 		free(ump->um_e2fs->e2fs_gd, M_EXT2MNT);
 		free(ump->um_e2fs->e2fs_contigdirs, M_EXT2MNT);
 		free(ump->um_e2fs->e2fs, M_EXT2MNT);

From owner-p4-projects@FreeBSD.ORG  Thu Oct 15 02:53:42 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 72855106568F; Thu, 15 Oct 2009 02:53:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 34B6F106566B
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 02:53:42 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1FF378FC35
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 02:53:42 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9F2rgqu035321
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 02:53:42 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9F2re6E035319
	for perforce@freebsd.org; Thu, 15 Oct 2009 02:53:40 GMT
	(envelope-from thompsa@freebsd.org)
Date: Thu, 15 Oct 2009 02:53:40 GMT
Message-Id: <200910150253.n9F2re6E035319@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169509 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Oct 2009 02:53:42 -0000

http://p4web.freebsd.org/chv.cgi?CH=169509

Change 169509 by thompsa@thompsa_burger on 2009/10/15 02:53:30

	IFC

Affected files ...

.. //depot/projects/usb/src/sys/amd64/acpica/acpi_machdep.c#6 integrate
.. //depot/projects/usb/src/sys/amd64/acpica/acpi_wakecode.S#4 integrate
.. //depot/projects/usb/src/sys/amd64/acpica/acpi_wakeup.c#6 integrate
.. //depot/projects/usb/src/sys/amd64/acpica/madt.c#8 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/elf_machdep.c#9 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#8 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#26 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#31 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/trap.c#18 integrate
.. //depot/projects/usb/src/sys/amd64/conf/GENERIC#32 integrate
.. //depot/projects/usb/src/sys/amd64/conf/NOTES#22 integrate
.. //depot/projects/usb/src/sys/amd64/include/acpica_machdep.h#3 integrate
.. //depot/projects/usb/src/sys/amd64/include/apm_bios.h#1 branch
.. //depot/projects/usb/src/sys/amd64/include/atomic.h#5 integrate
.. //depot/projects/usb/src/sys/amd64/include/cpufunc.h#7 integrate
.. //depot/projects/usb/src/sys/amd64/include/elf.h#5 integrate
.. //depot/projects/usb/src/sys/amd64/pci/pci_cfgreg.c#6 integrate
.. //depot/projects/usb/src/sys/arm/arm/cpufunc.c#11 integrate
.. //depot/projects/usb/src/sys/arm/arm/elf_machdep.c#9 integrate
.. //depot/projects/usb/src/sys/arm/arm/identcpu.c#8 integrate
.. //depot/projects/usb/src/sys/arm/arm/pmap.c#21 integrate
.. //depot/projects/usb/src/sys/arm/conf/HL200#10 integrate
.. //depot/projects/usb/src/sys/arm/conf/KB920X#21 integrate
.. //depot/projects/usb/src/sys/arm/include/elf.h#6 integrate
.. //depot/projects/usb/src/sys/arm/include/md_var.h#4 integrate
.. //depot/projects/usb/src/sys/arm/xscale/i80321/i80321_timer.c#5 integrate
.. //depot/projects/usb/src/sys/arm/xscale/xscalereg.h#2 delete
.. //depot/projects/usb/src/sys/arm/xscale/xscalevar.h#2 delete
.. //depot/projects/usb/src/sys/boot/forth/loader.conf#22 integrate
.. //depot/projects/usb/src/sys/boot/i386/zfsboot/zfsboot.c#4 integrate
.. //depot/projects/usb/src/sys/bsm/audit_kevents.h#15 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_all.c#3 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_da.c#4 integrate
.. //depot/projects/usb/src/sys/cam/cam_periph.c#12 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#6 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/policy.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#9 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#6 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#9 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#9 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#15 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#9 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#21 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#20 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#20 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#21 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#20 integrate
.. //depot/projects/usb/src/sys/compat/ia32/ia32_sysvec.c#13 integrate
.. //depot/projects/usb/src/sys/compat/x86bios/x86bios.c#1 branch
.. //depot/projects/usb/src/sys/compat/x86bios/x86bios.h#1 branch
.. //depot/projects/usb/src/sys/compat/x86bios/x86bios_alloc.c#1 branch
.. //depot/projects/usb/src/sys/conf/files#82 integrate
.. //depot/projects/usb/src/sys/conf/files.amd64#25 integrate
.. //depot/projects/usb/src/sys/conf/files.i386#30 integrate
.. //depot/projects/usb/src/sys/conf/files.pc98#20 integrate
.. //depot/projects/usb/src/sys/conf/newvers.sh#13 integrate
.. //depot/projects/usb/src/sys/ddb/db_ps.c#7 integrate
.. //depot/projects/usb/src/sys/dev/acpi_support/acpi_aiboost.c#3 integrate
.. //depot/projects/usb/src/sys/dev/acpi_support/acpi_ibm.c#10 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi.c#23 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_acad.c#4 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_video.c#4 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpivar.h#12 integrate
.. //depot/projects/usb/src/sys/dev/ae/if_ae.c#6 integrate
.. //depot/projects/usb/src/sys/dev/age/if_age.c#11 integrate
.. //depot/projects/usb/src/sys/dev/agp/agp_i810.c#10 integrate
.. //depot/projects/usb/src/sys/dev/ahci/ahci.c#3 integrate
.. //depot/projects/usb/src/sys/dev/alc/if_alc.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ale/if_ale.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ati.c#4 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#1 branch
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#1 branch
.. //depot/projects/usb/src/sys/dev/atkbdc/atkbd.c#6 integrate
.. //depot/projects/usb/src/sys/dev/bge/if_bge.c#21 integrate
.. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#11 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ael1002.c#11 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch
.. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#11 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#6 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_regs.h#4 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#13 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_tn1010.c#3 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_vsc8211.c#7 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_xgmac.c#10 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/cxgb_adapter.h#13 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#23 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/cxgb_osdep.h#11 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/cxgb_t3fw.h#3 integrate
.. //depot/projects/usb/src/sys/dev/de/if_de.c#8 integrate
.. //depot/projects/usb/src/sys/dev/de/if_devar.h#4 integrate
.. //depot/projects/usb/src/sys/dev/dpms/dpms.c#2 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_pciids.h#12 integrate
.. //depot/projects/usb/src/sys/dev/drm/i915_drv.h#10 integrate
.. //depot/projects/usb/src/sys/dev/drm/r600_blit.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_cs.c#2 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_drv.h#10 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_irq.c#10 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_state.c#6 integrate
.. //depot/projects/usb/src/sys/dev/fb/vesa.c#2 integrate
.. //depot/projects/usb/src/sys/dev/fdc/fdc.c#9 integrate
.. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#16 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/pmc_events.h#7 integrate
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#33 integrate
.. //depot/projects/usb/src/sys/dev/jme/if_jme.c#8 integrate
.. //depot/projects/usb/src/sys/dev/lindev/full.c#1 branch
.. //depot/projects/usb/src/sys/dev/lindev/lindev.c#1 branch
.. //depot/projects/usb/src/sys/dev/lindev/lindev.h#1 branch
.. //depot/projects/usb/src/sys/dev/mii/e1000phy.c#10 integrate
.. //depot/projects/usb/src/sys/dev/mii/e1000phyreg.h#6 integrate
.. //depot/projects/usb/src/sys/dev/msk/if_msk.c#15 integrate
.. //depot/projects/usb/src/sys/dev/msk/if_mskreg.h#10 integrate
.. //depot/projects/usb/src/sys/dev/mwl/if_mwl.c#7 integrate
.. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#17 integrate
.. //depot/projects/usb/src/sys/dev/mxge/if_mxge_var.h#15 integrate
.. //depot/projects/usb/src/sys/dev/pci/pcireg.h#15 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/lpt.c#9 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/vpo.c#9 integrate
.. //depot/projects/usb/src/sys/dev/siis/siis.c#3 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/hda/hda_reg.h#3 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#37 integrate
.. //depot/projects/usb/src/sys/dev/syscons/scmouse.c#5 integrate
.. //depot/projects/usb/src/sys/dev/syscons/scterm-teken.c#9 integrate
.. //depot/projects/usb/src/sys/dev/syscons/syscons.c#16 integrate
.. //depot/projects/usb/src/sys/dev/syscons/syscons.h#9 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_cl_io.c#4 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_cl_share.h#4 integrate
.. //depot/projects/usb/src/sys/dev/twe/twe.c#5 integrate
.. //depot/projects/usb/src/sys/dev/twe/twevar.h#2 integrate
.. //depot/projects/usb/src/sys/dev/uart/uart_bus.h#3 integrate
.. //depot/projects/usb/src/sys/dev/uart/uart_core.c#6 integrate
.. //depot/projects/usb/src/sys/dev/uart/uart_tty.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#40 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#36 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#14 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#34 integrate
.. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#34 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#18 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_cdcereg.h#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#21 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uark.c#12 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#16 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uch341.c#4 branch
.. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#14 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#16 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#16 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#18 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#18 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#14 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.h#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uslcom.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uvscom.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#34 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb.h#48 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#17 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#14 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#56 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_device.h#32 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#34 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#169 integrate
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#81 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#19 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#16 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#17 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#18 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#23 integrate
.. //depot/projects/usb/src/sys/dev/x86bios/x86bios.c#2 delete
.. //depot/projects/usb/src/sys/dev/x86bios/x86bios.h#2 delete
.. //depot/projects/usb/src/sys/dev/x86bios/x86bios_alloc.c#2 delete
.. //depot/projects/usb/src/sys/fs/fifofs/fifo_vnops.c#15 integrate
.. //depot/projects/usb/src/sys/fs/nfs/nfs_commonacl.c#4 integrate
.. //depot/projects/usb/src/sys/fs/procfs/procfs.c#7 integrate
.. //depot/projects/usb/src/sys/fs/procfs/procfs.h#2 integrate
.. //depot/projects/usb/src/sys/fs/procfs/procfs_osrel.c#1 branch
.. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs.h#8 integrate
.. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_subr.c#11 integrate
.. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#12 integrate
.. //depot/projects/usb/src/sys/geom/concat/g_concat.c#5 integrate
.. //depot/projects/usb/src/sys/geom/label/g_label.c#6 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part.c#21 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_ebr.c#7 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#14 integrate
.. //depot/projects/usb/src/sys/geom/shsec/g_shsec.c#3 integrate
.. //depot/projects/usb/src/sys/geom/stripe/g_stripe.c#6 integrate
.. //depot/projects/usb/src/sys/geom/uzip/g_uzip.c#3 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_create.c#3 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_events.c#3 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_init.c#5 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_move.c#4 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_rm.c#7 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_subr.c#7 integrate
.. //depot/projects/usb/src/sys/i386/acpica/acpi_machdep.c#13 integrate
.. //depot/projects/usb/src/sys/i386/acpica/madt.c#9 integrate
.. //depot/projects/usb/src/sys/i386/conf/GENERIC#31 integrate
.. //depot/projects/usb/src/sys/i386/conf/NOTES#26 integrate
.. //depot/projects/usb/src/sys/i386/i386/elf_machdep.c#10 integrate
.. //depot/projects/usb/src/sys/i386/i386/initcpu.c#9 integrate
.. //depot/projects/usb/src/sys/i386/i386/machdep.c#23 integrate
.. //depot/projects/usb/src/sys/i386/i386/vm_machdep.c#14 integrate
.. //depot/projects/usb/src/sys/i386/include/acpica_machdep.h#3 integrate
.. //depot/projects/usb/src/sys/i386/include/apm_bios.h#2 integrate
.. //depot/projects/usb/src/sys/i386/include/atomic.h#6 integrate
.. //depot/projects/usb/src/sys/i386/include/cpufunc.h#11 integrate
.. //depot/projects/usb/src/sys/i386/include/elf.h#5 integrate
.. //depot/projects/usb/src/sys/i386/pci/pci_cfgreg.c#7 integrate
.. //depot/projects/usb/src/sys/i386/xen/xen_machdep.c#9 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/elf_machdep.c#10 integrate
.. //depot/projects/usb/src/sys/ia64/include/elf.h#5 integrate
.. //depot/projects/usb/src/sys/kern/imgact_elf.c#15 integrate
.. //depot/projects/usb/src/sys/kern/init_main.c#16 integrate
.. //depot/projects/usb/src/sys/kern/init_sysent.c#17 integrate
.. //depot/projects/usb/src/sys/kern/kern_descrip.c#26 integrate
.. //depot/projects/usb/src/sys/kern/kern_event.c#13 integrate
.. //depot/projects/usb/src/sys/kern/kern_exec.c#22 integrate
.. //depot/projects/usb/src/sys/kern/kern_exit.c#24 integrate
.. //depot/projects/usb/src/sys/kern/kern_lock.c#20 integrate
.. //depot/projects/usb/src/sys/kern/kern_proc.c#23 integrate
.. //depot/projects/usb/src/sys/kern/kern_rwlock.c#18 integrate
.. //depot/projects/usb/src/sys/kern/kern_sig.c#18 integrate
.. //depot/projects/usb/src/sys/kern/kern_sx.c#19 integrate
.. //depot/projects/usb/src/sys/kern/kern_thr.c#14 integrate
.. //depot/projects/usb/src/sys/kern/kern_umtx.c#12 integrate
.. //depot/projects/usb/src/sys/kern/subr_acl_posix1e.c#6 integrate
.. //depot/projects/usb/src/sys/kern/subr_bus.c#31 integrate
.. //depot/projects/usb/src/sys/kern/subr_trap.c#12 integrate
.. //depot/projects/usb/src/sys/kern/syscalls.c#16 integrate
.. //depot/projects/usb/src/sys/kern/syscalls.master#16 integrate
.. //depot/projects/usb/src/sys/kern/uipc_socket.c#29 integrate
.. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#20 integrate
.. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#21 integrate
.. //depot/projects/usb/src/sys/kern/vfs_acl.c#7 integrate
.. //depot/projects/usb/src/sys/kern/vfs_default.c#15 integrate
.. //depot/projects/usb/src/sys/kern/vfs_export.c#12 integrate
.. //depot/projects/usb/src/sys/kern/vfs_subr.c#26 integrate
.. //depot/projects/usb/src/sys/kern/vfs_vnops.c#23 integrate
.. //depot/projects/usb/src/sys/mips/include/elf.h#4 integrate
.. //depot/projects/usb/src/sys/mips/mips/elf64_machdep.c#4 integrate
.. //depot/projects/usb/src/sys/mips/mips/elf_machdep.c#8 integrate
.. //depot/projects/usb/src/sys/modules/Makefile#44 integrate
.. //depot/projects/usb/src/sys/modules/acpi/acpi/Makefile#10 integrate
.. //depot/projects/usb/src/sys/modules/cxgb/cxgb/Makefile#8 integrate
.. //depot/projects/usb/src/sys/modules/lindev/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/nfsclient/Makefile#8 integrate
.. //depot/projects/usb/src/sys/modules/nfslockd/Makefile#4 integrate
.. //depot/projects/usb/src/sys/modules/pf/Makefile#7 integrate
.. //depot/projects/usb/src/sys/modules/procfs/Makefile#3 integrate
.. //depot/projects/usb/src/sys/modules/ubser/Makefile#6 integrate
.. //depot/projects/usb/src/sys/modules/usb/Makefile#22 integrate
.. //depot/projects/usb/src/sys/modules/usb/uch341/Makefile#3 branch
.. //depot/projects/usb/src/sys/modules/x86bios/Makefile#2 integrate
.. //depot/projects/usb/src/sys/net/flowtable.c#12 integrate
.. //depot/projects/usb/src/sys/net/flowtable.h#8 integrate
.. //depot/projects/usb/src/sys/net/if_bridge.c#20 integrate
.. //depot/projects/usb/src/sys/net/if_enc.c#10 integrate
.. //depot/projects/usb/src/sys/net/if_ethersubr.c#24 integrate
.. //depot/projects/usb/src/sys/net/pfil.c#4 integrate
.. //depot/projects/usb/src/sys/net/route.c#25 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211.h#18 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_hwmp.c#4 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_mesh.c#4 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_mesh.h#4 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_bridge.c#6 integrate
.. //depot/projects/usb/src/sys/netinet/in.c#37 integrate
.. //depot/projects/usb/src/sys/netinet/ip_fastfwd.c#15 integrate
.. //depot/projects/usb/src/sys/netinet/ip_icmp.c#20 integrate
.. //depot/projects/usb/src/sys/netinet/ip_input.c#31 integrate
.. //depot/projects/usb/src/sys/netinet/ip_output.c#29 integrate
.. //depot/projects/usb/src/sys/netinet/ip_var.h#15 integrate
.. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw2.c#12 integrate
.. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_pfil.c#5 integrate
.. //depot/projects/usb/src/sys/netinet/raw_ip.c#30 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_bsd_addr.c#13 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_os_bsd.h#21 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_output.c#24 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#20 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_input.c#29 integrate
.. //depot/projects/usb/src/sys/netinet6/icmp6.c#28 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#31 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_forward.c#15 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_input.c#31 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_output.c#21 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_var.h#17 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_esp.c#12 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfs_kdtrace.c#3 integrate
.. //depot/projects/usb/src/sys/nfsserver/nfs_serv.c#17 integrate
.. //depot/projects/usb/src/sys/nlm/nlm.h#5 integrate
.. //depot/projects/usb/src/sys/nlm/nlm_prot_impl.c#9 integrate
.. //depot/projects/usb/src/sys/nlm/nlm_prot_server.c#4 integrate
.. //depot/projects/usb/src/sys/pc98/conf/GENERIC#22 integrate
.. //depot/projects/usb/src/sys/pc98/conf/NOTES#18 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/swtch.S#6 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/trap_subr.S#7 integrate
.. //depot/projects/usb/src/sys/powerpc/include/elf.h#5 integrate
.. //depot/projects/usb/src/sys/powerpc/powerpc/elf_machdep.c#8 integrate
.. //depot/projects/usb/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#4 integrate
.. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#24 integrate
.. //depot/projects/usb/src/sys/sparc64/include/elf.h#5 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/elf_machdep.c#10 integrate
.. //depot/projects/usb/src/sys/sun4v/include/elf.h#4 integrate
.. //depot/projects/usb/src/sys/sys/ata.h#6 integrate
.. //depot/projects/usb/src/sys/sys/errno.h#2 integrate
.. //depot/projects/usb/src/sys/sys/event.h#8 integrate
.. //depot/projects/usb/src/sys/sys/fcntl.h#6 integrate
.. //depot/projects/usb/src/sys/sys/param.h#46 integrate
.. //depot/projects/usb/src/sys/sys/pmc.h#8 integrate
.. //depot/projects/usb/src/sys/sys/rwlock.h#12 integrate
.. //depot/projects/usb/src/sys/sys/signalvar.h#5 integrate
.. //depot/projects/usb/src/sys/sys/sx.h#12 integrate
.. //depot/projects/usb/src/sys/sys/syscall.h#16 integrate
.. //depot/projects/usb/src/sys/sys/syscall.mk#16 integrate
.. //depot/projects/usb/src/sys/sys/sysproto.h#17 integrate
.. //depot/projects/usb/src/sys/sys/vnode.h#26 integrate
.. //depot/projects/usb/src/sys/teken/sequences#2 integrate
.. //depot/projects/usb/src/sys/teken/teken.c#3 integrate
.. //depot/projects/usb/src/sys/teken/teken.h#3 integrate
.. //depot/projects/usb/src/sys/teken/teken_demo.c#3 integrate
.. //depot/projects/usb/src/sys/teken/teken_scs.h#2 integrate
.. //depot/projects/usb/src/sys/teken/teken_stress.c#2 integrate
.. //depot/projects/usb/src/sys/teken/teken_subr.h#3 integrate
.. //depot/projects/usb/src/sys/teken/teken_subr_compat.h#3 integrate
.. //depot/projects/usb/src/sys/ufs/ufs/ufs_gjournal.c#4 integrate
.. //depot/projects/usb/src/sys/vm/vm_map.c#20 integrate
.. //depot/projects/usb/src/sys/vm/vm_mmap.c#22 integrate
.. //depot/projects/usb/src/sys/vm/vm_page.c#20 integrate
.. //depot/projects/usb/src/sys/vm/vm_page.h#13 integrate

Differences ...

==== //depot/projects/usb/src/sys/amd64/acpica/acpi_machdep.c#6 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.21 2009/06/05 18:44:36 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.24 2009/10/08 17:41:53 jkim Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -33,12 +33,35 @@
 #include <sys/module.h>
 #include <sys/sysctl.h>
 
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
 #include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/actables.h>
 
 #include <dev/acpica/acpivar.h>
 
 #include <machine/nexusvar.h>
 
+/*
+ * APM driver emulation 
+ */
+
+#include <sys/condvar.h>
+#include <sys/conf.h>
+#include <sys/fcntl.h>
+#include <sys/malloc.h>
+#include <sys/poll.h>
+#include <sys/uio.h>
+
+#include <dev/acpica/acpiio.h>
+
+#include <machine/apm_bios.h>
+#include <i386/include/pc/bios.h>
+
+#include <i386/bios/apm.h>
+
 SYSCTL_DECL(_debug_acpi);
 
 int acpi_resume_beep;
@@ -50,7 +73,432 @@
 TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video);
 
 static int intr_model = ACPI_INTR_PIC;
-static struct apm_clone_data acpi_clone;
+static int apm_active;
+static struct clonedevs *apm_clones;
+
+MALLOC_DEFINE(M_APMDEV, "apmdev", "APM device emulation");
+
+static d_open_t		apmopen;
+static d_close_t	apmclose;
+static d_write_t	apmwrite;
+static d_ioctl_t	apmioctl;
+static d_poll_t		apmpoll;
+static d_kqfilter_t	apmkqfilter;
+static void		apmreadfiltdetach(struct knote *kn);
+static int		apmreadfilt(struct knote *kn, long hint);
+static struct filterops	apm_readfiltops = {
+	.f_isfd = 1,
+	.f_detach = apmreadfiltdetach,
+	.f_event = apmreadfilt,
+};
+
+static struct cdevsw apm_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_TRACKCLOSE | D_NEEDMINOR,
+	.d_open =	apmopen,
+	.d_close =	apmclose,
+	.d_write =	apmwrite,
+	.d_ioctl =	apmioctl,
+	.d_poll =	apmpoll,
+	.d_name =	"apm",
+	.d_kqfilter =	apmkqfilter
+};
+
+static int
+acpi_capm_convert_battstate(struct  acpi_battinfo *battp)
+{
+	int	state;
+
+	state = APM_UNKNOWN;
+
+	if (battp->state & ACPI_BATT_STAT_DISCHARG) {
+		if (battp->cap >= 50)
+			state = 0;	/* high */
+		else
+			state = 1;	/* low */
+	}
+	if (battp->state & ACPI_BATT_STAT_CRITICAL)
+		state = 2;		/* critical */
+	if (battp->state & ACPI_BATT_STAT_CHARGING)
+		state = 3;		/* charging */
+
+	/* If still unknown, determine it based on the battery capacity. */
+	if (state == APM_UNKNOWN) {
+		if (battp->cap >= 50)
+			state = 0;	/* high */
+		else
+			state = 1;	/* low */
+	}
+
+	return (state);
+}
+
+static int
+acpi_capm_convert_battflags(struct  acpi_battinfo *battp)
+{
+	int	flags;
+
+	flags = 0;
+
+	if (battp->cap >= 50)
+		flags |= APM_BATT_HIGH;
+	else {
+		if (battp->state & ACPI_BATT_STAT_CRITICAL)
+			flags |= APM_BATT_CRITICAL;
+		else
+			flags |= APM_BATT_LOW;
+	}
+	if (battp->state & ACPI_BATT_STAT_CHARGING)
+		flags |= APM_BATT_CHARGING;
+	if (battp->state == ACPI_BATT_STAT_NOT_PRESENT)
+		flags = APM_BATT_NOT_PRESENT;
+
+	return (flags);
+}
+
+static int
+acpi_capm_get_info(apm_info_t aip)
+{
+	int	acline;
+	struct	acpi_battinfo batt;
+
+	aip->ai_infoversion = 1;
+	aip->ai_major       = 1;
+	aip->ai_minor       = 2;
+	aip->ai_status      = apm_active;
+	aip->ai_capabilities= 0xff00;	/* unknown */
+
+	if (acpi_acad_get_acline(&acline))
+		aip->ai_acline = APM_UNKNOWN;	/* unknown */
+	else
+		aip->ai_acline = acline;	/* on/off */
+
+	if (acpi_battery_get_battinfo(NULL, &batt) != 0) {
+		aip->ai_batt_stat = APM_UNKNOWN;
+		aip->ai_batt_life = APM_UNKNOWN;
+		aip->ai_batt_time = -1;		 /* unknown */
+		aip->ai_batteries = ~0U;	 /* unknown */
+	} else {
+		aip->ai_batt_stat = acpi_capm_convert_battstate(&batt);
+		aip->ai_batt_life = batt.cap;
+		aip->ai_batt_time = (batt.min == -1) ? -1 : batt.min * 60;
+		aip->ai_batteries = acpi_battery_get_units();
+	}
+
+	return (0);
+}
+
+static int
+acpi_capm_get_pwstatus(apm_pwstatus_t app)
+{
+	device_t dev;
+	int	acline, unit, error;
+	struct	acpi_battinfo batt;
+
+	if (app->ap_device != PMDV_ALLDEV &&
+	    (app->ap_device < PMDV_BATT0 || app->ap_device > PMDV_BATT_ALL))
+		return (1);
+
+	if (app->ap_device == PMDV_ALLDEV)
+		error = acpi_battery_get_battinfo(NULL, &batt);
+	else {
+		unit = app->ap_device - PMDV_BATT0;
+		dev = devclass_get_device(devclass_find("battery"), unit);
+		if (dev != NULL)
+			error = acpi_battery_get_battinfo(dev, &batt);
+		else
+			error = ENXIO;
+	}
+	if (error)
+		return (1);
+
+	app->ap_batt_stat = acpi_capm_convert_battstate(&batt);
+	app->ap_batt_flag = acpi_capm_convert_battflags(&batt);
+	app->ap_batt_life = batt.cap;
+	app->ap_batt_time = (batt.min == -1) ? -1 : batt.min * 60;
+
+	if (acpi_acad_get_acline(&acline))
+		app->ap_acline = APM_UNKNOWN;
+	else
+		app->ap_acline = acline;	/* on/off */
+
+	return (0);
+}
+
+/* Create single-use devices for /dev/apm and /dev/apmctl. */
+static void
+apm_clone(void *arg, struct ucred *cred, char *name, int namelen,
+    struct cdev **dev)
+{
+	int ctl_dev, unit;
+
+	if (*dev != NULL)
+		return;
+	if (strcmp(name, "apmctl") == 0)
+		ctl_dev = TRUE;
+	else if (strcmp(name, "apm") == 0)
+		ctl_dev = FALSE;
+	else
+		return;
+
+	/* Always create a new device and unit number. */
+	unit = -1;
+	if (clone_create(&apm_clones, &apm_cdevsw, &unit, dev, 0)) {
+		if (ctl_dev) {
+			*dev = make_dev(&apm_cdevsw, unit,
+			    UID_ROOT, GID_OPERATOR, 0660, "apmctl%d", unit);
+		} else {
+			*dev = make_dev(&apm_cdevsw, unit,
+			    UID_ROOT, GID_OPERATOR, 0664, "apm%d", unit);
+		}
+		if (*dev != NULL) {
+			dev_ref(*dev);
+			(*dev)->si_flags |= SI_CHEAPCLONE;
+		}
+	}
+}
+
+/* Create a struct for tracking per-device suspend notification. */
+static struct apm_clone_data *
+apm_create_clone(struct cdev *dev, struct acpi_softc *acpi_sc)
+{
+	struct apm_clone_data *clone;
+
+	clone = malloc(sizeof(*clone), M_APMDEV, M_WAITOK);
+	clone->cdev = dev;
+	clone->acpi_sc = acpi_sc;
+	clone->notify_status = APM_EV_NONE;
+	bzero(&clone->sel_read, sizeof(clone->sel_read));
+	knlist_init_mtx(&clone->sel_read.si_note, &acpi_mutex);
+
+	/*
+	 * The acpi device is always managed by devd(8) and is considered
+	 * writable (i.e., ack is required to allow suspend to proceed.)
+	 */
+	if (strcmp("acpi", devtoname(dev)) == 0)
+		clone->flags = ACPI_EVF_DEVD | ACPI_EVF_WRITE;
+	else
+		clone->flags = ACPI_EVF_NONE;
+
+	ACPI_LOCK(acpi);
+	STAILQ_INSERT_TAIL(&acpi_sc->apm_cdevs, clone, entries);
+	ACPI_UNLOCK(acpi);
+	return (clone);
+}
+
+static int
+apmopen(struct cdev *dev, int flag, int fmt, struct thread *td)
+{
+	struct	acpi_softc *acpi_sc;
+	struct 	apm_clone_data *clone;
+
+	acpi_sc = devclass_get_softc(devclass_find("acpi"), 0);
+	clone = apm_create_clone(dev, acpi_sc);
+	dev->si_drv1 = clone;
+
+	/* If the device is opened for write, record that. */
+	if ((flag & FWRITE) != 0)
+		clone->flags |= ACPI_EVF_WRITE;
+
+	return (0);
+}
+
+static int
+apmclose(struct cdev *dev, int flag, int fmt, struct thread *td)
+{
+	struct	apm_clone_data *clone;
+	struct	acpi_softc *acpi_sc;
+
+	clone = dev->si_drv1;
+	acpi_sc = clone->acpi_sc;
+
+	/* We are about to lose a reference so check if suspend should occur */
+	if (acpi_sc->acpi_next_sstate != 0 &&
+	    clone->notify_status != APM_EV_ACKED)
+		acpi_AckSleepState(clone, 0);
+
+	/* Remove this clone's data from the list and free it. */
+	ACPI_LOCK(acpi);
+	STAILQ_REMOVE(&acpi_sc->apm_cdevs, clone, apm_clone_data, entries);
+	knlist_destroy(&clone->sel_read.si_note);
+	ACPI_UNLOCK(acpi);
+	free(clone, M_APMDEV);
+	destroy_dev_sched(dev);
+	return (0);
+}
+
+static int
+apmioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
+{
+	int	error;
+	struct	apm_clone_data *clone;
+	struct	acpi_softc *acpi_sc;
+	struct	apm_info info;
+	struct 	apm_event_info *ev_info;
+	apm_info_old_t aiop;
+
+	error = 0;
+	clone = dev->si_drv1;
+	acpi_sc = clone->acpi_sc;
+
+	switch (cmd) {
+	case APMIO_SUSPEND:
+		if ((flag & FWRITE) == 0)
+			return (EPERM);
+		if (acpi_sc->acpi_next_sstate == 0) {
+			if (acpi_sc->acpi_suspend_sx != ACPI_STATE_S5) {
+				error = acpi_ReqSleepState(acpi_sc,
+				    acpi_sc->acpi_suspend_sx);
+			} else {
+				printf(
+			"power off via apm suspend not supported\n");
+				error = ENXIO;
+			}
+		} else
+			error = acpi_AckSleepState(clone, 0);
+		break;
+	case APMIO_STANDBY:
+		if ((flag & FWRITE) == 0)
+			return (EPERM);
+		if (acpi_sc->acpi_next_sstate == 0) {
+			if (acpi_sc->acpi_standby_sx != ACPI_STATE_S5) {
+				error = acpi_ReqSleepState(acpi_sc,
+				    acpi_sc->acpi_standby_sx);
+			} else {
+				printf(
+			"power off via apm standby not supported\n");
+				error = ENXIO;
+			}
+		} else
+			error = acpi_AckSleepState(clone, 0);
+		break;
+	case APMIO_NEXTEVENT:
+		printf("apm nextevent start\n");
+		ACPI_LOCK(acpi);
+		if (acpi_sc->acpi_next_sstate != 0 && clone->notify_status ==
+		    APM_EV_NONE) {
+			ev_info = (struct apm_event_info *)addr;
+			if (acpi_sc->acpi_next_sstate <= ACPI_STATE_S3)
+				ev_info->type = PMEV_STANDBYREQ;
+			else
+				ev_info->type = PMEV_SUSPENDREQ;
+			ev_info->index = 0;
+			clone->notify_status = APM_EV_NOTIFIED;
+			printf("apm event returning %d\n", ev_info->type);
+		} else
+			error = EAGAIN;
+		ACPI_UNLOCK(acpi);
+		break;
+	case APMIO_GETINFO_OLD:
+		if (acpi_capm_get_info(&info))
+			error = ENXIO;
+		aiop = (apm_info_old_t)addr;
+		aiop->ai_major = info.ai_major;
+		aiop->ai_minor = info.ai_minor;
+		aiop->ai_acline = info.ai_acline;
+		aiop->ai_batt_stat = info.ai_batt_stat;
+		aiop->ai_batt_life = info.ai_batt_life;
+		aiop->ai_status = info.ai_status;
+		break;
+	case APMIO_GETINFO:
+		if (acpi_capm_get_info((apm_info_t)addr))
+			error = ENXIO;
+		break;
+	case APMIO_GETPWSTATUS:
+		if (acpi_capm_get_pwstatus((apm_pwstatus_t)addr))
+			error = ENXIO;
+		break;
+	case APMIO_ENABLE:
+		if ((flag & FWRITE) == 0)
+			return (EPERM);
+		apm_active = 1;
+		break;
+	case APMIO_DISABLE:
+		if ((flag & FWRITE) == 0)
+			return (EPERM);
+		apm_active = 0;
+		break;
+	case APMIO_HALTCPU:
+		break;
+	case APMIO_NOTHALTCPU:
+		break;
+	case APMIO_DISPLAY:
+		if ((flag & FWRITE) == 0)
+			return (EPERM);
+		break;
+	case APMIO_BIOS:
+		if ((flag & FWRITE) == 0)
+			return (EPERM);
+		bzero(addr, sizeof(struct apm_bios_arg));
+		break;
+	default:
+		error = EINVAL;
+		break;
+	}
+
+	return (error);
+}
+
+static int
+apmwrite(struct cdev *dev, struct uio *uio, int ioflag)
+{
+	return (uio->uio_resid);
+}
+
+static int
+apmpoll(struct cdev *dev, int events, struct thread *td)
+{
+	struct	apm_clone_data *clone;
+	int revents;
+
+	revents = 0;
+	ACPI_LOCK(acpi);
+	clone = dev->si_drv1;
+	if (clone->acpi_sc->acpi_next_sstate)
+		revents |= events & (POLLIN | POLLRDNORM);
+	else
+		selrecord(td, &clone->sel_read);
+	ACPI_UNLOCK(acpi);
+	return (revents);
+}
+
+static int
+apmkqfilter(struct cdev *dev, struct knote *kn)
+{
+	struct	apm_clone_data *clone;
+
+	ACPI_LOCK(acpi);
+	clone = dev->si_drv1;
+	kn->kn_hook = clone;
+	kn->kn_fop = &apm_readfiltops;
+	knlist_add(&clone->sel_read.si_note, kn, 0);
+	ACPI_UNLOCK(acpi);
+	return (0);
+}
+
+static void
+apmreadfiltdetach(struct knote *kn)
+{
+	struct	apm_clone_data *clone;
+
+	ACPI_LOCK(acpi);
+	clone = kn->kn_hook;
+	knlist_remove(&clone->sel_read.si_note, kn, 0);
+	ACPI_UNLOCK(acpi);
+}
+
+static int
+apmreadfilt(struct knote *kn, long hint)
+{
+	struct	apm_clone_data *clone;
+	int	sleeping;
+
+	ACPI_LOCK(acpi);
+	clone = kn->kn_hook;
+	sleeping = clone->acpi_sc->acpi_next_sstate ? 1 : 0;
+	ACPI_UNLOCK(acpi);
+	return (sleeping);
+}
 
 int
 acpi_machdep_init(device_t dev)
@@ -59,15 +507,11 @@
 
 	sc = devclass_get_softc(devclass_find("acpi"), 0);
 
-	/* Create a fake clone for /dev/acpi. */
+	/* Create a clone for /dev/acpi also. */
 	STAILQ_INIT(&sc->apm_cdevs);
-	acpi_clone.cdev = sc->acpi_dev_t;
-	acpi_clone.acpi_sc = sc;
-	ACPI_LOCK(acpi);
-	STAILQ_INSERT_TAIL(&sc->apm_cdevs, &acpi_clone, entries);
-	ACPI_UNLOCK(acpi);
-	sc->acpi_clone = &acpi_clone;
-	acpi_install_wakeup_handler(sc);
+	sc->acpi_clone = apm_create_clone(sc->acpi_dev_t, sc);
+	clone_setup(&apm_clones);
+	EVENTHANDLER_REGISTER(dev_clone, apm_clone, 0, 1000);
 
 	if (intr_model != ACPI_INTR_PIC)
 		acpi_SetIntrModel(intr_model);
@@ -100,6 +544,246 @@
 }
 
 /*
+ * Support for mapping ACPI tables during early boot.  Currently this
+ * uses the crashdump map to map each table.  However, the crashdump
+ * map is created in pmap_bootstrap() right after the direct map, so
+ * we should be able to just use pmap_mapbios() here instead.
+ *
+ * This makes the following assumptions about how we use this KVA:
+ * pages 0 and 1 are used to map in the header of each table found via
+ * the RSDT or XSDT and pages 2 to n are used to map in the RSDT or
+ * XSDT.  This has to use 2 pages for the table headers in case a
+ * header spans a page boundary.
+ *
+ * XXX: We don't ensure the table fits in the available address space
+ * in the crashdump map.
+ */
+
+/*
+ * Map some memory using the crashdump map.  'offset' is an offset in
+ * pages into the crashdump map to use for the start of the mapping.
+ */
+static void *
+table_map(vm_paddr_t pa, int offset, vm_offset_t length)
+{
+	vm_offset_t va, off;
+	void *data;
+
+	off = pa & PAGE_MASK;
+	length = roundup(length + off, PAGE_SIZE);
+	pa = pa & PG_FRAME;
+	va = (vm_offset_t)pmap_kenter_temporary(pa, offset) +
+	    (offset * PAGE_SIZE);
+	data = (void *)(va + off);
+	length -= PAGE_SIZE;
+	while (length > 0) {
+		va += PAGE_SIZE;
+		pa += PAGE_SIZE;
+		length -= PAGE_SIZE;
+		pmap_kenter(va, pa);
+		invlpg(va);
+	}
+	return (data);
+}
+
+/* Unmap memory previously mapped with table_map(). */
+static void
+table_unmap(void *data, vm_offset_t length)
+{
+	vm_offset_t va, off;
+
+	va = (vm_offset_t)data;
+	off = va & PAGE_MASK;
+	length = roundup(length + off, PAGE_SIZE);
+	va &= ~PAGE_MASK;
+	while (length > 0) {
+		pmap_kremove(va);
+		invlpg(va);
+		va += PAGE_SIZE;
+		length -= PAGE_SIZE;
+	}
+}
+
+/*
+ * Map a table at a given offset into the crashdump map.  It first
+ * maps the header to determine the table length and then maps the
+ * entire table.
+ */
+static void *
+map_table(vm_paddr_t pa, int offset, const char *sig)
+{
+	ACPI_TABLE_HEADER *header;
+	vm_offset_t length;
+	void *table;
+
+	header = table_map(pa, offset, sizeof(ACPI_TABLE_HEADER));
+	if (strncmp(header->Signature, sig, ACPI_NAME_SIZE) != 0) {
+		table_unmap(header, sizeof(ACPI_TABLE_HEADER));
+		return (NULL);
+	}
+	length = header->Length;
+	table_unmap(header, sizeof(ACPI_TABLE_HEADER));
+	table = table_map(pa, offset, length);
+	if (ACPI_FAILURE(AcpiTbChecksum(table, length))) {
+		if (bootverbose)
+			printf("ACPI: Failed checksum for table %s\n", sig);
+		table_unmap(table, length);
+		return (NULL);
+	}
+	return (table);
+}
+
+/*
+ * See if a given ACPI table is the requested table.  Returns the
+ * length of the able if it matches or zero on failure.
+ */
+static int
+probe_table(vm_paddr_t address, const char *sig)
+{
+	ACPI_TABLE_HEADER *table;
+
+	table = table_map(address, 0, sizeof(ACPI_TABLE_HEADER));
+	if (table == NULL) {
+		if (bootverbose)
+			printf("ACPI: Failed to map table at 0x%jx\n",
+			    (uintmax_t)address);
+		return (0);
+	}
+	if (bootverbose)
+		printf("Table '%.4s' at 0x%jx\n", table->Signature,
+		    (uintmax_t)address);
+
+	if (strncmp(table->Signature, sig, ACPI_NAME_SIZE) != 0) {
+		table_unmap(table, sizeof(ACPI_TABLE_HEADER));
+		return (0);
+	}
+	table_unmap(table, sizeof(ACPI_TABLE_HEADER));
+	return (1);
+}
+
+/*
+ * Try to map a table at a given physical address previously returned
+ * by acpi_find_table().
+ */
+void *
+acpi_map_table(vm_paddr_t pa, const char *sig)
+{
+
+	return (map_table(pa, 0, sig));
+}
+
+/* Unmap a table previously mapped via acpi_map_table(). */
+void
+acpi_unmap_table(void *table)
+{
+	ACPI_TABLE_HEADER *header;
+
+	header = (ACPI_TABLE_HEADER *)table;
+	table_unmap(table, header->Length);
+}
+
+/*
+ * Return the physical address of the requested table or zero if one
+ * is not found.
+ */
+vm_paddr_t
+acpi_find_table(const char *sig)
+{
+	ACPI_PHYSICAL_ADDRESS rsdp_ptr;
+	ACPI_TABLE_RSDP *rsdp;
+	ACPI_TABLE_RSDT *rsdt;
+	ACPI_TABLE_XSDT *xsdt;

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Oct 15 12:16:04 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B495D1065676; Thu, 15 Oct 2009 12:16:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7907A1065670
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 12:16:04 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 66CB58FC17
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 12:16:04 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9FCG4aY005951
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 12:16:04 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9FCG4F6005949
	for perforce@freebsd.org; Thu, 15 Oct 2009 12:16:04 GMT
	(envelope-from mav@freebsd.org)
Date: Thu, 15 Oct 2009 12:16:04 GMT
Message-Id: <200910151216.n9FCG4F6005949@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169516 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Oct 2009 12:16:05 -0000

http://p4web.freebsd.org/chv.cgi?CH=169516

Change 169516 by mav@mav_mavtest on 2009/10/15 12:15:49

	Use only cam_periph_acquire() instead of cam_periph_hold() on
	init and device reset async. We can't sleep in async handler.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#29 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#29 (text+ko) ====

@@ -555,13 +555,16 @@
 	{
 		struct ada_softc *softc = (struct ada_softc *)periph->softc;
 
+		cam_periph_async(periph, code, path, arg);
+		if (softc->state != ADA_STATE_NORMAL)
+			break;
 		/*
 		 * Restore device configuration.
 		 */
 		softc->state = ADA_STATE_SET_MULTI;
-		(void)cam_periph_hold(periph, PRIBIO);
+		cam_periph_acquire(periph);
 		xpt_schedule(periph, CAM_PRIORITY_DEV);
-		/* FALLTHROUGH*/
+		break;
 	}
 	default:
 		cam_periph_async(periph, code, path, arg);
@@ -737,7 +740,7 @@
 	 * to finish the probe.  The reference will be dropped in adadone at
 	 * the end of probe.
 	 */
-	(void)cam_periph_hold(periph, PRIBIO);
+	cam_periph_acquire(periph);
 	xpt_schedule(periph, CAM_PRIORITY_DEV);
 
 	/*
@@ -1020,7 +1023,11 @@
 		 * operation.
 		 */
 		xpt_release_ccb(done_ccb);
-		cam_periph_unhold(periph);
+		if (bioq_first(&softc->bio_queue) != NULL) {
+			/* Have more work to do, so ensure we stay scheduled */
+			xpt_schedule(periph, CAM_PRIORITY_NORMAL);
+		}
+		cam_periph_release_locked(periph);
 		return;
 	}
 	case ADA_CCB_DUMP:

From owner-p4-projects@FreeBSD.ORG  Thu Oct 15 13:42:31 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1BE251065696; Thu, 15 Oct 2009 13:42:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D405F106568D
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 13:42:30 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C14588FC20
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 13:42:30 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9FDgUMr023284
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 13:42:30 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9FDgUNw023282
	for perforce@freebsd.org; Thu, 15 Oct 2009 13:42:30 GMT
	(envelope-from mav@freebsd.org)
Date: Thu, 15 Oct 2009 13:42:30 GMT
Message-Id: <200910151342.n9FDgUNw023282@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169517 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Oct 2009 13:42:31 -0000

http://p4web.freebsd.org/chv.cgi?CH=169517

Change 169517 by mav@mav_mavtest on 2009/10/15 13:41:46

	Make PMP to freeze child devices while resetting/scanning. 

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#8 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#8 (text+ko) ====

@@ -93,6 +93,7 @@
 	int			pm_step;
 	int			pm_try;
 	int			found;
+	int			frozen;
 	union			ccb saved_ccb;
 	struct task		sysctl_task;
 	struct sysctl_ctx_list	sysctl_ctx;
@@ -158,6 +159,49 @@
 }
 
 static void
+pmpfreeze(struct cam_periph *periph, int mask)
+{
+	struct pmp_softc *softc = (struct pmp_softc *)periph->softc;
+	struct cam_path *dpath;
+	int i;
+
+	for (i = 0; i < 15; i++) {
+		if ((mask & (1 << i)) == 0)
+			continue;
+		if (xpt_create_path(&dpath, periph,
+		    xpt_path_path_id(periph->path),
+		    i, 0) == CAM_REQ_CMP) {
+printf("PMP freeze: %d\n", i);
+			softc->frozen |= (1 << i);
+			cam_freeze_devq(dpath);
+			xpt_free_path(dpath);
+		}
+	}
+}
+
+static void
+pmprelease(struct cam_periph *periph, int mask)
+{
+	struct pmp_softc *softc = (struct pmp_softc *)periph->softc;
+	struct cam_path *dpath;
+	int i;
+
+	mask &= softc->frozen;
+	for (i = 0; i < 15; i++) {
+		if ((mask & (1 << i)) == 0)
+			continue;
+		if (xpt_create_path(&dpath, periph,
+		    xpt_path_path_id(periph->path),
+		    i, 0) == CAM_REQ_CMP) {
+printf("PMP release: %d\n", i);
+			softc->frozen &= ~(1 << i);
+			cam_release_devq(dpath, 0, 0, 0, FALSE);
+			xpt_free_path(dpath);
+		}
+	}
+}
+
+static void
 pmponinvalidate(struct cam_periph *periph)
 {
 	struct pmp_softc *softc;
@@ -249,6 +293,7 @@
 		cam_periph_async(periph, code, path, arg);
 		if (softc->state != PMP_STATE_NORMAL)
 			break;
+		pmpfreeze(periph, softc->found);
 		if (code == AC_SENT_BDR || code == AC_BUS_RESET)
 			softc->found = 0; /* We have to reset everything. */
 		softc->state = PMP_STATE_PORTS;
@@ -677,11 +722,13 @@
 		work_ccb->ccb_h.ppriv_ptr0 = done_ccb;
 		work_ccb->crcn.flags = done_ccb->crcn.flags;
 		xpt_action(work_ccb);
+		pmprelease(periph, 1 << softc->pm_step);
 		return;
 	default:
 		break;
 	}
 	softc->state = PMP_STATE_NORMAL;
+	pmprelease(periph, -1);
 	cam_periph_release_locked(periph);
 }
 

From owner-p4-projects@FreeBSD.ORG  Thu Oct 15 13:50:39 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 726E31065672; Thu, 15 Oct 2009 13:50:39 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 370F6106566C
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 13:50:39 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0B3038FC12
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 13:50:39 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9FDocYX023858
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 13:50:38 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9FDocrQ023856
	for perforce@freebsd.org; Thu, 15 Oct 2009 13:50:38 GMT
	(envelope-from mav@freebsd.org)
Date: Thu, 15 Oct 2009 13:50:38 GMT
Message-Id: <200910151350.n9FDocrQ023856@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169518 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Oct 2009 13:50:39 -0000

http://p4web.freebsd.org/chv.cgi?CH=169518

Change 169518 by mav@mav_mavtest on 2009/10/15 13:50:22

	Do not freeze device if somehow happen.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#9 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#9 (text+ko) ====

@@ -165,6 +165,7 @@
 	struct cam_path *dpath;
 	int i;
 
+	mask &= ~softc->frozen;
 	for (i = 0; i < 15; i++) {
 		if ((mask & (1 << i)) == 0)
 			continue;

From owner-p4-projects@FreeBSD.ORG  Thu Oct 15 14:07:57 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F1D041065695; Thu, 15 Oct 2009 14:07:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AECF5106568F
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 14:07:56 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9C5588FC1A
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 14:07:56 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9FE7u6m026127
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 14:07:56 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9FE7uWq026125
	for perforce@freebsd.org; Thu, 15 Oct 2009 14:07:56 GMT
	(envelope-from mav@freebsd.org)
Date: Thu, 15 Oct 2009 14:07:56 GMT
Message-Id: <200910151407.n9FE7uWq026125@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169519 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Oct 2009 14:07:57 -0000

http://p4web.freebsd.org/chv.cgi?CH=169519

Change 169519 by mav@mav_mavtest on 2009/10/15 14:07:09

	Clean debug messages a bit.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#10 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#10 (text+ko) ====

@@ -443,8 +443,8 @@
 		      pmp_default_timeout * 1000);
 		ata_pm_write_cmd(ataio, 2, softc->pm_step,
 		    (softc->found & (1 << softc->pm_step)) ? 0 : 1);
-printf("PM RESET %d %04x %d\n", softc->pm_step, softc->found,
-    (softc->found & (1 << softc->pm_step)) ? 0 : 1);
+printf("PM RESET %d%s\n", softc->pm_step,
+    (softc->found & (1 << softc->pm_step)) ? " skipping" : "");
 		break;
 	case PMP_STATE_CONNECT:
 		cam_fill_ataio(ataio,
@@ -706,7 +706,6 @@
 			xpt_release_ccb(done_ccb);
 			break;
 		}
-printf("XXX: scan %d %p %p\n", softc->pm_step, done_ccb, softc);
 		if (xpt_create_path(&dpath, periph,
 		    done_ccb->ccb_h.path_id,
 		    softc->pm_step, 0) != CAM_REQ_CMP) {

From owner-p4-projects@FreeBSD.ORG  Thu Oct 15 15:48:38 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BEF3E1065692; Thu, 15 Oct 2009 15:48:37 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8304B1065672
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 15:48:37 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6F2028FC17
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 15:48:37 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9FFmb7d034549
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 15:48:37 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9FFmbHP034547
	for perforce@freebsd.org; Thu, 15 Oct 2009 15:48:37 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 15 Oct 2009 15:48:37 GMT
Message-Id: <200910151548.n9FFmbHP034547@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169523 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Oct 2009 15:48:38 -0000

http://p4web.freebsd.org/chv.cgi?CH=169523

Change 169523 by rwatson@rwatson_cinnamon on 2009/10/15 15:48:00

	Add __BEGIN_DECLS/__END_DECLS to capability.h to make it (more)
	C++-friendly.
	
	Submitted by:	Jonathan Anderson

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#25 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#25 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#24 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#25 $
  */
 
 /*
@@ -39,6 +39,7 @@
 #ifndef _SYS_CAPABILITY_H_
 #define	_SYS_CAPABILITY_H_
 
+#include <sys/cdefs.h>
 #include <sys/types.h>
 
 /*
@@ -159,6 +160,7 @@
 
 #else /* !_KERNEL */
 
+__BEGIN_DECLS
 /*
  * cap_enter(): Cause the process to enter capability mode, which will
  * prevent it from directly accessing global namespaces.  System calls will
@@ -183,6 +185,7 @@
  * cap_getrights(): Query the rights on a capability.
  */
 int	cap_getrights(int fd, cap_rights_t *rightsp);
+__END_DECLS
 
 #endif /* !_KERNEL */
 

From owner-p4-projects@FreeBSD.ORG  Thu Oct 15 16:36:25 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 91EAE1065679; Thu, 15 Oct 2009 16:36:25 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 566801065672
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 16:36:25 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 42E5D8FC15
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 16:36:25 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9FGaPjL039060
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 16:36:25 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9FGaP9D039058
	for perforce@freebsd.org; Thu, 15 Oct 2009 16:36:25 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 15 Oct 2009 16:36:25 GMT
Message-Id: <200910151636.n9FGaP9D039058@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169524 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Oct 2009 16:36:25 -0000

http://p4web.freebsd.org/chv.cgi?CH=169524

Change 169524 by rwatson@rwatson_cinnamon on 2009/10/15 16:36:04

	Clean up fexec test tool, no dependence on uncommitted headers yet.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/tools/cap/fexec/fexec.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fexec/fexec.c#2 (text+ko) ====

@@ -1,7 +1,4 @@
 #include <sys/types.h>
-#include <sys/capability.h>
-#include <sys/poll.h>
-#include <sys/procdesc.h>
 
 #include <err.h>
 #include <fcntl.h>
@@ -16,7 +13,7 @@
 	int fd_exec;
 
 	if (argc < 2)
-		errx(-1, "usage: fdenter [commandline]");
+		errx(-1, "usage: fexec [commandline]");
 
 	fd_exec = open(argv[1], O_RDONLY);
 	if (fd_exec < 0)

From owner-p4-projects@FreeBSD.ORG  Thu Oct 15 16:40:29 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C23D31065679; Thu, 15 Oct 2009 16:40:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 87CD51065672
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 16:40:29 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 745398FC15
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 16:40:29 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9FGeTdR039365
	for <perforce@freebsd.org>; Thu, 15 Oct 2009 16:40:29 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9FGeTdQ039363
	for perforce@freebsd.org; Thu, 15 Oct 2009 16:40:29 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 15 Oct 2009 16:40:29 GMT
Message-Id: <200910151640.n9FGeTdQ039363@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169525 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Oct 2009 16:40:30 -0000

http://p4web.freebsd.org/chv.cgi?CH=169525

Change 169525 by rwatson@rwatson_vimage_client on 2009/10/15 16:39:49

	Use more appropriate format strings for 64-bit.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/sandbox_echo.c#9 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/sandbox_echo.c#9 (text+ko) ====

@@ -70,7 +70,7 @@
 		if (lch_rpc(lcsp, 0, &iov, 1, &iov, 1, &len) < 0)
 			err(-1, "lch_rpc");
 		if (len != sizeof(ch))
-			errx(-1, "lch_rpc returned size %d not %d", len,
+			errx(-1, "lch_rpc returned size %zu not %zu", len,
 			    sizeof(ch));
 		if (ch != i)
 			errx(-1, "lch_recv: expected %d and got %d", i, ch);

From owner-p4-projects@FreeBSD.ORG  Fri Oct 16 14:26:19 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5807D106568B; Fri, 16 Oct 2009 14:26:19 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 12333106566C
	for <perforce@freebsd.org>; Fri, 16 Oct 2009 14:26:19 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F28E08FC0C
	for <perforce@freebsd.org>; Fri, 16 Oct 2009 14:26:18 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9GEQIFS015516
	for <perforce@freebsd.org>; Fri, 16 Oct 2009 14:26:18 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9GEQIKB015514
	for perforce@freebsd.org; Fri, 16 Oct 2009 14:26:18 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 16 Oct 2009 14:26:18 GMT
Message-Id: <200910161426.n9GEQIKB015514@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169535 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Oct 2009 14:26:19 -0000

http://p4web.freebsd.org/chv.cgi?CH=169535

Change 169535 by rwatson@rwatson_vimage_client on 2009/10/16 14:26:11

	Fix types to build warning-free on amd64.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_world/sandbox_world.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_world/sandbox_world.c#5 (text+ko) ====

@@ -85,7 +85,7 @@
 	if (lch_rpc(lcsp, 0, &iov, 1, &iov, 1, &len) < 0)
 		err(-1, "lch_rpc");
 	if (len != sizeof(ch))
-		errx(-1, "lch_rpc returned size %d not %d", len, sizeof(ch));
+		errx(-1, "lch_rpc returned size %zd not %zd", len, sizeof(ch));
 	if (ch != 'X')
 		errx(-1, "lch_recv: expected %d and got %d", 'X', ch);
 

From owner-p4-projects@FreeBSD.ORG  Sat Oct 17 18:19:10 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 71DE31065679; Sat, 17 Oct 2009 18:19:10 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 351FA106566B
	for <perforce@FreeBSD.org>; Sat, 17 Oct 2009 18:19:09 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E19498FC14
	for <perforce@FreeBSD.org>; Sat, 17 Oct 2009 18:19:09 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9HIJ9CQ038846
	for <perforce@FreeBSD.org>; Sat, 17 Oct 2009 18:19:09 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9HIJ9f2038844
	for perforce@freebsd.org; Sat, 17 Oct 2009 18:19:09 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sat, 17 Oct 2009 18:19:09 GMT
Message-Id: <200910171819.n9HIJ9f2038844@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169547 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Oct 2009 18:19:10 -0000

http://p4web.freebsd.org/chv.cgi?CH=169547

Change 169547 by rene@rene_self on 2009/10/17 18:19:07

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#29 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/philip.key#2 integrate
.. //depot/projects/docproj_nl/www/en/administration.sgml#9 integrate
.. //depot/projects/docproj_nl/www/en/news/status/Makefile#7 integrate
.. //depot/projects/docproj_nl/www/en/news/status/report-2009-04-2009-09.xml#2 integrate
.. //depot/projects/docproj_nl/www/en/news/status/status.sgml#8 integrate
.. //depot/projects/docproj_nl/www/en/platforms/ppc.sgml#3 integrate
.. //depot/projects/docproj_nl/www/nl/administration.sgml#10 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#53 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#29 (text+ko) ====

@@ -9,7 +9,7 @@
 
     <corpauthor>The &os; Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.286 2009/08/13 15:51:59 rwatson Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.287 2009/10/15 05:41:12 ale Exp $</pubdate>
 
     <copyright>
       <year>1999</year>
@@ -127,7 +127,7 @@
 	    <entry>
 	      <literal>RELENG_6</literal> (6.X-STABLE), 
 	      <literal>RELENG_7</literal> (7.X-STABLE), 
-	      <literal>RELENG_8</literal> (7.X-STABLE), 
+	      <literal>RELENG_8</literal> (8.X-STABLE), 
 	      <literal>HEAD</literal> (-CURRENT)
 	    </entry>
 	  </row>

==== //depot/projects/docproj_nl/share/pgpkeys/philip.key#2 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/share/pgpkeys/philip.key,v 1.5 2007/11/18 11:36:54 philip Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/philip.key,v 1.6 2009/10/14 09:01:13 philip Exp $ -->
 <!--
 sh addkey.sh philip C5D34D05;
 -->
@@ -10,8 +10,8 @@
 uid                  Philip Paeps <philip@fosdem.org>
 uid                  Philip Paeps <philip@freebsd.org>
 uid                  Philip Paeps <philip@pub.telenet.be>
-sub   1024D/035EFC58 2006-10-22 [expires: 2008-10-21]
-sub   2048g/6E5FD7D6 2006-10-22 [expires: 2008-11-17]
+sub   1024D/035EFC58 2006-10-22 [expires: 2010-10-13]
+sub   2048g/6E5FD7D6 2006-10-22 [expires: 2010-10-14]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -236,744 +236,1874 @@
 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
-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
-eAAKCRBfLIShPrYEbejZAJ4/cA1B4JmqR5g5jvooGSZvya8liACfbzZLKezZAFdp
-F2HfYJKjA6NVQraIjQQQEQIATQUCRfGDJUYUgAAAAAAOAC8gZmFsY29AbTR4Lm9y
-Z2h0dHA6Ly9mYWxjYWwubmV0L2dwZy8weDAyMUM1QkQyLTB4QzVEMzREMDUuYXNj
-AAoJEKd8S94CHFvSBbIAn0O9v7RMedOfOOm6MrjqrHfDgaNuAKCTv7WyO28RpxHP
-OwVelEHUa1E2ZYi8BBABAgAGBQJF776SAAoJEO2iHpS1ZXFvHjUE/2qc1qF9Vx2g
-hTH5JbSqCeIK+mSol74wRmRb5Ry2ZzUwcx3Qix+a8vCw0ktVIq9uydaGugakcpqz
-4v4hDj9z8id9D7ZyBTaVi56p8k1B4vkpdVa9+7DxOwsM7z1Y1ZFrGo8CaHzOarSD
-dIy9l5gYd9ShNqYJsYgV0/olO0P/smvm7QD9VDU20cU6cqfJB4vEqJQTpVyqQKsf
-BkNTT6Q1zdGI9QQQEQIAtQUCRT5aDIcUgAAAAAAQAG5zaWdub3Rlc0BncmVwLmJl
-Imh0dHA6Ly93d3cuZ3JlcC5iZS9ncGcvNDI2NzEwMTNGOTRBMEFCRUI0Q0U5QjZE
-M0RGQzJDNjJBRjc5RDI5RS8zNTZCQUUwMjQ3NjNGNzM5MkZBMkU0MzgyNjQ5RTYy
-OEM1RDM0RDA1LmFzYyImGmh0dHA6Ly93d3cuZ3JlcC5iZS9ncGcvY2VydC1wb2xp
-Y3ktdjIACgkQPfwsYq950p7y+ACglRn+/KomOH070ny/dYKfw64G9R8Amwak44Dv
-Ob5zW1Qr9OEAnUsDpg8fiQEcBBABAgAGBQJFPLwsAAoJEILS9urEu56ffNMIAIK5
-ZdSglCpL6lfgJfqB+UpZ/1nhod8eiO1omWju09Ct7d07ZgH7lSkHKJghU2CCuTwi
-bScecvgLC3k4SZYGXVTHvro0fUi5ZBaDjDAE4y2XijY2vN1hfbf4BmxGWc1Aj+vV
-v0TYcHMOujUuHW02QEDrU6kZM6b0x+t37IBGqrwaqRJgBwMW0CIy5phNhoISOZwI
-rJ6GuOIctcYFR0AvYYwrKqEXUXJCaEvDVaI15oOipbhUbN2s7cgCruWTO3b/ayn/
-5aiyXOHTTyuS169laiVNZp2o+NzzmdJSs61Ax48bQyVkvpwIwl1Mr+BZgD1maifY
-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
-CgkQXyyEoT62BG0z/wCfUz0NkUHdQFAByg0Z5ld5qsZXC1wAn01/a40+PqeYLNlp
-CSba9mD88sLNiI0EEBECAE0FAkXxgyVGFIAAAAAADgAvIGZhbGNvQG00eC5vcmdo
-dHRwOi8vZmFsY2FsLm5ldC9ncGcvMHgwMjFDNUJEMi0weEM1RDM0RDA1LmFzYwAK
-CRCnfEveAhxb0ozMAKCSkVIWJt4NxkHOwMeTL4nvTKLP3ACgiR7dwRhFOLF62UHK
-uOpm/P8/6eCI9QQQEQIAtQUCRT5aDIcUgAAAAAAQAG5zaWdub3Rlc0BncmVwLmJl
-Imh0dHA6Ly93d3cuZ3JlcC5iZS9ncGcvNDI2NzEwMTNGOTRBMEFCRUI0Q0U5QjZE
-M0RGQzJDNjJBRjc5RDI5RS8zNTZCQUUwMjQ3NjNGNzM5MkZBMkU0MzgyNjQ5RTYy
-OEM1RDM0RDA1LmFzYyImGmh0dHA6Ly93d3cuZ3JlcC5iZS9ncGcvY2VydC1wb2xp
-Y3ktdjIACgkQPfwsYq950p4mugCfVjyHTpSiCMDnkggcdLmJTFDNrUAAn0Cm6oc2
-yjPEcjt0FzuFxNwsmyfGiQEcBBABAgAGBQJFPLwsAAoJEILS9urEu56fudwH/0Uj
-WYWlAtAfg9OnKzCH5KnwNnNiuhCWrXJvXO5lx+VS1ypJKox+8fNMDrQ4txis2Szs
-ApMJZOnfPHiEqcfXQTIqcVFJSamAvmvRTFjGmYHC3exD7g07qpB3wh0C6T5DA1xS
-I/lz/E+Kbd6XRtWvnqBlHc9NCsqUs9hZOuMpc53dVxxHXsZVvyOBNWQJVhJnCxDa
-G42q14iB83LySY/RkFywsTvm+h/THsNDgS8XCWSc67q3JaOzYTcIdCUhMJKAe8Uu
-o3q30p3W3ioOpidXxppoZMr4XtPP87+Gcsz967QKwaiauLDyd8wl/4KqpH5ukODj
-A/LHGggrOfcen3bmz0+JARwEEAECAAYFAkVXTTwACgkQLtRdZmGgc+lshgf/U66C
-+Oog9mGt+ZPv3kFRCc6UbTV2WegZEorJpFmNdabDRomBckybige9rPIPgQIo/F5l
-58sK2WLpM+yHR8FmtGr5DBkO5J3uQE59utvVE270Mvf3HkrU2Zlo6kz9foNhEQzJ
-lzPN+HEopmxSQQltUmZZUQanIUwQbUqwS0aJgTqrhIWvsH36XpjERuxe3dwERhbF
-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
-Z0km5dISlMJ9iJwEEAECAAYFAkVVzKsACgkQH3+pCANY/L2QuAP9EgKkqwfjWozW
-a3pdl47roBleOjQ7XIH02XldIE+IT5GznAN8syF4VtuAA7CF9O/AziDt4GItvRTv
-sM/m4Ir/yu+wijCElibAlppCtzhLNC6Igep7bbJtQ45w/rw0FGjMBK55yDbeGWZw
-028fPQjoiZflCXRCmBPlFhLG6l6O6g+IvAQQAQIABgUCRe++kwAKCRDtoh6UtWVx
-b08CBP9xgVRDdGx08+mJ3OqnTeG2zLHhGP3W6AqYxJDe5yJQqY52kl8Cv0+MTh5A
-QyD+rUoc7EsaU4eOlh2U2AY6wRkdcgbI0Vsp0LLqI9vf+6F8RZdwpUwSSva4o31u
-BDfEwdHcueaojCvz9/vbJhfHQxdg3lN+wN0baCeV8ICOZZ5kOF2gFHA6cR0LYjoS
-HZAoKVuAZK7ndX9JKySmWvKkyf++iPUEEBECALUFAkU+WgyHFIAAAAAAEABuc2ln
-bm90ZXNAZ3JlcC5iZSJodHRwOi8vd3d3LmdyZXAuYmUvZ3BnLzQyNjcxMDEzRjk0
-QTBBQkVCNENFOUI2RDNERkMyQzYyQUY3OUQyOUUvMzU2QkFFMDI0NzYzRjczOTJG
-QTJFNDM4MjY0OUU2MjhDNUQzNEQwNS5hc2MiJhpodHRwOi8vd3d3LmdyZXAuYmUv
-Z3BnL2NlcnQtcG9saWN5LXYyAAoJED38LGKvedKenTkAn3QOdXkMFPfJhiBm4i/o
-hXqO4F2pAJ4n7zcGVpJQsAbveLYY3c+8tyeNUIkBHAQQAQIABgUCRTy8LAAKCRCC
-0vbqxLuenwG3CACYPg1kOuAhcWcfMUutsWbZZcQkNGke3IsP9lCyDlr8pk/emtg+
-jwTosrGFZr13smjdcKc5nHqvNT7JgNc7xs9p6MTjSdltYT8ouVLgl9lH40bL/3+G
-xj01R5wBxpoyiVg72Qi1USivu683xsGgC6rrYKOTTrWdUn0L308178fFPoBSuItF
-KYF/AZI+FLdei8gmEogo6cP+4Q0K3nP7XE+yYEp/od2RYcnuVHqHcB3D9x0FHubQ
-nQ0jMZZYOmoeXFO1WcIb79Tb8Dmw6sVdekn37o/tfpFFYt9roj6RtMGMxDk/Uwi4
-1VdQtrO0ljEfxQYUeFAq89Ul8aDf11C2sPcriQEcBBABAgAGBQJFV008AAoJEC7U
-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
+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

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Oct 17 18:33:25 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 00399106566C; Sat, 17 Oct 2009 18:33:25 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A060E106568B
	for <perforce@FreeBSD.org>; Sat, 17 Oct 2009 18:33:24 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8E0C38FC0C
	for <perforce@FreeBSD.org>; Sat, 17 Oct 2009 18:33:24 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9HIXOYi039916
	for <perforce@FreeBSD.org>; Sat, 17 Oct 2009 18:33:24 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9HIXO5M039914
	for perforce@freebsd.org; Sat, 17 Oct 2009 18:33:24 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sat, 17 Oct 2009 18:33:24 GMT
Message-Id: <200910171833.n9HIXO5M039914@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169548 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Oct 2009 18:33:25 -0000

http://p4web.freebsd.org/chv.cgi?CH=169548

Change 169548 by rene@rene_self on 2009/10/17 18:33:23

	[website]
	MFen nl/administration.sgml 1.26 -> 1.30

Affected files ...

.. //depot/projects/docproj_nl/www/nl/administration.sgml#11 edit

Differences ...

==== //depot/projects/docproj_nl/www/nl/administration.sgml#11 (text+ko) ====

@@ -7,7 +7,7 @@
 <!--
      Vertaald door: Rene Ladan
      %SOURCE%	en/administration.sgml
-     %SRCID%	1.26
+     %SRCID%	1.30
 -->
 <html>
   &header;
@@ -29,7 +29,6 @@
     <li>Uitgavebeheer
       <ul>
 	<li><a href="#t-re">Primaire Uitgave Beheerteam</a></li>
-	<li><a href="#t-re-alpha">&os;/alpha Uitgave Beheerteam</a></li>
 	<li><a href="#t-re-amd64">&os;/amd64 Uitgave Beheerteam</a></li>
 	<li><a href="#t-re-ia64">&os;/ia64 Uitgave Beheerteam</a></li>
 	<li><a href="#t-re-x86">&os;/i386 Uitgave Beheerteam</a></li>
@@ -112,7 +111,7 @@
     <li>&a.nik; &lt;<a href="mailto:nik@FreeBSD.org">nik@FreeBSD.org</a>&gt;</li>
     <li>&a.blackend; &lt;<a href="mailto:blackend@FreeBSD.org">blackend@FreeBSD.org</a>&gt;</li>
     <li>&a.hrs; &lt;<a href="mailto:hrs@FreeBSD.org">hrs@FreeBSD.org</a>&gt;</li>
-    <li>&a.murray; &lt;<a href="mailto:murray@FreeBSD.org">murray@FreeBSD.org</a>&gt;</li>
+    <li>&a.keramida; &lt;<a href="mailto:keramida@FreeBSD.org">keramida@FreeBSD.org</a>&gt;</li>
   </ul>
 
   <h3><a name="t-portmgr">&os; Port Beheerteam</a>
@@ -146,10 +145,10 @@
   <p>Het Primaire Uitgave Beheerteam is onder andere verantwoordelijk
     voor het maken en publiceren van uitgaveschema's voor offici&euml;le
     projectuitgaven van &os;, het aankondigen van code freezes en het
-    beheren van RELENG_* takken.  De <a href="../en/releng/charter.html">uitgave
-      engineering team richtlijnen</a> geven een gedetailleerdere beschrijving
-    van de plichten en verantwoordelijkheden van het Primaire Uitgave
-    Beheerteam.</p>
+    beheren van <code>RELENG_*</code>-takken.  De <a
+      href="../en/releng/charter.html">richtlijnen van het uitgave engineering
+      team</a> geven een gedetailleerdere beschrijving van de plichten en
+    verantwoordelijkheden van het Primaire Uitgave Beheerteam.</p>
 
   <ul>
     <li>&a.kib; &lt;<a href="mailto:kib@FreeBSD.org">kib@FreeBSD.org</a>&gt;</li>
@@ -160,23 +159,11 @@
     <li>&a.hrs; &lt;<a href="mailto:hrs@FreeBSD.org">hrs@FreeBSD.org</a>&gt;</li>
     <li>&a.kensmith; &lt;<a href="mailto:kensmith@FreeBSD.org">kensmith@FreeBSD.org</a>&gt;
       (Hoofd)</li>
-    <li>&a.murray; &lt;<a href="mailto:murray@FreeBSD.org">murray@FreeBSD.org</a>&gt;</li>
     <li>&a.rwatson; &lt;<a href="mailto:rwatson@FreeBSD.org">rwatson@FreeBSD.org</a>&gt;</li>
     <li>&a.dwhite; &lt;<a href="mailto:dwhite@FreeBSD.org">dwhite@FreeBSD.org</a>&gt;</li>
     <li>&a.bz; &lt;<a href="mailto:bz@FreeBSD.org">bz@FreeBSD.org</a>&gt;</li>
   </ul>
 
-  <h3><a name="t-re-alpha">&os;/alpha Uitgave Beheerteam</a>
-    &lt;<a href="mailto:re-alpha@FreeBSD.org">re-alpha@FreeBSD.org</a>&gt;</h3>
-
-  <p>Het &os;/alpha Uitgave Beheerteam is verantwoordelijk voor specifieke
-    uitgavekwesties die aan het &os;/alpha-platform gerelateerd zijn.</p>
-
-  <ul>
-    <li>&a.murray; &lt;<a href="mailto:murray@FreeBSD.org">murray@FreeBSD.org</a>&gt;</li>
-    <li>&a.rwatson; &lt;<a href="mailto:rwatson@FreeBSD.org">rwatson@FreeBSD.org</a>&gt;</li>
-  </ul>
-
   <h3><a name="t-re-amd64">&os;/amd64 Uitgave Beheerteam</a>
     &lt;<a href="mailto:re-amd64@FreeBSD.org">re-amd64@FreeBSD.org</a>&gt;</h3>
 
@@ -204,7 +191,6 @@
     uitgavekwesties die aan het &os;/i386-platform gerelateerd zijn.</p>
 
   <ul>
-    <li>&a.murray; &lt;<a href="mailto:murray@FreeBSD.org">murray@FreeBSD.org</a>&gt;</li>
     <li>&a.rwatson; &lt;<a href="mailto:rwatson@FreeBSD.org">rwatson@FreeBSD.org</a>&gt;</li>
   </ul>
 
@@ -241,7 +227,6 @@
     <li>&a.tmm; &lt;<a href="mailto:tmm@FreeBSD.org">tmm@FreeBSD.org</a>&gt;</li>
     <li>&a.obrien; &lt;<a href="mailto:obrien@FreeBSD.org">obrien@FreeBSD.org</a>&gt;</li>
     <li>&a.kensmith; &lt;<a href="mailto:kensmith@FreeBSD.org">kensmith@FreeBSD.org</a>&gt;</li>
-    <li>&a.murray; &lt;<a href="mailto:murray@FreeBSD.org">murray@FreeBSD.org</a>&gt;</li>
     <li>&a.rwatson; &lt;<a href="mailto:rwatson@FreeBSD.org">rwatson@FreeBSD.org</a>&gt;</li>
   </ul>