From owner-svn-src-user@freebsd.org  Mon Mar 26 16:06:04 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B5F09F511CF
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon, 26 Mar 2018 16:06:04 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 88747849CA;
 Mon, 26 Mar 2018 16:06:04 +0000 (UTC)
 (envelope-from markj@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7DC6E7224;
 Mon, 26 Mar 2018 16:06:04 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2QG645U082498;
 Mon, 26 Mar 2018 16:06:04 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2QG64bx082497;
 Mon, 26 Mar 2018 16:06:04 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201803261606.w2QG64bx082497@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 26 Mar 2018 16:06:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r331556 - user/markj/vm-playground/sys/vm
X-SVN-Group: user
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: user/markj/vm-playground/sys/vm
X-SVN-Commit-Revision: 331556
X-SVN-Commit-Repository: base
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.25
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: Mon, 26 Mar 2018 16:06:04 -0000

Author: markj
Date: Mon Mar 26 16:06:04 2018
New Revision: 331556
URL: https://svnweb.freebsd.org/changeset/base/331556

Log:
  Fix some accounting errors in vm_page_alloc_pages_domain_after().

Modified:
  user/markj/vm-playground/sys/vm/vm_page.c

Modified: user/markj/vm-playground/sys/vm/vm_page.c
==============================================================================
--- user/markj/vm-playground/sys/vm/vm_page.c	Mon Mar 26 15:22:25 2018	(r331555)
+++ user/markj/vm-playground/sys/vm/vm_page.c	Mon Mar 26 16:06:04 2018	(r331556)
@@ -1968,15 +1968,15 @@ again:
 		    VM_FREEPOOL_DIRECT;
 		vm_domain_free_lock(vmd);
 		do {
-			i = vm_phys_alloc_npages(domain, pool, &m,
-			    avail - nalloc);
+			i = vm_phys_alloc_npages(domain, pool, &m, avail);
 			if (i == 0) {
-				vm_domain_freecnt_inc(vmd, avail - nalloc);
+				vm_domain_freecnt_inc(vmd, avail);
 				break;
 			}
+			avail -= i;
 			for (; i > 0; i--)
 				ma[nalloc++] = m++;
-		} while (nalloc < avail);
+		} while (avail > 0);
 		vm_domain_free_unlock(vmd);
 	}
 	if (nalloc == 0 || (nalloc < nreq && (req & VM_ALLOC_WAITOK) != 0)) {