From owner-p4-projects@FreeBSD.ORG  Thu Dec 23 17:38:51 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E31371065672; Thu, 23 Dec 2010 17:38:50 +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 A5EBE106564A
	for <perforce@freebsd.org>; Thu, 23 Dec 2010 17:38:50 +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 5C0478FC14
	for <perforce@freebsd.org>; Thu, 23 Dec 2010 17:38:50 +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 oBNHcoh3088424
	for <perforce@freebsd.org>; Thu, 23 Dec 2010 17:38:50 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oBNHcoen088421
	for perforce@freebsd.org; Thu, 23 Dec 2010 17:38:50 GMT
	(envelope-from trasz@freebsd.org)
Date: Thu, 23 Dec 2010 17:38:50 GMT
Message-Id: <201012231738.oBNHcoen088421@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 187163 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 17:38:51 -0000

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

Change 187163 by trasz@trasz_victim on 2010/12/23 17:37:47

	Rework swap usage accounting.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#16 edit

Differences ...

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

@@ -192,6 +192,9 @@
 	if (incr & PAGE_MASK)
 		panic("swap_reserve: & PAGE_MASK");
 
+	if (rusage_add(curproc, RUSAGE_SWAP, incr))
+		return (0);
+
 	res = 0;
 	mtx_lock(&sw_dev_mtx);
 	r = swap_reserved + incr;
@@ -211,12 +214,7 @@
 	if (res) {
 		PROC_LOCK(curproc);
 		UIDINFO_VMSIZE_LOCK(uip);
-		/*
-		 * XXX: What if rusage_add() succeeds, and lim_cur() check fails?
-		 */
-		if (
-		    rusage_add(curproc, RUSAGE_SWAP, incr) &&
-		    (overcommit & SWAP_RESERVE_RLIMIT_ON) != 0 &&
+		if ((overcommit & SWAP_RESERVE_RLIMIT_ON) != 0 &&
 		    uip->ui_vmsize + incr > lim_cur(curproc, RLIMIT_SWAP) &&
 		    priv_check(curthread, PRIV_VM_SWAP_NORLIMIT))
 			res = 0;
@@ -235,6 +233,9 @@
 		    curproc->p_pid, uip->ui_uid, incr);
 	}
 
+	if (!res)
+		rusage_sub(curproc, RUSAGE_SWAP, incr);
+
 	return (res);
 }