Skip to content

Commit 4c45945

Browse files
author
Ingo Molnar
committed
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: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2 parents c5f8689 + b103de5 commit 4c45945

File tree

11 files changed

+41
-66
lines changed

11 files changed

+41
-66
lines changed

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -858,21 +858,6 @@ static void cs_etm_recording_free(struct auxtrace_record *itr)
858858
free(ptr);
859859
}
860860

861-
static int cs_etm_read_finish(struct auxtrace_record *itr, int idx)
862-
{
863-
struct cs_etm_recording *ptr =
864-
container_of(itr, struct cs_etm_recording, itr);
865-
struct evsel *evsel;
866-
867-
evlist__for_each_entry(ptr->evlist, evsel) {
868-
if (evsel->core.attr.type == ptr->cs_etm_pmu->type)
869-
return perf_evlist__enable_event_idx(ptr->evlist,
870-
evsel, idx);
871-
}
872-
873-
return -EINVAL;
874-
}
875-
876861
struct auxtrace_record *cs_etm_record_init(int *err)
877862
{
878863
struct perf_pmu *cs_etm_pmu;
@@ -892,6 +877,7 @@ struct auxtrace_record *cs_etm_record_init(int *err)
892877
}
893878

894879
ptr->cs_etm_pmu = cs_etm_pmu;
880+
ptr->itr.pmu = cs_etm_pmu;
895881
ptr->itr.parse_snapshot_options = cs_etm_parse_snapshot_options;
896882
ptr->itr.recording_options = cs_etm_recording_options;
897883
ptr->itr.info_priv_size = cs_etm_info_priv_size;
@@ -901,7 +887,7 @@ struct auxtrace_record *cs_etm_record_init(int *err)
901887
ptr->itr.snapshot_finish = cs_etm_snapshot_finish;
902888
ptr->itr.reference = cs_etm_reference;
903889
ptr->itr.free = cs_etm_recording_free;
904-
ptr->itr.read_finish = cs_etm_read_finish;
890+
ptr->itr.read_finish = auxtrace_record__read_finish;
905891

906892
*err = 0;
907893
return &ptr->itr;

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -158,20 +158,6 @@ static void arm_spe_recording_free(struct auxtrace_record *itr)
158158
free(sper);
159159
}
160160

161-
static int arm_spe_read_finish(struct auxtrace_record *itr, int idx)
162-
{
163-
struct arm_spe_recording *sper =
164-
container_of(itr, struct arm_spe_recording, itr);
165-
struct evsel *evsel;
166-
167-
evlist__for_each_entry(sper->evlist, evsel) {
168-
if (evsel->core.attr.type == sper->arm_spe_pmu->type)
169-
return perf_evlist__enable_event_idx(sper->evlist,
170-
evsel, idx);
171-
}
172-
return -EINVAL;
173-
}
174-
175161
struct auxtrace_record *arm_spe_recording_init(int *err,
176162
struct perf_pmu *arm_spe_pmu)
177163
{
@@ -189,12 +175,13 @@ struct auxtrace_record *arm_spe_recording_init(int *err,
189175
}
190176

191177
sper->arm_spe_pmu = arm_spe_pmu;
178+
sper->itr.pmu = arm_spe_pmu;
192179
sper->itr.recording_options = arm_spe_recording_options;
193180
sper->itr.info_priv_size = arm_spe_info_priv_size;
194181
sper->itr.info_fill = arm_spe_info_fill;
195182
sper->itr.free = arm_spe_recording_free;
196183
sper->itr.reference = arm_spe_reference;
197-
sper->itr.read_finish = arm_spe_read_finish;
184+
sper->itr.read_finish = auxtrace_record__read_finish;
198185
sper->itr.alignment = 0;
199186

200187
*err = 0;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,3 +517,5 @@
517517
433 common fspick sys_fspick
518518
434 common pidfd_open sys_pidfd_open
519519
435 nospu clone3 ppc_clone3
520+
437 common openat2 sys_openat2
521+
438 common pidfd_getfd sys_pidfd_getfd

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -413,20 +413,6 @@ static int intel_bts_find_snapshot(struct auxtrace_record *itr, int idx,
413413
return err;
414414
}
415415

416-
static int intel_bts_read_finish(struct auxtrace_record *itr, int idx)
417-
{
418-
struct intel_bts_recording *btsr =
419-
container_of(itr, struct intel_bts_recording, itr);
420-
struct evsel *evsel;
421-
422-
evlist__for_each_entry(btsr->evlist, evsel) {
423-
if (evsel->core.attr.type == btsr->intel_bts_pmu->type)
424-
return perf_evlist__enable_event_idx(btsr->evlist,
425-
evsel, idx);
426-
}
427-
return -EINVAL;
428-
}
429-
430416
struct auxtrace_record *intel_bts_recording_init(int *err)
431417
{
432418
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)
447433
}
448434

449435
btsr->intel_bts_pmu = intel_bts_pmu;
436+
btsr->itr.pmu = intel_bts_pmu;
450437
btsr->itr.recording_options = intel_bts_recording_options;
451438
btsr->itr.info_priv_size = intel_bts_info_priv_size;
452439
btsr->itr.info_fill = intel_bts_info_fill;
@@ -456,7 +443,7 @@ struct auxtrace_record *intel_bts_recording_init(int *err)
456443
btsr->itr.find_snapshot = intel_bts_find_snapshot;
457444
btsr->itr.parse_snapshot_options = intel_bts_parse_snapshot_options;
458445
btsr->itr.reference = intel_bts_reference;
459-
btsr->itr.read_finish = intel_bts_read_finish;
446+
btsr->itr.read_finish = auxtrace_record__read_finish;
460447
btsr->itr.alignment = sizeof(struct branch);
461448
return &btsr->itr;
462449
}

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,20 +1166,6 @@ static u64 intel_pt_reference(struct auxtrace_record *itr __maybe_unused)
11661166
return rdtsc();
11671167
}
11681168

1169-
static int intel_pt_read_finish(struct auxtrace_record *itr, int idx)
1170-
{
1171-
struct intel_pt_recording *ptr =
1172-
container_of(itr, struct intel_pt_recording, itr);
1173-
struct evsel *evsel;
1174-
1175-
evlist__for_each_entry(ptr->evlist, evsel) {
1176-
if (evsel->core.attr.type == ptr->intel_pt_pmu->type)
1177-
return perf_evlist__enable_event_idx(ptr->evlist, evsel,
1178-
idx);
1179-
}
1180-
return -EINVAL;
1181-
}
1182-
11831169
struct auxtrace_record *intel_pt_recording_init(int *err)
11841170
{
11851171
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)
12001186
}
12011187

12021188
ptr->intel_pt_pmu = intel_pt_pmu;
1189+
ptr->itr.pmu = intel_pt_pmu;
12031190
ptr->itr.recording_options = intel_pt_recording_options;
12041191
ptr->itr.info_priv_size = intel_pt_info_priv_size;
12051192
ptr->itr.info_fill = intel_pt_info_fill;
@@ -1209,7 +1196,7 @@ struct auxtrace_record *intel_pt_recording_init(int *err)
12091196
ptr->itr.find_snapshot = intel_pt_find_snapshot;
12101197
ptr->itr.parse_snapshot_options = intel_pt_parse_snapshot_options;
12111198
ptr->itr.reference = intel_pt_reference;
1212-
ptr->itr.read_finish = intel_pt_read_finish;
1199+
ptr->itr.read_finish = auxtrace_record__read_finish;
12131200
/*
12141201
* Decoding starts at a PSB packet. Minimum PSB period is 2K so 4K
12151202
* should give at least 1 PSB per sample.

‎tools/perf/include/bpf/pid_filter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#ifndef _PERF_BPF_PID_FILTER_
44
#define _PERF_BPF_PID_FILTER_
55

6-
#include <bpf/bpf.h>
6+
#include <bpf.h>
77

88
#define pid_filter(name) pid_map(name, bool)
99

‎tools/perf/include/bpf/stdio.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22

3-
#include <bpf/bpf.h>
3+
#include <bpf.h>
44

55
struct bpf_map SEC("maps") __bpf_stdout__ = {
66
.type = BPF_MAP_TYPE_PERF_EVENT_ARRAY,

‎tools/perf/include/bpf/unistd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: LGPL-2.1
22

3-
#include <bpf/bpf.h>
3+
#include <bpf.h>
44

55
static int (*bpf_get_current_pid_tgid)(void) = (void *)BPF_FUNC_get_current_pid_tgid;
66

‎tools/perf/tests/shell/lib/probe_vfs_getname.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ add_probe_vfs_getname() {
1414
if [ $had_vfs_getname -eq 1 ] ; then
1515
line=$(perf probe -L getname_flags 2>&1 | egrep 'result.*=.*filename;' | sed -r 's/[[:space:]]+([[:digit:]]+)[[:space:]]+result->uptr.*/\1/')
1616
perf probe -q "vfs_getname=getname_flags:${line} pathname=result->name:string" || \
17-
perf probe $verbose "vfs_getname=getname_flags:${line} pathname=filename:string"
17+
perf probe $verbose "vfs_getname=getname_flags:${line} pathname=filename:ustring"
1818
fi
1919
}
2020

‎tools/perf/util/auxtrace.c

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,8 +629,10 @@ int auxtrace_record__options(struct auxtrace_record *itr,
629629
struct evlist *evlist,
630630
struct record_opts *opts)
631631
{
632-
if (itr)
632+
if (itr) {
633+
itr->evlist = evlist;
633634
return itr->recording_options(itr, evlist, opts);
635+
}
634636
return 0;
635637
}
636638

@@ -664,6 +666,24 @@ int auxtrace_parse_snapshot_options(struct auxtrace_record *itr,
664666
return -EINVAL;
665667
}
666668

669+
int auxtrace_record__read_finish(struct auxtrace_record *itr, int idx)
670+
{
671+
struct evsel *evsel;
672+
673+
if (!itr->evlist || !itr->pmu)
674+
return -EINVAL;
675+
676+
evlist__for_each_entry(itr->evlist, evsel) {
677+
if (evsel->core.attr.type == itr->pmu->type) {
678+
if (evsel->disabled)
679+
return 0;
680+
return perf_evlist__enable_event_idx(itr->evlist, evsel,
681+
idx);
682+
}
683+
}
684+
return -EINVAL;
685+
}
686+
667687
/*
668688
* Event record size is 16-bit which results in a maximum size of about 64KiB.
669689
* Allow about 4KiB for the rest of the sample record, to give a maximum

0 commit comments

Comments
 (0)