* 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (40 commits) tracing: Separate raw syscall from syscall tracer ring-buffer-benchmark: Add parameters to set produce/consumer priorities tracing, function tracer: Clean up strstrip() usage ring-buffer benchmark: Run producer/consumer threads at nice +19 tracing: Remove the stale include/trace/power.h tracing: Only print objcopy version warning once from recordmcount tracing: Prevent build warning: 'ftrace_graph_buf' defined but not used ring-buffer: Move access to commit_page up into function used tracing: do not disable interrupts for trace_clock_local ring-buffer: Add multiple iterations between benchmark timestamps kprobes: Sanitize struct kretprobe_instance allocations tracing: Fix to use __always_unused attribute compiler: Introduce __always_unused tracing: Exit with error if a weak function is used in recordmcount.pl tracing: Move conditional into update_funcs() in recordmcount.pl tracing: Add regex for weak functions in recordmcount.pl tracing: Move mcount section search to front of loop in recordmcount.pl tracing: Fix objcopy revision check in recordmcount.pl tracing: Check absolute path of input file in recordmcount.pl tracing: Correct the check for number of arguments in recordmcount.pl ...
Showing the changes to include/trace (4 of 28 files). Show all
Unified · Split
| @@ -0,0 +1,61 @@ | ||
| 1 | +#undef TRACE_SYSTEM | |
| 2 | +#define TRACE_SYSTEM bkl | |
| 3 | + | |
| 4 | +#if !defined(_TRACE_BKL_H) || defined(TRACE_HEADER_MULTI_READ) | |
| 5 | +#define _TRACE_BKL_H | |
| 6 | + | |
| 7 | +#include <linux/tracepoint.h> | |
| 8 | + | |
| 9 | +TRACE_EVENT(lock_kernel, | |
| 10 | + | |
| 11 | + TP_PROTO(const char *func, const char *file, int line), | |
| 12 | + | |
| 13 | + TP_ARGS(func, file, line), | |
| 14 | + | |
| 15 | + TP_STRUCT__entry( | |
| 16 | + __field( int, lock_depth ) | |
| 17 | + __field_ext( const char *, func, FILTER_PTR_STRING ) | |
| 18 | + __field_ext( const char *, file, FILTER_PTR_STRING ) | |
| 19 | + __field( int, line ) | |
| 20 | + ), | |
| 21 | + | |
| 22 | + TP_fast_assign( | |
| 23 | + /* We want to record the lock_depth after lock is acquired */ | |
| 24 | + __entry->lock_depth = current->lock_depth + 1; | |
| 25 | + __entry->func = func; | |
| 26 | + __entry->file = file; | |
| 27 | + __entry->line = line; | |
| 28 | + ), | |
| 29 | + | |
| 30 | + TP_printk("depth: %d, %s:%d %s()", __entry->lock_depth, | |
| 31 | + __entry->file, __entry->line, __entry->func) | |
| 32 | +); | |
| 33 | + | |
| 34 | +TRACE_EVENT(unlock_kernel, | |
| 35 | + | |
| 36 | + TP_PROTO(const char *func, const char *file, int line), | |
| 37 | + | |
| 38 | + TP_ARGS(func, file, line), | |
| 39 | + | |
| 40 | + TP_STRUCT__entry( | |
| 41 | + __field(int, lock_depth) | |
| 42 | + __field(const char *, func) | |
| 43 | + __field(const char *, file) | |
| 44 | + __field(int, line) | |
| 45 | + ), | |
| 46 | + | |
| 47 | + TP_fast_assign( | |
| 48 | + __entry->lock_depth = current->lock_depth; | |
| 49 | + __entry->func = func; | |
| 50 | + __entry->file = file; | |
| 51 | + __entry->line = line; | |
| 52 | + ), | |
| 53 | + | |
| 54 | + TP_printk("depth: %d, %s:%d %s()", __entry->lock_depth, | |
| 55 | + __entry->file, __entry->line, __entry->func) | |
| 56 | +); | |
| 57 | + | |
| 58 | +#endif /* _TRACE_BKL_H */ | |
| 59 | + | |
| 60 | +/* This part must be outside protection */ | |
| 61 | +#include <trace/define_trace.h> | |
| @@ -1,5 +1,6 @@ | ||
| 1 | 1 | #undef TRACE_SYSTEM |
| 2 | −#define TRACE_SYSTEM syscalls | |
| 2 | +#define TRACE_SYSTEM raw_syscalls | |
| 3 | +#define TRACE_INCLUDE_FILE syscalls | |
| 3 | 4 | |
| 4 | 5 | #if !defined(_TRACE_EVENTS_SYSCALLS_H) || defined(TRACE_HEADER_MULTI_READ) |
| 5 | 6 | #define _TRACE_EVENTS_SYSCALLS_H |
| @@ -1,32 +0,0 @@ | ||
| 1 | −#ifndef _TRACE_POWER_H | |
| 2 | −#define _TRACE_POWER_H | |
| 3 | − | |
| 4 | −#include <linux/ktime.h> | |
| 5 | −#include <linux/tracepoint.h> | |
| 6 | − | |
| 7 | −enum { | |
| 8 | − POWER_NONE = 0, | |
| 9 | − POWER_CSTATE = 1, | |
| 10 | − POWER_PSTATE = 2, | |
| 11 | −}; | |
| 12 | − | |
| 13 | −struct power_trace { | |
| 14 | − ktime_t stamp; | |
| 15 | − ktime_t end; | |
| 16 | − int type; | |
| 17 | − int state; | |
| 18 | −}; | |
| 19 | − | |
| 20 | −DECLARE_TRACE(power_start, | |
| 21 | − TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state), | |
| 22 | − TP_ARGS(it, type, state)); | |
| 23 | − | |
| 24 | −DECLARE_TRACE(power_mark, | |
| 25 | − TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state), | |
| 26 | − TP_ARGS(it, type, state)); | |
| 27 | − | |
| 28 | −DECLARE_TRACE(power_end, | |
| 29 | − TP_PROTO(struct power_trace *it), | |
| 30 | − TP_ARGS(it)); | |
| 31 | − | |
| 32 | −#endif /* _TRACE_POWER_H */ | |
| @@ -33,7 +33,7 @@ struct syscall_metadata { · 32 unmodified lines | ||
| 33 | 33 | }; |
| 34 | 34 | |
| 35 | 35 | #ifdef CONFIG_FTRACE_SYSCALLS |
| 36 | −extern struct syscall_metadata *syscall_nr_to_meta(int nr); | |
| 36 | +extern unsigned long arch_syscall_addr(int nr); | |
| 37 | 37 | extern int syscall_name_to_nr(char *name); |
| 38 | 38 | void set_syscall_enter_id(int num, int id); |
| 39 | 39 | void set_syscall_exit_id(int num, int id); |