lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

uprobes: Remove "verify" argument from set_orig_insn()

Browse Source 
Nobody does set_orig_insn(verify => false), and I think nobody will.
Remove this argument. IIUC set_orig_insn(verify => false) was needed
to single-step without xol area.

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-08 18:07:03 +02:00
parent 61559a8165
commit ded86e7c8f
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/uprobes.h
View File

@@ -102,7 +102,7 @@ struct uprobes_state {
}; };
extern int __weak set_swbp(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long vaddr); extern int __weak set_swbp(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long vaddr);
extern int __weak set_orig_insn(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long vaddr, bool verify); extern int __weak set_orig_insn(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long vaddr);
extern bool __weak is_swbp_insn(uprobe_opcode_t *insn); extern bool __weak is_swbp_insn(uprobe_opcode_t *insn);
extern int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc); extern int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);
extern void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc); extern void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);

20
kernel/events/uprobes.c
View File

@@ -345,24 +345,22 @@ int __weak set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned
* @mm: the probed process address space. * @mm: the probed process address space.
* @auprobe: arch specific probepoint information. * @auprobe: arch specific probepoint information.
* @vaddr: the virtual address to insert the opcode. * @vaddr: the virtual address to insert the opcode.
* @verify: if true, verify existance of breakpoint instruction.
* *
* For mm @mm, restore the original opcode (opcode) at @vaddr. * For mm @mm, restore the original opcode (opcode) at @vaddr.
* Return 0 (success) or a negative errno. * Return 0 (success) or a negative errno.
*/ */
int __weak int __weak
set_orig_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr, bool verify) set_orig_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr)
{ {
if (verify) { int result;
int result;
result = is_swbp_at_addr(mm, vaddr); result = is_swbp_at_addr(mm, vaddr);
if (!result) if (!result)
return -EINVAL; return -EINVAL;
if (result != 1)
return result;
if (result != 1)
return result;
}
return write_opcode(auprobe, mm, vaddr, *(uprobe_opcode_t *)auprobe->insn); return write_opcode(auprobe, mm, vaddr, *(uprobe_opcode_t *)auprobe->insn);
} }
@@ -697,7 +695,7 @@ install_breakpoint(struct uprobe *uprobe, struct mm_struct *mm,
static void static void
remove_breakpoint(struct uprobe *uprobe, struct mm_struct *mm, unsigned long vaddr) remove_breakpoint(struct uprobe *uprobe, struct mm_struct *mm, unsigned long vaddr)
{ {
set_orig_insn(&uprobe->arch, mm, vaddr, true); set_orig_insn(&uprobe->arch, mm, vaddr);
} }
/* /*