Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull tracing updates from Steven Rostedt:
 "Some clean ups and small fixes, but the biggest change is the addition
  of the TRACE_DEFINE_ENUM() macro that can be used by tracepoints.

  Tracepoints have helper functions for the TP_printk() called
  __print_symbolic() and __print_flags() that lets a numeric number be
  displayed as a a human comprehensible text.  What is placed in the
  TP_printk() is also shown in the tracepoint format file such that user
  space tools like perf and trace-cmd can parse the binary data and
  express the values too.  Unfortunately, the way the TRACE_EVENT()
  macro works, anything placed in the TP_printk() will be shown pretty
  much exactly as is.  The problem arises when enums are used.  That's
  because unlike macros, enums will not be changed into their values by
  the C pre-processor.  Thus, the enum string is exported to the format
  file, and this makes it useless for user space tools.

  The TRACE_DEFINE_ENUM() solves this by converting the enum strings in
  the TP_printk() format into their number, and that is what is shown to
  user space.  For example, the tracepoint tlb_flush currently has this
  in its format file:

     __print_symbolic(REC->reason,
        { TLB_FLUSH_ON_TASK_SWITCH, "flush on task switch" },
        { TLB_REMOTE_SHOOTDOWN, "remote shootdown" },
        { TLB_LOCAL_SHOOTDOWN, "local shootdown" },
        { TLB_LOCAL_MM_SHOOTDOWN, "local mm shootdown" })

  After adding:

     TRACE_DEFINE_ENUM(TLB_FLUSH_ON_TASK_SWITCH);
     TRACE_DEFINE_ENUM(TLB_REMOTE_SHOOTDOWN);
     TRACE_DEFINE_ENUM(TLB_LOCAL_SHOOTDOWN);
     TRACE_DEFINE_ENUM(TLB_LOCAL_MM_SHOOTDOWN);

  Its format file will contain this:

     __print_symbolic(REC->reason,
        { 0, "flush on task switch" },
        { 1, "remote shootdown" },
        { 2, "local shootdown" },
        { 3, "local mm shootdown" })"

* tag 'trace-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (27 commits)
  tracing: Add enum_map file to show enums that have been mapped
  writeback: Export enums used by tracepoint to user space
  v4l: Export enums used by tracepoints to user space
  SUNRPC: Export enums in tracepoints to user space
  mm: tracing: Export enums in tracepoints to user space
  irq/tracing: Export enums in tracepoints to user space
  f2fs: Export the enums in the tracepoints to userspace
  net/9p/tracing: Export enums in tracepoints to userspace
  x86/tlb/trace: Export enums in used by tlb_flush tracepoint
  tracing/samples: Update the trace-event-sample.h with TRACE_DEFINE_ENUM()
  tracing: Allow for modules to convert their enums to values
  tracing: Add TRACE_DEFINE_ENUM() macro to map enums to their values
  tracing: Update trace-event-sample with TRACE_SYSTEM_VAR documentation
  tracing: Give system name a pointer
  brcmsmac: Move each system tracepoints to their own header
  iwlwifi: Move each system tracepoints to their own header
  mac80211: Move message tracepoints to their own header
  tracing: Add TRACE_SYSTEM_VAR to xhci-hcd
  tracing: Add TRACE_SYSTEM_VAR to kvm-s390
  tracing: Add TRACE_SYSTEM_VAR to intel-sst
  ...
parents 3f3c73de 9828413d

arch/s390/kvm/trace-s390.h

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,13 @@ 
#undef TRACE_INCLUDE_FILE

#define TRACE_INCLUDE_FILE trace-s390



/*

 * The TRACE_SYSTEM_VAR defaults to TRACE_SYSTEM, but must be a

 * legitimate C variable. It is not exported to user space.

 */

#undef TRACE_SYSTEM_VAR

#define TRACE_SYSTEM_VAR kvm_s390



/*

 * Trace point for the creation of the kvm instance.

 */

drivers/gpu/drm/drm_trace.h

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 


#undef TRACE_SYSTEM

#define TRACE_SYSTEM drm

#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)

#define TRACE_INCLUDE_FILE drm_trace



TRACE_EVENT(drm_vblank_event,

drivers/gpu/drm/i915/i915_trace.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 


#undef TRACE_SYSTEM

#define TRACE_SYSTEM i915

#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)

#define TRACE_INCLUDE_FILE i915_trace



/* pipe updates */

drivers/gpu/drm/radeon/radeon_trace.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 


#undef TRACE_SYSTEM

#define TRACE_SYSTEM radeon

#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)

#define TRACE_INCLUDE_FILE radeon_trace



TRACE_EVENT(radeon_bo_create,

drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_brcmsmac.h

0 → 100644
+102 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2011 Broadcom Corporation

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

 * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



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

#define __TRACE_BRCMSMAC_H



#include <linux/tracepoint.h>



#undef TRACE_SYSTEM

#define TRACE_SYSTEM brcmsmac



/*

 * We define a tracepoint, its arguments, its printk format and its

 * 'fast binary record' layout.

 */

TRACE_EVENT(brcms_timer,

	/* TPPROTO is the prototype of the function called by this tracepoint */

	TP_PROTO(struct brcms_timer *t),

	/*

	 * TPARGS(firstarg, p) are the parameters names, same as found in the

	 * prototype.

	 */

	TP_ARGS(t),

	/*

	 * Fast binary tracing: define the trace record via TP_STRUCT__entry().

	 * You can think about it like a regular C structure local variable

	 * definition.

	 */

	TP_STRUCT__entry(

		__field(uint, ms)

		__field(uint, set)

		__field(uint, periodic)

	),

	TP_fast_assign(

		__entry->ms = t->ms;

		__entry->set = t->set;

		__entry->periodic = t->periodic;

	),

	TP_printk(

		"ms=%u set=%u periodic=%u",

		__entry->ms, __entry->set, __entry->periodic

	)

);



TRACE_EVENT(brcms_dpc,

	TP_PROTO(unsigned long data),

	TP_ARGS(data),

	TP_STRUCT__entry(

		__field(unsigned long, data)

	),

	TP_fast_assign(

		__entry->data = data;

	),

	TP_printk(

		"data=%p",

		(void *)__entry->data

	)

);



TRACE_EVENT(brcms_macintstatus,

	TP_PROTO(const struct device *dev, int in_isr, u32 macintstatus,

		 u32 mask),

	TP_ARGS(dev, in_isr, macintstatus, mask),

	TP_STRUCT__entry(

		__string(dev, dev_name(dev))

		__field(int, in_isr)

		__field(u32, macintstatus)

		__field(u32, mask)

	),

	TP_fast_assign(

		__assign_str(dev, dev_name(dev));

		__entry->in_isr = in_isr;

		__entry->macintstatus = macintstatus;

		__entry->mask = mask;

	),

	TP_printk("[%s] in_isr=%d macintstatus=%#x mask=%#x", __get_str(dev),

		  __entry->in_isr, __entry->macintstatus, __entry->mask)

);

#endif /* __TRACE_BRCMSMAC_H */



#ifdef CONFIG_BRCM_TRACING



#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH .

#undef TRACE_INCLUDE_FILE

#define TRACE_INCLUDE_FILE brcms_trace_brcmsmac

#include <trace/define_trace.h>



#endif /* CONFIG_BRCM_TRACING */