gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

search_free_space(): manage region->map_end internally

Browse Source 
Cherry-pick of 87f72548a232a1626f2ca103da7f1ce62d139359

Conflicts:
	kernel/syscall.c
This commit is contained in:
Balazs Gerofi
2017-12-05 12:33:45 +09:00
parent 4b652c9353
commit b9b4a4fe36
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
kernel/syscall.c
View File

@@ -1282,6 +1282,7 @@ int do_munmap(void *addr, size_t len)
} }
} }
finish_free_pages_pending(); finish_free_pages_pending();
dkprintf("%s: 0x%lx:%lu, error: %ld\n", dkprintf("%s: 0x%lx:%lu, error: %ld\n",
__FUNCTION__, addr, len, error); __FUNCTION__, addr, len, error);
return error; return error;
@@ -1289,7 +1290,7 @@ int do_munmap(void *addr, size_t len)
#ifdef POSTK_DEBUG_ARCH_DEP_27 #ifdef POSTK_DEBUG_ARCH_DEP_27
#else #else
static int search_free_space(size_t len, intptr_t hint, int pgshift, intptr_t *addrp) static int search_free_space(size_t len, int pgshift, intptr_t *addrp)
{ {
struct thread *thread = cpu_local_var(current); struct thread *thread = cpu_local_var(current);
struct vm_regions *region = &thread->vm->region; struct vm_regions *region = &thread->vm->region;
@@ -1298,17 +1299,17 @@ static int search_free_space(size_t len, intptr_t hint, int pgshift, intptr_t *a
struct vm_range *range; struct vm_range *range;
size_t pgsize = (size_t)1 << pgshift; size_t pgsize = (size_t)1 << pgshift;
dkprintf("search_free_space(%lx,%lx,%d,%p)\n", len, hint, pgshift, addrp); dkprintf("%s: len: %lu, pgshift: %d\n",
__FUNCTION__, len, pgshift);
addr = hint; addr = region->map_end;
for (;;) { for (;;) {
addr = (addr + pgsize - 1) & ~(pgsize - 1); addr = (addr + pgsize - 1) & ~(pgsize - 1);
if ((region->user_end <= addr) if ((region->user_end <= addr)
|| ((region->user_end - len) < addr)) { || ((region->user_end - len) < addr)) {
ekprintf("search_free_space(%lx,%lx,%p):" ekprintf("%s: error: addr 0x%lx is outside the user region\n",
"no space. %lx %lx\n", __FUNCTION__, addr);
len, hint, addrp, addr,
region->user_end);
error = -ENOMEM; error = -ENOMEM;
goto out; goto out;
} }
@@ -1320,12 +1321,13 @@ static int search_free_space(size_t len, intptr_t hint, int pgshift, intptr_t *a
addr = range->end; addr = range->end;
} }
region->map_end = addr + len;
error = 0; error = 0;
*addrp = addr; *addrp = addr;
out: out:
dkprintf("search_free_space(%lx,%lx,%d,%p): %d %lx\n", dkprintf("%s: len: %lu, pgshift: %d, addr: 0x%lx\n",
len, hint, pgshift, addrp, error, addr); __FUNCTION__, len, pgshift, addr);
return error; return error;
} }
#endif #endif
@@ -1420,20 +1422,18 @@ do_mmap(const intptr_t addr0, const size_t len0, const int prot,
} }
} }
else { else {
/* choose mapping address */ /* Obtain mapping address */
#ifdef POSTK_DEBUG_ARCH_DEP_27 #ifdef POSTK_DEBUG_ARCH_DEP_27
error = search_free_space(cpu_local_var(current), len, error = search_free_space(cpu_local_var(current), len,
region->map_end, PAGE_SHIFT + p2align, &addr); region->map_end, PAGE_SHIFT + p2align, &addr);
#else #else
error = search_free_space(len, region->map_end, error = search_free_space(len, PAGE_SHIFT + p2align, &addr);
PAGE_SHIFT + p2align, &addr);
#endif /* POSTK_DEBUG_ARCH_DEP_27 */ #endif /* POSTK_DEBUG_ARCH_DEP_27 */
if (error) { if (error) {
ekprintf("do_mmap:search_free_space(%lx,%lx,%d) failed. %d\n", ekprintf("do_mmap:search_free_space(%lx,%lx,%d) failed. %d\n",
len, region->map_end, p2align, error); len, region->map_end, p2align, error);
goto out; goto out;
} }
region->map_end = addr + len;
} }
/* do the map */ /* do the map */
@@ -4908,7 +4908,6 @@ SYSCALL_DECLARE(shmat)
struct process_vm *vm = thread->vm; struct process_vm *vm = thread->vm;
size_t len; size_t len;
int error; int error;
struct vm_regions *region = &vm->region;
intptr_t addr; intptr_t addr;
int prot; int prot;
int vrflags; int vrflags;
@@ -4977,7 +4976,7 @@ SYSCALL_DECLARE(shmat)
error = search_free_space(cpu_local_var(current), len, error = search_free_space(cpu_local_var(current), len,
region->map_end, obj->pgshift, &addr); region->map_end, obj->pgshift, &addr);
#else #else
error = search_free_space(len, region->map_end, obj->pgshift, &addr); error = search_free_space(len, obj->pgshift, &addr);
#endif /* POSTK_DEBUG_ARCH_DEP_27 */ #endif /* POSTK_DEBUG_ARCH_DEP_27 */
if (error) { if (error) {
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock); ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
@@ -4985,7 +4984,6 @@ SYSCALL_DECLARE(shmat)
dkprintf("shmat(%#x,%p,%#x):search_free_space failed. %d\n", shmid, shmaddr, shmflg, error); dkprintf("shmat(%#x,%p,%#x):search_free_space failed. %d\n", shmid, shmaddr, shmflg, error);
return error; return error;
} }
region->map_end = addr + len;
} }
vrflags = VR_NONE; vrflags = VR_NONE;
@@ -7816,8 +7814,8 @@ SYSCALL_DECLARE(mremap)
vm->region.map_end, vm->region.map_end,
range->pgshift, (intptr_t *)&newstart); range->pgshift, (intptr_t *)&newstart);
#else #else
error = search_free_space(newsize, vm->region.map_end, error = search_free_space(newsize, range->pgshift,
range->pgshift, (intptr_t *)&newstart); (intptr_t *)&newstart);
#endif /* POSTK_DEBUG_ARCH_DEP_27 */ #endif /* POSTK_DEBUG_ARCH_DEP_27 */
if (error) { if (error) {
ekprintf("sys_mremap(%#lx,%#lx,%#lx,%#x,%#lx):" ekprintf("sys_mremap(%#lx,%#lx,%#lx,%#x,%#lx):"