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

Commit 2a0a5b22 authored by Jan Willeke's avatar Jan Willeke Committed by Martin Schwidefsky
Browse files

s390/uprobes: architecture backend for uprobes 



Signed-off-by: default avatarJan Willeke <willeke@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 975fab17

arch/s390/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ config NO_IOPORT_MAP 
config PCI_QUIRKS

	def_bool n



config ARCH_SUPPORTS_UPROBES

	def_bool 64BIT



config S390

	def_bool y

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

arch/s390/include/asm/ptrace.h

+6 −0
Original line number Diff line number Diff line
@@ -161,6 +161,12 @@ static inline long regs_return_value(struct pt_regs *regs) 
	return regs->gprs[2];

}



static inline void instruction_pointer_set(struct pt_regs *regs,

					   unsigned long val)

{

	regs->psw.addr = val | PSW_ADDR_AMODE;

}



int regs_query_register_offset(const char *name);

const char *regs_query_register_name(unsigned int offset);

unsigned long regs_get_register(struct pt_regs *regs, unsigned int offset);

arch/s390/include/asm/thread_info.h

+3 −0
Original line number Diff line number Diff line
@@ -84,11 +84,13 @@ static inline struct thread_info *current_thread_info(void) 
#define TIF_SYSCALL_AUDIT	4	/* syscall auditing active */

#define TIF_SECCOMP		5	/* secure computing */

#define TIF_SYSCALL_TRACEPOINT	6	/* syscall tracepoint instrumentation */

#define TIF_UPROBE		7	/* breakpointed or single-stepping */

#define TIF_31BIT		16	/* 32bit process */

#define TIF_MEMDIE		17	/* is terminating due to OOM killer */

#define TIF_RESTORE_SIGMASK	18	/* restore signal mask in do_signal() */

#define TIF_SINGLE_STEP		19	/* This task is single stepped */

#define TIF_BLOCK_STEP		20	/* This task is block stepped */

#define TIF_UPROBE_SINGLESTEP	21	/* This task is uprobe single stepped */



#define _TIF_NOTIFY_RESUME	(1<<TIF_NOTIFY_RESUME)

#define _TIF_SIGPENDING		(1<<TIF_SIGPENDING)
@@ -97,6 +99,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_SYSCALL_TRACEPOINT	(1<<TIF_SYSCALL_TRACEPOINT)

#define _TIF_UPROBE		(1<<TIF_UPROBE)

#define _TIF_31BIT		(1<<TIF_31BIT)

#define _TIF_SINGLE_STEP	(1<<TIF_SINGLE_STEP)

arch/s390/include/asm/uprobes.h

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

 *    User-space Probes (UProbes) for s390

 *

 *    Copyright IBM Corp. 2014

 *    Author(s): Jan Willeke,

 */



#ifndef _ASM_UPROBES_H

#define _ASM_UPROBES_H



#include <linux/notifier.h>



typedef u16 uprobe_opcode_t;



#define UPROBE_XOL_SLOT_BYTES	256 /* cache aligned */



#define UPROBE_SWBP_INSN	0x0002

#define UPROBE_SWBP_INSN_SIZE	2



struct arch_uprobe {

	union{

		uprobe_opcode_t insn[3];

		uprobe_opcode_t ixol[3];

	};

	unsigned int saved_per : 1;

	unsigned int saved_int_code;

};



struct arch_uprobe_task {

};



int arch_uprobe_analyze_insn(struct arch_uprobe *aup, struct mm_struct *mm,

			     unsigned long addr);

int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs);

int arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs);

bool arch_uprobe_xol_was_trapped(struct task_struct *tsk);

int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,

				 void *data);

void arch_uprobe_abort_xol(struct arch_uprobe *ap, struct pt_regs *regs);

unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline,

						struct pt_regs *regs);

#endif	/* _ASM_UPROBES_H */

arch/s390/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ obj-$(CONFIG_KPROBES) += kprobes.o 
obj-$(CONFIG_FUNCTION_TRACER)	+= $(if $(CONFIG_64BIT),mcount64.o,mcount.o)

obj-$(CONFIG_FUNCTION_TRACER)	+= ftrace.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_UPROBES)		+= uprobes.o



ifdef CONFIG_64BIT

obj-$(CONFIG_PERF_EVENTS)	+= perf_event.o perf_cpum_cf.o perf_cpum_sf.o \