Commit 4c45945a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-5.6-20200220' of... 

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

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

auxtrace:

  Adrian Hunter:

  - Fix endless record after being terminated on arm-spe.

  Wei Li:

  - Fix endless record after being terminated on Intel PT and BTS and
    on ARM's cs-etm.

perf test:

  Thomas Richter

  - Fix test trace+probe_vfs_getname.sh on s390

PowerPC:

  Arnaldo Carvalho de Melo:

  - Sync powerpc syscall.tbl with the kernel sources.

BPF:

  Arnaldo Carvalho de Melo:

  - Remove extraneous bpf/ subdir from bpf.h headers used to build bpf events.

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

tools/perf/arch/arm/util/cs-etm.c

+2 −16
Original line number Diff line number Diff line
@@ -858,21 +858,6 @@ static void cs_etm_recording_free(struct auxtrace_record *itr) 
	free(ptr);

}



static int cs_etm_read_finish(struct auxtrace_record *itr, int idx)

{

	struct cs_etm_recording *ptr =

			container_of(itr, struct cs_etm_recording, itr);

	struct evsel *evsel;



	evlist__for_each_entry(ptr->evlist, evsel) {

		if (evsel->core.attr.type == ptr->cs_etm_pmu->type)

			return perf_evlist__enable_event_idx(ptr->evlist,

							     evsel, idx);

	}



	return -EINVAL;

}



struct auxtrace_record *cs_etm_record_init(int *err)

{

	struct perf_pmu *cs_etm_pmu;
@@ -892,6 +877,7 @@ struct auxtrace_record *cs_etm_record_init(int *err) 
	}



	ptr->cs_etm_pmu			= cs_etm_pmu;

	ptr->itr.pmu			= cs_etm_pmu;

	ptr->itr.parse_snapshot_options	= cs_etm_parse_snapshot_options;

	ptr->itr.recording_options	= cs_etm_recording_options;

	ptr->itr.info_priv_size		= cs_etm_info_priv_size;
@@ -901,7 +887,7 @@ struct auxtrace_record *cs_etm_record_init(int *err) 
	ptr->itr.snapshot_finish	= cs_etm_snapshot_finish;

	ptr->itr.reference		= cs_etm_reference;

	ptr->itr.free			= cs_etm_recording_free;

	ptr->itr.read_finish		= cs_etm_read_finish;

	ptr->itr.read_finish		= auxtrace_record__read_finish;



	*err = 0;

	return &ptr->itr;

tools/perf/arch/arm64/util/arm-spe.c

+2 −15
Original line number Diff line number Diff line
@@ -158,20 +158,6 @@ static void arm_spe_recording_free(struct auxtrace_record *itr) 
	free(sper);

}



static int arm_spe_read_finish(struct auxtrace_record *itr, int idx)

{

	struct arm_spe_recording *sper =

			container_of(itr, struct arm_spe_recording, itr);

	struct evsel *evsel;



	evlist__for_each_entry(sper->evlist, evsel) {

		if (evsel->core.attr.type == sper->arm_spe_pmu->type)

			return perf_evlist__enable_event_idx(sper->evlist,

							     evsel, idx);

	}

	return -EINVAL;

}



struct auxtrace_record *arm_spe_recording_init(int *err,

					       struct perf_pmu *arm_spe_pmu)

{
@@ -189,12 +175,13 @@ struct auxtrace_record *arm_spe_recording_init(int *err, 
	}



	sper->arm_spe_pmu = arm_spe_pmu;

	sper->itr.pmu = arm_spe_pmu;

	sper->itr.recording_options = arm_spe_recording_options;

	sper->itr.info_priv_size = arm_spe_info_priv_size;

	sper->itr.info_fill = arm_spe_info_fill;

	sper->itr.free = arm_spe_recording_free;

	sper->itr.reference = arm_spe_reference;

	sper->itr.read_finish = arm_spe_read_finish;

	sper->itr.read_finish = auxtrace_record__read_finish;

	sper->itr.alignment = 0;



	*err = 0;

tools/perf/arch/powerpc/entry/syscalls/syscall.tbl

+2 −0
Original line number Diff line number Diff line
@@ -517,3 +517,5 @@ 
433	common	fspick				sys_fspick

434	common	pidfd_open			sys_pidfd_open

435	nospu	clone3				ppc_clone3

437	common	openat2				sys_openat2

438	common	pidfd_getfd			sys_pidfd_getfd

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

+2 −15
Original line number Diff line number Diff line
@@ -413,20 +413,6 @@ out_err: 
	return err;

}



static int intel_bts_read_finish(struct auxtrace_record *itr, int idx)

{

	struct intel_bts_recording *btsr =

			container_of(itr, struct intel_bts_recording, itr);

	struct evsel *evsel;



	evlist__for_each_entry(btsr->evlist, evsel) {

		if (evsel->core.attr.type == btsr->intel_bts_pmu->type)

			return perf_evlist__enable_event_idx(btsr->evlist,

							     evsel, idx);

	}

	return -EINVAL;

}



struct auxtrace_record *intel_bts_recording_init(int *err)

{

	struct perf_pmu *intel_bts_pmu = perf_pmu__find(INTEL_BTS_PMU_NAME);
@@ -447,6 +433,7 @@ struct auxtrace_record *intel_bts_recording_init(int *err) 
	}



	btsr->intel_bts_pmu = intel_bts_pmu;

	btsr->itr.pmu = intel_bts_pmu;

	btsr->itr.recording_options = intel_bts_recording_options;

	btsr->itr.info_priv_size = intel_bts_info_priv_size;

	btsr->itr.info_fill = intel_bts_info_fill;
@@ -456,7 +443,7 @@ struct auxtrace_record *intel_bts_recording_init(int *err) 
	btsr->itr.find_snapshot = intel_bts_find_snapshot;

	btsr->itr.parse_snapshot_options = intel_bts_parse_snapshot_options;

	btsr->itr.reference = intel_bts_reference;

	btsr->itr.read_finish = intel_bts_read_finish;

	btsr->itr.read_finish = auxtrace_record__read_finish;

	btsr->itr.alignment = sizeof(struct branch);

	return &btsr->itr;

}

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

+2 −15
Original line number Diff line number Diff line
@@ -1166,20 +1166,6 @@ static u64 intel_pt_reference(struct auxtrace_record *itr __maybe_unused) 
	return rdtsc();

}



static int intel_pt_read_finish(struct auxtrace_record *itr, int idx)

{

	struct intel_pt_recording *ptr =

			container_of(itr, struct intel_pt_recording, itr);

	struct evsel *evsel;



	evlist__for_each_entry(ptr->evlist, evsel) {

		if (evsel->core.attr.type == ptr->intel_pt_pmu->type)

			return perf_evlist__enable_event_idx(ptr->evlist, evsel,

							     idx);

	}

	return -EINVAL;

}



struct auxtrace_record *intel_pt_recording_init(int *err)

{

	struct perf_pmu *intel_pt_pmu = perf_pmu__find(INTEL_PT_PMU_NAME);
@@ -1200,6 +1186,7 @@ struct auxtrace_record *intel_pt_recording_init(int *err) 
	}



	ptr->intel_pt_pmu = intel_pt_pmu;

	ptr->itr.pmu = intel_pt_pmu;

	ptr->itr.recording_options = intel_pt_recording_options;

	ptr->itr.info_priv_size = intel_pt_info_priv_size;

	ptr->itr.info_fill = intel_pt_info_fill;
@@ -1209,7 +1196,7 @@ struct auxtrace_record *intel_pt_recording_init(int *err) 
	ptr->itr.find_snapshot = intel_pt_find_snapshot;

	ptr->itr.parse_snapshot_options = intel_pt_parse_snapshot_options;

	ptr->itr.reference = intel_pt_reference;

	ptr->itr.read_finish = intel_pt_read_finish;

	ptr->itr.read_finish = auxtrace_record__read_finish;

	/*

	 * Decoding starts at a PSB packet. Minimum PSB period is 2K so 4K

	 * should give at least 1 PSB per sample.

CRA Git | Maintained and supported by SUSTech CRA and CCSE