diff options
| author | Renato Botelho <renato@netgate.com> | 2016-07-11 14:09:23 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-07-11 14:09:23 -0300 |
| commit | 3a4027cfafa37c1a0c0b05987c0edb1452c7bd2b (patch) | |
| tree | 66dc775beb72a91e58e26949f9cba8fbd74c9301 /sys/vm | |
| parent | ac9e13a9f38640234319dfe1b3c26b7e69057982 (diff) | |
| parent | 0ddba37c51521e5d2e7ada2ebd4619a703477036 (diff) | |
| download | FreeBSD-src-3a4027cfafa37c1a0c0b05987c0edb1452c7bd2b.zip FreeBSD-src-3a4027cfafa37c1a0c0b05987c0edb1452c7bd2b.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
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; } /* |
