Commit 91a79e5f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

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

 into perf/core

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

New features:

- Support matching by topic in 'perf list' (Andi Kleen)

User visible:

- Apply cpu color only when there was activity in 'perf sched map' (Namhyung Kim)

- Always show the task's COMM in 'perf sched map -v' (Namhyung Kim)

- Fix hierarchy column counts in the perf hist browser (top, report), avoiding
  showing nothing after pressing the RIGHT key a number of times (Namhyung Kim)

Infrastructure:

- Support cascading options in libsubcmd and use it to share common options in
  'perf sched' subcommands (Namhyung Kim)

- Avoid worker cacheline bouncing in 'perf bench futex' (Davidlohr Bueso)

- Sanitize numeric parameters in 'perf bench futex' (Davidlohr Bueso)

- Update copies of kernel files (Arnaldo Carvalho de Melo)

- Fix scripting (perl, python) setup to avoid leaks (Arnaldo Carvalho de Melo)

- Add missing object file to the python binding linkage list (Arnaldo Carvalho de Melo)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 76e2d261 46cb25b1

tools/include/uapi/asm-generic/mman-common.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -72,4 +72,9 @@ 
#define MAP_HUGE_SHIFT	26

#define MAP_HUGE_SHIFT	26

#define MAP_HUGE_MASK	0x3f

#define MAP_HUGE_MASK	0x3f





#define PKEY_DISABLE_ACCESS	0x1

#define PKEY_DISABLE_WRITE	0x2

#define PKEY_ACCESS_MASK	(PKEY_DISABLE_ACCESS |\

				 PKEY_DISABLE_WRITE)



#endif /* __ASM_GENERIC_MMAN_COMMON_H */
 
#endif /* __ASM_GENERIC_MMAN_COMMON_H */

tools/lib/subcmd/parse-options.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -314,12 +314,19 @@ static int get_value(struct parse_opt_ctx_t *p, 




static int parse_short_opt(struct parse_opt_ctx_t *p, const struct option *options)

static int parse_short_opt(struct parse_opt_ctx_t *p, const struct option *options)

{

{

retry:

	for (; options->type != OPTION_END; options++) {

	for (; options->type != OPTION_END; options++) {

		if (options->short_name == *p->opt) {

		if (options->short_name == *p->opt) {

			p->opt = p->opt[1] ? p->opt + 1 : NULL;

			p->opt = p->opt[1] ? p->opt + 1 : NULL;

			return get_value(p, options, OPT_SHORT);

			return get_value(p, options, OPT_SHORT);

		}

		}

	}

	}



	if (options->parent) {

		options = options->parent;

		goto retry;

	}



	return -2;

	return -2;

}

}
@@ -333,6 +340,7 @@ static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg, 
	if (!arg_end)

	if (!arg_end)

		arg_end = arg + strlen(arg);

		arg_end = arg + strlen(arg);





retry:

	for (; options->type != OPTION_END; options++) {

	for (; options->type != OPTION_END; options++) {

		const char *rest;

		const char *rest;

		int flags = 0;

		int flags = 0;
@@ -426,6 +434,12 @@ match: 
	}

	}

	if (abbrev_option)

	if (abbrev_option)

		return get_value(p, abbrev_option, abbrev_flags);

		return get_value(p, abbrev_option, abbrev_flags);



	if (options->parent) {

		options = options->parent;

		goto retry;

	}



	return -2;

	return -2;

}

}

tools/lib/subcmd/parse-options.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -109,11 +109,13 @@ struct option { 
	intptr_t defval;

	intptr_t defval;

	bool *set;

	bool *set;

	void *data;

	void *data;

	const struct option *parent;

};

};





#define check_vtype(v, type) ( BUILD_BUG_ON_ZERO(!__builtin_types_compatible_p(typeof(v), type)) + v )

#define check_vtype(v, type) ( BUILD_BUG_ON_ZERO(!__builtin_types_compatible_p(typeof(v), type)) + v )





#define OPT_END()                   { .type = OPTION_END }

#define OPT_END()                   { .type = OPTION_END }

#define OPT_PARENT(p)               { .type = OPTION_END, .parent = (p) }

#define OPT_ARGUMENT(l, h)          { .type = OPTION_ARGUMENT, .long_name = (l), .help = (h) }

#define OPT_ARGUMENT(l, h)          { .type = OPTION_ARGUMENT, .long_name = (l), .help = (h) }

#define OPT_GROUP(h)                { .type = OPTION_GROUP, .help = (h) }

#define OPT_GROUP(h)                { .type = OPTION_GROUP, .help = (h) }

#define OPT_BIT(s, l, v, h, b)      { .type = OPTION_BIT, .short_name = (s), .long_name = (l), .value = check_vtype(v, int *), .help = (h), .defval = (b) }

#define OPT_BIT(s, l, v, h, b)      { .type = OPTION_BIT, .short_name = (s), .long_name = (l), .value = check_vtype(v, int *), .help = (h), .defval = (b) }

tools/perf/Makefile.perf

+2 −2
Original line number Original line Diff line number Diff line
@@ -381,10 +381,10 @@ $(PERF_IN): prepare FORCE 
        (diff -B ../arch/x86/include/asm/cpufeatures.h ../../arch/x86/include/asm/cpufeatures.h >/dev/null) \

        (diff -B ../arch/x86/include/asm/cpufeatures.h ../../arch/x86/include/asm/cpufeatures.h >/dev/null) \

        || echo "Warning: tools/arch/x86/include/asm/cpufeatures.h differs from kernel" >&2 )) || true

        || echo "Warning: tools/arch/x86/include/asm/cpufeatures.h differs from kernel" >&2 )) || true

	@(test -f ../../arch/x86/lib/memcpy_64.S && ( \

	@(test -f ../../arch/x86/lib/memcpy_64.S && ( \

        (diff -B ../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memcpy_64.S >/dev/null) \

        (diff -B -I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" ../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memcpy_64.S >/dev/null) \

        || echo "Warning: tools/arch/x86/lib/memcpy_64.S differs from kernel" >&2 )) || true

        || echo "Warning: tools/arch/x86/lib/memcpy_64.S differs from kernel" >&2 )) || true

	@(test -f ../../arch/x86/lib/memset_64.S && ( \

	@(test -f ../../arch/x86/lib/memset_64.S && ( \

        (diff -B ../arch/x86/lib/memset_64.S ../../arch/x86/lib/memset_64.S >/dev/null) \

        (diff -B -I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" ../arch/x86/lib/memset_64.S ../../arch/x86/lib/memset_64.S >/dev/null) \

        || echo "Warning: tools/arch/x86/lib/memset_64.S differs from kernel" >&2 )) || true

        || echo "Warning: tools/arch/x86/lib/memset_64.S differs from kernel" >&2 )) || true

	@(test -f ../../arch/arm/include/uapi/asm/perf_regs.h && ( \

	@(test -f ../../arch/arm/include/uapi/asm/perf_regs.h && ( \

        (diff -B ../arch/arm/include/uapi/asm/perf_regs.h ../../arch/arm/include/uapi/asm/perf_regs.h >/dev/null) \

        (diff -B ../arch/arm/include/uapi/asm/perf_regs.h ../../arch/arm/include/uapi/asm/perf_regs.h >/dev/null) \

tools/perf/arch/x86/entry/syscalls/syscall_64.tbl

+3 −0
Original line number Original line Diff line number Diff line
@@ -335,6 +335,9 @@ 
326	common	copy_file_range		sys_copy_file_range

326	common	copy_file_range		sys_copy_file_range

327	64	preadv2			sys_preadv2

327	64	preadv2			sys_preadv2

328	64	pwritev2		sys_pwritev2

328	64	pwritev2		sys_pwritev2

329	common	pkey_mprotect		sys_pkey_mprotect

330	common	pkey_alloc		sys_pkey_alloc

331	common	pkey_free		sys_pkey_free





#

#

# x32-specific system call numbers start at 512 to avoid cache impact

# x32-specific system call numbers start at 512 to avoid cache impact

CRA Git | Maintained and supported by SUSTech CRA and CCSE