Date: Mon, 23 May 2016 05:37:45 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r300468 - user/alc/PQ_LAUNDRY/sys/vm Message-ID: <201605230537.u4N5bj1I091547@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605230537.u4N5bj1I091547>