Commit 2293be58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tracing fixes from Steven Rostedt:

 - rtla (Real-Time Linux Analysis tool):
    - fix typo in man page
    - Update API -e to -E before it is released
    - Error message fix and memory leak fix

 - Partially uninline trace event soft disable to shrink text

 - Fix function graph start up test

 - Have triggers affect the trace instance they are in and not top level

 - Have osnoise sleep in the units it says it uses

 - Remove unused ftrace stub function

 - Remove event probe redundant info from event in the buffer

 - Fix group ownership setting in tracefs

 - Ensure trace buffer is minimum size to prevent crashes

* tag 'trace-v5.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  rtla/osnoise: Fix error message when failing to enable trace instance
  rtla/osnoise: Free params at the exit
  rtla/hist: Make -E the short version of --entries
  tracing: Fix selftest config check for function graph start up test
  tracefs: Set the group ownership in apply_options() not parse_options()
  tracing/osnoise: Make osnoise_main to sleep for microseconds
  ftrace: Remove unused ftrace_startup_enable() stub
  tracing: Ensure trace buffer is at least 4096 bytes large
  tracing: Uninline trace_trigger_soft_disabled() partly
  eprobes: Remove redundant event type information
  tracing: Have traceon and traceoff trigger honor the instance
  tracing: Dump stacktrace trigger to the corresponding instance
  rtla: Fix systme -> system typo on man page
parents e41898d2 90f59ee4

Documentation/tools/rtla/common_hist_options.rst

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


        Set the histogram bucket size (default *1*).



**-e**, **--entries** *N*

**-E**, **--entries** *N*



        Set the number of entries of the histogram (default 256).

Documentation/tools/rtla/common_osnoise_description.rst

+1 −1
Original line number Diff line number Diff line 
The **rtla osnoise** tool is an interface for the *osnoise* tracer. The

*osnoise* tracer dispatches a kernel thread per-cpu. These threads read the

time in a loop while with preemption, softirq and IRQs enabled, thus

allowing all the sources of operating systme noise during its execution.

allowing all the sources of operating system noise during its execution.

The *osnoise*'s tracer threads take note of the delta between each time

read, along with an interference counter of all sources of interference.

At the end of each period, the *osnoise* tracer displays a summary of

Documentation/tools/rtla/rtla-osnoise-hist.rst

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ default). The reason for reducing the runtime is to avoid starving the 
**rtla** tool. The tool is also set to run for *one minute*. The output

histogram is set to group outputs in buckets of *10us* and *25* entries::



  [root@f34 ~/]# rtla osnoise hist -P F:1 -c 0-11 -r 900000 -d 1M -b 10 -e 25

  [root@f34 ~/]# rtla osnoise hist -P F:1 -c 0-11 -r 900000 -d 1M -b 10 -E 25

  # RTLA osnoise histogram

  # Time unit is microseconds (us)

  # Duration:   0 00:01:00

fs/tracefs/inode.c

+3 −2
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ static int tracefs_parse_options(char *data, struct tracefs_mount_opts *opts) 
			if (!gid_valid(gid))

				return -EINVAL;

			opts->gid = gid;

			set_gid(tracefs_mount->mnt_root, gid);

			break;

		case Opt_mode:

			if (match_octal(&args[0], &option))
@@ -291,7 +290,9 @@ static int tracefs_apply_options(struct super_block *sb) 
	inode->i_mode |= opts->mode;



	inode->i_uid = opts->uid;

	inode->i_gid = opts->gid;



	/* Set all the group ids to the mount option */

	set_gid(sb->s_root, opts->gid);



	return 0;

}

include/linux/trace_events.h

+12 −10
Original line number Diff line number Diff line
@@ -699,6 +699,8 @@ event_triggers_post_call(struct trace_event_file *file, 


bool trace_event_ignore_this_pid(struct trace_event_file *trace_file);



bool __trace_trigger_soft_disabled(struct trace_event_file *file);



/**

 * trace_trigger_soft_disabled - do triggers and test if soft disabled

 * @file: The file pointer of the event to test
@@ -708,20 +710,20 @@ bool trace_event_ignore_this_pid(struct trace_event_file *trace_file); 
 * triggers that require testing the fields, it will return true,

 * otherwise false.

 */

static inline bool

static __always_inline bool

trace_trigger_soft_disabled(struct trace_event_file *file)

{

	unsigned long eflags = file->flags;



	if (!(eflags & EVENT_FILE_FL_TRIGGER_COND)) {

		if (eflags & EVENT_FILE_FL_TRIGGER_MODE)

			event_triggers_call(file, NULL, NULL, NULL);

		if (eflags & EVENT_FILE_FL_SOFT_DISABLED)

			return true;

		if (eflags & EVENT_FILE_FL_PID_FILTER)

			return trace_event_ignore_this_pid(file);

	}

	if (likely(!(eflags & (EVENT_FILE_FL_TRIGGER_MODE |

			       EVENT_FILE_FL_SOFT_DISABLED |

			       EVENT_FILE_FL_PID_FILTER))))

		return false;



	if (likely(eflags & EVENT_FILE_FL_TRIGGER_COND))

		return false;



	return __trace_trigger_soft_disabled(file);

}



#ifdef CONFIG_BPF_EVENTS