Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1439663
| From | David Long <dave.long@linaro.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v15 09/10] arm64: Add kernel return probes support (kretprobes) |
| Date | 2016-07-08 18:40 +0200 |
| Message-ID | <rSGYP-7fn-43@gated-at.bofh.it> (permalink) |
| References | <rSGYN-7fn-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Sandeepa Prabhu <sandeepa.s.prabhu@gmail.com>
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 <sandeepa.s.prabhu@gmail.com>
Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
---
arch/arm64/Kconfig | 1 +
arch/arm64/kernel/probes/kprobes.c | 90 +++++++++++++++++++++++++++++++++++++-
2 files changed, 90 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 1f7d644..6af0e2e 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -89,6 +89,7 @@ config ARM64
select HAVE_RCU_TABLE_FREE
select HAVE_SYSCALL_TRACEPOINTS
select HAVE_KPROBES
+ select HAVE_KRETPROBES if HAVE_KPROBES
select IOMMU_DMA if IOMMU_SUPPORT
select IRQ_DOMAIN
select IRQ_FORCED_THREADING
diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c
index be1f074..9c70e88 100644
--- a/arch/arm64/kernel/probes/kprobes.c
+++ b/arch/arm64/kernel/probes/kprobes.c
@@ -578,7 +578,95 @@ bool arch_within_kprobe_blacklist(unsigned long addr)
void __kprobes __used *trampoline_probe_handler(struct pt_regs *regs)
{
- return NULL;
+ struct kretprobe_instance *ri = NULL;
+ struct hlist_head *head, empty_rp;
+ struct hlist_node *tmp;
+ unsigned long flags, orig_ret_address = 0;
+ unsigned long trampoline_address =
+ (unsigned long)&kretprobe_trampoline;
+ kprobe_opcode_t *correct_ret_addr = NULL;
+
+ 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
+ * return probes installed on them, and/or more than one
+ * return probe was registered for a target function.
+ *
+ * We can handle this because:
+ * - instances are always pushed into the head of the list
+ * - when multiple return probes are registered for the same
+ * function, the (chronologically) first instance's ret_addr
+ * will be 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;
+
+ orig_ret_address = (unsigned long)ri->ret_addr;
+
+ if (orig_ret_address != 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_address, trampoline_address);
+
+ correct_ret_addr = ri->ret_addr;
+ hlist_for_each_entry_safe(ri, tmp, head, hlist) {
+ if (ri->task != current)
+ /* another task is sharing our hash bucket */
+ continue;
+
+ orig_ret_address = (unsigned long)ri->ret_addr;
+ if (ri->rp && ri->rp->handler) {
+ __this_cpu_write(current_kprobe, &ri->rp->kp);
+ get_kprobe_ctlblk()->kprobe_status = KPROBE_HIT_ACTIVE;
+ ri->ret_addr = correct_ret_addr;
+ ri->rp->handler(ri, regs);
+ __this_cpu_write(current_kprobe, NULL);
+ }
+
+ recycle_rp_inst(ri, &empty_rp);
+
+ if (orig_ret_address != 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_hash_unlock(current, &flags);
+
+ hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) {
+ hlist_del(&ri->hlist);
+ kfree(ri);
+ }
+ return (void *)orig_ret_address;
+}
+
+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)
--
2.5.0
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v15 00/10] arm64: Add kernel probes (kprobes) support David Long <dave.long@linaro.org> - 2016-07-08 18:40 +0200
[PATCH v15 05/10] arm64: Blacklist non-kprobe-able symbol David Long <dave.long@linaro.org> - 2016-07-08 18:40 +0200
[PATCH v15 08/10] arm64: Add trampoline code for kretprobes David Long <dave.long@linaro.org> - 2016-07-08 18:40 +0200
Re: [PATCH v15 08/10] arm64: Add trampoline code for kretprobes Catalin Marinas <catalin.marinas@arm.com> - 2016-07-19 15:50 +0200
Re: [PATCH v15 08/10] arm64: Add trampoline code for kretprobes David Long <dave.long@linaro.org> - 2016-07-20 20:30 +0200
[PATCH v15 09/10] arm64: Add kernel return probes support (kretprobes) David Long <dave.long@linaro.org> - 2016-07-08 18:40 +0200
[PATCH v15 01/10] arm64: Add HAVE_REGS_AND_STACK_ACCESS_API feature David Long <dave.long@linaro.org> - 2016-07-08 18:40 +0200
Re: [PATCH v15 01/10] arm64: Add HAVE_REGS_AND_STACK_ACCESS_API feature Catalin Marinas <catalin.marinas@arm.com> - 2016-07-15 13:00 +0200
Re: [PATCH v15 01/10] arm64: Add HAVE_REGS_AND_STACK_ACCESS_API feature David Long <dave.long@linaro.org> - 2016-07-15 17:00 +0200
Re: [PATCH v15 01/10] arm64: Add HAVE_REGS_AND_STACK_ACCESS_API feature Catalin Marinas <catalin.marinas@arm.com> - 2016-07-15 17:20 +0200
Re: [PATCH v15 01/10] arm64: Add HAVE_REGS_AND_STACK_ACCESS_API feature David Long <dave.long@linaro.org> - 2016-07-15 20:00 +0200
Re: [PATCH v15 01/10] arm64: Add HAVE_REGS_AND_STACK_ACCESS_API feature Catalin Marinas <catalin.marinas@arm.com> - 2016-07-19 16:20 +0200
Re: [PATCH v15 00/10] arm64: Add kernel probes (kprobes) support Catalin Marinas <catalin.marinas@arm.com> - 2016-07-14 18:30 +0200
Re: [PATCH v15 00/10] arm64: Add kernel probes (kprobes) support William Cohen <wcohen@redhat.com> - 2016-07-14 19:10 +0200
Re: [PATCH v15 00/10] arm64: Add kernel probes (kprobes) support Catalin Marinas <catalin.marinas@arm.com> - 2016-07-15 10:00 +0200
Re: [PATCH v15 00/10] arm64: Add kernel probes (kprobes) support Marc Zyngier <marc.zyngier@arm.com> - 2016-07-15 10:10 +0200
Re: [PATCH v15 00/10] arm64: Add kernel probes (kprobes) support Alex Bennée <alex.bennee@linaro.org> - 2016-07-15 11:00 +0200
Re: [PATCH v15 00/10] arm64: Add kernel probes (kprobes) support Marc Zyngier <marc.zyngier@arm.com> - 2016-07-15 11:10 +0200
Re: [PATCH v15 00/10] arm64: Add kernel probes (kprobes) support Marc Zyngier <marc.zyngier@arm.com> - 2016-07-15 12:00 +0200
Re: [PATCH v15 00/10] arm64: Add kernel probes (kprobes) support David Long <dave.long@linaro.org> - 2016-07-14 20:00 +0200
Re: [PATCH v15 00/10] arm64: Add kernel probes (kprobes) support Catalin Marinas <catalin.marinas@arm.com> - 2016-07-19 16:00 +0200
Re: [PATCH v15 00/10] arm64: Add kernel probes (kprobes) support David Long <dave.long@linaro.org> - 2016-07-19 16:10 +0200
Re: [PATCH v15 00/10] arm64: Add kernel probes (kprobes) support Catalin Marinas <catalin.marinas@arm.com> - 2016-07-19 20:30 +0200
Re: [PATCH v15 00/10] arm64: Add kernel probes (kprobes) support David Long <dave.long@linaro.org> - 2016-07-19 21:40 +0200
csiph-web