From: David Long <dave.long@linaro.org> To: linux-arm-kernel@lists.infradead.org Cc: Rabin Vincent <rabin@rab.in>, "Jon Medhurst (Tixy)" <tixy@linaro.org>, Oleg Nesterov <oleg@redhat.com>, Srikar Dronamraju <srikar@linux.vnet.ibm.com>, Ingo Molnar <mingo@redhat.com>, linux-kernel@vger.kernel.org Subject: [PATCH v2 03/13] uprobes: allow arch access to xol slot Date: Tue, 15 Oct 2013 17:04:18 -0400 [thread overview] Message-ID: <1381871068-27660-4-git-send-email-dave.long@linaro.org> (raw) In-Reply-To: <1381871068-27660-1-git-send-email-dave.long@linaro.org> From: "David A. Long" <dave.long@linaro.org> Allow arches to customize how the instruction is filled into the xol slot. ARM will use this to insert an undefined instruction after the real instruction in order to simulate a single step of the instruction without hardware support. Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: David A. Long <dave.long@linaro.org> --- include/linux/uprobes.h | 1 + kernel/events/uprobes.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h index 80116c9..2556ab6 100644 --- a/include/linux/uprobes.h +++ b/include/linux/uprobes.h @@ -134,6 +134,7 @@ extern int arch_uprobe_exception_notify(struct notifier_block *self, unsigned l extern void arch_uprobe_abort_xol(struct arch_uprobe *aup, struct pt_regs *regs); extern unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs *regs); extern bool __weak arch_uprobe_ignore(struct arch_uprobe *aup, struct pt_regs *regs); +extern void __weak arch_uprobe_xol_copy(struct arch_uprobe *auprobe, void *vaddr); #else /* !CONFIG_UPROBES */ struct uprobes_state { }; diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 3955172..22d0121 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1238,6 +1238,11 @@ static unsigned long xol_take_insn_slot(struct xol_area *area) return slot_addr; } +void __weak arch_uprobe_xol_copy(struct arch_uprobe *auprobe, void *vaddr) +{ + memcpy(vaddr, auprobe->insn, MAX_UINSN_BYTES); +} + /* * xol_get_insn_slot - allocate a slot for xol. * Returns the allocated slot address or 0. @@ -1246,6 +1251,7 @@ static unsigned long xol_get_insn_slot(struct uprobe *uprobe) { struct xol_area *area; unsigned long xol_vaddr; + void *kaddr; area = get_xol_area(); if (!area) @@ -1256,7 +1262,9 @@ static unsigned long xol_get_insn_slot(struct uprobe *uprobe) return 0; /* Initialize the slot */ - copy_to_page(area->page, xol_vaddr, uprobe->arch.insn, MAX_UINSN_BYTES); + kaddr = kmap_atomic(area->page); + arch_uprobe_xol_copy(&uprobe->arch, kaddr + (xol_vaddr & ~PAGE_MASK)); + kunmap_atomic(kaddr); /* * We probably need flush_icache_user_range() but it needs vma. * This should work on supported architectures too. -- 1.8.1.2
WARNING: multiple messages have this Message-ID (diff)
From: dave.long@linaro.org (David Long) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 03/13] uprobes: allow arch access to xol slot Date: Tue, 15 Oct 2013 17:04:18 -0400 [thread overview] Message-ID: <1381871068-27660-4-git-send-email-dave.long@linaro.org> (raw) In-Reply-To: <1381871068-27660-1-git-send-email-dave.long@linaro.org> From: "David A. Long" <dave.long@linaro.org> Allow arches to customize how the instruction is filled into the xol slot. ARM will use this to insert an undefined instruction after the real instruction in order to simulate a single step of the instruction without hardware support. Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: David A. Long <dave.long@linaro.org> --- include/linux/uprobes.h | 1 + kernel/events/uprobes.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h index 80116c9..2556ab6 100644 --- a/include/linux/uprobes.h +++ b/include/linux/uprobes.h @@ -134,6 +134,7 @@ extern int arch_uprobe_exception_notify(struct notifier_block *self, unsigned l extern void arch_uprobe_abort_xol(struct arch_uprobe *aup, struct pt_regs *regs); extern unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs *regs); extern bool __weak arch_uprobe_ignore(struct arch_uprobe *aup, struct pt_regs *regs); +extern void __weak arch_uprobe_xol_copy(struct arch_uprobe *auprobe, void *vaddr); #else /* !CONFIG_UPROBES */ struct uprobes_state { }; diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 3955172..22d0121 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1238,6 +1238,11 @@ static unsigned long xol_take_insn_slot(struct xol_area *area) return slot_addr; } +void __weak arch_uprobe_xol_copy(struct arch_uprobe *auprobe, void *vaddr) +{ + memcpy(vaddr, auprobe->insn, MAX_UINSN_BYTES); +} + /* * xol_get_insn_slot - allocate a slot for xol. * Returns the allocated slot address or 0. @@ -1246,6 +1251,7 @@ static unsigned long xol_get_insn_slot(struct uprobe *uprobe) { struct xol_area *area; unsigned long xol_vaddr; + void *kaddr; area = get_xol_area(); if (!area) @@ -1256,7 +1262,9 @@ static unsigned long xol_get_insn_slot(struct uprobe *uprobe) return 0; /* Initialize the slot */ - copy_to_page(area->page, xol_vaddr, uprobe->arch.insn, MAX_UINSN_BYTES); + kaddr = kmap_atomic(area->page); + arch_uprobe_xol_copy(&uprobe->arch, kaddr + (xol_vaddr & ~PAGE_MASK)); + kunmap_atomic(kaddr); /* * We probably need flush_icache_user_range() but it needs vma. * This should work on supported architectures too. -- 1.8.1.2
next prev parent reply other threads:[~2013-10-15 21:04 UTC|newest] Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-10-15 21:04 [PATCH v2 00/13] uprobes: Add uprobes support for ARM David Long 2013-10-15 21:04 ` David Long 2013-10-15 21:04 ` [PATCH v2 01/13] uprobes: move function declarations out of arch David Long 2013-10-15 21:04 ` David Long 2013-11-05 16:01 ` Oleg Nesterov 2013-11-05 16:01 ` Oleg Nesterov 2013-11-05 18:16 ` Oleg Nesterov 2013-11-05 18:16 ` Oleg Nesterov 2013-11-05 19:01 ` [PATCH] uprobes: Export write_opcode() as uprobe_write_opcode() Oleg Nesterov 2013-11-05 19:01 ` Oleg Nesterov 2013-11-05 19:55 ` David Long 2013-11-05 19:55 ` David Long 2013-11-05 19:13 ` [PATCH v2 01/13] uprobes: move function declarations out of arch David Long 2013-11-05 19:13 ` David Long 2013-10-15 21:04 ` [PATCH v2 02/13] uprobes: allow ignoring of probe hits David Long 2013-10-15 21:04 ` David Long 2013-10-19 17:02 ` Oleg Nesterov 2013-10-19 17:02 ` Oleg Nesterov 2013-10-22 3:45 ` David Long 2013-10-22 3:45 ` David Long 2013-10-22 11:25 ` Oleg Nesterov 2013-10-22 11:25 ` Oleg Nesterov 2013-10-22 23:56 ` David Long 2013-10-22 23:56 ` David Long 2013-10-28 18:54 ` Oleg Nesterov 2013-10-28 18:54 ` Oleg Nesterov 2013-10-30 21:11 ` David Long 2013-10-30 21:11 ` David Long 2013-10-15 21:04 ` David Long [this message] 2013-10-15 21:04 ` [PATCH v2 03/13] uprobes: allow arch access to xol slot David Long 2013-10-19 16:36 ` Oleg Nesterov 2013-10-19 16:36 ` Oleg Nesterov 2013-10-23 0:03 ` David Long 2013-10-23 0:03 ` David Long 2013-10-29 15:40 ` Oleg Nesterov 2013-10-29 15:40 ` Oleg Nesterov 2013-11-04 19:49 ` [PATCH] uprobes: introduce arch_uprobe->ixol Oleg Nesterov 2013-11-04 19:49 ` Oleg Nesterov 2013-11-04 21:25 ` David Long 2013-11-04 21:25 ` David Long 2013-11-05 16:04 ` David Long 2013-11-05 16:04 ` David Long 2013-11-05 18:01 ` Oleg Nesterov 2013-11-05 18:01 ` Oleg Nesterov 2013-11-05 18:45 ` David Long 2013-11-05 18:45 ` David Long 2013-10-15 21:04 ` [PATCH v2 04/13] uprobes: allow arch-specific initialization David Long 2013-10-15 21:04 ` David Long 2013-10-19 16:42 ` Oleg Nesterov 2013-10-19 16:42 ` Oleg Nesterov 2013-10-23 1:21 ` David Long 2013-10-23 1:21 ` David Long 2013-10-28 18:58 ` Oleg Nesterov 2013-10-28 18:58 ` Oleg Nesterov 2013-10-31 18:41 ` David Long 2013-10-31 18:41 ` David Long 2013-11-01 13:52 ` Oleg Nesterov 2013-11-01 13:52 ` Oleg Nesterov 2013-11-04 3:24 ` David Long 2013-11-04 3:24 ` David Long 2013-10-15 21:04 ` [PATCH v2 05/13] uprobes: add arch write opcode hook David Long 2013-10-15 21:04 ` David Long 2013-10-19 16:50 ` Oleg Nesterov 2013-10-19 16:50 ` Oleg Nesterov 2013-10-23 18:20 ` David Long 2013-10-23 18:20 ` David Long 2013-10-28 19:49 ` Oleg Nesterov 2013-10-28 19:49 ` Oleg Nesterov 2013-10-29 19:59 ` Oleg Nesterov 2013-10-29 19:59 ` Oleg Nesterov 2013-11-02 3:33 ` David Long 2013-11-02 3:33 ` David Long 2013-11-02 14:03 ` Oleg Nesterov 2013-11-02 14:03 ` Oleg Nesterov 2013-10-15 21:04 ` [PATCH v2 06/13] ARM: move shared uprobe/kprobe definitions into new include file David Long 2013-10-15 21:04 ` David Long 2013-10-15 21:04 ` [PATCH v2 07/13] ARM: move generic thumb instruction parsing code to new files for use by other features David Long 2013-11-13 17:09 ` Jon Medhurst (Tixy) 2013-11-13 17:09 ` Jon Medhurst (Tixy) 2013-11-14 14:13 ` David Long 2013-11-14 14:13 ` David Long 2013-10-15 21:04 ` [PATCH v2 08/13] ARM: use a function table for determining instruction interpreter actions David Long 2013-11-13 17:11 ` Jon Medhurst (Tixy) 2013-11-13 17:11 ` Jon Medhurst (Tixy) 2013-11-14 15:17 ` David Long 2013-11-14 15:17 ` David Long 2013-10-15 21:04 ` [PATCH v2 09/13] ARM: Disable jprobe selftests in thumb kernels David Long 2013-10-15 21:04 ` David Long 2013-11-07 17:26 ` Jon Medhurst (Tixy) 2013-11-07 17:26 ` Jon Medhurst (Tixy) 2013-11-10 22:57 ` David Long 2013-11-10 22:57 ` David Long 2013-10-15 21:04 ` [PATCH v2 10/13] kprobes: Remove uneeded kernel dependency on struct arch_specific_insn David Long 2013-10-15 21:04 ` David Long 2013-11-13 17:13 ` Jon Medhurst (Tixy) 2013-11-13 17:13 ` Jon Medhurst (Tixy) 2013-11-14 2:02 ` Masami Hiramatsu 2013-11-14 2:02 ` Masami Hiramatsu 2013-11-14 14:15 ` Jon Medhurst (Tixy) 2013-11-14 14:15 ` Jon Medhurst (Tixy) 2013-11-14 20:33 ` David Long 2013-11-14 20:33 ` David Long 2013-11-15 10:23 ` Masami Hiramatsu 2013-11-15 10:23 ` Masami Hiramatsu 2013-11-15 15:16 ` David Long 2013-11-15 15:16 ` David Long 2013-11-15 10:11 ` Re: " Masami Hiramatsu 2013-11-15 10:11 ` Masami Hiramatsu 2013-11-14 1:20 ` Masami Hiramatsu 2013-11-14 1:20 ` Masami Hiramatsu 2013-10-15 21:04 ` [PATCH v2 11/13] ARM: Finish renaming ARM kprobes APIs for sharing with uprobes David Long 2013-10-15 21:04 ` David Long 2013-11-13 17:16 ` Jon Medhurst (Tixy) 2013-11-13 17:16 ` Jon Medhurst (Tixy) 2013-11-15 15:45 ` David Long 2013-11-15 15:45 ` David Long 2013-10-15 21:04 ` [PATCH v2 12/13] ARM: add uprobes support David Long 2013-10-15 21:04 ` David Long 2013-10-15 21:04 ` [PATCH v2 13/13] ARM: Remove uprobes dependency on kprobes David Long 2013-10-15 21:04 ` David Long
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1381871068-27660-4-git-send-email-dave.long@linaro.org \ --to=dave.long@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=oleg@redhat.com \ --cc=rabin@rab.in \ --cc=srikar@linux.vnet.ibm.com \ --cc=tixy@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.