From: tip-bot for Oleg Nesterov <oleg@redhat.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
peterz@infradead.org, anton@redhat.com, ananth@in.ibm.com,
srikar@linux.vnet.ibm.com, tglx@linutronix.de, oleg@redhat.com
Subject: [tip:perf/core] uprobes: Don' t use loff_t for the valid virtual address
Date: Mon, 18 Jun 2012 02:00:34 -0700 [thread overview]
Message-ID: <tip-816c03fbabe64fa09f66fbb64e932081af381415@git.kernel.org> (raw)
In-Reply-To: <20120615154355.GA9622@redhat.com>
Commit-ID: 816c03fbabe64fa09f66fbb64e932081af381415
Gitweb: http://git.kernel.org/tip/816c03fbabe64fa09f66fbb64e932081af381415
Author: Oleg Nesterov <oleg@redhat.com>
AuthorDate: Fri, 15 Jun 2012 17:43:55 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Sat, 16 Jun 2012 09:10:48 +0200
uprobes: Don't use loff_t for the valid virtual address
loff_t looks confusing when it is used for the virtual address.
Change map_info and install_breakpoint/remove_breakpoint paths
to use "unsigned long".
The patch doesn't change vma_address(), it can't return "long"
because it is used to verify the mapping. But probably this
needs some cleanups too.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Anton Arapov <anton@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Acked-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20120615154355.GA9622@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/events/uprobes.c | 26 +++++++++-----------------
1 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 7d5c78f..4df84b7 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -664,9 +664,8 @@ static int copy_insn(struct uprobe *uprobe, struct file *filp)
*/
static int
install_breakpoint(struct uprobe *uprobe, struct mm_struct *mm,
- struct vm_area_struct *vma, loff_t vaddr)
+ struct vm_area_struct *vma, unsigned long vaddr)
{
- unsigned long addr;
int ret;
/*
@@ -679,8 +678,6 @@ install_breakpoint(struct uprobe *uprobe, struct mm_struct *mm,
if (!uprobe->consumers)
return -EEXIST;
- addr = (unsigned long)vaddr;
-
if (!(uprobe->flags & UPROBE_COPY_INSN)) {
ret = copy_insn(uprobe, vma->vm_file);
if (ret)
@@ -689,7 +686,7 @@ install_breakpoint(struct uprobe *uprobe, struct mm_struct *mm,
if (is_swbp_insn((uprobe_opcode_t *)uprobe->arch.insn))
return -ENOTSUPP;
- ret = arch_uprobe_analyze_insn(&uprobe->arch, mm, addr);
+ ret = arch_uprobe_analyze_insn(&uprobe->arch, mm, vaddr);
if (ret)
return ret;
@@ -709,7 +706,7 @@ install_breakpoint(struct uprobe *uprobe, struct mm_struct *mm,
* Hence increment before and decrement on failure.
*/
atomic_inc(&mm->uprobes_state.count);
- ret = set_swbp(&uprobe->arch, mm, addr);
+ ret = set_swbp(&uprobe->arch, mm, vaddr);
if (ret)
atomic_dec(&mm->uprobes_state.count);
@@ -717,9 +714,9 @@ install_breakpoint(struct uprobe *uprobe, struct mm_struct *mm,
}
static void
-remove_breakpoint(struct uprobe *uprobe, struct mm_struct *mm, loff_t vaddr)
+remove_breakpoint(struct uprobe *uprobe, struct mm_struct *mm, unsigned long vaddr)
{
- if (!set_orig_insn(&uprobe->arch, mm, (unsigned long)vaddr, true))
+ if (!set_orig_insn(&uprobe->arch, mm, vaddr, true))
atomic_dec(&mm->uprobes_state.count);
}
@@ -743,7 +740,7 @@ static void delete_uprobe(struct uprobe *uprobe)
struct map_info {
struct map_info *next;
struct mm_struct *mm;
- loff_t vaddr;
+ unsigned long vaddr;
};
static inline struct map_info *free_map_info(struct map_info *info)
@@ -837,7 +834,6 @@ static int register_for_each_vma(struct uprobe *uprobe, bool is_register)
while (info) {
struct mm_struct *mm = info->mm;
struct vm_area_struct *vma;
- loff_t vaddr;
if (err)
goto free;
@@ -847,9 +843,8 @@ static int register_for_each_vma(struct uprobe *uprobe, bool is_register)
if (!vma || !valid_vma(vma, is_register))
goto unlock;
- vaddr = vma_address(vma, uprobe->offset);
if (vma->vm_file->f_mapping->host != uprobe->inode ||
- vaddr != info->vaddr)
+ vma_address(vma, uprobe->offset) != info->vaddr)
goto unlock;
if (is_register) {
@@ -1055,10 +1050,8 @@ int uprobe_mmap(struct vm_area_struct *vma)
count = 0;
list_for_each_entry(uprobe, &tmp_list, pending_list) {
- loff_t vaddr;
-
if (!ret) {
- vaddr = vma_address(vma, uprobe->offset);
+ loff_t vaddr = vma_address(vma, uprobe->offset);
if (vaddr < vma->vm_start || vaddr >= vma->vm_end) {
put_uprobe(uprobe);
@@ -1122,9 +1115,8 @@ void uprobe_munmap(struct vm_area_struct *vma, unsigned long start, unsigned lon
build_probe_list(inode, &tmp_list);
list_for_each_entry(uprobe, &tmp_list, pending_list) {
- loff_t vaddr;
+ loff_t vaddr = vma_address(vma, uprobe->offset);
- vaddr = vma_address(vma, uprobe->offset);
if (vaddr >= start && vaddr < end) {
/*
* An unregister could have removed the probe before
next prev parent reply other threads:[~2012-06-18 9:00 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-15 15:42 [PATCH 0/15] uprobes: misc Oleg Nesterov
2012-06-15 15:43 ` [PATCH 01/15] uprobes: valid_vma() should reject VM_HUGETLB Oleg Nesterov
2012-06-18 8:50 ` [tip:perf/core] uprobes: Valid_vma() " tip-bot for Oleg Nesterov
2012-06-15 15:43 ` [PATCH 02/15] uprobes: __copy_insn() should ensure a_ops->readpage != NULL Oleg Nesterov
2012-06-18 8:50 ` [tip:perf/core] uprobes: __copy_insn() should ensure a_ops-> readpage " tip-bot for Oleg Nesterov
2012-06-15 15:43 ` [PATCH 03/15] uprobes: write_opcode()->__replace_page() can race with try_to_unmap() Oleg Nesterov
2012-06-18 8:51 ` [tip:perf/core] uprobes: Write_opcode()->__replace_page() " tip-bot for Oleg Nesterov
2012-06-15 15:43 ` [PATCH 04/15] uprobes: install_breakpoint() should fail if is_swbp_insn() == T Oleg Nesterov
2012-06-18 8:52 ` [tip:perf/core] uprobes: Install_breakpoint() " tip-bot for Oleg Nesterov
2012-06-15 15:43 ` [PATCH 05/15] uprobes: rework register_for_each_vma() to make it O(n) Oleg Nesterov
2012-06-18 8:53 ` [tip:perf/core] uprobes: Rework " tip-bot for Oleg Nesterov
2012-06-15 15:43 ` [PATCH 06/15] uprobes: change build_map_info() to try kmalloc(GFP_NOWAIT) first Oleg Nesterov
2012-06-18 8:54 ` [tip:perf/core] uprobes: Change build_map_info() to try kmalloc( GFP_NOWAIT) first tip-bot for Oleg Nesterov
2012-06-15 15:43 ` [PATCH 07/15] uprobes: document uprobe_register() vs uprobe_mmap() race Oleg Nesterov
2012-06-18 8:55 ` [tip:perf/core] uprobes: Document uprobe_register() vs uprobe_mmap () race tip-bot for Peter Zijlstra
2012-06-15 15:43 ` [PATCH 08/15] uprobes: copy_insn() shouldn't depend on mm/vma/vaddr Oleg Nesterov
2012-06-18 8:56 ` [tip:perf/core] uprobes: Copy_insn() shouldn't depend on mm/vma/ vaddr tip-bot for Oleg Nesterov
2012-06-15 15:43 ` [PATCH 09/15] uprobes: copy_insn() should not return -ENOMEM if __copy_insn() fails Oleg Nesterov
2012-06-18 8:57 ` [tip:perf/core] uprobes: Copy_insn() " tip-bot for Oleg Nesterov
2012-06-15 15:43 ` [PATCH 10/15] uprobes: no need to re-check vma_address() in write_opcode() Oleg Nesterov
2012-06-18 8:57 ` [tip:perf/core] uprobes: No " tip-bot for Oleg Nesterov
2012-06-15 15:43 ` [PATCH 11/15] uprobes: move BUG_ON(UPROBE_SWBP_INSN_SIZE) from write_opcode() to install_breakpoint() Oleg Nesterov
2012-06-15 16:36 ` Srikar Dronamraju
2012-06-15 17:52 ` Oleg Nesterov
2012-06-18 12:08 ` Srikar Dronamraju
2012-06-18 8:58 ` [tip:perf/core] uprobes: Move " tip-bot for Oleg Nesterov
2012-06-15 15:43 ` [PATCH 12/15] uprobes: simplify the usage of uprobe->pending_list Oleg Nesterov
2012-06-18 8:59 ` [tip:perf/core] uprobes: Simplify the usage of uprobe-> pending_list tip-bot for Oleg Nesterov
2012-06-15 15:43 ` [PATCH 13/15] uprobes: don't use loff_t for the valid virtual address Oleg Nesterov
2012-06-18 9:00 ` tip-bot for Oleg Nesterov [this message]
2012-06-15 15:43 ` [PATCH 14/15] uprobes: __copy_insn() needs "loff_t offset" Oleg Nesterov
2012-06-18 9:01 ` [tip:perf/core] " tip-bot for Oleg Nesterov
2012-06-15 15:44 ` [PATCH 15/15] uprobes: remove the unnecessary initialization in add_utask() Oleg Nesterov
2012-06-18 9:02 ` [tip:perf/core] uprobes: Remove " tip-bot for 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=tip-816c03fbabe64fa09f66fbb64e932081af381415@git.kernel.org \
--to=oleg@redhat.com \
--cc=ananth@in.ibm.com \
--cc=anton@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=srikar@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
/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).