Generalize xol_take_insn_slot() to enable more consumers of the function, e.g. trampoline implementation for return probes.
The first time a uprobe with return consumer is hit for a process, a trampoline slot is obtained in the xol_area and initialized with a breakpoint instruction. This slot is subsequently used by all uretprobes. v3: - unified xol_get_insn_slot(), thus get rid of xol_get_trampoline_slot() Signed-off-by: Anton Arapov <an...@redhat.com> --- kernel/events/uprobes.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index d904164..69bf060 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1221,7 +1221,7 @@ static unsigned long xol_take_insn_slot(struct xol_area *area) * xol_get_insn_slot - allocate a slot for xol. * Returns the allocated slot address or 0. */ -static unsigned long xol_get_insn_slot(struct uprobe *uprobe) +static unsigned long xol_get_insn_slot(unsigned char *insn) { struct xol_area *area; unsigned long offset; @@ -1239,7 +1239,7 @@ static unsigned long xol_get_insn_slot(struct uprobe *uprobe) /* Initialize the slot */ offset = xol_vaddr & ~PAGE_MASK; vaddr = kmap_atomic(area->page); - memcpy(vaddr + offset, uprobe->arch.insn, MAX_UINSN_BYTES); + memcpy(vaddr + offset, insn, MAX_UINSN_BYTES); kunmap_atomic(vaddr); /* * We probably need flush_icache_user_range() but it needs vma. @@ -1353,7 +1353,7 @@ pre_ssout(struct uprobe *uprobe, struct pt_regs *regs, unsigned long bp_vaddr) if (!utask) return -ENOMEM; - xol_vaddr = xol_get_insn_slot(uprobe); + xol_vaddr = xol_get_insn_slot(uprobe->arch.insn); if (!xol_vaddr) return -ENOMEM; -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/