Unverified Commit 74784081 authored by Guo Ren's avatar Guo Ren Committed by Palmer Dabbelt
Browse files

riscv: Add uprobes supported 



This patch adds support for uprobes on riscv architecture.

Just like kprobe, it support single-step and simulate instructions.

Signed-off-by: default avatarGuo Ren <guoren@linux.alibaba.com>
Reviewed-by: default avatarPekka Enberg <penberg@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Palmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 829adda5

arch/riscv/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ config ARCH_SELECT_MEMORY_MODEL 
config ARCH_WANT_GENERAL_HUGETLB

	def_bool y



config ARCH_SUPPORTS_UPROBES

	def_bool y



config SYS_SUPPORTS_HUGETLBFS

	depends on MMU

	def_bool y

arch/riscv/include/asm/processor.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ struct thread_struct { 
	unsigned long sp;	/* Kernel mode stack */

	unsigned long s[12];	/* s[0]: frame pointer */

	struct __riscv_d_ext_state fstate;

	unsigned long bad_cause;

};



#define INIT_THREAD {					\

arch/riscv/include/asm/thread_info.h

+3 −1
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ struct thread_info { 
#define TIF_SYSCALL_AUDIT	7	/* syscall auditing */

#define TIF_SECCOMP		8	/* syscall secure computing */

#define TIF_NOTIFY_SIGNAL	9	/* signal notifications exist */

#define TIF_UPROBE		10	/* uprobe breakpoint or singlestep */



#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)

#define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)
@@ -84,10 +85,11 @@ struct thread_info { 
#define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)

#define _TIF_SECCOMP		(1 << TIF_SECCOMP)

#define _TIF_NOTIFY_SIGNAL	(1 << TIF_NOTIFY_SIGNAL)

#define _TIF_UPROBE		(1 << TIF_UPROBE)



#define _TIF_WORK_MASK \

	(_TIF_NOTIFY_RESUME | _TIF_SIGPENDING | _TIF_NEED_RESCHED | \

	 _TIF_NOTIFY_SIGNAL)

	 _TIF_NOTIFY_SIGNAL | _TIF_UPROBE)



#define _TIF_SYSCALL_WORK \

	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_TRACEPOINT | _TIF_SYSCALL_AUDIT | \

arch/riscv/include/asm/uprobes.h

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */



#ifndef _ASM_RISCV_UPROBES_H

#define _ASM_RISCV_UPROBES_H



#include <asm/probes.h>

#include <asm/patch.h>

#include <asm/bug.h>



#define MAX_UINSN_BYTES		8



#ifdef CONFIG_RISCV_ISA_C

#define UPROBE_SWBP_INSN	__BUG_INSN_16

#define UPROBE_SWBP_INSN_SIZE	2

#else

#define UPROBE_SWBP_INSN	__BUG_INSN_32

#define UPROBE_SWBP_INSN_SIZE	4

#endif

#define UPROBE_XOL_SLOT_BYTES	MAX_UINSN_BYTES



typedef u32 uprobe_opcode_t;



struct arch_uprobe_task {

	unsigned long   saved_cause;

};



struct arch_uprobe {

	union {

		u8 insn[MAX_UINSN_BYTES];

		u8 ixol[MAX_UINSN_BYTES];

	};

	struct arch_probe_insn api;

	unsigned long insn_size;

	bool simulate;

};



bool uprobe_breakpoint_handler(struct pt_regs *regs);

bool uprobe_single_step_handler(struct pt_regs *regs);



#endif /* _ASM_RISCV_UPROBES_H */

arch/riscv/kernel/probes/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ 
obj-$(CONFIG_KPROBES)		+= kprobes.o decode-insn.o simulate-insn.o

obj-$(CONFIG_KPROBES)		+= kprobes_trampoline.o

obj-$(CONFIG_KPROBES_ON_FTRACE)	+= ftrace.o

obj-$(CONFIG_UPROBES)		+= uprobes.o decode-insn.o simulate-insn.o

CFLAGS_REMOVE_simulate-insn.o = $(CC_FLAGS_FTRACE)