Loading arch/mips/Kconfig +4 −0 Original line number Diff line number Diff line config MIPS bool default y select ARCH_SUPPORTS_UPROBES select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO select ARCH_USE_CMPXCHG_LOCKREF if 64BIT Loading Loading @@ -1041,6 +1042,9 @@ config FW_CFE config ARCH_DMA_ADDR_T_64BIT def_bool (HIGHMEM && ARCH_PHYS_ADDR_T_64BIT) || 64BIT config ARCH_SUPPORTS_UPROBES bool config DMA_MAYBE_COHERENT select DMA_NONCOHERENT bool Loading arch/mips/include/asm/kdebug.h +3 −1 Original line number Diff line number Diff line Loading @@ -11,7 +11,9 @@ enum die_val { DIE_PAGE_FAULT, DIE_BREAK, DIE_SSTEPBP, DIE_MSAFP DIE_MSAFP, DIE_UPROBE, DIE_UPROBE_XOL, }; #endif /* _ASM_MIPS_KDEBUG_H */ arch/mips/include/asm/ptrace.h +80 −0 Original line number Diff line number Diff line Loading @@ -14,11 +14,16 @@ #include <linux/linkage.h> #include <linux/types.h> #include <asm/isadep.h> #include <asm/page.h> #include <asm/thread_info.h> #include <uapi/asm/ptrace.h> /* * This struct defines the way the registers are stored on the stack during a * system call/exception. As usual the registers k0/k1 aren't being saved. * * If you add a register here, also add it to regoffset_table[] in * arch/mips/kernel/ptrace.c. */ struct pt_regs { #ifdef CONFIG_32BIT Loading @@ -43,8 +48,83 @@ struct pt_regs { unsigned long long mpl[6]; /* MTM{0-5} */ unsigned long long mtp[6]; /* MTP{0-5} */ #endif unsigned long __last[0]; } __aligned(8); static inline unsigned long kernel_stack_pointer(struct pt_regs *regs) { return regs->regs[31]; } /* * Don't use asm-generic/ptrace.h it defines FP accessors that don't make * sense on MIPS. We rather want an error if they get invoked. */ static inline void instruction_pointer_set(struct pt_regs *regs, unsigned long val) { regs->cp0_epc = val; } /* Query offset/name of register from its name/offset */ extern int regs_query_register_offset(const char *name); #define MAX_REG_OFFSET (offsetof(struct pt_regs, __last)) /** * regs_get_register() - get register value from its offset * @regs: pt_regs from which register value is gotten. * @offset: offset number of the register. * * regs_get_register returns the value of a register. The @offset is the * offset of the register in struct pt_regs address which specified by @regs. * If @offset is bigger than MAX_REG_OFFSET, this returns 0. */ static inline unsigned long regs_get_register(struct pt_regs *regs, unsigned int offset) { if (unlikely(offset > MAX_REG_OFFSET)) return 0; return *(unsigned long *)((unsigned long)regs + offset); } /** * regs_within_kernel_stack() - check the address in the stack * @regs: pt_regs which contains kernel stack pointer. * @addr: address which is checked. * * regs_within_kernel_stack() checks @addr is within the kernel stack page(s). * If @addr is within the kernel stack, it returns true. If not, returns false. */ static inline int regs_within_kernel_stack(struct pt_regs *regs, unsigned long addr) { return ((addr & ~(THREAD_SIZE - 1)) == (kernel_stack_pointer(regs) & ~(THREAD_SIZE - 1))); } /** * regs_get_kernel_stack_nth() - get Nth entry of the stack * @regs: pt_regs which contains kernel stack pointer. * @n: stack entry number. * * regs_get_kernel_stack_nth() returns @n th entry of the kernel stack which * is specified by @regs. If the @n th entry is NOT in the kernel stack, * this returns 0. */ static inline unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n) { unsigned long *addr = (unsigned long *)kernel_stack_pointer(regs); addr += n; if (regs_within_kernel_stack(regs, (unsigned long)addr)) return *addr; else return 0; } struct task_struct; extern int ptrace_getregs(struct task_struct *child, Loading arch/mips/include/asm/thread_info.h +4 −1 Original line number Diff line number Diff line Loading @@ -99,6 +99,7 @@ static inline struct thread_info *current_thread_info(void) #define TIF_SYSCALL_AUDIT 3 /* syscall auditing active */ #define TIF_SECCOMP 4 /* secure computing */ #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */ #define TIF_UPROBE 6 /* breakpointed or singlestepping */ #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */ #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */ #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ Loading @@ -122,6 +123,7 @@ static inline struct thread_info *current_thread_info(void) #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT) #define _TIF_SECCOMP (1<<TIF_SECCOMP) #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) #define _TIF_UPROBE (1<<TIF_UPROBE) #define _TIF_USEDFPU (1<<TIF_USEDFPU) #define _TIF_NOHZ (1<<TIF_NOHZ) #define _TIF_FIXADE (1<<TIF_FIXADE) Loading @@ -146,7 +148,8 @@ static inline struct thread_info *current_thread_info(void) /* work to do on interrupt/exception return */ #define _TIF_WORK_MASK \ (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME) (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME | \ _TIF_UPROBE) /* work to do on any return to u-space */ #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \ _TIF_WORK_SYSCALL_EXIT | \ Loading arch/mips/include/asm/uprobes.h 0 → 100644 +58 −0 Original line number Diff line number Diff line /* * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. */ #ifndef __ASM_UPROBES_H #define __ASM_UPROBES_H #include <linux/notifier.h> #include <linux/types.h> #include <asm/break.h> #include <asm/inst.h> /* * We want this to be defined as union mips_instruction but that makes the * generic code blow up. */ typedef u32 uprobe_opcode_t; /* * Classic MIPS (note this implementation doesn't consider microMIPS yet) * instructions are always 4 bytes but in order to deal with branches and * their delay slots, we treat instructions as having 8 bytes maximum. */ #define MAX_UINSN_BYTES 8 #define UPROBE_XOL_SLOT_BYTES 128 /* Max. cache line size */ #define UPROBE_BRK_UPROBE 0x000d000d /* break 13 */ #define UPROBE_BRK_UPROBE_XOL 0x000e000d /* break 14 */ #define UPROBE_SWBP_INSN UPROBE_BRK_UPROBE #define UPROBE_SWBP_INSN_SIZE 4 struct arch_uprobe { unsigned long resume_epc; u32 insn[2]; u32 ixol[2]; union mips_instruction orig_inst[MAX_UINSN_BYTES / 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 */ Loading
arch/mips/Kconfig +4 −0 Original line number Diff line number Diff line config MIPS bool default y select ARCH_SUPPORTS_UPROBES select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO select ARCH_USE_CMPXCHG_LOCKREF if 64BIT Loading Loading @@ -1041,6 +1042,9 @@ config FW_CFE config ARCH_DMA_ADDR_T_64BIT def_bool (HIGHMEM && ARCH_PHYS_ADDR_T_64BIT) || 64BIT config ARCH_SUPPORTS_UPROBES bool config DMA_MAYBE_COHERENT select DMA_NONCOHERENT bool Loading
arch/mips/include/asm/kdebug.h +3 −1 Original line number Diff line number Diff line Loading @@ -11,7 +11,9 @@ enum die_val { DIE_PAGE_FAULT, DIE_BREAK, DIE_SSTEPBP, DIE_MSAFP DIE_MSAFP, DIE_UPROBE, DIE_UPROBE_XOL, }; #endif /* _ASM_MIPS_KDEBUG_H */
arch/mips/include/asm/ptrace.h +80 −0 Original line number Diff line number Diff line Loading @@ -14,11 +14,16 @@ #include <linux/linkage.h> #include <linux/types.h> #include <asm/isadep.h> #include <asm/page.h> #include <asm/thread_info.h> #include <uapi/asm/ptrace.h> /* * This struct defines the way the registers are stored on the stack during a * system call/exception. As usual the registers k0/k1 aren't being saved. * * If you add a register here, also add it to regoffset_table[] in * arch/mips/kernel/ptrace.c. */ struct pt_regs { #ifdef CONFIG_32BIT Loading @@ -43,8 +48,83 @@ struct pt_regs { unsigned long long mpl[6]; /* MTM{0-5} */ unsigned long long mtp[6]; /* MTP{0-5} */ #endif unsigned long __last[0]; } __aligned(8); static inline unsigned long kernel_stack_pointer(struct pt_regs *regs) { return regs->regs[31]; } /* * Don't use asm-generic/ptrace.h it defines FP accessors that don't make * sense on MIPS. We rather want an error if they get invoked. */ static inline void instruction_pointer_set(struct pt_regs *regs, unsigned long val) { regs->cp0_epc = val; } /* Query offset/name of register from its name/offset */ extern int regs_query_register_offset(const char *name); #define MAX_REG_OFFSET (offsetof(struct pt_regs, __last)) /** * regs_get_register() - get register value from its offset * @regs: pt_regs from which register value is gotten. * @offset: offset number of the register. * * regs_get_register returns the value of a register. The @offset is the * offset of the register in struct pt_regs address which specified by @regs. * If @offset is bigger than MAX_REG_OFFSET, this returns 0. */ static inline unsigned long regs_get_register(struct pt_regs *regs, unsigned int offset) { if (unlikely(offset > MAX_REG_OFFSET)) return 0; return *(unsigned long *)((unsigned long)regs + offset); } /** * regs_within_kernel_stack() - check the address in the stack * @regs: pt_regs which contains kernel stack pointer. * @addr: address which is checked. * * regs_within_kernel_stack() checks @addr is within the kernel stack page(s). * If @addr is within the kernel stack, it returns true. If not, returns false. */ static inline int regs_within_kernel_stack(struct pt_regs *regs, unsigned long addr) { return ((addr & ~(THREAD_SIZE - 1)) == (kernel_stack_pointer(regs) & ~(THREAD_SIZE - 1))); } /** * regs_get_kernel_stack_nth() - get Nth entry of the stack * @regs: pt_regs which contains kernel stack pointer. * @n: stack entry number. * * regs_get_kernel_stack_nth() returns @n th entry of the kernel stack which * is specified by @regs. If the @n th entry is NOT in the kernel stack, * this returns 0. */ static inline unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n) { unsigned long *addr = (unsigned long *)kernel_stack_pointer(regs); addr += n; if (regs_within_kernel_stack(regs, (unsigned long)addr)) return *addr; else return 0; } struct task_struct; extern int ptrace_getregs(struct task_struct *child, Loading
arch/mips/include/asm/thread_info.h +4 −1 Original line number Diff line number Diff line Loading @@ -99,6 +99,7 @@ static inline struct thread_info *current_thread_info(void) #define TIF_SYSCALL_AUDIT 3 /* syscall auditing active */ #define TIF_SECCOMP 4 /* secure computing */ #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */ #define TIF_UPROBE 6 /* breakpointed or singlestepping */ #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */ #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */ #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ Loading @@ -122,6 +123,7 @@ static inline struct thread_info *current_thread_info(void) #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT) #define _TIF_SECCOMP (1<<TIF_SECCOMP) #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) #define _TIF_UPROBE (1<<TIF_UPROBE) #define _TIF_USEDFPU (1<<TIF_USEDFPU) #define _TIF_NOHZ (1<<TIF_NOHZ) #define _TIF_FIXADE (1<<TIF_FIXADE) Loading @@ -146,7 +148,8 @@ static inline struct thread_info *current_thread_info(void) /* work to do on interrupt/exception return */ #define _TIF_WORK_MASK \ (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME) (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME | \ _TIF_UPROBE) /* work to do on any return to u-space */ #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \ _TIF_WORK_SYSCALL_EXIT | \ Loading
arch/mips/include/asm/uprobes.h 0 → 100644 +58 −0 Original line number Diff line number Diff line /* * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. */ #ifndef __ASM_UPROBES_H #define __ASM_UPROBES_H #include <linux/notifier.h> #include <linux/types.h> #include <asm/break.h> #include <asm/inst.h> /* * We want this to be defined as union mips_instruction but that makes the * generic code blow up. */ typedef u32 uprobe_opcode_t; /* * Classic MIPS (note this implementation doesn't consider microMIPS yet) * instructions are always 4 bytes but in order to deal with branches and * their delay slots, we treat instructions as having 8 bytes maximum. */ #define MAX_UINSN_BYTES 8 #define UPROBE_XOL_SLOT_BYTES 128 /* Max. cache line size */ #define UPROBE_BRK_UPROBE 0x000d000d /* break 13 */ #define UPROBE_BRK_UPROBE_XOL 0x000e000d /* break 14 */ #define UPROBE_SWBP_INSN UPROBE_BRK_UPROBE #define UPROBE_SWBP_INSN_SIZE 4 struct arch_uprobe { unsigned long resume_epc; u32 insn[2]; u32 ixol[2]; union mips_instruction orig_inst[MAX_UINSN_BYTES / 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 */
Ralf Baechle <ralf@linux-mips.org>Ralf Baechle <ralf@linux-mips.org>