From owner-p4-projects@FreeBSD.ORG  Sun Feb 13 13:53:02 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F0EA91065674; Sun, 13 Feb 2011 13:53:01 +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 B396B1065673
	for <perforce@freebsd.org>; Sun, 13 Feb 2011 13:53:01 +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 9F9D48FC0A
	for <perforce@freebsd.org>; Sun, 13 Feb 2011 13:53:01 +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 p1DDr1pd062389
	for <perforce@freebsd.org>; Sun, 13 Feb 2011 13:53:01 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p1DDr1BV062386
	for perforce@freebsd.org; Sun, 13 Feb 2011 13:53:01 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 13 Feb 2011 13:53:01 GMT
Message-Id: <201102131353.p1DDr1BV062386@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 188779 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: Sun, 13 Feb 2011 13:53:02 -0000

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

Change 188779 by trasz@trasz_victim on 2011/02/13 13:52:11

	Fix logic error that could make vm_daemon() to loop indefinitely.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#29 edit

Differences ...

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

@@ -1636,7 +1636,7 @@
 	struct proc *p;
 	struct thread *td;
 	struct vmspace *vm;
-	int breakout, swapout_flags, tryagain;
+	int breakout, swapout_flags, tryagain, attempts;
 	uint64_t rsize, ravailable;
 
 	while (TRUE) {
@@ -1657,7 +1657,9 @@
 		 * process is swapped out -- deactivate pages
 		 */
 		tryagain = 0;
+		attempts = 0;
 again:
+		attempts++;
 		sx_slock(&allproc_lock);
 		FOREACH_PROC_IN_SYSTEM(p) {
 			vm_pindex_t limit, size;
@@ -1732,8 +1734,6 @@
 				 * been exceeded by some memory hog.  Don't
 				 * try to deactivate more than 1/4th of process'
 				 * resident set size.
-				 *
-				 * XXX: Reconsider.
 				 */
 				if (ravailable < rsize - (rsize / 4))
 					ravailable = rsize - (rsize / 4);
@@ -1746,19 +1746,18 @@
 				rusage_set(p, RUSAGE_RSS, rsize);
 				PROC_UNLOCK(p);
 				if (rsize > ravailable)
-					tryagain++;
-				if (tryagain > 20) {
-#if 0
-					printf("still too much: rsize = %ju, ravailable = %ju\n",
-					    (uintmax_t)rsize, (uintmax_t)ravailable);
+					tryagain = 1;
+				if (attempts == 10) {
+#if 1
+					printf("still too much: pid %d (%s), rsize = %ju, ravailable = %ju\n",
+					    p->p_pid, p->p_comm, (uintmax_t)rsize, (uintmax_t)ravailable);
 #endif
-					tryagain = 0;
 				}
 			}
 			vmspace_free(vm);
 		}
 		sx_sunlock(&allproc_lock);
-		if (tryagain != 0)
+		if (tryagain != 0 && attempts <= 10)
 			goto again;
 	}
 }