openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

uprobes: Turn copy_opcode() into copy_from_page() 

No functional changes. Rename copy_opcode() into copy_from_page() and
add the new "int len" argument to make it more more generic for the
new users.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Anton Arapov <anton@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
This commit is contained in:
Oleg Nesterov 2013-03-24 18:24:37 +01:00
parent 3c9eb54f71
commit ab0d805c7b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/events/uprobes.c
View File

@ -187,10 +187,10 @@ bool __weak is_trap_insn(uprobe_opcode_t *insn)
return is_swbp_insn(insn); return is_swbp_insn(insn);
} }
static void copy_opcode(struct page *page, unsigned long vaddr, uprobe_opcode_t *opcode) static void copy_from_page(struct page *page, unsigned long vaddr, void *dst, int len)
{ {
void *kaddr = kmap_atomic(page); void *kaddr = kmap_atomic(page);
memcpy(opcode, kaddr + (vaddr & ~PAGE_MASK), UPROBE_SWBP_INSN_SIZE); memcpy(dst, kaddr + (vaddr & ~PAGE_MASK), len);
kunmap_atomic(kaddr); kunmap_atomic(kaddr);
} }
@ -208,7 +208,7 @@ static int verify_opcode(struct page *page, unsigned long vaddr, uprobe_opcode_t
* is a trap variant; uprobes always wins over any other (gdb) * is a trap variant; uprobes always wins over any other (gdb)
* breakpoint. * breakpoint.
*/ */
copy_opcode(page, vaddr, &old_opcode); copy_from_page(page, vaddr, &old_opcode, UPROBE_SWBP_INSN_SIZE);
is_swbp = is_swbp_insn(&old_opcode); is_swbp = is_swbp_insn(&old_opcode);
if (is_swbp_insn(new_opcode)) { if (is_swbp_insn(new_opcode)) {
@ -1472,7 +1472,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
if (result < 0) if (result < 0)
return result; return result;
copy_opcode(page, vaddr, &opcode); copy_from_page(page, vaddr, &opcode, UPROBE_SWBP_INSN_SIZE);
put_page(page); put_page(page);
out: out:
/* This needs to return true for any variant of the trap insn */ /* This needs to return true for any variant of the trap insn */