Messages in this thread Patch in this message | | | From | Pratyush Anand <> | Subject | [RFC 3/8] Kernel/uprobe: Define arch_uprobe_exception_notify as __weak | Date | Wed, 31 Dec 2014 20:51:19 +0530 |
| |
Both ARM and ARM64 handle uprobe exceptions through their own hooks.So nothing to be done in arch_uprobe_exception_notify except to return NOTIFY_DONE. Implement this as weak default function and remove definition from arm arch code.
Signed-off-by: Pratyush Anand <panand@redhat.com> --- arch/arm/kernel/uprobes.c | 6 ------ kernel/events/uprobes.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/arch/arm/kernel/uprobes.c b/arch/arm/kernel/uprobes.c index 56adf9c1fde0..0f3663ca82fc 100644 --- a/arch/arm/kernel/uprobes.c +++ b/arch/arm/kernel/uprobes.c @@ -178,12 +178,6 @@ void arch_uprobe_abort_xol(struct arch_uprobe *auprobe, struct pt_regs *regs) instruction_pointer_set(regs, utask->vaddr); } -int arch_uprobe_exception_notify(struct notifier_block *self, - unsigned long val, void *data) -{ - return NOTIFY_DONE; -} - static int uprobe_trap_handler(struct pt_regs *regs, unsigned int instr) { unsigned long flags; diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index cb346f26a22d..027e39ccb778 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1973,6 +1973,24 @@ int uprobe_post_sstep_notifier(struct pt_regs *regs) return 1; } +/** + * arch_uprobe_exception_notify - Pass uprobe exception notigfication to + * architecture + * @self: Pointer to notifier_block + * @val: Type of exception + * @data: Exception specific data + * Default implementation of arch_uprobe_exception_notify + * Returns NOTIFY_DONE. + * + * Few architectures like arm and arm64 handle uprobe exceptions through + * their own hooks.So nothing to be done here. + */ +int __weak arch_uprobe_exception_notify(struct notifier_block *self, + unsigned long val, void *data) +{ + return NOTIFY_DONE; +} + static struct notifier_block uprobe_exception_nb = { .notifier_call = arch_uprobe_exception_notify, .priority = INT_MAX-1, /* notified after kprobes, kgdb */ -- 2.1.0
| |