From: dave.long@linaro.org (David Long)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 01/13] uprobes: move function declarations out of arch
Date: Tue, 05 Nov 2013 14:13:04 -0500 [thread overview]
Message-ID: <52794340.7030009@linaro.org> (raw)
In-Reply-To: <20131105181614.GA7614@redhat.com>
On 11/05/13 13:16, Oleg Nesterov wrote:
> On 11/05, Oleg Nesterov wrote:
>>
>> On 10/15, David Long wrote:
>>>
>>> Move the function declarations from the arch header to the common
>>> header, since only the function bodies are architecture-specific.
>>> These changes are from Vincent Rabin's uprobes patch.
>>
>> Hmm. I didn't look at this patch because I thought it is obviously
>> fine, but...
>>
>>> arch/x86/include/asm/uprobes.h | 7 -------
>>> include/linux/uprobes.h | 8 ++++++++
>>> 2 files changed, 8 insertions(+), 7 deletions(-)
>>
>> it should also update arch/powerpc/include/asm/uprobes.h ?
>>
>> And 12/13 should not touch arch/powerpc/ or include/linux/uprobes.h.
>
> And I think we can merge this change separately to reduce the
> number of non-arm changes in the next version.
>
> Please see the patch I am going to add to my tree below.
>
> Oleg.
> ---
>
> Subject: [PATCH] uprobes: move function declarations out of arch
> From: David A. Long <dave.long@linaro.org>
> Date: Tue, 15 Oct 2013 17:04:16 -0400
>
> Move the function declarations from the arch headers to the common
> header, since only the function bodies are architecture-specific.
> These changes are from Vincent Rabin's uprobes patch.
>
> [ oleg: update arch/powerpc/include/asm/uprobes.h ]
>
> Signed-off-by: Rabin Vincent <rabin@rab.in>
> Signed-off-by: David A. Long <dave.long@linaro.org>
> Signed-off-by: Oleg Nesterov <oleg@redhat.com>
> ---
> arch/powerpc/include/asm/uprobes.h | 7 -------
> arch/x86/include/asm/uprobes.h | 7 -------
> include/linux/uprobes.h | 8 ++++++++
> 3 files changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/uprobes.h b/arch/powerpc/include/asm/uprobes.h
> index 541fd6f..75c6ecd 100644
> --- a/arch/powerpc/include/asm/uprobes.h
> +++ b/arch/powerpc/include/asm/uprobes.h
> @@ -46,11 +46,4 @@ struct arch_uprobe_task {
> unsigned long saved_trap_nr;
> };
>
> -extern int arch_uprobe_analyze_insn(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long addr);
> -extern int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs);
> -extern int arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs);
> -extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk);
> -extern int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val, void *data);
> -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);
> #endif /* _ASM_UPROBES_H */
> diff --git a/arch/x86/include/asm/uprobes.h b/arch/x86/include/asm/uprobes.h
> index 2a24180..3087ea9 100644
> --- a/arch/x86/include/asm/uprobes.h
> +++ b/arch/x86/include/asm/uprobes.h
> @@ -52,11 +52,4 @@ struct arch_uprobe_task {
> unsigned int saved_tf;
> };
>
> -extern int arch_uprobe_analyze_insn(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long addr);
> -extern int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs);
> -extern int arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs);
> -extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk);
> -extern int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val, void *data);
> -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);
> #endif /* _ASM_UPROBES_H */
> diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
> index 06f28be..9fd60c5 100644
> --- a/include/linux/uprobes.h
> +++ b/include/linux/uprobes.h
> @@ -30,6 +30,7 @@
> struct vm_area_struct;
> struct mm_struct;
> struct inode;
> +struct notifier_block;
>
> #ifdef CONFIG_ARCH_SUPPORTS_UPROBES
> # include <asm/uprobes.h>
> @@ -125,6 +126,13 @@ extern void uprobe_notify_resume(struct pt_regs *regs);
> extern bool uprobe_deny_signal(void);
> extern bool __weak arch_uprobe_skip_sstep(struct arch_uprobe *aup, struct pt_regs *regs);
> extern void uprobe_clear_state(struct mm_struct *mm);
> +extern int arch_uprobe_analyze_insn(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long addr);
> +extern int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs);
> +extern int arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs);
> +extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk);
> +extern int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val, void *data);
> +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);
> #else /* !CONFIG_UPROBES */
> struct uprobes_state {
> };
>
Looks good to me. ARM builds/runs fine with your patch. I will remove
my (updated) version from my patch set.
-dl
next prev parent reply other threads:[~2013-11-05 19:13 UTC|newest]
Thread overview: 59+ 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 ` [PATCH v2 01/13] uprobes: move function declarations out of arch David Long
2013-11-05 16:01 ` 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:55 ` David Long
2013-11-05 19:13 ` David Long [this message]
2013-10-15 21:04 ` [PATCH v2 02/13] uprobes: allow ignoring of probe hits David Long
2013-10-19 17:02 ` Oleg Nesterov
2013-10-22 3:45 ` David Long
2013-10-22 11:25 ` Oleg Nesterov
2013-10-22 23:56 ` David Long
2013-10-28 18:54 ` Oleg Nesterov
2013-10-30 21:11 ` David Long
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-23 0:03 ` David Long
2013-10-29 15:40 ` Oleg Nesterov
2013-11-04 19:49 ` [PATCH] uprobes: introduce arch_uprobe->ixol Oleg Nesterov
2013-11-04 21:25 ` David Long
2013-11-05 16:04 ` David Long
2013-11-05 18:01 ` Oleg Nesterov
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-19 16:42 ` Oleg Nesterov
2013-10-23 1:21 ` David Long
2013-10-28 18:58 ` Oleg Nesterov
2013-10-31 18:41 ` David Long
2013-11-01 13:52 ` Oleg Nesterov
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-19 16:50 ` Oleg Nesterov
2013-10-23 18:20 ` David Long
2013-10-28 19:49 ` Oleg Nesterov
2013-10-29 19:59 ` Oleg Nesterov
2013-11-02 3:33 ` David Long
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 ` [PATCH v2 09/13] ARM: Disable jprobe selftests in thumb kernels David Long
2013-11-07 17:26 ` Jon Medhurst (Tixy)
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-11-13 17:13 ` Jon Medhurst (Tixy)
2013-11-14 2:02 ` Masami Hiramatsu
2013-11-14 14:15 ` Jon Medhurst (Tixy)
2013-11-14 20:33 ` David Long
2013-11-15 10:23 ` Masami Hiramatsu
2013-11-15 15:16 ` David Long
2013-11-15 10:11 ` 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-11-13 17:16 ` Jon Medhurst (Tixy)
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 ` [PATCH v2 13/13] ARM: Remove uprobes dependency on kprobes David Long
[not found] ` <1381871068-27660-8-git-send-email-dave.long@linaro.org>
2013-11-13 17:09 ` [PATCH v2 07/13] ARM: move generic thumb instruction parsing code to new files for use by other features Jon Medhurst (Tixy)
2013-11-14 14:13 ` David Long
[not found] ` <1381871068-27660-9-git-send-email-dave.long@linaro.org>
2013-11-13 17:11 ` [PATCH v2 08/13] ARM: use a function table for determining instruction interpreter actions Jon Medhurst (Tixy)
2013-11-14 15:17 ` 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=52794340.7030009@linaro.org \
--to=dave.long@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).