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

init_process_stack: change premapped stack size based on arch

Browse Source 
Avoid consuming a large 512MB page on 64K base page arch

Change-Id: Ice491d43fd998b375ddc24f4eff7faf5d36d9f42
Fujitsu: POSTK_DEBUG_ARCH_DEP_104
This commit is contained in:
Dominique Martinet
2019-01-28 17:22:37 +09:00
parent 960a6f5f90
commit 2b254f02f8
3 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm64/kernel/include/arch-memory.h
View File

@ -330,6 +330,18 @@ static const unsigned int PTL1_CONT_COUNT = __PTL1_CONT_COUNT;
#define PTE_FILEOFF PTE_SPECIAL #define PTE_FILEOFF PTE_SPECIAL
#ifdef CONFIG_ARM64_64K_PAGES
# define USER_STACK_PREPAGE_SIZE PAGE_SIZE
# define USER_STACK_PAGE_MASK PAGE_MASK
# define USER_STACK_PAGE_P2ALIGN PAGE_P2ALIGN
# define USER_STACK_PAGE_SHIFT PAGE_SHIFT
#else
# define USER_STACK_PREPAGE_SIZE LARGE_PAGE_SIZE
# define USER_STACK_PAGE_MASK LARGE_PAGE_MASK
# define USER_STACK_PAGE_P2ALIGN LARGE_PAGE_P2ALIGN
# define USER_STACK_PAGE_SHIFT LARGE_PAGE_SHIFT
#endif
#define PT_ENTRIES (PAGE_SIZE >> 3) #define PT_ENTRIES (PAGE_SIZE >> 3)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__

4
arch/x86_64/kernel/include/arch-memory.h
View File

@ -160,6 +160,10 @@ typedef unsigned long pte_t;
#define PM_PRESENT PM_STATUS(4LL) #define PM_PRESENT PM_STATUS(4LL)
#define PM_SWAP PM_STATUS(2LL) #define PM_SWAP PM_STATUS(2LL)
#define USER_STACK_PREPAGE_SIZE LARGE_PAGE_SIZE
#define USER_STACK_PAGE_MASK LARGE_PAGE_MASK
#define USER_STACK_PAGE_P2ALIGN LARGE_PAGE_P2ALIGN
#define USER_STACK_PAGE_SHIFT LARGE_PAGE_SHIFT
/* For easy conversion, it is better to be the same as architecture's ones */ /* For easy conversion, it is better to be the same as architecture's ones */
enum ihk_mc_pt_attribute { enum ihk_mc_pt_attribute {

31
kernel/process.c
View File

@ -2236,13 +2236,9 @@ int init_process_stack(struct thread *thread, struct program_load_desc *pn,
int stack_align_padding = 0; int stack_align_padding = 0;
/* Create stack range */ /* Create stack range */
end = STACK_TOP(&thread->vm->region) & LARGE_PAGE_MASK; end = STACK_TOP(&thread->vm->region) & USER_STACK_PAGE_MASK;
#ifdef POSTK_DEBUG_ARCH_DEP_80 /* user stack prepage size fix */ minsz = (pn->stack_premap + USER_STACK_PREPAGE_SIZE - 1) &
minsz = LARGE_PAGE_SIZE; USER_STACK_PAGE_MASK;
#else /* POSTK_DEBUG_ARCH_DEP_80 */
minsz = (pn->stack_premap
+ LARGE_PAGE_SIZE - 1) & LARGE_PAGE_MASK;
#endif /* POSTK_DEBUG_ARCH_DEP_80 */
maxsz = (end - thread->vm->region.map_start) / 2; maxsz = (end - thread->vm->region.map_start) / 2;
size = proc->rlimit[MCK_RLIMIT_STACK].rlim_cur; size = proc->rlimit[MCK_RLIMIT_STACK].rlim_cur;
if (size > maxsz) { if (size > maxsz) {
@ -2251,13 +2247,13 @@ int init_process_stack(struct thread *thread, struct program_load_desc *pn,
else if (size < minsz) { else if (size < minsz) {
size = minsz; size = minsz;
} }
size = (size + LARGE_PAGE_SIZE - 1) & LARGE_PAGE_MASK; size = (size + USER_STACK_PREPAGE_SIZE - 1) & USER_STACK_PAGE_MASK;
dkprintf("%s: stack_premap: %lu, rlim_cur: %lu, minsz: %lu, size: %lu\n", dkprintf("%s: stack_premap: %lu, rlim_cur: %lu, minsz: %lu, size: %lu\n",
__FUNCTION__, __FUNCTION__,
pn->stack_premap, pn->stack_premap,
proc->rlimit[MCK_RLIMIT_STACK].rlim_cur, proc->rlimit[MCK_RLIMIT_STACK].rlim_cur,
minsz, size); minsz, size);
start = (end - size) & LARGE_PAGE_MASK; start = (end - size) & USER_STACK_PAGE_MASK;
/* Apply user allocation policy to stacks */ /* Apply user allocation policy to stacks */
/* TODO: make threshold kernel or mcexec argument */ /* TODO: make threshold kernel or mcexec argument */
@ -2268,7 +2264,9 @@ int init_process_stack(struct thread *thread, struct program_load_desc *pn,
ap_flag ? "(IHK_MC_AP_USER)" : ""); ap_flag ? "(IHK_MC_AP_USER)" : "");
stack = ihk_mc_alloc_aligned_pages_user(minsz >> PAGE_SHIFT, stack = ihk_mc_alloc_aligned_pages_user(minsz >> PAGE_SHIFT,
LARGE_PAGE_P2ALIGN, IHK_MC_AP_NOWAIT | ap_flag, start); USER_STACK_PAGE_P2ALIGN,
IHK_MC_AP_NOWAIT | ap_flag,
start);
if (!stack) { if (!stack) {
kprintf("%s: error: couldn't allocate initial stack\n", kprintf("%s: error: couldn't allocate initial stack\n",
@ -2284,7 +2282,7 @@ int init_process_stack(struct thread *thread, struct program_load_desc *pn,
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, LARGE_PAGE_SHIFT, &range)) != 0) { vrflag, NULL, 0, USER_STACK_PAGE_SHIFT, &range)) != 0) {
ihk_mc_free_pages_user(stack, minsz >> PAGE_SHIFT); ihk_mc_free_pages_user(stack, minsz >> PAGE_SHIFT);
kprintf("%s: error addding process memory range: %d\n", rc); kprintf("%s: error addding process memory range: %d\n", rc);
return rc; return rc;
@ -2292,12 +2290,11 @@ int init_process_stack(struct thread *thread, struct program_load_desc *pn,
/* Map physical pages for initial stack frame */ /* Map physical pages for initial stack frame */
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, NULL), arch_vrflag_to_ptattr(vrflag, PF_POPULATE,
LARGE_PAGE_SHIFT, range, 0 NULL),
); USER_STACK_PAGE_SHIFT, range, 0);
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",