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

Commit a9a3cd90 authored Jun 20, 2015 by Ingo Molnar

Merge tag 'perf-core-for-mingo' of...

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

  - Replace CTRL+z with 'f' as hotkey for enable/disable events (Arnaldo Carvalho de Melo)

  - Do not exit when 'f' is pressed in 'report' mode (Arnaldo Carvalho de Melo)

  - Tell the user how to unfreeze events after pressing 'f' in 'perf top' (Arnaldo Carvalho de Melo)

  - React to unassigned hotkey pressing in 'top/report' (Arnaldo Carvalho de Melo)

  - Display total number of samples with --show-total-period in 'annotate' (Martin Liška)

  - Add timeout to make procfs mmap processing more robust (Kan Liang)

  - Fix sort__sym_cmp to also compare end of symbol (Yannick Brosseau)

Infrastructure changes:

  - Ensure thread-stack is flushed (Adrian Hunter)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents 79928928 9d9cad76

include/uapi/linux/perf_event.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -565,6 +565,10 @@ struct perf_event_mmap_page {
	#define PERF_RECORD_MISC_GUEST_KERNEL (4 << 0)		#define PERF_RECORD_MISC_GUEST_KERNEL (4 << 0)
	#define PERF_RECORD_MISC_GUEST_USER (5 << 0)		#define PERF_RECORD_MISC_GUEST_USER (5 << 0)

			/*
			* Indicates that /proc/PID/maps parsing are truncated by time out.
			*/
			#define PERF_RECORD_MISC_PROC_MAP_PARSE_TIMEOUT (1 << 12)
	/*		/*
	* PERF_RECORD_MISC_MMAP_DATA and PERF_RECORD_MISC_COMM_EXEC are used on		* PERF_RECORD_MISC_MMAP_DATA and PERF_RECORD_MISC_COMM_EXEC are used on
	* different events so can reuse the same bit position.		* different events so can reuse the same bit position.

tools/perf/Documentation/perf-kvm.txt

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -151,6 +151,12 @@ STAT LIVE OPTIONS
	Show events other than HLT (x86 only) or Wait state (s390 only)		Show events other than HLT (x86 only) or Wait state (s390 only)
	that take longer than duration usecs.		that take longer than duration usecs.

			--proc-map-timeout::
			When processing pre-existing threads /proc/XXX/mmap, it may take
			a long time, because the file may be huge. A time out is needed
			in such cases.
			This option sets the time out limit. The default value is 500 ms.

	SEE ALSO		SEE ALSO
	--------		--------
	linkperf:perf-top[1], linkperf:perf-record[1], linkperf:perf-report[1],		linkperf:perf-top[1], linkperf:perf-record[1], linkperf:perf-report[1],

tools/perf/Documentation/perf-record.txt

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -271,6 +271,11 @@ AUX area tracing event. Optionally the number of bytes to capture per
	snapshot can be specified. In Snapshot Mode, trace data is captured only when		snapshot can be specified. In Snapshot Mode, trace data is captured only when
	signal SIGUSR2 is received.		signal SIGUSR2 is received.

			--proc-map-timeout::
			When processing pre-existing threads /proc/XXX/mmap, it may take a long time,
			because the file may be huge. A time out is needed in such cases.
			This option sets the time out limit. The default value is 500 ms.

	SEE ALSO		SEE ALSO
	--------		--------
	linkperf:perf-stat[1], linkperf:perf-list[1]		linkperf:perf-stat[1], linkperf:perf-list[1]

tools/perf/Documentation/perf-top.txt

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -201,6 +201,12 @@ Default is to monitor all CPUS.
	Force each column width to the provided list, for large terminal		Force each column width to the provided list, for large terminal
	readability. 0 means no limit (default behavior).		readability. 0 means no limit (default behavior).

			--proc-map-timeout::
			When processing pre-existing threads /proc/XXX/mmap, it may take
			a long time, because the file may be huge. A time out is needed
			in such cases.
			This option sets the time out limit. The default value is 500 ms.


	INTERACTIVE PROMPTING KEYS		INTERACTIVE PROMPTING KEYS
	--------------------------		--------------------------

tools/perf/Documentation/perf-trace.txt

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -121,6 +121,11 @@ the thread executes on the designated CPUs. Default is to monitor all CPUs.
	--event::		--event::
	Trace other events, see 'perf list' for a complete list.		Trace other events, see 'perf list' for a complete list.

			--proc-map-timeout::
			When processing pre-existing threads /proc/XXX/mmap, it may take a long time,
			because the file may be huge. A time out is needed in such cases.
			This option sets the time out limit. The default value is 500 ms.

	PAGEFAULTS		PAGEFAULTS
	----------		----------