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

Commit 58cea307 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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:

 * Allow specifying syscalls in 'perf trace', a la strace.

 * Simplify symbol filtering by doing it at machine class level,
   from Adrian Hunter.

 * Add option to 'perf kvm' to print only events that exceed a specified time
   duration, from David Ahern.

 * 'perf sched' improvements, including removing some tracepoints that provide
   the same information as the PERF_RECORD_{FORK,EXIT} events.

 * Improve stack trace printing, from David Ahern.

 * Update documentation with live command, from David Ahern

 * Fix 'perf test' compile failure on do_sort_something, from David Ahern.

 * Improve robustness of topology parsing code, from Stephane Eranian.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 0a3d23a2 2ae3a312

tools/perf/Documentation/perf-kvm.txt

+44 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ SYNOPSIS 
	{top|record|report|diff|buildid-list}

'perf kvm' [--host] [--guest] [--guestkallsyms=<path> --guestmodules=<path>

	| --guestvmlinux=<path>] {top|record|report|diff|buildid-list|stat}

'perf kvm stat [record|report|live] [<options>]



DESCRIPTION

-----------
@@ -50,6 +51,10 @@ There are a couple of variants of perf kvm: 
  'perf kvm stat report' reports statistical data which includes events

  handled time, samples, and so on.



  'perf kvm stat live' reports statistical data in a live mode (similar to

  record + report but with statistical data updated live at a given display

  rate).



OPTIONS

-------

-i::
@@ -85,13 +90,50 @@ STAT REPORT OPTIONS 
--vcpu=<value>::

       analyze events which occures on this vcpu. (default: all vcpus)



--events=<value>::

       events to be analyzed. Possible values: vmexit, mmio, ioport.

--event=<value>::

       event to be analyzed. Possible values: vmexit, mmio, ioport.

       (default: vmexit)

-k::

--key=<value>::

       Sorting key. Possible values: sample (default, sort by samples

       number), time (sort by average time).

-p::

--pid=::

    Analyze events only for given process ID(s) (comma separated list).



STAT LIVE OPTIONS

-----------------

-d::

--display::

        Time in seconds between display updates



-m::

--mmap-pages=::

    Number of mmap data pages. Must be a power of two.



-a::

--all-cpus::

        System-wide collection from all CPUs.



-p::

--pid=::

    Analyze events only for given process ID(s) (comma separated list).



--vcpu=<value>::

       analyze events which occures on this vcpu. (default: all vcpus)





--event=<value>::

       event to be analyzed. Possible values: vmexit, mmio, ioport.

       (default: vmexit)



-k::

--key=<value>::

       Sorting key. Possible values: sample (default, sort by samples

       number), time (sort by average time).



--duration=<value>::

       Show events other than HLT that take longer than duration usecs.



SEE ALSO

--------

tools/perf/Documentation/perf-trace.txt

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ OPTIONS 
--all-cpus::

        System-wide collection from all CPUs.



-e::

--expr::

	List of events to show, currently only syscall names.



-p::

--pid=::

	Record events on existing process ID (comma separated list).

tools/perf/builtin-annotate.c

+3 −2
Original line number Diff line number Diff line
@@ -90,8 +90,7 @@ static int process_sample_event(struct perf_tool *tool, 
	struct perf_annotate *ann = container_of(tool, struct perf_annotate, tool);

	struct addr_location al;



	if (perf_event__preprocess_sample(event, machine, &al, sample,

					  symbol__annotate_init) < 0) {

	if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) {

		pr_warning("problem processing %d event, skipping it.\n",

			   event->header.type);

		return -1;
@@ -195,6 +194,8 @@ static int __cmd_annotate(struct perf_annotate *ann) 
	if (session == NULL)

		return -ENOMEM;



	machines__set_symbol_filter(&session->machines, symbol__annotate_init);



	if (ann->cpu_list) {

		ret = perf_session__cpu_bitmap(session, ann->cpu_list,

					       ann->cpu_bitmap);

tools/perf/builtin-diff.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused, 
{

	struct addr_location al;



	if (perf_event__preprocess_sample(event, machine, &al, sample, NULL) < 0) {

	if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) {

		pr_warning("problem processing %d event, skipping it.\n",

			   event->header.type);

		return -1;

tools/perf/builtin-inject.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool, 
	}



	thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION,

			      event->ip.ip, &al, NULL);

			      event->ip.ip, &al);



	if (al.map != NULL) {

		if (!al.map->dso->hit) {