From owner-p4-projects@FreeBSD.ORG  Sun Aug  2 11:56:26 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E2F0F1065672; Sun,  2 Aug 2009 11:56: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 A29B1106566B
	for <perforce@freebsd.org>; Sun,  2 Aug 2009 11:56:25 +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 7638C8FC12
	for <perforce@freebsd.org>; Sun,  2 Aug 2009 11:56:25 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n72BuPEr085605
	for <perforce@freebsd.org>; Sun, 2 Aug 2009 11:56:25 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n72BuPfM085603
	for perforce@freebsd.org; Sun, 2 Aug 2009 11:56:25 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 2 Aug 2009 11:56:25 GMT
Message-Id: <200908021156.n72BuPfM085603@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 166922 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, 02 Aug 2009 11:56:27 -0000

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

Change 166922 by trasz@trasz_anger on 2009/08/02 11:56:19

	Fix adding new rules via setrlimit(2).

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#36 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#16 edit

Differences ...

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

@@ -734,7 +734,14 @@
 	struct hrl_rule *rule;
 
 	rule = uma_zalloc(hrl_rule_zone, M_WAITOK);
+	rule->hr_subject = HRL_SUBJECT_UNDEFINED;
+	rule->hr_subject_id = HRL_SUBJECT_ID_UNDEFINED;
+	rule->hr_per = HRL_SUBJECT_UNDEFINED;
+	rule->hr_resource = HRL_RESOURCE_UNDEFINED;
+	rule->hr_action = HRL_ACTION_UNDEFINED;
+	rule->hr_amount = -1;
 	refcount_init(&rule->hr_refcount, 1);
+
 	return (rule);
 }
 
@@ -743,13 +750,14 @@
 {
 	struct hrl_rule *copy;
 
-	copy = hrl_rule_alloc();
+	copy = uma_zalloc(hrl_rule_zone, M_WAITOK);
 	copy->hr_subject = rule->hr_subject;
 	copy->hr_subject_id = rule->hr_subject_id;
 	copy->hr_per = rule->hr_per;
 	copy->hr_resource = rule->hr_resource;
 	copy->hr_action = rule->hr_action;
 	copy->hr_amount = rule->hr_amount;
+	refcount_init(&copy->hr_refcount, 1);
 
 	return (copy);
 }

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

@@ -712,23 +712,32 @@
 		panic("hrl_handle_setrlimit: unknown limit %d", which);
 	}
 
+	/*
+	 * Remove a previous limit that might exist for the resource
+	 * with a different hr_amount.
+	 */
+	hrl_rule_remove(rule);
+
+	/*
+	 * For rules with action different than "deny", we add another
+	 * rule, "deny".
+	 */
+	if (rule->hr_action != HRL_ACTION_DENY) {
+		rule2 = hrl_rule_duplicate(rule);
+		rule2->hr_action = HRL_ACTION_DENY;
+		hrl_rule_remove(rule2);
+
+		if (lim->rlim_cur != RLIM_INFINITY) {
+			rule2->hr_amount = lim->rlim_cur;
+			hrl_rule_add(rule2);
+		}
+		hrl_rule_release(rule2);
+	}
+
 	if (lim->rlim_cur != RLIM_INFINITY) {
 		rule->hr_amount = lim->rlim_cur;
 		hrl_rule_add(rule);
-		if (rule->hr_action != HRL_ACTION_DENY) {
-			rule2 = hrl_rule_duplicate(rule);
-			rule2->hr_action = HRL_ACTION_DENY;
-			hrl_rule_add(rule2);
-			hrl_rule_release(rule2);
-		}
-	} else {
-		hrl_rule_remove(rule);
-		if (rule->hr_action != HRL_ACTION_DENY) {
-			rule->hr_action = HRL_ACTION_DENY;
-			hrl_rule_remove(rule);
-		}
 	}
-
 	hrl_rule_release(rule);
 }