From owner-svn-src-user@freebsd.org Sun Aug 28 20:53:32 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 84646BC174D
for <svn-src-user@mailman.ysv.freebsd.org>;
Sun, 28 Aug 2016 20:53:32 +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 30408D33;
Sun, 28 Aug 2016 20:53:32 +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 u7SKrVUD058300;
Sun, 28 Aug 2016 20:53:31 GMT (envelope-from alc@FreeBSD.org)
Received: (from alc@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7SKrVaE058298;
Sun, 28 Aug 2016 20:53:31 GMT (envelope-from alc@FreeBSD.org)
Message-Id: <201608282053.u7SKrVaE058298@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: Sun, 28 Aug 2016 20:53:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r304968 - in user/alc/PQ_LAUNDRY/sys: 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 " user"
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: Sun, 28 Aug 2016 20:53:32 -0000
Author: alc
Date: Sun Aug 28 20:53:31 2016
New Revision: 304968
URL: https://svnweb.freebsd.org/changeset/base/304968
Log:
Simplify the logic for detecting shortfalls.
Discussed with: markj
Modified:
user/alc/PQ_LAUNDRY/sys/sys/vmmeter.h
user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c
Modified: user/alc/PQ_LAUNDRY/sys/sys/vmmeter.h
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/sys/vmmeter.h Sun Aug 28 20:39:53 2016 (r304967)
+++ user/alc/PQ_LAUNDRY/sys/sys/vmmeter.h Sun Aug 28 20:53:31 2016 (r304968)
@@ -198,17 +198,6 @@ vm_laundry_target(void)
}
/*
- * Return true if we are in shortfall and must begin laundering dirty memory.
- */
-static inline bool
-vm_laundering_needed(void)
-{
-
- return (vm_cnt.v_inactive_count < vm_cnt.v_inactive_target &&
- vm_paging_needed());
-}
-
-/*
* Obtain the value of a per-CPU counter.
*/
#define VM_METER_PCPU_CNT(member) \
Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Sun Aug 28 20:39:53 2016 (r304967)
+++ user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Sun Aug 28 20:53:31 2016 (r304968)
@@ -1133,9 +1133,8 @@ vm_pageout_laundry_worker(void *arg)
* First determine whether we need to launder pages to meet a
* shortage of free pages.
*/
- if (vm_laundering_needed()) {
- shortfall = vm_laundry_target() + vm_pageout_deficit;
-
+ shortfall = vm_laundry_target() + vm_pageout_deficit;
+ if (shortfall > 0) {
/*
* If we're in shortfall and we haven't yet started a
* laundering cycle to get us out of it, begin a run.
@@ -1156,7 +1155,7 @@ vm_pageout_laundry_worker(void *arg)
* shortfall, we have no immediate need to launder
* pages. Otherwise keep laundering.
*/
- if (vm_laundry_target() <= 0 || cycle == 0) {
+ if (shortfall <= 0 || cycle == 0) {
prev_shortfall = target = 0;
} else {
last_launder = wakeups;