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

Commit 55b4ce61 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

Merge tag 'perf-core-for-mingo-4.17-20180305' 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:

- Be more robust when drawing arrows in the annotation TUI, avoiding a
  segfault when jump instructions have as a target addresses in functions
  other that the one currently being annotated. The full fix will come in
  the following days, when jumping to other functions will work as call
  instructions (Arnaldo Carvalho de Melo)

- Allow asking for the maximum allowed sample rate in 'top' and
  'record', i.e. 'perf record -F max' will read the
  kernel.perf_event_max_sample_rate sysctl and use it (Arnaldo Carvalho de Melo)

- When the user specifies a freq above kernel.perf_event_max_sample_rate,
  Throttle it down to that max freq, and warn the user about it, add as
  well --strict-freq so that the previous behaviour of not starting the
  session when the desired freq can't be used can be selected (Arnaldo Carvalho de Melo)

- Find 'call' instruction target symbol at parsing time, used so far in
  the TUI, part of the infrastructure changes that will end up allowing
  for jumps to navigate to other functions, just like 'call'
  instructions. (Arnaldo Carvalho de Melo)

- Use xyarray dimensions to iterate fds in 'perf stat' (Andi Kleen)

- Ignore threads for which the current user hasn't permissions when
  enabling system-wide --per-thread (Jin Yao)

- Fix some backtrace perf test cases to use 'perf record' + 'perf script'
  instead, till 'perf trace' starts using ordered_events or equivalent
  to avoid symbol resolving artifacts due to reordering of
  PERF_RECORD_MMAP events (Jiri Olsa)

- Fix crash in 'perf record' pipe mode, it needs to allocate the ID
  array even for a single event, unlike non-pipe mode (Jiri Olsa)

- Make annoying fallback message on older kernels with newer 'perf top'
  binaries trying to use overwrite mode and that not being present
  in the older kernels (Kan Liang)

- Switch last users of old APIs to the newer perf_mmap__read_event()
  one, then discard those old mmap read forward APIs (Kan Liang)

- Fix the usage on the 'perf kallsyms' man page (Sangwon Hong)

- Simplify cgroup arguments when tracking multiple events (weiping zhang)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 8af31363 6afad54d

tools/perf/Documentation/perf-kallsyms.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ perf-kallsyms - Searches running kernel for symbols 
SYNOPSIS

--------

[verse]

'perf kallsyms <options> symbol_name[,symbol_name...]'

'perf kallsyms' [<options>] symbol_name[,symbol_name...]



DESCRIPTION

-----------

tools/perf/Documentation/perf-record.txt

+13 −2
Original line number Diff line number Diff line
@@ -191,9 +191,16 @@ OPTIONS 
-i::

--no-inherit::

	Child tasks do not inherit counters.



-F::

--freq=::

	Profile at this frequency.

	Profile at this frequency. Use 'max' to use the currently maximum

	allowed frequency, i.e. the value in the kernel.perf_event_max_sample_rate

	sysctl. Will throttle down to the currently maximum allowed frequency.

	See --strict-freq.



--strict-freq::

	Fail if the specified frequency can't be used.



-m::

--mmap-pages=::
@@ -308,7 +315,11 @@ can be provided. Each cgroup is applied to the corresponding event, i.e., first 
to first event, second cgroup to second event and so on. It is possible to provide

an empty cgroup (monitor all the time) using, e.g., -G foo,,bar. Cgroups must have

corresponding events, i.e., they always refer to events defined earlier on the command

line.

line. If the user wants to track multiple events for a specific cgroup, the user can

use '-e e1 -e e2 -G foo,foo' or just use '-e e1 -e e2 -G foo'.



If wanting to monitor, say, 'cycles' for a cgroup and also for system wide, this

command line can be used: 'perf stat -e cycles -G cgroup_name -a -e cycles'.



-b::

--branch-any::

tools/perf/Documentation/perf-stat.txt

+5 −1
Original line number Diff line number Diff line
@@ -118,7 +118,11 @@ can be provided. Each cgroup is applied to the corresponding event, i.e., first 
to first event, second cgroup to second event and so on. It is possible to provide

an empty cgroup (monitor all the time) using, e.g., -G foo,,bar. Cgroups must have

corresponding events, i.e., they always refer to events defined earlier on the command

line.

line. If the user wants to track multiple events for a specific cgroup, the user can

use '-e e1 -e e2 -G foo,foo' or just use '-e e1 -e e2 -G foo'.



If wanting to monitor, say, 'cycles' for a cgroup and also for system wide, this

command line can be used: 'perf stat -e cycles -G cgroup_name -a -e cycles'.



-o file::

--output file::

tools/perf/Documentation/perf-top.txt

+3 −1
Original line number Diff line number Diff line
@@ -55,7 +55,9 @@ Default is to monitor all CPUS. 


-F <freq>::

--freq=<freq>::

	Profile at this frequency.

	Profile at this frequency. Use 'max' to use the currently maximum

	allowed frequency, i.e. the value in the kernel.perf_event_max_sample_rate

	sysctl.



-i::

--inherit::

tools/perf/arch/x86/tests/perf-time-to-tsc.c

+9 −2
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 
	union perf_event *event;

	u64 test_tsc, comm1_tsc, comm2_tsc;

	u64 test_time, comm1_time = 0, comm2_time = 0;

	struct perf_mmap *md;

	u64 end, start;



	threads = thread_map__new(-1, getpid(), UINT_MAX);

	CHECK_NOT_NULL__(threads);
@@ -109,7 +111,11 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 
	perf_evlist__disable(evlist);



	for (i = 0; i < evlist->nr_mmaps; i++) {

		while ((event = perf_evlist__mmap_read(evlist, i)) != NULL) {

		md = &evlist->mmap[i];

		if (perf_mmap__read_init(md, false, &start, &end) < 0)

			continue;



		while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) {

			struct perf_sample sample;



			if (event->header.type != PERF_RECORD_COMM ||
@@ -128,8 +134,9 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 
				comm2_time = sample.time;

			}

next_event:

			perf_evlist__mmap_consume(evlist, i);

			perf_mmap__consume(md, false);

		}

		perf_mmap__read_done(md);

	}



	if (!comm1_time || !comm2_time)