From owner-p4-projects@FreeBSD.ORG  Wed Sep 15 18:33:13 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 095201065675; Wed, 15 Sep 2010 18:33: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 C054B1065672
	for <perforce@freebsd.org>; Wed, 15 Sep 2010 18:33:12 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id AEA228FC1C
	for <perforce@freebsd.org>; Wed, 15 Sep 2010 18:33:12 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8FIXCvC064976
	for <perforce@freebsd.org>; Wed, 15 Sep 2010 18:33:12 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8FIXCCM064973
	for perforce@freebsd.org; Wed, 15 Sep 2010 18:33:12 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 15 Sep 2010 18:33:12 GMT
Message-Id: <201009151833.o8FIXCCM064973@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 183814 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, 15 Sep 2010 18:33:13 -0000

http://p4web.freebsd.org/@@183814?ac=10

Change 183814 by trasz@trasz_victim on 2010/09/15 18:32:12

	Drop a wrong KASSERT, break out resetting per-vmspace counters
	into its own routine.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#9 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#21 edit

Differences ...

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

@@ -2438,11 +2438,6 @@
 	vm_map_entry_t cur;
 	int count = 0;
 
-#if 0
-	/* Panics the kernel at startup. */
-	KASSERT(vm_map_locked(map), ("vm_map not locked"));
-#endif
-
 	for (cur = map->header.next; cur != &map->header; cur = cur->next) {
 		vm_object_t object;
 

==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#21 (text+ko) ====

@@ -311,6 +311,20 @@
 	    vmspace_zinit, vmspace_zfini, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
 }
 
+#ifdef CONTAINERS
+static void
+vmspace_container_reset(struct proc *p)
+{
+
+	rusage_set(p, RUSAGE_DATA, 0);
+	rusage_set(p, RUSAGE_STACK, 0);
+	rusage_set(p, RUSAGE_RSS, 0);
+	rusage_set(p, RUSAGE_MEMLOCK, 0);
+	rusage_set(p, RUSAGE_VMEM, 0);
+	rusage_set(p, RUSAGE_SWAP, 0);
+}
+#endif
+
 static inline void
 vmspace_dofree(struct vmspace *vm)
 {
@@ -413,12 +427,7 @@
 		vmspace_dofree(vm);
 	}
 #ifdef CONTAINERS
-	rusage_set(p, RUSAGE_DATA, 0);
-	rusage_set(p, RUSAGE_STACK, 0);
-	rusage_set(p, RUSAGE_RSS, 0);
-	rusage_set(p, RUSAGE_MEMLOCK, 0);
-	rusage_set(p, RUSAGE_VMEM, 0);
-	rusage_set(p, RUSAGE_SWAP, 0);
+	vmspace_container_reset(p);
 #endif
 }