From: Andi Kleen <andi@firstfloor.org>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, eric.dumazet@gmail.com,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 3/4] posix-timers: Don't disable interrupts in idr_lock
Date: Mon, 29 Aug 2011 16:39:16 -0700 [thread overview]
Message-ID: <1314661157-22173-3-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1314661157-22173-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
idr_lock is only used for modifying a timer and never used from
interrupts, only from process context. So don't disable interrupts
while taking that lock.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
kernel/posix-timers.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index ef6721c..320659d 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -503,10 +503,9 @@ static void release_posix_timer(struct k_itimer *tmr, int it_id_set)
{
if (it_id_set) {
struct signal_struct *s = current->signal;
- unsigned long flags;
- spin_lock_irqsave(&s->idr_lock, flags);
+ spin_lock(&s->idr_lock);
idr_remove(&s->posix_timers_id, tmr->it_id);
- spin_unlock_irqrestore(&s->idr_lock, flags);
+ spin_unlock(&s->idr_lock);
}
put_pid(tmr->it_pid);
sigqueue_free(tmr->sigq);
@@ -558,9 +557,9 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
error = -EAGAIN;
goto out;
}
- spin_lock_irq(&s->idr_lock);
+ spin_lock(&s->idr_lock);
error = idr_get_new(&s->posix_timers_id, new_timer, &new_timer_id);
- spin_unlock_irq(&s->idr_lock);
+ spin_unlock(&s->idr_lock);
if (error) {
if (error == -EAGAIN)
goto retry;
--
1.7.4.4
next prev parent reply other threads:[~2011-08-29 23:39 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-29 23:39 [PATCH 1/4] posix-timers: move global timer id management to signal_struct v2 Andi Kleen
2011-08-29 23:39 ` [PATCH 2/4] posix-timers: limit the number of posix timers per process Andi Kleen
2011-08-30 21:44 ` Andrew Morton
2011-08-30 22:06 ` Andi Kleen
2011-08-30 22:22 ` Andrew Morton
2011-08-30 22:47 ` Andi Kleen
2011-08-30 23:02 ` Andrew Morton
2011-08-31 6:45 ` Jiri Slaby
2011-09-02 9:30 ` Thomas Gleixner
2011-08-29 23:39 ` Andi Kleen [this message]
2011-08-29 23:39 ` [PATCH 4/4] posix-timers: turn it_signal into it_valid flag Andi Kleen
2011-09-02 10:06 ` Thomas Gleixner
2011-09-02 11:49 ` Eric Dumazet
2011-09-02 14:19 ` Thomas Gleixner
2011-09-04 16:56 ` Oleg Nesterov
2011-09-04 19:07 ` Andi Kleen
2011-09-04 20:29 ` Oleg Nesterov
2011-09-06 3:14 ` Andi Kleen
2011-09-06 14:51 ` Oleg Nesterov
2011-09-06 15:39 ` Eric Dumazet
2011-09-06 16:27 ` Oleg Nesterov
2011-09-06 18:47 ` Thomas Gleixner
2011-09-06 18:49 ` Oleg Nesterov
2011-09-06 19:16 ` Thomas Gleixner
2011-09-06 19:26 ` Oleg Nesterov
2011-09-06 19:45 ` Thomas Gleixner
2011-09-06 22:08 ` Oleg Nesterov
2011-09-06 22:34 ` Thomas Gleixner
2011-09-21 16:46 ` Thomas Gleixner
2011-09-21 17:56 ` Thomas Gleixner
2011-09-22 11:19 ` Thomas Gleixner
2011-09-06 19:30 ` Eric Dumazet
2011-09-06 20:10 ` Thomas Gleixner
2011-09-06 20:27 ` Eric Dumazet
2011-09-06 19:04 ` Eric Dumazet
2011-08-31 8:53 ` [PATCH 1/4] posix-timers: move global timer id management to signal_struct v2 Eric Dumazet
2011-08-31 16:57 ` Andi Kleen
2011-09-02 9:19 ` Thomas Gleixner
2011-09-02 10:05 ` Eric Dumazet
2011-09-19 21:46 ` Andi Kleen
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=1314661157-22173-3-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=eric.dumazet@gmail.com \
--cc=linux-kernel@vger.kernel.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).