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

change the stack size according to stack size limit

Browse Source
This commit is contained in:
NAKAMURA Gou
2013-10-24 14:07:12 +09:00
parent db45e11921
commit 6e736f6248
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/process.c
View File

@@ -1041,9 +1041,9 @@ int init_process_stack(struct process *process, struct program_load_desc *pn,
{ {
int s_ind = 0; int s_ind = 0;
int arg_ind; int arg_ind;
unsigned long size = USER_STACK_NR_PAGES * PAGE_SIZE; unsigned long size;
unsigned long end = process->vm->region.user_end; unsigned long end = process->vm->region.user_end;
unsigned long start = end - size; unsigned long start;
int rc; int rc;
unsigned long vrflag; unsigned long vrflag;
char *stack; char *stack;
@@ -1052,6 +1052,16 @@ int init_process_stack(struct process *process, struct program_load_desc *pn,
unsigned long minsz; unsigned long minsz;
/* create stack range */ /* create stack range */
minsz = PAGE_SIZE;
size = process->rlimit_stack.rlim_cur & PAGE_MASK;
if (size > (USER_END / 2)) {
size = USER_END / 2;
}
else if (size < minsz) {
size = minsz;
}
start = end - size;
vrflag = VR_STACK | VR_DEMAND_PAGING; vrflag = VR_STACK | VR_DEMAND_PAGING;
vrflag |= VR_PROT_READ | VR_PROT_WRITE | VR_PROT_EXEC; vrflag |= VR_PROT_READ | VR_PROT_WRITE | VR_PROT_EXEC;
vrflag |= VRFLAG_PROT_TO_MAXPROT(vrflag); vrflag |= VRFLAG_PROT_TO_MAXPROT(vrflag);
@@ -1062,7 +1072,6 @@ int init_process_stack(struct process *process, struct program_load_desc *pn,
} }
/* map physical pages for initial stack frame */ /* map physical pages for initial stack frame */
minsz = PAGE_SIZE;
stack = ihk_mc_alloc_pages(minsz >> PAGE_SHIFT, IHK_MC_AP_NOWAIT); stack = ihk_mc_alloc_pages(minsz >> PAGE_SHIFT, IHK_MC_AP_NOWAIT);
if (!stack) { if (!stack) {
return -ENOMEM; return -ENOMEM;