Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When handling the MADV_FREE case, if the amap or aobj has more than

Browse Source 
one reference, go through the deactivate path; the page may actually
be in use by another process.

Fixes kern/8239.
This commit is contained in:
thorpej 1999-08-21 02:19:05 +00:00
parent e09aca5470
commit 23e83a7ac7
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/uvm/uvm_aobj.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_aobj.c,v 1.24 1999/07/22 22:58:38 thorpej Exp $ */ /* $NetBSD: uvm_aobj.c,v 1.25 1999/08/21 02:19:05 thorpej Exp $ */
/* /*
* Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and * Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@ -855,6 +855,7 @@ uao_flush(uobj, start, stop, flags)
case PGO_CLEANIT|PGO_FREE: case PGO_CLEANIT|PGO_FREE:
case PGO_CLEANIT|PGO_DEACTIVATE: case PGO_CLEANIT|PGO_DEACTIVATE:
case PGO_DEACTIVATE: case PGO_DEACTIVATE:
deactivate_it:
/* skip the page if it's loaned or wired */ /* skip the page if it's loaned or wired */
if (pp->loan_count != 0 || if (pp->loan_count != 0 ||
pp->wire_count != 0) pp->wire_count != 0)
@ -870,6 +871,13 @@ uao_flush(uobj, start, stop, flags)
continue; continue;
case PGO_FREE: case PGO_FREE:
/*
* If there are multiple references to
* the object, just deactivate the page.
*/
if (uobj->uo_refs > 1)
goto deactivate_it;
/* XXX skip the page if it's loaned or wired */ /* XXX skip the page if it's loaned or wired */
if (pp->loan_count != 0 || if (pp->loan_count != 0 ||
pp->wire_count != 0) pp->wire_count != 0)

10
sys/uvm/uvm_map.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_map.c,v 1.67 1999/08/03 00:38:33 thorpej Exp $ */ /* $NetBSD: uvm_map.c,v 1.68 1999/08/21 02:19:05 thorpej Exp $ */
/* /*
* Copyright (c) 1997 Charles D. Cranor and Washington University. * Copyright (c) 1997 Charles D. Cranor and Washington University.
@ -2533,6 +2533,7 @@ uvm_map_clean(map, start, end, flags)
case PGO_CLEANIT|PGO_FREE: case PGO_CLEANIT|PGO_FREE:
case PGO_CLEANIT|PGO_DEACTIVATE: case PGO_CLEANIT|PGO_DEACTIVATE:
case PGO_DEACTIVATE: case PGO_DEACTIVATE:
deactivate_it:
/* skip the page if it's loaned or wired */ /* skip the page if it's loaned or wired */
if (pg->loan_count != 0 || if (pg->loan_count != 0 ||
pg->wire_count != 0) { pg->wire_count != 0) {
@ -2577,6 +2578,13 @@ uvm_map_clean(map, start, end, flags)
continue; continue;
case PGO_FREE: case PGO_FREE:
/*
* If there are multiple references to
* the amap, just deactivate the page.
*/
if (amap_refs(amap) > 1)
goto deactivate_it;
/* XXX skip the page if it's wired */ /* XXX skip the page if it's wired */
if (pg->wire_count != 0) { if (pg->wire_count != 0) {
simple_unlock(&anon->an_lock); simple_unlock(&anon->an_lock);