diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2020-12-02 16:32:01 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2020-12-02 16:32:01 +0000 |
| commit | 15629cd6e7a3231d47a0996d26fa5f2cb11dd134 (patch) | |
| tree | 1f4f084b76d73b937520b99edad64280529fabf2 | |
| parent | abc7eaf74f87867d5602b2e10dfe32289557a58f (diff) | |
Document that the page queue must only be locked if the page is managed.
ok kettenis@
| -rw-r--r-- | sys/uvm/uvm_page.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/uvm/uvm_page.c b/sys/uvm/uvm_page.c index ccd2fae6240..222cd5c1910 100644 --- a/sys/uvm/uvm_page.c +++ b/sys/uvm/uvm_page.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_page.c,v 1.153 2020/12/01 13:56:22 mpi Exp $ */ +/* $OpenBSD: uvm_page.c,v 1.154 2020/12/02 16:32:00 mpi Exp $ */ /* $NetBSD: uvm_page.c,v 1.44 2000/11/27 08:40:04 chs Exp $ */ /* @@ -928,7 +928,7 @@ uvm_pagerealloc(struct vm_page *pg, struct uvm_object *newobj, voff_t newoff) * uvm_pageclean: clean page * * => erase page's identity (i.e. remove from object) - * => caller must lock page queues + * => caller must lock page queues if `pg' is managed * => assumes all valid mappings of pg are gone */ void @@ -937,7 +937,8 @@ uvm_pageclean(struct vm_page *pg) u_int flags_to_clear = 0; #if all_pmap_are_fixed - MUTEX_ASSERT_LOCKED(&uvm.pageqlock); + if (pg->pg_flags & (PG_TABLED|PQ_ACTIVE|PQ_INACTIVE)) + MUTEX_ASSERT_LOCKED(&uvm.pageqlock); #endif #ifdef DEBUG @@ -998,14 +999,15 @@ uvm_pageclean(struct vm_page *pg) * * => erase page's identity (i.e. remove from object) * => put page on free list - * => caller must lock page queues + * => caller must lock page queues if `pg' is managed * => assumes all valid mappings of pg are gone */ void uvm_pagefree(struct vm_page *pg) { #if all_pmap_are_fixed - MUTEX_ASSERT_LOCKED(&uvm.pageqlock); + if (pg->pg_flags & (PG_TABLED|PQ_ACTIVE|PQ_INACTIVE)) + MUTEX_ASSERT_LOCKED(&uvm.pageqlock); #endif uvm_pageclean(pg); |