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

add cpu_set and getter/setter of that (incomplete sched_***affinity)

Browse Source
This commit is contained in:
YOSHIDA Masanori
2014-05-23 17:52:54 +09:00
committed by Masamichi Takagi
parent f923e03565
commit 1889d10e3a
2 changed files with 81 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/include/process.h
View File

@@ -20,6 +20,7 @@
#include <list.h> #include <list.h>
#include <signal.h> #include <signal.h>
#include <memobj.h> #include <memobj.h>
#include <affinity.h>
#define VR_NONE 0x0 #define VR_NONE 0x0
#define VR_STACK 0x1 #define VR_STACK 0x1
@@ -185,6 +186,8 @@ struct process {
void *pgio_arg; void *pgio_arg;
struct fork_tree_node *ftn; struct fork_tree_node *ftn;
cpu_set_t cpu_set;
}; };
struct process_vm { struct process_vm {

115
kernel/syscall.c
View File

@@ -1919,56 +1919,97 @@ SYSCALL_DECLARE(ptrace)
return -ENOSYS; return -ENOSYS;
} }
#define MIN2(x,y) (x) < (y) ? (x) : (y)
SYSCALL_DECLARE(sched_setaffinity) SYSCALL_DECLARE(sched_setaffinity)
{ {
#if 0 int tid = (int)ihk_mc_syscall_arg0(ctx);
int pid = (int)ihk_mc_syscall_arg0(ctx); size_t len = (size_t)ihk_mc_syscall_arg1(ctx);
unsigned int len = (unsigned int)ihk_mc_syscall_arg1(ctx); cpu_set_t *u_cpu_set = (cpu_set_t *)ihk_mc_syscall_arg2(ctx);
#endif
cpu_set_t *mask = (cpu_set_t *)ihk_mc_syscall_arg2(ctx); cpu_set_t cpu_set;
unsigned long __phys; struct process *thread;
#if 0 int i;
int i;
#endif if (sizeof(cpu_set_t) > len) {
/* TODO: check mask is in user's page table */ kprintf("%s %d\n", __FILE__, __LINE__);
if(!mask) { return -EFAULT; } return -EINVAL;
if (ihk_mc_pt_virt_to_phys(cpu_local_var(current)->vm->page_table, }
(void *)mask, len = MIN2(len, sizeof(cpu_set_t));
&__phys)) {
if (copy_from_user(cpu_local_var(current), &cpu_set, u_cpu_set, len)) {
kprintf("%s %d\n", __FILE__, __LINE__);
return -EFAULT; return -EFAULT;
} }
#if 0
dkprintf("sched_setaffinity,\n"); thread = NULL;
for(i = 0; i < len/sizeof(__cpu_mask); i++) { extern int num_processors;
dkprintf("mask[%d]=%lx,", i, mask->__bits[i]); for (i = 0; i < num_processors; i++) {
} struct process *tmp_proc;
#endif ihk_mc_spinlock_lock_noirq(&get_cpu_local_var(i)->runq_lock);
list_for_each_entry(tmp_proc, &get_cpu_local_var(i)->runq, sched_list) {
if (tmp_proc && tmp_proc->pid && tmp_proc->tid == tid) {
thread = tmp_proc;
hold_process(thread);
break;
}
}
ihk_mc_spinlock_unlock_noirq(&get_cpu_local_var(i)->runq_lock);
if (thread)
break;
}
if (!thread) {
kprintf("%s %d\n", __FILE__, __LINE__);
return -ESRCH;
}
memcpy(&thread->cpu_set, &cpu_set, sizeof(cpu_set));
release_process(thread);
kprintf("%s %d\n", __FILE__, __LINE__);
return 0; return 0;
} }
#define MIN2(x,y) (x) < (y) ? (x) : (y)
#define MIN3(x,y,z) MIN2(MIN2((x),(y)),MIN2((y),(z)))
// see linux-2.6.34.13/kernel/sched.c // see linux-2.6.34.13/kernel/sched.c
SYSCALL_DECLARE(sched_getaffinity) SYSCALL_DECLARE(sched_getaffinity)
{ {
//int pid = (int)ihk_mc_syscall_arg0(ctx); int tid = (int)ihk_mc_syscall_arg0(ctx);
unsigned int len = (int)ihk_mc_syscall_arg1(ctx); size_t len = (size_t)ihk_mc_syscall_arg1(ctx);
//int cpu_id; cpu_set_t *u_cpu_set = (cpu_set_t *)ihk_mc_syscall_arg2(ctx);
cpu_set_t *mask = (cpu_set_t *)ihk_mc_syscall_arg2(ctx);
struct ihk_mc_cpu_info *cpu_info = ihk_mc_get_cpu_info();
if(len*8 < cpu_info->ncpus) { return -EINVAL; }
if(len & (sizeof(unsigned long)-1)) { return -EINVAL; }
int min_len = MIN2(len, sizeof(cpu_set_t));
//int min_ncpus = MIN2(min_len*8, cpu_info->ncpus);
CPU_ZERO_S(min_len, mask); int ret;
CPU_SET_S(ihk_mc_get_hardware_processor_id(), min_len, mask); struct process *thread;
//for (cpu_id = 0; cpu_id < min_ncpus; ++cpu_id) int i;
// CPU_SET_S(cpu_info->hw_ids[cpu_id], min_len, mask);
// dkprintf("sched_getaffinity returns full mask\n"); if (sizeof(cpu_set_t) > len) {
kprintf("%s %d\n", __FILE__, __LINE__);
return -EINVAL;
}
len = MIN2(len, sizeof(cpu_set_t));
return min_len; thread = NULL;
extern int num_processors;
for (i = 0; i < num_processors; i++) {
struct process *tmp_proc;
ihk_mc_spinlock_lock_noirq(&get_cpu_local_var(i)->runq_lock);
list_for_each_entry(tmp_proc, &get_cpu_local_var(i)->runq, sched_list) {
if (tmp_proc && tmp_proc->pid && tmp_proc->tid == tid) {
thread = tmp_proc;
hold_process(thread);
break;
}
}
ihk_mc_spinlock_unlock_noirq(&get_cpu_local_var(i)->runq_lock);
if (thread)
break;
}
if (!thread) {
kprintf("%s %d\n", __FILE__, __LINE__);
return -ESRCH;
}
ret = copy_to_user(cpu_local_var(current), u_cpu_set, &thread->cpu_set, len);
release_process(thread);
kprintf("%s %d %d\n", __FILE__, __LINE__, ret);
if (ret < 0)
return ret;
return len;
} }
SYSCALL_DECLARE(sched_yield) SYSCALL_DECLARE(sched_yield)