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

in uvm_fault_unwire_locked(), if we find that a pmap entry is missing,

Browse Source 
just skip that page.  this situation can arise legitimately when a file
with a wired mapping is truncated so that a wired page is no longer
part of the file.
This commit is contained in:
chs 2002-01-02 01:10:36 +00:00
parent 9451559ef4
commit e9a82c88ce
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/uvm/uvm_fault.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_fault.c,v 1.73 2002/01/01 22:18:39 chs Exp $ */ /* $NetBSD: uvm_fault.c,v 1.74 2002/01/02 01:10:36 chs Exp $ */
/* /*
* *
@ -39,7 +39,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.73 2002/01/01 22:18:39 chs Exp $"); __KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.74 2002/01/02 01:10:36 chs Exp $");
#include "opt_uvmhist.h" #include "opt_uvmhist.h"
@ -1800,22 +1800,21 @@ uvm_fault_unwire_locked(map, start, end)
/* /*
* find the beginning map entry for the region. * find the beginning map entry for the region.
*/ */
KASSERT(start >= vm_map_min(map) && end <= vm_map_max(map)); KASSERT(start >= vm_map_min(map) && end <= vm_map_max(map));
if (uvm_map_lookup_entry(map, start, &entry) == FALSE) if (uvm_map_lookup_entry(map, start, &entry) == FALSE)
panic("uvm_fault_unwire_locked: address not in map"); panic("uvm_fault_unwire_locked: address not in map");
for (va = start; va < end; va += PAGE_SIZE) { for (va = start; va < end; va += PAGE_SIZE) {
if (pmap_extract(pmap, va, &pa) == FALSE) if (pmap_extract(pmap, va, &pa) == FALSE)
panic("uvm_fault_unwire_locked: unwiring " continue;
"non-wired memory");
/* /*
* make sure the current entry is for the address we're * find the map entry for the current address.
* dealing with. if not, grab the next entry.
*/ */
KASSERT(va >= entry->start); KASSERT(va >= entry->start);
if (va >= entry->end) { while (va >= entry->end) {
KASSERT(entry->next != &map->header && KASSERT(entry->next != &map->header &&
entry->next->start <= entry->end); entry->next->start <= entry->end);
entry = entry->next; entry = entry->next;
@ -1824,6 +1823,7 @@ uvm_fault_unwire_locked(map, start, end)
/* /*
* if the entry is no longer wired, tell the pmap. * if the entry is no longer wired, tell the pmap.
*/ */
if (VM_MAPENT_ISWIRED(entry) == 0) if (VM_MAPENT_ISWIRED(entry) == 0)
pmap_unwire(pmap, va); pmap_unwire(pmap, va);