From: Oleg Nesterov <oleg@redhat.com>
To: Tejun Heo <tj@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: "Nikita V. Youshchenko" <nyoushchenko@mvista.com>,
Matt Fleming <matt@console-pimps.org>,
Thomas Gleixner <tglx@linutronix.de>,
linux-kernel@vger.kernel.org
Subject: [PATCH 5/6] x86: signal: handle_signal() should use sigprocmask()
Date: Mon, 11 Apr 2011 19:22:01 +0200 [thread overview]
Message-ID: <20110411172201.GF32469@redhat.com> (raw)
In-Reply-To: <20110411171957.GA32469@redhat.com>
This is ugly, but if sigprocmask() needs retarget_shared_pending() then
handle signal should follow this logic. In theory it is newer correct to
add the new signals to current->blocked, the signal handler can sleep/etc
so we should notify other threads in case we block the pending signal and
nobody else has TIF_SIGPENDING.
Of course, this change doesn't make signals faster :/
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
arch/x86/kernel/signal.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
--- sigprocmask/arch/x86/kernel/signal.c~5_handle_signal 2011-04-06 21:33:43.000000000 +0200
+++ sigprocmask/arch/x86/kernel/signal.c 2011-04-11 18:33:17.000000000 +0200
@@ -682,6 +682,7 @@ static int
handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
sigset_t *oldset, struct pt_regs *regs)
{
+ sigset_t blocked;
int ret;
/* Are we from a system call? */
@@ -741,12 +742,10 @@ handle_signal(unsigned long sig, siginfo
*/
regs->flags &= ~X86_EFLAGS_TF;
- spin_lock_irq(¤t->sighand->siglock);
- sigorsets(¤t->blocked, ¤t->blocked, &ka->sa.sa_mask);
+ blocked = ka->sa.sa_mask;
if (!(ka->sa.sa_flags & SA_NODEFER))
- sigaddset(¤t->blocked, sig);
- recalc_sigpending();
- spin_unlock_irq(¤t->sighand->siglock);
+ sigaddset(&blocked, sig);
+ sigprocmask(SIG_BLOCK, &blocked, NULL);
tracehook_signal_handler(sig, info, ka, regs,
test_thread_flag(TIF_SINGLESTEP));
next prev parent reply other threads:[~2011-04-11 17:22 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-11 17:19 [RFC PATCH 0/6] signal: sigprocmask fixes Oleg Nesterov
2011-04-11 17:20 ` [PATCH 1/6] signal: introduce retarget_shared_pending() Oleg Nesterov
2011-04-12 11:39 ` Matt Fleming
2011-04-11 17:20 ` [PATCH 2/6] signal: retarget_shared_pending: consider shared/unblocked signals only Oleg Nesterov
2011-04-12 11:40 ` Matt Fleming
2011-04-12 19:53 ` Oleg Nesterov
2011-04-11 17:21 ` [PATCH 3/6] signal: sigprocmask: narrow the scope of ->sigloc Oleg Nesterov
2011-04-12 11:38 ` Matt Fleming
2011-04-11 17:21 ` [PATCH 4/6] signal: sigprocmask() should do retarget_shared_pending() Oleg Nesterov
2011-04-12 12:07 ` Matt Fleming
2011-04-12 14:32 ` Linus Torvalds
2011-04-14 19:36 ` Oleg Nesterov
2011-04-12 18:33 ` Tejun Heo
2011-04-14 20:10 ` Oleg Nesterov
2011-04-14 20:33 ` Linus Torvalds
2011-04-11 17:22 ` Oleg Nesterov [this message]
2011-04-12 12:15 ` [PATCH 5/6] x86: signal: handle_signal() should use sigprocmask() Matt Fleming
2011-04-11 17:22 ` [PATCH 6/6] x86: signal: sys_rt_sigreturn() " Oleg Nesterov
2011-04-12 12:17 ` Matt Fleming
2011-04-14 20:15 ` Oleg Nesterov
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=20110411172201.GF32469@redhat.com \
--to=oleg@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@console-pimps.org \
--cc=nyoushchenko@mvista.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).