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

Commit 179a7ba6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tracing updates from Steven Rostedt:
 "This release has a few updates:

   - STM can hook into the function tracer
   - Function filtering now supports more advance glob matching
   - Ftrace selftests updates and added tests
   - Softirq tag in traces now show only softirqs
   - ARM nop added to non traced locations at compile time
   - New trace_marker_raw file that allows for binary input
   - Optimizations to the ring buffer
   - Removal of kmap in trace_marker
   - Wakeup and irqsoff tracers now adhere to the set_graph_notrace file
   - Other various fixes and clean ups"

* tag 'trace-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (42 commits)
  selftests: ftrace: Shift down default message verbosity
  kprobes/trace: Fix kprobe selftest for newer gcc
  tracing/kprobes: Add a helper method to return number of probe hits
  tracing/rb: Init the CPU mask on allocation
  tracing: Use SOFTIRQ_OFFSET for softirq dectection for more accurate results
  tracing/fgraph: Have wakeup and irqsoff tracers ignore graph functions too
  fgraph: Handle a case where a tracer ignores set_graph_notrace
  tracing: Replace kmap with copy_from_user() in trace_marker writing
  ftrace/x86_32: Set ftrace_stub to weak to prevent gcc from using short jumps to it
  tracing: Allow benchmark to be enabled at early_initcall()
  tracing: Have system enable return error if one of the events fail
  tracing: Do not start benchmark on boot up
  tracing: Have the reg function allow to fail
  ring-buffer: Force rb_end_commit() and rb_set_commit_to_write() inline
  ring-buffer: Froce rb_update_write_stamp() to be inlined
  ring-buffer: Force inline of hotpath helper functions
  tracing: Make __buffer_unlock_commit() always_inline
  tracing: Make tracepoint_printk a static_key
  ring-buffer: Always inline rb_event_data()
  ring-buffer: Make rb_reserve_next_event() always inlined
  ...
parents 5e176d69 3dbb16b8

Documentation/trace/events.txt

+3 −6
Original line number Diff line number Diff line
@@ -189,16 +189,13 @@ And for string fields they are: 


==, !=, ~



The glob (~) only accepts a wild card character (*) at the start and or

end of the string. For example:

The glob (~) accepts a wild card character (*,?) and character classes

([). For example:



  prev_comm ~ "*sh"

  prev_comm ~ "sh*"

  prev_comm ~ "*sh*"



But does not allow for it to be within the string:



  prev_comm ~ "ba*sh"   <-- is invalid

  prev_comm ~ "ba*sh"



5.2 Setting filters

-------------------

Documentation/trace/ftrace.txt

+9 −6
Original line number Diff line number Diff line
@@ -416,6 +416,12 @@ of ftrace. Here is a list of some of the key files: 


		trace_fd = open("trace_marker", WR_ONLY);



  trace_marker_raw:



	This is similar to trace_marker above, but is meant for for binary data

	to be written to it, where a tool can be used to parse the data

	from trace_pipe_raw.



  uprobe_events:

 

	Add dynamic tracepoints in programs.
@@ -2238,16 +2244,13 @@ hrtimer_interrupt 
sys_nanosleep





Perhaps this is not enough. The filters also allow simple wild

cards. Only the following are currently available

Perhaps this is not enough. The filters also allow glob(7) matching.



  <match>*  - will match functions that begin with <match>

  *<match>  - will match functions that end with <match>

  *<match>* - will match functions that have <match> in it



These are the only wild cards which are supported.



  <match>*<match> will not work.

  <match1>*<match2> - will match functions that begin with

                      <match1> and end with <match2>



Note: It is better to use quotes to enclose the wild cards,

      otherwise the shell may expand the parameters into names

arch/powerpc/include/asm/trace.h

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ DEFINE_EVENT(ppc64_interrupt_class, timer_interrupt_exit, 
);



#ifdef CONFIG_PPC_PSERIES

extern void hcall_tracepoint_regfunc(void);

extern int hcall_tracepoint_regfunc(void);

extern void hcall_tracepoint_unregfunc(void);



TRACE_EVENT_FN_COND(hcall_entry,
@@ -104,7 +104,7 @@ TRACE_EVENT_FN_COND(hcall_exit, 
#endif



#ifdef CONFIG_PPC_POWERNV

extern void opal_tracepoint_regfunc(void);

extern int opal_tracepoint_regfunc(void);

extern void opal_tracepoint_unregfunc(void);



TRACE_EVENT_FN(opal_entry,

arch/powerpc/platforms/powernv/opal-tracepoints.c

+4 −2
Original line number Diff line number Diff line
@@ -6,9 +6,10 @@ 
#ifdef HAVE_JUMP_LABEL

struct static_key opal_tracepoint_key = STATIC_KEY_INIT;



void opal_tracepoint_regfunc(void)

int opal_tracepoint_regfunc(void)

{

	static_key_slow_inc(&opal_tracepoint_key);

	return 0;

}



void opal_tracepoint_unregfunc(void)
@@ -25,9 +26,10 @@ void opal_tracepoint_unregfunc(void) 
/* NB: reg/unreg are called while guarded with the tracepoints_mutex */

extern long opal_tracepoint_refcount;



void opal_tracepoint_regfunc(void)

int opal_tracepoint_regfunc(void)

{

	opal_tracepoint_refcount++;

	return 0;

}



void opal_tracepoint_unregfunc(void)

arch/powerpc/platforms/pseries/lpar.c

+4 −2
Original line number Diff line number Diff line
@@ -661,9 +661,10 @@ EXPORT_SYMBOL(arch_free_page); 
#ifdef HAVE_JUMP_LABEL

struct static_key hcall_tracepoint_key = STATIC_KEY_INIT;



void hcall_tracepoint_regfunc(void)

int hcall_tracepoint_regfunc(void)

{

	static_key_slow_inc(&hcall_tracepoint_key);

	return 0;

}



void hcall_tracepoint_unregfunc(void)
@@ -680,9 +681,10 @@ void hcall_tracepoint_unregfunc(void) 
/* NB: reg/unreg are called while guarded with the tracepoints_mutex */

extern long hcall_tracepoint_refcount;



void hcall_tracepoint_regfunc(void)

int hcall_tracepoint_regfunc(void)

{

	hcall_tracepoint_refcount++;

	return 0;

}



void hcall_tracepoint_unregfunc(void)