| From 43a32d239e6e03df54ce14f52b7251ba0b402643 Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Fri, 3 Jul 2009 08:44:56 -0500 |
| Subject: [PATCH] signals: allow rt tasks to cache one sigqueue struct |
| |
| commit b55d97259bc176907fd531b805b6cc591c0d38a3 in tip. |
| |
| To avoid allocation allow rt tasks to cache on sigqueue struct. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/include/linux/sched.h b/include/linux/sched.h |
| index 87a1484..9636af8 100644 |
| --- a/include/linux/sched.h |
| +++ b/include/linux/sched.h |
| @@ -1331,6 +1331,7 @@ struct task_struct { |
| /* signal handlers */ |
| struct signal_struct *signal; |
| struct sighand_struct *sighand; |
| + struct sigqueue *sigqueue_cache; |
| |
| sigset_t blocked, real_blocked; |
| sigset_t saved_sigmask; /* restored if set_restore_sigmask() was used */ |
| diff --git a/include/linux/signal.h b/include/linux/signal.h |
| index ab9272c..0518172 100644 |
| --- a/include/linux/signal.h |
| +++ b/include/linux/signal.h |
| @@ -225,6 +225,7 @@ static inline void init_sigpending(struct sigpending *sig) |
| } |
| |
| extern void flush_sigqueue(struct sigpending *queue); |
| +extern void flush_task_sigqueue(struct task_struct *tsk); |
| |
| /* Test if 'sig' is valid signal. Use this instead of testing _NSIG directly */ |
| static inline int valid_signal(unsigned long sig) |
| diff --git a/kernel/exit.c b/kernel/exit.c |
| index ce1e48c..a84fbb1 100644 |
| --- a/kernel/exit.c |
| +++ b/kernel/exit.c |
| @@ -133,7 +133,7 @@ static void __exit_signal(struct task_struct *tsk) |
| * Do this under ->siglock, we can race with another thread |
| * doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals. |
| */ |
| - flush_sigqueue(&tsk->pending); |
| + flush_task_sigqueue(tsk); |
| |
| tsk->signal = NULL; |
| tsk->sighand = NULL; |
| diff --git a/kernel/fork.c b/kernel/fork.c |
| index 7415ab0..7f4e5eb 100644 |
| --- a/kernel/fork.c |
| +++ b/kernel/fork.c |
| @@ -1071,6 +1071,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, |
| spin_lock_init(&p->alloc_lock); |
| |
| init_sigpending(&p->pending); |
| + p->sigqueue_cache = NULL; |
| |
| p->utime = cputime_zero; |
| p->stime = cputime_zero; |
| diff --git a/kernel/signal.c b/kernel/signal.c |
| index 1f90b68..9ecee0f 100644 |
| --- a/kernel/signal.c |
| +++ b/kernel/signal.c |
| @@ -223,13 +223,47 @@ static inline void print_dropped_signal(int sig) |
| current->comm, current->pid, sig); |
| } |
| |
| +#ifdef __HAVE_ARCH_CMPXCHG |
| +static inline struct sigqueue *get_task_cache(struct task_struct *t) |
| +{ |
| + struct sigqueue *q = t->sigqueue_cache; |
| + |
| + if (cmpxchg(&t->sigqueue_cache, q, NULL) != q) |
| + return NULL; |
| + |
| + return q; |
| +} |
| + |
| +static inline int put_task_cache(struct task_struct *t, struct sigqueue *q) |
| +{ |
| + if (cmpxchg(&t->sigqueue_cache, NULL, q) == NULL) |
| + return 0; |
| + |
| + return 1; |
| +} |
| + |
| +#else |
| + |
| +static inline struct sigqueue *get_task_cache(struct task_struct *t) |
| +{ |
| + return NULL; |
| +} |
| + |
| +static inline int put_task_cache(struct task_struct *t, struct sigqueue *q) |
| +{ |
| + return 1; |
| +} |
| + |
| +#endif |
| + |
| /* |
| * allocate a new signal queue record |
| * - this may be called without locks if and only if t == current, otherwise an |
| * appopriate lock must be held to stop the target task from exiting |
| */ |
| static struct sigqueue * |
| -__sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimit) |
| +__sigqueue_do_alloc(int sig, struct task_struct *t, gfp_t flags, |
| + int override_rlimit, int fromslab) |
| { |
| struct sigqueue *q = NULL; |
| struct user_struct *user; |
| @@ -246,7 +280,10 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi |
| if (override_rlimit || |
| atomic_read(&user->sigpending) <= |
| task_rlimit(t, RLIMIT_SIGPENDING)) { |
| - q = kmem_cache_alloc(sigqueue_cachep, flags); |
| + if (!fromslab) |
| + q = get_task_cache(t); |
| + if (!q) |
| + q = kmem_cache_alloc(sigqueue_cachep, flags); |
| } else { |
| print_dropped_signal(sig); |
| } |
| @@ -263,6 +300,13 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi |
| return q; |
| } |
| |
| +static struct sigqueue * |
| +__sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, |
| + int override_rlimit) |
| +{ |
| + return __sigqueue_do_alloc(sig, t, flags, override_rlimit, 0); |
| +} |
| + |
| static void __sigqueue_free(struct sigqueue *q) |
| { |
| if (q->flags & SIGQUEUE_PREALLOC) |
| @@ -272,6 +316,21 @@ static void __sigqueue_free(struct sigqueue *q) |
| kmem_cache_free(sigqueue_cachep, q); |
| } |
| |
| +static void sigqueue_free_current(struct sigqueue *q) |
| +{ |
| + struct user_struct *up; |
| + |
| + if (q->flags & SIGQUEUE_PREALLOC) |
| + return; |
| + |
| + up = q->user; |
| + if (rt_prio(current->normal_prio) && !put_task_cache(current, q)) { |
| + atomic_dec(&up->sigpending); |
| + free_uid(up); |
| + } else |
| + __sigqueue_free(q); |
| +} |
| + |
| void flush_sigqueue(struct sigpending *queue) |
| { |
| struct sigqueue *q; |
| @@ -285,6 +344,21 @@ void flush_sigqueue(struct sigpending *queue) |
| } |
| |
| /* |
| + * Called from __exit_signal. Flush tsk->pending and |
| + * tsk->sigqueue_cache |
| + */ |
| +void flush_task_sigqueue(struct task_struct *tsk) |
| +{ |
| + struct sigqueue *q; |
| + |
| + flush_sigqueue(&tsk->pending); |
| + |
| + q = get_task_cache(tsk); |
| + if (q) |
| + kmem_cache_free(sigqueue_cachep, q); |
| +} |
| + |
| +/* |
| * Flush all pending signals for a task. |
| */ |
| void __flush_signals(struct task_struct *t) |
| @@ -432,7 +506,7 @@ static void collect_signal(int sig, struct sigpending *list, siginfo_t *info) |
| still_pending: |
| list_del_init(&first->list); |
| copy_siginfo(info, &first->info); |
| - __sigqueue_free(first); |
| + sigqueue_free_current(first); |
| } else { |
| /* Ok, it wasn't in the queue. This must be |
| a fast-pathed signal or we must have been |
| @@ -477,6 +551,8 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info) |
| { |
| int signr; |
| |
| + WARN_ON_ONCE(tsk != current); |
| + |
| /* We only dequeue private signals from ourselves, we don't let |
| * signalfd steal them |
| */ |
| @@ -1357,7 +1433,8 @@ EXPORT_SYMBOL(kill_pid); |
| */ |
| struct sigqueue *sigqueue_alloc(void) |
| { |
| - struct sigqueue *q = __sigqueue_alloc(-1, current, GFP_KERNEL, 0); |
| + /* Preallocated sigqueue objects always from the slabcache ! */ |
| + struct sigqueue *q = __sigqueue_do_alloc(-1, current, GFP_KERNEL, 0, 1); |
| |
| if (q) |
| q->flags |= SIGQUEUE_PREALLOC; |
| -- |
| 1.7.1.1 |
| |