From patchwork Mon Jun 15 19:07:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 49930 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 880F6205DE for ; Mon, 15 Jun 2015 19:07:30 +0000 (UTC) Received: by wgez8 with SMTP id z8sf27182695wge.2 for ; Mon, 15 Jun 2015 12:07:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=j8G82t13DU9J8FDFpcRkmebdDxvaU9By3rH/0i+DqeE=; b=VcmD3DaLPdqQky6dUNxJtpsi4Kt+f8yM/MMvAXX0RXy8hgSutnVv4C7NT/k+59Si+Y nIAwt9AKN04ws6rEZj6oEnJT2ZDRhAtiQ9Q6k8IxaP30gaInNuqTWGiFGuSADeSD8Dv7 +5ClByIqK/LWzdQJnA5MydaioVnQEDmKDOJQnQvCGN+PRAD1WJ99wN1zqsJvxvMt4mcS YBR16GYkVqilqJ8yKBkqIYru44IgiSAa/kfQIPhEEB6o9MEgko13YckATpUDlj1K8Dfp +vF24J+2PyIP8ToqPnnA+HQQ1cB1lfkJc8vw+YuwonS1Dt8XhFtI2kusp9h08ReMSOZI pYkA== X-Gm-Message-State: ALoCoQmzw0l3dpDjf4NLE561zxW0SBJqsC3IMUvJb/eUv/HYSZbmUjysYaggVBPzaDQoNE9UqC2/ X-Received: by 10.152.9.3 with SMTP id v3mr31052761laa.6.1434395249885; Mon, 15 Jun 2015 12:07:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.7 with SMTP id f7ls853892lah.48.gmail; Mon, 15 Jun 2015 12:07:29 -0700 (PDT) X-Received: by 10.152.121.67 with SMTP id li3mr7691620lab.29.1434395249666; Mon, 15 Jun 2015 12:07:29 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id oe4si11195036lbc.49.2015.06.15.12.07.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jun 2015 12:07:29 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by labbc20 with SMTP id bc20so28013797lab.1 for ; Mon, 15 Jun 2015 12:07:29 -0700 (PDT) X-Received: by 10.112.222.133 with SMTP id qm5mr1623661lbc.86.1434395249570; Mon, 15 Jun 2015 12:07:29 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1616856lbb; Mon, 15 Jun 2015 12:07:28 -0700 (PDT) X-Received: by 10.140.239.129 with SMTP id k123mr39379133qhc.66.1434395239221; Mon, 15 Jun 2015 12:07:19 -0700 (PDT) Received: from mail-qc0-f181.google.com (mail-qc0-f181.google.com. [209.85.216.181]) by mx.google.com with ESMTPS id m126si5189586qhb.132.2015.06.15.12.07.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jun 2015 12:07:19 -0700 (PDT) Received-SPF: pass (google.com: domain of dave.long@linaro.org designates 209.85.216.181 as permitted sender) client-ip=209.85.216.181; Received: by qcej3 with SMTP id j3so9206349qce.3 for ; Mon, 15 Jun 2015 12:07:18 -0700 (PDT) X-Received: by 10.140.83.168 with SMTP id j37mr37305568qgd.18.1434395238531; Mon, 15 Jun 2015 12:07:18 -0700 (PDT) Received: from localhost.localdomain (pool-72-71-243-249.cncdnh.fast00.myfairpoint.net. [72.71.243.249]) by mx.google.com with ESMTPSA id 6sm6748404qks.37.2015.06.15.12.07.17 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Jun 2015 12:07:17 -0700 (PDT) From: David Long To: Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org, Russell King Cc: sandeepa.s.prabhu@gmail.com, William Cohen , Steve Capper , "Jon Medhurst (Tixy)" , Masami Hiramatsu , Ananth N Mavinakayanahalli , Anil S Keshavamurthy , , Mark Brown , linux-kernel@vger.kernel.org Subject: [PATCH v7 6/7] arm64: Add kernel return probes support (kretprobes) Date: Mon, 15 Jun 2015 15:07:08 -0400 Message-Id: <1434395229-6654-7-git-send-email-dave.long@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1434395229-6654-1-git-send-email-dave.long@linaro.org> References: <1434395229-6654-1-git-send-email-dave.long@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: dave.long@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Sandeepa Prabhu The pre-handler of this special 'trampoline' kprobe executes the return probe handler functions and restores original return address in ELR_EL1. This way the saved pt_regs still hold the original register context to be carried back to the probed kernel function. Signed-off-by: Sandeepa Prabhu Signed-off-by: David A. Long --- arch/arm64/Kconfig | 1 + arch/arm64/kernel/kprobes.c | 75 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 45a9bd81..5312be5 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -72,6 +72,7 @@ config ARM64 select HAVE_RCU_TABLE_FREE select HAVE_SYSCALL_TRACEPOINTS select HAVE_KPROBES + select HAVE_KRETPROBES if HAVE_KPROBES select IRQ_DOMAIN select MODULES_USE_ELF_RELA select NO_BOOTMEM diff --git a/arch/arm64/kernel/kprobes.c b/arch/arm64/kernel/kprobes.c index 570218c..7e34ef3 100644 --- a/arch/arm64/kernel/kprobes.c +++ b/arch/arm64/kernel/kprobes.c @@ -583,7 +583,80 @@ static void __used __kprobes kretprobe_trampoline_holder(void) static void __kprobes __used *trampoline_probe_handler(struct pt_regs *regs) { - return (void *) 0; + struct kretprobe_instance *ri = NULL; + struct hlist_head *head, empty_rp; + struct hlist_node *tmp; + unsigned long flags, orig_ret_addr = 0; + unsigned long trampoline_address = + (unsigned long)&kretprobe_trampoline; + + INIT_HLIST_HEAD(&empty_rp); + kretprobe_hash_lock(current, &head, &flags); + + /* + * It is possible to have multiple instances associated with a given + * task either because multiple functions in the call path have + * a return probe installed on them, and/or more than one return + * probe was registered for a target function. + * + * We can handle this because: + * - instances are always inserted at the head of the list + * - when multiple return probes are registered for the same + * function, the first instance's ret_addr will point to the + * real return address, and all the rest will point to + * kretprobe_trampoline + */ + hlist_for_each_entry_safe(ri, tmp, head, hlist) { + if (ri->task != current) + /* another task is sharing our hash bucket */ + continue; + + if (ri->rp && ri->rp->handler) { + __this_cpu_write(current_kprobe, &ri->rp->kp); + get_kprobe_ctlblk()->kprobe_status = KPROBE_HIT_ACTIVE; + ri->rp->handler(ri, regs); + __this_cpu_write(current_kprobe, NULL); + } + + orig_ret_addr = (unsigned long)ri->ret_addr; + recycle_rp_inst(ri, &empty_rp); + + if (orig_ret_addr != trampoline_address) + /* + * This is the real return address. Any other + * instances associated with this task are for + * other calls deeper on the call stack + */ + break; + } + + kretprobe_assert(ri, orig_ret_addr, trampoline_address); + /* restore the original return address */ + instruction_pointer(regs) = orig_ret_addr; + reset_current_kprobe(); + kretprobe_hash_unlock(current, &flags); + + hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) { + hlist_del(&ri->hlist); + kfree(ri); + } + + /* return 1 so that post handlers not called */ + return (void *) orig_ret_addr; +} + +void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, + struct pt_regs *regs) +{ + ri->ret_addr = (kprobe_opcode_t *)regs->regs[30]; + + /* replace return addr (x30) with trampoline */ + regs->regs[30] = (long)&kretprobe_trampoline; +} + +int __kprobes arch_trampoline_kprobe(struct kprobe *p) +{ + return 0; } int __init arch_init_kprobes(void)