From owner-svn-src-user@FreeBSD.ORG  Sat Feb  4 17:34:10 2012
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 0E753106564A;
	Sat,  4 Feb 2012 17:34:10 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D16318FC08;
	Sat,  4 Feb 2012 17:34:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q14HY9F7045041;
	Sat, 4 Feb 2012 17:34:09 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q14HY9c0045039;
	Sat, 4 Feb 2012 17:34:09 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201202041734.q14HY9c0045039@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 4 Feb 2012 17:34:09 +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: r230987 -
	user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
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: Sat, 04 Feb 2012 17:34:10 -0000

Author: attilio
Date: Sat Feb  4 17:34:09 2012
New Revision: 230987
URL: http://svn.freebsd.org/changeset/base/230987

Log:
  Make a more comprehensive fix for vm_page_lookup which takes into account
  cached pages.

Modified:
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c

Modified: user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sat Feb  4 17:18:16 2012	(r230986)
+++ user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sat Feb  4 17:34:09 2012	(r230987)
@@ -321,22 +321,32 @@ page_lookup(vnode_t *vp, int64_t start, 
 
 	obj = vp->v_object;
 	VM_OBJECT_LOCK_ASSERT(obj, MA_OWNED);
+	mtx_assert(&vm_page_queue_free_mtx, MA_NOTOWNED);
 
 	for (;;) {
-		if ((pp = vm_page_lookup(obj, OFF_TO_IDX(start))) != NULL &&
-		    vm_page_is_valid(pp, (vm_offset_t)off, nbytes)) {
-			if ((pp->oflags & VPO_BUSY) != 0) {
-				/*
-				 * Reference the page before unlocking and
-				 * sleeping so that the page daemon is less
-				 * likely to reclaim it.
-				 */
-				vm_page_reference(pp);
-				vm_page_sleep(pp, "zfsmwb");
-				continue;
+		if ((pp = vm_radix_lookup(&obj->rtree, OFF_TO_IDX(start),
+		    VM_RADIX_ANY)) != NULL) {
+			if (pp->flags & PG_CACHED) {
+				mtx_lock(&vm_page_queue_free_mtx);
+				if (pp->object == obj)
+					vm_page_cache_remove(pp);
+				mtx_unlock(&vm_page_queue_free_mtx);
+				pp = NULL;
+			} else if (vm_page_is_valid(pp, (vm_offset_t)off,
+			    nbytes)) {
+				if ((pp->oflags & VPO_BUSY) != 0) {
+					/*
+				 	 * Reference the page before unlocking
+					 * and sleeping so that the page daemon
+					 * is less likely to reclaim it.
+				 	 */
+					vm_page_reference(pp);
+					vm_page_sleep(pp, "zfsmwb");
+					continue;
+				}
+				vm_page_busy(pp);
+				vm_page_undirty(pp);
 			}
-			vm_page_busy(pp);
-			vm_page_undirty(pp);
 		} else
 			pp = NULL;
 		break;