diff options
| author | kib <kib@FreeBSD.org> | 2016-07-10 04:33:16 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-07-10 04:33:16 +0000 |
| commit | fea655bb52699803569a299ebd46c996f3711d35 (patch) | |
| tree | f02622ca9ee8e7a2c9136466d17f2fd4c74c005f /sys/vm | |
| parent | ee3e200276b0f5bb9f2ac8fe92f747892fc807e1 (diff) | |
| download | FreeBSD-src-fea655bb52699803569a299ebd46c996f3711d35.zip FreeBSD-src-fea655bb52699803569a299ebd46c996f3711d35.tar.gz | |
MFC r302236:
Handle the vm_fault() handler race with the vm_object_collapse()
sleepable scan.
MFC r302317:
Change type of the 'dead' variable to boolean.
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/vm_fault.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index b5ac58f..d65cda2 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -286,7 +286,7 @@ vm_fault_hold(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, vm_prot_t prot; long ahead, behind; int alloc_req, era, faultcount, nera, reqpage, result; - boolean_t growstack, is_first_object_locked, wired; + boolean_t dead, growstack, is_first_object_locked, wired; int map_generation; vm_object_t next_object; vm_page_t marray[VM_FAULT_READ_MAX]; @@ -423,11 +423,18 @@ fast_failed: fs.pindex = fs.first_pindex; while (TRUE) { /* - * If the object is dead, we stop here + * If the object is marked for imminent termination, + * we retry here, since the collapse pass has raced + * with us. Otherwise, if we see terminally dead + * object, return fail. */ - if (fs.object->flags & OBJ_DEAD) { + if ((fs.object->flags & OBJ_DEAD) != 0) { + dead = fs.object->type == OBJT_DEAD; unlock_and_deallocate(&fs); - return (KERN_PROTECTION_FAILURE); + if (dead) + return (KERN_PROTECTION_FAILURE); + pause("vmf_de", 1); + goto RetryFault; } /* |
