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

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)