From owner-p4-projects@FreeBSD.ORG  Sun Aug 16 14:21: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 43A83106568F; Sun, 16 Aug 2009 14:21: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 EDB56106568D
	for <perforce@freebsd.org>; Sun, 16 Aug 2009 14:21:48 +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 C34058FC52
	for <perforce@freebsd.org>; Sun, 16 Aug 2009 14:21: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 n7GELmbk072309
	for <perforce@freebsd.org>; Sun, 16 Aug 2009 14:21:48 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7GELm1o072307
	for perforce@freebsd.org; Sun, 16 Aug 2009 14:21:48 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 16 Aug 2009 14:21:48 GMT
Message-Id: <200908161421.n7GELm1o072307@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 167408 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, 16 Aug 2009 14:21:49 -0000

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

Change 167408 by trasz@trasz_anger on 2009/08/16 14:20:54

	Even more KASSERTs.

Affected files ...

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

Differences ...

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

@@ -120,14 +120,13 @@
 
 MALLOC_DEFINE(M_HRL, "hrl", "Hierarchical Resource Limits");
 
-#ifdef INVARIANTS
+#ifdef DIAGNOSTIC
 /*
  * Go through the resource usage info and verify that it makes sense.
  */
 static void
 hrl_assert_proc(const struct proc *p __unused)
 {
-#ifdef notyet
 	int i, resource;
 	struct ucred *cred;
 	struct prison *pr;
@@ -139,18 +138,29 @@
 		    ("resource usage propagation meltdown"));
 	KASSERT(cred->cr_ruidinfo->ui_usage.hu_resources[resource] >= 0,
 	    ("resource usage propagation meltdown"));
-	for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
+	KASSERT(cred->cr_ruidinfo->ui_usage.hu_resources[resource] >=
+	    p->p_usage.hu_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,
 		    ("resource usage propagation meltdown"));
+		KASSERT(pr->pr_usage.hu_resources[resource] >=
+	    	    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"));
+			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
 }
-#endif /* INVARIANTS */
+#endif /* DIAGNOSTIC */
 
 void
 hrl_proc_exiting(struct proc *p)
@@ -507,7 +517,7 @@
 			continue;
 		}
 	}
-#ifdef INVARIANTS
+#ifdef DIAGNOSTIC
 	hrl_assert_proc(p);
 #endif
 	mtx_unlock(&hrl_lock);
@@ -571,7 +581,7 @@
 			continue;
 		}
 	}
-#ifdef INVARIANTS
+#ifdef DIAGNOSTIC
 	hrl_assert_proc(p);
 #endif
 	mtx_unlock(&hrl_lock);
@@ -626,7 +636,7 @@
 			continue;
 		}
 	}
-#ifdef INVARIANTS
+#ifdef DIAGNOSTIC
 	hrl_assert_proc(p);
 #endif
 	mtx_unlock(&hrl_lock);