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

obtain_clone_cpuid(): respect parent's CPU set

Browse Source
This commit is contained in:
Balazs Gerofi
2016-12-08 16:01:30 +09:00
parent 61fc4c5e55
commit 3cecafac59
3 changed files with 32 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
arch/x86/kernel/syscall.c
View File

@ -70,71 +70,37 @@ static struct vdso vdso;
static size_t container_size = 0; static size_t container_size = 0;
static ptrdiff_t vdso_offset; static ptrdiff_t vdso_offset;
/* extern int num_processors;
See dkprintf("BSP HW ID = %d, ", bsp_hw_id); (in ./mcos/kernel/ap.c)
Core with BSP HW ID 224 is 1st logical core of last physical core. int obtain_clone_cpuid(cpu_set_t *cpu_set) {
It boots first and is given SW-ID of 0 int min_queue_len = -1;
int cpu, min_cpu = -1;
Core with BSP HW ID 0 is 1st logical core of 1st physical core. /* Find the first allowed core with the shortest run queue */
It boots next and is given SW-ID of 1. for (cpu = 0; cpu < num_processors; ++cpu) {
Core with BSP HW ID 1 boots next and is given SW-ID of 2. struct cpu_local_var *v;
Core with BSP HW ID 2 boots next and is given SW-ID of 3. unsigned long irqstate;
Core with BSP HW ID 3 boots next and is given SW-ID of 4.
...
Core with BSP HW ID 220 is 1st logical core of 56-th physical core.
It boots next and is given SW-ID of 221.
Core with BSP HW ID 221 boots next and is given SW-ID of 222.
Core with BSP HW ID 222 boots next and is given SW-ID of 223.
Core with BSP HW ID 223 boots next and is given SW-ID of 224.
Core with BSP HW ID 225 is 2nd logical core of last physical core. if (!CPU_ISSET(cpu, cpu_set)) continue;
It boots next and is given SW-ID of 225.
Core with BSP HW ID 226 boots next and is given SW-ID of 226.
Core with BSP HW ID 227 boots next and is given SW-ID of 227.
*/
ihk_spinlock_t cpuid_head_lock = 0;
static int cpuid_head = 0;
/* archtecture-depended syscall handlers */ v = get_cpu_local_var(cpu);
int obtain_clone_cpuid() { irqstate = ihk_mc_spinlock_lock(&v->runq_lock);
/* see above on BSP HW ID */ if (min_queue_len == -1 || v->runq_len < min_queue_len) {
struct ihk_mc_cpu_info *cpu_info = ihk_mc_get_cpu_info(); min_queue_len = v->runq_len;
int cpuid, nretry = 0; min_cpu = cpu;
ihk_mc_spinlock_lock_noirq(&cpuid_head_lock); }
ihk_mc_spinlock_unlock(&v->runq_lock, irqstate);
/* Always start from 0 to fill in LWK cores linearily */
cpuid_head = 0;
retry:
/* Try to obtain next physical core */
cpuid = cpuid_head;
/* A hyper-threading core on the same physical core as if (min_queue_len == 0)
the parent process might be chosen. Use sched_setaffinity break;
if you want to skip that kind of busy physical core for }
performance reason. */
cpuid_head += 1;
if(cpuid_head >= cpu_info->ncpus) {
cpuid_head = 0;
}
/* A hyper-threading core whose parent physical core has a if (min_cpu != -1) {
process on one of its hyper-threading core might if (get_cpu_local_var(min_cpu)->status != CPU_STATUS_RESERVED)
be chosen. Use sched_setaffinity if you want to skip that get_cpu_local_var(min_cpu)->status = CPU_STATUS_RESERVED;
kind of busy physical core for performance reason. */ }
if(get_cpu_local_var(cpuid)->status != CPU_STATUS_IDLE) {
nretry++; return min_cpu;
if(nretry >= cpu_info->ncpus) {
cpuid = -1;
ihk_mc_spinlock_unlock_noirq(&cpuid_head_lock);
goto out;
}
goto retry;
}
get_cpu_local_var(cpuid)->status = CPU_STATUS_RESERVED;
ihk_mc_spinlock_unlock_noirq(&cpuid_head_lock);
out:
return cpuid;
} }
int int

11
kernel/host.c
View File

@ -579,14 +579,16 @@ static int syscall_packet_handler(struct ihk_ikc_channel_desc *c,
break; break;
case SCD_MSG_SCHEDULE_PROCESS: case SCD_MSG_SCHEDULE_PROCESS:
cpuid = obtain_clone_cpuid(); thread = (struct thread *)packet->arg;
if(cpuid == -1){
cpuid = obtain_clone_cpuid(&thread->cpu_set);
if (cpuid == -1) {
kprintf("No CPU available\n"); kprintf("No CPU available\n");
ret = -1; ret = -1;
break; break;
} }
dkprintf("SCD_MSG_SCHEDULE_PROCESS: %lx\n", packet->arg); dkprintf("SCD_MSG_SCHEDULE_PROCESS: %lx\n", packet->arg);
thread = (struct thread *)packet->arg;
proc = thread->proc; proc = thread->proc;
thread->tid = proc->pid; thread->tid = proc->pid;
proc->status = PS_RUNNING; proc->status = PS_RUNNING;
@ -594,8 +596,7 @@ static int syscall_packet_handler(struct ihk_ikc_channel_desc *c,
chain_thread(thread); chain_thread(thread);
chain_process(proc); chain_process(proc);
runq_add_thread(thread, cpuid); runq_add_thread(thread, cpuid);
//cpu_local_var(next) = (struct thread *)packet->arg;
ret = 0; ret = 0;
break; break;

2
kernel/syscall.c
View File

@ -2039,7 +2039,7 @@ unsigned long do_fork(int clone_flags, unsigned long newsp,
return -EINVAL; return -EINVAL;
} }
cpuid = obtain_clone_cpuid(); cpuid = obtain_clone_cpuid(&old->cpu_set);
if (cpuid == -1) { if (cpuid == -1) {
kprintf("do_fork,core not available\n"); kprintf("do_fork,core not available\n");
return -EAGAIN; return -EAGAIN;