1 files changed, 18 insertions, 60 deletions

diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 4efa5486a28c..ac66b79b5f04 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -186,9 +186,7 @@ unlock_and_deallocate(struct faultstate *fs)
 	VM_OBJECT_WUNLOCK(fs->object);
 	if (fs->object != fs->first_object) {
 		VM_OBJECT_WLOCK(fs->first_object);
-		vm_page_lock(fs->first_m);
 		vm_page_free(fs->first_m);
-		vm_page_unlock(fs->first_m);
 		vm_object_pip_wakeup(fs->first_object);
 		VM_OBJECT_WUNLOCK(fs->first_object);
 		fs->first_m = NULL;
@@ -263,18 +261,6 @@ vm_fault_dirty(vm_map_entry_t entry, vm_page_t m, vm_prot_t prot,
 		vm_pager_page_unswapped(m);
 }
 
-static void
-vm_fault_fill_hold(vm_page_t *m_hold, vm_page_t m)
-{
-
-	if (m_hold != NULL) {
-		*m_hold = m;
-		vm_page_lock(m);
-		vm_page_wire(m);
-		vm_page_unlock(m);
-	}
-}
-
 /*
  * Unlocks fs.first_object and fs.map on success.
  */
@@ -335,7 +321,10 @@ vm_fault_soft_fast(struct faultstate *fs, vm_offset_t vaddr, vm_prot_t prot,
 	    PMAP_ENTER_NOSLEEP | (wired ? PMAP_ENTER_WIRED : 0), psind);
 	if (rv != KERN_SUCCESS)
 		return (rv);
-	vm_fault_fill_hold(m_hold, m);
+	if (m_hold != NULL) {
+		*m_hold = m;
+		vm_page_wire(m);
+	}
 	vm_fault_dirty(fs->entry, m, prot, fault_type, fault_flags, false);
 	if (psind == 0 && !wired)
 		vm_fault_prefault(fs, vaddr, PFBAK, PFFOR, true);
@@ -511,11 +500,12 @@ vm_fault_populate(struct faultstate *fs, vm_prot_t prot, int fault_type,
 		VM_OBJECT_WLOCK(fs->first_object);
 		m_mtx = NULL;
 		for (i = 0; i < npages; i++) {
-			vm_page_change_lock(&m[i], &m_mtx);
-			if ((fault_flags & VM_FAULT_WIRE) != 0)
+			if ((fault_flags & VM_FAULT_WIRE) != 0) {
 				vm_page_wire(&m[i]);
-			else
+			} else {
+				vm_page_change_lock(&m[i], &m_mtx);
 				vm_page_activate(&m[i]);
+			}
 			if (m_hold != NULL && m[i].pindex == fs->first_pindex) {
 				*m_hold = &m[i];
 				vm_page_wire(&m[i]);
@@ -576,7 +566,6 @@ vm_fault_hold(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type,
 	struct faultstate fs;
 	struct vnode *vp;
 	struct domainset *dset;
-	struct mtx *mtx;
 	vm_object_t next_object, retry_object;
 	vm_offset_t e_end, e_start;
 	vm_pindex_t retry_pindex;
@@ -745,9 +734,7 @@ RetryFault_oom:
 						VM_OBJECT_WLOCK(fs.first_object);
 						VM_OBJECT_WLOCK(fs.object);
 					}
-					vm_page_lock(fs.first_m);
 					vm_page_free(fs.first_m);
-					vm_page_unlock(fs.first_m);
 					vm_object_pip_wakeup(fs.first_object);
 					VM_OBJECT_WUNLOCK(fs.first_object);
 					fs.first_m = NULL;
@@ -1030,12 +1017,10 @@ readrest:
 			 * an error.
 			 */
 			if (rv == VM_PAGER_ERROR || rv == VM_PAGER_BAD) {
-				vm_page_lock(fs.m);
 				if (!vm_page_wired(fs.m))
 					vm_page_free(fs.m);
 				else
-					vm_page_xunbusy_maybelocked(fs.m);
-				vm_page_unlock(fs.m);
+					vm_page_xunbusy(fs.m);
 				fs.m = NULL;
 				unlock_and_deallocate(&fs);
 				return (rv == VM_PAGER_ERROR ? KERN_FAILURE :
@@ -1053,12 +1038,10 @@ readrest:
 			 * that we are.
 			 */
 			if (fs.object != fs.first_object) {
-				vm_page_lock(fs.m);
 				if (!vm_page_wired(fs.m))
 					vm_page_free(fs.m);
 				else
-					vm_page_xunbusy_maybelocked(fs.m);
-				vm_page_unlock(fs.m);
+					vm_page_xunbusy(fs.m);
 				fs.m = NULL;
 			}
 		}
@@ -1169,23 +1152,11 @@ readrest:
 				 * We don't chase down the shadow chain
 				 */
 			    fs.object == fs.first_object->backing_object) {
-				/*
-				 * Keep the page wired to ensure that it is not
-				 * freed by another thread, such as the page
-				 * daemon, while it is disassociated from an
-				 * object.
-				 */
-				mtx = NULL;
-				vm_page_change_lock(fs.m, &mtx);
-				vm_page_wire(fs.m);
+
 				(void)vm_page_remove(fs.m);
-				vm_page_change_lock(fs.first_m, &mtx);
 				vm_page_replace_checked(fs.m, fs.first_object,
 				    fs.first_pindex, fs.first_m);
 				vm_page_free(fs.first_m);
-				vm_page_change_lock(fs.m, &mtx);
-				vm_page_unwire(fs.m, PQ_ACTIVE);
-				mtx_unlock(mtx);
 				vm_page_dirty(fs.m);
 #if VM_NRESERVLEVEL > 0
 				/*
@@ -1211,13 +1182,8 @@ readrest:
 				fs.first_m->valid = VM_PAGE_BITS_ALL;
 				if (wired && (fault_flags &
 				    VM_FAULT_WIRE) == 0) {
-					vm_page_lock(fs.first_m);
 					vm_page_wire(fs.first_m);
-					vm_page_unlock(fs.first_m);
-					
-					vm_page_lock(fs.m);
 					vm_page_unwire(fs.m, PQ_INACTIVE);
-					vm_page_unlock(fs.m);
 				}
 				/*
 				 * We no longer need the old page or object.
@@ -1350,21 +1316,22 @@ readrest:
 		    faultcount > 0 ? behind : PFBAK,
 		    faultcount > 0 ? ahead : PFFOR, false);
 	VM_OBJECT_WLOCK(fs.object);
-	vm_page_lock(fs.m);
 
 	/*
 	 * If the page is not wired down, then put it where the pageout daemon
 	 * can find it.
 	 */
-	if ((fault_flags & VM_FAULT_WIRE) != 0)
+	if ((fault_flags & VM_FAULT_WIRE) != 0) {
 		vm_page_wire(fs.m);
-	else
+	} else {
+		vm_page_lock(fs.m);
 		vm_page_activate(fs.m);
+		vm_page_unlock(fs.m);
+	}
 	if (m_hold != NULL) {
 		*m_hold = fs.m;
 		vm_page_wire(fs.m);
 	}
-	vm_page_unlock(fs.m);
 	vm_page_xunbusy(fs.m);
 
 	/*
@@ -1633,13 +1600,8 @@ vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len,
 	return (count);
 error:	
 	for (mp = ma; mp < ma + count; mp++)
-		if (*mp != NULL) {
-			vm_page_lock(*mp);
-			if (vm_page_unwire(*mp, PQ_INACTIVE) &&
-			    (*mp)->object == NULL)
-				vm_page_free(*mp);
-			vm_page_unlock(*mp);
-		}
+		if (*mp != NULL)
+			vm_page_unwire(*mp, PQ_INACTIVE);
 	return (-1);
 }
 
@@ -1835,12 +1797,8 @@ again:
 		
 		if (upgrade) {
 			if (src_m != dst_m) {
-				vm_page_lock(src_m);
 				vm_page_unwire(src_m, PQ_INACTIVE);
-				vm_page_unlock(src_m);
-				vm_page_lock(dst_m);
 				vm_page_wire(dst_m);
-				vm_page_unlock(dst_m);
 			} else {
 				KASSERT(vm_page_wired(dst_m),
 				    ("dst_m %p is not wired", dst_m));