d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make two changes to vm_fault().

Browse Source 
1. Retain the map lock until after the calls to pmap_enter() and
   vm_fault_prefault().
2. Remove a stale comment.  Submitted by: tegge@
This commit is contained in:
alc 2004-08-09 06:01:46 +00:00
parent 2c2b6c4ef7
commit eabee22ac5
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/vm/vm_fault.c
View File

@ -770,11 +770,6 @@ readrest:
vm_pindex_t retry_pindex;
vm_prot_t retry_prot;
/*
* Since map entries may be pageable, make sure we can take a
* page fault on them.
*/
/*
* Unlock vnode before the lookup to avoid deadlock. E.G.
* avoid a deadlock between the inode and exec_map that can
@ -890,13 +885,13 @@ readrest:
vm_page_zero_invalid(fs.m, TRUE);
printf("Warning: page %p partially invalid on fault\n", fs.m);
}
unlock_things(&fs);
VM_OBJECT_UNLOCK(fs.object);
pmap_enter(fs.map->pmap, vaddr, fs.m, prot, wired);
if (((fault_flags & VM_FAULT_WIRE_MASK) == 0) && (wired == 0)) {
vm_fault_prefault(fs.map->pmap, vaddr, fs.entry);
}
mtx_unlock(&Giant);
VM_OBJECT_LOCK(fs.object);
vm_page_lock_queues();
vm_page_flag_set(fs.m, PG_REFERENCED);
@ -915,6 +910,10 @@ readrest:
vm_page_wakeup(fs.m);
vm_page_unlock_queues();
/*
* Unlock everything, and return
*/
unlock_and_deallocate(&fs);
PROC_LOCK(curproc);
if ((curproc->p_sflag & PS_INMEM) && curproc->p_stats) {
if (hardfault) {
@ -925,10 +924,6 @@ readrest:
}
PROC_UNLOCK(curproc);
/*
* Unlock everything, and return
*/
vm_object_deallocate(fs.first_object);
return (KERN_SUCCESS);
}