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

Commit dfd9f7ab authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] ftrace: add dynamic ftrace support 



Dynamic ftrace support for s390.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent a2b53673

arch/s390/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ config S390 
	select USE_GENERIC_SMP_HELPERS if SMP

	select HAVE_SYSCALL_WRAPPERS

	select HAVE_FUNCTION_TRACER

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DEFAULT_NO_SPIN_MUTEXES

	select HAVE_OPROFILE

	select HAVE_KPROBES

arch/s390/include/asm/ftrace.h

+19 −0
Original line number Diff line number Diff line
@@ -2,7 +2,26 @@ 
#define _ASM_S390_FTRACE_H



#ifndef __ASSEMBLY__



extern void _mcount(void);

extern unsigned long ftrace_dyn_func;



struct dyn_arch_ftrace { };



#define MCOUNT_ADDR ((long)_mcount)



#ifdef CONFIG_64BIT

#define MCOUNT_INSN_SIZE 24

#define MCOUNT_OFFSET	 14

#else

#define MCOUNT_INSN_SIZE 30

#define MCOUNT_OFFSET	  8

#endif



static inline unsigned long ftrace_call_adjust(unsigned long addr)

{

	return addr - MCOUNT_OFFSET;

}



#endif /* __ASSEMBLY__ */

#endif /* _ASM_S390_FTRACE_H */

arch/s390/include/asm/lowcore.h

+6 −2
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
#define __LC_CPUID			0x02b0

#define __LC_INT_CLOCK			0x02c8

#define __LC_MACHINE_FLAGS		0x02d8

#define __LC_FTRACE_FUNC		0x02dc

#define __LC_IRB			0x0300

#define __LC_PFAULT_INTPARM		0x0080

#define __LC_CPU_TIMER_SAVE_AREA	0x00d8
@@ -113,6 +114,7 @@ 
#define __LC_INT_CLOCK			0x0340

#define __LC_VDSO_PER_CPU		0x0350

#define __LC_MACHINE_FLAGS		0x0358

#define __LC_FTRACE_FUNC		0x0360

#define __LC_IRB			0x0380

#define __LC_PASTE			0x03c0

#define __LC_PFAULT_INTPARM		0x11b8
@@ -281,7 +283,8 @@ struct _lowcore 
	__u64	int_clock;			/* 0x02c8 */

	__u64	clock_comparator;		/* 0x02d0 */

	__u32	machine_flags;			/* 0x02d8 */

	__u8	pad_0x02dc[0x0300-0x02dc];	/* 0x02dc */

	__u32	ftrace_func;			/* 0x02dc */

	__u8	pad_0x02f0[0x0300-0x02f0];	/* 0x02f0 */



	/* Interrupt response block */

	__u8	irb[64];			/* 0x0300 */
@@ -386,7 +389,8 @@ struct _lowcore 
	__u64	clock_comparator;		/* 0x0348 */

	__u64	vdso_per_cpu_data;		/* 0x0350 */

	__u64	machine_flags;			/* 0x0358 */

	__u8	pad_0x0360[0x0380-0x0360];	/* 0x0360 */

	__u64	ftrace_func;			/* 0x0360 */

	__u8	pad_0x0368[0x0380-0x0368];	/* 0x0368 */



	/* Interrupt response block. */

	__u8	irb[64];			/* 0x0380 */

arch/s390/kernel/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ ifdef CONFIG_FUNCTION_TRACER 
CFLAGS_REMOVE_early.o = -pg

endif



ifdef CONFIG_DYNAMIC_FTRACE

CFLAGS_REMOVE_ftrace.o = -pg

endif



#

# Passing null pointers is ok for smp code, since we access the lowcore here.

#
@@ -41,6 +45,7 @@ obj-$(CONFIG_COMPAT) += compat_linux.o compat_signal.o \ 
obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

obj-$(CONFIG_KPROBES)		+= kprobes.o

obj-$(CONFIG_FUNCTION_TRACER)	+= mcount.o

obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o



# Kexec part

S390_KEXEC_OBJS := machine_kexec.o crash.o

arch/s390/kernel/early.c

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/errno.h>

#include <linux/string.h>

#include <linux/ctype.h>

#include <linux/ftrace.h>

#include <linux/lockdep.h>

#include <linux/module.h>

#include <linux/pfn.h>
@@ -410,5 +411,8 @@ void __init startup_init(void) 
	sclp_facilities_detect();

	detect_memory_layout(memory_chunk);

	S390_lowcore.machine_flags = machine_flags;

#ifdef CONFIG_DYNAMIC_FTRACE

	S390_lowcore.ftrace_func = (unsigned long)ftrace_caller;

#endif

	lockdep_on();

}