From owner-svn-src-user@FreeBSD.ORG  Sun May 19 14:59:25 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 0BBF35DB;
 Sun, 19 May 2013 14:59:25 +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 F2A87D62;
 Sun, 19 May 2013 14:59:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4JExOpY007515;
 Sun, 19 May 2013 14:59:24 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4JExOkh007506;
 Sun, 19 May 2013 14:59:24 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201305191459.r4JExOkh007506@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sun, 19 May 2013 14:59:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r250807 - 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: Sun, 19 May 2013 14:59:25 -0000

Author: attilio
Date: Sun May 19 14:59:24 2013
New Revision: 250807
URL: http://svnweb.freebsd.org/changeset/base/250807

Log:
  Remove the necessity to define VM_OBJECT_LOCK_DOWNGRADE() and handle
  the race differently.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/attilio/vmobj-readlock/sys/vm/vm_map.c
  user/attilio/vmobj-readlock/sys/vm/vm_object.h

Modified: user/attilio/vmobj-readlock/sys/vm/vm_map.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/vm/vm_map.c	Sun May 19 07:44:01 2013	(r250806)
+++ user/attilio/vmobj-readlock/sys/vm/vm_map.c	Sun May 19 14:59:24 2013	(r250807)
@@ -1806,6 +1806,7 @@ vm_map_pmap_enter(vm_map_t map, vm_offse
 
 	if ((prot & (VM_PROT_READ | VM_PROT_EXECUTE)) == 0 || object == NULL)
 		return;
+relock:
 	VM_OBJECT_RLOCK(object);
 	if (object->type == OBJT_DEVICE || object->type == OBJT_SG) {
 		VM_OBJECT_RUNLOCK(object);
@@ -1816,7 +1817,8 @@ vm_map_pmap_enter(vm_map_t map, vm_offse
 			VM_OBJECT_WUNLOCK(object);
 			return;
 		}
-		VM_OBJECT_LOCK_DOWNGRADE(object);
+		VM_OBJECT_WUNLOCK(object);
+		goto relock;
 	}
 
 	psize = atop(size);

Modified: user/attilio/vmobj-readlock/sys/vm/vm_object.h
==============================================================================
--- user/attilio/vmobj-readlock/sys/vm/vm_object.h	Sun May 19 07:44:01 2013	(r250806)
+++ user/attilio/vmobj-readlock/sys/vm/vm_object.h	Sun May 19 14:59:24 2013	(r250807)
@@ -223,8 +223,6 @@ extern struct vm_object kmem_object_stor
 	rw_assert(&(object)->lock, RA_RLOCKED)
 #define	VM_OBJECT_ASSERT_WLOCKED(object)				\
 	rw_assert(&(object)->lock, RA_WLOCKED)
-#define	VM_OBJECT_LOCK_DOWNGRADE(object)				\
-	rw_downgrade(&(object)->lock)
 #define	VM_OBJECT_RLOCK(object)						\
 	rw_rlock(&(object)->lock)
 #define	VM_OBJECT_RUNLOCK(object)					\