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

support signalfd4 step1

Browse Source
This commit is contained in:
Tomoki Shirasawa
2015-03-18 17:35:43 +09:00
parent d53865ac5f
commit f5d935b703
4 changed files with 162 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/include/syscall_list.h
View File

@ -23,7 +23,7 @@
SYSCALL_DELEGATED(0, read)
SYSCALL_DELEGATED(1, write)
SYSCALL_DELEGATED(2, open)
SYSCALL_DELEGATED(3, close)
SYSCALL_HANDLED(3, close)
SYSCALL_DELEGATED(4, stat)
SYSCALL_DELEGATED(5, fstat)
SYSCALL_DELEGATED(8, lseek)

71
executer/user/mcexec.c
View File

@ -57,6 +57,7 @@
#include <pthread.h>
#include <semaphore.h>
#include <signal.h>
#include <sys/signalfd.h>
#include "../include/uprotocol.h"
//#define DEBUG
@ -98,6 +99,13 @@ typedef unsigned char cc_t;
typedef unsigned int speed_t;
typedef unsigned int tcflag_t;
struct sigfd {
struct sigfd *next;
int sigpipe[2];
};
struct sigfd *sigfdtop;
#ifdef NCCS
#undef NCCS
#endif
@ -887,6 +895,64 @@ sendsig(int sig, siginfo_t *siginfo, void *context)
}
}
long
act_signalfd4(struct syscall_wait_desc *w)
{
struct sigfd *sfd;
struct sigfd *sb;
int mode = w->sr.args[0];
int flags;
int tmp;
int rc = 0;
struct signalfd_siginfo *info;
switch(mode){
case 0: /* new signalfd */
sfd = malloc(sizeof(struct sigfd));
tmp = w->sr.args[1];
flags = 0;
if(tmp & SFD_NONBLOCK)
flags |= O_NONBLOCK;
if(tmp & SFD_CLOEXEC)
flags |= O_CLOEXEC;
pipe2(sfd->sigpipe, flags);
sfd->next = sigfdtop;
sigfdtop = sfd;
rc = sfd->sigpipe[0];
break;
case 1: /* close signalfd */
tmp = w->sr.args[1];
for(sfd = sigfdtop, sb = NULL; sfd; sb = sfd, sfd = sfd->next)
if(sfd->sigpipe[0] == tmp)
break;
if(!sfd)
rc = -EBADF;
else{
if(sb)
sb->next = sfd->next;
else
sigfdtop = sfd->next;
close(sfd->sigpipe[0]);
close(sfd->sigpipe[1]);
free(sfd);
}
break;
case 2: /* push signal */
tmp = w->sr.args[1];
for(sfd = sigfdtop; sfd; sfd = sfd->next)
if(sfd->sigpipe[0] == tmp)
break;
if(!sfd)
rc = -EBADF;
else{
info = (struct signalfd_siginfo *)w->sr.args[2];
write(sfd->sigpipe[1], info, sizeof(struct signalfd_siginfo));
}
break;
}
return rc;
}
void
act_sigaction(struct syscall_wait_desc *w)
{
@ -1955,6 +2021,11 @@ return_execve2:
break;
}
case __NR_signalfd4:
ret = act_signalfd4(&w);
do_syscall_return(fd, cpu, ret, 0, 0, 0, 0);
break;
case __NR_rt_sigaction:
act_sigaction(&w);
do_syscall_return(fd, cpu, 0, 0, 0, 0, 0);

9
kernel/include/process.h
View File

@ -244,9 +244,18 @@ struct vm_regions {
struct process_vm;
struct sigfd {
struct sigfd *next;
int fd;
__sigset_t mask;
};
#define SFD_CLOEXEC 02000000
#define SFD_NONBLOCK 04000
struct sig_handler {
ihk_spinlock_t lock;
ihk_atomic_t use;
struct sigfd *sigfd;
struct k_sigaction action[_NSIG];
};

83
kernel/syscall.c
View File

@ -2163,7 +2163,7 @@ do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact)
{
struct process *proc = cpu_local_var(current);
struct k_sigaction *k;
int irqstate;
long irqstate;
ihk_mc_user_context_t ctx0;
irqstate = ihk_mc_spinlock_lock(&proc->sighandler->lock);
@ -2183,6 +2183,39 @@ do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact)
return 0;
}
SYSCALL_DECLARE(close)
{
int fd = ihk_mc_syscall_arg0(ctx);
int rc;
struct process *proc = cpu_local_var(current);
struct sigfd *sfd;
struct sigfd *sb;
long irqstate;
irqstate = ihk_mc_spinlock_lock(&proc->sighandler->lock);
for(sfd = proc->sighandler->sigfd, sb = NULL; sfd; sb = sfd, sfd = sfd->next)
if(sfd->fd == fd)
break;
if(sfd){
struct syscall_request request IHK_DMA_ALIGN;
if(sb)
sb->next = sfd->next;
else
proc->sighandler->sigfd = sfd->next;
ihk_mc_spinlock_unlock(&proc->sighandler->lock, irqstate);
request.number = __NR_signalfd4;
request.args[0] = 1;
request.args[1] = sfd->fd;
kfree(sfd);
rc = do_syscall(&request, ihk_mc_get_processor_id(), 0);
}
else{
ihk_mc_spinlock_unlock(&proc->sighandler->lock, irqstate);
rc = syscall_generic_forwarding(__NR_close, ctx);
}
return rc;
}
SYSCALL_DECLARE(rt_sigprocmask)
{
int how = ihk_mc_syscall_arg0(ctx);
@ -2278,7 +2311,53 @@ SYSCALL_DECLARE(signalfd)
SYSCALL_DECLARE(signalfd4)
{
return -EOPNOTSUPP;
int fd = ihk_mc_syscall_arg0(ctx);
struct process *proc = cpu_local_var(current);
struct sigfd *sfd;
long irqstate;
sigset_t *maskp = (sigset_t *)ihk_mc_syscall_arg1(ctx);;
__sigset_t mask;
size_t sigsetsize = (size_t)ihk_mc_syscall_arg2(ctx);
int flags = ihk_mc_syscall_arg3(ctx);
if(sigsetsize != sizeof(sigset_t))
return -EINVAL;
if(copy_from_user(&mask, maskp, sizeof mask))
return -EFAULT;
if(flags & ~(SFD_NONBLOCK | SFD_CLOEXEC))
return -EINVAL;
irqstate = ihk_mc_spinlock_lock(&proc->sighandler->lock);
if(fd == -1){
struct syscall_request request IHK_DMA_ALIGN;
ihk_mc_spinlock_unlock(&proc->sighandler->lock, irqstate);
request.number = __NR_signalfd4;
request.args[0] = 0;
request.args[1] = flags;
fd = do_syscall(&request, ihk_mc_get_processor_id(), 0);
if(fd < 0){
return fd;
}
sfd = kmalloc(sizeof(struct sigfd), IHK_MC_AP_NOWAIT);
if(!sfd)
return -ENOMEM;
sfd->fd = fd;
irqstate = ihk_mc_spinlock_lock(&proc->sighandler->lock);
sfd->next = proc->sighandler->sigfd;
proc->sighandler->sigfd = sfd;
}
else{
for(sfd = proc->sighandler->sigfd; sfd; sfd = sfd->next)
if(sfd->fd == fd)
break;
if(!sfd){
ihk_mc_spinlock_unlock(&proc->sighandler->lock, irqstate);
return -EINVAL;
}
}
memcpy(&sfd->mask, &mask, sizeof mask);
ihk_mc_spinlock_unlock(&proc->sighandler->lock, irqstate);
return sfd->fd;
}
SYSCALL_DECLARE(rt_sigtimedwait)