From owner-svn-src-head@FreeBSD.ORG  Sun Feb  8 20:30:52 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE9311065748;
	Sun,  8 Feb 2009 20:30:51 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DAAD08FC24;
	Sun,  8 Feb 2009 20:30:51 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n18KUphl033656;
	Sun, 8 Feb 2009 20:30:51 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n18KUpj1033655;
	Sun, 8 Feb 2009 20:30:51 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200902082030.n18KUpj1033655@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 8 Feb 2009 20:30:51 +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: r188333 - 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: Sun, 08 Feb 2009 20:30:54 -0000

Author: kib
Date: Sun Feb  8 20:30:51 2009
New Revision: 188333
URL: http://svn.freebsd.org/changeset/base/188333

Log:
  In vm_map_sync(), do not call vm_object_sync() while holding map lock.
  Reference object, drop the map lock, and then call vm_object_sync().
  The object sync might require vnode lock for OBJT_VNODE type objects.
  
  Reviewed by:	tegge
  Tested by:	pho

Modified:
  head/sys/vm/vm_map.c

Modified: head/sys/vm/vm_map.c
==============================================================================
--- head/sys/vm/vm_map.c	Sun Feb  8 20:29:37 2009	(r188332)
+++ head/sys/vm/vm_map.c	Sun Feb  8 20:30:51 2009	(r188333)
@@ -2304,6 +2304,7 @@ vm_map_sync(
 	vm_size_t size;
 	vm_object_t object;
 	vm_ooffset_t offset;
+	unsigned int last_timestamp;
 
 	vm_map_lock_read(map);
 	VM_MAP_RANGE_CHECK(map, start, end);
@@ -2338,8 +2339,7 @@ vm_map_sync(
 	 * Make a second pass, cleaning/uncaching pages from the indicated
 	 * objects as we go.
 	 */
-	for (current = entry; current != &map->header && current->start < end;
-	    current = current->next) {
+	for (current = entry; current != &map->header && current->start < end;) {
 		offset = current->offset + (start - current->start);
 		size = (end <= current->end ? end : current->end) - start;
 		if (current->eflags & MAP_ENTRY_IS_SUB_MAP) {
@@ -2359,8 +2359,16 @@ vm_map_sync(
 		} else {
 			object = current->object.vm_object;
 		}
+		vm_object_reference(object);
+		last_timestamp = map->timestamp;
+		vm_map_unlock_read(map);
 		vm_object_sync(object, offset, size, syncio, invalidate);
 		start += size;
+		vm_object_deallocate(object);
+		vm_map_lock_read(map);
+		if (last_timestamp == map->timestamp ||
+		    !vm_map_lookup_entry(map, start, &current))
+			current = current->next;
 	}
 
 	vm_map_unlock_read(map);