uprobes/x86: Kill adjust_ret_addr(), simplify UPROBE_FIX_CALL logic
authorOleg Nesterov <oleg@redhat.com>
Fri, 25 Apr 2014 16:06:19 +0000 (18:06 +0200)
committerOleg Nesterov <oleg@redhat.com>
Wed, 30 Apr 2014 17:10:39 +0000 (19:10 +0200)
commit1dc76e6eacef271230d9ff6fd0f91824bda03f44
tree2e8bcef731ebe89c98964646a6751a84fc5a0906
parent2b82cadffc4154a25c25d88a63c7fb3397cda9d6
uprobes/x86: Kill adjust_ret_addr(), simplify UPROBE_FIX_CALL logic

The only insn which could have both UPROBE_FIX_IP and UPROBE_FIX_CALL
was 0xe8 "call relative", and now it is handled by branch_xol_ops.

So we can change default_post_xol_op(UPROBE_FIX_CALL) to simply push
the address of next insn == utask->vaddr + insn.length, just we need
to record insn.length into the new auprobe->def.ilen member.

Note: if/when we teach branch_xol_ops to support jcxz/loopz we can
remove the "correction" logic, UPROBE_FIX_IP can use the same address.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
arch/x86/include/asm/uprobes.h
arch/x86/kernel/uprobes.c