From faa929e717288444d2c718adc88e65209cfd52c3 Mon Sep 17 00:00:00 2001
From: Balazs Gerofi <bgerofi@riken.jp>
Date: Fri, 14 Oct 2016 21:15:23 +0900
Subject: [PATCH] NUMA: add NUMA mask to process VM structure

---
 kernel/include/process.h |  4 ++++
 kernel/process.c         | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/kernel/include/process.h b/kernel/include/process.h
index 58f33142..095560df 100644
--- a/kernel/include/process.h
+++ b/kernel/include/process.h
@@ -22,6 +22,7 @@
 #include <memobj.h>
 #include <affinity.h>
 #include <syscall.h>
+#include <bitops.h>
 
 #define VR_NONE            0x0
 #define VR_STACK           0x1
@@ -165,6 +166,8 @@
 
 #define NOPHYS ((uintptr_t)-1)
 
+#define PROCESS_NUMA_MASK_BITS 64
+
 #include <waitq.h>
 #include <futex.h>
 
@@ -594,6 +597,7 @@ struct process_vm {
 	int exiting;
 
 	long currss;
+	DECLARE_BITMAP(numa_mask, PROCESS_NUMA_MASK_BITS);
 };
 
 static inline int has_cap_ipc_lock(struct thread *th)
diff --git a/kernel/process.c b/kernel/process.c
index b5f319cb..fe78dd37 100644
--- a/kernel/process.c
+++ b/kernel/process.c
@@ -204,6 +204,7 @@ detach_address_space(struct address_space *asp, int pid)
 static int
 init_process_vm(struct process *owner, struct address_space *asp, struct process_vm *vm)
 {
+	int i;
 	ihk_mc_spinlock_init(&vm->memory_range_lock);
 	ihk_mc_spinlock_init(&vm->page_table_lock);
 
@@ -213,6 +214,16 @@ init_process_vm(struct process *owner, struct address_space *asp, struct process
 	vm->proc = owner;
 	vm->exiting = 0;
 
+	memset(&vm->numa_mask, 0, sizeof(vm->numa_mask));
+	for (i = 0; i < ihk_mc_get_nr_numa_nodes(); ++i) {
+		if (i >= PROCESS_NUMA_MASK_BITS) {
+			kprintf("%s: error: NUMA id is larger than mask size!\n",
+				__FUNCTION__);
+			break;
+		}
+		set_bit(i, &vm->numa_mask[0]);
+	}
+
 	return 0;
 }
 
@@ -371,6 +382,9 @@ clone_thread(struct thread *org, unsigned long pc, unsigned long sp,
 			kfree(proc);
 			goto err_free_proc;
 		}
+		memcpy(&proc->vm->numa_mask, &org->vm->numa_mask,
+				sizeof(proc->vm->numa_mask));
+
 		thread->proc = proc;
 		thread->vm = proc->vm;