svn commit: r207408 - user/kmacy/head_page_lock_incr/sys/i386/xen

[Kip Macy]

Author: kmacy
Date: Fri Apr 30 00:30:29 2010
New Revision: 207408
URL: http://svn.freebsd.org/changeset/base/207408

Log:
  convert xen's pmap_extract_and_hold

Modified:
  user/kmacy/head_page_lock_incr/sys/i386/xen/pmap.c

Modified: user/kmacy/head_page_lock_incr/sys/i386/xen/pmap.c
==============================================================================
--- user/kmacy/head_page_lock_incr/sys/i386/xen/pmap.c	Fri Apr 30 00:06:49 2010	(r207407)
+++ user/kmacy/head_page_lock_incr/sys/i386/xen/pmap.c	Fri Apr 30 00:30:29 2010	(r207408)
@@ -1219,14 +1219,19 @@ pmap_extract_and_hold(pmap_t pmap, vm_of
 	pd_entry_t pde;
 	pt_entry_t pte;
 	vm_page_t m;
+	vm_paddr_t pa;
 
+	pa = 0;
 	m = NULL;
-	vm_page_lock_queues();
 	PMAP_LOCK(pmap);
+retry:
 	pde = PT_GET(pmap_pde(pmap, va));
 	if (pde != 0) {
 		if (pde & PG_PS) {
 			if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) {
+				if (vm_page_pa_tryrelock(pmap, (pde & PG_PS_FRAME) |
+				       (va & PDRMASK), &pa))
+					goto retry;
 				m = PHYS_TO_VM_PAGE((pde & PG_PS_FRAME) |
 				    (va & PDRMASK));
 				vm_page_hold(m);
@@ -1238,13 +1243,15 @@ pmap_extract_and_hold(pmap_t pmap, vm_of
 				PT_SET_MA(PADDR1, 0);
 			if ((pte & PG_V) &&
 			    ((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) {
+				if (vm_page_pa_tryrelock(pmap, pte & PG_FRAME, &pa))
+					goto retry;
 				m = PHYS_TO_VM_PAGE(pte & PG_FRAME);
 				vm_page_hold(m);
 			}
 			sched_unpin();
 		}
 	}
-	vm_page_unlock_queues();
+	PA_UNLOCK_COND(pa);
 	PMAP_UNLOCK(pmap);
 	return (m);
 }