From owner-p4-projects@FreeBSD.ORG Thu Aug 6 18:50:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44D8F1065674; Thu, 6 Aug 2009 18: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 055141065672 for ; Thu, 6 Aug 2009 18:50:39 +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 CE3FD8FC08 for ; Thu, 6 Aug 2009 18:50:38 +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 n76Iockp083261 for ; Thu, 6 Aug 2009 18:50:38 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n76IocRx083259 for perforce@freebsd.org; Thu, 6 Aug 2009 18:50:38 GMT (envelope-from trasz@freebsd.org) Date: Thu, 6 Aug 2009 18:50:38 GMT Message-Id: <200908061850.n76IocRx083259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 167069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Aug 2009 18:50:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=167069 Change 167069 by trasz@trasz_anger on 2009/08/06 18:49:56 Use only cr_ruidinfo, not cr_uidinfo - for simplicity. Might add it back later, should it prove useful. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#47 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#18 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#47 (text+ko) ==== @@ -249,9 +249,6 @@ struct sbuf *sb; /* - * XXX: Check maxfilesperproc. - */ - /* * XXX: Do this just before we start running on a CPU, not all the time. */ hrl_compute_available(p, &available, &rules); @@ -266,12 +263,6 @@ * into proper one for the situation - EFSIZ, ENOMEM etc. */ return (EDOOFUS); - case HRL_ACTION_DELAY: - /* - * XXX: Think whether we actually can and want to do this. - */ - printf("hrl_enforce_proc: XXX, \"delay\" unimplemented.\n"); - return (0); case HRL_ACTION_LOG: sb = sbuf_new_auto(); hrl_rule_to_sbuf(sb, rules[resource]); @@ -372,8 +363,6 @@ p->p_usage.hu_resources[resource] += amount; cred = p->p_ucred; cred->cr_ruidinfo->ui_usage.hu_resources[resource] += amount; - if (cred->cr_ruidinfo != cred->cr_uidinfo) - cred->cr_uidinfo->ui_usage.hu_resources[resource] += amount; for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent) pr->pr_usage.hu_resources[resource] += amount; /* @@ -436,8 +425,6 @@ p->p_usage.hu_resources[resource] = amount; cred = p->p_ucred; cred->cr_ruidinfo->ui_usage.hu_resources[resource] += diff; - if (cred->cr_ruidinfo != cred->cr_uidinfo) - cred->cr_uidinfo->ui_usage.hu_resources[resource] += diff; for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent) pr->pr_usage.hu_resources[resource] += diff; /* @@ -493,8 +480,6 @@ p->p_usage.hu_resources[resource] -= amount; cred = p->p_ucred; cred->cr_ruidinfo->ui_usage.hu_resources[resource] -= amount; - if (cred->cr_ruidinfo != cred->cr_uidinfo) - cred->cr_uidinfo->ui_usage.hu_resources[resource] -= amount; for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent) pr->pr_usage.hu_resources[resource] -= amount; /* @@ -922,6 +907,9 @@ rule->hr_per == HRL_SUBJECT_GROUP) && !hrl_group_accounting) return (EOPNOTSUPP); + if (rule->hr_action == HRL_ACTION_DELAY) + return (EOPNOTSUPP); + /* * Make sure there are no duplicated rules. */ ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#18 (text+ko) ==== @@ -2189,16 +2189,6 @@ PROC_LOCK_ASSERT(p, MA_OWNED); /* - * Fix up per-euid resource consumption. - */ - newuip = newcred->cr_uidinfo; - olduip = p->p_ucred->cr_uidinfo; - if (newuip != olduip) { - hrl_usage_subtract(&olduip->ui_usage, &p->p_usage); - hrl_usage_add(&newuip->ui_usage, &p->p_usage); - } - - /* * Fix up per-ruid resource consumption. */ newuip = newcred->cr_ruidinfo;