svn commit: r355516 - head/sys/vm

[Jeff Roberson]

Author: jeff
Date: Sun Dec  8 01:49:53 2019
New Revision: 355516
URL: https://svnweb.freebsd.org/changeset/base/355516

Log:
  It is safe to wire a page while the object is busy.
  
  Reviewed by:	kib, markj
  Differential Revision:	https://reviews.freebsd.org/D22636

Modified:
  head/sys/vm/vm_page.c

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Sun Dec  8 01:49:03 2019	(r355515)
+++ head/sys/vm/vm_page.c	Sun Dec  8 01:49:53 2019	(r355516)
@@ -3803,7 +3803,7 @@ vm_page_wire(vm_page_t m)
 
 	KASSERT(m->object != NULL,
 	    ("vm_page_wire: page %p does not belong to an object", m));
-	if (!vm_page_busied(m))
+	if (!vm_page_busied(m) && !vm_object_busied(m->object))
 		VM_OBJECT_ASSERT_LOCKED(m->object);
 	KASSERT((m->flags & PG_FICTITIOUS) == 0 ||
 	    VPRC_WIRE_COUNT(m->ref_count) >= 1,