From owner-svn-src-all@freebsd.org Wed Dec 19 18:00:59 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 CEBE5133E879;
Wed, 19 Dec 2018 18:00:59 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 543E08C45A;
Wed, 19 Dec 2018 18:00:59 +0000 (UTC)
(envelope-from emaste@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 43CF519631;
Wed, 19 Dec 2018 18:00:59 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBJI0xdi094731;
Wed, 19 Dec 2018 18:00:59 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBJI0xms094730;
Wed, 19 Dec 2018 18:00:59 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201812191800.wBJI0xms094730@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 19 Dec 2018 18:00:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-releng@freebsd.org
Subject: svn commit: r342225 - releng/11.2/sys/vm
X-SVN-Group: releng
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: releng/11.2/sys/vm
X-SVN-Commit-Revision: 342225
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 543E08C45A
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.93 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
NEURAL_HAM_SHORT(-0.93)[-0.935,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
NEURAL_HAM_LONG(-1.00)[-0.998,0]
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2018 18:01:00 -0000
Author: emaste
Date: Wed Dec 19 18:00:58 2018
New Revision: 342225
URL: https://svnweb.freebsd.org/changeset/base/342225
Log:
MFS11 r341401: Update the free page count when blacklisting pages.
PR: 231296
Submitted by: markj
Approved by: so
Security: FreeBSD-EN-18:17.vm
Sponsored by: The FreeBSD Foundation
Modified:
releng/11.2/sys/vm/vm_page.c
Directory Properties:
releng/11.2/ (props changed)
Modified: releng/11.2/sys/vm/vm_page.c
==============================================================================
--- releng/11.2/sys/vm/vm_page.c Wed Dec 19 17:52:56 2018 (r342224)
+++ releng/11.2/sys/vm/vm_page.c Wed Dec 19 18:00:58 2018 (r342225)
@@ -304,8 +304,10 @@ vm_page_blacklist_add(vm_paddr_t pa, bool verbose)
mtx_lock(&vm_page_queue_free_mtx);
ret = vm_phys_unfree_page(m);
+ if (ret != 0)
+ vm_phys_freecnt_adj(m, -1);
mtx_unlock(&vm_page_queue_free_mtx);
- if (ret) {
+ if (ret != 0) {
TAILQ_INSERT_TAIL(&blacklist_head, m, listq);
if (verbose)
printf("Skipping page with pa 0x%jx\n", (uintmax_t)pa);