diff options
author | Oleg Nesterov <oleg@redhat.com> | 2013-02-19 14:56:51 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-04 06:09:05 +0800 |
commit | 964b12560e1d50f31bc1cc0ac662d52bdbdb6f40 (patch) | |
tree | bbc317c3b1173bd9ec8ece352ad4ddd3d9933924 /kernel/signal.c | |
parent | 603b86549a4d6928d1059b19df2dfc5d61070533 (diff) | |
download | kernel_samsung_tuna-964b12560e1d50f31bc1cc0ac662d52bdbdb6f40.zip kernel_samsung_tuna-964b12560e1d50f31bc1cc0ac662d52bdbdb6f40.tar.gz kernel_samsung_tuna-964b12560e1d50f31bc1cc0ac662d52bdbdb6f40.tar.bz2 |
ptrace: introduce signal_wake_up_state() and ptrace_signal_wake_up()
Upstream commit 910ffdb18a6408e14febbb6e4b6840fd2c928c82.
Cleanup and preparation for the next change.
signal_wake_up(resume => true) is overused. None of ptrace/jctl callers
actually want to wakeup a TASK_WAKEKILL task, but they can't specify the
necessary mask.
Turn signal_wake_up() into signal_wake_up_state(state), reintroduce
signal_wake_up() as a trivial helper, and add ptrace_signal_wake_up()
which adds __TASK_TRACED.
This way ptrace_signal_wake_up() can work "inside" ptrace_request()
even if the tracee doesn't have the TASK_WAKEKILL bit set.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/signal.c')
-rw-r--r-- | kernel/signal.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 43fee1c..8b0dd5b 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -631,23 +631,17 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info) * No need to set need_resched since signal event passing * goes through ->blocked */ -void signal_wake_up(struct task_struct *t, int resume) +void signal_wake_up_state(struct task_struct *t, unsigned int state) { - unsigned int mask; - set_tsk_thread_flag(t, TIF_SIGPENDING); - /* - * For SIGKILL, we want to wake it up in the stopped/traced/killable + * TASK_WAKEKILL also means wake it up in the stopped/traced/killable * case. We don't check t->state here because there is a race with it * executing another processor and just now entering stopped state. * By using wake_up_state, we ensure the process will wake up and * handle its death signal. */ - mask = TASK_INTERRUPTIBLE; - if (resume) - mask |= TASK_WAKEKILL; - if (!wake_up_state(t, mask)) + if (!wake_up_state(t, state | TASK_INTERRUPTIBLE)) kick_process(t); } |