 @@ -1,18 +1,18 @@
-/*	$NetBSD: uvm_pdpolicy_clock.c,v 1.33 2020/02/23 15:46:43 ad Exp $	*/
+/*	$NetBSD: uvm_pdpolicy_clock.c,v 1.34 2020/03/08 15:01:50 ad Exp $	*/
 /*	NetBSD: uvm_pdaemon.c,v 1.72 2006/01/05 10:47:33 yamt Exp $	*/
 /*-
- * Copyright (c) 2019 The NetBSD Foundation, Inc.
+ * Copyright (c) 2019, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -88,27 +88,27 @@
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #if defined(PDSIM)
 #include "pdsim.h"
 #else /* defined(PDSIM) */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.33 2020/02/23 15:46:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.34 2020/03/08 15:01:50 ad Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/atomic.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_pdpolicy.h>
 #include <uvm/uvm_pdpolicy_impl.h>
 #include <uvm/uvm_stat.h>
 @@ -445,27 +445,28 @@ uvmpdpol_pagedeactivate_locked(struct vm
 	KASSERT((pg->pqflags & (PQ_INTENT_MASK | PQ_INTENT_SET)) !=
 	    (PQ_INTENT_D | PQ_INTENT_SET));
 	if (pg->pqflags & PQ_ACTIVE) {
 		TAILQ_REMOVE(&pdpol_state.s_activeq, pg, pdqueue);
 		KASSERT(pdpol_state.s_active > 0);
 		pdpol_state.s_active--;
+	}
 	if ((pg->pqflags & PQ_INACTIVE) == 0) {
 		KASSERT(pg->wire_count == 0);
 		TAILQ_INSERT_TAIL(&pdpol_state.s_inactiveq, pg, pdqueue);
 		pdpol_state.s_inactive++;
+	}
-	pg->pqflags = (pg->pqflags & PQ_INTENT_QUEUED) | PQ_INACTIVE;
+	pg->pqflags &= ~(PQ_ACTIVE | PQ_INTENT_SET);
 	pg->pqflags |= PQ_INACTIVE;
+}
 void
 uvmpdpol_pagedeactivate(struct vm_page *pg)
+{
 	KASSERT(uvm_page_owner_locked_p(pg, true));
 	KASSERT(mutex_owned(&pg->interlock));
 	/*
 	 * we have to clear the reference bit now, as when it comes time to
 	 * realize the intent we won't have the object locked any more.
 	 */
 @@ -476,27 +477,28 @@ uvmpdpol_pagedeactivate(struct vm_page *
 static void
 uvmpdpol_pageactivate_locked(struct vm_page *pg)
+{
 	struct uvmpdpol_globalstate *s __diagused = &pdpol_state;
 	KASSERT(mutex_owned(&s->lock));
 	KASSERT(mutex_owned(&pg->interlock));
 	KASSERT((pg->pqflags & (PQ_INTENT_MASK | PQ_INTENT_SET)) !=
 	    (PQ_INTENT_D | PQ_INTENT_SET));
 	uvmpdpol_pagedequeue_locked(pg);
 	TAILQ_INSERT_TAIL(&pdpol_state.s_activeq, pg, pdqueue);
 	pdpol_state.s_active++;
-	pg->pqflags = (pg->pqflags & PQ_INTENT_QUEUED) | PQ_ACTIVE;
+	pg->pqflags &= ~(PQ_INACTIVE | PQ_INTENT_SET);
 	pg->pqflags |= PQ_ACTIVE;
+}
 void
 uvmpdpol_pageactivate(struct vm_page *pg)
+{
 	KASSERT(uvm_page_owner_locked_p(pg, true));
 	KASSERT(mutex_owned(&pg->interlock));
 	uvmpdpol_set_intent(pg, PQ_INTENT_A);
+}
 static void
 @@ -507,27 +509,27 @@ uvmpdpol_pagedequeue_locked(struct vm_pa
 	KASSERT(mutex_owned(&s->lock));
 	KASSERT(mutex_owned(&pg->interlock));
 	if (pg->pqflags & PQ_ACTIVE) {
 		TAILQ_REMOVE(&pdpol_state.s_activeq, pg, pdqueue);
 		KASSERT((pg->pqflags & PQ_INACTIVE) == 0);
 		KASSERT(pdpol_state.s_active > 0);
 		pdpol_state.s_active--;
 	} else if (pg->pqflags & PQ_INACTIVE) {
 		TAILQ_REMOVE(&pdpol_state.s_inactiveq, pg, pdqueue);
 		KASSERT(pdpol_state.s_inactive > 0);
 		pdpol_state.s_inactive--;
+	}
-	pg->pqflags &= PQ_INTENT_QUEUED;
+	pg->pqflags &= ~(PQ_ACTIVE | PQ_INACTIVE | PQ_INTENT_SET);
+}
 void
 uvmpdpol_pagedequeue(struct vm_page *pg)
+{
 	KASSERT(uvm_page_owner_locked_p(pg, true));
 	KASSERT(mutex_owned(&pg->interlock));
 	uvmpdpol_set_intent(pg, PQ_INTENT_D);
+}
 void