Page MenuHomeFreeBSD
Files F145356564

D20356.id57701.diff
No OneTemporary
Actions

D20356.id57701.diff
View Options

Index: vm_map.c
===================================================================
--- vm_map.c
+++ vm_map.c
@@ -1251,7 +1251,7 @@
* The map must be locked, and leaves it so.
*/
static void
-vm_map_entry_resize_free(vm_map_t map, vm_map_entry_t entry)
+vm_map_entry_resize_free(vm_map_t map, vm_map_entry_t entry, size_t grow_amount)
{
vm_map_entry_t llist, rlist, root;
@@ -1262,11 +1262,12 @@
("vm_map_entry_resize_free: resize_free object not mapped"));
vm_map_splay_findnext(root, &rlist);
root->right = NULL;
+ entry->end += grow_amount;
map->root = vm_map_splay_merge(root, llist, rlist,
root->left, root->right);
VM_MAP_ASSERT_CONSISTENT(map);
- CTR3(KTR_VM, "vm_map_entry_resize_free: map %p, nentries %d, entry %p", map,
- map->nentries, entry);
+ CTR3(KTR_VM, "vm_map_entry_resize_free: map %p, nentries %d, entry %p",
+ map, map->nentries, entry);
}
/*
@@ -1486,8 +1487,8 @@
prev_entry));
if ((prev_entry->eflags & MAP_ENTRY_GUARD) == 0)
map->size += end - prev_entry->end;
- prev_entry->end = end;
- vm_map_entry_resize_free(map, prev_entry);
+ vm_map_entry_resize_free(map, prev_entry,
+ end - prev_entry->end);
vm_map_simplify_entry(map, prev_entry);
return (KERN_SUCCESS);
}
@@ -4314,24 +4315,20 @@
} else {
MPASS(gap_entry->start < gap_entry->end - grow_amount);
gap_entry->end -= grow_amount;
- vm_map_entry_resize_free(map, gap_entry);
+ vm_map_entry_resize_free(map, gap_entry, -grow_amount);
gap_deleted = false;
}
rv = vm_map_insert(map, NULL, 0, grow_start,
grow_start + grow_amount,
stack_entry->protection, stack_entry->max_protection,
MAP_STACK_GROWS_DOWN);
- if (rv != KERN_SUCCESS) {
- if (gap_deleted) {
- rv1 = vm_map_insert(map, NULL, 0, gap_start,
- gap_end, VM_PROT_NONE, VM_PROT_NONE,
- MAP_CREATE_GUARD | MAP_CREATE_STACK_GAP_DN);
- MPASS(rv1 == KERN_SUCCESS);
- } else {
- gap_entry->end += grow_amount;
- vm_map_entry_resize_free(map, gap_entry);
- }
- }
+ if (rv != KERN_SUCCESS && gap_deleted) {
+ rv1 = vm_map_insert(map, NULL, 0, gap_start,
+ gap_end, VM_PROT_NONE, VM_PROT_NONE,
+ MAP_CREATE_GUARD | MAP_CREATE_STACK_GAP_DN);
+ MPASS(rv1 == KERN_SUCCESS);
+ } else if (rv != KERN_SUCCESS)
+ vm_map_entry_resize_free(map, gap_entry, grow_amount);
} else {
grow_start = stack_entry->end;
cred = stack_entry->cred;
@@ -4350,8 +4347,7 @@
else
gap_entry->start += grow_amount;
stack_entry->end += grow_amount;
- map->size += grow_amount;
- vm_map_entry_resize_free(map, stack_entry);
+ vm_map_entry_resize_free(map, stack_entry, grow_amount);
rv = KERN_SUCCESS;
} else
rv = KERN_FAILURE;

File Metadata

Mime Type
text/plain
Expires
Thu, Feb 19, 6:00 PM (14 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28887355
Default Alt Text
D20356.id57701.diff (2 KB)

Event Timeline