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

mcexec_start_image(): handle IKC send timeout

Browse Source
This commit is contained in:
Balazs Gerofi
2018-03-17 21:33:17 +09:00
parent 0d9c1df75a
commit e2dea4e9f8
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -435,6 +435,7 @@ static long mcexec_start_image(ihk_os_t os,
struct mcctrl_channel *c; struct mcctrl_channel *c;
struct mcctrl_usrdata *usrdata = ihk_host_os_get_usrdata(os); struct mcctrl_usrdata *usrdata = ihk_host_os_get_usrdata(os);
struct mcos_handler_info *info; struct mcos_handler_info *info;
int ret = 0;
desc = kmalloc(sizeof(*desc), GFP_KERNEL); desc = kmalloc(sizeof(*desc), GFP_KERNEL);
if (!desc) { if (!desc) {
@ -445,17 +446,18 @@ static long mcexec_start_image(ihk_os_t os,
if (copy_from_user(desc, udesc, if (copy_from_user(desc, udesc,
sizeof(struct program_load_desc))) { sizeof(struct program_load_desc))) {
kfree(desc); ret = -EFAULT;
return -EFAULT; goto out;
} }
info = new_mcos_handler_info(os, file); info = new_mcos_handler_info(os, file);
#ifdef POSTK_DEBUG_TEMP_FIX_64 /* host process is SIGKILLed fix. */ #ifdef POSTK_DEBUG_TEMP_FIX_64 /* host process is SIGKILLed fix. */
if (info == NULL) { if (info == NULL) {
kfree(desc); ret = -ENOMEM;
return -ENOMEM; goto out;
} }
#endif /* POSTK_DEBUG_TEMP_FIX_64 */ #endif /* POSTK_DEBUG_TEMP_FIX_64 */
info->pid = desc->pid; info->pid = desc->pid;
info->cpu = desc->cpu; info->cpu = desc->cpu;
ihk_os_register_release_handler(file, release_handler, info); ihk_os_register_release_handler(file, release_handler, info);
@ -471,10 +473,14 @@ static long mcexec_start_image(ihk_os_t os,
isp.ref = desc->cpu; isp.ref = desc->cpu;
isp.arg = desc->rprocess; isp.arg = desc->rprocess;
mcctrl_ikc_send(os, desc->cpu, &isp); ret = mcctrl_ikc_send(os, desc->cpu, &isp);
if (ret < 0) {
printk("%s: error: sending IKC msg\n", __FUNCTION__);
}
out:
kfree(desc); kfree(desc);
return 0; return ret;
} }
static DECLARE_WAIT_QUEUE_HEAD(signalq); static DECLARE_WAIT_QUEUE_HEAD(signalq);