Revision 1.52 of vm/uma_core.c has led to UMA's obj_alloc() being

called without Giant; and obj_alloc() in turn calls vm_page_alloc()
without Giant.  This causes an assertion failure in vm_page_alloc().
Fortunately, obj_alloc() is now MPSAFE.  So, we need only clean up
some assertions.

 - Weaken the assertion in vm_page_lookup() to require Giant only
   if the vm_object isn't locked.
 - Remove an assertion from vm_page_alloc() that duplicates a check
   performed in vm_page_lookup().

In collaboration with:	gallatin, jake, jeff

1 files changed, 2 insertions, 3 deletions

diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index a0d7744..8ce52ab 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -652,7 +652,8 @@ vm_page_lookup(vm_object_t object, vm_pindex_t pindex)
 {
 	vm_page_t m;
 
-	mtx_assert(object == kmem_object ? &object->mtx : &Giant, MA_OWNED);
+	if (!VM_OBJECT_LOCKED(object))
+		GIANT_REQUIRED;
 	m = vm_page_splay(pindex, object->root);
 	if ((object->root = m) != NULL && m->pindex != pindex)
 		m = NULL;
@@ -770,8 +771,6 @@ vm_page_alloc(vm_object_t object, vm_pindex_t pindex, int req)
 	if ((req & VM_ALLOC_NOOBJ) == 0) {
 		KASSERT(object != NULL,
 		    ("vm_page_alloc: NULL object."));
-		mtx_assert(object == kmem_object ? &object->mtx : &Giant,
-		    MA_OWNED);
 		KASSERT(!vm_page_lookup(object, pindex),
 		    ("vm_page_alloc: page already allocated"));
 		color = pindex + object->pg_color;