From owner-svn-src-user@FreeBSD.ORG  Mon Mar  8 04:56:40 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 ABEA0106564A;
	Mon,  8 Mar 2010 04:56:40 +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 9C4D38FC0C;
	Mon,  8 Mar 2010 04:56:40 +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 o284ueFU082842;
	Mon, 8 Mar 2010 04:56:40 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o284ueXK082841;
	Mon, 8 Mar 2010 04:56:40 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201003080456.o284ueXK082841@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 8 Mar 2010 04:56:40 +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: r204854 - 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 04:56:40 -0000

Author: kmacy
Date: Mon Mar  8 04:56:39 2010
New Revision: 204854
URL: http://svn.freebsd.org/changeset/base/204854

Log:
  switch to pa_retrylock to avoid deadlock with a previously acquired superpage

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 03:20:26 2010	(r204853)
+++ user/kmacy/head_page_lock/sys/amd64/amd64/pmap.c	Mon Mar  8 04:56:39 2010	(r204854)
@@ -2943,23 +2943,14 @@ restart:
 		for (pte = pmap_pde_to_pte(pde, sva); sva != va_next; pte++,
 		    sva += PAGE_SIZE) {
 			int ret;
-			vm_page_t m = NULL;
 
 			if (*pte == 0)
 				continue;
 
-			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 != *pmap_pde_to_pte(pde, sva)) {
-					vm_page_unlock(m);
-					goto restart;
-				}
-			}
+			if  ((*pte & PG_MANAGED) &&
+			    pa_tryrelock(pmap, *pte & PG_FRAME, &pa))
+				goto restart;
+
 			/*
 			 * The TLB entry for a PG_G mapping is invalidated
 			 * by pmap_remove_pte().
@@ -2968,8 +2959,10 @@ restart:
 				anyvalid = 1;
 			ret = pmap_remove_pte(pmap, pte, sva, ptpaddr, &free);
 
-			if (m != NULL)
-				vm_page_unlock(m);
+			if (pa) {
+				PA_UNLOCK(pa);
+				pa = 0;
+			}
 			if (ret)
 				break;
 		}