Commit 2a56bb59 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tracing updates from Steven Rostedt:
 "New features:

   - Tom Zanussi's extended histogram work.

     This adds the synthetic events to have histograms from multiple
     event data Adds triggers "onmatch" and "onmax" to call the
     synthetic events Several updates to the histogram code from this

   - Allow way to nest ring buffer calls in the same context

   - Allow absolute time stamps in ring buffer

   - Rewrite of filter code parsing based on Al Viro's suggestions

   - Setting of trace_clock to global if TSC is unstable (on boot)

   - Better OOM handling when allocating large ring buffers

   - Added initcall tracepoints (consolidated initcall_debug code with
     them)

  And other various fixes and clean ups"

* tag 'trace-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (68 commits)
  init: Have initcall_debug still work without CONFIG_TRACEPOINTS
  init, tracing: Have printk come through the trace events for initcall_debug
  init, tracing: instrument security and console initcall trace events
  init, tracing: Add initcall trace events
  tracing: Add rcu dereference annotation for test func that touches filter->prog
  tracing: Add rcu dereference annotation for filter->prog
  tracing: Fixup logic inversion on setting trace_global_clock defaults
  tracing: Hide global trace clock from lockdep
  ring-buffer: Add set/clear_current_oom_origin() during allocations
  ring-buffer: Check if memory is available before allocation
  lockdep: Add print_irqtrace_events() to __warn
  vsprintf: Do not preprocess non-dereferenced pointers for bprintf (%px and %pK)
  tracing: Uninitialized variable in create_tracing_map_fields()
  tracing: Make sure variable string fields are NULL-terminated
  tracing: Add action comparisons when testing matching hist triggers
  tracing: Don't add flag strings when displaying variable references
  tracing: Fix display of hist trigger expressions containing timestamps
  ftrace: Drop a VLA in module_exists()
  tracing: Mention trace_clock=global when warning about unstable clocks
  tracing: Default to using trace_global_clock if sched_clock is unstable
  ...
parents 9f3a0941 b0dc52f1

Documentation/trace/events.rst

+1 −1547

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/trace/ftrace.rst

+24 −0
Original line number Original line Diff line number Diff line
@@ -543,6 +543,30 @@ of ftrace. Here is a list of some of the key files: 




	See events.txt for more information.

	See events.txt for more information.





  timestamp_mode:



	Certain tracers may change the timestamp mode used when

	logging trace events into the event buffer.  Events with

	different modes can coexist within a buffer but the mode in

	effect when an event is logged determines which timestamp mode

	is used for that event.  The default timestamp mode is

	'delta'.



	Usual timestamp modes for tracing:



	  # cat timestamp_mode

	  [delta] absolute



	  The timestamp mode with the square brackets around it is the

	  one in effect.



	  delta: Default timestamp mode - timestamp is a delta against

	         a per-buffer timestamp.



	  absolute: The timestamp is a full timestamp, not a delta

                 against some other value.  As such it takes up more

                 space and is less efficient.



  hwlat_detector:

  hwlat_detector:





	Directory for the Hardware Latency Detector.

	Directory for the Hardware Latency Detector.

Documentation/trace/histogram.txt

0 → 100644
+1995 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/ring_buffer.h

+12 −5
Original line number Original line Diff line number Diff line
@@ -34,10 +34,12 @@ struct ring_buffer_event { 
 *				 array[0] = time delta (28 .. 59)

 *				 array[0] = time delta (28 .. 59)

 *				 size = 8 bytes

 *				 size = 8 bytes

 *

 *

 * @RINGBUF_TYPE_TIME_STAMP:	Sync time stamp with external clock

 * @RINGBUF_TYPE_TIME_STAMP:	Absolute timestamp

 *				 array[0]    = tv_nsec

 *				 Same format as TIME_EXTEND except that the

 *				 array[1..2] = tv_sec

 *				 value is an absolute timestamp, not a delta

 *				 size = 16 bytes

 *				 event.time_delta contains bottom 27 bits

 *				 array[0] = top (28 .. 59) bits

 *				 size = 8 bytes

 *

 *

 * <= @RINGBUF_TYPE_DATA_TYPE_LEN_MAX:

 * <= @RINGBUF_TYPE_DATA_TYPE_LEN_MAX:

 *				Data record

 *				Data record
@@ -54,12 +56,12 @@ enum ring_buffer_type { 
	RINGBUF_TYPE_DATA_TYPE_LEN_MAX = 28,

	RINGBUF_TYPE_DATA_TYPE_LEN_MAX = 28,

	RINGBUF_TYPE_PADDING,

	RINGBUF_TYPE_PADDING,

	RINGBUF_TYPE_TIME_EXTEND,

	RINGBUF_TYPE_TIME_EXTEND,

	/* FIXME: RINGBUF_TYPE_TIME_STAMP not implemented */

	RINGBUF_TYPE_TIME_STAMP,

	RINGBUF_TYPE_TIME_STAMP,

};

};





unsigned ring_buffer_event_length(struct ring_buffer_event *event);

unsigned ring_buffer_event_length(struct ring_buffer_event *event);

void *ring_buffer_event_data(struct ring_buffer_event *event);

void *ring_buffer_event_data(struct ring_buffer_event *event);

u64 ring_buffer_event_time_stamp(struct ring_buffer_event *event);





/*

/*

 * ring_buffer_discard_commit will remove an event that has not

 * ring_buffer_discard_commit will remove an event that has not
@@ -115,6 +117,9 @@ int ring_buffer_unlock_commit(struct ring_buffer *buffer, 
int ring_buffer_write(struct ring_buffer *buffer,

int ring_buffer_write(struct ring_buffer *buffer,

		      unsigned long length, void *data);

		      unsigned long length, void *data);





void ring_buffer_nest_start(struct ring_buffer *buffer);

void ring_buffer_nest_end(struct ring_buffer *buffer);



struct ring_buffer_event *

struct ring_buffer_event *

ring_buffer_peek(struct ring_buffer *buffer, int cpu, u64 *ts,

ring_buffer_peek(struct ring_buffer *buffer, int cpu, u64 *ts,

		 unsigned long *lost_events);

		 unsigned long *lost_events);
@@ -178,6 +183,8 @@ void ring_buffer_normalize_time_stamp(struct ring_buffer *buffer, 
				      int cpu, u64 *ts);

				      int cpu, u64 *ts);

void ring_buffer_set_clock(struct ring_buffer *buffer,

void ring_buffer_set_clock(struct ring_buffer *buffer,

			   u64 (*clock)(void));

			   u64 (*clock)(void));

void ring_buffer_set_time_stamp_abs(struct ring_buffer *buffer, bool abs);

bool ring_buffer_time_stamp_abs(struct ring_buffer *buffer);





size_t ring_buffer_page_len(void *page);

size_t ring_buffer_page_len(void *page);

include/linux/trace_events.h

+8 −6
Original line number Original line Diff line number Diff line
@@ -430,11 +430,13 @@ enum event_trigger_type { 




extern int filter_match_preds(struct event_filter *filter, void *rec);

extern int filter_match_preds(struct event_filter *filter, void *rec);





extern enum event_trigger_type event_triggers_call(struct trace_event_file *file,

extern enum event_trigger_type

						   void *rec);

event_triggers_call(struct trace_event_file *file, void *rec,

extern void event_triggers_post_call(struct trace_event_file *file,

		    struct ring_buffer_event *event);

extern void

event_triggers_post_call(struct trace_event_file *file,

			 enum event_trigger_type tt,

			 enum event_trigger_type tt,

				     void *rec);

			 void *rec, struct ring_buffer_event *event);





bool trace_event_ignore_this_pid(struct trace_event_file *trace_file);

bool trace_event_ignore_this_pid(struct trace_event_file *trace_file);
@@ -454,7 +456,7 @@ trace_trigger_soft_disabled(struct trace_event_file *file) 




	if (!(eflags & EVENT_FILE_FL_TRIGGER_COND)) {

	if (!(eflags & EVENT_FILE_FL_TRIGGER_COND)) {

		if (eflags & EVENT_FILE_FL_TRIGGER_MODE)

		if (eflags & EVENT_FILE_FL_TRIGGER_MODE)

			event_triggers_call(file, NULL);

			event_triggers_call(file, NULL, NULL);

		if (eflags & EVENT_FILE_FL_SOFT_DISABLED)

		if (eflags & EVENT_FILE_FL_SOFT_DISABLED)

			return true;

			return true;

		if (eflags & EVENT_FILE_FL_PID_FILTER)

		if (eflags & EVENT_FILE_FL_PID_FILTER)

CRA Git | Maintained and supported by SUSTech CRA and CCSE