Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7edc9e3 authored by David A. Long's avatar David A. Long
Browse files

ARM: add uprobes support 



Using Rabin Vincent's ARM uprobes patches as a base, enable uprobes
support on ARM.

Caveats:

 - Thumb is not supported

Signed-off-by: default avatarRabin Vincent <rabin@rab.in>
Signed-off-by: default avatarDavid A. Long <dave.long@linaro.org>
parent b4cd605c

arch/arm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -207,6 +207,9 @@ config ZONE_DMA 
config NEED_DMA_MAP_STATE

       def_bool y



config ARCH_SUPPORTS_UPROBES

	def_bool y



config ARCH_HAS_DMA_SET_COHERENT_MASK

	bool

arch/arm/include/asm/ptrace.h

+6 −0
Original line number Diff line number Diff line
@@ -80,6 +80,12 @@ static inline long regs_return_value(struct pt_regs *regs) 


#define instruction_pointer(regs)	(regs)->ARM_pc



static inline void instruction_pointer_set(struct pt_regs *regs,

					   unsigned long val)

{

	instruction_pointer(regs) = val;

}



#ifdef CONFIG_SMP

extern unsigned long profile_pc(struct pt_regs *regs);

#else

arch/arm/include/asm/thread_info.h

+4 −1
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, 
#define TIF_SIGPENDING		0

#define TIF_NEED_RESCHED	1

#define TIF_NOTIFY_RESUME	2	/* callback before returning to user */

#define TIF_UPROBE		7

#define TIF_SYSCALL_TRACE	8

#define TIF_SYSCALL_AUDIT	9

#define TIF_SYSCALL_TRACEPOINT	10
@@ -165,6 +166,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, 
#define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)

#define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)

#define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)

#define _TIF_UPROBE		(1 << TIF_UPROBE)

#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)

#define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)

#define _TIF_SYSCALL_TRACEPOINT	(1 << TIF_SYSCALL_TRACEPOINT)
@@ -178,7 +180,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, 
/*

 * Change these and you break ASM code in entry-common.S

 */

#define _TIF_WORK_MASK		(_TIF_NEED_RESCHED | _TIF_SIGPENDING | _TIF_NOTIFY_RESUME)

#define _TIF_WORK_MASK		(_TIF_NEED_RESCHED | _TIF_SIGPENDING | \

				 _TIF_NOTIFY_RESUME | _TIF_UPROBE)



#endif /* __KERNEL__ */

#endif /* __ASM_ARM_THREAD_INFO_H */

arch/arm/include/asm/uprobes.h

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 Rabin Vincent <rabin at rab.in>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef _ASM_UPROBES_H

#define _ASM_UPROBES_H



#include <asm/probes.h>

#include <asm/opcodes.h>



typedef u32 uprobe_opcode_t;



#define MAX_UINSN_BYTES		4

#define UPROBE_XOL_SLOT_BYTES	64



#define UPROBE_SWBP_ARM_INSN	0xe7f001f9

#define UPROBE_SS_ARM_INSN	0xe7f001fa

#define UPROBE_SWBP_INSN	__opcode_to_mem_arm(UPROBE_SWBP_ARM_INSN)

#define UPROBE_SWBP_INSN_SIZE	4



struct arch_uprobe_task {

	u32 backup;

	unsigned long	saved_trap_no;

};



struct arch_uprobe {

	u8 insn[MAX_UINSN_BYTES];

	unsigned long ixol[2];

	uprobe_opcode_t bpinsn;

	bool simulate;

	u32 pcreg;

	void (*prehandler)(struct arch_uprobe *auprobe,

			   struct arch_uprobe_task *autask,

			   struct pt_regs *regs);

	void (*posthandler)(struct arch_uprobe *auprobe,

			    struct arch_uprobe_task *autask,

			    struct pt_regs *regs);

	struct arch_probes_insn asi;

};



#endif

arch/arm/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o insn.o 
obj-$(CONFIG_FUNCTION_GRAPH_TRACER)	+= ftrace.o insn.o

obj-$(CONFIG_JUMP_LABEL)	+= jump_label.o insn.o patch.o

obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o

obj-$(CONFIG_UPROBES)		+= probes.o probes-arm.o uprobes.o uprobes-arm.o

obj-$(CONFIG_KPROBES)		+= probes.o kprobes.o kprobes-common.o patch.o

ifdef CONFIG_THUMB2_KERNEL

obj-$(CONFIG_KPROBES)		+= kprobes-thumb.o probes-thumb.o