All of lore.kernel.org
 help / color / mirror / Atom feed
From: Oleg Nesterov <oleg@redhat.com>
To: Ingo Molnar <mingo@elte.hu>,
	Peter Zijlstra <peterz@infradead.org>,
	Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
	Jim Keniston <jkenisto@linux.vnet.ibm.com>,
	LKML <linux-kernel@vger.kernel.org>,
	Linux-mm <linux-mm@kvack.org>, Andi Kleen <andi@firstfloor.org>,
	Christoph Hellwig <hch@infradead.org>,
	Steven Rostedt <rostedt@goodmis.org>,
	Arnaldo Carvalho de Melo <acme@infradead.org>,
	Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Anton Arapov <anton@redhat.com>
Subject: [PATCH 4/6] uprobes: change register_for_each_vma() to take mm->mmap_sem for writing
Date: Fri, 6 Apr 2012 00:21:46 +0200	[thread overview]
Message-ID: <20120405222146.GD19166@redhat.com> (raw)
In-Reply-To: <20120405222024.GA19154@redhat.com>

Change register_for_each_vma() to take mm->mmap_sem for writing.
This is a bit unfortunate but hopefully not too bad, this is the
slow path anyway.

This is needed to ensure that find_active_uprobe() can not race
with uprobe_register() which adds the new bp at the same bp_vaddr,
after find_uprobe() fails and before is_swbp_at_addr_fast() checks
the memory.

IOW, this is needed to ensure that if find_active_uprobe() returns
NULL but is_swbp == true, we can safely assume that it was the
"normal" int3 and we should send SIGTRAP.
---
 kernel/events/uprobes.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 054c00f..2af458d 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -838,12 +838,12 @@ static int register_for_each_vma(struct uprobe *uprobe, bool is_register)
 		}
 
 		mm = vi->mm;
-		down_read(&mm->mmap_sem);
+		down_write(&mm->mmap_sem);
 		vma = find_vma(mm, (unsigned long)vi->vaddr);
 		if (!vma || !valid_vma(vma, is_register)) {
 			list_del(&vi->probe_list);
 			kfree(vi);
-			up_read(&mm->mmap_sem);
+			up_write(&mm->mmap_sem);
 			mmput(mm);
 			continue;
 		}
@@ -852,7 +852,7 @@ static int register_for_each_vma(struct uprobe *uprobe, bool is_register)
 						vaddr != vi->vaddr) {
 			list_del(&vi->probe_list);
 			kfree(vi);
-			up_read(&mm->mmap_sem);
+			up_write(&mm->mmap_sem);
 			mmput(mm);
 			continue;
 		}
@@ -862,7 +862,7 @@ static int register_for_each_vma(struct uprobe *uprobe, bool is_register)
 		else
 			remove_breakpoint(uprobe, mm, vi->vaddr);
 
-		up_read(&mm->mmap_sem);
+		up_write(&mm->mmap_sem);
 		mmput(mm);
 		if (is_register) {
 			if (ret && ret == -EEXIST)
-- 
1.5.5.1



WARNING: multiple messages have this Message-ID (diff)
From: Oleg Nesterov <oleg@redhat.com>
To: Ingo Molnar <mingo@elte.hu>,
	Peter Zijlstra <peterz@infradead.org>,
	Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
	Jim Keniston <jkenisto@linux.vnet.ibm.com>,
	LKML <linux-kernel@vger.kernel.org>,
	Linux-mm <linux-mm@kvack.org>, Andi Kleen <andi@firstfloor.org>,
	Christoph Hellwig <hch@infradead.org>,
	Steven Rostedt <rostedt@goodmis.org>,
	Arnaldo Carvalho de Melo <acme@infradead.org>,
	Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Anton Arapov <anton@redhat.com>
Subject: [PATCH 4/6] uprobes: change register_for_each_vma() to take mm->mmap_sem for writing
Date: Fri, 6 Apr 2012 00:21:46 +0200	[thread overview]
Message-ID: <20120405222146.GD19166@redhat.com> (raw)
In-Reply-To: <20120405222024.GA19154@redhat.com>

Change register_for_each_vma() to take mm->mmap_sem for writing.
This is a bit unfortunate but hopefully not too bad, this is the
slow path anyway.

This is needed to ensure that find_active_uprobe() can not race
with uprobe_register() which adds the new bp at the same bp_vaddr,
after find_uprobe() fails and before is_swbp_at_addr_fast() checks
the memory.

IOW, this is needed to ensure that if find_active_uprobe() returns
NULL but is_swbp == true, we can safely assume that it was the
"normal" int3 and we should send SIGTRAP.
---
 kernel/events/uprobes.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 054c00f..2af458d 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -838,12 +838,12 @@ static int register_for_each_vma(struct uprobe *uprobe, bool is_register)
 		}
 
 		mm = vi->mm;
-		down_read(&mm->mmap_sem);
+		down_write(&mm->mmap_sem);
 		vma = find_vma(mm, (unsigned long)vi->vaddr);
 		if (!vma || !valid_vma(vma, is_register)) {
 			list_del(&vi->probe_list);
 			kfree(vi);
-			up_read(&mm->mmap_sem);
+			up_write(&mm->mmap_sem);
 			mmput(mm);
 			continue;
 		}
@@ -852,7 +852,7 @@ static int register_for_each_vma(struct uprobe *uprobe, bool is_register)
 						vaddr != vi->vaddr) {
 			list_del(&vi->probe_list);
 			kfree(vi);
-			up_read(&mm->mmap_sem);
+			up_write(&mm->mmap_sem);
 			mmput(mm);
 			continue;
 		}
@@ -862,7 +862,7 @@ static int register_for_each_vma(struct uprobe *uprobe, bool is_register)
 		else
 			remove_breakpoint(uprobe, mm, vi->vaddr);
 
-		up_read(&mm->mmap_sem);
+		up_write(&mm->mmap_sem);
 		mmput(mm);
 		if (is_register) {
 			if (ret && ret == -EEXIST)
-- 
1.5.5.1


--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  parent reply	other threads:[~2012-04-05 22:22 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-05 22:20 [RFC 0/6] uprobes: kill uprobes_srcu/uprobe_srcu_id Oleg Nesterov
2012-04-05 22:20 ` Oleg Nesterov
2012-04-05 22:20 ` [PATCH 1/6] uprobes: introduce find_active_uprobe() Oleg Nesterov
2012-04-05 22:20   ` Oleg Nesterov
2012-04-05 22:21 ` [PATCH 2/6] uprobes: introduce is_swbp_at_addr_fast() Oleg Nesterov
2012-04-05 22:21   ` Oleg Nesterov
2012-04-16 10:08   ` Peter Zijlstra
2012-04-16 10:08     ` Peter Zijlstra
2012-04-16 14:44     ` Oleg Nesterov
2012-04-16 14:44       ` Oleg Nesterov
2012-04-16 14:55       ` Peter Zijlstra
2012-04-16 14:55         ` Peter Zijlstra
2012-04-16 15:34         ` Oleg Nesterov
2012-04-16 15:34           ` Oleg Nesterov
2012-04-17 10:08           ` Peter Zijlstra
2012-04-17 10:08             ` Peter Zijlstra
2012-04-17 17:09             ` Oleg Nesterov
2012-04-17 17:09               ` Oleg Nesterov
2012-04-17 19:53               ` Peter Zijlstra
2012-04-17 19:53                 ` Peter Zijlstra
2012-04-05 22:21 ` [PATCH 3/6] uprobes: teach find_active_uprobe() to provide the "is_swbp" info Oleg Nesterov
2012-04-05 22:21   ` Oleg Nesterov
2012-04-05 22:21 ` Oleg Nesterov [this message]
2012-04-05 22:21   ` [PATCH 4/6] uprobes: change register_for_each_vma() to take mm->mmap_sem for writing Oleg Nesterov
2012-04-05 22:22 ` [PATCH 5/6] uprobes: teach handle_swbp() to rely on "is_swbp" rather than uprobes_srcu Oleg Nesterov
2012-04-05 22:22   ` Oleg Nesterov
2012-04-05 22:22 ` [PATCH 6/6] uprobes: kill uprobes_srcu/uprobe_srcu_id Oleg Nesterov
2012-04-05 22:22   ` Oleg Nesterov
2012-04-14 11:16 ` [RFC 0/6] " Ingo Molnar
2012-04-14 11:16   ` Ingo Molnar
2012-04-16 11:31   ` Srikar Dronamraju
2012-04-16 11:31     ` Srikar Dronamraju
2012-04-16 14:41     ` Oleg Nesterov
2012-04-16 14:41       ` Oleg Nesterov
2012-04-25 12:52       ` Srikar Dronamraju
2012-04-25 12:52         ` Srikar Dronamraju
2012-04-25 14:22         ` Oleg Nesterov
2012-04-25 14:22           ` Oleg Nesterov
2012-04-14 13:16 ` Peter Zijlstra
2012-04-14 13:16   ` Peter Zijlstra
2012-04-14 20:52   ` Oleg Nesterov
2012-04-14 20:52     ` Oleg Nesterov
2012-04-15 10:51     ` Peter Zijlstra
2012-04-15 10:51       ` Peter Zijlstra
2012-04-15 19:53       ` Oleg Nesterov
2012-04-15 19:53         ` Oleg Nesterov
2012-04-15 21:48         ` Peter Zijlstra
2012-04-15 21:48           ` Peter Zijlstra
2012-04-15 23:44           ` Oleg Nesterov
2012-04-15 23:44             ` Oleg Nesterov
2012-04-16 10:16             ` Peter Zijlstra
2012-04-16 10:16               ` Peter Zijlstra
2012-04-16 21:47               ` Oleg Nesterov
2012-04-16 21:47                 ` Oleg Nesterov
2012-04-20 10:14                 ` Peter Zijlstra
2012-04-20 10:14                   ` Peter Zijlstra
2012-04-20 10:16                   ` Srikar Dronamraju
2012-04-20 10:16                     ` Srikar Dronamraju
2012-04-20 18:58                     ` Oleg Nesterov
2012-04-20 18:58                       ` Oleg Nesterov
2012-04-20 18:37                   ` Oleg Nesterov
2012-04-20 18:37                     ` Oleg Nesterov
2012-04-23  7:14                     ` Peter Zijlstra
2012-04-23  7:14                       ` Peter Zijlstra
2012-04-23  7:24                       ` Srikar Dronamraju
2012-04-23  7:24                         ` Srikar Dronamraju
2012-04-23  7:40                         ` Peter Zijlstra
2012-04-23  7:40                           ` Peter Zijlstra
2012-04-23 17:29                           ` Oleg Nesterov
2012-04-23 17:29                             ` Oleg Nesterov
2012-04-23 19:18                             ` Peter Zijlstra
2012-04-23 19:18                               ` Peter Zijlstra
2012-04-23 20:50                               ` Oleg Nesterov
2012-04-23 20:50                                 ` Oleg Nesterov
2012-04-23 21:25                                 ` Oleg Nesterov
2012-04-23 21:25                                   ` 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=20120405222146.GD19166@redhat.com \
    --to=oleg@redhat.com \
    --cc=acme@infradead.org \
    --cc=akpm@linux-foundation.org \
    --cc=ananth@in.ibm.com \
    --cc=andi@firstfloor.org \
    --cc=anton@redhat.com \
    --cc=hch@infradead.org \
    --cc=jkenisto@linux.vnet.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=rostedt@goodmis.org \
    --cc=srikar@linux.vnet.ibm.com \
    --cc=tglx@linutronix.de \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.