From fdbdcbd0ee927eb05a3da4153f25594489f2c116 Mon Sep 17 00:00:00 2001
From: Balazs Gerofi <bgerofi@riken.jp>
Date: Thu, 12 Jan 2017 16:39:49 +0900
Subject: [PATCH] VR_AP_USER: memory range flag to respect user mempolicy
 (e.g., in PF handler)

---
 kernel/include/process.h | 1 +
 kernel/process.c         | 7 +++++--
 kernel/syscall.c         | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/kernel/include/process.h b/kernel/include/process.h
index 65cad7bc..40a0d383 100644
--- a/kernel/include/process.h
+++ b/kernel/include/process.h
@@ -27,6 +27,7 @@
 #define VR_NONE            0x0
 #define VR_STACK           0x1
 #define VR_RESERVED        0x2
+#define VR_AP_USER         0x4
 #define VR_IO_NOCACHE      0x100
 #define VR_REMOTE          0x200
 #define VR_WRITE_COMBINED  0x400
diff --git a/kernel/process.c b/kernel/process.c
index b3102d85..48b527ee 100644
--- a/kernel/process.c
+++ b/kernel/process.c
@@ -1652,7 +1652,9 @@ static int page_fault_process_memory_range(struct process_vm *vm, struct vm_rang
 
 retry:
 			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)) {
 				error = arch_get_smaller_page_size(NULL, pgsize, &pgsize, &p2align);
 				if (error) {
@@ -1685,7 +1687,7 @@ retry:
 
 	attr = arch_vrflag_to_ptattr(range->flag | memobj_flag, reason, ptep);
 
-	/*****/
+	/* Copy on write */
 	if (((range->flag & VR_PRIVATE) ||
 				((reason & PF_PATCH) && !(range->flag & VR_PROT_WRITE)))
 			&& ((!page && phys == NOPHYS) || (page &&
@@ -1940,6 +1942,7 @@ int init_process_stack(struct thread *thread, struct program_load_desc *pn,
 	memset(stack, 0, minsz);
 
 	vrflag = VR_STACK | VR_DEMAND_PAGING;
+	vrflag |= (__flag ? VR_AP_USER : 0);
 	vrflag |= PROT_TO_VR_FLAG(pn->stack_prot);
 	vrflag |= VR_MAXPROT_READ | VR_MAXPROT_WRITE | VR_MAXPROT_EXEC;
 #define	NOPHYS	((uintptr_t)-1)
diff --git a/kernel/syscall.c b/kernel/syscall.c
index aaaf87cf..63cee0bd 100644
--- a/kernel/syscall.c
+++ b/kernel/syscall.c
@@ -1431,6 +1431,10 @@ do_mmap(const intptr_t addr0, const size_t len0, const int prot,
 		 * otherwise follow user requested policy */
 		unsigned long __flag = (len >= 2097152) ? IHK_MC_AP_USER : 0;
 
+		if (__flag) {
+			vrflags |= VR_AP_USER;
+		}
+
 		p = ihk_mc_alloc_aligned_pages(npages, p2align,
 				IHK_MC_AP_NOWAIT | __flag);
 		if (p == NULL) {