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

Commit 4bc6a58f authored Oct 01, 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:

User visible changes:

  - By default use the most precise "cycles" hw counter available, i.e.
    when the user doesn't specify any event, it will try using cycles:ppp,
    cycles:pp, etc. (Arnaldo Carvalho de Melo)

  - Remove blank lines, headers when piping output in 'perf list', so that it can
    be sanely used with 'wc -l', etc. (Arnaldo Carvalho de Melo)

  - Amend documentation about max_stack and synthesized callchains. (Adrian Hunter)

  - Fix 'perf probe -l' for probes added to kernel module functions. (Masami Hiramatsu)

Build fixes:

  - Fix shadowed declarations that break the build on older distros. (Jiri Olsa)

  - Fix build break on powerpc due to sample_reg_masks. (Sukadev Bhattiprolu)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parents 9c17dbc6 7f8d1ade

tools/include/linux/err.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -31,9 +31,9 @@

	#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)		#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)

	static inline void * __must_check ERR_PTR(long error)		static inline void * __must_check ERR_PTR(long error_)
	{		{
	return (void *) error;		return (void *) error_;
	}		}

	static inline long __must_check PTR_ERR(__force const void *ptr)		static inline long __must_check PTR_ERR(__force const void *ptr)

tools/lib/symbol/kallsyms.c

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2,6 +2,12 @@
	#include <stdio.h>		#include <stdio.h>
	#include <stdlib.h>		#include <stdlib.h>

			u8 kallsyms2elf_type(char type)
			{
			type = tolower(type);
			return (type == 't' \|\| type == 'w') ? STT_FUNC : STT_OBJECT;
			}

	int kallsyms__parse(const char filename, void arg,		int kallsyms__parse(const char filename, void arg,
	int (process_symbol)(void arg, const char *name,		int (process_symbol)(void arg, const char *name,
	char type, u64 start))		char type, u64 start))

tools/lib/symbol/kallsyms.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@
	#define KSYM_NAME_LEN 256		#define KSYM_NAME_LEN 256
	#endif		#endif

	static inline u8 kallsyms2elf_type(char type)		static inline u8 kallsyms2elf_binding(char type)
	{		{
	if (type == 'W')		if (type == 'W')
	return STB_WEAK;		return STB_WEAK;
	@@ -17,6 +17,8 @@ static inline u8 kallsyms2elf_type(char type)
	return isupper(type) ? STB_GLOBAL : STB_LOCAL;		return isupper(type) ? STB_GLOBAL : STB_LOCAL;
	}		}

			u8 kallsyms2elf_type(char type);

	int kallsyms__parse(const char filename, void arg,		int kallsyms__parse(const char filename, void arg,
	int (process_symbol)(void arg, const char *name,		int (process_symbol)(void arg, const char *name,
	char type, u64 start));		char type, u64 start));

tools/perf/Documentation/perf-report.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -205,6 +205,8 @@ OPTIONS
	beyond the specified depth will be ignored. This is a trade-off		beyond the specified depth will be ignored. This is a trade-off
	between information loss and faster processing especially for		between information loss and faster processing especially for
	workloads that can have a very long callchain stack.		workloads that can have a very long callchain stack.
			Note that when using the --itrace option the synthesized callchain size
			will override this value if the synthesized callchain size is bigger.

	Default: 127		Default: 127

tools/perf/builtin-kmem.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -329,7 +329,7 @@ static int build_alloc_func_list(void)
	return -EINVAL;		return -EINVAL;
	}		}

	kernel_map = machine->vmlinux_maps[MAP__FUNCTION];		kernel_map = machine__kernel_map(machine);
	if (map__load(kernel_map, NULL) < 0) {		if (map__load(kernel_map, NULL) < 0) {
	pr_err("cannot load kernel map\n");		pr_err("cannot load kernel map\n");
	return -ENOENT;		return -ENOENT;