From owner-svn-src-user@FreeBSD.ORG  Mon Mar  8 05:16:20 2010
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 DCF21106564A;
	Mon,  8 Mar 2010 05:16:20 +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 97CD98FC12;
	Mon,  8 Mar 2010 05:16:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o285GKRA087814;
	Mon, 8 Mar 2010 05:16:20 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o285GKBB087812;
	Mon, 8 Mar 2010 05:16:20 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201003080516.o285GKBB087812@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 8 Mar 2010 05:16:20 +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: r204856 - user/kmacy/head_page_lock/sys/amd64/amd64
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	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: Mon, 08 Mar 2010 05:16:20 -0000

Author: kmacy
Date: Mon Mar  8 05:16:20 2010
New Revision: 204856
URL: http://svn.freebsd.org/changeset/base/204856

Log:
  - streamline pmap_remove_page using pa_retrylock
  - remove gratuitous unlock from pmap_remove_pages

Modified:
  user/kmacy/head_page_lock/sys/amd64/amd64/pmap.c

Modified: user/kmacy/head_page_lock/sys/amd64/amd64/pmap.c
==============================================================================
--- user/kmacy/head_page_lock/sys/amd64/amd64/pmap.c	Mon Mar  8 05:03:24 2010	(r204855)
+++ user/kmacy/head_page_lock/sys/amd64/amd64/pmap.c	Mon Mar  8 05:16:20 2010	(r204856)
@@ -2719,7 +2719,7 @@ static void
 pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde, vm_page_t *free)
 {
 	pt_entry_t *pte;
-	vm_page_t m = NULL;
+	vm_paddr_t pa = 0;
 
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
 	if ((*pde & PG_V) == 0)
@@ -2727,17 +2727,12 @@ pmap_remove_page(pmap_t pmap, vm_offset_
 	pte = pmap_pde_to_pte(pde, va);
 	if ((*pte & PG_V) == 0)
 		return;
-	if  (*pte & PG_MANAGED) {
-		m = PHYS_TO_VM_PAGE(*pte & PG_FRAME);
-		if (vm_page_trylock(m) == 0) {
-			PMAP_UNLOCK(pmap);
-			vm_page_lock(m);
-			PMAP_LOCK(pmap);
-		}
-	}
+	if  (*pte & PG_MANAGED)
+		(void)pa_tryrelock(pmap, *pte & PG_FRAME, &pa);
+
 	pmap_remove_pte(pmap, pte, va, *pde, free);
-	if (m != NULL)
-		vm_page_unlock(m);
+	if (pa)
+		PA_UNLOCK(pa);
 	pmap_invalidate_page(pmap, va);
 }
 
@@ -2959,10 +2954,6 @@ restart:
 				anyvalid = 1;
 			ret = pmap_remove_pte(pmap, pte, sva, ptpaddr, &free);
 
-			if (pa) {
-				PA_UNLOCK(pa);
-				pa = 0;
-			}
 			if (ret)
 				break;
 		}