leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uprobes: uprobes_treelock should not disable irqs

Browse Source 
Nobody plays with uprobes_tree/uprobes_treelock in interrupt context,
no need to disable irqs.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
This commit is contained in:
Oleg Nesterov 2012-08-18 17:01:57 +02:00
parent 6d1d8dfa8b
commit 6f47caa0e1
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kernel/events/uprobes.c
View File

@ -411,11 +411,10 @@ static struct uprobe *__find_uprobe(struct inode *inode, loff_t offset)
static struct uprobe *find_uprobe(struct inode *inode, loff_t offset) static struct uprobe *find_uprobe(struct inode *inode, loff_t offset)
{ {
struct uprobe *uprobe; struct uprobe *uprobe;
unsigned long flags;
spin_lock_irqsave(&uprobes_treelock, flags); spin_lock(&uprobes_treelock);
uprobe = __find_uprobe(inode, offset); uprobe = __find_uprobe(inode, offset);
spin_unlock_irqrestore(&uprobes_treelock, flags); spin_unlock(&uprobes_treelock);
return uprobe; return uprobe;
} }
@ -462,12 +461,11 @@ static struct uprobe *__insert_uprobe(struct uprobe *uprobe)
*/ */
static struct uprobe *insert_uprobe(struct uprobe *uprobe) static struct uprobe *insert_uprobe(struct uprobe *uprobe)
{ {
unsigned long flags;
struct uprobe *u; struct uprobe *u;
spin_lock_irqsave(&uprobes_treelock, flags); spin_lock(&uprobes_treelock);
u = __insert_uprobe(uprobe); u = __insert_uprobe(uprobe);
spin_unlock_irqrestore(&uprobes_treelock, flags); spin_unlock(&uprobes_treelock);
/* For now assume that the instruction need not be single-stepped */ /* For now assume that the instruction need not be single-stepped */
uprobe->flags |= UPROBE_SKIP_SSTEP; uprobe->flags |= UPROBE_SKIP_SSTEP;
@ -705,11 +703,9 @@ remove_breakpoint(struct uprobe *uprobe, struct mm_struct *mm, unsigned long vad
*/ */
static void delete_uprobe(struct uprobe *uprobe) static void delete_uprobe(struct uprobe *uprobe)
{ {
unsigned long flags; spin_lock(&uprobes_treelock);
spin_lock_irqsave(&uprobes_treelock, flags);
rb_erase(&uprobe->rb_node, &uprobes_tree); rb_erase(&uprobe->rb_node, &uprobes_tree);
spin_unlock_irqrestore(&uprobes_treelock, flags); spin_unlock(&uprobes_treelock);
iput(uprobe->inode); iput(uprobe->inode);
put_uprobe(uprobe); put_uprobe(uprobe);
atomic_dec(&uprobe_events); atomic_dec(&uprobe_events);
@ -968,7 +964,6 @@ static void build_probe_list(struct inode *inode,
struct list_head *head) struct list_head *head)
{ {
loff_t min, max; loff_t min, max;
unsigned long flags;
struct rb_node *n, *t; struct rb_node *n, *t;
struct uprobe *u; struct uprobe *u;
@ -976,7 +971,7 @@ static void build_probe_list(struct inode *inode,
min = vaddr_to_offset(vma, start); min = vaddr_to_offset(vma, start);
max = min + (end - start) - 1; max = min + (end - start) - 1;
spin_lock_irqsave(&uprobes_treelock, flags); spin_lock(&uprobes_treelock);
n = find_node_in_range(inode, min, max); n = find_node_in_range(inode, min, max);
if (n) { if (n) {
for (t = n; t; t = rb_prev(t)) { for (t = n; t; t = rb_prev(t)) {
@ -994,7 +989,7 @@ static void build_probe_list(struct inode *inode,
atomic_inc(&u->ref); atomic_inc(&u->ref);
} }
} }
spin_unlock_irqrestore(&uprobes_treelock, flags); spin_unlock(&uprobes_treelock);
} }
/* /*