From: Tejun Heo <tj@kernel.org>
To: roland@redhat.com, oleg@redhat.com, linux-kernel@vger.kernel.org,
torvalds@linux-foundation.org, akpm@linux-foundation.org,
"rjw@sisk.plpavel"@ucw.cz
Cc: Tejun Heo <tj@kernel.org>
Subject: [PATCH 07/14] ptrace: add @why to ptrace_stop()
Date: Fri, 26 Nov 2010 11:49:22 +0100 [thread overview]
Message-ID: <1290768569-16224-8-git-send-email-tj@kernel.org> (raw)
In-Reply-To: <1290768569-16224-1-git-send-email-tj@kernel.org>
To prepare for cleanup of the interaction between group stop and
ptrace, add @why to ptrace_stop(). Existing users are updateda such
that there is no behavior change.
Signed-off-by: Tejun Heo <tj@kernel.org>
---
kernel/signal.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/signal.c b/kernel/signal.c
index b859690..3b3e69c 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1633,7 +1633,7 @@ static int sigkill_pending(struct task_struct *tsk)
* If we actually decide not to stop at all because the tracer
* is gone, we keep current->exit_code unless clear_code.
*/
-static void ptrace_stop(int exit_code, int clear_code, siginfo_t *info)
+static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
__releases(¤t->sighand->siglock)
__acquires(¤t->sighand->siglock)
{
@@ -1671,7 +1671,7 @@ static void ptrace_stop(int exit_code, int clear_code, siginfo_t *info)
spin_unlock_irq(¤t->sighand->siglock);
read_lock(&tasklist_lock);
if (may_ptrace_stop()) {
- do_notify_parent_cldstop(current, CLD_TRAPPED);
+ do_notify_parent_cldstop(current, why);
/*
* Don't want to allow preemption here, because
* sys_ptrace() needs this task to be inactive.
@@ -1730,7 +1730,7 @@ void ptrace_notify(int exit_code)
/* Let the debugger run. */
spin_lock_irq(¤t->sighand->siglock);
- ptrace_stop(exit_code, 1, &info);
+ ptrace_stop(exit_code, CLD_TRAPPED, 1, &info);
spin_unlock_irq(¤t->sighand->siglock);
}
@@ -1826,7 +1826,7 @@ static int ptrace_signal(int signr, siginfo_t *info,
ptrace_signal_deliver(regs, cookie);
/* Let the debugger run. */
- ptrace_stop(signr, 0, info);
+ ptrace_stop(signr, CLD_TRAPPED, 0, info);
/* We're back. Did the debugger cancel the sig? */
signr = current->exit_code;
--
1.7.1
next prev parent reply other threads:[~2010-11-26 10:51 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-26 10:49 [PATCHSET RFC] ptrace,signal: sane interaction between ptrace and job control signals Tejun Heo
2010-11-26 10:49 ` [PATCH 01/14] signal: fix SIGCONT notification code Tejun Heo
2010-11-26 13:49 ` Oleg Nesterov
2010-12-01 1:43 ` Roland McGrath
2010-11-26 10:49 ` [PATCH 02/14] freezer: fix a race during freezing of TASK_STOPPED tasks Tejun Heo
2010-11-26 19:40 ` Rafael J. Wysocki
2010-11-26 19:59 ` Tejun Heo
2010-11-26 10:49 ` [PATCH 03/14] freezer: remove superflous try_to_freeze() loop in do_signal_stop() Tejun Heo
2010-11-26 19:42 ` Rafael J. Wysocki
2010-11-26 10:49 ` [PATCH 04/14] signal: don't notify parent if not stopping after tracehook_notify_jctl() " Tejun Heo
2010-11-26 14:46 ` Oleg Nesterov
2010-11-26 15:04 ` Tejun Heo
2010-11-26 10:49 ` [PATCH 05/14] signal: fix premature completion of group stop when interfered by ptrace Tejun Heo
2010-11-26 15:40 ` Oleg Nesterov
2010-11-26 16:03 ` Tejun Heo
2010-11-26 10:49 ` [PATCH 06/14] signal: use GROUP_STOP_PENDING to avoid stopping multiple times for a single group stop Tejun Heo
2010-11-26 17:59 ` Oleg Nesterov
2010-11-26 18:39 ` Tejun Heo
2010-11-27 11:40 ` [PATCH UPDATED " Tejun Heo
2010-11-28 19:07 ` Oleg Nesterov
2010-11-29 13:38 ` Tejun Heo
2010-11-26 10:49 ` Tejun Heo [this message]
2010-11-26 10:49 ` [PATCH 08/14] ptrace: make do_signal_stop() use ptrace_stop() if the task is being ptraced Tejun Heo
2010-11-28 19:54 ` Oleg Nesterov
2010-11-28 20:22 ` Jan Kratochvil
2010-11-28 20:53 ` Oleg Nesterov
2010-11-26 10:49 ` [PATCH 09/14] ptrace: clean transitions between TASK_STOPPED and TRACED Tejun Heo
2010-11-28 20:25 ` Oleg Nesterov
2010-11-28 20:51 ` Jan Kratochvil
2010-11-29 13:48 ` Tejun Heo
2010-11-26 10:49 ` [PATCH 10/14] ptrace: don't consume group count from ptrace_stop() Tejun Heo
2010-11-26 10:49 ` [PATCH 11/14] ptrace: make group stop notification reliable against ptrace Tejun Heo
2010-11-28 20:30 ` Oleg Nesterov
2010-11-29 13:52 ` Tejun Heo
2010-11-26 10:49 ` [PATCH 12/14] ptrace: reorganize __ptrace_unlink() and ptrace_untrace() Tejun Heo
2010-11-26 10:49 ` [PATCH 13/14] ptrace: make SIGCONT notification reliable against ptrace Tejun Heo
2010-11-26 10:49 ` [PATCH 14/14] ptrace: remove the extra wake_up_process() from ptrace_detach() Tejun Heo
2010-11-28 20:44 ` Oleg Nesterov
2010-11-29 13:55 ` Tejun Heo
2010-11-26 10:55 ` [PATCHSET RFC] ptrace,signal: sane interaction between ptrace and job control signals Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1290768569-16224-8-git-send-email-tj@kernel.org \
--to=tj@kernel.org \
--cc="rjw@sisk.plpavel"@ucw.cz \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=roland@redhat.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome