svn commit: r358505 - head/sys/vm

[Mark Johnston]

Author: markj
Date: Sun Mar  1 22:09:11 2020
New Revision: 358505
URL: https://svnweb.freebsd.org/changeset/base/358505

Log:
  Avoid doubly wiring a newly allocated page in vm_page_grab_valid().
  
  This fixes a regression from r358363.
  
  Reported by:	manu, jbeich
  Tested by:	jbeich

Modified:
  head/sys/vm/vm_page.c

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Sun Mar  1 21:54:28 2020	(r358504)
+++ head/sys/vm/vm_page.c	Sun Mar  1 22:09:11 2020	(r358505)
@@ -4535,7 +4535,8 @@ vm_page_grab_valid(vm_page_t *mp, vm_object_t object, 
 	    (VM_ALLOC_NOWAIT | VM_ALLOC_WAITFAIL | VM_ALLOC_ZERO)) == 0,
 	    ("vm_page_grab_valid: Invalid flags 0x%X", allocflags));
 	VM_OBJECT_ASSERT_WLOCKED(object);
-	pflags = allocflags & ~(VM_ALLOC_NOBUSY | VM_ALLOC_SBUSY);
+	pflags = allocflags & ~(VM_ALLOC_NOBUSY | VM_ALLOC_SBUSY |
+	    VM_ALLOC_WIRED);
 	pflags |= VM_ALLOC_WAITFAIL;
 
 retrylookup: