Commit 8a8de66c authored by Oleg Nesterov's avatar Oleg Nesterov

uprobes: Introduce arch_uprobe->ixol

Currently xol_get_insn_slot() assumes that we should simply copy
arch_uprobe->insn[] which is (ignoring arch_uprobe_analyze_insn)
just the copy of the original insn.

This is not true for arm which needs to create another insn to
execute it out-of-line.

So this patch simply adds the new member, ->ixol into the union.
This doesn't make any difference for x86 and powerpc, but arm
can divorce insn/ixol and initialize the correct xol insn in
arch_uprobe_analyze_insn().
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
parent 736e89d9
...@@ -37,6 +37,7 @@ typedef ppc_opcode_t uprobe_opcode_t; ...@@ -37,6 +37,7 @@ typedef ppc_opcode_t uprobe_opcode_t;
struct arch_uprobe { struct arch_uprobe {
union { union {
u8 insn[MAX_UINSN_BYTES]; u8 insn[MAX_UINSN_BYTES];
u8 ixol[MAX_UINSN_BYTES];
u32 ainsn; u32 ainsn;
}; };
}; };
......
...@@ -35,7 +35,10 @@ typedef u8 uprobe_opcode_t; ...@@ -35,7 +35,10 @@ typedef u8 uprobe_opcode_t;
struct arch_uprobe { struct arch_uprobe {
u16 fixups; u16 fixups;
u8 insn[MAX_UINSN_BYTES]; union {
u8 insn[MAX_UINSN_BYTES];
u8 ixol[MAX_UINSN_BYTES];
};
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
unsigned long rip_rela_target_address; unsigned long rip_rela_target_address;
#endif #endif
......
...@@ -1264,7 +1264,8 @@ static unsigned long xol_get_insn_slot(struct uprobe *uprobe) ...@@ -1264,7 +1264,8 @@ static unsigned long xol_get_insn_slot(struct uprobe *uprobe)
return 0; return 0;
/* Initialize the slot */ /* Initialize the slot */
copy_to_page(area->page, xol_vaddr, uprobe->arch.insn, MAX_UINSN_BYTES); copy_to_page(area->page, xol_vaddr,
uprobe->arch.ixol, sizeof(uprobe->arch.ixol));
/* /*
* We probably need flush_icache_user_range() but it needs vma. * We probably need flush_icache_user_range() but it needs vma.
* This should work on supported architectures too. * This should work on supported architectures too.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment