Merge tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull IPI tracepoints for ARM from Steven Rostedt:
 "Nicolas Pitre added generic tracepoints for tracing IPIs and updated
  the arm and arm64 architectures.  It required some minor updates to
  the generic tracepoint system, so it had to wait for me to implement
  them"

* tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ARM64: add IPI tracepoints
  ARM: add IPI tracepoints
  tracepoint: add generic tracepoint definitions for IPI tracing
  tracing: Do not do anything special with tracepoint_string when tracing is disabled
This commit is contained in:
Linus Torvalds
2014-08-09 17:33:44 -07:00
5 changed files with 214 additions and 88 deletions

View File

@@ -0,0 +1,89 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM ipi
#if !defined(_TRACE_IPI_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_IPI_H
#include <linux/tracepoint.h>
/**
* ipi_raise - called when a smp cross call is made
*
* @mask: mask of recipient CPUs for the IPI
* @reason: string identifying the IPI purpose
*
* It is necessary for @reason to be a static string declared with
* __tracepoint_string.
*/
TRACE_EVENT(ipi_raise,
TP_PROTO(const struct cpumask *mask, const char *reason),
TP_ARGS(mask, reason),
TP_STRUCT__entry(
__bitmask(target_cpus, nr_cpumask_bits)
__field(const char *, reason)
),
TP_fast_assign(
__assign_bitmask(target_cpus, cpumask_bits(mask), nr_cpumask_bits);
__entry->reason = reason;
),
TP_printk("target_mask=%s (%s)", __get_bitmask(target_cpus), __entry->reason)
);
DECLARE_EVENT_CLASS(ipi_handler,
TP_PROTO(const char *reason),
TP_ARGS(reason),
TP_STRUCT__entry(
__field(const char *, reason)
),
TP_fast_assign(
__entry->reason = reason;
),
TP_printk("(%s)", __entry->reason)
);
/**
* ipi_entry - called immediately before the IPI handler
*
* @reason: string identifying the IPI purpose
*
* It is necessary for @reason to be a static string declared with
* __tracepoint_string, ideally the same as used with trace_ipi_raise
* for that IPI.
*/
DEFINE_EVENT(ipi_handler, ipi_entry,
TP_PROTO(const char *reason),
TP_ARGS(reason)
);
/**
* ipi_exit - called immediately after the IPI handler returns
*
* @reason: string identifying the IPI purpose
*
* It is necessary for @reason to be a static string declared with
* __tracepoint_string, ideally the same as used with trace_ipi_raise for
* that IPI.
*/
DEFINE_EVENT(ipi_handler, ipi_exit,
TP_PROTO(const char *reason),
TP_ARGS(reason)
);
#endif /* _TRACE_IPI_H */
/* This part must be outside protection */
#include <trace/define_trace.h>