From owner-svn-src-user@freebsd.org Fri Mar 23 18:15:02 2018 Return-Path: Delivered-To: svn-src-user@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 2F5D5F60B35 for ; Fri, 23 Mar 2018 18:15:02 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D373883E1F; Fri, 23 Mar 2018 18:15:01 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C9D2223665; Fri, 23 Mar 2018 18:15:01 +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 w2NIF160055748; Fri, 23 Mar 2018 18:15:01 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2NIF1ke055747; Fri, 23 Mar 2018 18:15:01 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201803231815.w2NIF1ke055747@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 23 Mar 2018 18:15:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r331448 - user/markj/vm-playground/sys/vm X-SVN-Group: user X-SVN-Commit-Author: markj X-SVN-Commit-Paths: user/markj/vm-playground/sys/vm X-SVN-Commit-Revision: 331448 X-SVN-Commit-Repository: base 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.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Mar 2018 18:15:02 -0000 Author: markj Date: Fri Mar 23 18:15:01 2018 New Revision: 331448 URL: https://svnweb.freebsd.org/changeset/base/331448 Log: Avoid taking the queue lock in _vm_page_deactivate() when requeuing. Modified: user/markj/vm-playground/sys/vm/vm_page.c Modified: user/markj/vm-playground/sys/vm/vm_page.c ============================================================================== --- user/markj/vm-playground/sys/vm/vm_page.c Fri Mar 23 18:11:06 2018 (r331447) +++ user/markj/vm-playground/sys/vm/vm_page.c Fri Mar 23 18:15:01 2018 (r331448) @@ -3863,15 +3863,10 @@ _vm_page_deactivate(vm_page_t m, bool noreuse) if (m->wire_count > 0 || (m->oflags & VPO_UNMANAGED) != 0) return; - /* - * XXX we can do this with only one lock acquisition if m is already - * in PQ_INACTIVE - */ - vm_page_remque(m); - - pq = &vm_pagequeue_domain(m)->vmd_pagequeues[PQ_INACTIVE]; if (noreuse) { - /* This is a slow path. */ + /* This is slower than it could be. */ + vm_page_remque(m); + pq = &vm_pagequeue_domain(m)->vmd_pagequeues[PQ_INACTIVE]; vm_pagequeue_lock(pq); m->queue = PQ_INACTIVE; TAILQ_INSERT_BEFORE(&vm_pagequeue_domain(m)->vmd_inacthead, m, @@ -3881,8 +3876,11 @@ _vm_page_deactivate(vm_page_t m, bool noreuse) if ((m->aflags & PGA_REQUEUE) != 0) vm_page_aflag_clear(m, PGA_REQUEUE); vm_pagequeue_unlock(pq); - } else + } else if (!vm_page_inactive(m)) { + vm_page_remque(m); vm_page_enqueue_lazy(m, PQ_INACTIVE); + } else + vm_page_requeue(m); } /*