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

VR_AP_USER: memory range flag to respect user mempolicy (e.g., in PF handler)

Browse Source
This commit is contained in:
Balazs Gerofi
2017-01-12 16:39:49 +09:00
parent a18fd1f45c
commit fdbdcbd0ee
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/include/process.h
View File

@@ -27,6 +27,7 @@
#define VR_NONE 0x0 #define VR_NONE 0x0
#define VR_STACK 0x1 #define VR_STACK 0x1
#define VR_RESERVED 0x2 #define VR_RESERVED 0x2
#define VR_AP_USER 0x4
#define VR_IO_NOCACHE 0x100 #define VR_IO_NOCACHE 0x100
#define VR_REMOTE 0x200 #define VR_REMOTE 0x200
#define VR_WRITE_COMBINED 0x400 #define VR_WRITE_COMBINED 0x400

7
kernel/process.c
View File

@@ -1652,7 +1652,9 @@ static int page_fault_process_memory_range(struct process_vm *vm, struct vm_rang
retry: retry:
npages = pgsize / PAGE_SIZE; npages = pgsize / PAGE_SIZE;
virt = ihk_mc_alloc_aligned_pages(npages, p2align, IHK_MC_AP_NOWAIT); virt = ihk_mc_alloc_aligned_pages(npages, p2align,
IHK_MC_AP_NOWAIT |
(range->flag & VR_AP_USER) ? IHK_MC_AP_USER : 0);
if (!virt && !range->pgshift && (pgsize != PAGE_SIZE)) { if (!virt && !range->pgshift && (pgsize != PAGE_SIZE)) {
error = arch_get_smaller_page_size(NULL, pgsize, &pgsize, &p2align); error = arch_get_smaller_page_size(NULL, pgsize, &pgsize, &p2align);
if (error) { if (error) {
@@ -1685,7 +1687,7 @@ retry:
attr = arch_vrflag_to_ptattr(range->flag | memobj_flag, reason, ptep); attr = arch_vrflag_to_ptattr(range->flag | memobj_flag, reason, ptep);
/*****/ /* Copy on write */
if (((range->flag & VR_PRIVATE) || if (((range->flag & VR_PRIVATE) ||
((reason & PF_PATCH) && !(range->flag & VR_PROT_WRITE))) ((reason & PF_PATCH) && !(range->flag & VR_PROT_WRITE)))
&& ((!page && phys == NOPHYS) || (page && && ((!page && phys == NOPHYS) || (page &&
@@ -1940,6 +1942,7 @@ int init_process_stack(struct thread *thread, struct program_load_desc *pn,
memset(stack, 0, minsz); memset(stack, 0, minsz);
vrflag = VR_STACK | VR_DEMAND_PAGING; vrflag = VR_STACK | VR_DEMAND_PAGING;
vrflag |= (__flag ? VR_AP_USER : 0);
vrflag |= PROT_TO_VR_FLAG(pn->stack_prot); vrflag |= PROT_TO_VR_FLAG(pn->stack_prot);
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)

4
kernel/syscall.c
View File

@@ -1431,6 +1431,10 @@ do_mmap(const intptr_t addr0, const size_t len0, const int prot,
* otherwise follow user requested policy */ * otherwise follow user requested policy */
unsigned long __flag = (len >= 2097152) ? IHK_MC_AP_USER : 0; unsigned long __flag = (len >= 2097152) ? IHK_MC_AP_USER : 0;
if (__flag) {
vrflags |= VR_AP_USER;
}
p = ihk_mc_alloc_aligned_pages(npages, p2align, p = ihk_mc_alloc_aligned_pages(npages, p2align,
IHK_MC_AP_NOWAIT | __flag); IHK_MC_AP_NOWAIT | __flag);
if (p == NULL) { if (p == NULL) {