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

fix two bugs with wiring:

Browse Source 
(1) in pmap_enter_pv(), we would always mark the header entry wired, even if
     the new entry wasn't put there.  noticed by Juergen Hannken-Illjes.
 (2) in pmap_unwire(), we would never examine the header entry.
     noticed by me.

while I'm here, move the counter increment in the pmap_enter() path to be
next to the corresponding PV_WIRE() call so it's more obvious they match.
This commit is contained in:
chs 2005-03-02 09:02:42 +00:00
parent bd2d26b450
commit 111117ce57
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/arch/powerpc/ibm4xx/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.32 2005/02/25 07:09:58 simonb Exp $ */
/* $NetBSD: pmap.c,v 1.33 2005/03/02 09:02:42 chs Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.32 2005/02/25 07:09:58 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.33 2005/03/02 09:02:42 chs Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@ -728,9 +728,11 @@ pmap_enter_pv(struct pmap *pm, vaddr_t va, paddr_t pa, boolean_t wired)
npv->pv_pm = pm;
npv->pv_next = pv->pv_next;
pv->pv_next = npv;
pv = npv;
}
if (wired) {
PV_WIRE(pv);
pm->pm_stats.wired_count++;
}
splx(s);
return (1);
@ -869,16 +871,13 @@ pmap_enter(struct pmap *pm, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags)
if ((prot & VM_PROT_EXECUTE) && (tte & TTE_I) == 0)
__syncicache((void *)pa, PAGE_SIZE);
if (flags & PMAP_WIRED)
pm->pm_stats.wired_count++;
return 0;
}
void
pmap_unwire(struct pmap *pm, vaddr_t va)
{
struct pv_entry *pv, *npv;
struct pv_entry *pv;
paddr_t pa;
int s;
@ -890,21 +889,16 @@ pmap_unwire(struct pmap *pm, vaddr_t va)
if (!pv)
return;
/*
* If it is the first entry on the list, it is actually
* in the header and we must copy the following entry up
* to the header. Otherwise we must search the list for
* the entry. In either case we free the now unused entry.
*/
s = splvm();
for (npv = pv; (npv = pv->pv_next) != NULL; pv = npv) {
if (pm == npv->pv_pm && PV_CMPVA(va, npv)) {
if (PV_ISWIRED(npv)) {
PV_UNWIRE(npv);
while (pv != NULL) {
if (pm == pv->pv_pm && PV_CMPVA(va, pv)) {
if (PV_ISWIRED(pv)) {
PV_UNWIRE(pv);
pm->pm_stats.wired_count--;
}
break;
}
pv = pv->pv_next;
}
splx(s);
}