From owner-p4-projects@FreeBSD.ORG  Thu Dec 23 13:22:07 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9C3541065670; Thu, 23 Dec 2010 13:22:07 +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 5C0FE106566B
	for <perforce@freebsd.org>; Thu, 23 Dec 2010 13:22:07 +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 49A178FC12
	for <perforce@freebsd.org>; Thu, 23 Dec 2010 13:22:07 +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 oBNDM7xw037185
	for <perforce@freebsd.org>; Thu, 23 Dec 2010 13:22:07 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oBNDM75v037182
	for perforce@freebsd.org; Thu, 23 Dec 2010 13:22:07 GMT
	(envelope-from trasz@freebsd.org)
Date: Thu, 23 Dec 2010 13:22:07 GMT
Message-Id: <201012231322.oBNDM75v037182@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 187160 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, 23 Dec 2010 13:22:07 -0000

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

Change 187160 by trasz@trasz_victim on 2010/12/23 13:21:05

	Fix error handling in vslock().

Affected files ...

.. //depot/projects/soc2009/trasz_limits/TODO#36 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_glue.c#11 edit

Differences ...

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

@@ -100,6 +100,8 @@
    to be investigated; there are many of them and it wouldn't be user-friendly
    to add ten new resource counters.
 
+ - What about RLIMIT_RTPRIO and RLIMIT_RTTIME?  Linux seems to have these.
+
 HRL-specific issues:
 
  - Reconsider setrlimit(2) handling.

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

@@ -200,8 +200,7 @@
 	PROC_LOCK(curproc);
 	nsize = ptoa(npages +
 	    pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map)));
-	if (nsize > lim_cur(curproc, RLIMIT_MEMLOCK) ||
-	    rusage_set(curproc, RUSAGE_MEMLOCK, nsize) != 0) {
+	if (nsize > lim_cur(curproc, RLIMIT_MEMLOCK)) {
 		PROC_UNLOCK(curproc);
 		return (ENOMEM);
 	}
@@ -219,10 +218,12 @@
 	if (npages + cnt.v_wire_count > vm_page_max_wired)
 		return (EAGAIN);
 #endif
+	if (rusage_set(curproc, RUSAGE_MEMLOCK, nsize))
+		return (ENOMEM);
 	error = vm_map_wire(&curproc->p_vmspace->vm_map, start, end,
 	    VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES);
 	if (error != KERN_SUCCESS)
-		rusage_sub(curproc, RUSAGE_MEMLOCK, 
+		rusage_set(curproc, RUSAGE_MEMLOCK, 
 		    ptoa(pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map))));
 	/*
 	 * Return EFAULT on error to match copy{in,out}() behaviour