From: Oleg Nesterov <oleg@tv-sign.ru>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Dmitry Adamushko <dmitry.adamushko@gmail.com>,
Ingo Molnar <mingo@elte.hu>, Matthew Wilcox <matthew@wil.cx>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Roland McGrath <roland@redhat.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 0/2] ptrace && SIGKILL fixes
Date: Tue, 10 Jun 2008 20:50:51 +0400 [thread overview]
Message-ID: <20080610165051.GA6026@tv-sign.ru> (raw)
These 2 patches don't depend on each other. Each change is user visible,
and I am not really sure it can't confuse debuggers/etc. The explicit
ack/nack from maintainers is wanted.
If the first patch won't get Roland's ack, the nasty TASK_TRACED check in
signal_pending_state() should die anyway. Something like the (incomplete)
patch below.
Oleg.
--- include/linux/sched.h
+++ include/linux/sched.h
@@ -173,8 +173,8 @@ extern unsigned long long time_sync_thre
#define TASK_RUNNING 0
#define TASK_INTERRUPTIBLE 1
#define TASK_UNINTERRUPTIBLE 2
-#define __TASK_STOPPED 4
-#define __TASK_TRACED 8
+#define TASK_STOPPED 4
+#define TASK_TRACED 8
/* in tsk->exit_state */
#define EXIT_ZOMBIE 16
#define EXIT_DEAD 32
@@ -184,8 +184,6 @@ extern unsigned long long time_sync_thre
/* Convenience macros for the sake of set_task_state */
#define TASK_KILLABLE (TASK_WAKEKILL | TASK_UNINTERRUPTIBLE)
-#define TASK_STOPPED (TASK_WAKEKILL | __TASK_STOPPED)
-#define TASK_TRACED (TASK_WAKEKILL | __TASK_TRACED)
/* Convenience macros for the sake of wake_up */
#define TASK_NORMAL (TASK_INTERRUPTIBLE | TASK_UNINTERRUPTIBLE)
@@ -2034,9 +2032,6 @@ static inline int signal_pending_state(l
if (!signal_pending(p))
return 0;
- if (state & (__TASK_STOPPED | __TASK_TRACED))
- return 0;
-
return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p);
}
--- kernel/signal.c
+++ kernel/signal.c
@@ -496,7 +496,7 @@ void signal_wake_up(struct task_struct *
*/
mask = TASK_INTERRUPTIBLE;
if (resume)
- mask |= TASK_WAKEKILL;
+ mask |= (TASK_WAKEKILL | TASK_STOPPED | TASK_TRACED);
if (!wake_up_state(t, mask))
kick_process(t);
}
reply other threads:[~2008-06-10 16:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20080610165051.GA6026@tv-sign.ru \
--to=oleg@tv-sign.ru \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=dmitry.adamushko@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew@wil.cx \
--cc=mingo@elte.hu \
--cc=roland@redhat.com \
/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
all inboxes | Powered by JetHome®