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

schedule(): sync CPU_FLAG_NEED_RESCHED flag with clone and migrate

Browse Source
This commit is contained in:
Balazs Gerofi
2015-09-16 19:22:40 +09:00
parent e7b1115572
commit 40b8587a8a
3 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kernel/cpu.c
View File

@ -720,9 +720,12 @@ void handle_interrupt(int vector, struct x86_user_context *regs)
}
}
else if (vector == LOCAL_TIMER_VECTOR) {
unsigned long irqstate;
/* Timer interrupt, enabled only on oversubscribed CPU cores,
* request reschedule */
irqstate = ihk_mc_spinlock_lock(&v->runq_lock);
v->flags |= CPU_FLAG_NEED_RESCHED;
ihk_mc_spinlock_unlock(&v->runq_lock, irqstate);
dkprintf("timer[%lu]: CPU_FLAG_NEED_RESCHED \n", rdtsc());
}
else if (vector >= IHK_TLB_FLUSH_IRQ_VECTOR_START &&

19
kernel/process.c
View File

@ -2087,8 +2087,8 @@ static void idle(void)
/* See if we need to migrate a process somewhere */
if (v->flags & CPU_FLAG_NEED_MIGRATE) {
v->flags &= ~CPU_FLAG_NEED_MIGRATE;
do_migrate();
v->flags &= ~CPU_FLAG_NEED_MIGRATE;
}
/*
@ -2232,8 +2232,8 @@ static void do_migrate(void)
dkprintf("do_migrate(): migrated TID %d from CPU %d to CPU %d\n",
req->proc->ftn->tid, old_cpu_id, cpu_id);
if (v->runq_len == 1)
ihk_mc_interrupt_cpu(get_x86_cpu_local_variable(cpu_id)->apic_id, 0xd1);
v->flags |= CPU_FLAG_NEED_RESCHED;
ihk_mc_interrupt_cpu(get_x86_cpu_local_variable(cpu_id)->apic_id, 0xd1);
double_rq_unlock(cur_v, v, irqstate);
ack:
@ -2270,6 +2270,8 @@ redo:
next = NULL;
prev = v->current;
v->flags &= ~CPU_FLAG_NEED_RESCHED;
/* All runnable processes are on the runqueue */
if (prev && prev != &cpu_local_var(idle)) {
list_del(&prev->sched_list);
@ -2393,15 +2395,21 @@ release_cpuid(int cpuid)
void check_need_resched(void)
{
unsigned long irqstate;
struct cpu_local_var *v = get_this_cpu_local_var();
irqstate = ihk_mc_spinlock_lock(&v->runq_lock);
if (v->flags & CPU_FLAG_NEED_RESCHED) {
if (v->in_interrupt && (v->flags & CPU_FLAG_NEED_MIGRATE)) {
dkprintf("no migration in IRQ context\n");
kprintf("no migration in IRQ context\n");
ihk_mc_spinlock_unlock(&v->runq_lock, irqstate);
return;
}
v->flags &= ~CPU_FLAG_NEED_RESCHED;
ihk_mc_spinlock_unlock(&v->runq_lock, irqstate);
schedule();
}
else {
ihk_mc_spinlock_unlock(&v->runq_lock, irqstate);
}
}
@ -2503,6 +2511,7 @@ void __runq_add_proc(struct process *proc, int cpu_id)
struct cpu_local_var *v = get_cpu_local_var(cpu_id);
list_add_tail(&proc->sched_list, &v->runq);
++v->runq_len;
v->flags |= CPU_FLAG_NEED_RESCHED;
proc->cpu_id = cpu_id;
//proc->ftn->status = PS_RUNNING; /* not set here */
get_cpu_local_var(cpu_id)->status = CPU_STATUS_RUNNING;

30
kernel/syscall.c
View File

@ -4849,16 +4849,32 @@ SYSCALL_DECLARE(sched_setaffinity)
return -EINVAL;
}
if (tid == 0)
if (tid == 0) {
tid = cpu_local_var(current)->ftn->tid;
for (cpu_id = 0; cpu_id < num_processors; cpu_id++) {
thread = cpu_local_var(current);
cpu_id = ihk_mc_get_processor_id();
irqstate = ihk_mc_spinlock_lock(&get_cpu_local_var(cpu_id)->runq_lock);
list_for_each_entry(thread, &get_cpu_local_var(cpu_id)->runq, sched_list)
if (thread->ftn->pid && thread->ftn->tid == tid)
goto found; /* without unlocking runq_lock */
ihk_mc_spinlock_unlock(&get_cpu_local_var(cpu_id)->runq_lock, irqstate);
goto found;
}
else {
for (cpu_id = 0; cpu_id < num_processors; cpu_id++) {
irqstate = ihk_mc_spinlock_lock(
&get_cpu_local_var(cpu_id)->runq_lock);
list_for_each_entry(thread,
&get_cpu_local_var(cpu_id)->runq, sched_list) {
if (thread->ftn->pid && thread->ftn->tid == tid) {
goto found; /* without unlocking runq_lock */
}
}
ihk_mc_spinlock_unlock(&get_cpu_local_var(cpu_id)->runq_lock,
irqstate);
}
}
kprintf("%s:%d Thread not found.\n", __FILE__, __LINE__);
return -ESRCH;