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

extend_process_region: Fall back to demand paging when not contiguous enough

Browse Source 
This fixes ostest-mem_limits.005 which tries to move brk by 95% of
total memory. It reports a failure because McKernel tries to allocate
physically contiguous area and fails.

Change-Id: I50a61cb7103fdbdbe051f0ae276a79e8e2dcdda3
This commit is contained in:
Masamichi Takagi
2019-06-13 00:30:51 +09:00
parent 3b74b0a093
commit aa66fe2cb1
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/process.c
View File

@@ -2429,6 +2429,8 @@ unsigned long extend_process_region(struct process_vm *vm,
unsigned long new_end_allocated; unsigned long new_end_allocated;
void *p; void *p;
int rc; int rc;
size_t len;
int npages;
size_t align_size = vm->proc->heap_extension > PAGE_SIZE ? size_t align_size = vm->proc->heap_extension > PAGE_SIZE ?
LARGE_PAGE_SIZE : PAGE_SIZE; LARGE_PAGE_SIZE : PAGE_SIZE;
@@ -2445,17 +2447,27 @@ unsigned long extend_process_region(struct process_vm *vm,
(align_size - 1)) & align_mask; (align_size - 1)) & align_mask;
} }
len = new_end_allocated - end_allocated;
npages = len >> PAGE_SHIFT;
if (flag & VR_DEMAND_PAGING) { if (flag & VR_DEMAND_PAGING) {
p = 0; p = 0;
} }
else { else {
p = ihk_mc_alloc_aligned_pages_user( p = ihk_mc_alloc_aligned_pages_user(
(new_end_allocated - end_allocated) >> PAGE_SHIFT, npages, align_p2align,
align_p2align, IHK_MC_AP_NOWAIT | IHK_MC_AP_NOWAIT |
(!(vm->proc->mpol_flags & MPOL_NO_HEAP) ? IHK_MC_AP_USER : 0), end_allocated); (!(vm->proc->mpol_flags & MPOL_NO_HEAP) ?
IHK_MC_AP_USER : 0),
end_allocated);
if (!p) { if (!p) {
return end_allocated; dkprintf("%s: warning: failed to allocate %d contiguous pages "
" (bytes: %lu, pgshift: %d), enabling demand paging\n",
__func__, npages, len, align_p2align);
/* Give demand paging a chance */
flag |= VR_DEMAND_PAGING;
} }
} }