Commit 09670b8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-v6.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace 

Pull tracing fixes from Steven Rostedt:

 - Fix accounting of stop_count in file release

   On opening the trace file, if "pause-on-trace" option is set, it will
   increment the stop_count. On file release, it checks if stop_count is
   set, and if so it decrements it. Since this code was originally
   written, the stop_count can be incremented by other use cases. This
   makes just checking the stop_count not enough to know if it should be
   decremented.

   Add a new iterator flag called "PAUSE" and have it set if the open
   disables tracing and only decrement the stop_count if that flag is
   set on close.

 - Remove length field in trace_seq_printf() of print_synth_event()

   When printing the synthetic event that has a static length array
   field, the vsprintf() of the trace_seq_printf() triggered a
   "(efault)" in the output. That's because the print_fmt replaced the
   "%.*s" with "%s" causing the arguments to be off.

 - Fix a bunch of typos

* tag 'trace-v6.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing: Fix typo in trace_seq.c
  tracing: Fix typo in trace_probe.c
  tracing: Fix multiple typos in trace_osnoise.c
  tracing: Fix multiple typos in trace_events_user.c
  tracing: Fix typo in trace_events_trigger.c
  tracing: Fix typo in trace_events_hist.c
  tracing: Fix typo in trace_events_filter.c
  tracing: Fix multiple typos in trace_events.c
  tracing: Fix multiple typos in trace.c
  tracing: Fix typo in ring_buffer_benchmark.c
  tracing: Fix multiple typos in ring_buffer.c
  tracing: Fix typo in fprobe.c
  tracing: Fix typo in fpgraph.c
  tracing: Fix fixed array of synthetic event
  tracing: Fix enabling of tracing on file release
parents cc3ee4ba c5108c58

include/linux/trace_events.h

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ enum trace_iter_flags { 
	TRACE_FILE_LAT_FMT	= 1,

	TRACE_FILE_ANNOTATE	= 2,

	TRACE_FILE_TIME_IN_NS	= 4,

	TRACE_FILE_PAUSE	= 8,

};

kernel/trace/fgraph.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ enum { 
#define RET_STACK(t, offset) ((struct ftrace_ret_stack *)(&(t)->ret_stack[offset]))



/*

 * Each fgraph_ops has a reservered unsigned long at the end (top) of the

 * Each fgraph_ops has a reserved unsigned long at the end (top) of the

 * ret_stack to store task specific state.

 */

#define SHADOW_STACK_TASK_VARS(ret_stack) \

kernel/trace/fprobe.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
 * fprobe_table: hold 'fprobe_hlist::hlist' for checking the fprobe still

 *   exists. The key is the address of fprobe instance.

 * fprobe_ip_table: hold 'fprobe_hlist::array[*]' for searching the fprobe

 *   instance related to the funciton address. The key is the ftrace IP

 *   instance related to the function address. The key is the ftrace IP

 *   address.

 *

 * When unregistering the fprobe, fprobe_hlist::fp and fprobe_hlist::array[*].fp

kernel/trace/ring_buffer.c

+3 −3
Original line number Diff line number Diff line
@@ -1770,7 +1770,7 @@ static bool rb_meta_init(struct trace_buffer *buffer, int scratch_size) 
	bmeta->total_size = total_size;

	bmeta->buffers_offset = (void *)ptr - (void *)bmeta;



	/* Zero out the scatch pad */

	/* Zero out the scratch pad */

	memset((void *)bmeta + sizeof(*bmeta), 0, bmeta->buffers_offset - sizeof(*bmeta));



	return false;
@@ -6089,7 +6089,7 @@ static void rb_clear_buffer_page(struct buffer_page *page) 
 * id field, and updated via this function.

 *

 * But for a fixed memory mapped buffer, the id is already assigned for

 * fixed memory ording in the memory layout and can not be used. Instead

 * fixed memory ordering in the memory layout and can not be used. Instead

 * the index of where the page lies in the memory layout is used.

 *

 * For the normal pages, set the buffer page id with the passed in @id
@@ -7669,7 +7669,7 @@ static __init int test_ringbuffer(void) 
	/*

	 * Show buffer is enabled before setting rb_test_started.

	 * Yes there's a small race window where events could be

	 * dropped and the thread wont catch it. But when a ring

	 * dropped and the thread won't catch it. But when a ring

	 * buffer gets enabled, there will always be some kind of

	 * delay before other CPUs see it. Thus, we don't care about

	 * those dropped events. We care about events dropped after

kernel/trace/ring_buffer_benchmark.c

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ static int __init ring_buffer_benchmark_init(void) 
{

	int ret;



	/* make a one meg buffer in overwite mode */

	/* make a one meg buffer in overwrite mode */

	buffer = ring_buffer_alloc(1000000, RB_FL_OVERWRITE);

	if (!buffer)

		return -ENOMEM;