From owner-svn-src-user@FreeBSD.ORG Fri Jun 26 06:38:50 2009 Return-Path: <owner-svn-src-user@FreeBSD.ORG> Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00F171065673; Fri, 26 Jun 2009 06:38:50 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E43FE8FC19; Fri, 26 Jun 2009 06:38:49 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5Q6cnXI077544; Fri, 26 Jun 2009 06:38:49 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5Q6cntE077542; Fri, 26 Jun 2009 06:38:49 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200906260638.n5Q6cntE077542@svn.freebsd.org> From: Kip Macy <kmacy@FreeBSD.org> Date: Fri, 26 Jun 2009 06:38:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195041 - user/kmacy/releng_7_2_fcs/sys/vm X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" <svn-src-user.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 26 Jun 2009 06:38:50 -0000 Author: kmacy Date: Fri Jun 26 06:38:49 2009 New Revision: 195041 URL: http://svn.freebsd.org/changeset/base/195041 Log: don't acquire global page queues lock in _vm_pageq_remove unless queue != PQ_NONE Modified: user/kmacy/releng_7_2_fcs/sys/vm/vm_page.c Modified: user/kmacy/releng_7_2_fcs/sys/vm/vm_page.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/vm/vm_page.c Fri Jun 26 06:11:39 2009 (r195040) +++ user/kmacy/releng_7_2_fcs/sys/vm/vm_page.c Fri Jun 26 06:38:49 2009 (r195041) @@ -1259,9 +1259,9 @@ vm_page_requeue_locked(vm_page_t m) int queue; struct vpgqueues *vpq; - mtx_assert(&vm_page_queue_mtx, MA_OWNED); queue = VM_PAGE_GETQUEUE(m); if (queue != PQ_NONE) { + mtx_assert(&vm_page_queue_mtx, MA_OWNED); vpq = &vm_page_queues[queue]; TAILQ_REMOVE(&vpq->pl, m, pageq); TAILQ_INSERT_TAIL(&vpq->pl, m, pageq); @@ -1290,18 +1290,17 @@ _vm_pageq_remove(vm_page_t m, int locked int queue; struct vpgqueues *pq; - if (locked == 0) - vm_page_lock_queues(); - queue = VM_PAGE_GETQUEUE(m); if (queue != PQ_NONE) { + if (locked == 0) + vm_page_lock_queues(); VM_PAGE_SETQUEUE2(m, PQ_NONE); pq = &vm_page_queues[queue]; TAILQ_REMOVE(&pq->pl, m, pageq); (*pq->cnt)--; + if (locked == 0) + vm_page_unlock_queues(); } - if (locked == 0) - vm_page_unlock_queues(); } void