From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757554Ab3AILZ2 (ORCPT ); Wed, 9 Jan 2013 06:25:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48093 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757344Ab3AILZZ (ORCPT ); Wed, 9 Jan 2013 06:25:25 -0500 From: Anton Arapov To: Oleg Nesterov , Srikar Dronamraju Cc: LKML , Josh Stone , Frank Eigler , Peter Zijlstra , Ingo Molnar , Ananth N Mavinakayanahalli , Anton Arapov Subject: [RFC PATCH v2 3/4] uretprobes: return probe entry, prepare uretprobe Date: Wed, 9 Jan 2013 12:24:51 +0100 Message-Id: <1357730692-3928-4-git-send-email-anton@redhat.com> In-Reply-To: <1357730692-3928-1-git-send-email-anton@redhat.com> References: <1357730692-3928-1-git-send-email-anton@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When a uprobe with return consumer is hit, prepare_uretprobe function is invoked. It creates return_instance, hijacks return address and replaces it with the trampoline. v2: get rid of ->return_consumers todo: protect uprobe Signed-off-by: Anton Arapov --- include/linux/uprobes.h | 4 ++++ kernel/events/uprobes.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h index bddfad6..cdc4d53 100644 --- a/include/linux/uprobes.h +++ b/include/linux/uprobes.h @@ -68,6 +68,10 @@ struct uprobe_task { enum uprobe_task_state state; struct arch_uprobe_task autask; + /* + * list for tracking uprobes with return consumers + */ + struct hlist_head return_uprobes; struct uprobe *active_uprobe; unsigned long xol_vaddr; diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 0ad2ac3..d6fa497 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -74,6 +74,12 @@ struct uprobe { struct arch_uprobe arch; }; +struct return_uprobe_i { + struct uprobe *uprobe; + struct hlist_node hlist; /* node in list */ + unsigned long orig_ret_vaddr; /* original return address */ +}; + /* * valid_vma: Verify if the specified vma is an executable vma * Relax restrictions while unregistering: vm_flags might have @@ -1327,11 +1333,44 @@ void uprobe_copy_process(struct task_struct *t) */ static struct uprobe_task *get_utask(void) { - if (!current->utask) + if (!current->utask) { current->utask = kzalloc(sizeof(struct uprobe_task), GFP_KERNEL); + INIT_HLIST_HEAD(¤t->utask->return_uprobes); + } return current->utask; } +static void prepare_uretprobe(struct uprobe *uprobe, struct pt_regs *regs) +{ + struct return_uprobe_i *ri; + struct uprobe_task *utask; + struct xol_area *area; + unsigned long rp_trampoline_vaddr = 0; + + area = get_xol_area(); + if (area) + rp_trampoline_vaddr = area->rp_trampoline_vaddr; + if (!rp_trampoline_vaddr) { + rp_trampoline_vaddr = xol_get_trampoline_slot(); + if (!rp_trampoline_vaddr) + return; + } + + ri = (struct return_uprobe_i *)kzalloc(sizeof(struct return_uprobe_i), + GFP_KERNEL); + if (!ri) + return; + + utask = get_utask(); + ri->orig_ret_vaddr = arch_uretprobe_hijack_return_addr(rp_trampoline_vaddr, regs); + if (likely(ri->orig_ret_vaddr)) { + ri->uprobe = uprobe; + INIT_HLIST_NODE(&ri->hlist); + hlist_add_head(&ri->hlist, &utask->return_uprobes); + } else + kfree(ri); +} + /* Prepare to single-step probed instruction out of line. */ static int pre_ssout(struct uprobe *uprobe, struct pt_regs *regs, unsigned long bp_vaddr) @@ -1485,12 +1524,17 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp) static void handler_chain(struct uprobe *uprobe, struct pt_regs *regs) { + int rc = 0; struct uprobe_consumer *uc; int remove = UPROBE_HANDLER_REMOVE; down_read(&uprobe->register_rwsem); for (uc = uprobe->consumers; uc; uc = uc->next) { - int rc = uc->handler(uc, regs); + if (uc->handler) + rc = uc->handler(uc, regs); + + if (uc->rp_handler) + prepare_uretprobe(uprobe, regs); /* put bp at return */ WARN(rc & ~UPROBE_HANDLER_MASK, "bad rc=0x%x from %pf()\n", rc, uc->handler); -- 1.8.0.2