From owner-svn-src-user@freebsd.org Mon May 23 05:37:46 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 9BB7FB463DB
for <svn-src-user@mailman.ysv.freebsd.org>;
Mon, 23 May 2016 05:37:46 +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 mx1.freebsd.org (Postfix) with ESMTPS id 63C9A12FC;
Mon, 23 May 2016 05:37:46 +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 u4N5bjQP091548;
Mon, 23 May 2016 05:37:45 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4N5bj1I091547;
Mon, 23 May 2016 05:37:45 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201605230537.u4N5bj1I091547@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, 23 May 2016 05:37:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r300468 - 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 " 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: Mon, 23 May 2016 05:37:46 -0000
Author: markj
Date: Mon May 23 05:37:45 2016
New Revision: 300468
URL: https://svnweb.freebsd.org/changeset/base/300468
Log:
Fix laundry queue handling when multiple domains are configured.
Currently, there is only a single laundry thread and it operates on
queues in domain 0. Therefore, when placing a page in PQ_LAUNDRY, it
should be placed in the PQ_LAUNDRY queue for domain 0.
Reviewed by: alc
Modified:
user/alc/PQ_LAUNDRY/sys/vm/vm_page.c
Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_page.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/vm/vm_page.c Mon May 23 05:31:53 2016 (r300467)
+++ user/alc/PQ_LAUNDRY/sys/vm/vm_page.c Mon May 23 05:37:45 2016 (r300468)
@@ -2738,7 +2738,10 @@ struct vm_pagequeue *
vm_page_pagequeue(vm_page_t m)
{
- return (&vm_phys_domain(m)->vmd_pagequeues[m->queue]);
+ if (vm_page_in_laundry(m))
+ return (&vm_dom[0].vmd_pagequeues[m->queue]);
+ else
+ return (&vm_phys_domain(m)->vmd_pagequeues[m->queue]);
}
/*
@@ -2800,7 +2803,10 @@ vm_page_enqueue(uint8_t queue, vm_page_t
KASSERT(queue < PQ_COUNT,
("vm_page_enqueue: invalid queue %u request for page %p",
queue, m));
- pq = &vm_phys_domain(m)->vmd_pagequeues[queue];
+ if (queue == PQ_LAUNDRY)
+ pq = &vm_dom[0].vmd_pagequeues[queue];
+ else
+ pq = &vm_phys_domain(m)->vmd_pagequeues[queue];
vm_pagequeue_lock(pq);
m->queue = queue;
TAILQ_INSERT_TAIL(&pq->pq_pl, m, plinks.q);
@@ -3182,7 +3188,9 @@ vm_page_deactivate_noreuse(vm_page_t m)
}
/*
- * XXX
+ * vm_page_launder
+ *
+ * Put a page in the laundry.
*/
void
vm_page_launder(vm_page_t m)