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

Commit 1a91eac6 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:

User visible fixes and changes:

  * Show better error message in case we fail to open counters due to EBUSY error,
    for instance, when oprofile is running. (Jiri Olsa)

  * Honour -w in the report tools (report, top), allowing to specify the widths
    for the histogram entries columns. (Namhyung Kim)

  * Don't run workload if not told to, as happens when the user has no
    permission for profiling and even then the specified workload ends
    up running (Arnaldo Carvalho de Melo)

  * Do not ignore mmap events in 'perf kmem report'. This tool was using
    the kernel mmaps in the running machine instead of processing the mmap
    records from the perf.data file. (Namhyung Kim)

  * Properly show submicrosecond times in 'perf kvm stat' (Christian Borntraeger)

  * Honour existing 'perf record' --time/-T command line option (Andi Kleen)

  * Make sure --symfs usage includes the path separator (Arnaldo Carvalho de Melo)

Development infrastructure fixes and changes:

  * Fix arm64 build error (Mark Salter)

  * Fix make PYTHON override (Namhyung Kim)

  * Rename ordered_samples to ordered_events and allow setting a queue
    size for ordering events (Jiri Olsa)

  * Default to python version 2 (Thomas Ilsche)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents f96f5678 d6a947fb

tools/perf/Documentation/perf-report.txt

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ OPTIONS 
-w::

--column-widths=<width[,width...]>::

	Force each column width to the provided list, for large terminal

	readability.

	readability.  0 means no limit (default behavior).



-t::

--field-separator=::

tools/perf/Documentation/perf-top.txt

+6 −0
Original line number Diff line number Diff line
@@ -193,6 +193,12 @@ Default is to monitor all CPUS. 
	sum of shown entries will be always 100%. "absolute" means it retains

	the original value before and after the filter is applied.



-w::

--column-widths=<width[,width...]>::

	Force each column width to the provided list, for large terminal

	readability.  0 means no limit (default behavior).





INTERACTIVE PROMPTING KEYS

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

tools/perf/Makefile.perf

+2 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ LIB_H += util/xyarray.h 
LIB_H += util/header.h

LIB_H += util/help.h

LIB_H += util/session.h

LIB_H += util/ordered-events.h

LIB_H += util/strbuf.h

LIB_H += util/strlist.h

LIB_H += util/strfilter.h
@@ -347,6 +348,7 @@ LIB_OBJS += $(OUTPUT)util/machine.o 
LIB_OBJS += $(OUTPUT)util/map.o

LIB_OBJS += $(OUTPUT)util/pstack.o

LIB_OBJS += $(OUTPUT)util/session.o

LIB_OBJS += $(OUTPUT)util/ordered-events.o

LIB_OBJS += $(OUTPUT)util/comm.o

LIB_OBJS += $(OUTPUT)util/thread.o

LIB_OBJS += $(OUTPUT)util/thread_map.o

tools/perf/arch/arm64/include/perf_regs.h

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
#include <asm/perf_regs.h>



#define PERF_REGS_MASK	((1ULL << PERF_REG_ARM64_MAX) - 1)

#define PERF_REGS_MAX	PERF_REG_ARM64_MAX



#define PERF_REG_IP	PERF_REG_ARM64_PC

#define PERF_REG_SP	PERF_REG_ARM64_SP

tools/perf/builtin-annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) 
			.comm	= perf_event__process_comm,

			.exit	= perf_event__process_exit,

			.fork	= perf_event__process_fork,

			.ordered_samples = true,

			.ordered_events = true,

			.ordering_requires_timestamps = true,

		},

	};