svn commit: r356183 - head/sys/vm

[Mark Johnston]

Author: markj
Date: Sun Dec 29 20:01:03 2019
New Revision: 356183
URL: https://svnweb.freebsd.org/changeset/base/356183

Log:
  Restore a vm_page_wired() check in vm_page_mvqueue() after r356156.
  
  We now set PGA_DEQUEUE on a managed page when it is wired after
  allocation, and vm_page_mvqueue() ignores pages with this flag set,
  ensuring that they do not end up in the page queues.  However, this is
  not sufficient for managed fictitious pages or pages managed by the
  TTM.  In particular, the TTM makes use of the plinks.q queue linkage
  fields for its own purposes.
  
  PR:	242961
  Reported and tested by:	Greg V <greg at unrelenting.technology>

Modified:
  head/sys/vm/vm_page.c

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Sun Dec 29 19:33:41 2019	(r356182)
+++ head/sys/vm/vm_page.c	Sun Dec 29 20:01:03 2019	(r356183)
@@ -4010,7 +4010,7 @@ vm_page_mvqueue(vm_page_t m, const uint8_t nqueue, con
 	KASSERT(nflag == PGA_REQUEUE || nflag == PGA_REQUEUE_HEAD,
 	    ("%s: invalid flags %x", __func__, nflag));
 
-	if ((m->oflags & VPO_UNMANAGED) != 0)
+	if ((m->oflags & VPO_UNMANAGED) != 0 || vm_page_wired(m))
 		return;
 
 	old = vm_page_astate_load(m);