From 663c121308e52ab158e6b47af9075753a1e7dcff Mon Sep 17 00:00:00 2001
From: Tomoki Shirasawa <sira@popeye.cc.u-tokyo.ac.jp>
Date: Mon, 18 Aug 2014 16:49:49 +0900
Subject: [PATCH] interrupt syscall sufficient threads

---
 arch/x86/kernel/syscall.c | 88 +++++++++++++++++++++++----------------
 executer/user/mcexec.c    |  2 +-
 kernel/syscall.c          |  9 ++--
 3 files changed, 57 insertions(+), 42 deletions(-)

diff --git a/arch/x86/kernel/syscall.c b/arch/x86/kernel/syscall.c
index 705f5f2f..d9fc3d86 100644
--- a/arch/x86/kernel/syscall.c
+++ b/arch/x86/kernel/syscall.c
@@ -309,6 +309,8 @@ do_kill(int pid, int tid, int sig)
 	struct list_head *head;
 	int rc;
 	unsigned long irqstate;
+	struct k_sigaction *k;
+	int doint;
 
 	if(proc == NULL || proc->pid == 0){
 		return -ESRCH;
@@ -317,27 +319,30 @@ do_kill(int pid, int tid, int sig)
 	if(sig > 64 || sig < 0)
 		return -EINVAL;
 
+	mask = __sigmask(sig);
 	if(tid == -1){
-		if(pid == -1)
-			return -EPERM;
-		if(proc->pid == -pid)
-			pid = -pid;
+		struct process *tproc0 = NULL;
+
 		if(pid == proc->pid || pid == 0){
-			tproc = proc;
+			tproc0 = proc;
 		}
-		else{
-			for(i = 0; i < num_processors; i++){
-				v = get_cpu_local_var(i);
-				irqstate = ihk_mc_spinlock_lock(&(v->runq_lock));
-				list_for_each_entry(p, &(v->runq), sched_list){
-					if(p->pid == pid){
-						tproc = p;
-						break;
+		for(i = 0; i < num_processors; i++){
+			v = get_cpu_local_var(i);
+			irqstate = ihk_mc_spinlock_lock(&(v->runq_lock));
+			list_for_each_entry(p, &(v->runq), sched_list){
+				if(p->pid == pid){
+					if(p->tid == pid || tproc0 == NULL)
+						tproc0 = p;
+					if(mask & p->sigmask.__val[0]){
+						if(p->tid == pid || tproc == NULL)
+							tproc = p;
 					}
 				}
-				ihk_mc_spinlock_unlock(&(v->runq_lock), irqstate);
 			}
+			ihk_mc_spinlock_unlock(&(v->runq_lock), irqstate);
 		}
+		if(tproc == NULL)
+			tproc = tproc0;
 	}
 	else if(pid == -1){
 		for(i = 0; i < num_processors; i++){
@@ -376,6 +381,8 @@ do_kill(int pid, int tid, int sig)
 	if(sig == 0)
 		return 0;
 
+
+	doint = 0;
 	if(tid == -1){
 		irqstate = ihk_mc_spinlock_lock(&tproc->sigshared->lock);
 		head = &tproc->sigshared->sigpending;
@@ -384,38 +391,47 @@ do_kill(int pid, int tid, int sig)
 		irqstate = ihk_mc_spinlock_lock(&tproc->sigpendinglock);
 		head = &tproc->sigpending;
 	}
-	mask = __sigmask(sig);
-	pending = NULL;
-	rc = 0;
-	if(sig < 33){ // SIGRTMIN - SIGRTMAX
-		list_for_each_entry(pending, head, list){
-			if(pending->sigmask.__val[0] == mask)
-				break;
+
+	k = tproc->sighandler->action + sig - 1;
+	if(k->sa.sa_handler != (void *)1 &&
+	   (k->sa.sa_handler != NULL ||
+	    (sig != SIGCHLD && sig != SIGURG))){
+		pending = NULL;
+		rc = 0;
+		if(sig < 33){ // SIGRTMIN - SIGRTMAX
+			list_for_each_entry(pending, head, list){
+				if(pending->sigmask.__val[0] == mask)
+					break;
+			}
+			if(&pending->list == head)
+				pending = NULL;
 		}
-		if(&pending->list == head)
-			pending = NULL;
-	}
-	if(pending == NULL){
-		pending = kmalloc(sizeof(struct sig_pending), IHK_MC_AP_NOWAIT);
-		pending->sigmask.__val[0] = mask;
-		if(!pending){
-			rc = -ENOMEM;
-		}
-		else{
-			list_add_tail(&pending->list, head);
-			tproc->sigevent = 1;
+		if(pending == NULL){
+			doint = 1;
+			pending = kmalloc(sizeof(struct sig_pending), IHK_MC_AP_NOWAIT);
+			pending->sigmask.__val[0] = mask;
+			if(!pending){
+				rc = -ENOMEM;
+			}
+			else{
+				list_add_tail(&pending->list, head);
+				tproc->sigevent = 1;
+			}
 		}
 	}
+
 	if(tid == -1){
 		ihk_mc_spinlock_unlock(&tproc->sigshared->lock, irqstate);
 	}
 	else{
 		ihk_mc_spinlock_unlock(&tproc->sigpendinglock, irqstate);
 	}
-	if(proc != tproc){
-		ihk_mc_interrupt_cpu(get_x86_cpu_local_variable(tproc->cpu_id)->apic_id, 0xd0);
+	if(doint && !(mask & tproc->sigmask.__val[0])){
+		if(proc != tproc){
+			ihk_mc_interrupt_cpu(get_x86_cpu_local_variable(tproc->cpu_id)->apic_id, 0xd0);
+		}
+		interrupt_syscall(tproc->pid, tproc->cpu_id);
 	}
-	interrupt_syscall(1, tproc->pid);
 	return rc;
 }
 
diff --git a/executer/user/mcexec.c b/executer/user/mcexec.c
index 8208689b..647b665d 100644
--- a/executer/user/mcexec.c
+++ b/executer/user/mcexec.c
@@ -1111,7 +1111,7 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
 			break;
 
 		case __NR_kill: // interrupt syscall
-			kill_thread(w.sr.args[0]);
+			kill_thread(w.sr.args[1]);
 			do_syscall_return(fd, cpu, 0, 0, 0, 0, 0);
 			break;
 		case __NR_exit:
diff --git a/kernel/syscall.c b/kernel/syscall.c
index b1677dbc..7b1593e2 100644
--- a/kernel/syscall.c
+++ b/kernel/syscall.c
@@ -129,7 +129,7 @@ static void send_syscall(struct syscall_request *req, int cpu, int pid)
 		 * exit/receive signals at the same time?? */
 		cpu = num_processors;
 		if(req->number == __NR_kill)
-			pid = req->args[2];
+			pid = req->args[0];
 	}
 	else{
 		scp = &get_cpu_local_var(cpu)->scp;
@@ -454,14 +454,13 @@ terminate(int rc, int sig, ihk_mc_user_context_t *ctx)
 }
 
 void
-interrupt_syscall(int all, int pid)
+interrupt_syscall(int pid, int cpuid)
 {
 	ihk_mc_user_context_t ctx;
 	long lerror;
 
-	ihk_mc_syscall_arg0(&ctx) = all? -1: ihk_mc_get_processor_id();
-	ihk_mc_syscall_arg1(&ctx) = 0;
-	ihk_mc_syscall_arg2(&ctx) = pid;
+	ihk_mc_syscall_arg0(&ctx) = pid;
+	ihk_mc_syscall_arg1(&ctx) = cpuid;
 
 	lerror = syscall_generic_forwarding(__NR_kill, &ctx);
 	if (lerror) {