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

do_mmap(): indicate user level allocations for anonymous mappings

Browse Source
This commit is contained in:
Balazs Gerofi
2016-12-31 10:09:49 +09:00
parent 40d75baca2
commit 4437ecc69a
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/fileobj.c
View File

@ -497,7 +497,10 @@ static int fileobj_get_page(struct memobj *memobj, off_t off,
if (!page) { if (!page) {
npages = 1 << p2align; npages = 1 << p2align;
virt = ihk_mc_alloc_pages(npages, IHK_MC_AP_NOWAIT);
virt = ihk_mc_alloc_pages(npages, IHK_MC_AP_NOWAIT |
(to_memobj(obj)->flags & MF_ZEROFILL) ? IHK_MC_AP_USER : 0);
if (!virt) { if (!virt) {
error = -ENOMEM; error = -ENOMEM;
kprintf("fileobj_get_page(%p,%lx,%x,%p):" kprintf("fileobj_get_page(%p,%lx,%x,%p):"

8
kernel/syscall.c
View File

@ -1252,12 +1252,14 @@ do_mmap(const intptr_t addr0, const size_t len0, const int prot,
populated_mapping = 1; populated_mapping = 1;
} }
#if 0
/* XXX: Intel MPI 128MB mapping.. */ /* XXX: Intel MPI 128MB mapping.. */
if (len == 134217728) { if (len == 134217728) {
kprintf("%s: 128MB mapping -> no prefault\n", kprintf("%s: 128MB mapping -> no prefault\n",
__FUNCTION__, len); __FUNCTION__, len);
populated_mapping = 0; populated_mapping = 0;
} }
#endif
if (!(prot & PROT_WRITE)) { if (!(prot & PROT_WRITE)) {
error = set_host_vma(addr, len, PROT_READ); error = set_host_vma(addr, len, PROT_READ);
@ -1317,8 +1319,12 @@ do_mmap(const intptr_t addr0, const size_t len0, const int prot,
else if (!(vrflags & VR_DEMAND_PAGING) else if (!(vrflags & VR_DEMAND_PAGING)
&& ((vrflags & VR_PROT_MASK) != VR_PROT_NONE)) { && ((vrflags & VR_PROT_MASK) != VR_PROT_NONE)) {
npages = len >> PAGE_SHIFT; npages = len >> PAGE_SHIFT;
/* Small allocations mostly benefit from closest RAM,
* otherwise follow user requested policy */
unsigned long __flag = (len >= 1048576) ? IHK_MC_AP_USER : 0;
p = ihk_mc_alloc_aligned_pages(npages, p2align, IHK_MC_AP_NOWAIT); p = ihk_mc_alloc_aligned_pages(npages, p2align,
IHK_MC_AP_NOWAIT | __flag);
if (p == NULL) { if (p == NULL) {
ekprintf("%s: warning: failed to allocate %d contiguous pages" ekprintf("%s: warning: failed to allocate %d contiguous pages"
" (pgshift: %d), enabling demand paging\n", " (pgshift: %d), enabling demand paging\n",