Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-09 00:00:03 +01:00
Code Issues Releases Wiki Activity

vma_add resize the region if the predecessor has the same start address

Browse source
This commit is contained in:
Stefan Lankes 2016-05-31 04:37:38 +02:00
parent 0f4ed50569
commit 629a42dc4b
1 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
hermit/mm/vma.c
View file

@ -203,6 +203,7 @@ int vma_add(size_t start, size_t end, uint32_t flags)
{
spinlock_t* lock = &vma_lock;
vma_t** list = &vma_list;
int ret = 0;
if (BUILTIN_EXPECT(start >= end, 0))
return -EINVAL;
@ -225,33 +226,39 @@ int vma_add(size_t start, size_t end, uint32_t flags)
}
if (BUILTIN_EXPECT(*list && !pred && !succ, 0)) {
spinlock_unlock(lock);
return -EINVAL;
ret = -EINVAL;
goto fail;
}
// insert new VMA
vma_t* new = kmalloc(sizeof(vma_t));
if (BUILTIN_EXPECT(!new, 0)) {
spinlock_unlock(lock);
return -ENOMEM;
if (pred && (pred->end == start) && (pred->flags == flags)) {
pred->end = end; // resize VMA
//kprintf("vma_alloc: resize vma, start 0x%zx, pred->start 0x%zx, pred->end 0x%zx\n", start, pred->start, pred->end);
} else {
// insert new VMA
vma_t* new = kmalloc(sizeof(vma_t));
if (BUILTIN_EXPECT(!new, 0)) {
ret = -ENOMEM;
goto fail;
}
new->start = start;
new->end = end;
new->flags = flags;
new->next = succ;
new->prev = pred;
if (succ)
succ->prev = new;
if (pred)
pred->next = new;
else
*list = new;
}
new->start = start;
new->end = end;
new->flags = flags;
new->next = succ;
new->prev = pred;
if (succ)
succ->prev = new;
if (pred)
pred->next = new;
else
*list = new;
fail:
spinlock_unlock(lock);
return 0;
return ret;
}
void vma_dump(void)