bf7165cfa2
There are several trace include files that define TRACE_INCLUDE_FILE. Include several of them in the same .c file (as I currently have in some code I am working on), and the compile will blow up with a "warning: "TRACE_INCLUDE_FILE" redefined #define TRACE_INCLUDE_FILE syscalls" Every other include file in include/trace/events/ avoids that issue by having a #undef TRACE_INCLUDE_FILE before the #define; syscalls.h should have one, too. Link: http://lkml.kernel.org/r/20160928225554.13bd7ac6@annuminas.surriel.com Cc: stable@vger.kernel.org Fixes: b8007ef74222 ("tracing: Separate raw syscall from syscall tracer") Signed-off-by: Rik van Riel <riel@redhat.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
74 lines
1.4 KiB
C
74 lines
1.4 KiB
C
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM raw_syscalls
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_FILE syscalls
|
|
|
|
#if !defined(_TRACE_EVENTS_SYSCALLS_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_EVENTS_SYSCALLS_H
|
|
|
|
#include <linux/tracepoint.h>
|
|
|
|
#include <asm/ptrace.h>
|
|
#include <asm/syscall.h>
|
|
|
|
|
|
#ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS
|
|
|
|
TRACE_EVENT_FN(sys_enter,
|
|
|
|
TP_PROTO(struct pt_regs *regs, long id),
|
|
|
|
TP_ARGS(regs, id),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( long, id )
|
|
__array( unsigned long, args, 6 )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->id = id;
|
|
syscall_get_arguments(current, regs, 0, 6, __entry->args);
|
|
),
|
|
|
|
TP_printk("NR %ld (%lx, %lx, %lx, %lx, %lx, %lx)",
|
|
__entry->id,
|
|
__entry->args[0], __entry->args[1], __entry->args[2],
|
|
__entry->args[3], __entry->args[4], __entry->args[5]),
|
|
|
|
syscall_regfunc, syscall_unregfunc
|
|
);
|
|
|
|
TRACE_EVENT_FLAGS(sys_enter, TRACE_EVENT_FL_CAP_ANY)
|
|
|
|
TRACE_EVENT_FN(sys_exit,
|
|
|
|
TP_PROTO(struct pt_regs *regs, long ret),
|
|
|
|
TP_ARGS(regs, ret),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( long, id )
|
|
__field( long, ret )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->id = syscall_get_nr(current, regs);
|
|
__entry->ret = ret;
|
|
),
|
|
|
|
TP_printk("NR %ld = %ld",
|
|
__entry->id, __entry->ret),
|
|
|
|
syscall_regfunc, syscall_unregfunc
|
|
);
|
|
|
|
TRACE_EVENT_FLAGS(sys_exit, TRACE_EVENT_FL_CAP_ANY)
|
|
|
|
#endif /* CONFIG_HAVE_SYSCALL_TRACEPOINTS */
|
|
|
|
#endif /* _TRACE_EVENTS_SYSCALLS_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|
|
|