The patch titled
signals: move handle_stop_signal() into send_signal()
has been removed from the -mm tree. Its filename was
signals-move-handle_stop_signal-into-send_signal.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: signals: move handle_stop_signal() into send_signal()
From: Oleg Nesterov <oleg@xxxxxxxxxx>
Move handle_stop_signal() into send_signal(). This factors out a couple of
callsites and allows us to do further unifications.
Also, with this change specific_send_sig_info() does handle_stop_signal().
Not that this is really important, we never send STOP/CONT via send_sig() and
friends, but still this looks more consistent.
The only (afaics) special case is get_signal_to_deliver(). If the traced task
dequeues SIGCONT, it can re-send it to itself after ptrace_stop() if the
signal was blocked by debugger. In that case handle_stop_signal() is
unnecessary, but hopefully not a problem.
Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Cc: Roland McGrath <roland@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/signal.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff -puN kernel/signal.c~signals-move-handle_stop_signal-into-send_signal kernel/signal.c
--- a/kernel/signal.c~signals-move-handle_stop_signal-into-send_signal
+++ a/kernel/signal.c
@@ -660,8 +660,10 @@ static inline int legacy_queue(struct si
static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
struct sigpending *signals)
{
- struct sigqueue * q = NULL;
+ struct sigqueue *q;
+ assert_spin_locked(&t->sighand->siglock);
+ handle_stop_signal(sig, t);
/*
* Short-circuit ignored signals and support queuing
* exactly one non-rt signal, so that we can get more
@@ -766,9 +768,6 @@ specific_send_sig_info(int sig, struct s
{
int ret;
- BUG_ON(!irqs_disabled());
- assert_spin_locked(&t->sighand->siglock);
-
ret = send_signal(sig, info, t, &t->pending);
if (ret <= 0)
return ret;
@@ -923,9 +922,6 @@ __group_send_sig_info(int sig, struct si
{
int ret;
- assert_spin_locked(&p->sighand->siglock);
- handle_stop_signal(sig, p);
-
/*
* Put this signal on the shared-pending queue, or fail with EAGAIN.
* We always use the shared queue for process-wide signals,
@@ -2241,7 +2237,6 @@ static int do_tkill(int tgid, int pid, i
*/
if (!error && sig && p->sighand) {
spin_lock_irq(&p->sighand->siglock);
- handle_stop_signal(sig, p);
error = specific_send_sig_info(sig, &info, p);
spin_unlock_irq(&p->sighand->siglock);
}
_
Patches currently in -mm which might be from oleg@xxxxxxxxxx are
origin.patch
posix-timers-bug-10460-discard-the-pending-signal-when-the-timer-is-destroyed.patch
workqueue-remove-redundant-function-invocation.patch
put_pid-make-sure-we-dont-free-the-live-pid.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
