Commit ea20d929 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

tracing: consolidate trace and trace_event headers 



Impact: clean up

Neil Horman (et. al.) criticized the way the trace events were broken up
into two files. The reason for that was that ftrace needed to separate out
the declarations from where the #include <linux/tracepoint.h> was used.
It then dawned on me that the tracepoint.h header only needs to define the
TRACE_EVENT macro if it is not already defined.

The solution is simply to test if TRACE_EVENT is defined, and if it is not
then the linux/tracepoint.h header can define it. This change consolidates
all the <traces>.h and <traces>_event_types.h into the <traces>.h file.

Reported-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Reported-by: default avatarTheodore Tso <tytso@mit.edu>
Reported-by: default avatarJiaying Zhang <jiayingz@google.com>
Cc: Zhaolei <zhaolei@cn.fujitsu.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Jason Baron <jbaron@redhat.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 0a19e53c

include/linux/tracepoint.h

+8 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ struct tracepoint { 
					 * Keep in sync with vmlinux.lds.h.

					 */



#ifndef DECLARE_TRACE



#define TP_PROTO(args...)	args

#define TP_ARGS(args...)		args
@@ -114,6 +116,7 @@ static inline void tracepoint_update_probe_range(struct tracepoint *begin, 
	struct tracepoint *end)

{ }

#endif /* CONFIG_TRACEPOINTS */

#endif /* DECLARE_TRACE */



/*

 * Connect a probe to a tracepoint.
@@ -154,10 +157,13 @@ static inline void tracepoint_synchronize_unregister(void) 
}



#define PARAMS(args...) args



#ifndef TRACE_FORMAT

#define TRACE_FORMAT(name, proto, args, fmt)		\

	DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))

#endif





#ifndef TRACE_EVENT

/*

 * For use with the TRACE_EVENT macro:

 *
@@ -262,5 +268,6 @@ static inline void tracepoint_synchronize_unregister(void) 


#define TRACE_EVENT(name, proto, args, struct, assign, print)	\

	DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))

#endif



#endif

include/trace/irq.h

+48 −3
Original line number Diff line number Diff line 
#ifndef _TRACE_IRQ_H

#if !defined(_TRACE_IRQ_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_IRQ_H



#include <linux/interrupt.h>

#include <linux/tracepoint.h>

#include <linux/interrupt.h>



#undef TRACE_SYSTEM

#define TRACE_SYSTEM irq



/*

 * Tracepoint for entry of interrupt handler:

 */

TRACE_FORMAT(irq_handler_entry,

	TP_PROTO(int irq, struct irqaction *action),

	TP_ARGS(irq, action),

	TP_FMT("irq=%d handler=%s", irq, action->name)

	);



/*

 * Tracepoint for return of an interrupt handler:

 */

TRACE_EVENT(irq_handler_exit,



	TP_PROTO(int irq, struct irqaction *action, int ret),



	TP_ARGS(irq, action, ret),



	TP_STRUCT__entry(

		__field(	int,	irq	)

		__field(	int,	ret	)

	),



	TP_fast_assign(

		__entry->irq	= irq;

		__entry->ret	= ret;

	),



	TP_printk("irq=%d return=%s",

		  __entry->irq, __entry->ret ? "handled" : "unhandled")

);



TRACE_FORMAT(softirq_entry,

	TP_PROTO(struct softirq_action *h, struct softirq_action *vec),

	TP_ARGS(h, vec),

	TP_FMT("softirq=%d action=%s", (int)(h - vec), softirq_to_name[h-vec])

	);



#include <trace/irq_event_types.h>

TRACE_FORMAT(softirq_exit,

	TP_PROTO(struct softirq_action *h, struct softirq_action *vec),

	TP_ARGS(h, vec),

	TP_FMT("softirq=%d action=%s", (int)(h - vec), softirq_to_name[h-vec])

	);



#endif

include/trace/irq_event_types.h

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 


/* use <trace/irq.h> instead */

#ifndef TRACE_FORMAT

# error Do not include this file directly.

# error Unless you know what you are doing.

#endif



#undef TRACE_SYSTEM

#define TRACE_SYSTEM irq



/*

 * Tracepoint for entry of interrupt handler:

 */

TRACE_FORMAT(irq_handler_entry,

	TP_PROTO(int irq, struct irqaction *action),

	TP_ARGS(irq, action),

	TP_FMT("irq=%d handler=%s", irq, action->name)

	);



/*

 * Tracepoint for return of an interrupt handler:

 */

TRACE_EVENT(irq_handler_exit,



	TP_PROTO(int irq, struct irqaction *action, int ret),



	TP_ARGS(irq, action, ret),



	TP_STRUCT__entry(

		__field(	int,	irq	)

		__field(	int,	ret	)

	),



	TP_fast_assign(

		__entry->irq	= irq;

		__entry->ret	= ret;

	),



	TP_printk("irq=%d return=%s",

		  __entry->irq, __entry->ret ? "handled" : "unhandled")

);



TRACE_FORMAT(softirq_entry,

	TP_PROTO(struct softirq_action *h, struct softirq_action *vec),

	TP_ARGS(h, vec),

	TP_FMT("softirq=%d action=%s", (int)(h - vec), softirq_to_name[h-vec])

	);



TRACE_FORMAT(softirq_exit,

	TP_PROTO(struct softirq_action *h, struct softirq_action *vec),

	TP_ARGS(h, vec),

	TP_FMT("softirq=%d action=%s", (int)(h - vec), softirq_to_name[h-vec])

	);



#undef TRACE_SYSTEM

include/trace/kmem.h

+186 −3
Original line number Diff line number Diff line 
#ifndef _TRACE_KMEM_H

#if !defined(_TRACE_KMEM_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_KMEM_H



#include <linux/types.h>

#include <linux/tracepoint.h>



#include <trace/kmem_event_types.h>

#undef TRACE_SYSTEM

#define TRACE_SYSTEM kmem



#endif /* _TRACE_KMEM_H */
 
TRACE_EVENT(kmalloc,



	TP_PROTO(unsigned long call_site,

		 const void *ptr,

		 size_t bytes_req,

		 size_t bytes_alloc,

		 gfp_t gfp_flags),



	TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags),



	TP_STRUCT__entry(

		__field(	unsigned long,	call_site	)

		__field(	const void *,	ptr		)

		__field(	size_t,		bytes_req	)

		__field(	size_t,		bytes_alloc	)

		__field(	gfp_t,		gfp_flags	)

	),



	TP_fast_assign(

		__entry->call_site	= call_site;

		__entry->ptr		= ptr;

		__entry->bytes_req	= bytes_req;

		__entry->bytes_alloc	= bytes_alloc;

		__entry->gfp_flags	= gfp_flags;

	),



	TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%08x",

		__entry->call_site,

		__entry->ptr,

		__entry->bytes_req,

		__entry->bytes_alloc,

		__entry->gfp_flags)

);



TRACE_EVENT(kmem_cache_alloc,



	TP_PROTO(unsigned long call_site,

		 const void *ptr,

		 size_t bytes_req,

		 size_t bytes_alloc,

		 gfp_t gfp_flags),



	TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags),



	TP_STRUCT__entry(

		__field(	unsigned long,	call_site	)

		__field(	const void *,	ptr		)

		__field(	size_t,		bytes_req	)

		__field(	size_t,		bytes_alloc	)

		__field(	gfp_t,		gfp_flags	)

	),



	TP_fast_assign(

		__entry->call_site	= call_site;

		__entry->ptr		= ptr;

		__entry->bytes_req	= bytes_req;

		__entry->bytes_alloc	= bytes_alloc;

		__entry->gfp_flags	= gfp_flags;

	),



	TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%08x",

		__entry->call_site,

		__entry->ptr,

		__entry->bytes_req,

		__entry->bytes_alloc,

		__entry->gfp_flags)

);



TRACE_EVENT(kmalloc_node,



	TP_PROTO(unsigned long call_site,

		 const void *ptr,

		 size_t bytes_req,

		 size_t bytes_alloc,

		 gfp_t gfp_flags,

		 int node),



	TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node),



	TP_STRUCT__entry(

		__field(	unsigned long,	call_site	)

		__field(	const void *,	ptr		)

		__field(	size_t,		bytes_req	)

		__field(	size_t,		bytes_alloc	)

		__field(	gfp_t,		gfp_flags	)

		__field(	int,		node		)

	),



	TP_fast_assign(

		__entry->call_site	= call_site;

		__entry->ptr		= ptr;

		__entry->bytes_req	= bytes_req;

		__entry->bytes_alloc	= bytes_alloc;

		__entry->gfp_flags	= gfp_flags;

		__entry->node		= node;

	),



	TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%08x node=%d",

		__entry->call_site,

		__entry->ptr,

		__entry->bytes_req,

		__entry->bytes_alloc,

		__entry->gfp_flags,

		__entry->node)

);



TRACE_EVENT(kmem_cache_alloc_node,



	TP_PROTO(unsigned long call_site,

		 const void *ptr,

		 size_t bytes_req,

		 size_t bytes_alloc,

		 gfp_t gfp_flags,

		 int node),



	TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node),



	TP_STRUCT__entry(

		__field(	unsigned long,	call_site	)

		__field(	const void *,	ptr		)

		__field(	size_t,		bytes_req	)

		__field(	size_t,		bytes_alloc	)

		__field(	gfp_t,		gfp_flags	)

		__field(	int,		node		)

	),



	TP_fast_assign(

		__entry->call_site	= call_site;

		__entry->ptr		= ptr;

		__entry->bytes_req	= bytes_req;

		__entry->bytes_alloc	= bytes_alloc;

		__entry->gfp_flags	= gfp_flags;

		__entry->node		= node;

	),



	TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%08x node=%d",

		__entry->call_site,

		__entry->ptr,

		__entry->bytes_req,

		__entry->bytes_alloc,

		__entry->gfp_flags,

		__entry->node)

);



TRACE_EVENT(kfree,



	TP_PROTO(unsigned long call_site, const void *ptr),



	TP_ARGS(call_site, ptr),



	TP_STRUCT__entry(

		__field(	unsigned long,	call_site	)

		__field(	const void *,	ptr		)

	),



	TP_fast_assign(

		__entry->call_site	= call_site;

		__entry->ptr		= ptr;

	),



	TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr)

);



TRACE_EVENT(kmem_cache_free,



	TP_PROTO(unsigned long call_site, const void *ptr),



	TP_ARGS(call_site, ptr),



	TP_STRUCT__entry(

		__field(	unsigned long,	call_site	)

		__field(	const void *,	ptr		)

	),



	TP_fast_assign(

		__entry->call_site	= call_site;

		__entry->ptr		= ptr;

	),



	TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr)

);



#endif

include/trace/lockdep.h

+50 −2
Original line number Diff line number Diff line 
#ifndef _TRACE_LOCKDEP_H

#if !defined(_TRACE_LOCKDEP_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_LOCKDEP_H



#include <linux/lockdep.h>

#include <linux/tracepoint.h>



#include <trace/lockdep_event_types.h>

#undef TRACE_SYSTEM

#define TRACE_SYSTEM lock



#ifdef CONFIG_LOCKDEP



TRACE_FORMAT(lock_acquire,

	TP_PROTO(struct lockdep_map *lock, unsigned int subclass,

		int trylock, int read, int check,

		struct lockdep_map *next_lock, unsigned long ip),

	TP_ARGS(lock, subclass, trylock, read, check, next_lock, ip),

	TP_FMT("%s%s%s", trylock ? "try " : "",

		read ? "read " : "", lock->name)

	);



TRACE_FORMAT(lock_release,

	TP_PROTO(struct lockdep_map *lock, int nested, unsigned long ip),

	TP_ARGS(lock, nested, ip),

	TP_FMT("%s", lock->name)

	);



#ifdef CONFIG_LOCK_STAT



TRACE_FORMAT(lock_contended,

	TP_PROTO(struct lockdep_map *lock, unsigned long ip),

	TP_ARGS(lock, ip),

	TP_FMT("%s", lock->name)

	);



TRACE_EVENT(lock_acquired,

	TP_PROTO(struct lockdep_map *lock, unsigned long ip, s64 waittime),



	TP_ARGS(lock, ip, waittime),



	TP_STRUCT__entry(

		__field(const char *, name)

		__field(unsigned long, wait_usec)

		__field(unsigned long, wait_nsec_rem)

	),

	TP_fast_assign(

		__entry->name = lock->name;

		__entry->wait_nsec_rem = do_div(waittime, NSEC_PER_USEC);

		__entry->wait_usec = (unsigned long) waittime;

	),

	TP_printk("%s (%lu.%03lu us)", __entry->name, __entry->wait_usec,

				       __entry->wait_nsec_rem)

);



#endif

#endif



#endif /* _TRACE_LOCKDEP_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE