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

Merge branch 'master' of postpeta.pccluster.org:mckernel into gdb

Browse Source
This commit is contained in:
Naoki Hamada
2014-07-31 10:31:45 +09:00
parent f5b37ef577 27bfe37b80
commit b58682dd73
8 changed files with 135 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
executer/kernel/control.c
View File

@ -330,12 +330,13 @@ retry_alloc:
}
wqhln->pid = pid;
wqhln->req = 0;
init_waitqueue_head(&wqhln->wq_syscall);
list_add_tail(&wqhln->list, &c->wq_list);
}
ihk_ikc_spinlock_unlock(&c->wq_list_lock, flags);
c->req = 1;
wqhln->req = 1;
wake_up(&wqhln->wq_syscall);
return 0;
@ -388,6 +389,7 @@ retry_alloc:
}
wqhln->pid = swd.pid;
wqhln->req = 0;
init_waitqueue_head(&wqhln->wq_syscall);
irqflags = ihk_ikc_spinlock_lock(&c->wq_list_lock);
@ -403,8 +405,12 @@ retry_alloc:
list_add_tail(&wqhln->list, &c->wq_list);
ihk_ikc_spinlock_unlock(&c->wq_list_lock, irqflags);
ret = wait_event_interruptible(wqhln->wq_syscall, c->req);
ret = wait_event_interruptible(wqhln->wq_syscall, wqhln->req);
if (ret) {
return -EINTR;
}
/* Remove per-process wait queue head */
irqflags = ihk_ikc_spinlock_lock(&c->wq_list_lock);
list_del(&wqhln->list);
@ -423,11 +429,6 @@ retry_alloc:
return -EINTR;
}
if (ret) {
return -EINTR;
}
c->req = 0;
#if 1
mb();
if (!c->param.request_va->valid) {

2
executer/kernel/mcctrl.h
View File

@ -100,6 +100,7 @@ struct wait_queue_head_list_node {
struct list_head list;
wait_queue_head_t wq_syscall;
int pid;
int req;
};
struct mcctrl_channel {
@ -108,7 +109,6 @@ struct mcctrl_channel {
struct ikc_scd_init_param init;
void *dma_buf;
int req;
struct list_head wq_list;
ihk_spinlock_t wq_list_lock;
};

4
executer/kernel/syscall.c
View File

@ -255,6 +255,7 @@ retry_alloc:
/* Prepare per-process wait queue head */
wqhln->pid = current->tgid;
wqhln->req = 0;
init_waitqueue_head(&wqhln->wq_syscall);
irqflags = ihk_ikc_spinlock_lock(&channel->wq_list_lock);
@ -271,7 +272,7 @@ retry_alloc:
ihk_ikc_spinlock_unlock(&channel->wq_list_lock, irqflags);
/* wait for response */
error = wait_event_interruptible(wqhln->wq_syscall, channel->req);
error = wait_event_interruptible(wqhln->wq_syscall, wqhln->req);
/* Remove per-process wait queue head */
irqflags = ihk_ikc_spinlock_lock(&channel->wq_list_lock);
@ -283,7 +284,6 @@ retry_alloc:
printk("remote_page_fault:interrupted. %d\n", error);
goto out;
}
channel->req = 0;
if (!req->valid) {
printk("remote_page_fault:not valid\n");
}

94
executer/user/mcexec.c
View File

@ -116,6 +116,7 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock);
static int fd;
static char *altroot;
static const char rlimit_stack_envname[] = "MCKERNEL_RLIMIT_STACK";
static int ischild;
pid_t gettid(void)
{
@ -341,6 +342,12 @@ int load_elf_desc(char *filename, struct program_load_desc **desc_p)
FILE *interp = NULL;
char *interp_path;
struct program_load_desc *desc;
int ret = 0;
if ((ret = access(filename, X_OK)) != 0) {
fprintf(stderr, "Error: %s is not an executable?\n", filename);
return ret;
}
fp = fopen(filename, "rb");
if (!fp) {
@ -1106,8 +1113,10 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
sig = w.sr.args[0] & 0x7f;
term = (w.sr.args[0] & 0xff00) >> 8;
if(isatty(2)){
if(sig)
fprintf(stderr, "Terminate by signal %d\n", sig);
if(sig){
if(!ischild)
fprintf(stderr, "Terminate by signal %d\n", sig);
}
else if(term)
__dprintf("Exit status: %d\n", term);
}
@ -1163,6 +1172,7 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
case 0: {
int i;
ischild = 1;
/* Reopen device fd */
close(fd);
fd = open(dev, O_RDWR);
@ -1214,21 +1224,84 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
/* Execve phase */
switch (w.sr.args[0]) {
int ret = -1;
struct program_load_desc *desc;
struct remote_transfer trans;
int error;
int found;
char path[2048];
char *filename;
int ret;
/* Load descriptor phase */
case 1:
if (load_elf_desc((char *)w.sr.args[1], &desc) != 0) {
ret = -1;
found = 0;
filename = (char *)w.sr.args[1];
/* Is filename a single component without path? */
if (strncmp(filename, "/", 1)
&& !strchr(filename, '/')) {
char *token, *string, *tofree;
char *PATH = getenv("COKERNEL_PATH");
if (!PATH) {
PATH = getenv("PATH");
}
__dprintf("PATH: %s\n", PATH);
/* strsep() modifies string! */
tofree = string = strdup(PATH);
if (string == NULL) {
printf("error: copying PATH, not enough memory?\n");
goto return_execve1;
}
while ((token = strsep(&string, ":")) != NULL) {
error = snprintf(path, sizeof(path),
"%s/%s", token, filename);
if (error < 0 || error >= sizeof(path)) {
fprintf(stderr, "execve(): array too small?\n");
continue;
}
error = access(path, X_OK);
if (error == 0) {
found = 1;
break;
}
}
free(tofree);
}
else {
error = snprintf(path, sizeof(path), "%s", filename);
if (error < 0 || error >= sizeof(path)) {
fprintf(stderr, "execve(): array too small?\n");
goto return_execve1;
}
found = 1;
}
if (!found) {
fprintf(stderr,
"execve(): error loading ELF for file %s\n",
(char *)w.sr.args[1]);
"execve(): error finding file %s\n", filename);
goto return_execve1;
}
__dprintf("execve(): path to binary: %s\n", path);
if ((ret = load_elf_desc(path, &desc)) != 0) {
fprintf(stderr,
"execve(): error loading ELF for file %s\n", path);
goto return_execve1;
}
__dprintf("execve(): load_elf_desc() for %s OK, num sections: %d\n",
w.sr.args[1], desc->num_sections);
path, desc->num_sections);
/* Copy descriptor to co-kernel side */
trans.userp = (void*)desc;
@ -1246,7 +1319,7 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
}
__dprintf("execve(): load_elf_desc() for %s OK\n",
w.sr.args[1]);
path);
/* We can't be sure next phase will succeed */
/* TODO: what shall we do with fp in desc?? */
@ -1260,6 +1333,7 @@ return_execve1:
/* Copy program image phase */
case 2:
ret = -1;
/* Alloc descriptor */
desc = malloc(w.sr.args[2]);
if (!desc) {
@ -1279,7 +1353,7 @@ return_execve1:
goto return_execve1;
}
printf("execve(): transfer ELF desc OK\n");
__dprintf("execve(): transfer ELF desc OK\n");
transfer_image(fd, desc);
__dprintf("execve(): image transferred\n");