From owner-p4-projects@FreeBSD.ORG  Thu Oct 27 17:37:01 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 101F91065675; Thu, 27 Oct 2011 17:37:01 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C7277106564A
	for <perforce@freebsd.org>; Thu, 27 Oct 2011 17:37:00 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id B51D18FC13
	for <perforce@freebsd.org>; Thu, 27 Oct 2011 17:37:00 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p9RHb00u054761
	for <perforce@freebsd.org>; Thu, 27 Oct 2011 17:37:00 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9RHb0IG054758
	for perforce@freebsd.org; Thu, 27 Oct 2011 17:37:00 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 27 Oct 2011 17:37:00 GMT
Message-Id: <201110271737.p9RHb0IG054758@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 200834 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Oct 2011 17:37:01 -0000

http://p4web.freebsd.org/@@200834?ac=10

Change 200834 by jhb@jhb_jhbbsd on 2011/10/27 17:36:23

	Optimize vm page locking ala vm_unhold_pages().
	
	Requested by:	kib

Affected files ...

.. //depot/projects/fadvise/sys/vm/vm_object.c#4 edit

Differences ...

==== //depot/projects/fadvise/sys/vm/vm_object.c#4 (text+ko) ====

@@ -1881,6 +1881,7 @@
 void
 vm_object_page_cache(vm_object_t object, vm_pindex_t start, vm_pindex_t end)
 {
+	struct mtx *mtx, *new_mtx;
 	vm_page_t p, next;
 
 	VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
@@ -1895,13 +1896,24 @@
 	 * Here, the variable "p" is either (1) the page with the least pindex
 	 * greater than or equal to the parameter "start" or (2) NULL. 
 	 */
+	mtx = NULL;
 	for (; p != NULL && (p->pindex < end || end == 0); p = next) {
 		next = TAILQ_NEXT(p, listq);
 
-		vm_page_lock(p);
+		/*
+		 * Avoid releasing and reacquiring the same page lock.
+		 */
+		new_mtx = vm_page_lockptr(p);
+		if (mtx != new_mtx) {
+			if (mtx != NULL)
+				mtx_unlock(mtx);
+			mtx = new_mtx;
+			mtx_lock(mtx);
+		}
 		vm_page_try_to_cache(p);
-		vm_page_unlock(p);
 	}
+	if (mtx != NULL)
+		mtx_unlock(mtx);
 }
 
 /*