From owner-svn-src-head@FreeBSD.ORG  Fri Apr 30 21:20:15 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1181D106564A;
	Fri, 30 Apr 2010 21:20:15 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 01A098FC0A;
	Fri, 30 Apr 2010 21:20:15 +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 o3ULKEHR083170;
	Fri, 30 Apr 2010 21:20:14 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3ULKEar083168;
	Fri, 30 Apr 2010 21:20:14 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201004302120.o3ULKEar083168@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 30 Apr 2010 21:20:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207450 - head/sys/vm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Apr 2010 21:20:15 -0000

Author: kmacy
Date: Fri Apr 30 21:20:14 2010
New Revision: 207450
URL: http://svn.freebsd.org/changeset/base/207450

Log:
  - acquire the page lock in vm_contig_launder_page before checking page fields
  - release page queue lock before calling vm_pageout_flush

Modified:
  head/sys/vm/vm_contig.c

Modified: head/sys/vm/vm_contig.c
==============================================================================
--- head/sys/vm/vm_contig.c	Fri Apr 30 19:52:35 2010	(r207449)
+++ head/sys/vm/vm_contig.c	Fri Apr 30 21:20:14 2010	(r207450)
@@ -96,30 +96,33 @@ vm_contig_launder_page(vm_page_t m, vm_p
 	vm_page_t m_tmp;
 	struct vnode *vp;
 	struct mount *mp;
-	int vfslocked;
+	int vfslocked, dirty;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	vm_page_lock(m);
+	vm_page_lock_queues();
 	object = m->object;
 	if (!VM_OBJECT_TRYLOCK(object) &&
 	    !vm_pageout_fallback_object_lock(m, next)) {
 		VM_OBJECT_UNLOCK(object);
+		vm_page_unlock_queues();
+		vm_page_unlock(m);
 		return (EAGAIN);
 	}
 	if (vm_page_sleep_if_busy(m, TRUE, "vpctw0")) {
 		VM_OBJECT_UNLOCK(object);
-		vm_page_lock_queues();
 		return (EBUSY);
 	}
 	vm_page_test_dirty(m);
 	if (m->dirty == 0 && m->hold_count == 0)
 		pmap_remove_all(m);
-	if (m->dirty) {
+	if ((dirty = m->dirty) != 0) {
+		vm_page_unlock_queues();
+		vm_page_unlock(m);
 		if ((object->flags & OBJ_DEAD) != 0) {
 			VM_OBJECT_UNLOCK(object);
 			return (EAGAIN);
 		}
 		if (object->type == OBJT_VNODE) {
-			vm_page_unlock_queues();
 			vp = object->handle;
 			vm_object_reference_locked(object);
 			VM_OBJECT_UNLOCK(object);
@@ -133,7 +136,6 @@ vm_contig_launder_page(vm_page_t m, vm_p
 			VFS_UNLOCK_GIANT(vfslocked);
 			vm_object_deallocate(object);
 			vn_finished_write(mp);
-			vm_page_lock_queues();
 			return (0);
 		} else if (object->type == OBJT_SWAP ||
 			   object->type == OBJT_DEFAULT) {
@@ -144,6 +146,11 @@ vm_contig_launder_page(vm_page_t m, vm_p
 		}
 	} else if (m->hold_count == 0)
 		vm_page_cache(m);
+
+	if (dirty == 0) {
+		vm_page_unlock_queues();
+		vm_page_unlock(m);
+	}
 	VM_OBJECT_UNLOCK(object);
 	return (0);
 }
@@ -162,7 +169,9 @@ vm_contig_launder(int queue)
 
 		KASSERT(VM_PAGE_INQUEUE2(m, queue),
 		    ("vm_contig_launder: page %p's queue is not %d", m, queue));
+		vm_page_unlock_queues();
 		error = vm_contig_launder_page(m, &next);
+		vm_page_lock_queues();
 		if (error == 0)
 			return (TRUE);
 		if (error == EBUSY)