Do not call vm_object_deallocate() from vm_map_delete(), because we

hold the map lock there, and might need the vnode lock for OBJT_VNODE
objects. Postpone object deallocation until caller of vm_map_delete()
drops the map lock. Link the map entries to be freed into the freelist,
that is released by the new helper function vm_map_entry_free_freelist().

Reviewed by:	tegge, alc
Tested by:	pho

1 files changed, 9 insertions, 3 deletions

diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 9a1ac63..b438058 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -271,7 +271,7 @@ kmem_malloc(map, size, flags)
 	int flags;
 {
 	vm_offset_t offset, i;
-	vm_map_entry_t entry;
+	vm_map_entry_t entry, freelist;
 	vm_offset_t addr;
 	vm_page_t m;
 	int pflags;
@@ -355,8 +355,10 @@ retry:
 				vm_page_unlock_queues();
 			}
 			VM_OBJECT_UNLOCK(kmem_object);
-			vm_map_delete(map, addr, addr + size);
+			freelist = NULL;
+			vm_map_delete(map, addr, addr + size, &freelist);
 			vm_map_unlock(map);
+			vm_map_entry_free_freelist(map, freelist);
 			return (0);
 		}
 		if (flags & M_ZERO && (m->flags & PG_ZERO) == 0)
@@ -455,14 +457,18 @@ kmem_free_wakeup(map, addr, size)
 	vm_offset_t addr;
 	vm_size_t size;
 {
+	vm_map_entry_t freelist;
 
+	freelist = NULL;
 	vm_map_lock(map);
-	(void) vm_map_delete(map, trunc_page(addr), round_page(addr + size));
+	(void) vm_map_delete(map, trunc_page(addr), round_page(addr + size),
+	     &freelist);
 	if (map->needs_wakeup) {
 		map->needs_wakeup = FALSE;
 		vm_map_wakeup(map);
 	}
 	vm_map_unlock(map);
+	vm_map_entry_free_freelist(map, freelist);
 }
 
 /*