Commit e0d27242 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'tracing-core-for-linus' of... 

Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (28 commits)
  ftrace: Add function names to dangling } in function graph tracer
  tracing: Simplify memory recycle of trace_define_field
  tracing: Remove unnecessary variable in print_graph_return
  tracing: Fix typo of info text in trace_kprobe.c
  tracing: Fix typo in prof_sysexit_enable()
  tracing: Remove CONFIG_TRACE_POWER from kernel config
  tracing: Fix ftrace_event_call alignment for use with gcc 4.5
  ftrace: Remove memory barriers from NMI code when not needed
  tracing/kprobes: Add short documentation for HAVE_REGS_AND_STACK_ACCESS_API
  s390: Add pt_regs register and stack access API
  tracing/kprobes: Make Kconfig dependencies generic
  tracing: Unify arch_syscall_addr() implementations
  tracing: Add notrace to TRACE_EVENT implementation functions
  ftrace: Allow to remove a single function from function graph filter
  tracing: Add correct/incorrect to sort keys for branch annotation output
  tracing: Simplify test for function_graph tracing start point
  tracing: Drop the tr check from the graph tracing path
  tracing: Add stack dump to trace_printk if stacktrace option is set
  tracing: Use appropriate perl constructs in recordmcount.pl
  tracing: optimize recordmcount.pl for offsets-handling
  ...
parents d25e8dbd 48091742

Documentation/trace/ftrace-design.txt

+2 −3
Original line number Diff line number Diff line
@@ -238,11 +238,10 @@ HAVE_SYSCALL_TRACEPOINTS 


You need very few things to get the syscalls tracing in an arch.



- Support HAVE_ARCH_TRACEHOOK (see arch/Kconfig).

- Have a NR_syscalls variable in <asm/unistd.h> that provides the number

  of syscalls supported by the arch.

- Implement arch_syscall_addr() that resolves a syscall address from a

  syscall number.

- Support the TIF_SYSCALL_TRACEPOINT thread flags

- Support the TIF_SYSCALL_TRACEPOINT thread flags.

- Put the trace_sys_enter() and trace_sys_exit() tracepoints calls from ptrace

  in the ptrace syscalls tracing path.

- Tag this arch as HAVE_SYSCALL_TRACEPOINTS.

arch/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -105,6 +105,14 @@ config HAVE_DMA_ATTRS 
config USE_GENERIC_SMP_HELPERS

	bool



config HAVE_REGS_AND_STACK_ACCESS_API

	bool

	help

	  This symbol should be selected by an architecure if it supports

	  the API needed to access registers and stack entries from pt_regs,

	  declared in asm/ptrace.h

	  For example the kprobes-based event tracer needs this API.



config HAVE_CLK

	bool

	help

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ config S390 
	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_DEFAULT_NO_SPIN_MUTEXES

	select HAVE_OPROFILE

	select HAVE_KPROBES

arch/s390/include/asm/ptrace.h

+12 −1
Original line number Diff line number Diff line
@@ -492,13 +492,24 @@ struct user_regs_struct 
struct task_struct;

extern void user_enable_single_step(struct task_struct *);

extern void user_disable_single_step(struct task_struct *);

extern void show_regs(struct pt_regs * regs);



#define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)

#define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN)

#define user_stack_pointer(regs)((regs)->gprs[15])

#define regs_return_value(regs)((regs)->gprs[2])

#define profile_pc(regs) instruction_pointer(regs)

extern void show_regs(struct pt_regs * regs);



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);

unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n);



static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)

{

	return regs->gprs[15] & PSW_ADDR_INSN;

}



#endif /* __KERNEL__ */

#endif /* __ASSEMBLY__ */

arch/s390/include/asm/syscall.h

+7 −0
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ 
#include <linux/sched.h>

#include <asm/ptrace.h>



/*

 * The syscall table always contains 32 bit pointers since we know that the

 * address of the function to be called is (way) below 4GB.  So the "int"

 * type here is what we want [need] for both 32 bit and 64 bit systems.

 */

extern const unsigned int sys_call_table[];



static inline long syscall_get_nr(struct task_struct *task,

				  struct pt_regs *regs)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE