Module Name: src
Committed By: ad
Date: Sat Mar 14 13:53:26 UTC 2020
Modified Files:
src/sys/uvm: uvm_pdpolicy_clock.c uvm_pdpolicy_clockpro.c
Log Message:
uvm_pdpolicy: Require a write lock on the object only for dequeue.
No sense in requiring that for enqueue/activate/deactivate.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/uvm/uvm_pdpolicy_clock.c
cvs rdiff -u -r1.23 -r1.24 src/sys/uvm/uvm_pdpolicy_clockpro.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/uvm_pdpolicy_clock.c
diff -u src/sys/uvm/uvm_pdpolicy_clock.c:1.34 src/sys/uvm/uvm_pdpolicy_clock.c:1.35
--- src/sys/uvm/uvm_pdpolicy_clock.c:1.34 Sun Mar 8 15:01:50 2020
+++ src/sys/uvm/uvm_pdpolicy_clock.c Sat Mar 14 13:53:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pdpolicy_clock.c,v 1.34 2020/03/08 15:01:50 ad Exp $ */
+/* $NetBSD: uvm_pdpolicy_clock.c,v 1.35 2020/03/14 13:53:26 ad Exp $ */
/* NetBSD: uvm_pdaemon.c,v 1.72 2006/01/05 10:47:33 yamt Exp $ */
/*-
@@ -98,7 +98,7 @@
#else /* defined(PDSIM) */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.34 2020/03/08 15:01:50 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.35 2020/03/14 13:53:26 ad Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -463,7 +463,7 @@ void
uvmpdpol_pagedeactivate(struct vm_page *pg)
{
- KASSERT(uvm_page_owner_locked_p(pg, true));
+ KASSERT(uvm_page_owner_locked_p(pg, false));
KASSERT(mutex_owned(&pg->interlock));
/*
@@ -495,7 +495,7 @@ void
uvmpdpol_pageactivate(struct vm_page *pg)
{
- KASSERT(uvm_page_owner_locked_p(pg, true));
+ KASSERT(uvm_page_owner_locked_p(pg, false));
KASSERT(mutex_owned(&pg->interlock));
uvmpdpol_set_intent(pg, PQ_INTENT_A);
@@ -536,7 +536,7 @@ void
uvmpdpol_pageenqueue(struct vm_page *pg)
{
- KASSERT(uvm_page_owner_locked_p(pg, true));
+ KASSERT(uvm_page_owner_locked_p(pg, false));
KASSERT(mutex_owned(&pg->interlock));
uvmpdpol_set_intent(pg, PQ_INTENT_E);
Index: src/sys/uvm/uvm_pdpolicy_clockpro.c
diff -u src/sys/uvm/uvm_pdpolicy_clockpro.c:1.23 src/sys/uvm/uvm_pdpolicy_clockpro.c:1.24
--- src/sys/uvm/uvm_pdpolicy_clockpro.c:1.23 Thu Jan 30 12:28:51 2020
+++ src/sys/uvm/uvm_pdpolicy_clockpro.c Sat Mar 14 13:53:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pdpolicy_clockpro.c,v 1.23 2020/01/30 12:28:51 ad Exp $ */
+/* $NetBSD: uvm_pdpolicy_clockpro.c,v 1.24 2020/03/14 13:53:26 ad Exp $ */
/*-
* Copyright (c)2005, 2006 YAMAMOTO Takashi,
@@ -43,7 +43,7 @@
#else /* defined(PDSIM) */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clockpro.c,v 1.23 2020/01/30 12:28:51 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clockpro.c,v 1.24 2020/03/14 13:53:26 ad Exp $");
#include "opt_ddb.h"
@@ -645,7 +645,7 @@ clockpro_movereferencebit(struct vm_page
bool referenced;
KASSERT(mutex_owned(&clockpro.lock));
- KASSERT(!locked || uvm_page_owner_locked_p(pg));
+ KASSERT(!locked || uvm_page_owner_locked_p(pg, false));
if (!locked) {
/*
* acquire interlock to stablize page identity.
