Commit 2ca3515a authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

signals: change send_signal/do_send_sigqueue to take "boolean group" parameter

send_signal() is used either with ->pending or with ->signal->shared_pending.
Change it to take "int group" instead, this argument will be re-used later.
Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 71f11dc0
...@@ -754,18 +754,21 @@ static inline int legacy_queue(struct sigpending *signals, int sig) ...@@ -754,18 +754,21 @@ static inline int legacy_queue(struct sigpending *signals, int sig)
} }
static int send_signal(int sig, struct siginfo *info, struct task_struct *t, static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
struct sigpending *signals) int group)
{ {
struct sigpending *pending;
struct sigqueue *q; struct sigqueue *q;
assert_spin_locked(&t->sighand->siglock); assert_spin_locked(&t->sighand->siglock);
handle_stop_signal(sig, t); handle_stop_signal(sig, t);
pending = group ? &t->signal->shared_pending : &t->pending;
/* /*
* Short-circuit ignored signals and support queuing * Short-circuit ignored signals and support queuing
* exactly one non-rt signal, so that we can get more * exactly one non-rt signal, so that we can get more
* detailed information about the cause of the signal. * detailed information about the cause of the signal.
*/ */
if (sig_ignored(t, sig) || legacy_queue(signals, sig)) if (sig_ignored(t, sig) || legacy_queue(pending, sig))
return 0; return 0;
/* /*
...@@ -793,7 +796,7 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t, ...@@ -793,7 +796,7 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
(is_si_special(info) || (is_si_special(info) ||
info->si_code >= 0))); info->si_code >= 0)));
if (q) { if (q) {
list_add_tail(&q->list, &signals->list); list_add_tail(&q->list, &pending->list);
switch ((unsigned long) info) { switch ((unsigned long) info) {
case (unsigned long) SEND_SIG_NOINFO: case (unsigned long) SEND_SIG_NOINFO:
q->info.si_signo = sig; q->info.si_signo = sig;
...@@ -823,7 +826,7 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t, ...@@ -823,7 +826,7 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
} }
out_set: out_set:
sigaddset(&signals->signal, sig); sigaddset(&pending->signal, sig);
return 1; return 1;
} }
...@@ -864,7 +867,7 @@ specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) ...@@ -864,7 +867,7 @@ specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
{ {
int ret; int ret;
ret = send_signal(sig, info, t, &t->pending); ret = send_signal(sig, info, t, 0);
if (ret <= 0) if (ret <= 0)
return ret; return ret;
...@@ -923,7 +926,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p) ...@@ -923,7 +926,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
* We always use the shared queue for process-wide signals, * We always use the shared queue for process-wide signals,
* to avoid several races. * to avoid several races.
*/ */
ret = send_signal(sig, info, p, &p->signal->shared_pending); ret = send_signal(sig, info, p, 1);
if (ret <= 0) if (ret <= 0)
return ret; return ret;
...@@ -1258,8 +1261,10 @@ void sigqueue_free(struct sigqueue *q) ...@@ -1258,8 +1261,10 @@ void sigqueue_free(struct sigqueue *q)
} }
static int do_send_sigqueue(int sig, struct sigqueue *q, struct task_struct *t, static int do_send_sigqueue(int sig, struct sigqueue *q, struct task_struct *t,
struct sigpending *pending) int group)
{ {
struct sigpending *pending;
handle_stop_signal(sig, t); handle_stop_signal(sig, t);
if (unlikely(!list_empty(&q->list))) { if (unlikely(!list_empty(&q->list))) {
...@@ -1277,8 +1282,10 @@ static int do_send_sigqueue(int sig, struct sigqueue *q, struct task_struct *t, ...@@ -1277,8 +1282,10 @@ static int do_send_sigqueue(int sig, struct sigqueue *q, struct task_struct *t,
return 1; return 1;
signalfd_notify(t, sig); signalfd_notify(t, sig);
pending = group ? &t->signal->shared_pending : &t->pending;
list_add_tail(&q->list, &pending->list); list_add_tail(&q->list, &pending->list);
sigaddset(&pending->signal, sig); sigaddset(&pending->signal, sig);
return 0; return 0;
} }
...@@ -1300,7 +1307,7 @@ int send_sigqueue(int sig, struct sigqueue *q, struct task_struct *p) ...@@ -1300,7 +1307,7 @@ int send_sigqueue(int sig, struct sigqueue *q, struct task_struct *p)
if (!likely(lock_task_sighand(p, &flags))) if (!likely(lock_task_sighand(p, &flags)))
goto out_err; goto out_err;
ret = do_send_sigqueue(sig, q, p, &p->pending); ret = do_send_sigqueue(sig, q, p, 0);
if (!sigismember(&p->blocked, sig)) if (!sigismember(&p->blocked, sig))
signal_wake_up(p, sig == SIGKILL); signal_wake_up(p, sig == SIGKILL);
...@@ -1321,7 +1328,7 @@ send_group_sigqueue(int sig, struct sigqueue *q, struct task_struct *p) ...@@ -1321,7 +1328,7 @@ send_group_sigqueue(int sig, struct sigqueue *q, struct task_struct *p)
/* Since it_lock is held, p->sighand cannot be NULL. */ /* Since it_lock is held, p->sighand cannot be NULL. */
spin_lock_irqsave(&p->sighand->siglock, flags); spin_lock_irqsave(&p->sighand->siglock, flags);
ret = do_send_sigqueue(sig, q, p, &p->signal->shared_pending); ret = do_send_sigqueue(sig, q, p, 1);
__group_complete_signal(sig, p); __group_complete_signal(sig, p);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment