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

Pull across a fix from OpenBSD, but use PDE_SIZE instead of ~PDE_MASK + 1.

Browse Source 
Make sure that if a PDE isn't there, we skip to the start of the address
range covered by the next PDE and not somewhere in the middle.  The old could
have skipped over some valid PTE's causing them to stay behind in the pmap.
Since we would not flush the cache for those pages either this could also
cause memory corruption when dirty cache lines would be written back to
memory at a later stage.
This commit is contained in:
skrll 2009-08-12 07:42:36 +00:00
parent 75b3905d60
commit 3e1a0e3c2d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/hppa/hppa/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.49 2009/04/30 07:01:27 skrll Exp $ */
/* $NetBSD: pmap.c,v 1.50 2009/08/12 07:42:36 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.49 2009/04/30 07:01:27 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.50 2009/08/12 07:42:36 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -465,7 +465,7 @@ pmap_dump_table(pa_space_t space, vaddr_t sva)
if (pdemask != (va & PDE_MASK)) {
pdemask = va & PDE_MASK;
if (!(pde = pmap_pde_get(pd, va))) {
va += ~PDE_MASK + 1 - PAGE_SIZE;
va = pdemask + PDE_SIZE - PAGE_SIZE;
continue;
}
printf("%x:%8p:\n", sp, pde);
@ -1368,10 +1368,10 @@ pmap_remove(pmap_t pmap, vaddr_t sva, vaddr_t eva)
if (pdemask != (sva & PDE_MASK)) {
pdemask = sva & PDE_MASK;
if (!(pde = pmap_pde_get(pmap->pm_pdir, sva))) {
sva += ~PDE_MASK + 1 - PAGE_SIZE;
sva = pdemask + PDE_SIZE - PAGE_SIZE;
continue;
}
batch = pdemask == sva && sva + ~PDE_MASK + 1 <= eva;
batch = pdemask == sva && sva + PDE_SIZE <= eva;
}
if ((pte = pmap_pte_get(pde, sva))) {
@ -1436,7 +1436,7 @@ pmap_write_protect(pmap_t pmap, vaddr_t sva, vaddr_t eva, vm_prot_t prot)
if (pdemask != (sva & PDE_MASK)) {
pdemask = sva & PDE_MASK;
if (!(pde = pmap_pde_get(pmap->pm_pdir, sva))) {
sva += ~PDE_MASK + 1 - PAGE_SIZE;
sva = pdemask + PDE_SIZE - PAGE_SIZE;
continue;
}
}
@ -1883,7 +1883,7 @@ pmap_kremove(vaddr_t va, vsize_t size)
if (pdemask != (va & PDE_MASK)) {
pdemask = va & PDE_MASK;
if (!(pde = pmap_pde_get(pmap->pm_pdir, va))) {
va += ~PDE_MASK + 1 - PAGE_SIZE;
va = pdemask + PDE_SIZE - PAGE_SIZE;
continue;
}
}