From owner-svn-src-user@FreeBSD.ORG  Mon Mar 11 13:50:41 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 0801F8C1;
 Mon, 11 Mar 2013 13:50:41 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EDD28320;
 Mon, 11 Mar 2013 13:50:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2BDoeFO054745;
 Mon, 11 Mar 2013 13:50:40 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2BDoeRI054744;
 Mon, 11 Mar 2013 13:50:40 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201303111350.r2BDoeRI054744@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 11 Mar 2013 13:50:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r248162 - user/attilio/vmobj-readlock/sys/vm
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Mon, 11 Mar 2013 13:50:41 -0000

Author: attilio
Date: Mon Mar 11 13:50:40 2013
New Revision: 248162
URL: http://svnweb.freebsd.org/changeset/base/248162

Log:
  The VM_ALLOC_IFCACHED case does not require any object locking as
  it will only go through the object page cache and return.
  Lookups in the object's page cache are correctly handled by
  the vm_page_queue_free_mtx, which will be acquired correctly in this
  case.
  Relax the locking assertion.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/attilio/vmobj-readlock/sys/vm/vm_page.c

Modified: user/attilio/vmobj-readlock/sys/vm/vm_page.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/vm/vm_page.c	Mon Mar 11 13:37:18 2013	(r248161)
+++ user/attilio/vmobj-readlock/sys/vm/vm_page.c	Mon Mar 11 13:50:40 2013	(r248162)
@@ -1184,7 +1184,7 @@ vm_page_alloc(vm_object_t object, vm_pin
 
 	KASSERT((object != NULL) == ((req & VM_ALLOC_NOOBJ) == 0),
 	    ("vm_page_alloc: inconsistent object/req"));
-	if (object != NULL)
+	if (object != NULL && (req & VM_ALLOC_IFCACHED) == 0)
 		VM_OBJECT_ASSERT_WLOCKED(object);
 
 	req_class = req & VM_ALLOC_CLASS_MASK;