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

brk(): force transparent large pages

Browse Source
This commit is contained in:
Balazs Gerofi
2017-01-01 20:39:42 +09:00
parent b005adc103
commit 6309095fd2
2 changed files with 12 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/host.c
View File

@@ -202,7 +202,8 @@ int prepare_process_ranges_args_envs(struct thread *thread,
pn->at_entry += aout_base; pn->at_entry += aout_base;
} }
vm->region.brk_start = vm->region.brk_end = vm->region.data_end; vm->region.brk_start = vm->region.brk_end =
(vm->region.data_end + LARGE_PAGE_SIZE - 1) & LARGE_PAGE_MASK;
/* Map, copy and update args and envs */ /* Map, copy and update args and envs */
flags = VR_PROT_READ | VR_PROT_WRITE; flags = VR_PROT_READ | VR_PROT_WRITE;

81
kernel/process.c
View File

@@ -2042,90 +2042,29 @@ unsigned long extend_process_region(struct process_vm *vm,
return end; return end;
} }
aligned_end = ((end + PAGE_SIZE - 1) & PAGE_MASK); aligned_end = ((end + LARGE_PAGE_SIZE - 1) & LARGE_PAGE_MASK);
if (aligned_end >= address) { if (aligned_end >= address) {
return address; return address;
} }
aligned_new_end = (address + PAGE_SIZE - 1) & PAGE_MASK; aligned_new_end = (address + LARGE_PAGE_SIZE - 1) & LARGE_PAGE_MASK;
#ifdef USE_LARGE_PAGES if (flag & VR_DEMAND_PAGING) {
if (aligned_new_end - aligned_end >= LARGE_PAGE_SIZE) { p = 0;
if(flag & VR_DEMAND_PAGING){panic("demand paging for large page is not available!");} }
unsigned long p_aligned; else {
unsigned long old_aligned_end = aligned_end; p = ihk_mc_alloc_aligned_pages((aligned_new_end - aligned_end) >> PAGE_SHIFT,
LARGE_PAGE_P2ALIGN, IHK_MC_AP_NOWAIT | IHK_MC_AP_USER);
if ((aligned_end & (LARGE_PAGE_SIZE - 1)) != 0) { if (!p) {
aligned_end = (aligned_end + (LARGE_PAGE_SIZE - 1)) & LARGE_PAGE_MASK;
/* Fill in the gap between old_aligned_end and aligned_end
* with regular pages */
if((p = ihk_mc_alloc_pages((aligned_end - old_aligned_end) >> PAGE_SHIFT,
IHK_MC_AP_NOWAIT)) == NULL){
return end;
}
if((rc = add_process_memory_range(vm, old_aligned_end,
aligned_end, virt_to_phys(p), flag,
LARGE_PAGE_SHIFT, NULL)) != 0){
ihk_mc_free_pages(p, (aligned_end - old_aligned_end) >> PAGE_SHIFT);
return end;
}
dkprintf("filled in gap for LARGE_PAGE_SIZE aligned start: 0x%lX -> 0x%lX\n",
old_aligned_end, aligned_end);
}
/* Add large region for the actual mapping */
aligned_new_end = (aligned_new_end + (aligned_end - old_aligned_end) +
(LARGE_PAGE_SIZE - 1)) & LARGE_PAGE_MASK;
address = aligned_new_end;
if((p = ihk_mc_alloc_pages((aligned_new_end - aligned_end + LARGE_PAGE_SIZE) >> PAGE_SHIFT,
IHK_MC_AP_NOWAIT)) == NULL){
return end; return end;
} }
p_aligned = ((unsigned long)p + (LARGE_PAGE_SIZE - 1)) & LARGE_PAGE_MASK;
if (p_aligned > (unsigned long)p) {
ihk_mc_free_pages(p, (p_aligned - (unsigned long)p) >> PAGE_SHIFT);
}
ihk_mc_free_pages(
(void *)(p_aligned + aligned_new_end - aligned_end),
(LARGE_PAGE_SIZE - (p_aligned - (unsigned long)p)) >> PAGE_SHIFT);
if((rc = add_process_memory_range(vm, aligned_end,
aligned_new_end, virt_to_phys((void *)p_aligned),
flag, LARGE_PAGE_SHIFT, NULL)) != 0){
ihk_mc_free_pages(p, (aligned_new_end - aligned_end + LARGE_PAGE_SIZE) >> PAGE_SHIFT);
return end;
}
dkprintf("largePTE area: 0x%lX - 0x%lX (s: %lu) -> 0x%lX - \n",
aligned_end, aligned_new_end,
(aligned_new_end - aligned_end),
virt_to_phys((void *)p_aligned));
return address;
} }
#endif
if(flag & VR_DEMAND_PAGING){
// demand paging no need to allocate page now
kprintf("demand page do not allocate page\n");
p=0;
}else{
p = ihk_mc_alloc_pages((aligned_new_end - aligned_end) >> PAGE_SHIFT,
IHK_MC_AP_NOWAIT | IHK_MC_AP_USER);
if (!p) {
return end;
}
}
if ((rc = add_process_memory_range(vm, aligned_end, aligned_new_end, if ((rc = add_process_memory_range(vm, aligned_end, aligned_new_end,
(p == 0 ? 0 : virt_to_phys(p)), flag, NULL, 0, (p == 0 ? 0 : virt_to_phys(p)), flag, NULL, 0,
PAGE_SHIFT, NULL)) != 0) { LARGE_PAGE_SHIFT, NULL)) != 0) {
ihk_mc_free_pages(p, (aligned_new_end - aligned_end) >> PAGE_SHIFT); ihk_mc_free_pages(p, (aligned_new_end - aligned_end) >> PAGE_SHIFT);
return end; return end;
} }