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

stack: force transparent large pages

Browse Source
This commit is contained in:
Balazs Gerofi
2017-01-01 20:40:06 +09:00
parent 6309095fd2
commit fee5234c54
1 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
kernel/process.c
View File

@ -1910,41 +1910,52 @@ int init_process_stack(struct thread *thread, struct program_load_desc *pn,
struct process *proc = thread->proc; struct process *proc = thread->proc;
unsigned long __flag; unsigned long __flag;
/* create stack range */ /* Create stack range */
end = STACK_TOP(&thread->vm->region); end = STACK_TOP(&thread->vm->region) & LARGE_PAGE_MASK;
minsz = PAGE_SIZE; minsz = LARGE_PAGE_SIZE;
size = proc->rlimit[MCK_RLIMIT_STACK].rlim_cur & PAGE_MASK; size = (proc->rlimit[MCK_RLIMIT_STACK].rlim_cur
+ LARGE_PAGE_SIZE - 1) & LARGE_PAGE_MASK;
if (size > (USER_END / 2)) { if (size > (USER_END / 2)) {
size = USER_END / 2; size = USER_END / 2;
} }
else if (size < minsz) { else if (size < minsz) {
size = minsz; size = minsz;
} }
start = end - size; start = (end - size) & LARGE_PAGE_MASK;
/* Put large stacks in user requested region */
__flag = (size >= (2 * 1024 * 1024)) ? IHK_MC_AP_USER : 0;
kprintf("%s: size: %lu %s\n", __FUNCTION__, size,
__flag ? "(IHK_MC_AP_USER)" : "");
stack = ihk_mc_alloc_aligned_pages(minsz >> PAGE_SHIFT,
LARGE_PAGE_P2ALIGN, IHK_MC_AP_NOWAIT | __flag);
if (!stack) {
kprintf("%s: error: couldn't allocate initial stack\n",
__FUNCTION__);
return -ENOMEM;
}
memset(stack, 0, minsz);
vrflag = VR_STACK | VR_DEMAND_PAGING; vrflag = VR_STACK | VR_DEMAND_PAGING;
vrflag |= PROT_TO_VR_FLAG(pn->stack_prot); vrflag |= PROT_TO_VR_FLAG(pn->stack_prot);
vrflag |= VR_MAXPROT_READ | VR_MAXPROT_WRITE | VR_MAXPROT_EXEC; vrflag |= VR_MAXPROT_READ | VR_MAXPROT_WRITE | VR_MAXPROT_EXEC;
#define NOPHYS ((uintptr_t)-1) #define NOPHYS ((uintptr_t)-1)
if ((rc = add_process_memory_range(thread->vm, start, end, NOPHYS, if ((rc = add_process_memory_range(thread->vm, start, end, NOPHYS,
vrflag, NULL, 0, PAGE_SHIFT, NULL)) != 0) { vrflag, NULL, 0, LARGE_PAGE_SHIFT, NULL)) != 0) {
ihk_mc_free_pages(stack, minsz >> PAGE_SHIFT);
return rc; return rc;
} }
__flag = (size >= 16777216) ? IHK_MC_AP_USER : 0; /* Map physical pages for initial stack frame */
/* map physical pages for initial stack frame */
stack = ihk_mc_alloc_pages(minsz >> PAGE_SHIFT,
IHK_MC_AP_NOWAIT | __flag);
if (!stack) {
return -ENOMEM;
}
memset(stack, 0, minsz);
error = ihk_mc_pt_set_range(thread->vm->address_space->page_table, error = ihk_mc_pt_set_range(thread->vm->address_space->page_table,
thread->vm, (void *)(end-minsz), thread->vm, (void *)(end - minsz),
(void *)end, virt_to_phys(stack), (void *)end, virt_to_phys(stack),
arch_vrflag_to_ptattr(vrflag, PF_POPULATE, arch_vrflag_to_ptattr(vrflag, PF_POPULATE, NULL),
NULL), 0); LARGE_PAGE_SHIFT);
if (error) { if (error) {
kprintf("init_process_stack:" kprintf("init_process_stack:"
"set range %lx-%lx %lx failed. %d\n", "set range %lx-%lx %lx failed. %d\n",