support sigqueue

executer/include/uprotocol.h

@@ -153,6 +153,7 @@ struct signal_desc {
 	int pid;
 	int tid;
 	int sig;
+	char info[128];
 };
 
 #endif

executer/kernel/control.c

@@ -270,27 +270,57 @@ static long mcexec_start_image(ihk_os_t os,
 	return 0;
 }
 
+static DECLARE_WAIT_QUEUE_HEAD(signalq);
+
 static long mcexec_send_signal(ihk_os_t os, struct signal_desc *sigparam)
 {
 	struct ikc_scd_packet isp;
 	struct mcctrl_channel *c;
 	struct mcctrl_usrdata *usrdata = ihk_host_os_get_usrdata(os);
 	struct signal_desc sig;
+	struct mcctrl_signal msig[2];
+	struct mcctrl_signal *msigp;
+	int rc;
 
 	if (copy_from_user(&sig, sigparam, sizeof(struct signal_desc))) {
 		return -EFAULT;
 	}
+
+	msigp = msig;
+	if(((unsigned long)msig & 0xfffffffffffff000L) !=
+	   ((unsigned long)(msig + 1) & 0xfffffffffffff000L))
+		msigp++;
+	memset(msigp, '\0', sizeof msig);
+	msigp->sig = sig.sig;
+	msigp->pid = sig.pid;
+	msigp->tid = sig.tid;
+	memcpy(&msigp->info, &sig.info, 128);
+
 	c = usrdata->channels;
 	isp.msg = SCD_MSG_SEND_SIGNAL;
 	isp.ref = sig.cpu;
 	isp.pid = sig.pid;
-	isp.arg = (long)sig.tid << 32 | (sig.sig & 0x00000000ffffffffL);
+	isp.arg = virt_to_phys(msigp);
 
-	mcctrl_ikc_send(os, sig.cpu, &isp);
+	if((rc = mcctrl_ikc_send(os, sig.cpu, &isp)) < 0){
+		printk("mcexec_send_signal: mcctrl_ikc_send ret=%d\n", rc);
+		return rc;
+	}
+	wait_event_interruptible(signalq, msigp->cond != 0);
 
 	return 0;
 }
 
+void
+sig_done(unsigned long arg, int err)
+{
+	struct mcctrl_signal *msigp;
+
+	msigp = phys_to_virt(arg);
+	msigp->cond = 1;
+	wake_up_interruptible(&signalq);
+}
+
 static long mcexec_get_cpu(ihk_os_t os)
 {
 	struct ihk_cpu_info *info;

executer/kernel/ikc.c

@@ -44,6 +44,7 @@ int mcexec_syscall(struct mcctrl_channel *c, int pid, unsigned long arg);
 void procfs_create(void *__os, int ref, int osnum, int pid, unsigned long arg);
 void procfs_delete(void *__os, int osnum, unsigned long arg);
 void procfs_answer(unsigned long arg, int err);
+void sig_done(unsigned long arg, int err);
 
 static int syscall_packet_handler(struct ihk_ikc_channel_desc *c,
                                   void *__packet, void *__os)
@@ -79,8 +80,11 @@ static int syscall_packet_handler(struct ihk_ikc_channel_desc *c,
 	case SCD_MSG_PROCFS_ANSWER:
 		procfs_answer(pisp->arg, pisp->err);
 		break;
-	}
 
+	case SCD_MSG_SEND_SIGNAL:
+		sig_done(pisp->arg, pisp->err);
+		break;
+	}
 	return 0;
 }
 

executer/kernel/mcctrl.h

@@ -145,6 +145,14 @@ struct mcctrl_usrdata {
 	void **keys;
 };
 
+struct mcctrl_signal {
+	int	cond;
+	int	sig;
+	int	pid;
+	int	tid;
+	char	info[128];
+};
+
 int mcctrl_ikc_send(ihk_os_t os, int cpu, struct ikc_scd_packet *pisp);
 int mcctrl_ikc_send_msg(ihk_os_t os, int cpu, int msg, int ref, unsigned long arg);
 int mcctrl_ikc_is_valid_thread(ihk_os_t os, int cpu);

executer/user/mcexec.c

@@ -820,6 +820,7 @@ sendsig(int sig, siginfo_t *siginfo, void *context)
 	sigdesc.pid = (int)pid;
 	sigdesc.tid = remote_tid;
 	sigdesc.sig = sig;
+	memcpy(&sigdesc.info, siginfo, 128);
 	if (ioctl(fd, MCEXEC_UP_SEND_SIGNAL, &sigdesc) != 0) {
 		perror("send_signal");
 		close(fd);