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

Commit 3cace81e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-20160815' of... 

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

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

- Fix occasional decoding errors when tracing system-wide with
  Intel PT (Adrian Hunter)

- Fix ip compression in Intel PT for some specific packet types not
  present on current hardware (Adrian Hunter)

- Fix annotation of objects with debuginfo files (Anton Blanchard)

- Fix build on Fedora Rawhide (25) wrt using the right header to
  get the major() & minor() definitions in the jitdump code, now
  it is deprecated getting those using sys/types.h, one has to use
  sys/sysmacros.h (Arnaldo Carvalho de Melo)

- Sync arm64/s390 kvm related header files (Arnaldo Carvalho de Melo)

- Check for dup and fdopen failures in 'perf probe' (Colin Ian King,
  Arnaldo Carvalho de Melo)

- Fix showing callchains in pipe mode, i.e.

    perf record -g -o - workload | perf script

  now shows callchains (He Kuang)

- Show proper message when the scripts directory points to some
  invalid location in 'perf script --list' (He Kuang)

- Fix 'perf mem -t store' to record 'cpu/mem-stores/P' events
  again (Jiri Olsa)

- Fix ppc64le build failure when libelf is not present (Ravi Bangoria)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 3684b03d 3d918fb1

tools/arch/arm64/include/uapi/asm/kvm.h

+2 −0
Original line number Diff line number Diff line
@@ -87,9 +87,11 @@ struct kvm_regs { 
/* Supported VGICv3 address types  */

#define KVM_VGIC_V3_ADDR_TYPE_DIST	2

#define KVM_VGIC_V3_ADDR_TYPE_REDIST	3

#define KVM_VGIC_ITS_ADDR_TYPE		4



#define KVM_VGIC_V3_DIST_SIZE		SZ_64K

#define KVM_VGIC_V3_REDIST_SIZE		(2 * SZ_64K)

#define KVM_VGIC_V3_ITS_SIZE		(2 * SZ_64K)



#define KVM_ARM_VCPU_POWER_OFF		0 /* CPU is started in OFF state */

#define KVM_ARM_VCPU_EL1_32BIT		1 /* CPU running a 32bit VM */

tools/arch/s390/include/uapi/asm/kvm.h

+41 −0
Original line number Diff line number Diff line
@@ -93,6 +93,47 @@ struct kvm_s390_vm_cpu_machine { 
	__u64 fac_list[256];

};



#define KVM_S390_VM_CPU_PROCESSOR_FEAT	2

#define KVM_S390_VM_CPU_MACHINE_FEAT	3



#define KVM_S390_VM_CPU_FEAT_NR_BITS	1024

#define KVM_S390_VM_CPU_FEAT_ESOP	0

#define KVM_S390_VM_CPU_FEAT_SIEF2	1

#define KVM_S390_VM_CPU_FEAT_64BSCAO	2

#define KVM_S390_VM_CPU_FEAT_SIIF	3

#define KVM_S390_VM_CPU_FEAT_GPERE	4

#define KVM_S390_VM_CPU_FEAT_GSLS	5

#define KVM_S390_VM_CPU_FEAT_IB		6

#define KVM_S390_VM_CPU_FEAT_CEI	7

#define KVM_S390_VM_CPU_FEAT_IBS	8

#define KVM_S390_VM_CPU_FEAT_SKEY	9

#define KVM_S390_VM_CPU_FEAT_CMMA	10

#define KVM_S390_VM_CPU_FEAT_PFMFI	11

#define KVM_S390_VM_CPU_FEAT_SIGPIF	12

struct kvm_s390_vm_cpu_feat {

	__u64 feat[16];

};



#define KVM_S390_VM_CPU_PROCESSOR_SUBFUNC	4

#define KVM_S390_VM_CPU_MACHINE_SUBFUNC		5

/* for "test bit" instructions MSB 0 bit ordering, for "query" raw blocks */

struct kvm_s390_vm_cpu_subfunc {

	__u8 plo[32];		/* always */

	__u8 ptff[16];		/* with TOD-clock steering */

	__u8 kmac[16];		/* with MSA */

	__u8 kmc[16];		/* with MSA */

	__u8 km[16];		/* with MSA */

	__u8 kimd[16];		/* with MSA */

	__u8 klmd[16];		/* with MSA */

	__u8 pckmo[16];		/* with MSA3 */

	__u8 kmctr[16];		/* with MSA4 */

	__u8 kmf[16];		/* with MSA4 */

	__u8 kmo[16];		/* with MSA4 */

	__u8 pcc[16];		/* with MSA4 */

	__u8 ppno[16];		/* with MSA5 */

	__u8 reserved[1824];

};



/* kvm attributes for crypto */

#define KVM_S390_VM_CRYPTO_ENABLE_AES_KW	0

#define KVM_S390_VM_CRYPTO_ENABLE_DEA_KW	1

tools/arch/s390/include/uapi/asm/sie.h

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ 
	exit_code_ipa0(0xB2, 0x4c, "TAR"),	\

	exit_code_ipa0(0xB2, 0x50, "CSP"),	\

	exit_code_ipa0(0xB2, 0x54, "MVPG"),	\

	exit_code_ipa0(0xB2, 0x56, "STHYI"),	\

	exit_code_ipa0(0xB2, 0x58, "BSG"),	\

	exit_code_ipa0(0xB2, 0x5a, "BSA"),	\

	exit_code_ipa0(0xB2, 0x5f, "CHSC"),	\

tools/perf/arch/powerpc/util/sym-handling.c

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ void arch__fix_tev_from_maps(struct perf_probe_event *pev, 
	}

}



#ifdef HAVE_LIBELF_SUPPORT

void arch__post_process_probe_trace_events(struct perf_probe_event *pev,

					   int ntevs)

{
@@ -118,5 +119,6 @@ void arch__post_process_probe_trace_events(struct perf_probe_event *pev, 
		}

	}

}

#endif /* HAVE_LIBELF_SUPPORT */



#endif

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

+5 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, 
	struct intel_pt_recording *ptr =

			container_of(itr, struct intel_pt_recording, itr);

	struct perf_pmu *intel_pt_pmu = ptr->intel_pt_pmu;

	bool have_timing_info;

	bool have_timing_info, need_immediate = false;

	struct perf_evsel *evsel, *intel_pt_evsel = NULL;

	const struct cpu_map *cpus = evlist->cpus;

	bool privileged = geteuid() == 0 || perf_event_paranoid() < 0;
@@ -655,6 +655,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, 
				ptr->have_sched_switch = 3;

			} else {

				opts->record_switch_events = true;

				need_immediate = true;

				if (cpu_wide)

					ptr->have_sched_switch = 3;

				else
@@ -700,6 +701,9 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, 
		tracking_evsel->attr.freq = 0;

		tracking_evsel->attr.sample_period = 1;



		if (need_immediate)

			tracking_evsel->immediate = true;



		/* In per-cpu case, always need the time of mmap events etc */

		if (!cpu_map__empty(cpus)) {

			perf_evsel__set_sample_bit(tracking_evsel, TIME);