diff options
author | alc <alc@FreeBSD.org> | 2014-06-25 03:30:03 +0000 |
---|---|---|
committer | alc <alc@FreeBSD.org> | 2014-06-25 03:30:03 +0000 |
commit | aeda9d4c41a801be5fa4318ddf2503e58c41ca78 (patch) | |
tree | da677396835fc493d539f7205388b591c9b6c5b6 | |
parent | 33e60dabce67b0805a0f9dc2bc92b0a3156c82c6 (diff) | |
download | FreeBSD-src-aeda9d4c41a801be5fa4318ddf2503e58c41ca78.zip FreeBSD-src-aeda9d4c41a801be5fa4318ddf2503e58c41ca78.tar.gz |
Now that vm_map_insert() sets MAP_ENTRY_GROWS_{DOWN,UP} on the stack entries
that it creates (r267645), we can place the check that blocks map entry
coalescing on stack entries in vm_map_simplify_entry() where it properly
belongs.
Reviewed by: kib
-rw-r--r-- | sys/vm/vm_map.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 9bb9bd1..47313a6 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1292,12 +1292,12 @@ charged: map->size += new_entry->end - new_entry->start; /* - * It may be possible to merge the new entry with the next and/or - * previous entries. However, due to MAP_STACK_* being a hack, a - * panic can result from merging such entries. + * Try to coalesce the new entry with both the previous and next + * entries in the list. Previously, we only attempted to coalesce + * with the previous entry when object is NULL. Here, we handle the + * other cases, which are less common. */ - if ((cow & (MAP_STACK_GROWS_DOWN | MAP_STACK_GROWS_UP)) == 0) - vm_map_simplify_entry(map, new_entry); + vm_map_simplify_entry(map, new_entry); if (cow & (MAP_PREFAULT|MAP_PREFAULT_PARTIAL)) { vm_map_pmap_enter(map, start, prot, @@ -1512,7 +1512,8 @@ vm_map_simplify_entry(vm_map_t map, vm_map_entry_t entry) vm_map_entry_t next, prev; vm_size_t prevsize, esize; - if (entry->eflags & (MAP_ENTRY_IN_TRANSITION | MAP_ENTRY_IS_SUB_MAP)) + if ((entry->eflags & (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP | + MAP_ENTRY_IN_TRANSITION | MAP_ENTRY_IS_SUB_MAP)) != 0) return; prev = entry->prev; |