* [patch 2/9] signalfd/timerfd - signalfd core ...
@ 2007-03-11 2:22 Davide Libenzi
2007-03-11 12:02 ` Oleg Nesterov
0 siblings, 1 reply; 3+ messages in thread
From: Davide Libenzi @ 2007-03-11 2:22 UTC (permalink / raw)
To: Linux Kernel Mailing List; +Cc: Andrew Morton, Linus Torvalds, Oleg Nesterov
This patch series implements the new signalfd() system call.
I took part of the original Linus code (and you know how
badly it can be broken :), and I added even more breakage ;)
Signals are fetched from the same signal queue used by the process,
so signalfd will compete with standard kernel delivery in dequeue_signal().
If you want to reliably fetch signals on the signalfd file, you need to
block them with sigprocmask(SIG_BLOCK).
This seems to be working fine on my Dual Opteron machine. I made a quick
test program for it:
http://www.xmailserver.org/signafd-test.c
The signalfd() system call implements signal delivery into a file
descriptor receiver. The signalfd file descriptor if created with the
following API:
int signalfd(int ufd, const sigset_t *mask, size_t masksize);
The "ufd" parameter allows to change an existing signalfd sigmask, w/out
going to close/create cycle (Linus idea). Use "ufd" == -1 if you want a
brand new signalfd file.
The "mask" allows to specify the signal mask of signals that we are
interested in. The "masksize" parameter is the size of "mask".
The signalfd fd supports the poll(2) and read(2) system calls. The poll(2)
will return POLLIN when signals are available to be dequeued. As a direct
consequence of supporting the Linux poll subsystem, the signalfd fd can use
used together with epoll(2) too.
The read(2) system call will return a "struct signalfd_siginfo" structure
in the userspace supplied buffer. The return value is the number of bytes
copied in the supplied buffer, or -1 in case of error. The read(2) call
can also return 0, in case the sighand structure to which the signalfd
was attached, has been orphaned. The O_NONBLOCK flag is also supported, and
read(2) will return -EAGAIN in case no signal is available.
The format of the struct signalfd_siginfo is, and the valid fields depends
of the (->code & __SI_MASK) value, in the same way a struct siginfo would:
struct signalfd_siginfo {
__u32 signo; /* si_signo */
__s32 err; /* si_errno */
__s32 code; /* si_code */
__u32 pid; /* si_pid */
__u32 uid; /* si_uid */
__s32 fd; /* si_fd */
__u32 tid; /* si_fd */
__u32 band; /* si_band */
__u32 overrun; /* si_overrun */
__u32 trapno; /* si_trapno */
__s32 status; /* si_status */
__s32 svint; /* si_int */
__u64 svptr; /* si_ptr */
__u64 utime; /* si_utime */
__u64 stime; /* si_stime */
__u64 addr; /* si_addr */
};
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
- Davide
Index: linux-2.6.20.ep2/fs/signalfd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.20.ep2/fs/signalfd.c 2007-03-10 15:57:51.000000000 -0800
@@ -0,0 +1,381 @@
+/*
+ * fs/signalfd.c
+ *
+ * Copyright (C) 2003 Linus Torvalds
+ *
+ * Mon Mar 5, 2007: Davide Libenzi <davidel@xmailserver.org>
+ * Changed ->read() to return a siginfo strcture instead of signal number.
+ * Fixed locking in ->poll().
+ * Added sighand-detach notification.
+ * Added fd re-use in sys_signalfd() syscall.
+ * Now using anonymous inode source.
+ * Thanks to Oleg Nesterov for useful code review and suggestions.
+ */
+
+#include <linux/file.h>
+#include <linux/poll.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/mount.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/signal.h>
+#include <linux/list.h>
+#include <linux/anon_inodes.h>
+#include <linux/signalfd.h>
+
+#include <asm/uaccess.h>
+
+
+
+struct signalfd_ctx {
+ struct list_head lnk;
+ wait_queue_head_t wqh;
+ sigset_t sigmask;
+ struct task_struct *tsk;
+};
+
+
+
+static struct sighand_struct *signalfd_get_sighand(struct signalfd_ctx *ctx,
+ unsigned long *flags);
+static void signalfd_put_sighand(struct signalfd_ctx *ctx,
+ struct sighand_struct *sighand,
+ unsigned long *flags);
+static void signalfd_cleanup(struct signalfd_ctx *ctx);
+static int signalfd_close(struct inode *inode, struct file *file);
+static unsigned int signalfd_poll(struct file *file, poll_table *wait);
+static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo,
+ siginfo_t const *kinfo);
+static ssize_t signalfd_read(struct file *file, char __user *buf, size_t count,
+ loff_t *ppos);
+
+
+
+static const struct file_operations signalfd_fops = {
+ .release = signalfd_close,
+ .poll = signalfd_poll,
+ .read = signalfd_read,
+};
+static struct kmem_cache *signalfd_ctx_cachep;
+
+
+
+static struct sighand_struct *signalfd_get_sighand(struct signalfd_ctx *ctx,
+ unsigned long *flags)
+{
+ struct sighand_struct *sighand;
+
+ rcu_read_lock();
+ sighand = lock_task_sighand(ctx->tsk, flags);
+ rcu_read_unlock();
+
+ if (sighand && list_empty(&ctx->lnk)) {
+ unlock_task_sighand(ctx->tsk, flags);
+ sighand = NULL;
+ }
+
+ return sighand;
+}
+
+
+static void signalfd_put_sighand(struct signalfd_ctx *ctx,
+ struct sighand_struct *sighand,
+ unsigned long *flags)
+{
+ unlock_task_sighand(ctx->tsk, flags);
+}
+
+
+/*
+ * This must be called with the sighand lock held.
+ */
+int signalfd_deliver(struct sighand_struct *sighand, int sig,
+ struct siginfo *info)
+{
+ int nsig = 0;
+ struct signalfd_ctx *ctx, *tmp;
+
+ list_for_each_entry_safe(ctx, tmp, &sighand->sfdlist, lnk) {
+ /*
+ * We use a negative signal value as a way to broadcast that the
+ * sighand has been orphaned, so that we can notify all the
+ * listeners about this. Remeber the ctx->sigmask is inverted,
+ * so if the user is interested in a signal, that corresponding
+ * bit will be zero.
+ */
+ if (sig < 0)
+ list_del_init(&ctx->lnk);
+ if (sig < 0 || !sigismember(&ctx->sigmask, sig)) {
+ wake_up(&ctx->wqh);
+ nsig++;
+ }
+ }
+
+ return nsig;
+}
+
+
+/*
+ * Create a file descriptor that is associated with our signal
+ * state. We can pass it around to others if we want to, but
+ * it will always be _our_ signal state.
+ */
+asmlinkage long sys_signalfd(int ufd, sigset_t __user *user_mask, size_t sizemask)
+{
+ int error;
+ unsigned long flags;
+ sigset_t sigmask;
+ struct signalfd_ctx *ctx;
+ struct sighand_struct *sighand;
+ struct file *file;
+ struct inode *inode;
+
+ error = -EINVAL;
+ if (sizemask != sizeof(sigset_t) ||
+ copy_from_user(&sigmask, user_mask, sizeof(sigmask)))
+ goto err_exit;
+ sigdelsetmask(&sigmask, sigmask(SIGKILL) | sigmask(SIGSTOP));
+ signotset(&sigmask);
+
+ if (ufd == -1) {
+ error = -ENOMEM;
+ ctx = kmem_cache_alloc(signalfd_ctx_cachep, GFP_KERNEL);
+ if (!ctx)
+ goto err_exit;
+
+ init_waitqueue_head(&ctx->wqh);
+ ctx->sigmask = sigmask;
+ ctx->tsk = current;
+ get_task_struct(current);
+
+ sighand = current->sighand;
+ /*
+ * Add this fd to the list of signal listeners.
+ */
+ spin_lock_irq(&sighand->siglock);
+ list_add_tail(&ctx->lnk, &sighand->sfdlist);
+ spin_unlock_irq(&sighand->siglock);
+
+ /*
+ * When we call this, the initialization must be complete, since
+ * aino_getfd() will install the fd.
+ */
+ error = aino_getfd(&ufd, &inode, &file, "[signalfd]",
+ &signalfd_fops, ctx);
+ if (error)
+ goto err_fdalloc;
+ } else {
+ error = -EBADF;
+ file = fget(ufd);
+ if (!file)
+ goto err_exit;
+ ctx = file->private_data;
+ error = -EINVAL;
+ if (file->f_op != &signalfd_fops) {
+ fput(file);
+ goto err_exit;
+ }
+ if ((sighand = signalfd_get_sighand(ctx, &flags)) != NULL) {
+ ctx->sigmask = sigmask;
+ signalfd_put_sighand(ctx, sighand, &flags);
+ }
+ wake_up(&ctx->wqh);
+ fput(file);
+ }
+
+ return ufd;
+
+err_fdalloc:
+ signalfd_cleanup(ctx);
+err_exit:
+ return error;
+}
+
+
+static void signalfd_cleanup(struct signalfd_ctx *ctx)
+{
+ unsigned long flags;
+ struct sighand_struct *sighand;
+
+ /*
+ * This is tricky. If the sighand is gone, we do not need to remove
+ * context from the list, the list itself won't be there anymore.
+ */
+ if ((sighand = signalfd_get_sighand(ctx, &flags)) != NULL) {
+ list_del(&ctx->lnk);
+ signalfd_put_sighand(ctx, sighand, &flags);
+ }
+ put_task_struct(ctx->tsk);
+ kmem_cache_free(signalfd_ctx_cachep, ctx);
+}
+
+
+static int signalfd_close(struct inode *inode, struct file *file)
+{
+ signalfd_cleanup(file->private_data);
+ return 0;
+}
+
+
+static unsigned int signalfd_poll(struct file *file, poll_table *wait)
+{
+ struct signalfd_ctx *ctx = file->private_data;
+ unsigned int events = 0;
+ unsigned long flags;
+ struct sighand_struct *sighand;
+
+ poll_wait(file, &ctx->wqh, wait);
+
+ /*
+ * Let the caller get a POLLIN in this case, ala socket recv() when
+ * the peer disconnect.
+ */
+ if ((sighand = signalfd_get_sighand(ctx, &flags)) != NULL) {
+ if (next_signal(&ctx->tsk->pending, &ctx->sigmask) > 0 ||
+ next_signal(&ctx->tsk->signal->shared_pending,
+ &ctx->sigmask) > 0)
+ events |= POLLIN;
+ signalfd_put_sighand(ctx, sighand, &flags);
+ } else
+ events |= POLLIN;
+
+ return events;
+}
+
+
+/*
+ * Copied from copy_siginfo_to_user() in kernel/signal.c
+ */
+static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo,
+ siginfo_t const *kinfo)
+{
+ long err;
+
+ err = __clear_user(uinfo, sizeof(*uinfo));
+
+ /*
+ * If you change siginfo_t structure, please be sure
+ * this code is fixed accordingly.
+ */
+ err |= __put_user(kinfo->si_signo, &uinfo->signo);
+ err |= __put_user(kinfo->si_errno, &uinfo->err);
+ err |= __put_user((short)kinfo->si_code, &uinfo->code);
+ switch (kinfo->si_code & __SI_MASK) {
+ case __SI_KILL:
+ err |= __put_user(kinfo->si_pid, &uinfo->pid);
+ err |= __put_user(kinfo->si_uid, &uinfo->uid);
+ break;
+ case __SI_TIMER:
+ err |= __put_user(kinfo->si_tid, &uinfo->tid);
+ err |= __put_user(kinfo->si_overrun, &uinfo->overrun);
+ err |= __put_user(kinfo->si_ptr, &uinfo->svptr);
+ break;
+ case __SI_POLL:
+ err |= __put_user(kinfo->si_band, &uinfo->band);
+ err |= __put_user(kinfo->si_fd, &uinfo->fd);
+ break;
+ case __SI_FAULT:
+ err |= __put_user(kinfo->si_addr, &uinfo->addr);
+#ifdef __ARCH_SI_TRAPNO
+ err |= __put_user(kinfo->si_trapno, &uinfo->trapno);
+#endif
+ break;
+ case __SI_CHLD:
+ err |= __put_user(kinfo->si_pid, &uinfo->pid);
+ err |= __put_user(kinfo->si_uid, &uinfo->uid);
+ err |= __put_user(kinfo->si_status, &uinfo->status);
+ err |= __put_user(kinfo->si_utime, &uinfo->utime);
+ err |= __put_user(kinfo->si_stime, &uinfo->stime);
+ break;
+ case __SI_RT: /* This is not generated by the kernel as of now. */
+ case __SI_MESGQ: /* But this is */
+ err |= __put_user(kinfo->si_pid, &uinfo->pid);
+ err |= __put_user(kinfo->si_uid, &uinfo->uid);
+ err |= __put_user(kinfo->si_ptr, &uinfo->svptr);
+ break;
+ default: /* this is just in case for now ... */
+ err |= __put_user(kinfo->si_pid, &uinfo->pid);
+ err |= __put_user(kinfo->si_uid, &uinfo->uid);
+ break;
+ }
+
+ return err ? -EFAULT: sizeof(*uinfo);
+}
+
+
+static ssize_t signalfd_read(struct file *file, char __user *buf, size_t count,
+ loff_t *ppos)
+{
+ struct signalfd_ctx *ctx = file->private_data;
+ ssize_t res = 0;
+ int signo;
+ unsigned long flags;
+ struct sighand_struct *sighand;
+ siginfo_t info;
+ DECLARE_WAITQUEUE(wait, current);
+
+ if (count < sizeof(struct signalfd_siginfo))
+ return -EINVAL;
+ if ((sighand = signalfd_get_sighand(ctx, &flags)) == NULL)
+ return 0;
+ res = -EAGAIN;
+ if ((signo = dequeue_signal(ctx->tsk, &ctx->sigmask, &info)) == 0 &&
+ !(file->f_flags & O_NONBLOCK)) {
+ add_wait_queue(&ctx->wqh, &wait);
+ for (;;) {
+ set_current_state(TASK_INTERRUPTIBLE);
+ if ((signo = dequeue_signal(ctx->tsk, &ctx->sigmask,
+ &info)) != 0)
+ break;
+ if (signal_pending(current)) {
+ res = -ERESTARTSYS;
+ break;
+ }
+ signalfd_put_sighand(ctx, sighand, &flags);
+ schedule();
+ if (unlikely((sighand =
+ signalfd_get_sighand(ctx, &flags)) == NULL)) {
+ /*
+ * Let the caller read zero byte, ala socket recv()
+ * when the peer disconnect. This test must be done
+ * before doing a dequeue_signal(), because if the
+ * sighand has been orphaned, the dequeue_signal()
+ * call is going to crash.
+ */
+ res = 0;
+ break;
+ }
+ }
+ remove_wait_queue(&ctx->wqh, &wait);
+ __set_current_state(TASK_RUNNING);
+ }
+ if (likely(sighand))
+ signalfd_put_sighand(ctx, sighand, &flags);
+ if (likely(signo))
+ res = signalfd_copyinfo((struct signalfd_siginfo __user *) buf,
+ &info);
+
+ return res;
+}
+
+
+static int __init signalfd_init(void)
+{
+ signalfd_ctx_cachep = kmem_cache_create("signalfd_ctx_cache",
+ sizeof(struct signalfd_ctx),
+ 0, SLAB_PANIC, NULL, NULL);
+ return 0;
+}
+
+
+static void __exit signalfd_exit(void)
+{
+ kmem_cache_destroy(signalfd_ctx_cachep);
+}
+
+module_init(signalfd_init);
+module_exit(signalfd_exit);
+
+MODULE_LICENSE("GPL");
Index: linux-2.6.20.ep2/include/linux/init_task.h
===================================================================
--- linux-2.6.20.ep2.orig/include/linux/init_task.h 2007-03-10 15:57:00.000000000 -0800
+++ linux-2.6.20.ep2/include/linux/init_task.h 2007-03-10 15:57:51.000000000 -0800
@@ -84,6 +84,7 @@
.count = ATOMIC_INIT(1), \
.action = { { { .sa_handler = NULL, } }, }, \
.siglock = __SPIN_LOCK_UNLOCKED(sighand.siglock), \
+ .sfdlist = LIST_HEAD_INIT(sighand.sfdlist), \
}
extern struct group_info init_groups;
Index: linux-2.6.20.ep2/include/linux/sched.h
===================================================================
--- linux-2.6.20.ep2.orig/include/linux/sched.h 2007-03-10 15:57:00.000000000 -0800
+++ linux-2.6.20.ep2/include/linux/sched.h 2007-03-10 15:57:51.000000000 -0800
@@ -379,6 +379,7 @@
atomic_t count;
struct k_sigaction action[_NSIG];
spinlock_t siglock;
+ struct list_head sfdlist;
};
struct pacct_struct {
Index: linux-2.6.20.ep2/kernel/fork.c
===================================================================
--- linux-2.6.20.ep2.orig/kernel/fork.c 2007-03-10 15:57:00.000000000 -0800
+++ linux-2.6.20.ep2/kernel/fork.c 2007-03-10 15:57:51.000000000 -0800
@@ -1422,8 +1422,10 @@
struct sighand_struct *sighand = data;
if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) ==
- SLAB_CTOR_CONSTRUCTOR)
+ SLAB_CTOR_CONSTRUCTOR) {
spin_lock_init(&sighand->siglock);
+ INIT_LIST_HEAD(&sighand->sfdlist);
+ }
}
void __init proc_caches_init(void)
Index: linux-2.6.20.ep2/include/linux/syscalls.h
===================================================================
--- linux-2.6.20.ep2.orig/include/linux/syscalls.h 2007-03-10 15:57:00.000000000 -0800
+++ linux-2.6.20.ep2/include/linux/syscalls.h 2007-03-10 15:57:51.000000000 -0800
@@ -602,6 +602,7 @@
asmlinkage long sys_set_robust_list(struct robust_list_head __user *head,
size_t len);
asmlinkage long sys_getcpu(unsigned __user *cpu, unsigned __user *node, struct getcpu_cache __user *cache);
+asmlinkage long sys_signalfd(int ufd, sigset_t __user *user_mask, size_t sizemask);
int kernel_execve(const char *filename, char *const argv[], char *const envp[]);
Index: linux-2.6.20.ep2/fs/Makefile
===================================================================
--- linux-2.6.20.ep2.orig/fs/Makefile 2007-03-10 15:57:47.000000000 -0800
+++ linux-2.6.20.ep2/fs/Makefile 2007-03-10 15:57:51.000000000 -0800
@@ -11,7 +11,7 @@
attr.o bad_inode.o file.o filesystems.o namespace.o aio.o \
seq_file.o xattr.o libfs.o fs-writeback.o \
pnode.o drop_caches.o splice.o sync.o utimes.o \
- stack.o anon_inodes.o
+ stack.o anon_inodes.o signalfd.o
ifeq ($(CONFIG_BLOCK),y)
obj-y += buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o
Index: linux-2.6.20.ep2/include/linux/signalfd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.20.ep2/include/linux/signalfd.h 2007-03-10 15:57:51.000000000 -0800
@@ -0,0 +1,47 @@
+/*
+ * include/linux/signalfd.h
+ *
+ * Copyright (C) 2007 Davide Libenzi <davidel@xmailserver.org>
+ *
+ */
+
+#ifndef _LINUX_SIGNALFD_H
+#define _LINUX_SIGNALFD_H
+
+
+struct signalfd_siginfo {
+ __u32 signo;
+ __s32 err;
+ __s32 code;
+ __u32 pid;
+ __u32 uid;
+ __s32 fd;
+ __u32 tid;
+ __u32 band;
+ __u32 overrun;
+ __u32 trapno;
+ __s32 status;
+ __s32 svint;
+ __u64 svptr;
+ __u64 utime;
+ __u64 stime;
+ __u64 addr;
+};
+
+
+int signalfd_deliver(struct sighand_struct *sighand, int sig, struct siginfo *info);
+
+/*
+ * No need to fall inside signalfd_deliver() and get/release a spinlock,
+ * if no signal listeners are available.
+ */
+static inline int signalfd_notify(struct sighand_struct *sighand, int sig,
+ struct siginfo *info)
+{
+ if (likely(list_empty(&sighand->sfdlist)))
+ return 0;
+ return signalfd_deliver(sighand, sig, info);
+}
+
+#endif /* _LINUX_SIGNALFD_H */
+
Index: linux-2.6.20.ep2/kernel/signal.c
===================================================================
--- linux-2.6.20.ep2.orig/kernel/signal.c 2007-03-10 15:57:00.000000000 -0800
+++ linux-2.6.20.ep2/kernel/signal.c 2007-03-10 15:57:51.000000000 -0800
@@ -26,6 +26,7 @@
#include <linux/freezer.h>
#include <linux/pid_namespace.h>
#include <linux/nsproxy.h>
+#include <linux/signalfd.h>
#include <asm/param.h>
#include <asm/uaccess.h>
@@ -233,8 +234,7 @@
/* Given the mask, find the first available signal that should be serviced. */
-static int
-next_signal(struct sigpending *pending, sigset_t *mask)
+int next_signal(struct sigpending *pending, sigset_t *mask)
{
unsigned long i, *s, *m, x;
int sig = 0;
@@ -716,6 +716,11 @@
int ret = 0;
/*
+ * Deliver the signal to listening signalfds ...
+ */
+ signalfd_notify(t->sighand, sig, info);
+
+ /*
* fast-pathed signals for kernel-internal things like SIGSTOP
* or SIGKILL.
*/
@@ -1399,6 +1404,10 @@
ret = 1;
goto out;
}
+ /*
+ * Deliver the signal to listening signalfds ...
+ */
+ signalfd_notify(p->sighand, sig, &q->info);
list_add_tail(&q->list, &p->pending.list);
sigaddset(&p->pending.signal, sig);
@@ -1442,6 +1451,10 @@
q->info.si_overrun++;
goto out;
}
+ /*
+ * Deliver the signal to listening signalfds ...
+ */
+ signalfd_notify(p->sighand, sig, &q->info);
/*
* Put this signal on the shared-pending queue.
@@ -2103,6 +2116,8 @@
/*
* If you change siginfo_t structure, please be sure
* this code is fixed accordingly.
+ * Please remember to update the signalfd_copyinfo() function
+ * inside fs/signalfd.c too, in case siginfo_t changes.
* It should never copy any pad contained in the structure
* to avoid security leaks, but must copy the generic
* 3 ints plus the relevant union member.
Index: linux-2.6.20.ep2/fs/exec.c
===================================================================
--- linux-2.6.20.ep2.orig/fs/exec.c 2007-03-10 15:57:00.000000000 -0800
+++ linux-2.6.20.ep2/fs/exec.c 2007-03-10 15:57:51.000000000 -0800
@@ -50,6 +50,7 @@
#include <linux/tsacct_kern.h>
#include <linux/cn_proc.h>
#include <linux/audit.h>
+#include <linux/signalfd.h>
#include <asm/uaccess.h>
#include <asm/mmu_context.h>
@@ -583,6 +584,17 @@
int count;
/*
+ * Tell all the sighand listeners that this sighand has
+ * been detached. Needs to be called with the sighand lock
+ * held.
+ */
+ if (unlikely(!list_empty(&oldsighand->sfdlist))) {
+ spin_lock_irq(&oldsighand->siglock);
+ signalfd_notify(oldsighand, -1, NULL);
+ spin_unlock_irq(&oldsighand->siglock);
+ }
+
+ /*
* If we don't share sighandlers, then we aren't sharing anything
* and we can just re-use it all.
*/
@@ -758,8 +770,7 @@
spin_unlock(&oldsighand->siglock);
write_unlock_irq(&tasklist_lock);
- if (atomic_dec_and_test(&oldsighand->count))
- kmem_cache_free(sighand_cachep, oldsighand);
+ __cleanup_sighand(oldsighand);
}
BUG_ON(!thread_group_leader(tsk));
Index: linux-2.6.20.ep2/kernel/exit.c
===================================================================
--- linux-2.6.20.ep2.orig/kernel/exit.c 2007-03-10 15:57:00.000000000 -0800
+++ linux-2.6.20.ep2/kernel/exit.c 2007-03-10 15:57:51.000000000 -0800
@@ -42,6 +42,7 @@
#include <linux/audit.h> /* for audit_free() */
#include <linux/resource.h>
#include <linux/blkdev.h>
+#include <linux/signalfd.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
@@ -120,6 +121,10 @@
tsk->signal = NULL;
tsk->sighand = NULL;
+ /*
+ * Notify that this sighand has been detached.
+ */
+ signalfd_notify(sighand, -1, NULL);
spin_unlock(&sighand->siglock);
rcu_read_unlock();
Index: linux-2.6.20.ep2/include/linux/signal.h
===================================================================
--- linux-2.6.20.ep2.orig/include/linux/signal.h 2007-03-10 15:57:00.000000000 -0800
+++ linux-2.6.20.ep2/include/linux/signal.h 2007-03-10 15:57:51.000000000 -0800
@@ -233,6 +233,7 @@
return sig <= _NSIG ? 1 : 0;
}
+extern int next_signal(struct sigpending *pending, sigset_t *mask);
extern int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p);
extern int __group_send_sig_info(int, struct siginfo *, struct task_struct *);
extern long do_sigpending(void __user *, unsigned long);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 2/9] signalfd/timerfd - signalfd core ...
2007-03-11 2:22 [patch 2/9] signalfd/timerfd - signalfd core Davide Libenzi
@ 2007-03-11 12:02 ` Oleg Nesterov
2007-03-11 18:14 ` Davide Libenzi
0 siblings, 1 reply; 3+ messages in thread
From: Oleg Nesterov @ 2007-03-11 12:02 UTC (permalink / raw)
To: Davide Libenzi; +Cc: Linux Kernel Mailing List, Andrew Morton, Linus Torvalds
On 03/10, Davide Libenzi wrote:
>
> +static void signalfd_put_sighand(struct signalfd_ctx *ctx,
> + struct sighand_struct *sighand,
> + unsigned long *flags)
> +{
> + unlock_task_sighand(ctx->tsk, flags);
> +}
Note that signalfd_put_sighand() doesn't need "sighand" parameter, please
see below.
> +int signalfd_deliver(struct sighand_struct *sighand, int sig,
> + struct siginfo *info)
> +{
> + int nsig = 0;
> + struct signalfd_ctx *ctx, *tmp;
> +
> + list_for_each_entry_safe(ctx, tmp, &sighand->sfdlist, lnk) {
> + /*
> + * We use a negative signal value as a way to broadcast that the
> + * sighand has been orphaned, so that we can notify all the
> + * listeners about this. Remeber the ctx->sigmask is inverted,
> + * so if the user is interested in a signal, that corresponding
> + * bit will be zero.
> + */
> + if (sig < 0)
> + list_del_init(&ctx->lnk);
I'm afraid this is not right. This should be per-thread.
Suppose we have threads T1 and T2 from the same thread group. sighand->sfdlist
contains ctx1 and ctx2 "linked" to T1 and T2. Now, T1 exits, __exit_signal()
does signalfd_notify(sighand, -1), and "unlinks" all threads, not just T1.
IOW, we should do
if (ctx->tsk == current) {
list_del_init(&ctx->lnk);
wake_up(&ctx->wqh);
}
Perhaps it makes sense to not re-use signalfd_deliver(), but introduce
a new signalfd_xxx(sighand, tsk) helper for de_thread/exit_signal.
Btw, signalfd_deliver() doesn't use "info" parameter.
> + if (sig < 0 || !sigismember(&ctx->sigmask, sig)) {
> + wake_up(&ctx->wqh);
Minor nit. Perhaps it makes sense to do
void signalfd_deliver(struct task_struct *tsk, int sig, struct sigpending *pending)
{
struct sighand_struct *sighand = tsk->sighand;
int private = (tsk->pending == pending);
list_for_each_entry_safe(ctx, tmp, &sighand->sfdlist, lnk) {
if (private && ctx->tsk != tsk)
continue;
if (!sigismember(&ctx->sigmask, sig))
wake_up(&ctx->wqh);
}
}
Even better: signalfd_deliver(struct task_struct *tsk, int sig, int private).
This way specific_send_sig_info/send_sigqueue won't do a "false" wakeup.
> +asmlinkage long sys_signalfd(int ufd, sigset_t __user *user_mask, size_t sizemask)
> +{
> ...
> + if ((sighand = signalfd_get_sighand(ctx, &flags)) != NULL) {
> + ctx->sigmask = sigmask;
> + signalfd_put_sighand(ctx, sighand, &flags);
> + }
This looks like unneeded complication to me, I'd suggest
if (signalfd_get_sighand(ctx, &flags)) {
ctx->sigmask = sigmask;
signalfd_put_sighand(ctx, flags);
}
unlock_task_sighand() (and thus signalfd_put_sighand) doesn't need "sighand"
parameter. signalfd_get_sighand() is in fact boolean. It makes sense to return
sighand, it may be useful, but this patch only needs != NULL.
Every usage of signalfd_get_sighand() could be simplified accordingly.
> --- linux-2.6.20.ep2.orig/fs/exec.c 2007-03-10 15:57:00.000000000 -0800
> +++ linux-2.6.20.ep2/fs/exec.c 2007-03-10 15:57:51.000000000 -0800
> @@ -50,6 +50,7 @@
> #include <linux/tsacct_kern.h>
> #include <linux/cn_proc.h>
> #include <linux/audit.h>
> +#include <linux/signalfd.h>
>
> #include <asm/uaccess.h>
> #include <asm/mmu_context.h>
> @@ -583,6 +584,17 @@
> int count;
>
> /*
> + * Tell all the sighand listeners that this sighand has
> + * been detached. Needs to be called with the sighand lock
> + * held.
> + */
> + if (unlikely(!list_empty(&oldsighand->sfdlist))) {
> + spin_lock_irq(&oldsighand->siglock);
> + signalfd_notify(oldsighand, -1, NULL);
> + spin_unlock_irq(&oldsighand->siglock);
> + }
Very minor nit. I'd suggest to make a new helper and put it in signalfd.h
(like signalfd_notify()). This will help CONFIG_SIGNALFD.
I still think that we should do this only for suid-exec. If application
passes a signalfd to another process with unix socket, it should know
what it does. But yes, I agree, we can change this later if needed.
(in that case the caller of the above helper should be flush_old_exec).
Oleg.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 2/9] signalfd/timerfd - signalfd core ...
2007-03-11 12:02 ` Oleg Nesterov
@ 2007-03-11 18:14 ` Davide Libenzi
0 siblings, 0 replies; 3+ messages in thread
From: Davide Libenzi @ 2007-03-11 18:14 UTC (permalink / raw)
To: Oleg Nesterov; +Cc: Linux Kernel Mailing List, Andrew Morton, Linus Torvalds
On Sun, 11 Mar 2007, Oleg Nesterov wrote:
> On 03/10, Davide Libenzi wrote:
> >
> > +static void signalfd_put_sighand(struct signalfd_ctx *ctx,
> > + struct sighand_struct *sighand,
> > + unsigned long *flags)
> > +{
> > + unlock_task_sighand(ctx->tsk, flags);
> > +}
>
> Note that signalfd_put_sighand() doesn't need "sighand" parameter, please
> see below.
I want it to return the sighand, and for simmetry I prefer the "put" to be
passed the parameter back too. Even if not used.
> > +int signalfd_deliver(struct sighand_struct *sighand, int sig,
> > + struct siginfo *info)
> > +{
> > + int nsig = 0;
> > + struct signalfd_ctx *ctx, *tmp;
> > +
> > + list_for_each_entry_safe(ctx, tmp, &sighand->sfdlist, lnk) {
> > + /*
> > + * We use a negative signal value as a way to broadcast that the
> > + * sighand has been orphaned, so that we can notify all the
> > + * listeners about this. Remeber the ctx->sigmask is inverted,
> > + * so if the user is interested in a signal, that corresponding
> > + * bit will be zero.
> > + */
> > + if (sig < 0)
> > + list_del_init(&ctx->lnk);
>
> I'm afraid this is not right. This should be per-thread.
>
> Suppose we have threads T1 and T2 from the same thread group. sighand->sfdlist
> contains ctx1 and ctx2 "linked" to T1 and T2. Now, T1 exits, __exit_signal()
> does signalfd_notify(sighand, -1), and "unlinks" all threads, not just T1.
>
> IOW, we should do
>
> if (ctx->tsk == current) {
> list_del_init(&ctx->lnk);
> wake_up(&ctx->wqh);
> }
Yes, of course. Dunno why the change got lost.
> Perhaps it makes sense to not re-use signalfd_deliver(), but introduce
> a new signalfd_xxx(sighand, tsk) helper for de_thread/exit_signal.
>
> Btw, signalfd_deliver() doesn't use "info" parameter.
>
> > + if (sig < 0 || !sigismember(&ctx->sigmask, sig)) {
> > + wake_up(&ctx->wqh);
>
> Minor nit. Perhaps it makes sense to do
>
> void signalfd_deliver(struct task_struct *tsk, int sig, struct sigpending *pending)
> {
> struct sighand_struct *sighand = tsk->sighand;
> int private = (tsk->pending == pending);
>
> list_for_each_entry_safe(ctx, tmp, &sighand->sfdlist, lnk) {
> if (private && ctx->tsk != tsk)
> continue;
> if (!sigismember(&ctx->sigmask, sig))
> wake_up(&ctx->wqh);
> }
> }
>
> Even better: signalfd_deliver(struct task_struct *tsk, int sig, int private).
> This way specific_send_sig_info/send_sigqueue won't do a "false" wakeup.
I agree in the latter.
> > +asmlinkage long sys_signalfd(int ufd, sigset_t __user *user_mask, size_t sizemask)
> > +{
> > ...
> > + if ((sighand = signalfd_get_sighand(ctx, &flags)) != NULL) {
> > + ctx->sigmask = sigmask;
> > + signalfd_put_sighand(ctx, sighand, &flags);
> > + }
>
> This looks like unneeded complication to me, I'd suggest
>
> if (signalfd_get_sighand(ctx, &flags)) {
> ctx->sigmask = sigmask;
> signalfd_put_sighand(ctx, flags);
> }
>
> unlock_task_sighand() (and thus signalfd_put_sighand) doesn't need "sighand"
> parameter. signalfd_get_sighand() is in fact boolean. It makes sense to return
> sighand, it may be useful, but this patch only needs != NULL.
>
> Every usage of signalfd_get_sighand() could be simplified accordingly.
As I said before, I prefer that way.
> > + * Tell all the sighand listeners that this sighand has
> > + * been detached. Needs to be called with the sighand lock
> > + * held.
> > + */
> > + if (unlikely(!list_empty(&oldsighand->sfdlist))) {
> > + spin_lock_irq(&oldsighand->siglock);
> > + signalfd_notify(oldsighand, -1, NULL);
> > + spin_unlock_irq(&oldsighand->siglock);
> > + }
>
> Very minor nit. I'd suggest to make a new helper and put it in signalfd.h
> (like signalfd_notify()). This will help CONFIG_SIGNALFD.
Yes, makes sense.
- Davide
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-03-11 18:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-03-11 2:22 [patch 2/9] signalfd/timerfd - signalfd core Davide Libenzi
2007-03-11 12:02 ` Oleg Nesterov
2007-03-11 18:14 ` Davide Libenzi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®