Module Name: src
Committed By: skrll
Date: Wed Aug 12 07:42:36 UTC 2009
Modified Files:
src/sys/arch/hppa/hppa: pmap.c
Log Message:
Pull across a fix from OpenBSD, but use PDE_SIZE instead of ~PDE_MASK + 1.
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.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/hppa/hppa/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/hppa/pmap.c
diff -u src/sys/arch/hppa/hppa/pmap.c:1.49 src/sys/arch/hppa/hppa/pmap.c:1.50
--- src/sys/arch/hppa/hppa/pmap.c:1.49 Thu Apr 30 07:01:27 2009
+++ src/sys/arch/hppa/hppa/pmap.c Wed Aug 12 07:42:36 2009
@@ -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 @@
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 @@
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 @@
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 @@
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;
}
}
