Page MenuHomeFreeBSD
Files F133109758

D19826.id55933.diff
No OneTemporary
Actions

D19826.id55933.diff
View Options

Index: sys/vm/vm_map.c
===================================================================
--- sys/vm/vm_map.c
+++ sys/vm/vm_map.c
@@ -917,36 +917,38 @@
entry->max_free = MAX(max_left, max_right);
}
-#define SPLAY_LEFT_STEP(root, y, rlist, test) do { \
- y = root->left; \
- if (y != NULL && (test)) { \
- /* Rotate right and make y root. */ \
- root->left = y->right; \
- y->right = root; \
- vm_map_entry_set_max_free(root); \
- root = y; \
- y = root->left; \
- } \
- /* Put root on rlist. */ \
- root->left = rlist; \
- rlist = root; \
- root = y; \
+#define SPLAY_LEFT_STEP(root, y, rlist, test) do { \
+ y = root->left; \
+ if (y != NULL && (test)) { \
+ /* Rotate right and make y root. */ \
+ root->left = y->right; \
+ y->right = root; \
+ if (root->max_free == y->max_free) \
+ vm_map_entry_set_max_free(root); \
+ root = y; \
+ y = root->left; \
+ } \
+ /* Put root on rlist. */ \
+ root->left = rlist; \
+ rlist = root; \
+ root = y; \
} while (0)
-#define SPLAY_RIGHT_STEP(root, y, llist, test) do { \
- y = root->right; \
- if (y != NULL && (test)) { \
- /* Rotate left and make y root. */ \
- root->right = y->left; \
- y->left = root; \
- vm_map_entry_set_max_free(root); \
- root = y; \
- y = root->right; \
- } \
- /* Put root on llist. */ \
- root->right = llist; \
- llist = root; \
- root = y; \
+#define SPLAY_RIGHT_STEP(root, y, llist, test) do { \
+ y = root->right; \
+ if (y != NULL && (test)) { \
+ /* Rotate left and make y root. */ \
+ root->right = y->left; \
+ y->left = root; \
+ if (root->max_free == y->max_free) \
+ vm_map_entry_set_max_free(root); \
+ root = y; \
+ y = root->right; \
+ } \
+ /* Put root on llist. */ \
+ root->right = llist; \
+ llist = root; \
+ root = y; \
} while (0)
/*
@@ -1015,18 +1017,31 @@
vm_map_entry_t ltree, vm_map_entry_t rtree)
{
vm_map_entry_t y;
+ vm_size_t max_free;
+ if (llist != NULL)
+ max_free = (ltree != NULL) ? ltree->max_free :
+ llist->next->start - llist->end;
while (llist != NULL) {
y = llist->right;
llist->right = ltree;
- vm_map_entry_set_max_free(llist);
+ if (llist->max_free < max_free)
+ llist->max_free = max_free;
+ else
+ max_free = llist->max_free;
ltree = llist;
llist = y;
}
+ if (rlist != NULL)
+ max_free = (rtree != NULL) ? rtree->max_free :
+ rlist->start - rlist->prev->end;
while (rlist != NULL) {
y = rlist->left;
rlist->left = rtree;
- vm_map_entry_set_max_free(rlist);
+ if (rlist->max_free < max_free)
+ rlist->max_free = max_free;
+ else
+ max_free = rlist->max_free;
rtree = rlist;
rlist = y;
}
@@ -1105,6 +1120,7 @@
"vm_map_entry_link: map %p, nentries %d, entry %p", map,
map->nentries, entry);
VM_MAP_ASSERT_LOCKED(map);
+// VM_MAP_ASSERT_CONSISTENT(map);
map->nentries++;
root = map->root;
root = vm_map_splay_split(entry->start, 0, root, &llist, &rlist);
@@ -1132,10 +1148,6 @@
vm_map_entry_t llist, rlist, root, y;
VM_MAP_ASSERT_LOCKED(map);
- llist = entry->prev;
- rlist = entry->next;
- llist->next = rlist;
- rlist->prev = llist;
root = map->root;
root = vm_map_splay_split(entry->start, 0, root, &llist, &rlist);
KASSERT(root != NULL,
@@ -1174,6 +1186,9 @@
root = NULL;
break;
}
+ y = entry->next;
+ y->prev = entry->prev;
+ y->prev->next = y;
if (root != NULL)
root = vm_map_splay_merge(root, llist, rlist,
root->left, root->right);
@@ -1185,17 +1200,18 @@
}
/*
- * vm_map_entry_resize_free:
+ * vm_map_entry_resize:
*
- * Recompute the amount of free space following a modified vm_map_entry
- * and propagate those values up the tree. Call this function after
- * resizing a map entry in-place by changing the end value, without a
+ * Recompute the amount of free space around a modified vm_map_entry and
+ * propagate those values up the tree. Call this function to resize a
+ * map entry in-place by changing the start and end values, without a
* call to vm_map_entry_link() or _unlink().
*
* 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(vm_map_t map, vm_map_entry_t entry,
+ vm_offset_t start, vm_offset_t end)
{
vm_map_entry_t llist, rlist, root;
@@ -1203,13 +1219,22 @@
root = map->root;
root = vm_map_splay_split(entry->start, 0, root, &llist, &rlist);
KASSERT(root != NULL,
- ("vm_map_entry_resize_free: resize_free object not mapped"));
- vm_map_splay_findnext(root, &rlist);
- root->right = NULL;
+ ("vm_map_entry_resize: resize_free object not mapped"));
+ if (entry->start != start) {
+ vm_map_splay_findprev(root, &llist);
+ root->left = NULL;
+ entry->offset += start - entry->start;
+ entry->start = start;
+ }
+ if (entry->end != end) {
+ vm_map_splay_findnext(root, &rlist);
+ root->right = NULL;
+ entry->end = end;
+ }
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,
+ CTR3(KTR_VM, "vm_map_entry_resize: map %p, nentries %d, entry %p", map,
map->nentries, entry);
}
@@ -1253,6 +1278,7 @@
* change the map. Thus, the map's timestamp need not change
* on a temporary upgrade.
*/
+ VM_MAP_ASSERT_CONSISTENT(map);
map->root = cur = vm_map_entry_splay(address, cur);
VM_MAP_ASSERT_CONSISTENT(map);
if (!locked)
@@ -1427,8 +1453,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(map, prev_entry,
+ prev_entry->start, end);
vm_map_simplify_entry(map, prev_entry);
return (KERN_SUCCESS);
}
@@ -2068,8 +2094,7 @@
*new_entry = *entry;
new_entry->end = start;
- entry->offset += (start - entry->start);
- entry->start = start;
+ vm_map_entry_resize(map, entry, start, entry->end);
if (new_entry->cred != NULL)
crhold(entry->cred);
@@ -2150,7 +2175,8 @@
new_entry = vm_map_entry_create(map);
*new_entry = *entry;
- new_entry->start = entry->end = end;
+ vm_map_entry_resize(map, entry, entry->start, end);
+ new_entry->start = end;
new_entry->offset += (end - entry->start);
if (new_entry->cred != NULL)
crhold(entry->cred);
@@ -4181,25 +4207,22 @@
gap_deleted = true;
} 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(map, gap_entry,
+ gap_entry->start, gap_entry->end - 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(map, gap_entry,
+ gap_entry->start, gap_entry->end + grow_amount);
} else {
grow_start = stack_entry->end;
cred = stack_entry->cred;
@@ -4213,13 +4236,16 @@
stack_entry->offset,
(vm_size_t)(stack_entry->end - stack_entry->start),
(vm_size_t)grow_amount, cred != NULL)) {
- if (gap_entry->start + grow_amount == gap_entry->end)
+ if (gap_entry->start + grow_amount == gap_entry->end) {
vm_map_entry_delete(map, gap_entry);
- else
+ vm_map_entry_resize(map, stack_entry,
+ stack_entry->start,
+ stack_entry->end + grow_amount);
+ } else {
gap_entry->start += grow_amount;
- stack_entry->end += grow_amount;
+ stack_entry->end += grow_amount;
+ }
map->size += grow_amount;
- vm_map_entry_resize_free(map, stack_entry);
rv = KERN_SUCCESS;
} else
rv = KERN_FAILURE;

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 24, 1:38 AM (13 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24112199
Default Alt Text
D19826.id55933.diff (8 KB)

Event Timeline