Commit dad38ca6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

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

 - Do not use events that don't have timestamps when setting 'perf trace's
   base timestamp, fixing up the timestamp column for syscalls (Arnaldo Carvalho de Melo)

 - Make the 'bpf-output' sample_type be the same as tracepoint's, fixing up
   'perf trace's timestamp column for bpf events (Wang Nan)

 - Fix PMU term format max value calculation (Kan Liang)

 - Pretty print 'seccomp', 'getrandom' syscalls in 'perf trace' (Arnaldo Carvalho de Melo)

Infrastructure changes:

 - Add support for using TSC as an ARCH timestamp when synthesizing
   JIT records (Adrian Hunter)

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

tools/perf/arch/x86/util/intel-bts.c

+5 −0
Original line number Diff line number Diff line
@@ -438,6 +438,11 @@ struct auxtrace_record *intel_bts_recording_init(int *err) 
	if (!intel_bts_pmu)

		return NULL;



	if (setenv("JITDUMP_USE_ARCH_TIMESTAMP", "1", 1)) {

		*err = -errno;

		return NULL;

	}



	btsr = zalloc(sizeof(struct intel_bts_recording));

	if (!btsr) {

		*err = -ENOMEM;

tools/perf/arch/x86/util/intel-pt.c

+5 −0
Original line number Diff line number Diff line
@@ -1027,6 +1027,11 @@ struct auxtrace_record *intel_pt_recording_init(int *err) 
	if (!intel_pt_pmu)

		return NULL;



	if (setenv("JITDUMP_USE_ARCH_TIMESTAMP", "1", 1)) {

		*err = -errno;

		return NULL;

	}



	ptr = zalloc(sizeof(struct intel_pt_recording));

	if (!ptr) {

		*err = -ENOMEM;

tools/perf/arch/x86/util/tsc.c

+31 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <linux/types.h>

#include "../../util/debug.h"

#include "../../util/tsc.h"

#include "tsc.h"



int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,

			     struct perf_tsc_conversion *tc)
@@ -46,3 +45,34 @@ u64 rdtsc(void) 


	return low | ((u64)high) << 32;

}



int perf_event__synth_time_conv(const struct perf_event_mmap_page *pc,

				struct perf_tool *tool,

				perf_event__handler_t process,

				struct machine *machine)

{

	union perf_event event = {

		.time_conv = {

			.header = {

				.type = PERF_RECORD_TIME_CONV,

				.size = sizeof(struct time_conv_event),

			},

		},

	};

	struct perf_tsc_conversion tc;

	int err;



	err = perf_read_tsc_conversion(pc, &tc);

	if (err == -EOPNOTSUPP)

		return 0;

	if (err)

		return err;



	pr_debug2("Synthesizing TSC conversion information\n");



	event.time_conv.time_mult  = tc.time_mult;

	event.time_conv.time_shift = tc.time_shift;

	event.time_conv.time_zero  = tc.time_zero;



	return process(tool, &event, NULL, machine);

}

tools/perf/arch/x86/util/tsc.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
#ifndef TOOLS_PERF_ARCH_X86_UTIL_TSC_H__

#define TOOLS_PERF_ARCH_X86_UTIL_TSC_H__



#include <linux/types.h>



struct perf_tsc_conversion {

	u16 time_shift;

	u32 time_mult;

	u64 time_zero;

};



struct perf_event_mmap_page;



int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,

			     struct perf_tsc_conversion *tc);



#endif /* TOOLS_PERF_ARCH_X86_UTIL_TSC_H__ */

tools/perf/builtin-inject.c

+1 −0
Original line number Diff line number Diff line
@@ -748,6 +748,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) 
			.auxtrace_info	= perf_event__repipe_op2_synth,

			.auxtrace	= perf_event__repipe_auxtrace,

			.auxtrace_error	= perf_event__repipe_op2_synth,

			.time_conv	= perf_event__repipe_op2_synth,

			.finished_round	= perf_event__repipe_oe_synth,

			.build_id	= perf_event__repipe_op2_synth,

			.id_index	= perf_event__repipe_op2_synth,

CRA Git | Maintained and supported by SUSTech CRA and CCSE