From e2dea4e9f82168b4aa3a98a10370be7c9cb31881 Mon Sep 17 00:00:00 2001
From: Balazs Gerofi <bgerofi@riken.jp>
Date: Sat, 17 Mar 2018 21:33:17 +0900
Subject: [PATCH] mcexec_start_image(): handle IKC send timeout

---
 executer/kernel/mcctrl/control.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/executer/kernel/mcctrl/control.c b/executer/kernel/mcctrl/control.c
index 350bcce0..9fa91db7 100644
--- a/executer/kernel/mcctrl/control.c
+++ b/executer/kernel/mcctrl/control.c
@@ -435,6 +435,7 @@ static long mcexec_start_image(ihk_os_t os,
 	struct mcctrl_channel *c;
 	struct mcctrl_usrdata *usrdata = ihk_host_os_get_usrdata(os);
 	struct mcos_handler_info *info;
+	int ret = 0;
 
 	desc = kmalloc(sizeof(*desc), GFP_KERNEL);
 	if (!desc) {
@@ -445,17 +446,18 @@ static long mcexec_start_image(ihk_os_t os,
 
 	if (copy_from_user(desc, udesc,
 	                   sizeof(struct program_load_desc))) {
-		kfree(desc);
-		return -EFAULT;
+		ret = -EFAULT;
+		goto out;
 	}
 
 	info = new_mcos_handler_info(os, file);
 #ifdef POSTK_DEBUG_TEMP_FIX_64 /* host process is SIGKILLed fix. */
 	if (info == NULL) {
-		kfree(desc);
-		return -ENOMEM;
+		ret = -ENOMEM;
+		goto out;
 	}
 #endif /* POSTK_DEBUG_TEMP_FIX_64 */
+
 	info->pid = desc->pid;
 	info->cpu = desc->cpu;
 	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.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);
-	return 0;
+	return ret;
 }
 
 static DECLARE_WAIT_QUEUE_HEAD(signalq);