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

Commit 9b7c8547 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-4.15-20171023' of... 

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

 - Update vendor events JSON metrics for Intel's Broadwell, Broadwell
   Server, Haswell, Haswell Server, IvyBridge, IvyTown, JakeTown, Sandy
   Bridge, Skylake and SkyLake Server (Andi Kleen)

 - Add vendor event file for Intel's Goldmont Plus V1 (Kan Liang)

 - Move perf_mmap methods from 'perf record' and evlist.c to a separate
   mmap.[ch] pair, to better separate things and pave the way for further
   work on multithreading tools (Arnaldo Carvalho de Melo)

 - Do not check ABI headers in a detached tarball build, as it the kernel
   headers from where we copied tools/include/ are by definition not
   available (Arnaldo Carvalho de Melo)

 - Make 'perf script' use fprintf() like printing, i.e. receiving a FILE
   pointer so that it gets consistent with other tools/ code and allows
   for printing to per-event files (Arnaldo Carvalho de Melo)

 - Error handling fixes (resource release on exit) for 'perf script'
   and 'perf kmem' (Christophe JAILLET)

 - Make some 'perf event attr' tests optional on virtual machines, where
   tested counters are not available (Jiri Olsa)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 8776fe75 65db92e0

tools/perf/Documentation/perf-list.txt

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ For example Intel Core CPUs typically have four generic performance counters 
for the core, plus three fixed counters for instructions, cycles and

ref-cycles. Some special events have restrictions on which counter they

can schedule, and may not support multiple instances in a single group.

When too many events are specified in the group none of them will not

When too many events are specified in the group some of them will not

be measured.



Globally pinned events can limit the number of counters available for

tools/perf/arch/arm/annotate/instructions.c

+2 −1
Original line number Diff line number Diff line 
#include <linux/compiler.h>

#include <sys/types.h>

#include <regex.h>
@@ -23,7 +24,7 @@ static struct ins_ops *arm__associate_instruction_ops(struct arch *arch, const c 
	return ops;

}



static int arm__annotate_init(struct arch *arch)

static int arm__annotate_init(struct arch *arch, char *cpuid __maybe_unused)

{

	struct arm_annotate *arm;

	int err;

tools/perf/arch/arm64/annotate/instructions.c

+2 −1
Original line number Diff line number Diff line 
#include <linux/compiler.h>

#include <sys/types.h>

#include <regex.h>
@@ -25,7 +26,7 @@ static struct ins_ops *arm64__associate_instruction_ops(struct arch *arch, const 
	return ops;

}



static int arm64__annotate_init(struct arch *arch)

static int arm64__annotate_init(struct arch *arch, char *cpuid __maybe_unused)

{

	struct arm64_annotate *arm;

	int err;

tools/perf/arch/powerpc/annotate/instructions.c

+3 −1
Original line number Diff line number Diff line 
#include <linux/compiler.h>



static struct ins_ops *powerpc__associate_instruction_ops(struct arch *arch, const char *name)

{

	int i;
@@ -46,7 +48,7 @@ static struct ins_ops *powerpc__associate_instruction_ops(struct arch *arch, con 
	return ops;

}



static int powerpc__annotate_init(struct arch *arch)

static int powerpc__annotate_init(struct arch *arch, char *cpuid __maybe_unused)

{

	if (!arch->initialized) {

		arch->initialized = true;

tools/perf/arch/s390/annotate/instructions.c

+3 −1
Original line number Diff line number Diff line 
#include <linux/compiler.h>



static struct ins_ops *s390__associate_ins_ops(struct arch *arch, const char *name)

{

	struct ins_ops *ops = NULL;
@@ -19,7 +21,7 @@ static struct ins_ops *s390__associate_ins_ops(struct arch *arch, const char *na 
	return ops;

}



static int s390__annotate_init(struct arch *arch)

static int s390__annotate_init(struct arch *arch, char *cpuid __maybe_unused)

{

	if (!arch->initialized) {

		arch->initialized = true;