From patchwork Wed Mar 9 05:32:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 8542331 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 508A0C0553 for ; Wed, 9 Mar 2016 05:36:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 367712024C for ; Wed, 9 Mar 2016 05:36:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 30348201EF for ; Wed, 9 Mar 2016 05:36:42 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1adWlx-00079n-W6; Wed, 09 Mar 2016 05:35:02 +0000 Received: from mail-pf0-x231.google.com ([2607:f8b0:400e:c00::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1adWkx-00064L-M0 for linux-arm-kernel@lists.infradead.org; Wed, 09 Mar 2016 05:34:05 +0000 Received: by mail-pf0-x231.google.com with SMTP id x188so30930968pfb.2 for ; Tue, 08 Mar 2016 21:33:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vzLMWb8Do0F2IfMPNL429nE67NtPCIQooinZUuBqS0c=; b=h0zoDu4ESYZdtObU3TSnbgoL41FYFpgzbnE4KiSXYHViE5tsW8cv7rnI91DqV7zwhV LfYpip2S97aJhddh1q4qVlTL3cm/1WSJLxZaLV9um7C4D+5fL04t2oY4iMt6nxTLtM8+ UyNFCsjsO1owy0/qPiFolhl20lK6tAlwc7VbQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vzLMWb8Do0F2IfMPNL429nE67NtPCIQooinZUuBqS0c=; b=S+AOcgk/S1TTIp9eBWbV+pUTtfX2lfojRBrY1kverqB4dMSLy4MEr3Bt1CRQOWWDeY HTQ83Voxr+OprpnhUQcSE4Y032AjJduEdsvUp0MSm1ueePfEujKKAHdFo9YDPyhF5yVP RqIpAfGPjAy8sJR1W0/+/I1u16pyQEJscdAVABLrviuZZJAIhmKTpvQqcw/9DbcXMATB cTwEsuHxyOrKcUx1kdvv3nHqdpCgyhL1IlrykhPNdlRO2NJ02tFa5lLzwi4T57YLb+f0 8OmJMOhMRfie3a0q17tYu8E3PHxQ3Dg62Zyz5MaJG4UFbgTkca1W6lWru7OhlTB1qloz o6AA== X-Gm-Message-State: AD7BkJLilTrcazeWs1JZAUCj5vTX2uCLy7DIv8Vd2vNncOfcXLoZwBXt0NzzDynuQhjkXiL8 X-Received: by 10.98.73.88 with SMTP id w85mr32301053pfa.82.1457501618879; Tue, 08 Mar 2016 21:33:38 -0800 (PST) Received: from solstice.IMGCGCW.net (110-170-137-3.static.asianet.co.th. [110.170.137.3]) by smtp.googlemail.com with ESMTPSA id v9sm8799041pfi.50.2016.03.08.21.33.31 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 Mar 2016 21:33:38 -0800 (PST) From: David Long To: Catalin Marinas , Will Deacon , Sandeepa Prabhu , William Cohen , Pratyush Anand , Steve Capper , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Marc Zyngier Subject: [PATCH v11 7/9] arm64: Add trampoline code for kretprobes Date: Wed, 9 Mar 2016 00:32:21 -0500 Message-Id: <1457501543-24197-8-git-send-email-dave.long@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457501543-24197-1-git-send-email-dave.long@linaro.org> References: <1457501543-24197-1-git-send-email-dave.long@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160308_213359_973761_1FD4D20B X-CRM114-Status: GOOD ( 18.71 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Petr Mladek , Viresh Kumar , John Blackwood , Feng Kan , Zi Shen Lim , Dave P Martin , Yang Shi , Vladimir Murzin , Kees Cook , "Suzuki K. Poulose" , Mark Brown , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Ard Biesheuvel , Greg Kroah-Hartman , Mark Salyzyn , James Morse , Christoffer Dall , Andrew Morton , Robin Murphy , Jens Wiklander , Balamurugan Shanmugam MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: William Cohen The trampoline code is used by kretprobes to capture a return from a probed function. This is done by saving the registers, calling the handler, and restoring the registers. The code then returns to the original saved caller return address. It is necessary to do this directly instead of using a software breakpoint because the code used in processing that breakpoint could itself be kprobe'd and cause a problematic reentry into the debug exception handler. Signed-off-by: William Cohen Signed-off-by: David A. Long --- arch/arm64/include/asm/kprobes.h | 2 + arch/arm64/kernel/Makefile | 1 + arch/arm64/kernel/asm-offsets.c | 11 +++++ arch/arm64/kernel/kprobes.c | 5 ++ arch/arm64/kernel/kprobes_trampoline.S | 88 ++++++++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+) create mode 100644 arch/arm64/kernel/kprobes_trampoline.S diff --git a/arch/arm64/include/asm/kprobes.h b/arch/arm64/include/asm/kprobes.h index 79c9511..61b4915 100644 --- a/arch/arm64/include/asm/kprobes.h +++ b/arch/arm64/include/asm/kprobes.h @@ -56,5 +56,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *data); int kprobe_breakpoint_handler(struct pt_regs *regs, unsigned int esr); int kprobe_single_step_handler(struct pt_regs *regs, unsigned int esr); +void kretprobe_trampoline(void); +void __kprobes *trampoline_probe_handler(struct pt_regs *regs); #endif /* _ARM_KPROBES_H */ diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 08325e5..f192b7d 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -37,6 +37,7 @@ arm64-obj-$(CONFIG_CPU_IDLE) += cpuidle.o arm64-obj-$(CONFIG_JUMP_LABEL) += jump_label.o arm64-obj-$(CONFIG_KGDB) += kgdb.o arm64-obj-$(CONFIG_KPROBES) += kprobes.o kprobes-arm64.o \ + kprobes_trampoline.o \ probes-simulate-insn.o arm64-obj-$(CONFIG_EFI) += efi.o efi-entry.stub.o arm64-obj-$(CONFIG_PCI) += pci.o diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index fffa4ac6..f7cc8ce 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -50,6 +50,17 @@ int main(void) DEFINE(S_X5, offsetof(struct pt_regs, regs[5])); DEFINE(S_X6, offsetof(struct pt_regs, regs[6])); DEFINE(S_X7, offsetof(struct pt_regs, regs[7])); + DEFINE(S_X8, offsetof(struct pt_regs, regs[8])); + DEFINE(S_X10, offsetof(struct pt_regs, regs[10])); + DEFINE(S_X12, offsetof(struct pt_regs, regs[12])); + DEFINE(S_X14, offsetof(struct pt_regs, regs[14])); + DEFINE(S_X16, offsetof(struct pt_regs, regs[16])); + DEFINE(S_X18, offsetof(struct pt_regs, regs[18])); + DEFINE(S_X20, offsetof(struct pt_regs, regs[20])); + DEFINE(S_X22, offsetof(struct pt_regs, regs[22])); + DEFINE(S_X24, offsetof(struct pt_regs, regs[24])); + DEFINE(S_X26, offsetof(struct pt_regs, regs[26])); + DEFINE(S_X28, offsetof(struct pt_regs, regs[28])); DEFINE(S_LR, offsetof(struct pt_regs, regs[30])); DEFINE(S_SP, offsetof(struct pt_regs, sp)); #ifdef CONFIG_COMPAT diff --git a/arch/arm64/kernel/kprobes.c b/arch/arm64/kernel/kprobes.c index ffc5affd..bd3f233 100644 --- a/arch/arm64/kernel/kprobes.c +++ b/arch/arm64/kernel/kprobes.c @@ -532,6 +532,11 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs) return 1; } +void __kprobes __used *trampoline_probe_handler(struct pt_regs *regs) +{ + return NULL; +} + int __init arch_init_kprobes(void) { return 0; diff --git a/arch/arm64/kernel/kprobes_trampoline.S b/arch/arm64/kernel/kprobes_trampoline.S new file mode 100644 index 0000000..072b4e5 --- /dev/null +++ b/arch/arm64/kernel/kprobes_trampoline.S @@ -0,0 +1,88 @@ +/* + * trampoline entry and return code for kretprobes. + */ + +#include +#include +#include + + .text + +.macro save_all_base_regs ctxt + stp x0, x1, [\ctxt, #S_X0] + stp x2, x3, [\ctxt, #S_X2] + stp x4, x5, [\ctxt, #S_X4] + stp x6, x7, [\ctxt, #S_X6] + stp x8, x9, [\ctxt, #S_X8] + stp x10, x11, [\ctxt, #S_X10] + stp x12, x13, [\ctxt, #S_X12] + stp x14, x15, [\ctxt, #S_X14] + stp x16, x17, [\ctxt, #S_X16] + stp x18, x19, [\ctxt, #S_X18] + stp x20, x21, [\ctxt, #S_X20] + stp x22, x23, [\ctxt, #S_X22] + stp x24, x25, [\ctxt, #S_X24] + stp x26, x27, [\ctxt, #S_X26] + stp x28, x29, [\ctxt, #S_X28] + str lr, [\ctxt, #S_LR] + add x0, \ctxt, #S_FRAME_SIZE + str x0, [\ctxt, #S_SP] +/* + * Construct a useful saved PSTATE + */ + mrs x0, nzcv + and x0, x0, #0xf0000000 + mrs x1, daif + and x1, x1, #0x3c0 + orr x0, x0, x1 + mrs x1, CurrentEL + and x1, x1, #12 + lsl x1, x1, #21 + orr x0, x1, x0 + mrs x1, SPSel + and x1, x1, #1 + lsl x1, x1, #21 + orr x0, x1, x0 + str x0, [\ctxt, #S_PSTATE] +.endm + +.macro restore_all_base_regs ctxt + ldr x0, [\ctxt, #S_PSTATE] + and x0, x0, #0xf0000000 + msr nzcv, x0 + ldp x0, x1, [\ctxt, #S_X0] + ldp x2, x3, [\ctxt, #S_X2] + ldp x4, x5, [\ctxt, #S_X4] + ldp x6, x7, [\ctxt, #S_X6] + ldp x8, x9, [\ctxt, #S_X8] + ldp x10, x11, [\ctxt, #S_X10] + ldp x12, x13, [\ctxt, #S_X12] + ldp x14, x15, [\ctxt, #S_X14] + ldp x16, x17, [\ctxt, #S_X16] + ldp x18, x19, [\ctxt, #S_X18] + ldp x20, x21, [\ctxt, #S_X20] + ldp x22, x23, [\ctxt, #S_X22] + ldp x24, x25, [\ctxt, #S_X24] + ldp x26, x27, [\ctxt, #S_X26] + ldp x28, x29, [\ctxt, #S_X28] +.endm + +ENTRY(kretprobe_trampoline) + + sub sp, sp, #S_FRAME_SIZE + + save_all_base_regs sp + + mov x0, sp + bl trampoline_probe_handler + /* Replace trampoline address in lr with actual + orig_ret_addr return address. */ + mov lr, x0 + + restore_all_base_regs sp + + add sp, sp, #S_FRAME_SIZE + + ret + +ENDPROC(kretprobe_trampoline)