From owner-svn-src-user@freebsd.org  Fri Aug  5 16:49:33 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BF951BB0709
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri,  5 Aug 2016 16:49:33 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8FC241BBF;
 Fri,  5 Aug 2016 16:49:33 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u75GnWSB049620;
 Fri, 5 Aug 2016 16:49:32 GMT (envelope-from alc@FreeBSD.org)
Received: (from alc@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u75GnWJ7049619;
 Fri, 5 Aug 2016 16:49:32 GMT (envelope-from alc@FreeBSD.org)
Message-Id: <201608051649.u75GnWJ7049619@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org
 using -f
From: Alan Cox <alc@FreeBSD.org>
Date: Fri, 5 Aug 2016 16:49:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r303774 - user/alc/PQ_LAUNDRY/sys/vm
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Aug 2016 16:49:33 -0000

Author: alc
Date: Fri Aug  5 16:49:32 2016
New Revision: 303774
URL: https://svnweb.freebsd.org/changeset/base/303774

Log:
  A second attempt at avoiding spurious "cycle" decrements.

Modified:
  user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c

Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c	Fri Aug  5 16:44:11 2016	(r303773)
+++ user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c	Fri Aug  5 16:49:32 2016	(r303774)
@@ -1078,6 +1078,7 @@ vm_pageout_laundry_worker(void *arg)
 	 * The pageout laundry worker is never done, so loop forever.
 	 */
 	for (;;) {
+		KASSERT(cycle >= 0, ("negative cycle %d", cycle));
 		KASSERT(target >= 0, ("negative target %d", target));
 		launder = 0;
 
@@ -1111,7 +1112,7 @@ vm_pageout_laundry_worker(void *arg)
 			if (vm_laundry_target() <= 0 || cycle == 0) {
 				shortfall = prev_shortfall = target = 0;
 			} else {
-				launder = target / cycle;
+				launder = target / cycle--;
 				goto dolaundry;
 			}
 		}
@@ -1162,7 +1163,7 @@ vm_pageout_laundry_worker(void *arg)
 			target = min(target, bkgrd_launder_max);
 		}
 		if (target > 0 && cycle != 0)
-			launder = target / cycle;
+			launder = target / cycle--;
 
 dolaundry:
 		if (launder > 0)
@@ -1171,7 +1172,6 @@ dolaundry:
 
 		tsleep(&vm_cnt.v_laundry_count, PVM, "laundr",
 		    hz / VM_LAUNDER_INTERVAL);
-		cycle--;
 	}
 }