All of lore.kernel.org
 help / color / mirror / Atom feed
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 04/14] signal: don't notify parent if not stopping after tracehook_notify_jctl() in do_signal_stop()
Date: Fri, 26 Nov 2010 11:49:19 +0100	[thread overview]
Message-ID: <1290768569-16224-5-git-send-email-tj@kernel.org> (raw)
In-Reply-To: <1290768569-16224-1-git-send-email-tj@kernel.org>

do_signal_stop() tests sig->group_stop_count one more time after
calling tracehook_notify_jctl() as it's allowed release siglock.  If
group_stop_count has changed to zero, it no longer stops but still
notifies the parent.  For both SIGCONT and KILL which could cause the
condition, this notification is unnecessary.

SIGCONT will be notified to the parent when the task calls
get_signal_to_deliver() right after returning from do_signal_stop()
which will handle the collapsed notification correctly by itself.  The
notification from do_signal_stop() in this case would only cause
duplication.  For SIGKILL, the imminent death of the task will be
notified to parent and it's completely superflous to report the
skipped stop.

Also, tracehook_notify_jctl() doesn't release siglock, so, currently,
none of these matters at all.

This patch updates do_signal_stop() such that it jumps out of the
function if group_stop_count has dropped during
tracehook_notify_jctl().

This doesn't cause any behavior difference as the condition never
triggers in the current code.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
---
 kernel/signal.c |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/kernel/signal.c b/kernel/signal.c
index 0a6816a..6f7407d 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1763,15 +1763,20 @@ static int do_signal_stop(int signr)
 	notify = tracehook_notify_jctl(notify, CLD_STOPPED);
 	/*
 	 * tracehook_notify_jctl() can drop and reacquire siglock, so
-	 * we keep ->group_stop_count != 0 before the call. If SIGCONT
-	 * or SIGKILL comes in between ->group_stop_count == 0.
+	 * we test ->group_stop_count again.  If SIGCONT or SIGKILL
+	 * comes in between, ->group_stop_count == 0.
 	 */
-	if (sig->group_stop_count) {
-		if (!--sig->group_stop_count)
-			sig->flags = SIGNAL_STOP_STOPPED;
-		current->exit_code = sig->group_exit_code;
-		__set_current_state(TASK_STOPPED);
+	if (!sig->group_stop_count) {
+		spin_unlock_irq(&current->sighand->siglock);
+		goto out;
 	}
+
+	if (!--sig->group_stop_count)
+		sig->flags = SIGNAL_STOP_STOPPED;
+
+	current->exit_code = sig->group_exit_code;
+	__set_current_state(TASK_STOPPED);
+
 	spin_unlock_irq(&current->sighand->siglock);
 
 	if (notify) {
@@ -1782,7 +1787,7 @@ static int do_signal_stop(int signr)
 
 	/* Now we don't run again until woken by SIGCONT or SIGKILL */
 	schedule();
-
+out:
 	tracehook_finish_jctl();
 	current->exit_code = 0;
 
-- 
1.7.1


  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 ` Tejun Heo [this message]
2010-11-26 14:46   ` [PATCH 04/14] signal: don't notify parent if not stopping after tracehook_notify_jctl() " 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 ` [PATCH 07/14] ptrace: add @why to ptrace_stop() Tejun Heo
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-5-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.