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

mcctrl: clean up syscall offload wait code

Browse Source
This commit is contained in:
Balazs Gerofi
2016-08-07 20:55:36 +09:00
parent 4cefb4333f
commit 5fbeee953a
1 changed files with 21 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
executer/kernel/mcctrl/control.c
View File

@ -453,13 +453,6 @@ retry_alloc:
return 0; return 0;
} }
#ifndef DO_USER_MODE
// static int remaining_job, base_cpu, job_pos;
#endif
// extern int num_channels;
// extern int mcctrl_dma_abort;
int mcexec_wait_syscall(ihk_os_t os, struct syscall_wait_desc *__user req) int mcexec_wait_syscall(ihk_os_t os, struct syscall_wait_desc *__user req)
{ {
struct syscall_wait_desc swd; struct syscall_wait_desc swd;
@ -469,9 +462,6 @@ int mcexec_wait_syscall(ihk_os_t os, struct syscall_wait_desc *__user req)
struct wait_queue_head_list_node *wqhln_iter; struct wait_queue_head_list_node *wqhln_iter;
int ret = 0; int ret = 0;
unsigned long irqflags; unsigned long irqflags;
#ifndef DO_USER_MODE
unsigned long s, w, d;
#endif
//printk("mcexec_wait_syscall swd=%p req=%p size=%d\n", &swd, req, sizeof(swd.cpu)); //printk("mcexec_wait_syscall swd=%p req=%p size=%d\n", &swd, req, sizeof(swd.cpu));
if (copy_from_user(&swd, req, sizeof(swd))) { if (copy_from_user(&swd, req, sizeof(swd))) {
@ -489,7 +479,6 @@ int mcexec_wait_syscall(ihk_os_t os, struct syscall_wait_desc *__user req)
} }
c = usrdata->channels + swd.cpu; c = usrdata->channels + swd.cpu;
#ifdef DO_USER_MODE
retry: retry:
/* Prepare per-process wait queue head */ /* Prepare per-process wait queue head */
retry_alloc: retry_alloc:
@ -518,7 +507,6 @@ retry_alloc:
ret = wait_event_interruptible(wqhln->wq_syscall, wqhln->req); ret = wait_event_interruptible(wqhln->wq_syscall, wqhln->req);
/* Remove per-process wait queue head */ /* Remove per-process wait queue head */
irqflags = ihk_ikc_spinlock_lock(&c->wq_list_lock); irqflags = ihk_ikc_spinlock_lock(&c->wq_list_lock);
list_del(&wqhln->list); list_del(&wqhln->list);
@ -541,79 +529,34 @@ retry_alloc:
return -EINTR; return -EINTR;
} }
#if 1
mb(); mb();
if (!c->param.request_va->valid) { if (!c->param.request_va->valid) {
printk("mcexec_wait_syscall:stray wakeup\n"); printk("mcexec_wait_syscall:stray wakeup pid: %d, tid: %d: SC %d, swd.cpu: %d\n",
task_tgid_vnr(current),
task_pid_vnr(current),
c->param.request_va->number,
swd.cpu);
goto retry; goto retry;
} }
#endif
#else
while (1) {
c = usrdata->channels + swd.cpu;
ihk_get_tsc(s);
if (!usrdata->remaining_job) {
while (!(*c->param.doorbell_va)) {
mb();
cpu_relax();
ihk_get_tsc(w);
if (w > s + 1024UL * 1024 * 1024 * 10) {
return -EINTR;
}
}
d = (*c->param.doorbell_va) - 1;
*c->param.doorbell_va = 0;
if (d < 0 || d >= usrdata->num_channels) { c->param.request_va->valid = 0; /* ack */
d = 0; dprintk("SC #%lx, %lx\n",
} c->param.request_va->number,
usrdata->base_cpu = d; c->param.request_va->args[0]);
usrdata->job_pos = 0; register_peer_channel(usrdata, current, c);
usrdata->remaining_job = 1;
} else {
usrdata->job_pos++;
}
for (; usrdata->job_pos < usrdata->num_channels; usrdata->job_pos++) { if (__do_in_kernel_syscall(os, c, c->param.request_va)) {
if (base_cpu + job_pos >= num_channels) { if (copy_to_user(&req->sr, c->param.request_va,
c = usrdata->channels + sizeof(struct syscall_request))) {
(usrdata->base_cpu + usrdata->job_pos - usrdata->num_channels); deregister_peer_channel(usrdata, current, c);
} else { return -EFAULT;
c = usrdata->channels + usrdata->base_cpu + usrdata->job_pos;
}
if (!c) {
continue;
}
if (c->param.request_va &&
c->param.request_va->valid) {
#endif
c->param.request_va->valid = 0; /* ack */
dprintk("SC #%lx, %lx\n",
c->param.request_va->number,
c->param.request_va->args[0]);
register_peer_channel(usrdata, current, c);
if (__do_in_kernel_syscall(os, c, c->param.request_va)) {
if (copy_to_user(&req->sr, c->param.request_va,
sizeof(struct syscall_request))) {
deregister_peer_channel(usrdata, current, c);
return -EFAULT;
}
return 0;
}
deregister_peer_channel(usrdata, current, c);
#ifdef DO_USER_MODE
goto retry;
#endif
#ifndef DO_USER_MODE
if (usrdata->mcctrl_dma_abort) {
return -2;
}
}
} }
usrdata->remaining_job = 0; return 0;
} }
#endif
return 0; deregister_peer_channel(usrdata, current, c);
goto retry;
} }
long mcexec_pin_region(ihk_os_t os, unsigned long *__user arg) long mcexec_pin_region(ihk_os_t os, unsigned long *__user arg)