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

don't deactivate pmap in exit1 because we'll touch the pmap later.

Browse Source 
instead, borrow vmspace0 immediately before destroying the pmap
in uvmspace_free.
This commit is contained in:
yamt 2004-02-07 10:05:52 +00:00
parent e0b6b6f7ff
commit a45adbd9c7
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/kern/kern_exit.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_exit.c,v 1.133 2004/01/04 11:33:31 jdolecek Exp $ */
/* $NetBSD: kern_exit.c,v 1.134 2004/02/07 10:05:52 yamt Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.133 2004/01/04 11:33:31 jdolecek Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.134 2004/02/07 10:05:52 yamt Exp $");
#include "opt_ktrace.h"
#include "opt_perfctrs.h"
@ -372,13 +372,6 @@ exit1(struct lwp *l, int rv)
}
proclist_unlock_write(s);
/*
* Deactivate the address space before the vmspace is
* freed. Note that we will continue to run on this
* vmspace's context until the switch to the idle process.
*/
pmap_deactivate(l);
/*
* Free the VM resources we're still holding on to.
* We must do this from a valid thread because doing

18
sys/uvm/uvm_map.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_map.c,v 1.157 2004/02/07 08:02:21 yamt Exp $ */
/* $NetBSD: uvm_map.c,v 1.158 2004/02/07 10:05:52 yamt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.157 2004/02/07 08:02:21 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.158 2004/02/07 10:05:52 yamt Exp $");
#include "opt_ddb.h"
#include "opt_uvmhist.h"
@ -3595,6 +3595,7 @@ uvmspace_free(struct vmspace *vm)
{
struct vm_map_entry *dead_entries;
struct vm_map *map;
struct lwp *l;
UVMHIST_FUNC("uvmspace_free"); UVMHIST_CALLED(maphist);
UVMHIST_LOG(maphist,"(vm=0x%x) ref=%d", vm, vm->vm_refcnt,0,0);
@ -3623,6 +3624,19 @@ uvmspace_free(struct vmspace *vm)
}
KASSERT(map->nentries == 0);
KASSERT(map->size == 0);
/*
* if we're destroying our own vmspace,
* borrow proc0's one.
*/
l = curlwp;
if (l->l_proc->p_vmspace == vm) {
pmap_deactivate(l);
l->l_proc->p_vmspace = proc0.p_vmspace;
pmap_activate(l);
}
pmap_destroy(map->pmap);
pool_put(&uvm_vmspace_pool, vm);
}