diff options
author | Oleg Nesterov <oleg@redhat.com> | 2014-04-25 18:06:19 +0200 |
---|---|---|
committer | Oleg Nesterov <oleg@redhat.com> | 2014-04-30 19:10:39 +0200 |
commit | 1dc76e6eacef271230d9ff6fd0f91824bda03f44 (patch) | |
tree | 2e8bcef731ebe89c98964646a6751a84fc5a0906 /arch/x86/include/asm/uprobes.h | |
parent | 2b82cadffc4154a25c25d88a63c7fb3397cda9d6 (diff) | |
download | linux-stable-1dc76e6eacef271230d9ff6fd0f91824bda03f44.tar.gz linux-stable-1dc76e6eacef271230d9ff6fd0f91824bda03f44.tar.bz2 linux-stable-1dc76e6eacef271230d9ff6fd0f91824bda03f44.zip |
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>
Diffstat (limited to 'arch/x86/include/asm/uprobes.h')
-rw-r--r-- | arch/x86/include/asm/uprobes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/uprobes.h b/arch/x86/include/asm/uprobes.h index 9ce25ce04fee..a040d493a4f9 100644 --- a/arch/x86/include/asm/uprobes.h +++ b/arch/x86/include/asm/uprobes.h @@ -54,6 +54,7 @@ struct arch_uprobe { long riprel_target; #endif u8 fixups; + u8 ilen; } def; }; }; |