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

NUMA: add NUMA mask to process VM structure

Browse Source
This commit is contained in:
Balazs Gerofi
2016-10-14 21:15:23 +09:00
parent 3ee3a9df6d
commit faa929e717
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/include/process.h
View File

@ -22,6 +22,7 @@
#include <memobj.h> #include <memobj.h>
#include <affinity.h> #include <affinity.h>
#include <syscall.h> #include <syscall.h>
#include <bitops.h>
#define VR_NONE 0x0 #define VR_NONE 0x0
#define VR_STACK 0x1 #define VR_STACK 0x1
@ -165,6 +166,8 @@
#define NOPHYS ((uintptr_t)-1) #define NOPHYS ((uintptr_t)-1)
#define PROCESS_NUMA_MASK_BITS 64
#include <waitq.h> #include <waitq.h>
#include <futex.h> #include <futex.h>
@ -594,6 +597,7 @@ struct process_vm {
int exiting; int exiting;
long currss; long currss;
DECLARE_BITMAP(numa_mask, PROCESS_NUMA_MASK_BITS);
}; };
static inline int has_cap_ipc_lock(struct thread *th) static inline int has_cap_ipc_lock(struct thread *th)

14
kernel/process.c
View File

@ -204,6 +204,7 @@ detach_address_space(struct address_space *asp, int pid)
static int static int
init_process_vm(struct process *owner, struct address_space *asp, struct process_vm *vm) 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->memory_range_lock);
ihk_mc_spinlock_init(&vm->page_table_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->proc = owner;
vm->exiting = 0; 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; return 0;
} }
@ -371,6 +382,9 @@ clone_thread(struct thread *org, unsigned long pc, unsigned long sp,
kfree(proc); kfree(proc);
goto err_free_proc; goto err_free_proc;
} }
memcpy(&proc->vm->numa_mask, &org->vm->numa_mask,
sizeof(proc->vm->numa_mask));
thread->proc = proc; thread->proc = proc;
thread->vm = proc->vm; thread->vm = proc->vm;