perf test: Fix test case 120 and 121 for s390
Subsystems (2)
PATCH 1/1 perf test: Fix test case 120 and 121 for s390
Perf tests
120: 'perf data convert --to-ctf' command test
121: 'perf data convert --to-json' command test
fail on s390. It is caused by selecting the default event cycles which does not exist on s390 z/VM. Use software event cpu-clock and specify it explicitly on the command line.
Output before:
❯ perf test 120 121
120: 'perf data convert --to-ctf' command test : FAILED!
121: 'perf data convert --to-json' command test : FAILED!
Output after:
❯ perf test 120 121
120: 'perf data convert --to-ctf' command test : Ok
121: 'perf data convert --to-json' command test : Ok
--- tools/perf/tests/shell/test_perf_data_converter_ctf.sh | 4 ++-- tools/perf/tests/shell/test_perf_data_converter_json.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
tools/perf/tests/shell/test_perf_data_converter_ctf.sh +2 -2
@@ -37,7 +37,7 @@ test_ctf_converter_file() { echo "Testing Perf Data Conversion Command to CTF (File input)" # Record some data - if ! perf record -o "$perfdata" -F 99 -g -- perf test -w noploop + if ! perf record -o "$perfdata" -e cpu-clock -F 99 -g -- perf test -w noploop then echo "Failed to record perf data" err=1
@@ -73,7 +73,7 @@ test_ctf_converter_pipe() rm -rf "${ctf_dir}" # Record to stdout and pipe to $perfdata file - if ! perf record -o - -F 99 -g -- perf test -w noploop > "$perfdata" + if ! perf record -o - -e cpu-clock -F 99 -g -- perf test -w noploop > "$perfdata" then echo "Failed to record perf data" err=1
tools/perf/tests/shell/test_perf_data_converter_json.sh +2 -2
@@ -31,7 +31,7 @@ trap trap_cleanup exit term int test_json_converter_command() { echo "Testing Perf Data Conversion Command to JSON" - perf record -o "$perfdata" -F 99 -g -- perf test -w noploop + perf record -o "$perfdata" -e cpu-clock -F 99 -g -- perf test -w noploop perf data convert --to-json "$result" --force -i "$perfdata" if [ "$(cat ${result} | wc -l)" -gt "0" ] ; then echo "Perf Data Converter Command to JSON [SUCCESS]"
@@ -44,7 +44,7 @@ test_json_converter_command() test_json_converter_pipe() { echo "Testing Perf Data Conversion Command to JSON (Pipe mode)" - perf record -o - -F 99 -g -- perf test -w noploop > "$perfdata" + perf record -o - -e cpu-clock -F 99 -g -- perf test -w noploop > "$perfdata" cat "$perfdata" | perf data convert --to-json "$result" --force -i - if [ "$(cat ${result} | wc -l)" -gt "0" ] ; then echo "Perf Data Converter Command to JSON (Pipe mode) [SUCCESS]"
Signature · 1 line
2.53.0
Quoted 12 lines · Thomas Richter
Perf tests
120: 'perf data convert --to-ctf' command test
121: 'perf data convert --to-json' command test
fail on s390. It is caused by selecting the default event cycles which does not exist on s390 z/VM. Use software event cpu-clock and specify it explicitly on the command line.Output before:
❯ perf test 120 121
120: 'perf data convert --to-ctf' command test : FAILED!
121: 'perf data convert --to-json' command test : FAILED!
Quoted 6 lines
Output after:
❯ perf test 120 121
120: 'perf data convert --to-ctf' command test : Ok
121: 'perf data convert --to-json' command test : OkSigned-off-by Thomas Richter <[email protected]>
[snip]
Thanks for providing this, Thomas!
Ian Rogers
reviewerQuoted 19 lines · Jan Polensky
Quoted 17 lines · Thomas Richter
Perf tests
120: 'perf data convert --to-ctf' command test
121: 'perf data convert --to-json' command test
fail on s390. It is caused by selecting the default event cycles which does not exist on s390 z/VM. Use software event cpu-clock and specify it explicitly on the command line.Output before:
❯ perf test 120 121
120: 'perf data convert --to-ctf' command test : FAILED!
121: 'perf data convert --to-json' command test : FAILED!Output after:
❯ perf test 120 121
120: 'perf data convert --to-ctf' command test : Ok
121: 'perf data convert --to-json' command test : Ok
Quoted 5 lines
Quoted 1 line
Signed-off-by Thomas Richter <[email protected]>[snip]
Thanks for providing this, Thomas!Tested-by Jan Polensky <[email protected]>Reviewed-by Jan Polensky <[email protected]>
Should we not fallback for the cycles as a default event?
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/builtin-record.c#n1374
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/evsel.c#n3792
Thanks,
Ian
Quoted 26 lines · Ian Rogers
Quoted 19 lines · Jan Polensky
Quoted 17 lines · Thomas Richter
Perf tests
120: 'perf data convert --to-ctf' command test
121: 'perf data convert --to-json' command test
fail on s390. It is caused by selecting the default event cycles which does not exist on s390 z/VM. Use software event cpu-clock and specify it explicitly on the command line.Output before:
❯ perf test 120 121
120: 'perf data convert --to-ctf' command test : FAILED!
121: 'perf data convert --to-json' command test : FAILED!Output after:
❯ perf test 120 121
120: 'perf data convert --to-ctf' command test : Ok
121: 'perf data convert --to-json' command test : OkQuoted 5 lines
Quoted 1 line
Signed-off-by Thomas Richter <[email protected]>[snip]
Thanks for providing this, Thomas!Tested-by Jan Polensky <[email protected]>Reviewed-by Jan Polensky <[email protected]>
Quoted 7 lines
Should we not fallback for the cycles as a default event?
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/builtin-record.c#n1374
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/evsel.c#n3792Thanks,
Ian
The fallback should be cpu-clock in case hardware event cycles (or CPU_CYCLES on s390) does not exist.
Thanks Thomas
Signature · 9 lines
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany -- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Wolfgang Wendt Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Ian Rogers
reviewerQuoted 32 lines · Thomas Richter
Quoted 30 lines · Ian Rogers
Quoted 19 lines · Jan Polensky
Quoted 17 lines · Thomas Richter
Perf tests
120: 'perf data convert --to-ctf' command test
121: 'perf data convert --to-json' command test
fail on s390. It is caused by selecting the default event cycles which does not exist on s390 z/VM. Use software event cpu-clock and specify it explicitly on the command line.Output before:
❯ perf test 120 121
120: 'perf data convert --to-ctf' command test : FAILED!
121: 'perf data convert --to-json' command test : FAILED!Output after:
❯ perf test 120 121
120: 'perf data convert --to-ctf' command test : Ok
121: 'perf data convert --to-json' command test : OkQuoted 5 lines
Quoted 1 line
Signed-off-by Thomas Richter <[email protected]>[snip]
Thanks for providing this, Thomas!Tested-by Jan Polensky <[email protected]>Reviewed-by Jan Polensky <[email protected]>Should we not fallback for the cycles as a default event?
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/builtin-record.c#n1374
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/evsel.c#n3792
Quoted 5 lines
Quoted 3 lines
Thanks,
IanThe fallback should be cpu-clock in case hardware event cycles (or
CPU_CYCLESon s390) does not exist.
Thanks Thomas, so the change is doing:
``` - if ! perf record -o "$perfdata" -F 99 -g -- perf test -w noploop + if ! perf record -o "$perfdata" -e cpu-clock -F 99 -g -- perf test -w noploop ```
where the default event is cycles:
https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/util/evlist.c#n116
Given that cycles will fail but then fallback to cpu-clock:
https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/util/evsel.c#n3792
I wonder if the issue is that the fallback is broken. Specifically:
```
evsel->core.attr.type == PERF_TYPE_HARDWARE &&
evsel->core.attr.config == PERF_COUNT_HW_CPU_CYCLES) {
```It isn't going to work well on hybrid machines or those whose PMU's sysfs events or JSON include a cycles event. I wonder if using evsel__match(evsel, HARDWARE, CYCLES) would be better, as the evsel__match code is more robust to these kind of variances. I don't know if that will address the fallback problem for you.
Thanks,
Ian
Quoted 11 lines
Thanks Thomas
--
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany --
IBM Deutschland Research & Development GmbHVorsitzender des Aufsichtsrats: Wolfgang Wendt
Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Namhyung Kim
maintainerQuoted 51 lines · Ian Rogers
Quoted 32 lines · Thomas Richter
Quoted 30 lines · Ian Rogers
Quoted 19 lines · Jan Polensky
Quoted 17 lines · Thomas Richter
Perf tests
120: 'perf data convert --to-ctf' command test
121: 'perf data convert --to-json' command test
fail on s390. It is caused by selecting the default event cycles which does not exist on s390 z/VM. Use software event cpu-clock and specify it explicitly on the command line.Output before:
❯ perf test 120 121
120: 'perf data convert --to-ctf' command test : FAILED!
121: 'perf data convert --to-json' command test : FAILED!Output after:
❯ perf test 120 121
120: 'perf data convert --to-ctf' command test : Ok
121: 'perf data convert --to-json' command test : OkQuoted 5 lines
Quoted 1 line
Signed-off-by Thomas Richter <[email protected]>[snip]
Thanks for providing this, Thomas!Tested-by Jan Polensky <[email protected]>Reviewed-by Jan Polensky <[email protected]>Should we not fallback for the cycles as a default event?
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/builtin-record.c#n1374
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/evsel.c#n3792Quoted 5 lines
Quoted 3 lines
Thanks,
IanThe fallback should be cpu-clock in case hardware event cycles (or
CPU_CYCLESon s390) does not exist.Thanks Thomas, so the change is doing:
```(quoted diff) +1
-1- if ! perf record -o "$perfdata" -F 99 -g -- perf test -w noploop + if ! perf record -o "$perfdata" -e cpu-clock -F 99 -g -- perftest -w noploop
``` where the default event is cycles: https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/util/evlist.c#n116 Given that cycles will fail but then fallback to cpu-clock: https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/util/evsel.c#n3792 I wonder if the issue is that the fallback is broken. Specifically: ```
Quoted 8 lines
evsel->core.attr.type==PERF_TYPE_HARDWARE&&
evsel->core.attr.config==PERF_COUNT_HW_CPU_CYCLES) {
```
It isn't going to work well on hybrid machines or those whose PMU's sysfs events or JSON include a cycles event. I wonder if usingevsel__match(evsel, HARDWARE, CYCLES)would be better, as theevsel__matchcode is more robust to these kind of variances. I don't know if that will address the fallback problem for you.
I suspect it may return a different error code on s390.
Thanks,
Namhyung
Quoted 61 lines · Namhyung Kim
Quoted 51 lines · Ian Rogers
Quoted 32 lines · Thomas Richter
Quoted 30 lines · Ian Rogers
Quoted 19 lines · Jan Polensky
Quoted 17 lines · Thomas Richter
Perf tests
120: 'perf data convert --to-ctf' command test
121: 'perf data convert --to-json' command test
fail on s390. It is caused by selecting the default event cycles which does not exist on s390 z/VM. Use software event cpu-clock and specify it explicitly on the command line.Output before:
❯ perf test 120 121
120: 'perf data convert --to-ctf' command test : FAILED!
121: 'perf data convert --to-json' command test : FAILED!Output after:
❯ perf test 120 121
120: 'perf data convert --to-ctf' command test : Ok
121: 'perf data convert --to-json' command test : OkQuoted 5 lines
Quoted 1 line
Signed-off-by Thomas Richter <[email protected]>[snip]
Thanks for providing this, Thomas!Tested-by Jan Polensky <[email protected]>Reviewed-by Jan Polensky <[email protected]>Should we not fallback for the cycles as a default event?
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/builtin-record.c#n1374
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/evsel.c#n3792Quoted 5 lines
Quoted 3 lines
Thanks,
IanThe fallback should be cpu-clock in case hardware event cycles (or
CPU_CYCLESon s390) does not exist.Thanks Thomas, so the change is doing:
```(quoted diff) +1
-1- if ! perf record -o "$perfdata" -F 99 -g -- perf test -w noploop + if ! perf record -o "$perfdata" -e cpu-clock -F 99 -g -- perftest -w noploop
``` where the default event is cycles: https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/util/evlist.c#n116 Given that cycles will fail but then fallback to cpu-clock: https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/util/evsel.c#n3792 I wonder if the issue is that the fallback is broken. Specifically: ```Quoted 8 lines
evsel->core.attr.type==PERF_TYPE_HARDWARE&&
evsel->core.attr.config==PERF_COUNT_HW_CPU_CYCLES) {
```
It isn't going to work well on hybrid machines or those whose PMU's sysfs events or JSON include a cycles event. I wonder if usingevsel__match(evsel, HARDWARE, CYCLES)would be better, as theevsel__matchcode is more robust to these kind of variances. I don't know if that will address the fallback problem for you.
Quoted 5 lines
I suspect it may return a different error code on s390.
Thanks,
Namhyung
This is interesting, further debugging revealed this:
# ./perf record -F 99 --call-graph dwarf -F99 -- perf test -w noploop Error: Failure to open event 'cpum_cf/cycles/PH' on PMU 'cpum_cf' which will be removed. cpum_cf/cycles/PH: PMU Hardware doesn't support sampling/overflow-interrupts. Try 'perf stat' Error: Failure to open any events for recording. # ./perf record -F 99 -g -- perf test -w noploop Error: Failure to open event 'cpum_cf/cycles/PH' on PMU 'cpum_cf' which will be removed. cpum_cf/cycles/PH: PMU Hardware doesn't support sampling/overflow-interrupts. Try 'perf stat' Error: Failure to open any events for recording. # ./perf record -F 99 -- perf test -w noploop [ perf record: Woken up 1 times to write data ] Failed to open /proc/schedstat [ perf record: Captured and wrote 0.012 MB perf.data (95 samples) ] #
So the real issue is the -g / --call-graph dwarf option. s390 supports only dwarf. But with --call-graph event 'cpum_cf/cycles/PH' is used, that is modifier H is added.
# ./perf evlist cpum_cf/cycles/P #
Without that option modifier H is not added and all is well.
I suggest to drop the call-graph option. If that option is needed for the test than we need a s390 change anyway.
Signature · 9 lines
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany -- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Wolfgang Wendt Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Ian Rogers
reviewercover perf evsel fallback changes
Discussion with Thomas Richter in:
https://lore.kernel.org/lkml/[email protected]/
showed that the evsel__fallback wasn't working for s390. These patches avoid the problematic frame pointer callchain on s390 and fix evsel__fallback from a range of problems when falling back to a software event. I simulated failures when developing the patches but they are untested other than that.
Ian Rogers (2):
perf evsel: Improve falling back from cycles
perf evsel: Don't configure framepointer callchains on s390
tools/perf/util/evsel.c | 49 +++++++++++++++++++++++++++++------------ tools/perf/util/evsel.h | 2 ++ 2 files changed, 37 insertions(+), 14 deletions(-)
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH 1/2 perf evsel: Improve falling back from cycles
Switch to using evsel__match rather than comparing perf_event_attr values, this is robust on hybrid architectures.
Ensure evsel->pmu matches the evsel->core.attr.
Remove exclude bits that get set in other fallback attempts when switching the event.
Log the event name with modifiers when switching the event on fallback.
--- tools/perf/util/evsel.c | 44 ++++++++++++++++++++++++++++------------- tools/perf/util/evsel.h | 2 ++ 2 files changed, 32 insertions(+), 14 deletions(-)
tools/perf/util/evsel.c +30 -14
@@ -3785,25 +3785,41 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, {int paranoid; -if ((err ==ENOENT || err ==ENXIO || err ==ENODEV ) && - evsel->core.attr.type ==PERF_TYPE_HARDWARE && - evsel->core.attr.config ==PERF_COUNT_HW_CPU_CYCLES ) { +if ((err ==ENODEV || err ==ENOENT || err ==ENXIO ) && +evsel__match (evsel,HARDWARE ,HW_CPU_CYCLES )) {/* -* If it's cycles then fall back to hrtimer based cpu-clock sw -* counter, which is always available even if no PMU support. -* -* PPC returns ENXIO until 2.6.37 (behavior changed with commit -* b0a873e). +* If it's the legacy hardware cycles event fails then fall back +* to hrtimer based cpu-clock sw counter, which is always +* available even if no PMU support. PPC returned ENXIO rather +* than ENODEV or ENOENT until 2.6.37. */ - evsel->core.attr.type =PERF_TYPE_SOFTWARE ; + evsel->pmu =perf_pmus__find_by_type (PERF_TYPE_SOFTWARE ); +assert (evsel->pmu);/* software is a "well-known" and can't fail PMU type. */ + +/* Configure the event. */ + evsel->core.attr.type =PERF_TYPE_SOFTWARE ; evsel->core.attr.config =target__has_cpu (target) ?PERF_COUNT_SW_CPU_CLOCK :PERF_COUNT_SW_TASK_CLOCK ; -scnprintf (msg, msgsize, -"The cycles event is not supported, trying to fall back to %s" , -target__has_cpu (target) ?"cpu-clock" :"task-clock" ); +/* Remove excludes for new event. */ +if (evsel->fallenback_eacces) { + evsel->core.attr.exclude_kernel =0 ; + evsel->core.attr.exclude_hv =0 ; + evsel->fallenback_eacces = false; + } +if (evsel->fallenback_eopnotsupp) { + evsel->core.attr.exclude_guest =0 ; + evsel->fallenback_eopnotsupp = false; + } + +/* Name is recomputed by evsel__name. */ zfree (&evsel->name); + +/* Log message. */ +scnprintf (msg, msgsize, +"The cycles event is not supported, trying to fall back to %s" , +evsel__name (evsel));return true; }else if (err ==EACCES && !evsel->core.attr.exclude_kernel && (paranoid =perf_event_paranoid ()) >1 ) {
@@ -3830,7 +3846,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, " samples", paranoid); evsel->core.attr.exclude_kernel =1 ; evsel->core.attr.exclude_hv =1 ; - + evsel->fallenback_eacces = true;return true; }else if (err ==EOPNOTSUPP && !evsel->core.attr.exclude_guest && !evsel->exclude_GH) {
@@ -3851,7 +3867,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err,/* Apple M1 requires exclude_guest */ scnprintf (msg, msgsize,"Trying to fall back to excluding guest samples" ); evsel->core.attr.exclude_guest =1 ; - + evsel->fallenback_eopnotsupp = true;return true; } no_fallback:
tools/perf/util/evsel.h +2 -0
@@ -124,6 +124,8 @@ struct evsel {bool default_metricgroup;/* A member of the Default metricgroup */ bool default_show_events;/* If a default group member, show the event */ bool needs_uniquify; +bool fallenback_eacces; +bool fallenback_eopnotsupp;struct hashmap *per_pkg_mask;int err;int script_output_type;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH 2/2 perf evsel: Don't configure framepointer callchains on s390
In reply to Ian RogersFrame pointer callchains are not supported on s390. Ignore the option and print a warning.
--- tools/perf/util/evsel.c | 5 +++++ 1 file changed, 5 insertions(+)
tools/perf/util/evsel.c +5 -0
@@ -1021,6 +1021,11 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *obool function =evsel__is_function_event (evsel);struct perf_event_attr *attr = &evsel->core.attr; +if (EM_HOST ==EM_S390 && param->record_mode ==CALLCHAIN_FP ) { +pr_warning ("Framepointer unwinding not supported on s390, option ignored. Try '--call-graph dwarf'\n" ); +return ; + } +evsel__set_sample_bit (evsel,CALLCHAIN ); attr->sample_max_stack = param->max_stack;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerv2 cover perf evsel fallback changes
In reply to Ian RogersDiscussion with Thomas Richter in:
https://lore.kernel.org/lkml/[email protected]/
showed that the evsel__fallback wasn't working for s390. These patches avoid the problematic frame pointer callchain on s390 and fix evsel__fallback from a range of problems when falling back to a software event. I simulated failures when developing the patches but they are untested other than that.
v2: try exclude_callchain_user for s390 rather than fully disabling
the callchain. Fix a missed clearing of is_pmu_core if the software event fallback.
v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (2):
perf evsel: Improve falling back from cycles
perf evsel: Don't configure framepointer callchains on s390
tools/perf/util/evsel.c | 51 ++++++++++++++++++++++++++++++----------- tools/perf/util/evsel.h | 2 ++ 2 files changed, 39 insertions(+), 14 deletions(-)
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v2 1/2 perf evsel: Improve falling back from cycles
Switch to using evsel__match rather than comparing perf_event_attr values, this is robust on hybrid architectures.
Ensure evsel->pmu matches the evsel->core.attr.
Remove exclude bits that get set in other fallback attempts when switching the event.
Log the event name with modifiers when switching the event on fallback.
---
v2: Also update evsel->core.is_pmu_core when switchingto a software event.
--- tools/perf/util/evsel.c | 45 ++++++++++++++++++++++++++++------------- tools/perf/util/evsel.h | 2 ++ 2 files changed, 33 insertions(+), 14 deletions(-)
tools/perf/util/evsel.c +31 -14
@@ -3785,25 +3785,42 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, {int paranoid; -if ((err ==ENOENT || err ==ENXIO || err ==ENODEV ) && - evsel->core.attr.type ==PERF_TYPE_HARDWARE && - evsel->core.attr.config ==PERF_COUNT_HW_CPU_CYCLES ) { +if ((err ==ENODEV || err ==ENOENT || err ==ENXIO ) && +evsel__match (evsel,HARDWARE ,HW_CPU_CYCLES )) {/* -* If it's cycles then fall back to hrtimer based cpu-clock sw -* counter, which is always available even if no PMU support. -* -* PPC returns ENXIO until 2.6.37 (behavior changed with commit -* b0a873e). +* If it's the legacy hardware cycles event fails then fall back +* to hrtimer based cpu-clock sw counter, which is always +* available even if no PMU support. PPC returned ENXIO rather +* than ENODEV or ENOENT until 2.6.37. */ - evsel->core.attr.type =PERF_TYPE_SOFTWARE ; + evsel->pmu =perf_pmus__find_by_type (PERF_TYPE_SOFTWARE ); +assert (evsel->pmu);/* software is a "well-known" and can't fail PMU type. */ + +/* Configure the event. */ + evsel->core.attr.type =PERF_TYPE_SOFTWARE ; evsel->core.attr.config =target__has_cpu (target) ?PERF_COUNT_SW_CPU_CLOCK :PERF_COUNT_SW_TASK_CLOCK ; -scnprintf (msg, msgsize, -"The cycles event is not supported, trying to fall back to %s" , -target__has_cpu (target) ?"cpu-clock" :"task-clock" ); + evsel->core.is_pmu_core = false; + +/* Remove excludes for new event. */ +if (evsel->fallenback_eacces) { + evsel->core.attr.exclude_kernel =0 ; + evsel->core.attr.exclude_hv =0 ; + evsel->fallenback_eacces = false; + } +if (evsel->fallenback_eopnotsupp) { + evsel->core.attr.exclude_guest =0 ; + evsel->fallenback_eopnotsupp = false; + } +/* Name is recomputed by evsel__name. */ zfree (&evsel->name); + +/* Log message. */ +scnprintf (msg, msgsize, +"The cycles event is not supported, trying to fall back to %s" , +evsel__name (evsel));return true; }else if (err ==EACCES && !evsel->core.attr.exclude_kernel && (paranoid =perf_event_paranoid ()) >1 ) {
@@ -3830,7 +3847,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, " samples", paranoid); evsel->core.attr.exclude_kernel =1 ; evsel->core.attr.exclude_hv =1 ; - + evsel->fallenback_eacces = true;return true; }else if (err ==EOPNOTSUPP && !evsel->core.attr.exclude_guest && !evsel->exclude_GH) {
@@ -3851,7 +3868,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err,/* Apple M1 requires exclude_guest */ scnprintf (msg, msgsize,"Trying to fall back to excluding guest samples" ); evsel->core.attr.exclude_guest =1 ; - + evsel->fallenback_eopnotsupp = true;return true; } no_fallback:
tools/perf/util/evsel.h +2 -0
@@ -124,6 +124,8 @@ struct evsel {bool default_metricgroup;/* A member of the Default metricgroup */ bool default_show_events;/* If a default group member, show the event */ bool needs_uniquify; +bool fallenback_eacces; +bool fallenback_eopnotsupp;struct hashmap *per_pkg_mask;int err;int script_output_type;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v2 2/2 perf evsel: Don't configure framepointer callchains on s390
In reply to Ian RogersFrame pointer callchains are not supported on s390. Ignore the option and print a warning.
---
v2: Only disable user callchains as AI is telling me native "kernel"
callchains are supported on s390.
--- tools/perf/util/evsel.c | 6 ++++++ 1 file changed, 6 insertions(+)
tools/perf/util/evsel.c +6 -0
@@ -1076,6 +1076,12 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->exclude_callchain_user =1 ; } +if (EM_HOST ==EM_S390 && (evsel->core.attr.sample_type &PERF_SAMPLE_CALLCHAIN ) && + !evsel->core.attr.exclude_callchain_user) { +pr_warning ("Excluding user callchains that are not supported on s390. Try '--call-graph dwarf'\n" ); + evsel->core.attr.exclude_callchain_user =1 ; + } +if (param->defer && !attr->exclude_callchain_user) attr->defer_callchain =1 ; }
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Re: [PATCH v2 2/2] perf evsel: Don't configure framepointer callchains on s390
Quoted 18 lines · Ian Rogers
Frame pointer callchains are not supported on s390. Ignore the option and print a warning.
Signed-off-by Ian Rogers <[email protected]>---
v2: Only disable user callchains as AI is telling me native "kernel"
callchains are supported on s390.--- tools/perf/util/evsel.c | 6 ++++++ 1 file changed, 6 insertions(+)tools/perf/util/evsel.c +0
-0@@ -1076,6 +1076,12 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->exclude_callchain_user =1 ; }
tools/perf/util/evsel.c static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o · line 1087
Quoted 10 lines
tools/perf/util/evsel.c +6
-0+if (EM_HOST ==EM_S390 && (evsel->core.attr.sample_type &PERF_SAMPLE_CALLCHAIN ) && + !evsel->core.attr.exclude_callchain_user) { +pr_warning ("Excluding user callchains that are not supported on s390. Try '--call-graph dwarf'\n" ); + evsel->core.attr.exclude_callchain_user =1 ; + } +if (param->defer && !attr->exclude_callchain_user) attr->defer_callchain =1 ; }
Ian, thanks very much.
Your patch set helps a lot. However there is a small nit (which is mandatory). Please add these lines
evsel->core.attr.sample_type &= ~PERF_SAMPLE_CALLCHAIN; evsel->core.attr.sample_type &= ~PERF_SAMPLE_REGS_USER; evsel->core.attr.sample_type &= ~PERF_SAMPLE_STACK_USER;
to the new if(EM_HOST == ...) above.
The s390 CPU Measurement sampling device driver does not check on the attr.core.exclude_callchain_user member, but on the sample_type bit mask. It returns -EOPNOTSUPP when this bit PERF_SAMPLE_CALLCHAIN is set. This solves the invocation with command line flag -g as in
# ./perf record -v -e cycles -g -- perf test -w noploop ... perf record: Captured and wrote 0.183 MB perf.data ]
Also I discovered that the fallback when using --call-graph dwarf command line flag still fails:
# ./perf record -v -e cycles --call-graph dwarf -- perf test -w noploop ... Warning: Trying to fall back to excluding guest samples Error: Failure to open event 'cycles:H' on PMU 'cpum_cf' which will be removed. cycles:H: PMU Hardware doesn't support sampling overflow-interrupts. Try 'perf stat' Error: Failure to open any events for recording.
The reason is in __evsel__config_callchain() which calls evsel__set_sample_bit(evsel, CALLCHAIN) and sets the PERF_SAMPLE_CALLCHAIN bit in evsel->core.attr.sample_type. It also sets the member attr->exclude_callchain_user = 1 and sets bits REGS_USER and _STACK_USER. All three bits are not supported by s390.
I have modified your 2nd patch and appended it.
I find all these bits in sample_type and the attr.exclude_XXX stuff very confusing. If there is a more consistant way of checking these feature, please let me know.
Thanks again for looking into this.
Signature · 9 lines
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany -- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Wolfgang Wendt Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
From fa7720071277e7f892c9d81f2e277c4ae0359054 Mon Sep 17 00:00:00 2001
From: Ian Rogers <[email protected]>
Date: Wed, 11 Mar 2026 23:16:28 -0700
Subject: [PATCH] perf evsel: Don't configure framepointer callchains on s390
Frame pointer callchains are not supported on s390. Ignore the option and print a warning.
--- tools/perf/util/evsel.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/perf/util/evsel.c +8 -0
@@ -1076,6 +1076,14 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->exclude_callchain_user =1 ; } +if (EM_HOST ==EM_S390 && (evsel->core.attr.sample_type &PERF_SAMPLE_CALLCHAIN )) { +pr_warning ("Excluding user callchains that are not supported on s390. Try '--call-graph dwarf'\n" ); + evsel->core.attr.exclude_callchain_user =1 ; + evsel->core.attr.sample_type &= ~PERF_SAMPLE_CALLCHAIN ; + evsel->core.attr.sample_type &= ~PERF_SAMPLE_REGS_USER ; + evsel->core.attr.sample_type &= ~PERF_SAMPLE_STACK_USER ; + } +if (param->defer && !attr->exclude_callchain_user) attr->defer_callchain =1 ; }
Signature · 1 line
2.53.0
Ian Rogers
reviewerRe: [PATCH v2 2/2] perf evsel: Don't configure framepointer callchains on s390
Quoted 34 lines · Thomas Richter
Quoted 18 lines · Ian Rogers
Frame pointer callchains are not supported on s390. Ignore the option and print a warning.
Signed-off-by Ian Rogers <[email protected]>---
v2: Only disable user callchains as AI is telling me native "kernel"
callchains are supported on s390.--- tools/perf/util/evsel.c | 6 ++++++ 1 file changed, 6 insertions(+)tools/perf/util/evsel.c +0
-0@@ -1076,6 +1076,12 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->exclude_callchain_user =1 ; }tools/perf/util/evsel.c static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o · line 1087
Quoted 10 lines
tools/perf/util/evsel.c +6
-0+if (EM_HOST ==EM_S390 && (evsel->core.attr.sample_type &PERF_SAMPLE_CALLCHAIN ) && + !evsel->core.attr.exclude_callchain_user) { +pr_warning ("Excluding user callchains that are not supported on s390. Try '--call-graph dwarf'\n" ); + evsel->core.attr.exclude_callchain_user =1 ; + } +if (param->defer && !attr->exclude_callchain_user) attr->defer_callchain =1 ; }Ian, thanks very much.
Your patch set helps a lot. However there is a small nit (which is mandatory). Please add these lines
Quoted 3 lines
evsel->core.attr.sample_type &= ~PERF_SAMPLE_CALLCHAIN; evsel->core.attr.sample_type &= ~PERF_SAMPLE_REGS_USER; evsel->core.attr.sample_type &= ~PERF_SAMPLE_STACK_USER;
So these lines are dropping callchain from the sample_type which means the kernel stack won't be sampled. AI was telling me this worked, but I'm guess it was wrong. I think rather than this it is just cleaner never to set the bits in the perf_event_attr, more like what v1 of the patch did:
https://lore.kernel.org/lkml/[email protected]/
Quoted 7 lines
to the new
if(EM_HOST == ...)above.
The s390 CPU Measurement sampling device driver does not check on the attr.core.exclude_callchain_user member, but on thesample_typebit mask. It returns-EOPNOTSUPPwhen this bitPERF_SAMPLE_CALLCHAINis set. This solves the invocation with command line flag -g as in# ./perf record -v -e cycles -g -- perf test -w noploop ... perf record: Captured and wrote 0.183 MB perf.data ]
Right because the callchain was removed from all the samples. We can't fix old kernels (other than by using fix tags); is there a possibility of adding the exclude_callchain_user to the s390 perf driver for the sake of kernel callchains? It seems better than providing no callchain.
Quoted 11 lines
Also I discovered that the fallback when using --call-graph dwarf command line flag still fails:
# ./perf record -v -e cycles --call-graph dwarf -- perf test -w noploop ... Warning: Trying to fall back to excluding guest samples Error: Failure to open event 'cycles:H' on PMU 'cpum_cf' which will be removed. cycles:H: PMU Hardware doesn't support sampling overflow-interrupts. Try 'perf stat' Error: Failure to open any events for recording.
Quoted 4 lines
The reason is in
__evsel__config_callchain()which callsevsel__set_sample_bit(evsel, CALLCHAIN)and sets thePERF_SAMPLE_CALLCHAINbit inevsel->core.attr.sample_type. It also sets the memberattr->exclude_callchain_user= 1 and sets bitsREGS_USERand_STACK_USER. All three bits are not supported by s390.
I'm confused by this and your previous testing that showed the --call-graph dwarf worked. You need the sampled registers for dwarf unwinding to provide initial register values for the unwinder.
Quoted 4 lines
I have modified your 2nd patch and appended it.
I find all these bits in
sample_typeand the attr.exclude_XXX stuff very confusing. If there is a more consistant way of checking these feature, please let me know.
Ok, let me check it out.
Quoted 1 line
Thanks again for looking into this.
Thanks,
Ian
Quoted 10 lines
--
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany --
IBM Deutschland Research & Development GmbHVorsitzender des Aufsichtsrats: Wolfgang Wendt
Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Ian Rogers
reviewerRe: [PATCH v2 2/2] perf evsel: Don't configure framepointer callchains on s390
Quoted 72 lines · Ian Rogers
Quoted 34 lines · Thomas Richter
Quoted 18 lines · Ian Rogers
Frame pointer callchains are not supported on s390. Ignore the option and print a warning.
Signed-off-by Ian Rogers <[email protected]>---
v2: Only disable user callchains as AI is telling me native "kernel"
callchains are supported on s390.--- tools/perf/util/evsel.c | 6 ++++++ 1 file changed, 6 insertions(+)tools/perf/util/evsel.c +0
-0@@ -1076,6 +1076,12 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->exclude_callchain_user =1 ; }tools/perf/util/evsel.c static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o · line 1087
Quoted 10 lines
tools/perf/util/evsel.c +6
-0+if (EM_HOST ==EM_S390 && (evsel->core.attr.sample_type &PERF_SAMPLE_CALLCHAIN ) && + !evsel->core.attr.exclude_callchain_user) { +pr_warning ("Excluding user callchains that are not supported on s390. Try '--call-graph dwarf'\n" ); + evsel->core.attr.exclude_callchain_user =1 ; + } +if (param->defer && !attr->exclude_callchain_user) attr->defer_callchain =1 ; }Ian, thanks very much.
Your patch set helps a lot. However there is a small nit (which is mandatory). Please add these linesQuoted 3 lines
evsel->core.attr.sample_type &= ~PERF_SAMPLE_CALLCHAIN; evsel->core.attr.sample_type &= ~PERF_SAMPLE_REGS_USER; evsel->core.attr.sample_type &= ~PERF_SAMPLE_STACK_USER;So these lines are dropping callchain from the
sample_typewhich means the kernel stack won't be sampled. AI was telling me this worked, but I'm guess it was wrong. I think rather than this it is just cleaner never to set the bits in theperf_event_attr, more like what v1 of the patch did:
https://lore.kernel.org/lkml/[email protected]/Quoted 7 lines
to the new
if(EM_HOST == ...)above.
The s390 CPU Measurement sampling device driver does not check on the attr.core.exclude_callchain_user member, but on thesample_typebit mask. It returns-EOPNOTSUPPwhen this bitPERF_SAMPLE_CALLCHAINis set. This solves the invocation with command line flag -g as in# ./perf record -v -e cycles -g -- perf test -w noploop ... perf record: Captured and wrote 0.183 MB perf.data ]Right because the callchain was removed from all the samples. We can't fix old kernels (other than by using fix tags); is there a possibility of adding the
exclude_callchain_userto the s390 perf driver for the sake of kernel callchains? It seems better than providing no callchain.Quoted 11 lines
Also I discovered that the fallback when using --call-graph dwarf command line flag still fails:
# ./perf record -v -e cycles --call-graph dwarf -- perf test -w noploop ... Warning: Trying to fall back to excluding guest samples Error: Failure to open event 'cycles:H' on PMU 'cpum_cf' which will be removed. cycles:H: PMU Hardware doesn't support sampling overflow-interrupts. Try 'perf stat' Error: Failure to open any events for recording.
Quoted 13 lines
Quoted 4 lines
The reason is in
__evsel__config_callchain()which callsevsel__set_sample_bit(evsel, CALLCHAIN)and sets thePERF_SAMPLE_CALLCHAINbit inevsel->core.attr.sample_type. It also sets the memberattr->exclude_callchain_user= 1 and sets bitsREGS_USERand_STACK_USER. All three bits are not supported by s390.I'm confused by this and your previous testing that showed the
--call-graph dwarfworked. You need the sampled registers for dwarf unwinding to provide initial register values for the unwinder.Quoted 4 lines
I have modified your 2nd patch and appended it.
I find all these bits in
sample_typeand the attr.exclude_XXX stuff very confusing. If there is a more consistant way of checking these feature, please let me know.
I forgot to mention, yeah the exclude thing is maddening. It takes about 100 lines to convert the command line modifiers to those in the perf_event_attr, there's a priority to them, and so on:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/util/parse-events.c#n1759
Fwiw, I was thinking for patch 1 of holding onto the parsed modifiers so that we could reset the excludes based on them when switching to the software event.
Quoted 1 line
Ok, let me check it out.
So looking at the cpum_cf driver it fails events for having sampling enabled:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/s390/kernel/perf_cpum_cf.c#n859
``` if (is_sampling_event(event)) /* No sampling support */ ``` and the cpum_sf driver fails for any kind of callchain: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/s390/kernel/perf_cpum_sf.c#n839 ``` static bool is_callchain_event(struct perf_event *event) { u64 sample_type = event->attr.sample_type; return sample_type & (PERF_SAMPLE_CALLCHAIN | PERF_SAMPLE_REGS_USER | PERF_SAMPLE_REGS_INTR | PERF_SAMPLE_STACK_USER); } static int cpumsf_pmu_event_init(struct perf_event *event) { int err; /* No support for taken branch sampling */ /* No support for callchain, stacks and registers */ if (has_branch_stack(event) || is_callchain_event(event)) return -EOPNOTSUPP; ```
Perhaps there is an oversight in the cpum_cf driver wrt branch stacks (LBR on x86). The PERF_SAMPLE_CALLCHAIN bit is set for perf call-graph options currently:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/util/evsel.c#n1024
I think cpum_sf is the PMU we care about for the default cycles event? Since callchains of any flavor don't work with cpum_sf we can do a few things:
1) Disable the callchain and allow hardware sampling to continue,
2) Switch to a software event like cpu-clock,
3) Fail for the callchain option with this PMU, which is currently happening anyway.
I dislike option 3 because it requires special s390 logic for many tests, and we lose testing coverage of hardware events. Option 1 is a smaller patch, an early return in __evsel__config_callchain if on s390. Option 2 feels most like what the user would want given they asked for a callchain. We could change evlist__new_default to take a "with callchain" boolean and on s390 that could switch the event to a software one. Only two non-test callers use evlist__new__default (record and top), so it isn't a huge change.
Wdyt Thomas, option 1 or 2?
Thanks,
Ian
Quoted 15 lines
Quoted 1 line
Thanks again for looking into this.
Thanks,
IanQuoted 10 lines
--
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany --
IBM Deutschland Research & Development GmbHVorsitzender des Aufsichtsrats: Wolfgang Wendt
Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Namhyung Kim
maintainerRe: [PATCH v2 2/2] perf evsel: Don't configure framepointer callchains on s390
Hello,
Quoted 127 lines · Ian Rogers
Quoted 72 lines · Ian Rogers
Quoted 34 lines · Thomas Richter
Quoted 18 lines · Ian Rogers
Frame pointer callchains are not supported on s390. Ignore the option and print a warning.
Signed-off-by Ian Rogers <[email protected]>---
v2: Only disable user callchains as AI is telling me native "kernel"
callchains are supported on s390.--- tools/perf/util/evsel.c | 6 ++++++ 1 file changed, 6 insertions(+)tools/perf/util/evsel.c +0
-0@@ -1076,6 +1076,12 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->exclude_callchain_user =1 ; }tools/perf/util/evsel.c static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o · line 1087
Quoted 10 lines
tools/perf/util/evsel.c +6
-0+if (EM_HOST ==EM_S390 && (evsel->core.attr.sample_type &PERF_SAMPLE_CALLCHAIN ) && + !evsel->core.attr.exclude_callchain_user) { +pr_warning ("Excluding user callchains that are not supported on s390. Try '--call-graph dwarf'\n" ); + evsel->core.attr.exclude_callchain_user =1 ; + } +if (param->defer && !attr->exclude_callchain_user) attr->defer_callchain =1 ; }Ian, thanks very much.
Your patch set helps a lot. However there is a small nit (which is mandatory). Please add these linesQuoted 3 lines
evsel->core.attr.sample_type &= ~PERF_SAMPLE_CALLCHAIN; evsel->core.attr.sample_type &= ~PERF_SAMPLE_REGS_USER; evsel->core.attr.sample_type &= ~PERF_SAMPLE_STACK_USER;So these lines are dropping callchain from the
sample_typewhich means the kernel stack won't be sampled. AI was telling me this worked, but I'm guess it was wrong. I think rather than this it is just cleaner never to set the bits in theperf_event_attr, more like what v1 of the patch did:
https://lore.kernel.org/lkml/[email protected]/Quoted 7 lines
to the new
if(EM_HOST == ...)above.
The s390 CPU Measurement sampling device driver does not check on the attr.core.exclude_callchain_user member, but on thesample_typebit mask. It returns-EOPNOTSUPPwhen this bitPERF_SAMPLE_CALLCHAINis set. This solves the invocation with command line flag -g as in# ./perf record -v -e cycles -g -- perf test -w noploop ... perf record: Captured and wrote 0.183 MB perf.data ]Right because the callchain was removed from all the samples. We can't fix old kernels (other than by using fix tags); is there a possibility of adding the
exclude_callchain_userto the s390 perf driver for the sake of kernel callchains? It seems better than providing no callchain.Quoted 11 lines
Also I discovered that the fallback when using --call-graph dwarf command line flag still fails:
# ./perf record -v -e cycles --call-graph dwarf -- perf test -w noploop ... Warning: Trying to fall back to excluding guest samples Error: Failure to open event 'cycles:H' on PMU 'cpum_cf' which will be removed. cycles:H: PMU Hardware doesn't support sampling overflow-interrupts. Try 'perf stat' Error: Failure to open any events for recording.Quoted 13 lines
Quoted 4 lines
The reason is in
__evsel__config_callchain()which callsevsel__set_sample_bit(evsel, CALLCHAIN)and sets thePERF_SAMPLE_CALLCHAINbit inevsel->core.attr.sample_type. It also sets the memberattr->exclude_callchain_user= 1 and sets bitsREGS_USERand_STACK_USER. All three bits are not supported by s390.I'm confused by this and your previous testing that showed the
--call-graph dwarfworked. You need the sampled registers for dwarf unwinding to provide initial register values for the unwinder.Quoted 4 lines
I have modified your 2nd patch and appended it.
I find all these bits in
sample_typeand the attr.exclude_XXX stuff very confusing. If there is a more consistant way of checking these feature, please let me know.I forgot to mention, yeah the exclude thing is maddening. It takes about 100 lines to convert the command line modifiers to those in the
perf_event_attr, there's a priority to them, and so on:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/util/parse-events.c#n1759
Fwiw, I was thinking for patch 1 of holding onto the parsed modifiers so that we could reset the excludes based on them when switching to the software event.Quoted 1 line
Ok, let me check it out.
So looking at the
cpum_cfdriver it fails events for having sampling enabled:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/s390/kernel/perf_cpum_cf.c#n859``` if (is_sampling_event(event)) /* No sampling support */ ``` and the cpum_sf driver fails for any kind of callchain: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/s390/kernel/perf_cpum_sf.c#n839 ``` static bool is_callchain_event(struct perf_event *event) { u64 sample_type = event->attr.sample_type; return sample_type & (PERF_SAMPLE_CALLCHAIN | PERF_SAMPLE_REGS_USER | PERF_SAMPLE_REGS_INTR | PERF_SAMPLE_STACK_USER); } static int cpumsf_pmu_event_init(struct perf_event *event) { int err; /* No support for taken branch sampling */ /* No support for callchain, stacks and registers */ if (has_branch_stack(event) || is_callchain_event(event)) return -EOPNOTSUPP; ```Perhaps there is an oversight in the
cpum_cfdriver wrt branch stacks (LBR on x86). ThePERF_SAMPLE_CALLCHAINbit is set for perf call-graph options currently:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/util/evsel.c#n1024
Quoted 7 lines
I think
cpum_sfis the PMU we care about for the default cycles event? Since callchains of any flavor don't work withcpum_sfwe can do a few things:
1) Disable the callchain and allow hardware sampling to continue,
2) Switch to a software event like cpu-clock,
3) Fail for the callchain option with this PMU, which is currently happening anyway.
I'm confused. Is it failing to open any events with callchains or just events from cpum_sf PMU (with callchains)?
Thanks,
Namhyung
Quoted 30 lines
I dislike option 3 because it requires special s390 logic for many tests, and we lose testing coverage of hardware events. Option 1 is a smaller patch, an early return in
__evsel__config_callchainif on s390. Option 2 feels most like what the user would want given they asked for a callchain. We could changeevlist__new_defaultto take a "with callchain" boolean and on s390 that could switch the event to a software one. Only two non-test callers useevlist__new__default(record and top), so it isn't a huge change.Wdyt Thomas, option 1 or 2?
Thanks,
IanQuoted 15 lines
Quoted 1 line
Thanks again for looking into this.
Thanks,
IanQuoted 10 lines
--
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany --
IBM Deutschland Research & Development GmbHVorsitzender des Aufsichtsrats: Wolfgang Wendt
Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Re: [PATCH v2 2/2] perf evsel: Don't configure framepointer callchains on s390
In reply to Ian RogersQuoted 41 lines · Ian Rogers
Quoted 40 lines · Ian Rogers
Quoted 37 lines · Thomas Richter
Quoted 18 lines · Ian Rogers
Frame pointer callchains are not supported on s390. Ignore the option and print a warning.
Signed-off-by Ian Rogers <[email protected]>---
v2: Only disable user callchains as AI is telling me native "kernel"
callchains are supported on s390.--- tools/perf/util/evsel.c | 6 ++++++ 1 file changed, 6 insertions(+)tools/perf/util/evsel.c +0
-0@@ -1076,6 +1076,12 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->exclude_callchain_user =1 ; }tools/perf/util/evsel.c static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o · line 1087
Quoted 10 lines
tools/perf/util/evsel.c +6
-0+if (EM_HOST ==EM_S390 && (evsel->core.attr.sample_type &PERF_SAMPLE_CALLCHAIN ) && + !evsel->core.attr.exclude_callchain_user) { +pr_warning ("Excluding user callchains that are not supported on s390. Try '--call-graph dwarf'\n" ); + evsel->core.attr.exclude_callchain_user =1 ; + } +if (param->defer && !attr->exclude_callchain_user) attr->defer_callchain =1 ; }Ian, thanks very much.
Your patch set helps a lot. However there is a small nit (which is mandatory). Please add these linesevsel->core.attr.sample_type &= ~PERF_SAMPLE_CALLCHAIN; evsel->core.attr.sample_type &= ~PERF_SAMPLE_REGS_USER; evsel->core.attr.sample_type &= ~PERF_SAMPLE_STACK_USER;
Quoted 7 lines
Quoted 7 lines
So these lines are dropping callchain from the
sample_typewhich means the kernel stack won't be sampled. AI was telling me this worked, but I'm guess it was wrong. I think rather than this it is just cleaner never to set the bits in theperf_event_attr, more like what v1 of the patch did:
https://lore.kernel.org/lkml/[email protected]/
Let me try to answer your and Namhyung questions in one reply.
s390 has many PMUs, there is one for counting (cpum_cf) and one for sampling (cpum_sf), which are totally different hardware components.
Hardware sampling
1. writes into a large buffer, data is timestamp and IP (instruction pointer), no registers, no PID.
2. when buffer gets full an interrupt occurs and the interrupt handler scans the hardware samples and converts valid samples to perf format and saves them in perf ring buffer.
This means we can not reconstruct register values for an individual sample. Current Pid is saved by other means somewhere and added to perf data during perf ring buffer write.
For s390 when we need callchains, we always use event cpu-clock, never hardware event cycles.
Quoted 30 lines
Quoted 30 lines
Quoted 7 lines
to the new
if(EM_HOST == ...)above.
The s390 CPU Measurement sampling device driver does not check on the attr.core.exclude_callchain_user member, but on thesample_typebit mask. It returns-EOPNOTSUPPwhen this bitPERF_SAMPLE_CALLCHAINis set. This solves the invocation with command line flag -g as in# ./perf record -v -e cycles -g -- perf test -w noploop ... perf record: Captured and wrote 0.183 MB perf.data ]Right because the callchain was removed from all the samples. We can't fix old kernels (other than by using fix tags); is there a possibility of adding the
exclude_callchain_userto the s390 perf driver for the sake of kernel callchains? It seems better than providing no callchain.Quoted 15 lines
Also I discovered that the fallback when using --call-graph dwarf command line flag still fails:
# ./perf record -v -e cycles --call-graph dwarf -- perf test -w noploop ... Warning: Trying to fall back to excluding guest samples Error: Failure to open event 'cycles:H' on PMU 'cpum_cf' which will be removed. cycles:H: PMU Hardware doesn't support sampling overflow-interrupts. Try 'perf stat' Error: Failure to open any events for recording.The reason is in
__evsel__config_callchain()which callsevsel__set_sample_bit(evsel, CALLCHAIN)and sets thePERF_SAMPLE_CALLCHAINbit inevsel->core.attr.sample_type. It also sets the memberattr->exclude_callchain_user= 1 and sets bitsREGS_USERand_STACK_USER. All three bits are not supported by s390.
Quoted 4 lines
Quoted 4 lines
I'm confused by this and your previous testing that showed the
--call-graph dwarfworked. You need the sampled registers for dwarf unwinding to provide initial register values for the unwinder.
Right, as explained shortly above, we have to use '-e cpu-clock --call-graph dwarf' to get valid call chain data.
Quoted 40 lines
Quoted 4 lines
Quoted 4 lines
I have modified your 2nd patch and appended it.
I find all these bits in
sample_typeand the attr.exclude_XXX stuff very confusing. If there is a more consistant way of checking these feature, please let me know.I forgot to mention, yeah the exclude thing is maddening. It takes about 100 lines to convert the command line modifiers to those in the
perf_event_attr, there's a priority to them, and so on:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/util/parse-events.c#n1759
Fwiw, I was thinking for patch 1 of holding onto the parsed modifiers so that we could reset the excludes based on them when switching to the software event.Quoted 1 line
Ok, let me check it out.
So looking at the
cpum_cfdriver it fails events for having sampling enabled:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/s390/kernel/perf_cpum_cf.c#n859``` if (is_sampling_event(event)) /* No sampling support */ ``` and the cpum_sf driver fails for any kind of callchain: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/s390/kernel/perf_cpum_sf.c#n839 ``` static bool is_callchain_event(struct perf_event *event) { u64 sample_type = event->attr.sample_type; return sample_type & (PERF_SAMPLE_CALLCHAIN | PERF_SAMPLE_REGS_USER | PERF_SAMPLE_REGS_INTR | PERF_SAMPLE_STACK_USER); } static int cpumsf_pmu_event_init(struct perf_event *event) { int err; /* No support for taken branch sampling */ /* No support for callchain, stacks and registers */ if (has_branch_stack(event) || is_callchain_event(event)) return -EOPNOTSUPP; ```
Quoted 6 lines
Perhaps there is an oversight in the
cpum_cfdriver wrt branch stacks (LBR on x86). ThePERF_SAMPLE_CALLCHAINbit is set for perf call-graph options currently:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/util/evsel.c#n1024I think
cpum_sfis the PMU we care about for the default cycles event?
Right this PMU does sampling on s390
Quoted 6 lines
Since callchains of any flavor don't work with
cpum_sfwe can do a few things:
1) Disable the callchain and allow hardware sampling to continue,
2) Switch to a software event like cpu-clock,
3) Fail for the callchain option with this PMU, which is currently happening anyway.
@Namhyung:
It fails to open event cycles for PMU cpum_sf.
Quoted 10 lines
I dislike option 3 because it requires special s390 logic for many tests, and we lose testing coverage of hardware events. Option 1 is a smaller patch, an early return in
__evsel__config_callchainif on s390. Option 2 feels most like what the user would want given they asked for a callchain. We could changeevlist__new_defaultto take a "with callchain" boolean and on s390 that could switch the event to a software one. Only two non-test callers useevlist__new__default(record and top), so it isn't a huge change.
Quoted 4 lines
Wdyt Thomas, option 1 or 2?
Thanks,
Ian
I actually prefer option 2. when call chains are requested by the user switch to cpu-clock event.
Thanks a lot for your patience.
Signature · 9 lines
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany -- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Wolfgang Wendt Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Namhyung Kim
maintainerRe: [PATCH v2 2/2] perf evsel: Don't configure framepointer callchains on s390
Quoted 50 lines · Thomas Richter
Quoted 41 lines · Ian Rogers
Quoted 40 lines · Ian Rogers
Quoted 37 lines · Thomas Richter
Quoted 18 lines · Ian Rogers
Frame pointer callchains are not supported on s390. Ignore the option and print a warning.
Signed-off-by Ian Rogers <[email protected]>---
v2: Only disable user callchains as AI is telling me native "kernel"
callchains are supported on s390.--- tools/perf/util/evsel.c | 6 ++++++ 1 file changed, 6 insertions(+)tools/perf/util/evsel.c +0
-0@@ -1076,6 +1076,12 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->exclude_callchain_user =1 ; }tools/perf/util/evsel.c static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o · line 1087
Quoted 10 lines
tools/perf/util/evsel.c +6
-0+if (EM_HOST ==EM_S390 && (evsel->core.attr.sample_type &PERF_SAMPLE_CALLCHAIN ) && + !evsel->core.attr.exclude_callchain_user) { +pr_warning ("Excluding user callchains that are not supported on s390. Try '--call-graph dwarf'\n" ); + evsel->core.attr.exclude_callchain_user =1 ; + } +if (param->defer && !attr->exclude_callchain_user) attr->defer_callchain =1 ; }Ian, thanks very much.
Your patch set helps a lot. However there is a small nit (which is mandatory). Please add these linesevsel->core.attr.sample_type &= ~PERF_SAMPLE_CALLCHAIN; evsel->core.attr.sample_type &= ~PERF_SAMPLE_REGS_USER; evsel->core.attr.sample_type &= ~PERF_SAMPLE_STACK_USER;Quoted 7 lines
Quoted 7 lines
So these lines are dropping callchain from the
sample_typewhich means the kernel stack won't be sampled. AI was telling me this worked, but I'm guess it was wrong. I think rather than this it is just cleaner never to set the bits in theperf_event_attr, more like what v1 of the patch did:
https://lore.kernel.org/lkml/[email protected]/
Quoted 9 lines
Let me try to answer your and Namhyung questions in one reply.
s390 has many PMUs, there is one for counting (cpum_cf) and one for sampling (cpum_sf), which are totally different hardware components.
Hardware sampling
1. writes into a large buffer, data is timestamp and IP (instruction pointer), no registers, no PID.
2. when buffer gets full an interrupt occurs and the interrupt handler scans the hardware samples and converts valid samples to perf format and saves them in perf ring buffer.
This means we can not reconstruct register values for an individual sample. Current Pid is saved by other means somewhere and added to perf data during perf ring buffer write.
Thanks for the explanation!
Sounds like ARM SPE. Off-topic but I just wonder if it's possible to adjust the buffer size so that it can fire for each sample.
Quoted 2 lines
For s390 when we need callchains, we always use event cpu-clock, never hardware event cycles.
I see.
Quoted 96 lines
Quoted 32 lines
Quoted 32 lines
Quoted 9 lines
to the new
if(EM_HOST == ...)above.
The s390 CPU Measurement sampling device driver does not check on the attr.core.exclude_callchain_user member, but on thesample_typebit mask. It returns-EOPNOTSUPPwhen this bitPERF_SAMPLE_CALLCHAINis set. This solves the invocation with command line flag -g as in# ./perf record -v -e cycles -g -- perf test -w noploop ... perf record: Captured and wrote 0.183 MB perf.data ]Right because the callchain was removed from all the samples. We can't fix old kernels (other than by using fix tags); is there a possibility of adding the
exclude_callchain_userto the s390 perf driver for the sake of kernel callchains? It seems better than providing no callchain.Quoted 15 lines
Also I discovered that the fallback when using --call-graph dwarf command line flag still fails:
# ./perf record -v -e cycles --call-graph dwarf -- perf test -w noploop ... Warning: Trying to fall back to excluding guest samples Error: Failure to open event 'cycles:H' on PMU 'cpum_cf' which will be removed. cycles:H: PMU Hardware doesn't support sampling overflow-interrupts. Try 'perf stat' Error: Failure to open any events for recording.The reason is in
__evsel__config_callchain()which callsevsel__set_sample_bit(evsel, CALLCHAIN)and sets thePERF_SAMPLE_CALLCHAINbit inevsel->core.attr.sample_type. It also sets the memberattr->exclude_callchain_user= 1 and sets bitsREGS_USERand_STACK_USER. All three bits are not supported by s390.Quoted 4 lines
Quoted 4 lines
I'm confused by this and your previous testing that showed the
--call-graph dwarfworked. You need the sampled registers for dwarf unwinding to provide initial register values for the unwinder.Right, as explained shortly above, we have to use '-e cpu-clock --call-graph dwarf' to get valid call chain data.
Quoted 40 lines
Quoted 4 lines
Quoted 4 lines
I have modified your 2nd patch and appended it.
I find all these bits in
sample_typeand the attr.exclude_XXX stuff very confusing. If there is a more consistant way of checking these feature, please let me know.I forgot to mention, yeah the exclude thing is maddening. It takes about 100 lines to convert the command line modifiers to those in the
perf_event_attr, there's a priority to them, and so on:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/util/parse-events.c#n1759
Fwiw, I was thinking for patch 1 of holding onto the parsed modifiers so that we could reset the excludes based on them when switching to the software event.Quoted 1 line
Ok, let me check it out.
So looking at the
cpum_cfdriver it fails events for having sampling enabled:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/s390/kernel/perf_cpum_cf.c#n859``` if (is_sampling_event(event)) /* No sampling support */ ``` and the cpum_sf driver fails for any kind of callchain: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/s390/kernel/perf_cpum_sf.c#n839 ``` static bool is_callchain_event(struct perf_event *event) { u64 sample_type = event->attr.sample_type; return sample_type & (PERF_SAMPLE_CALLCHAIN | PERF_SAMPLE_REGS_USER | PERF_SAMPLE_REGS_INTR | PERF_SAMPLE_STACK_USER); } static int cpumsf_pmu_event_init(struct perf_event *event) { int err; /* No support for taken branch sampling */ /* No support for callchain, stacks and registers */ if (has_branch_stack(event) || is_callchain_event(event)) return -EOPNOTSUPP; ```Quoted 6 lines
Perhaps there is an oversight in the
cpum_cfdriver wrt branch stacks (LBR on x86). ThePERF_SAMPLE_CALLCHAINbit is set for perf call-graph options currently:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/util/evsel.c#n1024I think
cpum_sfis the PMU we care about for the default cycles event?Right this PMU does sampling on s390
Quoted 6 lines
Since callchains of any flavor don't work with
cpum_sfwe can do a few things:
1) Disable the callchain and allow hardware sampling to continue,
2) Switch to a software event like cpu-clock,
3) Fail for the callchain option with this PMU, which is currently happening anyway.
Quoted 2 lines
@Namhyung:
It fails to open event cycles for PMUcpum_sf.
Ok, I assume it'd reject events with PERF_SAMPLE_CALLCHAIN.
Quoted 11 lines
Quoted 11 lines
I dislike option 3 because it requires special s390 logic for many tests, and we lose testing coverage of hardware events. Option 1 is a smaller patch, an early return in
__evsel__config_callchainif on s390. Option 2 feels most like what the user would want given they asked for a callchain. We could changeevlist__new_defaultto take a "with callchain" boolean and on s390 that could switch the event to a software one. Only two non-test callers useevlist__new__default(record and top), so it isn't a huge change.
Quoted 7 lines
Quoted 4 lines
Wdyt Thomas, option 1 or 2?
Thanks,
IanI actually prefer option 2. when call chains are requested by the user switch to cpu-clock event.
I think the current code will do the job already. But we missed to remove some exclude_* bits before that. And moving callchain setting from FP to DWARF is a separate issue.
Quoted 2 lines
Thanks a lot for your patience.
The same goes to you. :)
Thanks,
Namhyung
Quoted 11 lines
Signature · 10 lines
-- Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany -- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Wolfgang Wendt Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Ian Rogers
reviewerv3 cover perf evsel fallback changes
In reply to Ian RogersDiscussion with Thomas Richter in:
https://lore.kernel.org/lkml/[email protected]/
showed that the evsel__fallback wasn't working for s390. These patches avoid the problematic frame pointer callchain on s390 and fix evsel__fallback from a range of problems when falling back to a software event. I simulated failures when developing the patches but they are untested other than that.
v3: Incorporate feedback about event and callchain behavior for s390:
https://lore.kernel.org/lkml/[email protected]/
v2: try exclude_callchain_user for s390 rather than fully disabling
the callchain. Fix a missed clearing of is_pmu_core if the software event fallback.
https://lore.kernel.org/lkml/[email protected]/
v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (3):
perf evsel: Improve falling back from cycles
perf target: Constify simple check functions
perf evlist: Improve default event for s390
tools/perf/builtin-record.c | 3 +- tools/perf/builtin-top.c | 2 +- tools/perf/tests/event_update.c | 4 ++- tools/perf/tests/expand-cgroup.c | 4 ++- tools/perf/tests/perf-record.c | 7 ++-- tools/perf/tests/topology.c | 4 ++- tools/perf/util/evlist.c | 37 ++++++++++++--------- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 56 +++++++++++++++++++++++--------- tools/perf/util/evsel.h | 2 ++ tools/perf/util/target.h | 12 +++---- 11 files changed, 88 insertions(+), 45 deletions(-)
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v3 1/3 perf evsel: Improve falling back from cycles
Switch to using evsel__match rather than comparing perf_event_attr values, this is robust on hybrid architectures.
Ensure evsel->pmu matches the evsel->core.attr.
Remove exclude bits that get set in other fallback attempts when switching the event.
Log the event name with modifiers when switching the event on fallback.
--- tools/perf/util/evsel.c | 45 ++++++++++++++++++++++++++++------------- tools/perf/util/evsel.h | 2 ++ 2 files changed, 33 insertions(+), 14 deletions(-)
tools/perf/util/evsel.c +31 -14
@@ -3785,25 +3785,42 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, {int paranoid; -if ((err ==ENOENT || err ==ENXIO || err ==ENODEV ) && - evsel->core.attr.type ==PERF_TYPE_HARDWARE && - evsel->core.attr.config ==PERF_COUNT_HW_CPU_CYCLES ) { +if ((err ==ENODEV || err ==ENOENT || err ==ENXIO ) && +evsel__match (evsel,HARDWARE ,HW_CPU_CYCLES )) {/* -* If it's cycles then fall back to hrtimer based cpu-clock sw -* counter, which is always available even if no PMU support. -* -* PPC returns ENXIO until 2.6.37 (behavior changed with commit -* b0a873e). +* If it's the legacy hardware cycles event fails then fall back +* to hrtimer based cpu-clock sw counter, which is always +* available even if no PMU support. PPC returned ENXIO rather +* than ENODEV or ENOENT until 2.6.37. */ - evsel->core.attr.type =PERF_TYPE_SOFTWARE ; + evsel->pmu =perf_pmus__find_by_type (PERF_TYPE_SOFTWARE ); +assert (evsel->pmu);/* software is a "well-known" and can't fail PMU type. */ + +/* Configure the event. */ + evsel->core.attr.type =PERF_TYPE_SOFTWARE ; evsel->core.attr.config =target__has_cpu (target) ?PERF_COUNT_SW_CPU_CLOCK :PERF_COUNT_SW_TASK_CLOCK ; -scnprintf (msg, msgsize, -"The cycles event is not supported, trying to fall back to %s" , -target__has_cpu (target) ?"cpu-clock" :"task-clock" ); + evsel->core.is_pmu_core = false; + +/* Remove excludes for new event. */ +if (evsel->fallenback_eacces) { + evsel->core.attr.exclude_kernel =0 ; + evsel->core.attr.exclude_hv =0 ; + evsel->fallenback_eacces = false; + } +if (evsel->fallenback_eopnotsupp) { + evsel->core.attr.exclude_guest =0 ; + evsel->fallenback_eopnotsupp = false; + } +/* Name is recomputed by evsel__name. */ zfree (&evsel->name); + +/* Log message. */ +scnprintf (msg, msgsize, +"The cycles event is not supported, trying to fall back to %s" , +evsel__name (evsel));return true; }else if (err ==EACCES && !evsel->core.attr.exclude_kernel && (paranoid =perf_event_paranoid ()) >1 ) {
@@ -3830,7 +3847,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, " samples", paranoid); evsel->core.attr.exclude_kernel =1 ; evsel->core.attr.exclude_hv =1 ; - + evsel->fallenback_eacces = true;return true; }else if (err ==EOPNOTSUPP && !evsel->core.attr.exclude_guest && !evsel->exclude_GH) {
@@ -3851,7 +3868,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err,/* Apple M1 requires exclude_guest */ scnprintf (msg, msgsize,"Trying to fall back to excluding guest samples" ); evsel->core.attr.exclude_guest =1 ; - + evsel->fallenback_eopnotsupp = true;return true; } no_fallback:
tools/perf/util/evsel.h +2 -0
@@ -124,6 +124,8 @@ struct evsel {bool default_metricgroup;/* A member of the Default metricgroup */ bool default_show_events;/* If a default group member, show the event */ bool needs_uniquify; +bool fallenback_eacces; +bool fallenback_eopnotsupp;struct hashmap *per_pkg_mask;int err;int script_output_type;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v3 2/3 perf target: Constify simple check functions
In reply to Ian RogersAllow the target to be const in callers.
--- tools/perf/util/target.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/perf/util/target.h +6 -6
@@ -49,22 +49,22 @@ uid_t parse_uid(const char *str);int target__strerror (struct target *target,int errnum,char *buf,size_t buflen); -static inline bool target__has_task (struct target *target) +static inline bool target__has_task (const struct target *target) {return target->tid || target->pid; } -static inline bool target__has_cpu (struct target *target) +static inline bool target__has_cpu (const struct target *target) {return target->system_wide || target->cpu_list; } -static inline bool target__none (struct target *target) +static inline bool target__none (const struct target *target) {return !target__has_task (target) && !target__has_cpu (target); } -static inline bool target__enable_on_exec (struct target *target) +static inline bool target__enable_on_exec (const struct target *target) {/* * Normally enable_on_exec should be set if:
@@ -75,12 +75,12 @@ static inline bool target__enable_on_exec(struct target *target)return target__none (target) && !target->initial_delay; } -static inline bool target__has_per_thread (struct target *target) +static inline bool target__has_per_thread (const struct target *target) {return target->system_wide && target->per_thread; } -static inline bool target__uses_dummy_map (struct target *target) +static inline bool target__uses_dummy_map (const struct target *target) {bool use_dummy = false;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v3 3/3 perf evlist: Improve default event for s390
In reply to Ian RogersFrame pointer callchains are not supported on s390 and dwarf callchains are only supported on software events.
Switch the default event from cycles to cpu-clock or task-clock on s390 if callchains are enabled.
If frame pointer callchains are requested on s390, warn and switch to dwarf callchains.
--- tools/perf/builtin-record.c | 3 ++- tools/perf/builtin-top.c | 2 +- tools/perf/tests/event_update.c | 4 +++- tools/perf/tests/expand-cgroup.c | 4 +++- tools/perf/tests/perf-record.c | 7 ++++-- tools/perf/tests/topology.c | 4 +++- tools/perf/util/evlist.c | 37 +++++++++++++++++++------------- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 11 ++++++++-- 9 files changed, 49 insertions(+), 25 deletions(-)
tools/perf/builtin-record.c +2 -1
@@ -4310,7 +4310,8 @@ int cmd_record(int argc, const char **argv) record.opts.tail_synthesize = true;if (rec->evlist->core.nr_entries ==0 ) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (&rec->opts.target, + callchain_param.enabled);if (!def_evlist) goto out;
tools/perf/builtin-top.c +1 -1
@@ -1695,7 +1695,7 @@ int cmd_top(int argc, const char **argv) goto out_delete_evlist;if (!top.evlist->core.nr_entries) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (target, callchain_param.enabled);if (!def_evlist) goto out_delete_evlist;
tools/perf/tests/event_update.c +3 -1
@@ -8,6 +8,7 @@#include "header.h" #include "machine.h" #include "util/synthetic-events.h" +#include "target.h" #include "tool.h" #include "tests.h" #include "debug.h"
@@ -81,7 +82,8 @@ static int test__event_update(struct test_suite *test __maybe_unused, int subtes {struct evsel *evsel;struct event_name tmp; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);
tools/perf/tests/expand-cgroup.c +3 -1
@@ -8,6 +8,7 @@#include "parse-events.h" #include "pmu-events/pmu-events.h" #include "pfm.h" +#include "target.h" #include <subcmd/parse-options.h> #include <stdio.h> #include <stdlib.h>
@@ -99,7 +100,8 @@ out: for (i = 0; i < nr_events; i++)static int expand_default_events (void ) {int ret; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);
tools/perf/tests/perf-record.c +5 -2
@@ -84,8 +84,11 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestCPU_ZERO_S (cpu_mask_size, cpu_mask);perf_sample__init (&sample,/*all=*/ false); -if (evlist ==NULL )/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ - evlist =evlist__new_default (); +if (evlist ==NULL ) {/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ +struct target target = {}; + + evlist =evlist__new_default (&target,/*sample_callchains=*/ false); + }if (evlist ==NULL ) {pr_debug ("Not enough memory to create evlist\n" );
tools/perf/tests/topology.c +3 -1
@@ -9,6 +9,7 @@#include "evlist.h" #include "debug.h" #include "pmus.h" +#include "target.h" #include <linux/err.h> #define TEMPL "/tmp/perf-test-XXXXXX"
@@ -37,11 +38,12 @@ static int session_write_header(char *path) .path = path, .mode = PERF_DATA_MODE_WRITE, }; +struct target target = {}; session =perf_session__new (&data,NULL );TEST_ASSERT_VAL ("can't get session" , !IS_ERR (session)); - session->evlist =evlist__new_default (); + session->evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("can't get evlist" , session->evlist); session->evlist->session = session;
tools/perf/util/evlist.c +22 -15
@@ -13,6 +13,7 @@#include "util/mmap.h" #include "thread_map.h" #include "target.h" +#include "dwarf-regs.h" #include "evlist.h" #include "evsel.h" #include "record.h"
@@ -98,38 +99,44 @@ struct evlist *evlist__new(void)return evlist; } -struct evlist *evlist__new_default (void ) +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains) {struct evlist *evlist =evlist__new ();bool can_profile_kernel;struct perf_pmu *pmu =NULL ; +struct evsel *evsel; +char buf[256 ]; +int err;if (!evlist)return NULL ; can_profile_kernel =perf_event_paranoid_check (1 ); -while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { -char buf[256 ]; -int err; - -snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, +if (EM_HOST ==EM_S390 && sample_callchains) { +snprintf (buf,sizeof (buf),"software/%s/%s" , +target__has_cpu (target) ?"cpu-clock" :"task-clock" , can_profile_kernel ?"P" :"Pu" ); err =parse_event (evlist, buf); -if (err) { -evlist__delete (evlist); -return NULL ; +if (err) + goto out_err; + }else { +while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { +snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, + can_profile_kernel ?"P" :"Pu" ); + err =parse_event (evlist, buf); +if (err) + goto out_err; } } -if (evlist->core.nr_entries >1 ) { -struct evsel *evsel; - -evlist__for_each_entry (evlist, evsel) -evsel__set_sample_id (evsel,/*can_sample_identifier=*/ false); - } +evlist__for_each_entry (evlist, evsel) +evsel__set_sample_id (evsel,/*can_sample_identifier=*/ false);return evlist; +out_err: +evlist__delete (evlist); +return NULL ; }struct evlist *evlist__new_dummy (void )
tools/perf/util/evlist.h +1 -1
@@ -104,7 +104,7 @@ struct evsel_str_handler { };struct evlist *evlist__new (void ); -struct evlist *evlist__new_default (void ); +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains);struct evlist *evlist__new_dummy (void );void evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus,struct perf_thread_map *threads);
tools/perf/util/evsel.c +9 -2
@@ -1020,6 +1020,13 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o {bool function =evsel__is_function_event (evsel);struct perf_event_attr *attr = &evsel->core.attr; +enum perf_call_graph_mode record_mode = param->record_mode; + +if (EM_HOST ==EM_S390 && param->record_mode ==CALLCHAIN_FP ) { +pr_warning ("Framepointer unwinding switched to dwarf due to a lack of kernel support.\n" +"Use '--call-graph dwarf' to silence this warning.\n" ); + record_mode =CALLCHAIN_DWARF ; + }evsel__set_sample_bit (evsel,CALLCHAIN );
@@ -1029,7 +1036,7 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->exclude_callchain_user =1 ;if (opts->user_callchains) attr->exclude_callchain_kernel =1 ; -if (param->record_mode ==CALLCHAIN_LBR ) { +if (record_mode ==CALLCHAIN_LBR ) {if (!opts->branch_stack) {if (attr->exclude_user) { pr_warning("LBR callstack option is only available "
@@ -1048,7 +1055,7 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o "Falling back to framepointers.\n"); } -if (param->record_mode ==CALLCHAIN_DWARF ) { +if (record_mode ==CALLCHAIN_DWARF ) {if (!function) {uint16_t e_machine =evsel__e_machine (evsel,/*e_flags=*/ NULL );
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Re: [PATCH v3 3/3] perf evlist: Improve default event for s390
Quoted 250 lines · Ian Rogers
Frame pointer callchains are not supported on s390 and dwarf callchains are only supported on software events.
Switch the default event from cycles to cpu-clock or task-clock on s390 if callchains are enabled.
If frame pointer callchains are requested on s390, warn and switch to dwarf callchains.
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/builtin-record.c | 3 ++- tools/perf/builtin-top.c | 2 +- tools/perf/tests/event_update.c | 4 +++- tools/perf/tests/expand-cgroup.c | 4 +++- tools/perf/tests/perf-record.c | 7 ++++-- tools/perf/tests/topology.c | 4 +++- tools/perf/util/evlist.c | 37 +++++++++++++++++++------------- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 11 ++++++++-- 9 files changed, 49 insertions(+), 25 deletions(-)tools/perf/builtin-record.c +2
-1@@ -4310,7 +4310,8 @@ int cmd_record(int argc, const char **argv) record.opts.tail_synthesize = true;if (rec->evlist->core.nr_entries ==0 ) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (&rec->opts.target, + callchain_param.enabled);if (!def_evlist) goto out;tools/perf/builtin-top.c +1
-1@@ -1695,7 +1695,7 @@ int cmd_top(int argc, const char **argv) goto out_delete_evlist;if (!top.evlist->core.nr_entries) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (target, callchain_param.enabled);if (!def_evlist) goto out_delete_evlist;tools/perf/tests/event_update.c +3
-1@@ -8,6 +8,7 @@#include "header.h" #include "machine.h" #include "util/synthetic-events.h" +#include "target.h" #include "tool.h" #include "tests.h" #include "debug.h" @@ -81,7 +82,8 @@ static int test__event_update(struct test_suite *test __maybe_unused, int subtes {struct evsel *evsel;struct event_name tmp; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);tools/perf/tests/expand-cgroup.c +3
-1@@ -8,6 +8,7 @@#include "parse-events.h" #include "pmu-events/pmu-events.h" #include "pfm.h" +#include "target.h" #include <subcmd/parse-options.h> #include <stdio.h> #include <stdlib.h> @@ -99,7 +100,8 @@ out: for (i = 0; i < nr_events; i++)static int expand_default_events (void ) {int ret; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);tools/perf/tests/perf-record.c +5
-2@@ -84,8 +84,11 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestCPU_ZERO_S (cpu_mask_size, cpu_mask);perf_sample__init (&sample,/*all=*/ false); -if (evlist ==NULL )/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ - evlist =evlist__new_default (); +if (evlist ==NULL ) {/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ +struct target target = {}; + + evlist =evlist__new_default (&target,/*sample_callchains=*/ false); + }if (evlist ==NULL ) {pr_debug ("Not enough memory to create evlist\n" );tools/perf/tests/topology.c +3
-1@@ -9,6 +9,7 @@#include "evlist.h" #include "debug.h" #include "pmus.h" +#include "target.h" #include <linux/err.h> #define TEMPL "/tmp/perf-test-XXXXXX"@@ -37,11 +38,12 @@ static int session_write_header(char *path) .path = path, .mode = PERF_DATA_MODE_WRITE, }; +struct target target = {}; session =perf_session__new (&data,NULL );TEST_ASSERT_VAL ("can't get session" , !IS_ERR (session)); - session->evlist =evlist__new_default (); + session->evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("can't get evlist" , session->evlist); session->evlist->session = session;tools/perf/util/evlist.c +22
-15@@ -13,6 +13,7 @@#include "util/mmap.h" #include "thread_map.h" #include "target.h" +#include "dwarf-regs.h" #include "evlist.h" #include "evsel.h" #include "record.h" @@ -98,38 +99,44 @@ struct evlist *evlist__new(void)return evlist; } -struct evlist *evlist__new_default (void ) +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains) {struct evlist *evlist =evlist__new ();bool can_profile_kernel;struct perf_pmu *pmu =NULL ; +struct evsel *evsel; +char buf[256 ]; +int err;if (!evlist)return NULL ; can_profile_kernel =perf_event_paranoid_check (1 ); -while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { -char buf[256 ]; -int err; - -snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, +if (EM_HOST ==EM_S390 && sample_callchains) { +snprintf (buf,sizeof (buf),"software/%s/%s" , +target__has_cpu (target) ?"cpu-clock" :"task-clock" , can_profile_kernel ?"P" :"Pu" ); err =parse_event (evlist, buf); -if (err) { -evlist__delete (evlist); -return NULL ; +if (err) + goto out_err; + }else { +while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { +snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, + can_profile_kernel ?"P" :"Pu" ); + err =parse_event (evlist, buf); +if (err) + goto out_err; } } -if (evlist->core.nr_entries >1 ) { -struct evsel *evsel; - -evlist__for_each_entry (evlist, evsel) -evsel__set_sample_id (evsel,/*can_sample_identifier=*/ false); - } +evlist__for_each_entry (evlist, evsel) +evsel__set_sample_id (evsel,/*can_sample_identifier=*/ false);return evlist; +out_err: +evlist__delete (evlist); +return NULL ; }struct evlist *evlist__new_dummy (void )tools/perf/util/evlist.h +1
-1@@ -104,7 +104,7 @@ struct evsel_str_handler { };struct evlist *evlist__new (void ); -struct evlist *evlist__new_default (void ); +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains);struct evlist *evlist__new_dummy (void );void evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus,struct perf_thread_map *threads);tools/perf/util/evsel.c +8
-1@@ -1020,6 +1020,13 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o {bool function =evsel__is_function_event (evsel);struct perf_event_attr *attr = &evsel->core.attr; +enum perf_call_graph_mode record_mode = param->record_mode; + +if (EM_HOST ==EM_S390 && param->record_mode ==CALLCHAIN_FP ) { +pr_warning ("Framepointer unwinding switched to dwarf due to a lack of kernel support.\n" +"Use '--call-graph dwarf' to silence this warning.\n" ); + record_mode =CALLCHAIN_DWARF ; + }evsel__set_sample_bit (evsel,CALLCHAIN );@@ -1029,7 +1036,7 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->exclude_callchain_user =1 ;if (opts->user_callchains) attr->exclude_callchain_kernel =1 ; -if (param->record_mode ==CALLCHAIN_LBR ) { +if (record_mode ==CALLCHAIN_LBR ) {if (!opts->branch_stack) {if (attr->exclude_user) { pr_warning("LBR callstack option is only available "
tools/perf/util/evsel.c static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o · line 1061
Quoted 8 lines
tools/perf/util/evsel.c +1
-1@@ -1048,7 +1055,7 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o "Falling back to framepointers.\n"); } -if (param->record_mode ==CALLCHAIN_DWARF ) { +if (record_mode ==CALLCHAIN_DWARF ) {if (!function) {uint16_t e_machine =evsel__e_machine (evsel,/*e_flags=*/ NULL );
Ian, Thanks very much.
The fall back to cpu-clock works nicely when --call-graph or -g is specified on s390.
Signature · 9 lines
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany -- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Wolfgang Wendt Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Ian Rogers
reviewerRe: [PATCH v3 3/3] perf evlist: Improve default event for s390
Quoted 263 lines · Thomas Richter
Quoted 250 lines · Ian Rogers
Frame pointer callchains are not supported on s390 and dwarf callchains are only supported on software events.
Switch the default event from cycles to cpu-clock or task-clock on s390 if callchains are enabled.
If frame pointer callchains are requested on s390, warn and switch to dwarf callchains.
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/builtin-record.c | 3 ++- tools/perf/builtin-top.c | 2 +- tools/perf/tests/event_update.c | 4 +++- tools/perf/tests/expand-cgroup.c | 4 +++- tools/perf/tests/perf-record.c | 7 ++++-- tools/perf/tests/topology.c | 4 +++- tools/perf/util/evlist.c | 37 +++++++++++++++++++------------- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 11 ++++++++-- 9 files changed, 49 insertions(+), 25 deletions(-)tools/perf/builtin-record.c +2
-1@@ -4310,7 +4310,8 @@ int cmd_record(int argc, const char **argv) record.opts.tail_synthesize = true;if (rec->evlist->core.nr_entries ==0 ) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (&rec->opts.target, + callchain_param.enabled);if (!def_evlist) goto out;tools/perf/builtin-top.c +1
-1@@ -1695,7 +1695,7 @@ int cmd_top(int argc, const char **argv) goto out_delete_evlist;if (!top.evlist->core.nr_entries) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (target, callchain_param.enabled);if (!def_evlist) goto out_delete_evlist;tools/perf/tests/event_update.c +3
-1@@ -8,6 +8,7 @@#include "header.h" #include "machine.h" #include "util/synthetic-events.h" +#include "target.h" #include "tool.h" #include "tests.h" #include "debug.h" @@ -81,7 +82,8 @@ static int test__event_update(struct test_suite *test __maybe_unused, int subtes {struct evsel *evsel;struct event_name tmp; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);tools/perf/tests/expand-cgroup.c +3
-1@@ -8,6 +8,7 @@#include "parse-events.h" #include "pmu-events/pmu-events.h" #include "pfm.h" +#include "target.h" #include <subcmd/parse-options.h> #include <stdio.h> #include <stdlib.h> @@ -99,7 +100,8 @@ out: for (i = 0; i < nr_events; i++)static int expand_default_events (void ) {int ret; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);tools/perf/tests/perf-record.c +5
-2@@ -84,8 +84,11 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestCPU_ZERO_S (cpu_mask_size, cpu_mask);perf_sample__init (&sample,/*all=*/ false); -if (evlist ==NULL )/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ - evlist =evlist__new_default (); +if (evlist ==NULL ) {/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ +struct target target = {}; + + evlist =evlist__new_default (&target,/*sample_callchains=*/ false); + }if (evlist ==NULL ) {pr_debug ("Not enough memory to create evlist\n" );tools/perf/tests/topology.c +3
-1@@ -9,6 +9,7 @@#include "evlist.h" #include "debug.h" #include "pmus.h" +#include "target.h" #include <linux/err.h> #define TEMPL "/tmp/perf-test-XXXXXX"@@ -37,11 +38,12 @@ static int session_write_header(char *path) .path = path, .mode = PERF_DATA_MODE_WRITE, }; +struct target target = {}; session =perf_session__new (&data,NULL );TEST_ASSERT_VAL ("can't get session" , !IS_ERR (session)); - session->evlist =evlist__new_default (); + session->evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("can't get evlist" , session->evlist); session->evlist->session = session;tools/perf/util/evlist.c +22
-15@@ -13,6 +13,7 @@#include "util/mmap.h" #include "thread_map.h" #include "target.h" +#include "dwarf-regs.h" #include "evlist.h" #include "evsel.h" #include "record.h" @@ -98,38 +99,44 @@ struct evlist *evlist__new(void)return evlist; } -struct evlist *evlist__new_default (void ) +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains) {struct evlist *evlist =evlist__new ();bool can_profile_kernel;struct perf_pmu *pmu =NULL ; +struct evsel *evsel; +char buf[256 ]; +int err;if (!evlist)return NULL ; can_profile_kernel =perf_event_paranoid_check (1 ); -while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { -char buf[256 ]; -int err; - -snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, +if (EM_HOST ==EM_S390 && sample_callchains) { +snprintf (buf,sizeof (buf),"software/%s/%s" , +target__has_cpu (target) ?"cpu-clock" :"task-clock" , can_profile_kernel ?"P" :"Pu" ); err =parse_event (evlist, buf); -if (err) { -evlist__delete (evlist); -return NULL ; +if (err) + goto out_err; + }else { +while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { +snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, + can_profile_kernel ?"P" :"Pu" ); + err =parse_event (evlist, buf); +if (err) + goto out_err; } } -if (evlist->core.nr_entries >1 ) { -struct evsel *evsel; - -evlist__for_each_entry (evlist, evsel) -evsel__set_sample_id (evsel,/*can_sample_identifier=*/ false); - } +evlist__for_each_entry (evlist, evsel) +evsel__set_sample_id (evsel,/*can_sample_identifier=*/ false);return evlist; +out_err: +evlist__delete (evlist); +return NULL ; }struct evlist *evlist__new_dummy (void )tools/perf/util/evlist.h +1
-1@@ -104,7 +104,7 @@ struct evsel_str_handler { };struct evlist *evlist__new (void ); -struct evlist *evlist__new_default (void ); +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains);struct evlist *evlist__new_dummy (void );void evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus,struct perf_thread_map *threads);tools/perf/util/evsel.c +8
-1@@ -1020,6 +1020,13 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o {bool function =evsel__is_function_event (evsel);struct perf_event_attr *attr = &evsel->core.attr; +enum perf_call_graph_mode record_mode = param->record_mode; + +if (EM_HOST ==EM_S390 && param->record_mode ==CALLCHAIN_FP ) { +pr_warning ("Framepointer unwinding switched to dwarf due to a lack of kernel support.\n" +"Use '--call-graph dwarf' to silence this warning.\n" ); + record_mode =CALLCHAIN_DWARF ; + }evsel__set_sample_bit (evsel,CALLCHAIN );@@ -1029,7 +1036,7 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->exclude_callchain_user =1 ;if (opts->user_callchains) attr->exclude_callchain_kernel =1 ; -if (param->record_mode ==CALLCHAIN_LBR ) { +if (record_mode ==CALLCHAIN_LBR ) {if (!opts->branch_stack) {if (attr->exclude_user) { pr_warning("LBR callstack option is only available "tools/perf/util/evsel.c static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o · line 1061
Quoted 8 lines
tools/perf/util/evsel.c +1
-1@@ -1048,7 +1055,7 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o "Falling back to framepointers.\n"); } -if (param->record_mode ==CALLCHAIN_DWARF ) { +if (record_mode ==CALLCHAIN_DWARF ) {if (!function) {uint16_t e_machine =evsel__e_machine (evsel,/*e_flags=*/ NULL );Ian, Thanks very much.
Quoted 3 lines
Tested-by Thomas Richter <[email protected]>The fall back to cpu-clock works nicely when --call-graph or -g is specified on s390.
Thanks Thomas. Some legitimate issues were flagged in the automated AI review so I'll need to do a v4. Unfortunately it will need testing again.
https://sashiko.dev/#/patchset/20260313202811.2599195-1-irogers%40google.com
Thanks,
Ian
Quoted 10 lines
--
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany --
IBM Deutschland Research & Development GmbHVorsitzender des Aufsichtsrats: Wolfgang Wendt
Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Ian Rogers
reviewerv4 cover perf evsel fallback changes
Discussion with Thomas Richter in:
https://lore.kernel.org/lkml/[email protected]/
showed that the evsel__fallback wasn't working for s390. These patches avoid the problematic frame pointer callchain on s390 and fix evsel__fallback from a range of problems when falling back to a software event. I simulated failures when developing the patches but they are untested other than that.
v4: Changing the callchain parameter at configuration time means other
options aren't set the same as they would for --call-graph dwarf, for example the stack size. Switch to setting the callchain option on s390 to parameter parse time. For '-g' use '--call-graph dwarf' for s390. Other --call-graph options are parsed as normal, but a warning is generated when setting --call-graph fp for s390. Also fix that sample IDs aren't wanted when there is only 1 event in the evlist.
v3: Incorporate feedback about event and callchain behavior for s390:
https://lore.kernel.org/lkml/[email protected]/
https://lore.kernel.org/lkml/[email protected]/
v2: try exclude_callchain_user for s390 rather than fully disabling
the callchain. Fix a missed clearing of is_pmu_core if the software event fallback.
https://lore.kernel.org/lkml/[email protected]/
v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (5):
perf evsel: Improve falling back from cycles
perf target: Constify simple check functions
perf evsel: Constify option arguments to config functions perf callchain: Move callchain option parsing out of builtin perf evlist: Improve default event for s390
tools/perf/builtin-record.c | 64 ++--------------------------- tools/perf/builtin-top.c | 2 +- tools/perf/tests/event_update.c | 4 +- tools/perf/tests/expand-cgroup.c | 4 +- tools/perf/tests/perf-record.c | 7 +++- tools/perf/tests/topology.c | 4 +- tools/perf/util/callchain.c | 61 ++++++++++++++++++++++++++++ tools/perf/util/evlist.c | 32 ++++++++++----- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 70 +++++++++++++++++++++----------- tools/perf/util/evsel.h | 10 +++-- tools/perf/util/target.h | 12 +++--- 12 files changed, 159 insertions(+), 113 deletions(-)
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v4 1/5 perf evsel: Improve falling back from cycles
Switch to using evsel__match rather than comparing perf_event_attr values, this is robust on hybrid architectures.
Ensure evsel->pmu matches the evsel->core.attr.
Remove exclude bits that get set in other fallback attempts when switching the event.
Log the event name with modifiers when switching the event on fallback.
--- tools/perf/util/evsel.c | 45 ++++++++++++++++++++++++++++------------- tools/perf/util/evsel.h | 2 ++ 2 files changed, 33 insertions(+), 14 deletions(-)
tools/perf/util/evsel.c +31 -14
@@ -3785,25 +3785,42 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, {int paranoid; -if ((err ==ENOENT || err ==ENXIO || err ==ENODEV ) && - evsel->core.attr.type ==PERF_TYPE_HARDWARE && - evsel->core.attr.config ==PERF_COUNT_HW_CPU_CYCLES ) { +if ((err ==ENODEV || err ==ENOENT || err ==ENXIO ) && +evsel__match (evsel,HARDWARE ,HW_CPU_CYCLES )) {/* -* If it's cycles then fall back to hrtimer based cpu-clock sw -* counter, which is always available even if no PMU support. -* -* PPC returns ENXIO until 2.6.37 (behavior changed with commit -* b0a873e). +* If it's the legacy hardware cycles event fails then fall back +* to hrtimer based cpu-clock sw counter, which is always +* available even if no PMU support. PPC returned ENXIO rather +* than ENODEV or ENOENT until 2.6.37. */ - evsel->core.attr.type =PERF_TYPE_SOFTWARE ; + evsel->pmu =perf_pmus__find_by_type (PERF_TYPE_SOFTWARE ); +assert (evsel->pmu);/* software is a "well-known" and can't fail PMU type. */ + +/* Configure the event. */ + evsel->core.attr.type =PERF_TYPE_SOFTWARE ; evsel->core.attr.config =target__has_cpu (target) ?PERF_COUNT_SW_CPU_CLOCK :PERF_COUNT_SW_TASK_CLOCK ; -scnprintf (msg, msgsize, -"The cycles event is not supported, trying to fall back to %s" , -target__has_cpu (target) ?"cpu-clock" :"task-clock" ); + evsel->core.is_pmu_core = false; + +/* Remove excludes for new event. */ +if (evsel->fallenback_eacces) { + evsel->core.attr.exclude_kernel =0 ; + evsel->core.attr.exclude_hv =0 ; + evsel->fallenback_eacces = false; + } +if (evsel->fallenback_eopnotsupp) { + evsel->core.attr.exclude_guest =0 ; + evsel->fallenback_eopnotsupp = false; + } +/* Name is recomputed by evsel__name. */ zfree (&evsel->name); + +/* Log message. */ +scnprintf (msg, msgsize, +"The cycles event is not supported, trying to fall back to %s" , +evsel__name (evsel));return true; }else if (err ==EACCES && !evsel->core.attr.exclude_kernel && (paranoid =perf_event_paranoid ()) >1 ) {
@@ -3830,7 +3847,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, " samples", paranoid); evsel->core.attr.exclude_kernel =1 ; evsel->core.attr.exclude_hv =1 ; - + evsel->fallenback_eacces = true;return true; }else if (err ==EOPNOTSUPP && !evsel->core.attr.exclude_guest && !evsel->exclude_GH) {
@@ -3851,7 +3868,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err,/* Apple M1 requires exclude_guest */ scnprintf (msg, msgsize,"Trying to fall back to excluding guest samples" ); evsel->core.attr.exclude_guest =1 ; - + evsel->fallenback_eopnotsupp = true;return true; } no_fallback:
tools/perf/util/evsel.h +2 -0
@@ -124,6 +124,8 @@ struct evsel {bool default_metricgroup;/* A member of the Default metricgroup */ bool default_show_events;/* If a default group member, show the event */ bool needs_uniquify; +bool fallenback_eacces; +bool fallenback_eopnotsupp;struct hashmap *per_pkg_mask;int err;int script_output_type;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v4 2/5 perf target: Constify simple check functions
In reply to Ian RogersAllow the target to be const in callers.
--- tools/perf/util/target.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/perf/util/target.h +6 -6
@@ -49,22 +49,22 @@ uid_t parse_uid(const char *str);int target__strerror (struct target *target,int errnum,char *buf,size_t buflen); -static inline bool target__has_task (struct target *target) +static inline bool target__has_task (const struct target *target) {return target->tid || target->pid; } -static inline bool target__has_cpu (struct target *target) +static inline bool target__has_cpu (const struct target *target) {return target->system_wide || target->cpu_list; } -static inline bool target__none (struct target *target) +static inline bool target__none (const struct target *target) {return !target__has_task (target) && !target__has_cpu (target); } -static inline bool target__enable_on_exec (struct target *target) +static inline bool target__enable_on_exec (const struct target *target) {/* * Normally enable_on_exec should be set if:
@@ -75,12 +75,12 @@ static inline bool target__enable_on_exec(struct target *target)return target__none (target) && !target->initial_delay; } -static inline bool target__has_per_thread (struct target *target) +static inline bool target__has_per_thread (const struct target *target) {return target->system_wide && target->per_thread; } -static inline bool target__uses_dummy_map (struct target *target) +static inline bool target__uses_dummy_map (const struct target *target) {bool use_dummy = false;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v4 3/5 perf evsel: Constify option arguments to config functions
In reply to Ian RogersThe options are used to configure the evsel but are not themselves configured. Make the arguments const to better capture this.
--- tools/perf/util/evsel.c | 20 ++++++++++---------- tools/perf/util/evsel.h | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-)
tools/perf/util/evsel.c +10 -10
@@ -1015,8 +1015,8 @@ uint16_t evsel__e_machine(struct evsel *evsel, uint32_t *e_flags)return perf_session__e_machine (session, e_flags); } -static void __evsel__config_callchain (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *param) +static void __evsel__config_callchain (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *param) {bool function =evsel__is_function_event (evsel);struct perf_event_attr *attr = &evsel->core.attr;
@@ -1080,14 +1080,14 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->defer_callchain =1 ; } -void evsel__config_callchain (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *param) +void evsel__config_callchain (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *param) {if (param->enabled)return __evsel__config_callchain (evsel, opts, param); } -static void evsel__reset_callgraph (struct evsel *evsel,struct callchain_param *param) +static void evsel__reset_callgraph (struct evsel *evsel,const struct callchain_param *param) {struct perf_event_attr *attr = &evsel->core.attr;
@@ -1106,7 +1106,7 @@ static void evsel__reset_callgraph(struct evsel *evsel, struct callchain_param *static void evsel__apply_ratio_to_prev (struct evsel *evsel,struct perf_event_attr *attr, -struct record_opts *opts, +const struct record_opts *opts,const char *buf) {struct perf_event_attr *prev_attr =NULL ;
@@ -1170,7 +1170,7 @@ static void evsel__apply_ratio_to_prev(struct evsel *evsel, }static void evsel__apply_config_terms (struct evsel *evsel, -struct record_opts *opts,bool track) +const struct record_opts *opts,bool track) {struct evsel_config_term *term;struct list_head *config_terms = &evsel->config_terms;
@@ -1445,7 +1445,7 @@ void __weak arch_evsel__apply_ratio_to_prev(struct evsel *evsel __maybe_unused, { } -static void evsel__set_default_freq_period (struct record_opts *opts, +static void evsel__set_default_freq_period (const struct record_opts *opts,struct perf_event_attr *attr) {if (opts->freq) {
@@ -1490,8 +1490,8 @@ bool evsel__is_offcpu_event(struct evsel *evsel)* enable/disable events specifically, as there's no * initial traced exec call. */ -void evsel__config (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *callchain) +void evsel__config (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *callchain) {struct evsel *leader =evsel__leader (evsel);struct perf_event_attr *attr = &evsel->core.attr;
tools/perf/util/evsel.h +4 -4
@@ -287,10 +287,10 @@ void evsel__set_priv_destructor(void (*destructor)(void *priv));struct callchain_param ; -void evsel__config (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *callchain); -void evsel__config_callchain (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *callchain); +void evsel__config (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *callchain); +void evsel__config_callchain (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *callchain);int __evsel__sample_size (u64 sample_type);void evsel__calc_id_pos (struct evsel *evsel);
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v4 4/5 perf callchain: Move callchain option parsing out of builtin
In reply to Ian Rogersrecord_opts__parse_callchain, record_callchain_opt, record_parse_callchain_opt are shared by builtin-record, builtin-top and builtin-trace, they are declared in callchain.h. Move the declarations to callchain.c for consistency with the header.
--- tools/perf/builtin-record.c | 59 ----------------------------------- tools/perf/util/callchain.c | 61 +++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 59 deletions(-)
tools/perf/builtin-record.c +0 -59
@@ -2975,65 +2975,6 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)return status; } -static void callchain_debug (struct callchain_param *callchain) -{ -static const char *str[CALLCHAIN_MAX ] = {"NONE" ,"FP" ,"DWARF" ,"LBR" }; - -pr_debug ("callchain: type %s\n" , str[callchain->record_mode]); - -if (callchain->record_mode ==CALLCHAIN_DWARF ) -pr_debug ("callchain: stack dump size %d\n" , - callchain->dump_size); -} - -int record_opts__parse_callchain (struct record_opts *record, -struct callchain_param *callchain, -const char *arg,bool unset) -{ -int ret; - callchain->enabled = !unset; - -/* --no-call-graph */ -if (unset) { - callchain->record_mode =CALLCHAIN_NONE ; -pr_debug ("callchain: disabled\n" ); -return 0 ; - } - - ret =parse_callchain_record_opt (arg, callchain); -if (!ret) { -/* Enable data address sampling for DWARF unwind. */ -if (callchain->record_mode ==CALLCHAIN_DWARF && - !record->record_data_mmap_set) - record->record_data_mmap = true; -callchain_debug (callchain); - } - -return ret; -} - -int record_parse_callchain_opt (const struct option *opt, -const char *arg, -int unset) -{ -return record_opts__parse_callchain (opt->value, &callchain_param, arg, unset); -} - -int record_callchain_opt (const struct option *opt, -const char *arg__maybe_unused , -int unset__maybe_unused ) -{ -struct callchain_param *callchain = opt->value; - - callchain->enabled = true; - -if (callchain->record_mode ==CALLCHAIN_NONE ) - callchain->record_mode =CALLCHAIN_FP ; - -callchain_debug (callchain); -return 0 ; -} -static int perf_record_config (const char *var,const char *value,void *cb) {struct record *rec = cb;
tools/perf/util/callchain.c +61 -0
79 lines not on this page · raw message
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v4 5/5 perf evlist: Improve default event for s390
In reply to Ian RogersFrame pointer callchains are not supported on s390 and dwarf callchains are only supported on software events.
Switch the default event from cycles to cpu-clock or task-clock on s390 if callchains are enabled.
If frame pointer callchains are requested on s390, warn and switch to dwarf callchains.
--- tools/perf/builtin-record.c | 5 +++-- tools/perf/builtin-top.c | 2 +- tools/perf/tests/event_update.c | 4 +++- tools/perf/tests/expand-cgroup.c | 4 +++- tools/perf/tests/perf-record.c | 7 +++++-- tools/perf/tests/topology.c | 4 +++- tools/perf/util/callchain.c | 16 ++++++++-------- tools/perf/util/evlist.c | 32 +++++++++++++++++++++----------- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 5 +++++ 10 files changed, 53 insertions(+), 28 deletions(-)
tools/perf/builtin-record.c +3 -2
@@ -3466,7 +3466,7 @@ static struct option __record_options[] = {OPT_CALLBACK (0 ,"mmap-flush" , &record.opts,"number" ,"Minimal number of bytes that is extracted from mmap data pages (default: 1)" , record__mmap_flush_parse), -OPT_CALLBACK_NOOPT ('g' ,NULL , &callchain_param, +OPT_CALLBACK_NOOPT ('g' ,NULL , &record.opts,NULL ,"enables call-graph recording" , &record_callchain_opt), OPT_CALLBACK(0, "call-graph", &record.opts,
@@ -4250,7 +4250,8 @@ int cmd_record(int argc, const char **argv) record.opts.tail_synthesize = true;if (rec->evlist->core.nr_entries ==0 ) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (&rec->opts.target, + callchain_param.enabled);if (!def_evlist) goto out;
tools/perf/builtin-top.c +1 -1
@@ -1695,7 +1695,7 @@ int cmd_top(int argc, const char **argv) goto out_delete_evlist;if (!top.evlist->core.nr_entries) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (target, callchain_param.enabled);if (!def_evlist) goto out_delete_evlist;
tools/perf/tests/event_update.c +3 -1
@@ -8,6 +8,7 @@#include "header.h" #include "machine.h" #include "util/synthetic-events.h" +#include "target.h" #include "tool.h" #include "tests.h" #include "debug.h"
@@ -81,7 +82,8 @@ static int test__event_update(struct test_suite *test __maybe_unused, int subtes {struct evsel *evsel;struct event_name tmp; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);
tools/perf/tests/expand-cgroup.c +3 -1
@@ -8,6 +8,7 @@#include "parse-events.h" #include "pmu-events/pmu-events.h" #include "pfm.h" +#include "target.h" #include <subcmd/parse-options.h> #include <stdio.h> #include <stdlib.h>
@@ -99,7 +100,8 @@ out: for (i = 0; i < nr_events; i++)static int expand_default_events (void ) {int ret; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);
tools/perf/tests/perf-record.c +5 -2
@@ -84,8 +84,11 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestCPU_ZERO_S (cpu_mask_size, cpu_mask);perf_sample__init (&sample,/*all=*/ false); -if (evlist ==NULL )/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ - evlist =evlist__new_default (); +if (evlist ==NULL ) {/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ +struct target target = {}; + + evlist =evlist__new_default (&target,/*sample_callchains=*/ false); + }if (evlist ==NULL ) {pr_debug ("Not enough memory to create evlist\n" );
tools/perf/tests/topology.c +3 -1
@@ -9,6 +9,7 @@#include "evlist.h" #include "debug.h" #include "pmus.h" +#include "target.h" #include <linux/err.h> #define TEMPL "/tmp/perf-test-XXXXXX"
@@ -37,11 +38,12 @@ static int session_write_header(char *path) .path = path, .mode = PERF_DATA_MODE_WRITE, }; +struct target target = {}; session =perf_session__new (&data,NULL );TEST_ASSERT_VAL ("can't get session" , !IS_ERR (session)); - session->evlist =evlist__new_default (); + session->evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("can't get evlist" , session->evlist); session->evlist->session = session;
tools/perf/util/callchain.c +8 -8
@@ -30,6 +30,7 @@#include "machine.h" #include "map.h" #include "callchain.h" +#include "dwarf-regs.h" #include "branch.h" #include "record.h" #include "symbol.h"
@@ -378,14 +379,13 @@ int record_callchain_opt(const struct option *opt,const char *arg__maybe_unused , int unset __maybe_unused) { -struct callchain_param *callchain = opt->value; - - callchain->enabled = true; - -if (callchain->record_mode ==CALLCHAIN_NONE ) - callchain->record_mode =CALLCHAIN_FP ; - -callchain_debug (callchain); + callchain_param.enabled = true; +if (callchain_param.record_mode ==CALLCHAIN_NONE ) { +/* s390 lacks kernel framepoint unwinding. */ +record_opts__parse_callchain (opt->value, &callchain_param, +EM_HOST !=EM_S390 ?"fp" :"dwarf" , +/*unset=*/ 0 ); + }return 0 ; }
tools/perf/util/evlist.c +21 -11
@@ -13,6 +13,7 @@#include "util/mmap.h" #include "thread_map.h" #include "target.h" +#include "dwarf-regs.h" #include "evlist.h" #include "evsel.h" #include "record.h"
@@ -98,38 +99,47 @@ struct evlist *evlist__new(void)return evlist; } -struct evlist *evlist__new_default (void ) +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains) {struct evlist *evlist =evlist__new ();bool can_profile_kernel;struct perf_pmu *pmu =NULL ; +struct evsel *evsel; +char buf[256 ]; +int err;if (!evlist)return NULL ; can_profile_kernel =perf_event_paranoid_check (1 ); -while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { -char buf[256 ]; -int err; - -snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, +if (EM_HOST ==EM_S390 && sample_callchains) { +snprintf (buf,sizeof (buf),"software/%s/%s" , +target__has_cpu (target) ?"cpu-clock" :"task-clock" , can_profile_kernel ?"P" :"Pu" ); err =parse_event (evlist, buf); -if (err) { -evlist__delete (evlist); -return NULL ; +if (err) + goto out_err; + }else { +while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { +snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, + can_profile_kernel ?"P" :"Pu" ); + err =parse_event (evlist, buf); +if (err) + goto out_err; } } +/* If there is only 1 event a sample identifier isn't necessary. */ if (evlist->core.nr_entries >1 ) { -struct evsel *evsel; -evlist__for_each_entry (evlist, evsel)evsel__set_sample_id (evsel,/*can_sample_identifier=*/ false); }return evlist; +out_err: +evlist__delete (evlist); +return NULL ; }struct evlist *evlist__new_dummy (void )
tools/perf/util/evlist.h +1 -1
@@ -104,7 +104,7 @@ struct evsel_str_handler { };struct evlist *evlist__new (void ); -struct evlist *evlist__new_default (void ); +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains);struct evlist *evlist__new_dummy (void );void evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus,struct perf_thread_map *threads);
tools/perf/util/evsel.c +5 -0
@@ -1021,6 +1021,11 @@ static void __evsel__config_callchain(struct evsel *evsel, const struct record_obool function =evsel__is_function_event (evsel);struct perf_event_attr *attr = &evsel->core.attr; +if (EM_HOST ==EM_S390 && param->record_mode ==CALLCHAIN_FP ) { +pr_warning_once ( +"Framepointer unwinding lacks kernel support. Use '--call-graph dwarf'\n" ); + } +evsel__set_sample_bit (evsel,CALLCHAIN ); attr->sample_max_stack = param->max_stack;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerv5 cover perf evsel fallback changes
In reply to Ian RogersDiscussion with Thomas Richter in:
https://lore.kernel.org/lkml/[email protected]/
showed that the evsel__fallback wasn't working for s390. These patches avoid the problematic frame pointer callchain on s390 and fix evsel__fallback from a range of problems when falling back to a software event. I simulated failures when developing the patches but they are untested other than that.
v5: Fix the value for the top option to match that of record. Tidy the
callchain parsing option callbacks. Based on AI review feedback:
https://sashiko.dev/#/patchset/20260317030601.567422-1-irogers%40google.com
v4: Changing the callchain parameter at configuration time means other
options aren't set the same as they would for --call-graph dwarf, for example the stack size. Switch to setting the callchain option on s390 to parameter parse time. For '-g' use '--call-graph dwarf' for s390. Other --call-graph options are parsed as normal, but a warning is generated when setting --call-graph fp for s390. Also fix that sample IDs aren't wanted when there is only 1 event in the evlist.
https://lore.kernel.org/lkml/[email protected]/
v3: Incorporate feedback about event and callchain behavior for s390:
https://lore.kernel.org/lkml/[email protected]/
https://lore.kernel.org/lkml/[email protected]/
v2: try exclude_callchain_user for s390 rather than fully disabling
the callchain. Fix a missed clearing of is_pmu_core if the software event fallback.
https://lore.kernel.org/lkml/[email protected]/
v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (5):
perf evsel: Improve falling back from cycles perf target: Constify simple check functions perf evsel: Constify option arguments to config functions perf callchain: Refactor callchain option parsing perf evlist: Improve default event for s390
tools/perf/builtin-record.c | 64 ++++++----------------------- tools/perf/builtin-top.c | 17 ++++---- tools/perf/builtin-trace.c | 9 +++- tools/perf/tests/event_update.c | 4 +- tools/perf/tests/expand-cgroup.c | 4 +- tools/perf/tests/perf-record.c | 7 +++- tools/perf/tests/topology.c | 4 +- tools/perf/util/callchain.c | 39 ++++++++++++++++++ tools/perf/util/callchain.h | 12 ++---- tools/perf/util/evlist.c | 32 ++++++++++----- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 70 +++++++++++++++++++++----------- tools/perf/util/evsel.h | 10 +++-- tools/perf/util/target.h | 12 +++--- 14 files changed, 165 insertions(+), 121 deletions(-)
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v5 1/5 perf evsel: Improve falling back from cycles
Switch to using evsel__match rather than comparing perf_event_attr values, this is robust on hybrid architectures.
Ensure evsel->pmu matches the evsel->core.attr.
Remove exclude bits that get set in other fallback attempts when switching the event.
Log the event name with modifiers when switching the event on fallback.
--- tools/perf/util/evsel.c | 45 ++++++++++++++++++++++++++++------------- tools/perf/util/evsel.h | 2 ++ 2 files changed, 33 insertions(+), 14 deletions(-)
tools/perf/util/evsel.c +31 -14
@@ -3785,25 +3785,42 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, {int paranoid; -if ((err ==ENOENT || err ==ENXIO || err ==ENODEV ) && - evsel->core.attr.type ==PERF_TYPE_HARDWARE && - evsel->core.attr.config ==PERF_COUNT_HW_CPU_CYCLES ) { +if ((err ==ENODEV || err ==ENOENT || err ==ENXIO ) && +evsel__match (evsel,HARDWARE ,HW_CPU_CYCLES )) {/* -* If it's cycles then fall back to hrtimer based cpu-clock sw -* counter, which is always available even if no PMU support. -* -* PPC returns ENXIO until 2.6.37 (behavior changed with commit -* b0a873e). +* If it's the legacy hardware cycles event fails then fall back +* to hrtimer based cpu-clock sw counter, which is always +* available even if no PMU support. PPC returned ENXIO rather +* than ENODEV or ENOENT until 2.6.37. */ - evsel->core.attr.type =PERF_TYPE_SOFTWARE ; + evsel->pmu =perf_pmus__find_by_type (PERF_TYPE_SOFTWARE ); +assert (evsel->pmu);/* software is a "well-known" and can't fail PMU type. */ + +/* Configure the event. */ + evsel->core.attr.type =PERF_TYPE_SOFTWARE ; evsel->core.attr.config =target__has_cpu (target) ?PERF_COUNT_SW_CPU_CLOCK :PERF_COUNT_SW_TASK_CLOCK ; -scnprintf (msg, msgsize, -"The cycles event is not supported, trying to fall back to %s" , -target__has_cpu (target) ?"cpu-clock" :"task-clock" ); + evsel->core.is_pmu_core = false; + +/* Remove excludes for new event. */ +if (evsel->fallenback_eacces) { + evsel->core.attr.exclude_kernel =0 ; + evsel->core.attr.exclude_hv =0 ; + evsel->fallenback_eacces = false; + } +if (evsel->fallenback_eopnotsupp) { + evsel->core.attr.exclude_guest =0 ; + evsel->fallenback_eopnotsupp = false; + } +/* Name is recomputed by evsel__name. */ zfree (&evsel->name); + +/* Log message. */ +scnprintf (msg, msgsize, +"The cycles event is not supported, trying to fall back to %s" , +evsel__name (evsel));return true; }else if (err ==EACCES && !evsel->core.attr.exclude_kernel && (paranoid =perf_event_paranoid ()) >1 ) {
@@ -3830,7 +3847,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, " samples", paranoid); evsel->core.attr.exclude_kernel =1 ; evsel->core.attr.exclude_hv =1 ; - + evsel->fallenback_eacces = true;return true; }else if (err ==EOPNOTSUPP && !evsel->core.attr.exclude_guest && !evsel->exclude_GH) {
@@ -3851,7 +3868,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err,/* Apple M1 requires exclude_guest */ scnprintf (msg, msgsize,"Trying to fall back to excluding guest samples" ); evsel->core.attr.exclude_guest =1 ; - + evsel->fallenback_eopnotsupp = true;return true; } no_fallback:
tools/perf/util/evsel.h +2 -0
@@ -124,6 +124,8 @@ struct evsel {bool default_metricgroup;/* A member of the Default metricgroup */ bool default_show_events;/* If a default group member, show the event */ bool needs_uniquify; +bool fallenback_eacces; +bool fallenback_eopnotsupp;struct hashmap *per_pkg_mask;int err;int script_output_type;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v5 2/5 perf target: Constify simple check functions
In reply to Ian RogersAllow the target to be const in callers.
--- tools/perf/util/target.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/perf/util/target.h +6 -6
@@ -49,22 +49,22 @@ uid_t parse_uid(const char *str);int target__strerror (struct target *target,int errnum,char *buf,size_t buflen); -static inline bool target__has_task (struct target *target) +static inline bool target__has_task (const struct target *target) {return target->tid || target->pid; } -static inline bool target__has_cpu (struct target *target) +static inline bool target__has_cpu (const struct target *target) {return target->system_wide || target->cpu_list; } -static inline bool target__none (struct target *target) +static inline bool target__none (const struct target *target) {return !target__has_task (target) && !target__has_cpu (target); } -static inline bool target__enable_on_exec (struct target *target) +static inline bool target__enable_on_exec (const struct target *target) {/* * Normally enable_on_exec should be set if:
@@ -75,12 +75,12 @@ static inline bool target__enable_on_exec(struct target *target)return target__none (target) && !target->initial_delay; } -static inline bool target__has_per_thread (struct target *target) +static inline bool target__has_per_thread (const struct target *target) {return target->system_wide && target->per_thread; } -static inline bool target__uses_dummy_map (struct target *target) +static inline bool target__uses_dummy_map (const struct target *target) {bool use_dummy = false;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v5 3/5 perf evsel: Constify option arguments to config functions
In reply to Ian RogersThe options are used to configure the evsel but are not themselves configured. Make the arguments const to better capture this.
--- tools/perf/util/evsel.c | 20 ++++++++++---------- tools/perf/util/evsel.h | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-)
tools/perf/util/evsel.c +10 -10
@@ -1015,8 +1015,8 @@ uint16_t evsel__e_machine(struct evsel *evsel, uint32_t *e_flags)return perf_session__e_machine (session, e_flags); } -static void __evsel__config_callchain (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *param) +static void __evsel__config_callchain (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *param) {bool function =evsel__is_function_event (evsel);struct perf_event_attr *attr = &evsel->core.attr;
@@ -1080,14 +1080,14 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->defer_callchain =1 ; } -void evsel__config_callchain (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *param) +void evsel__config_callchain (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *param) {if (param->enabled)return __evsel__config_callchain (evsel, opts, param); } -static void evsel__reset_callgraph (struct evsel *evsel,struct callchain_param *param) +static void evsel__reset_callgraph (struct evsel *evsel,const struct callchain_param *param) {struct perf_event_attr *attr = &evsel->core.attr;
@@ -1106,7 +1106,7 @@ static void evsel__reset_callgraph(struct evsel *evsel, struct callchain_param *static void evsel__apply_ratio_to_prev (struct evsel *evsel,struct perf_event_attr *attr, -struct record_opts *opts, +const struct record_opts *opts,const char *buf) {struct perf_event_attr *prev_attr =NULL ;
@@ -1170,7 +1170,7 @@ static void evsel__apply_ratio_to_prev(struct evsel *evsel, }static void evsel__apply_config_terms (struct evsel *evsel, -struct record_opts *opts,bool track) +const struct record_opts *opts,bool track) {struct evsel_config_term *term;struct list_head *config_terms = &evsel->config_terms;
@@ -1445,7 +1445,7 @@ void __weak arch_evsel__apply_ratio_to_prev(struct evsel *evsel __maybe_unused, { } -static void evsel__set_default_freq_period (struct record_opts *opts, +static void evsel__set_default_freq_period (const struct record_opts *opts,struct perf_event_attr *attr) {if (opts->freq) {
@@ -1490,8 +1490,8 @@ bool evsel__is_offcpu_event(struct evsel *evsel)* enable/disable events specifically, as there's no * initial traced exec call. */ -void evsel__config (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *callchain) +void evsel__config (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *callchain) {struct evsel *leader =evsel__leader (evsel);struct perf_event_attr *attr = &evsel->core.attr;
tools/perf/util/evsel.h +4 -4
@@ -287,10 +287,10 @@ void evsel__set_priv_destructor(void (*destructor)(void *priv));struct callchain_param ; -void evsel__config (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *callchain); -void evsel__config_callchain (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *callchain); +void evsel__config (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *callchain); +void evsel__config_callchain (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *callchain);int __evsel__sample_size (u64 sample_type);void evsel__calc_id_pos (struct evsel *evsel);
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v5 4/5 perf callchain: Refactor callchain option parsing
In reply to Ian Rogersrecord_opts__parse_callchain is shared by builtin-record and builtin-trace, it is declared in callchain.h. Move the declaration to callchain.c for consistency with the header. In other cases make the option callback a small static stub that then calls into callchain.c. Make the no argument '-g' callchain option just a short-cut for '--call-graph fp' so that there is consistency in how the arguments are handled.
--- tools/perf/builtin-record.c | 58 +++++-------------------------------- tools/perf/builtin-top.c | 14 ++++----- tools/perf/builtin-trace.c | 9 +++++- tools/perf/util/callchain.c | 39 +++++++++++++++++++++++++ tools/perf/util/callchain.h | 12 ++------ 5 files changed, 64 insertions(+), 68 deletions(-)
tools/perf/builtin-record.c +7 -51
@@ -2975,65 +2975,21 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)return status; } -static void callchain_debug (struct callchain_param *callchain) -{ -static const char *str[CALLCHAIN_MAX ] = {"NONE" ,"FP" ,"DWARF" ,"LBR" }; - -pr_debug ("callchain: type %s\n" , str[callchain->record_mode]); - -if (callchain->record_mode ==CALLCHAIN_DWARF ) -pr_debug ("callchain: stack dump size %d\n" , - callchain->dump_size); -} - -int record_opts__parse_callchain (struct record_opts *record, -struct callchain_param *callchain, -const char *arg,bool unset) -{ -int ret; - callchain->enabled = !unset; - -/* --no-call-graph */ -if (unset) { - callchain->record_mode =CALLCHAIN_NONE ; -pr_debug ("callchain: disabled\n" ); -return 0 ; - } - - ret =parse_callchain_record_opt (arg, callchain); -if (!ret) { -/* Enable data address sampling for DWARF unwind. */ -if (callchain->record_mode ==CALLCHAIN_DWARF && - !record->record_data_mmap_set) - record->record_data_mmap = true; -callchain_debug (callchain); - } - -return ret; -} - -int record_parse_callchain_opt (const struct option *opt, +static int record_parse_callchain_opt (const struct option *opt,const char *arg,int unset) {return record_opts__parse_callchain (opt->value, &callchain_param, arg, unset); } -int record_callchain_opt (const struct option *opt, -const char *arg__maybe_unused , -int unset__maybe_unused ) +static int record_callchain_opt (const struct option *opt, +const char *arg__maybe_unused , +int unset) { -struct callchain_param *callchain = opt->value; - - callchain->enabled = true; - -if (callchain->record_mode ==CALLCHAIN_NONE ) - callchain->record_mode =CALLCHAIN_FP ; - -callchain_debug (callchain); -return 0 ; +return record_opts__parse_callchain (opt->value, &callchain_param,"fp" , unset); } +static int perf_record_config (const char *var,const char *value,void *cb) {struct record *rec = cb;
@@ -3525,7 +3481,7 @@ static struct option __record_options[] = {OPT_CALLBACK (0 ,"mmap-flush" , &record.opts,"number" ,"Minimal number of bytes that is extracted from mmap data pages (default: 1)" , record__mmap_flush_parse), -OPT_CALLBACK_NOOPT ('g' ,NULL , &callchain_param, +OPT_CALLBACK_NOOPT ('g' ,NULL , &record.opts,NULL ,"enables call-graph recording" , &record_callchain_opt), OPT_CALLBACK(0, "call-graph", &record.opts,
tools/perf/builtin-top.c +7 -7
@@ -1386,13 +1386,6 @@ static int __cmd_top(struct perf_top *top)return ret; } -static int -callchain_opt (const struct option *opt,const char *arg,int unset) -{ - symbol_conf.use_callchain = true; -return record_callchain_opt (opt, arg, unset); -} -static int parse_callchain_opt (const struct option *opt,const char *arg,int unset) {
@@ -1413,6 +1406,13 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)return parse_callchain_top_opt (arg); } +static int +callchain_opt (const struct option *opt,const char *arg__maybe_unused ,int unset) +{ +return parse_callchain_opt (opt,"fp" , unset); +} + +static int perf_top_config (const char *var,const char *value,void *cb__maybe_unused ) {if (!strcmp (var,"top.call-graph" )) {
tools/perf/builtin-trace.c +8 -1
@@ -5300,6 +5300,13 @@ static int trace__parse_summary_mode(const struct option *opt, const char *str,return 0 ; } +static int trace_parse_callchain_opt (const struct option *opt, +const char *arg, +int unset) +{ +return record_opts__parse_callchain (opt->value, &callchain_param, arg, unset); +} +static int trace__config (const char *var,const char *value,void *arg) {struct trace *trace = arg;
@@ -5447,7 +5454,7 @@ int cmd_trace(int argc, const char **argv)OPT_BOOLEAN ('f' ,"force" , &trace.force,"don't complain, do it" ),OPT_CALLBACK (0 ,"call-graph" , &trace.opts,"record_mode[,record_size]" , record_callchain_help, - &record_parse_callchain_opt), + &trace_parse_callchain_opt),OPT_BOOLEAN (0 ,"libtraceevent_print" , &trace.libtraceevent_print,"Use libtraceevent to print the tracepoint arguments." ), OPT_BOOLEAN(0, "kernel-syscall-graph", &trace.kernel_syscallchains,
tools/perf/util/callchain.c +39 -0
@@ -30,6 +30,7 @@#include "map.h" #include "callchain.h" #include "branch.h" +#include "record.h" #include "symbol.h" #include "thread.h" #include "util.h"
@@ -328,6 +329,44 @@ int parse_callchain_record(const char *arg, struct callchain_param *param)return ret; } +static void callchain_debug (const struct callchain_param *callchain) +{ +static const char *str[CALLCHAIN_MAX ] = {"NONE" ,"FP" ,"DWARF" ,"LBR" }; + +pr_debug ("callchain: type %s\n" , str[callchain->record_mode]); + +if (callchain->record_mode ==CALLCHAIN_DWARF ) +pr_debug ("callchain: stack dump size %d\n" , + callchain->dump_size); +} + +int record_opts__parse_callchain (struct record_opts *record, +struct callchain_param *callchain, +const char *arg,bool unset) +{ +int ret; + + callchain->enabled = !unset; + +/* --no-call-graph */ +if (unset) { + callchain->record_mode =CALLCHAIN_NONE ; +pr_debug ("callchain: disabled\n" ); +return 0 ; + } + + ret =parse_callchain_record_opt (arg, callchain); +if (!ret) { +/* Enable data address sampling for DWARF unwind. */ +if (callchain->record_mode ==CALLCHAIN_DWARF && + !record->record_data_mmap_set) + record->record_data_mmap = true; +callchain_debug (callchain); + } + +return ret; +} +int perf_callchain_config (const char *var,const char *value) {char *endptr;
tools/perf/util/callchain.h +3 -9
@@ -9,11 +9,13 @@struct addr_location ;struct evsel ; +struct hist_entry ; +struct hists ;struct ip_callchain ;struct map ;struct perf_sample ; +struct record_opts ;struct thread ; -struct hists ;#define HELP_PAD "\t\t\t\t"
@@ -237,14 +239,6 @@ struct callchain_cursor *get_tls_callchain_cursor(void);int callchain_cursor__copy (struct callchain_cursor *dst,struct callchain_cursor *src); -struct option ; -struct hist_entry ; - -int record_parse_callchain_opt (const struct option *opt,const char *arg,int unset); -int record_callchain_opt (const struct option *opt,const char *arg,int unset); - -struct record_opts ; -int record_opts__parse_callchain (struct record_opts *record,struct callchain_param *callchain,const char *arg,bool unset);
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v5 5/5 perf evlist: Improve default event for s390
In reply to Ian RogersFrame pointer callchains are not supported on s390 and dwarf callchains are only supported on software events.
Switch the default event from cycles to cpu-clock or task-clock on s390 if callchains are enabled.
If frame pointer callchains are requested on s390 show a warning. Modify the '-g' option of perf top and perf record to default to dwarf callchains on s390.
--- tools/perf/builtin-record.c | 8 ++++++-- tools/perf/builtin-top.c | 5 +++-- tools/perf/tests/event_update.c | 4 +++- tools/perf/tests/expand-cgroup.c | 4 +++- tools/perf/tests/perf-record.c | 7 +++++-- tools/perf/tests/topology.c | 4 +++- tools/perf/util/evlist.c | 32 +++++++++++++++++++++----------- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 5 +++++ 9 files changed, 50 insertions(+), 21 deletions(-)
tools/perf/builtin-record.c +6 -2
@@ -55,6 +55,7 @@#include "asm/bug.h" #include "perf.h" #include "cputopo.h" +#include "dwarf-regs.h" #include <errno.h> #include <inttypes.h>
@@ -2986,7 +2987,9 @@ static int record_callchain_opt(const struct option *opt, const char *arg __maybe_unused, int unset) { -return record_opts__parse_callchain (opt->value, &callchain_param,"fp" , unset); +return record_opts__parse_callchain (opt->value, &callchain_param, +EM_HOST !=EM_S390 ?"fp" :"dwarf" , + unset); }
@@ -4265,7 +4268,8 @@ int cmd_record(int argc, const char **argv) record.opts.tail_synthesize = true;if (rec->evlist->core.nr_entries ==0 ) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (&rec->opts.target, + callchain_param.enabled);if (!def_evlist) goto out;
tools/perf/builtin-top.c +3 -2
@@ -56,6 +56,7 @@#include "util/debug.h" #include "util/ordered-events.h" #include "util/pfm.h" +#include "dwarf-regs.h" #include <assert.h> #include <elf.h>
@@ -1409,7 +1410,7 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)static int callchain_opt (const struct option *opt,const char *arg__maybe_unused ,int unset) { -return parse_callchain_opt (opt,"fp" , unset); +return parse_callchain_opt (opt,EM_HOST !=EM_S390 ?"fp" :"dwarf" , unset); }
@@ -1695,7 +1696,7 @@ int cmd_top(int argc, const char **argv) goto out_delete_evlist;if (!top.evlist->core.nr_entries) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (target, callchain_param.enabled);if (!def_evlist) goto out_delete_evlist;
tools/perf/tests/event_update.c +3 -1
@@ -8,6 +8,7 @@#include "header.h" #include "machine.h" #include "util/synthetic-events.h" +#include "target.h" #include "tool.h" #include "tests.h" #include "debug.h"
@@ -81,7 +82,8 @@ static int test__event_update(struct test_suite *test __maybe_unused, int subtes {struct evsel *evsel;struct event_name tmp; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);
tools/perf/tests/expand-cgroup.c +3 -1
@@ -8,6 +8,7 @@#include "parse-events.h" #include "pmu-events/pmu-events.h" #include "pfm.h" +#include "target.h" #include <subcmd/parse-options.h> #include <stdio.h> #include <stdlib.h>
@@ -99,7 +100,8 @@ out: for (i = 0; i < nr_events; i++)static int expand_default_events (void ) {int ret; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);
tools/perf/tests/perf-record.c +5 -2
@@ -84,8 +84,11 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestCPU_ZERO_S (cpu_mask_size, cpu_mask);perf_sample__init (&sample,/*all=*/ false); -if (evlist ==NULL )/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ - evlist =evlist__new_default (); +if (evlist ==NULL ) {/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ +struct target target = {}; + + evlist =evlist__new_default (&target,/*sample_callchains=*/ false); + }if (evlist ==NULL ) {pr_debug ("Not enough memory to create evlist\n" );
tools/perf/tests/topology.c +3 -1
@@ -9,6 +9,7 @@#include "evlist.h" #include "debug.h" #include "pmus.h" +#include "target.h" #include <linux/err.h> #define TEMPL "/tmp/perf-test-XXXXXX"
@@ -37,11 +38,12 @@ static int session_write_header(char *path) .path = path, .mode = PERF_DATA_MODE_WRITE, }; +struct target target = {}; session =perf_session__new (&data,NULL );TEST_ASSERT_VAL ("can't get session" , !IS_ERR (session)); - session->evlist =evlist__new_default (); + session->evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("can't get evlist" , session->evlist); session->evlist->session = session;
tools/perf/util/evlist.c +21 -11
@@ -13,6 +13,7 @@#include "util/mmap.h" #include "thread_map.h" #include "target.h" +#include "dwarf-regs.h" #include "evlist.h" #include "evsel.h" #include "record.h"
@@ -98,38 +99,47 @@ struct evlist *evlist__new(void)return evlist; } -struct evlist *evlist__new_default (void ) +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains) {struct evlist *evlist =evlist__new ();bool can_profile_kernel;struct perf_pmu *pmu =NULL ; +struct evsel *evsel; +char buf[256 ]; +int err;if (!evlist)return NULL ; can_profile_kernel =perf_event_paranoid_check (1 ); -while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { -char buf[256 ]; -int err; - -snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, +if (EM_HOST ==EM_S390 && sample_callchains) { +snprintf (buf,sizeof (buf),"software/%s/%s" , +target__has_cpu (target) ?"cpu-clock" :"task-clock" , can_profile_kernel ?"P" :"Pu" ); err =parse_event (evlist, buf); -if (err) { -evlist__delete (evlist); -return NULL ; +if (err) + goto out_err; + }else { +while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { +snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, + can_profile_kernel ?"P" :"Pu" ); + err =parse_event (evlist, buf); +if (err) + goto out_err; } } +/* If there is only 1 event a sample identifier isn't necessary. */ if (evlist->core.nr_entries >1 ) { -struct evsel *evsel; -evlist__for_each_entry (evlist, evsel)evsel__set_sample_id (evsel,/*can_sample_identifier=*/ false); }return evlist; +out_err: +evlist__delete (evlist); +return NULL ; }struct evlist *evlist__new_dummy (void )
tools/perf/util/evlist.h +1 -1
@@ -104,7 +104,7 @@ struct evsel_str_handler { };struct evlist *evlist__new (void ); -struct evlist *evlist__new_default (void ); +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains);struct evlist *evlist__new_dummy (void );void evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus,struct perf_thread_map *threads);
tools/perf/util/evsel.c +5 -0
@@ -1021,6 +1021,11 @@ static void __evsel__config_callchain(struct evsel *evsel, const struct record_obool function =evsel__is_function_event (evsel);struct perf_event_attr *attr = &evsel->core.attr; +if (EM_HOST ==EM_S390 && param->record_mode ==CALLCHAIN_FP ) { +pr_warning_once ( +"Framepointer unwinding lacks kernel support. Use '--call-graph dwarf'\n" ); + } +evsel__set_sample_bit (evsel,CALLCHAIN ); attr->sample_max_stack = param->max_stack;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Re: [PATCH v5 5/5] perf evlist: Improve default event for s390
Quoted 264 lines · Ian Rogers
Frame pointer callchains are not supported on s390 and dwarf callchains are only supported on software events.
Switch the default event from cycles to cpu-clock or task-clock on s390 if callchains are enabled.
If frame pointer callchains are requested on s390 show a warning. Modify the '-g' option of
perf topandperf recordto default to dwarf callchains on s390.Signed-off-by Ian Rogers <[email protected]>--- tools/perf/builtin-record.c | 8 ++++++-- tools/perf/builtin-top.c | 5 +++-- tools/perf/tests/event_update.c | 4 +++- tools/perf/tests/expand-cgroup.c | 4 +++- tools/perf/tests/perf-record.c | 7 +++++-- tools/perf/tests/topology.c | 4 +++- tools/perf/util/evlist.c | 32 +++++++++++++++++++++----------- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 5 +++++ 9 files changed, 50 insertions(+), 21 deletions(-)tools/perf/builtin-record.c +6
-2@@ -55,6 +55,7 @@#include "asm/bug.h" #include "perf.h" #include "cputopo.h" +#include "dwarf-regs.h" #include <errno.h> #include <inttypes.h> @@ -2986,7 +2987,9 @@ static int record_callchain_opt(const struct option *opt, const char *arg __maybe_unused, int unset) { -return record_opts__parse_callchain (opt->value, &callchain_param,"fp" , unset); +return record_opts__parse_callchain (opt->value, &callchain_param, +EM_HOST !=EM_S390 ?"fp" :"dwarf" , + unset); }@@ -4265,7 +4268,8 @@ int cmd_record(int argc, const char **argv) record.opts.tail_synthesize = true;if (rec->evlist->core.nr_entries ==0 ) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (&rec->opts.target, + callchain_param.enabled);if (!def_evlist) goto out;tools/perf/builtin-top.c +3
-2@@ -56,6 +56,7 @@#include "util/debug.h" #include "util/ordered-events.h" #include "util/pfm.h" +#include "dwarf-regs.h" #include <assert.h> #include <elf.h> @@ -1409,7 +1410,7 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)static int callchain_opt (const struct option *opt,const char *arg__maybe_unused ,int unset) { -return parse_callchain_opt (opt,"fp" , unset); +return parse_callchain_opt (opt,EM_HOST !=EM_S390 ?"fp" :"dwarf" , unset); }@@ -1695,7 +1696,7 @@ int cmd_top(int argc, const char **argv) goto out_delete_evlist;if (!top.evlist->core.nr_entries) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (target, callchain_param.enabled);if (!def_evlist) goto out_delete_evlist;tools/perf/tests/event_update.c +3
-1@@ -8,6 +8,7 @@#include "header.h" #include "machine.h" #include "util/synthetic-events.h" +#include "target.h" #include "tool.h" #include "tests.h" #include "debug.h" @@ -81,7 +82,8 @@ static int test__event_update(struct test_suite *test __maybe_unused, int subtes {struct evsel *evsel;struct event_name tmp; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);tools/perf/tests/expand-cgroup.c +3
-1@@ -8,6 +8,7 @@#include "parse-events.h" #include "pmu-events/pmu-events.h" #include "pfm.h" +#include "target.h" #include <subcmd/parse-options.h> #include <stdio.h> #include <stdlib.h> @@ -99,7 +100,8 @@ out: for (i = 0; i < nr_events; i++)static int expand_default_events (void ) {int ret; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);tools/perf/tests/perf-record.c +5
-2@@ -84,8 +84,11 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestCPU_ZERO_S (cpu_mask_size, cpu_mask);perf_sample__init (&sample,/*all=*/ false); -if (evlist ==NULL )/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ - evlist =evlist__new_default (); +if (evlist ==NULL ) {/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ +struct target target = {}; + + evlist =evlist__new_default (&target,/*sample_callchains=*/ false); + }if (evlist ==NULL ) {pr_debug ("Not enough memory to create evlist\n" );tools/perf/tests/topology.c +3
-1@@ -9,6 +9,7 @@#include "evlist.h" #include "debug.h" #include "pmus.h" +#include "target.h" #include <linux/err.h> #define TEMPL "/tmp/perf-test-XXXXXX"@@ -37,11 +38,12 @@ static int session_write_header(char *path) .path = path, .mode = PERF_DATA_MODE_WRITE, }; +struct target target = {}; session =perf_session__new (&data,NULL );TEST_ASSERT_VAL ("can't get session" , !IS_ERR (session)); - session->evlist =evlist__new_default (); + session->evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("can't get evlist" , session->evlist); session->evlist->session = session;tools/perf/util/evlist.c +21
-11@@ -13,6 +13,7 @@#include "util/mmap.h" #include "thread_map.h" #include "target.h" +#include "dwarf-regs.h" #include "evlist.h" #include "evsel.h" #include "record.h" @@ -98,38 +99,47 @@ struct evlist *evlist__new(void)return evlist; } -struct evlist *evlist__new_default (void ) +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains) {struct evlist *evlist =evlist__new ();bool can_profile_kernel;struct perf_pmu *pmu =NULL ; +struct evsel *evsel; +char buf[256 ]; +int err;if (!evlist)return NULL ; can_profile_kernel =perf_event_paranoid_check (1 ); -while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { -char buf[256 ]; -int err; - -snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, +if (EM_HOST ==EM_S390 && sample_callchains) { +snprintf (buf,sizeof (buf),"software/%s/%s" , +target__has_cpu (target) ?"cpu-clock" :"task-clock" , can_profile_kernel ?"P" :"Pu" ); err =parse_event (evlist, buf); -if (err) { -evlist__delete (evlist); -return NULL ; +if (err) + goto out_err; + }else { +while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { +snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, + can_profile_kernel ?"P" :"Pu" ); + err =parse_event (evlist, buf); +if (err) + goto out_err; } } +/* If there is only 1 event a sample identifier isn't necessary. */ if (evlist->core.nr_entries >1 ) { -struct evsel *evsel; -evlist__for_each_entry (evlist, evsel)evsel__set_sample_id (evsel,/*can_sample_identifier=*/ false); }return evlist; +out_err: +evlist__delete (evlist); +return NULL ; }struct evlist *evlist__new_dummy (void )tools/perf/util/evlist.h +1
-1@@ -104,7 +104,7 @@ struct evsel_str_handler { };struct evlist *evlist__new (void ); -struct evlist *evlist__new_default (void ); +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains);struct evlist *evlist__new_dummy (void );void evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus,struct perf_thread_map *threads);tools/perf/util/evsel.c +0
-0@@ -1021,6 +1021,11 @@ static void __evsel__config_callchain(struct evsel *evsel, const struct record_obool function =evsel__is_function_event (evsel);
tools/perf/util/evsel.c static void __evsel__config_callchain(struct evsel *evsel, const struct record_o · line 1031
Quoted 10 lines
tools/perf/util/evsel.c +5
-0struct perf_event_attr *attr = &evsel->core.attr; +if (EM_HOST ==EM_S390 && param->record_mode ==CALLCHAIN_FP ) { +pr_warning_once ( +"Framepointer unwinding lacks kernel support. Use '--call-graph dwarf'\n" ); + } +evsel__set_sample_bit (evsel,CALLCHAIN ); attr->sample_max_stack = param->max_stack;
Great, here is the output on my LPAR. Thanks very much fpr addressing and fixing this!!!
root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc took 2s ❯ ./perf record --call-graph dwarf -- perf test -w noploop
[ perf record: Woken up 133 times to write data ]
[ perf record: Captured and wrote 32.928 MB perf.data (4039 samples) ]
root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc took 2s ❯ ./perf evlist
software/task-clock/P
root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc ❯ ./perf record -g -- perf test -w noploop
[ perf record: Woken up 133 times to write data ]
[ perf record: Captured and wrote 32.952 MB perf.data (4042 samples) ]
root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc took 2s ❯ ./perf evlist
software/task-clock/P
root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc ❯ ./perf record -- perf test -w noploop
[ perf record: Woken up 2 times to write data ]
[ perf record: Captured and wrote 0.179 MB perf.data (3974 samples) ]
root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc took 2s ❯ ./perf evlist
cpum_cf/cycles/P
root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc ❯ ./perf record
^C[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.250 MB perf.data (24 samples) ]
root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc took 3s ❯ ./perf evlist
cpum_cf/cycles/P
dummy:u
root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc ❯ ./perf record -g
^C[ perf record: Woken up 8 times to write data ]
[ perf record: Captured and wrote 5.186 MB perf.data (34255 samples) ]
root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc took 3s ❯ ./perf evlist
software/cpu-clock/P
dummy:u
root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc took 3s
Signature · 9 lines
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany -- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Wolfgang Wendt Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Ian Rogers
reviewerRe: [PATCH v5 5/5] perf evlist: Improve default event for s390
Quoted 329 lines · Thomas Richter
Quoted 264 lines · Ian Rogers
Frame pointer callchains are not supported on s390 and dwarf callchains are only supported on software events.
Switch the default event from cycles to cpu-clock or task-clock on s390 if callchains are enabled.
If frame pointer callchains are requested on s390 show a warning. Modify the '-g' option of
perf topandperf recordto default to dwarf callchains on s390.Signed-off-by Ian Rogers <[email protected]>--- tools/perf/builtin-record.c | 8 ++++++-- tools/perf/builtin-top.c | 5 +++-- tools/perf/tests/event_update.c | 4 +++- tools/perf/tests/expand-cgroup.c | 4 +++- tools/perf/tests/perf-record.c | 7 +++++-- tools/perf/tests/topology.c | 4 +++- tools/perf/util/evlist.c | 32 +++++++++++++++++++++----------- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 5 +++++ 9 files changed, 50 insertions(+), 21 deletions(-)tools/perf/builtin-record.c +6
-2@@ -55,6 +55,7 @@#include "asm/bug.h" #include "perf.h" #include "cputopo.h" +#include "dwarf-regs.h" #include <errno.h> #include <inttypes.h> @@ -2986,7 +2987,9 @@ static int record_callchain_opt(const struct option *opt,const char *arg__maybe_unused , int unset) { - return record_opts__parse_callchain(opt->value, &callchain_param, "fp", unset); + return record_opts__parse_callchain(opt->value, &callchain_param, + EM_HOST != EM_S390 ? "fp" : "dwarf", +unset ); }@@ -4265,7 +4268,8 @@ int cmd_record(int argc, const char **argv) record.opts.tail_synthesize = true;if (rec->evlist->core.nr_entries ==0 ) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (&rec->opts.target, + callchain_param.enabled);if (!def_evlist) goto out;tools/perf/builtin-top.c +3
-2@@ -56,6 +56,7 @@#include "util/debug.h" #include "util/ordered-events.h" #include "util/pfm.h" +#include "dwarf-regs.h" #include <assert.h> #include <elf.h> @@ -1409,7 +1410,7 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)static int callchain_opt (const struct option *opt,const char *arg__maybe_unused ,int unset) { -return parse_callchain_opt (opt,"fp" , unset); +return parse_callchain_opt (opt,EM_HOST !=EM_S390 ?"fp" :"dwarf" , unset); }@@ -1695,7 +1696,7 @@ int cmd_top(int argc, const char **argv) goto out_delete_evlist;if (!top.evlist->core.nr_entries) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (target, callchain_param.enabled);if (!def_evlist) goto out_delete_evlist;tools/perf/tests/event_update.c +3
-1@@ -8,6 +8,7 @@#include "header.h" #include "machine.h" #include "util/synthetic-events.h" +#include "target.h" #include "tool.h" #include "tests.h" #include "debug.h" @@ -81,7 +82,8 @@ static int test__event_update(struct test_suite *test __maybe_unused, int subtes {struct evsel *evsel;struct event_name tmp; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);tools/perf/tests/expand-cgroup.c +3
-1@@ -8,6 +8,7 @@#include "parse-events.h" #include "pmu-events/pmu-events.h" #include "pfm.h" +#include "target.h" #include <subcmd/parse-options.h> #include <stdio.h> #include <stdlib.h> @@ -99,7 +100,8 @@ out: for (i = 0; i < nr_events; i++)static int expand_default_events (void ) {int ret; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);tools/perf/tests/perf-record.c +5
-2@@ -84,8 +84,11 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestCPU_ZERO_S (cpu_mask_size, cpu_mask);perf_sample__init (&sample,/*all=*/ false); -if (evlist ==NULL )/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ - evlist =evlist__new_default (); +if (evlist ==NULL ) {/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ +struct target target = {}; + + evlist =evlist__new_default (&target,/*sample_callchains=*/ false); + }if (evlist ==NULL ) {pr_debug ("Not enough memory to create evlist\n" );tools/perf/tests/topology.c +3
-1@@ -9,6 +9,7 @@#include "evlist.h" #include "debug.h" #include "pmus.h" +#include "target.h" #include <linux/err.h> #define TEMPL "/tmp/perf-test-XXXXXX"@@ -37,11 +38,12 @@ static int session_write_header(char *path) .path = path, .mode = PERF_DATA_MODE_WRITE, }; +struct target target = {}; session =perf_session__new (&data,NULL );TEST_ASSERT_VAL ("can't get session" , !IS_ERR (session)); - session->evlist =evlist__new_default (); + session->evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("can't get evlist" , session->evlist); session->evlist->session = session;tools/perf/util/evlist.c +21
-11@@ -13,6 +13,7 @@#include "util/mmap.h" #include "thread_map.h" #include "target.h" +#include "dwarf-regs.h" #include "evlist.h" #include "evsel.h" #include "record.h" @@ -98,38 +99,47 @@ struct evlist *evlist__new(void)return evlist; } -struct evlist *evlist__new_default (void ) +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains) {struct evlist *evlist =evlist__new ();bool can_profile_kernel;struct perf_pmu *pmu =NULL ; +struct evsel *evsel; +char buf[256 ]; +int err;if (!evlist)return NULL ; can_profile_kernel =perf_event_paranoid_check (1 ); -while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { -char buf[256 ]; -int err; - -snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, +if (EM_HOST ==EM_S390 && sample_callchains) { +snprintf (buf,sizeof (buf),"software/%s/%s" , +target__has_cpu (target) ?"cpu-clock" :"task-clock" , can_profile_kernel ?"P" :"Pu" ); err =parse_event (evlist, buf); -if (err) { -evlist__delete (evlist); -return NULL ; +if (err) + goto out_err; + }else { +while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { +snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, + can_profile_kernel ?"P" :"Pu" ); + err =parse_event (evlist, buf); +if (err) + goto out_err; } } +/* If there is only 1 event a sample identifier isn't necessary. */ if (evlist->core.nr_entries >1 ) { -struct evsel *evsel; -evlist__for_each_entry (evlist, evsel)evsel__set_sample_id (evsel,/*can_sample_identifier=*/ false); }return evlist; +out_err: +evlist__delete (evlist); +return NULL ; }struct evlist *evlist__new_dummy (void )tools/perf/util/evlist.h +1
-1@@ -104,7 +104,7 @@ struct evsel_str_handler { };struct evlist *evlist__new (void ); -struct evlist *evlist__new_default (void ); +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains);struct evlist *evlist__new_dummy (void );void evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus,struct perf_thread_map *threads);tools/perf/util/evsel.c +0
-0@@ -1021,6 +1021,11 @@ static void __evsel__config_callchain(struct evsel *evsel, const struct record_obool function =evsel__is_function_event (evsel);tools/perf/util/evsel.c static void __evsel__config_callchain(struct evsel *evsel, const struct record_o · line 1031
Quoted 10 lines
tools/perf/util/evsel.c +5
-0struct perf_event_attr *attr = &evsel->core.attr; +if (EM_HOST ==EM_S390 && param->record_mode ==CALLCHAIN_FP ) { +pr_warning_once ( +"Framepointer unwinding lacks kernel support. Use '--call-graph dwarf'\n" ); + } +evsel__set_sample_bit (evsel,CALLCHAIN ); attr->sample_max_stack = param->max_stack;Great, here is the output on my LPAR. Thanks very much fpr addressing and fixing this!!!
root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc took 2s ❯ ./perf record --call-graph dwarf -- perf test -w noploop
[ perf record: Woken up 133 times to write data ]
[ perf record: Captured and wrote 32.928 MB perf.data (4039 samples) ]root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc took 2s ❯ ./perf evlist
software/task-clock/Proot in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc ❯ ./perf record -g -- perf test -w noploop
[ perf record: Woken up 133 times to write data ]
[ perf record: Captured and wrote 32.952 MB perf.data (4042 samples) ]root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc took 2s ❯ ./perf evlist
software/task-clock/Proot in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc ❯ ./perf record -- perf test -w noploop
[ perf record: Woken up 2 times to write data ]
[ perf record: Captured and wrote 0.179 MB perf.data (3974 samples) ]root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc took 2s ❯ ./perf evlist
cpum_cf/cycles/Proot in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc ❯ ./perf record
^C[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.250 MB perf.data (24 samples) ]root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc took 3s ❯ ./perf evlist
cpum_cf/cycles/P
dummy:uroot in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc ❯ ./perf record -g
^C[ perf record: Woken up 8 times to write data ]
[ perf record: Captured and wrote 5.186 MB perf.data (34255 samples) ]root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc took 3s ❯ ./perf evlist
software/cpu-clock/P
dummy:u
Quoted 3 lines
root in 🌐 b83lp69 in mirror-linux-next/tools/perf on master [⇡] via C v15.2.1-gcc took 3s
Tested-by Thomas Richter <[email protected]>
Thanks Thomas! I'll add the tag into the next version. Why a new version? I'm trying to appease sashiko that is rightly flagging more issues:
https://sashiko.dev/#/patchset/20260317055334.760347-1-irogers%40google.com
Thanks,
Ian
Quoted 10 lines
--
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany --
IBM Deutschland Research & Development GmbHVorsitzender des Aufsichtsrats: Wolfgang Wendt
Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Ian Rogers
reviewerv6 cover perf evsel fallback changes, better s390 defaults
Discussion with Thomas Richter in:
https://lore.kernel.org/lkml/[email protected]/
showed that the evsel__fallback wasn't working for s390. These patches avoid the problematic frame pointer callchain on s390 and fix evsel__fallback from a range of problems when falling back to a software event. I simulated failures when developing the patches but they are untested other than that.
v6: Sashiko noted that target wasn't fully set up when creating the
default evlist in perf top, so move it earlier. Fix const char* casting issues in __parse_callchain_report_opt. Make '-g' not override the .perfconfig setting again.
https://sashiko.dev/#/patchset/20260317055334.760347-1-irogers%40google.com
v5: Fix the value for the top option to match that of record. Tidy the
callchain parsing option callbacks. Based on AI review feedback:
https://sashiko.dev/#/patchset/20260317030601.567422-1-irogers%40google.com
https://lore.kernel.org/lkml/[email protected]/
v4: Changing the callchain parameter at configuration time means other
options aren't set the same as they would for --call-graph dwarf, for example the stack size. Switch to setting the callchain option on s390 to parameter parse time. For '-g' use '--call-graph dwarf' for s390. Other --call-graph options are parsed as normal, but a warning is generated when setting --call-graph fp for s390. Also fix that sample IDs aren't wanted when there is only 1 event in the evlist.
https://lore.kernel.org/lkml/[email protected]/
v3: Incorporate feedback about event and callchain behavior for s390:
https://lore.kernel.org/lkml/[email protected]/
https://lore.kernel.org/lkml/[email protected]/
v2: try exclude_callchain_user for s390 rather than fully disabling
the callchain. Fix a missed clearing of is_pmu_core if the software event fallback.
https://lore.kernel.org/lkml/[email protected]/
v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (5):
perf evsel: Improve falling back from cycles perf target: Constify simple check functions perf evsel: Constify option arguments to config functions perf callchain: Refactor callchain option parsing perf evlist: Improve default event for s390
tools/perf/builtin-record.c | 66 +++++++---------------------- tools/perf/builtin-top.c | 67 ++++++++++++++++------------- tools/perf/builtin-trace.c | 9 +++- tools/perf/tests/event_update.c | 4 +- tools/perf/tests/expand-cgroup.c | 4 +- tools/perf/tests/perf-record.c | 7 ++- tools/perf/tests/topology.c | 4 +- tools/perf/util/callchain.c | 73 ++++++++++++++++++++++++++------ tools/perf/util/callchain.h | 12 ++---- tools/perf/util/evlist.c | 32 +++++++++----- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 70 +++++++++++++++++++----------- tools/perf/util/evsel.h | 10 +++-- tools/perf/util/target.h | 12 +++--- 14 files changed, 217 insertions(+), 155 deletions(-)
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v6 1/5 perf evsel: Improve falling back from cycles
Switch to using evsel__match rather than comparing perf_event_attr values, this is robust on hybrid architectures.
Ensure evsel->pmu matches the evsel->core.attr.
Remove exclude bits that get set in other fallback attempts when switching the event.
Log the event name with modifiers when switching the event on fallback.
--- tools/perf/util/evsel.c | 45 ++++++++++++++++++++++++++++------------- tools/perf/util/evsel.h | 2 ++ 2 files changed, 33 insertions(+), 14 deletions(-)
tools/perf/util/evsel.c +31 -14
@@ -3785,25 +3785,42 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, {int paranoid; -if ((err ==ENOENT || err ==ENXIO || err ==ENODEV ) && - evsel->core.attr.type ==PERF_TYPE_HARDWARE && - evsel->core.attr.config ==PERF_COUNT_HW_CPU_CYCLES ) { +if ((err ==ENODEV || err ==ENOENT || err ==ENXIO ) && +evsel__match (evsel,HARDWARE ,HW_CPU_CYCLES )) {/* -* If it's cycles then fall back to hrtimer based cpu-clock sw -* counter, which is always available even if no PMU support. -* -* PPC returns ENXIO until 2.6.37 (behavior changed with commit -* b0a873e). +* If it's the legacy hardware cycles event fails then fall back +* to hrtimer based cpu-clock sw counter, which is always +* available even if no PMU support. PPC returned ENXIO rather +* than ENODEV or ENOENT until 2.6.37. */ - evsel->core.attr.type =PERF_TYPE_SOFTWARE ; + evsel->pmu =perf_pmus__find_by_type (PERF_TYPE_SOFTWARE ); +assert (evsel->pmu);/* software is a "well-known" and can't fail PMU type. */ + +/* Configure the event. */ + evsel->core.attr.type =PERF_TYPE_SOFTWARE ; evsel->core.attr.config =target__has_cpu (target) ?PERF_COUNT_SW_CPU_CLOCK :PERF_COUNT_SW_TASK_CLOCK ; -scnprintf (msg, msgsize, -"The cycles event is not supported, trying to fall back to %s" , -target__has_cpu (target) ?"cpu-clock" :"task-clock" ); + evsel->core.is_pmu_core = false; + +/* Remove excludes for new event. */ +if (evsel->fallenback_eacces) { + evsel->core.attr.exclude_kernel =0 ; + evsel->core.attr.exclude_hv =0 ; + evsel->fallenback_eacces = false; + } +if (evsel->fallenback_eopnotsupp) { + evsel->core.attr.exclude_guest =0 ; + evsel->fallenback_eopnotsupp = false; + } +/* Name is recomputed by evsel__name. */ zfree (&evsel->name); + +/* Log message. */ +scnprintf (msg, msgsize, +"The cycles event is not supported, trying to fall back to %s" , +evsel__name (evsel));return true; }else if (err ==EACCES && !evsel->core.attr.exclude_kernel && (paranoid =perf_event_paranoid ()) >1 ) {
@@ -3830,7 +3847,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, " samples", paranoid); evsel->core.attr.exclude_kernel =1 ; evsel->core.attr.exclude_hv =1 ; - + evsel->fallenback_eacces = true;return true; }else if (err ==EOPNOTSUPP && !evsel->core.attr.exclude_guest && !evsel->exclude_GH) {
@@ -3851,7 +3868,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err,/* Apple M1 requires exclude_guest */ scnprintf (msg, msgsize,"Trying to fall back to excluding guest samples" ); evsel->core.attr.exclude_guest =1 ; - + evsel->fallenback_eopnotsupp = true;return true; } no_fallback:
tools/perf/util/evsel.h +2 -0
@@ -124,6 +124,8 @@ struct evsel {bool default_metricgroup;/* A member of the Default metricgroup */ bool default_show_events;/* If a default group member, show the event */ bool needs_uniquify; +bool fallenback_eacces; +bool fallenback_eopnotsupp;struct hashmap *per_pkg_mask;int err;int script_output_type;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v6 2/5 perf target: Constify simple check functions
In reply to Ian RogersAllow the target to be const in callers.
--- tools/perf/util/target.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/perf/util/target.h +6 -6
@@ -49,22 +49,22 @@ uid_t parse_uid(const char *str);int target__strerror (struct target *target,int errnum,char *buf,size_t buflen); -static inline bool target__has_task (struct target *target) +static inline bool target__has_task (const struct target *target) {return target->tid || target->pid; } -static inline bool target__has_cpu (struct target *target) +static inline bool target__has_cpu (const struct target *target) {return target->system_wide || target->cpu_list; } -static inline bool target__none (struct target *target) +static inline bool target__none (const struct target *target) {return !target__has_task (target) && !target__has_cpu (target); } -static inline bool target__enable_on_exec (struct target *target) +static inline bool target__enable_on_exec (const struct target *target) {/* * Normally enable_on_exec should be set if:
@@ -75,12 +75,12 @@ static inline bool target__enable_on_exec(struct target *target)return target__none (target) && !target->initial_delay; } -static inline bool target__has_per_thread (struct target *target) +static inline bool target__has_per_thread (const struct target *target) {return target->system_wide && target->per_thread; } -static inline bool target__uses_dummy_map (struct target *target) +static inline bool target__uses_dummy_map (const struct target *target) {bool use_dummy = false;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v6 3/5 perf evsel: Constify option arguments to config functions
In reply to Ian RogersThe options are used to configure the evsel but are not themselves configured. Make the arguments const to better capture this.
--- tools/perf/util/evsel.c | 20 ++++++++++---------- tools/perf/util/evsel.h | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-)
tools/perf/util/evsel.c +10 -10
@@ -1015,8 +1015,8 @@ uint16_t evsel__e_machine(struct evsel *evsel, uint32_t *e_flags)return perf_session__e_machine (session, e_flags); } -static void __evsel__config_callchain (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *param) +static void __evsel__config_callchain (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *param) {bool function =evsel__is_function_event (evsel);struct perf_event_attr *attr = &evsel->core.attr;
@@ -1080,14 +1080,14 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->defer_callchain =1 ; } -void evsel__config_callchain (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *param) +void evsel__config_callchain (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *param) {if (param->enabled)return __evsel__config_callchain (evsel, opts, param); } -static void evsel__reset_callgraph (struct evsel *evsel,struct callchain_param *param) +static void evsel__reset_callgraph (struct evsel *evsel,const struct callchain_param *param) {struct perf_event_attr *attr = &evsel->core.attr;
@@ -1106,7 +1106,7 @@ static void evsel__reset_callgraph(struct evsel *evsel, struct callchain_param *static void evsel__apply_ratio_to_prev (struct evsel *evsel,struct perf_event_attr *attr, -struct record_opts *opts, +const struct record_opts *opts,const char *buf) {struct perf_event_attr *prev_attr =NULL ;
@@ -1170,7 +1170,7 @@ static void evsel__apply_ratio_to_prev(struct evsel *evsel, }static void evsel__apply_config_terms (struct evsel *evsel, -struct record_opts *opts,bool track) +const struct record_opts *opts,bool track) {struct evsel_config_term *term;struct list_head *config_terms = &evsel->config_terms;
@@ -1445,7 +1445,7 @@ void __weak arch_evsel__apply_ratio_to_prev(struct evsel *evsel __maybe_unused, { } -static void evsel__set_default_freq_period (struct record_opts *opts, +static void evsel__set_default_freq_period (const struct record_opts *opts,struct perf_event_attr *attr) {if (opts->freq) {
@@ -1490,8 +1490,8 @@ bool evsel__is_offcpu_event(struct evsel *evsel)* enable/disable events specifically, as there's no * initial traced exec call. */ -void evsel__config (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *callchain) +void evsel__config (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *callchain) {struct evsel *leader =evsel__leader (evsel);struct perf_event_attr *attr = &evsel->core.attr;
tools/perf/util/evsel.h +4 -4
@@ -287,10 +287,10 @@ void evsel__set_priv_destructor(void (*destructor)(void *priv));struct callchain_param ; -void evsel__config (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *callchain); -void evsel__config_callchain (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *callchain); +void evsel__config (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *callchain); +void evsel__config_callchain (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *callchain);int __evsel__sample_size (u64 sample_type);void evsel__calc_id_pos (struct evsel *evsel);
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v6 4/5 perf callchain: Refactor callchain option parsing
In reply to Ian Rogersrecord_opts__parse_callchain is shared by builtin-record and builtin-trace, it is declared in callchain.h. Move the declaration to callchain.c for consistency with the header. In other cases make the option callback a small static stub that then calls into callchain.c.
Make the no argument '-g' callchain option just a short-cut for '--call-graph fp' so that there is consistency in how the arguments are handled. This requires the const char* string to be strdup-ed in __parse_callchain_report_opt. For consistency also make parse_callchain_record use strdup and remove some unnecessary casts. Also, be more explicit with comments about the '-g' behavior if there is a .perfconfig file setting.
--- tools/perf/builtin-record.c | 60 +++++------------------------- tools/perf/builtin-top.c | 20 ++++++---- tools/perf/builtin-trace.c | 9 ++++- tools/perf/util/callchain.c | 73 ++++++++++++++++++++++++++++++------- tools/perf/util/callchain.h | 12 ++---- 5 files changed, 94 insertions(+), 80 deletions(-)
tools/perf/builtin-record.c +10 -50
@@ -2975,65 +2975,25 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)return status; } -static void callchain_debug (struct callchain_param *callchain) -{ -static const char *str[CALLCHAIN_MAX ] = {"NONE" ,"FP" ,"DWARF" ,"LBR" }; - -pr_debug ("callchain: type %s\n" , str[callchain->record_mode]); - -if (callchain->record_mode ==CALLCHAIN_DWARF ) -pr_debug ("callchain: stack dump size %d\n" , - callchain->dump_size); -} - -int record_opts__parse_callchain (struct record_opts *record, -struct callchain_param *callchain, -const char *arg,bool unset) -{ -int ret; - callchain->enabled = !unset; - -/* --no-call-graph */ -if (unset) { - callchain->record_mode =CALLCHAIN_NONE ; -pr_debug ("callchain: disabled\n" ); -return 0 ; - } - - ret =parse_callchain_record_opt (arg, callchain); -if (!ret) { -/* Enable data address sampling for DWARF unwind. */ -if (callchain->record_mode ==CALLCHAIN_DWARF && - !record->record_data_mmap_set) - record->record_data_mmap = true; -callchain_debug (callchain); - } - -return ret; -} - -int record_parse_callchain_opt (const struct option *opt, +static int record_parse_callchain_opt (const struct option *opt,const char *arg,int unset) {return record_opts__parse_callchain (opt->value, &callchain_param, arg, unset); } -int record_callchain_opt (const struct option *opt, -const char *arg__maybe_unused , -int unset__maybe_unused ) +static int record_callchain_opt (const struct option *opt, +const char *arg__maybe_unused , +int unset) { -struct callchain_param *callchain = opt->value; - - callchain->enabled = true; - -if (callchain->record_mode ==CALLCHAIN_NONE ) - callchain->record_mode =CALLCHAIN_FP ; +/* The -g option only sets the callchain if not already configure by .perfconfig. */ +if (callchain_param.record_mode !=CALLCHAIN_NONE ) +return 0 ; -callchain_debug (callchain); -return 0 ; +return record_opts__parse_callchain (opt->value, &callchain_param,"fp" , unset); } +static int perf_record_config (const char *var,const char *value,void *cb) {struct record *rec = cb;
@@ -3525,7 +3485,7 @@ static struct option __record_options[] = {OPT_CALLBACK (0 ,"mmap-flush" , &record.opts,"number" ,"Minimal number of bytes that is extracted from mmap data pages (default: 1)" , record__mmap_flush_parse), -OPT_CALLBACK_NOOPT ('g' ,NULL , &callchain_param, +OPT_CALLBACK_NOOPT ('g' ,NULL , &record.opts,NULL ,"enables call-graph recording" , &record_callchain_opt), OPT_CALLBACK(0, "call-graph", &record.opts,
tools/perf/builtin-top.c +13 -7
@@ -1386,13 +1386,6 @@ static int __cmd_top(struct perf_top *top)return ret; } -static int -callchain_opt (const struct option *opt,const char *arg,int unset) -{ - symbol_conf.use_callchain = true; -return record_callchain_opt (opt, arg, unset); -} -static int parse_callchain_opt (const struct option *opt,const char *arg,int unset) {
@@ -1413,6 +1406,19 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)return parse_callchain_top_opt (arg); } +static int +callchain_opt (const struct option *opt,const char *arg__maybe_unused ,int unset) +{ +struct callchain_param *callchain = opt->value; + +/* The -g option only sets the callchain if not already configure by .perfconfig. */ +if (callchain->record_mode !=CALLCHAIN_NONE ) +return 0 ; + +return parse_callchain_opt (opt,"fp" , unset); +} + +static int perf_top_config (const char *var,const char *value,void *cb__maybe_unused ) {if (!strcmp (var,"top.call-graph" )) {
tools/perf/builtin-trace.c +8 -1
@@ -5300,6 +5300,13 @@ static int trace__parse_summary_mode(const struct option *opt, const char *str,return 0 ; } +static int trace_parse_callchain_opt (const struct option *opt, +const char *arg, +int unset) +{ +return record_opts__parse_callchain (opt->value, &callchain_param, arg, unset); +} +static int trace__config (const char *var,const char *value,void *arg) {struct trace *trace = arg;
@@ -5447,7 +5454,7 @@ int cmd_trace(int argc, const char **argv)OPT_BOOLEAN ('f' ,"force" , &trace.force,"don't complain, do it" ),OPT_CALLBACK (0 ,"call-graph" , &trace.opts,"record_mode[,record_size]" , record_callchain_help, - &record_parse_callchain_opt), + &trace_parse_callchain_opt),OPT_BOOLEAN (0 ,"libtraceevent_print" , &trace.libtraceevent_print,"Use libtraceevent to print the tracepoint arguments." ), OPT_BOOLEAN(0, "kernel-syscall-graph", &trace.kernel_syscallchains,
tools/perf/util/callchain.c +60 -13
135 lines not on this page · raw message
tools/perf/util/callchain.h +3 -9
@@ -9,11 +9,13 @@struct addr_location ;struct evsel ; +struct hist_entry ; +struct hists ;struct ip_callchain ;struct map ;struct perf_sample ; +struct record_opts ;struct thread ; -struct hists ;#define HELP_PAD "\t\t\t\t"
@@ -237,14 +239,6 @@ struct callchain_cursor *get_tls_callchain_cursor(void);int callchain_cursor__copy (struct callchain_cursor *dst,struct callchain_cursor *src); -struct option ; -struct hist_entry ; - -int record_parse_callchain_opt (const struct option *opt,const char *arg,int unset); -int record_callchain_opt (const struct option *opt,const char *arg,int unset); - -struct record_opts ; -int record_opts__parse_callchain (struct record_opts *record,struct callchain_param *callchain,const char *arg,bool unset);
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v6 5/5 perf evlist: Improve default event for s390
In reply to Ian RogersFrame pointer callchains are not supported on s390 and dwarf callchains are only supported on software events.
Switch the default event from the hardware 'cycles' event to the software 'cpu-clock' or 'task-clock' on s390 if callchains are enabled. Move the target initialization earlier in builtin-top so it is ready for use by evlist__new_default.
If frame pointer callchains are requested on s390 show a warning. Modify the '-g' option of perf top and perf record to default to dwarf callchains on s390.
--- tools/perf/builtin-record.c | 8 ++++-- tools/perf/builtin-top.c | 49 ++++++++++++++++---------------- tools/perf/tests/event_update.c | 4 ++- tools/perf/tests/expand-cgroup.c | 4 ++- tools/perf/tests/perf-record.c | 7 +++-- tools/perf/tests/topology.c | 4 ++- tools/perf/util/evlist.c | 32 ++++++++++++++------- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 5 ++++ 9 files changed, 72 insertions(+), 43 deletions(-)
tools/perf/builtin-record.c +6 -2
@@ -55,6 +55,7 @@#include "asm/bug.h" #include "perf.h" #include "cputopo.h" +#include "dwarf-regs.h" #include <errno.h> #include <inttypes.h>
@@ -2990,7 +2991,9 @@ static int record_callchain_opt(const struct option *opt,if (callchain_param.record_mode !=CALLCHAIN_NONE )return 0 ; -return record_opts__parse_callchain (opt->value, &callchain_param,"fp" , unset); +return record_opts__parse_callchain (opt->value, &callchain_param, +EM_HOST !=EM_S390 ?"fp" :"dwarf" , + unset); }
@@ -4269,7 +4272,8 @@ int cmd_record(int argc, const char **argv) record.opts.tail_synthesize = true;if (rec->evlist->core.nr_entries ==0 ) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (&rec->opts.target, + callchain_param.enabled);if (!def_evlist) goto out;
tools/perf/builtin-top.c +25 -24
74 lines not on this page · raw message
tools/perf/tests/event_update.c +3 -1
@@ -8,6 +8,7 @@#include "header.h" #include "machine.h" #include "util/synthetic-events.h" +#include "target.h" #include "tool.h" #include "tests.h" #include "debug.h"
@@ -81,7 +82,8 @@ static int test__event_update(struct test_suite *test __maybe_unused, int subtes {struct evsel *evsel;struct event_name tmp; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);
tools/perf/tests/expand-cgroup.c +3 -1
@@ -8,6 +8,7 @@#include "parse-events.h" #include "pmu-events/pmu-events.h" #include "pfm.h" +#include "target.h" #include <subcmd/parse-options.h> #include <stdio.h> #include <stdlib.h>
@@ -99,7 +100,8 @@ out: for (i = 0; i < nr_events; i++)static int expand_default_events (void ) {int ret; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);
tools/perf/tests/perf-record.c +5 -2
@@ -84,8 +84,11 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestCPU_ZERO_S (cpu_mask_size, cpu_mask);perf_sample__init (&sample,/*all=*/ false); -if (evlist ==NULL )/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ - evlist =evlist__new_default (); +if (evlist ==NULL ) {/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ +struct target target = {}; + + evlist =evlist__new_default (&target,/*sample_callchains=*/ false); + }if (evlist ==NULL ) {pr_debug ("Not enough memory to create evlist\n" );
tools/perf/tests/topology.c +3 -1
@@ -9,6 +9,7 @@#include "evlist.h" #include "debug.h" #include "pmus.h" +#include "target.h" #include <linux/err.h> #define TEMPL "/tmp/perf-test-XXXXXX"
@@ -37,11 +38,12 @@ static int session_write_header(char *path) .path = path, .mode = PERF_DATA_MODE_WRITE, }; +struct target target = {}; session =perf_session__new (&data,NULL );TEST_ASSERT_VAL ("can't get session" , !IS_ERR (session)); - session->evlist =evlist__new_default (); + session->evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("can't get evlist" , session->evlist); session->evlist->session = session;
tools/perf/util/evlist.c +21 -11
@@ -13,6 +13,7 @@#include "util/mmap.h" #include "thread_map.h" #include "target.h" +#include "dwarf-regs.h" #include "evlist.h" #include "evsel.h" #include "record.h"
@@ -98,38 +99,47 @@ struct evlist *evlist__new(void)return evlist; } -struct evlist *evlist__new_default (void ) +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains) {struct evlist *evlist =evlist__new ();bool can_profile_kernel;struct perf_pmu *pmu =NULL ; +struct evsel *evsel; +char buf[256 ]; +int err;if (!evlist)return NULL ; can_profile_kernel =perf_event_paranoid_check (1 ); -while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { -char buf[256 ]; -int err; - -snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, +if (EM_HOST ==EM_S390 && sample_callchains) { +snprintf (buf,sizeof (buf),"software/%s/%s" , +target__has_cpu (target) ?"cpu-clock" :"task-clock" , can_profile_kernel ?"P" :"Pu" ); err =parse_event (evlist, buf); -if (err) { -evlist__delete (evlist); -return NULL ; +if (err) + goto out_err; + }else { +while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { +snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, + can_profile_kernel ?"P" :"Pu" ); + err =parse_event (evlist, buf); +if (err) + goto out_err; } } +/* If there is only 1 event a sample identifier isn't necessary. */ if (evlist->core.nr_entries >1 ) { -struct evsel *evsel; -evlist__for_each_entry (evlist, evsel)evsel__set_sample_id (evsel,/*can_sample_identifier=*/ false); }return evlist; +out_err: +evlist__delete (evlist); +return NULL ; }struct evlist *evlist__new_dummy (void )
tools/perf/util/evlist.h +1 -1
@@ -104,7 +104,7 @@ struct evsel_str_handler { };struct evlist *evlist__new (void ); -struct evlist *evlist__new_default (void ); +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains);struct evlist *evlist__new_dummy (void );void evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus,struct perf_thread_map *threads);
tools/perf/util/evsel.c +5 -0
@@ -1021,6 +1021,11 @@ static void __evsel__config_callchain(struct evsel *evsel, const struct record_obool function =evsel__is_function_event (evsel);struct perf_event_attr *attr = &evsel->core.attr; +if (EM_HOST ==EM_S390 && param->record_mode ==CALLCHAIN_FP ) { +pr_warning_once ( +"Framepointer unwinding lacks kernel support. Use '--call-graph dwarf'\n" ); + } +evsel__set_sample_bit (evsel,CALLCHAIN ); attr->sample_max_stack = param->max_stack;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Re: [PATCH v6 0/5] perf evsel fallback changes, better s390 defaults
In reply to Ian RogersQuoted 47 lines · Ian Rogers
Discussion with Thomas Richter in:
https://lore.kernel.org/lkml/[email protected]/
showed that theevsel__fallbackwasn't working for s390. These patches avoid the problematic frame pointer callchain on s390 and fixevsel__fallbackfrom a range of problems when falling back to a software event. I simulated failures when developing the patches but they are untested other than that.v6: Sashiko noted that target wasn't fully set up when creating the
default evlist inperf top, so move it earlier. Fix const char* casting issues in__parse_callchain_report_opt. Make '-g' not override the .perfconfig setting again.
https://sashiko.dev/#/patchset/20260317055334.760347-1-irogers%40google.comv5: Fix the value for the top option to match that of record. Tidy the
callchain parsing option callbacks. Based on AI review feedback:
https://sashiko.dev/#/patchset/20260317030601.567422-1-irogers%40google.com
https://lore.kernel.org/lkml/[email protected]/v4: Changing the callchain parameter at configuration time means other
options aren't set the same as they would for--call-graph dwarf, for example the stack size. Switch to setting the callchain option on s390 to parameter parse time. For '-g' use '--call-graph dwarf' for s390. Other --call-graph options are parsed as normal, but a warning is generated when setting--call-graph fpfor s390. Also fix that sample IDs aren't wanted when there is only 1 event in the evlist.
https://lore.kernel.org/lkml/[email protected]/v3: Incorporate feedback about event and callchain behavior for s390:
https://lore.kernel.org/lkml/[email protected]/
https://lore.kernel.org/lkml/[email protected]/v2: try
exclude_callchain_userfor s390 rather than fully disabling
the callchain. Fix a missed clearing ofis_pmu_coreif the software event fallback.
https://lore.kernel.org/lkml/[email protected]/v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (5):
perf evsel: Improve falling back from cycles perf target: Constify simple check functions perf evsel: Constify option arguments to config functions perf callchain: Refactor callchain option parsing perf evlist: Improve default event for s390
Quoted 16 lines
tools/perf/builtin-record.c | 66 +++++++---------------------- tools/perf/builtin-top.c | 67 ++++++++++++++++------------- tools/perf/builtin-trace.c | 9 +++- tools/perf/tests/event_update.c | 4 +- tools/perf/tests/expand-cgroup.c | 4 +- tools/perf/tests/perf-record.c | 7 ++- tools/perf/tests/topology.c | 4 +- tools/perf/util/callchain.c | 73 ++++++++++++++++++++++++++------ tools/perf/util/callchain.h | 12 ++---- tools/perf/util/evlist.c | 32 +++++++++----- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 70 +++++++++++++++++++----------- tools/perf/util/evsel.h | 10 +++-- tools/perf/util/target.h | 12 +++--- 14 files changed, 217 insertions(+), 155 deletions(-)
Ian, thanks a lot. I tested it using the same sequences as for v5.
Signature · 9 lines
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany -- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Wolfgang Wendt Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Ian Rogers
reviewerRe: [PATCH v6 0/5] perf evsel fallback changes, better s390 defaults
Quoted 66 lines · Thomas Richter
Quoted 47 lines · Ian Rogers
Discussion with Thomas Richter in:
https://lore.kernel.org/lkml/[email protected]/
showed that theevsel__fallbackwasn't working for s390. These patches avoid the problematic frame pointer callchain on s390 and fixevsel__fallbackfrom a range of problems when falling back to a software event. I simulated failures when developing the patches but they are untested other than that.v6: Sashiko noted that target wasn't fully set up when creating the
default evlist inperf top, so move it earlier. Fix const char* casting issues in__parse_callchain_report_opt. Make '-g' not override the .perfconfig setting again.
https://sashiko.dev/#/patchset/20260317055334.760347-1-irogers%40google.comv5: Fix the value for the top option to match that of record. Tidy the
callchain parsing option callbacks. Based on AI review feedback:
https://sashiko.dev/#/patchset/20260317030601.567422-1-irogers%40google.com
https://lore.kernel.org/lkml/[email protected]/v4: Changing the callchain parameter at configuration time means other
options aren't set the same as they would for--call-graph dwarf, for example the stack size. Switch to setting the callchain option on s390 to parameter parse time. For '-g' use '--call-graph dwarf' for s390. Other --call-graph options are parsed as normal, but a warning is generated when setting--call-graph fpfor s390. Also fix that sample IDs aren't wanted when there is only 1 event in the evlist.
https://lore.kernel.org/lkml/[email protected]/v3: Incorporate feedback about event and callchain behavior for s390:
https://lore.kernel.org/lkml/[email protected]/
https://lore.kernel.org/lkml/[email protected]/v2: try
exclude_callchain_userfor s390 rather than fully disabling
the callchain. Fix a missed clearing ofis_pmu_coreif the software event fallback.
https://lore.kernel.org/lkml/[email protected]/v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (5):
perf evsel: Improve falling back from cycles perf target: Constify simple check functions perf evsel: Constify option arguments to config functions perf callchain: Refactor callchain option parsing perf evlist: Improve default event for s390Quoted 16 lines
tools/perf/builtin-record.c | 66 +++++++---------------------- tools/perf/builtin-top.c | 67 ++++++++++++++++------------- tools/perf/builtin-trace.c | 9 +++- tools/perf/tests/event_update.c | 4 +- tools/perf/tests/expand-cgroup.c | 4 +- tools/perf/tests/perf-record.c | 7 ++- tools/perf/tests/topology.c | 4 +- tools/perf/util/callchain.c | 73 ++++++++++++++++++++++++++------ tools/perf/util/callchain.h | 12 ++---- tools/perf/util/evlist.c | 32 +++++++++----- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 70 +++++++++++++++++++----------- tools/perf/util/evsel.h | 10 +++-- tools/perf/util/target.h | 12 +++--- 14 files changed, 217 insertions(+), 155 deletions(-)
Quoted 3 lines
Ian, thanks a lot. I tested it using the same sequences as for v5.
Tested-by Thomas Richter <[email protected]>
Thanks Thomas! There's a Sashiko review that moving the target initialization for perf top will cause issues, I'll do a v7 with your tags. That change shouldn't impact any testing.
https://sashiko.dev/#/patchset/20260317175642.161647-1-irogers%40google.com
Thanks,
Ian
Quoted 10 lines
--
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany --
IBM Deutschland Research & Development GmbHVorsitzender des Aufsichtsrats: Wolfgang Wendt
Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Ian Rogers
reviewerv7 cover perf evsel fallback changes, better s390 defaults
Discussion with Thomas Richter in:
https://lore.kernel.org/lkml/[email protected]/
showed that the evsel__fallback wasn't working for s390. These patches avoid the problematic frame pointer callchain on s390 and fix evsel__fallback from a range of problems when falling back to a software event. I simulated failures when developing the patches but they are untested other than that.
v7: In perf top, move the target uid handling back to after the evlist
is setup. A regression caught by Sashiko in:
https://sashiko.dev/#/patchset/20260317175642.161647-1-irogers%40google.com
v6: Sashiko noted that target wasn't fully set up when creating the
default evlist in perf top, so move it earlier. Fix const char* casting issues in __parse_callchain_report_opt. Make '-g' not override the .perfconfig setting again.
https://sashiko.dev/#/patchset/20260317055334.760347-1-irogers%40google.com
https://lore.kernel.org/lkml/[email protected]/
v5: Fix the value for the top option to match that of record. Tidy the
callchain parsing option callbacks. Based on AI review feedback:
https://sashiko.dev/#/patchset/20260317030601.567422-1-irogers%40google.com
https://lore.kernel.org/lkml/[email protected]/
v4: Changing the callchain parameter at configuration time means other
options aren't set the same as they would for --call-graph dwarf, for example the stack size. Switch to setting the callchain option on s390 to parameter parse time. For '-g' use '--call-graph dwarf' for s390. Other --call-graph options are parsed as normal, but a warning is generated when setting --call-graph fp for s390. Also fix that sample IDs aren't wanted when there is only 1 event in the evlist.
https://lore.kernel.org/lkml/[email protected]/
v3: Incorporate feedback about event and callchain behavior for s390:
https://lore.kernel.org/lkml/[email protected]/
https://lore.kernel.org/lkml/[email protected]/
v2: try exclude_callchain_user for s390 rather than fully disabling
the callchain. Fix a missed clearing of is_pmu_core if the software event fallback.
https://lore.kernel.org/lkml/[email protected]/
v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (5):
perf evsel: Improve falling back from cycles perf target: Constify simple check functions perf evsel: Constify option arguments to config functions perf callchain: Refactor callchain option parsing perf evlist: Improve default event for s390
tools/perf/builtin-record.c | 66 +++++++---------------------- tools/perf/builtin-top.c | 41 ++++++++++-------- tools/perf/builtin-trace.c | 9 +++- tools/perf/tests/event_update.c | 4 +- tools/perf/tests/expand-cgroup.c | 4 +- tools/perf/tests/perf-record.c | 7 ++- tools/perf/tests/topology.c | 4 +- tools/perf/util/callchain.c | 73 ++++++++++++++++++++++++++------ tools/perf/util/callchain.h | 12 ++---- tools/perf/util/evlist.c | 32 +++++++++----- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 70 +++++++++++++++++++----------- tools/perf/util/evsel.h | 10 +++-- tools/perf/util/target.h | 12 +++--- 14 files changed, 204 insertions(+), 142 deletions(-)
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v7 1/5 perf evsel: Improve falling back from cycles
Switch to using evsel__match rather than comparing perf_event_attr values, this is robust on hybrid architectures.
Ensure evsel->pmu matches the evsel->core.attr.
Remove exclude bits that get set in other fallback attempts when switching the event.
Log the event name with modifiers when switching the event on fallback.
--- tools/perf/util/evsel.c | 45 ++++++++++++++++++++++++++++------------- tools/perf/util/evsel.h | 2 ++ 2 files changed, 33 insertions(+), 14 deletions(-)
tools/perf/util/evsel.c +31 -14
@@ -3785,25 +3785,42 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, {int paranoid; -if ((err ==ENOENT || err ==ENXIO || err ==ENODEV ) && - evsel->core.attr.type ==PERF_TYPE_HARDWARE && - evsel->core.attr.config ==PERF_COUNT_HW_CPU_CYCLES ) { +if ((err ==ENODEV || err ==ENOENT || err ==ENXIO ) && +evsel__match (evsel,HARDWARE ,HW_CPU_CYCLES )) {/* -* If it's cycles then fall back to hrtimer based cpu-clock sw -* counter, which is always available even if no PMU support. -* -* PPC returns ENXIO until 2.6.37 (behavior changed with commit -* b0a873e). +* If it's the legacy hardware cycles event fails then fall back +* to hrtimer based cpu-clock sw counter, which is always +* available even if no PMU support. PPC returned ENXIO rather +* than ENODEV or ENOENT until 2.6.37. */ - evsel->core.attr.type =PERF_TYPE_SOFTWARE ; + evsel->pmu =perf_pmus__find_by_type (PERF_TYPE_SOFTWARE ); +assert (evsel->pmu);/* software is a "well-known" and can't fail PMU type. */ + +/* Configure the event. */ + evsel->core.attr.type =PERF_TYPE_SOFTWARE ; evsel->core.attr.config =target__has_cpu (target) ?PERF_COUNT_SW_CPU_CLOCK :PERF_COUNT_SW_TASK_CLOCK ; -scnprintf (msg, msgsize, -"The cycles event is not supported, trying to fall back to %s" , -target__has_cpu (target) ?"cpu-clock" :"task-clock" ); + evsel->core.is_pmu_core = false; + +/* Remove excludes for new event. */ +if (evsel->fallenback_eacces) { + evsel->core.attr.exclude_kernel =0 ; + evsel->core.attr.exclude_hv =0 ; + evsel->fallenback_eacces = false; + } +if (evsel->fallenback_eopnotsupp) { + evsel->core.attr.exclude_guest =0 ; + evsel->fallenback_eopnotsupp = false; + } +/* Name is recomputed by evsel__name. */ zfree (&evsel->name); + +/* Log message. */ +scnprintf (msg, msgsize, +"The cycles event is not supported, trying to fall back to %s" , +evsel__name (evsel));return true; }else if (err ==EACCES && !evsel->core.attr.exclude_kernel && (paranoid =perf_event_paranoid ()) >1 ) {
@@ -3830,7 +3847,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, " samples", paranoid); evsel->core.attr.exclude_kernel =1 ; evsel->core.attr.exclude_hv =1 ; - + evsel->fallenback_eacces = true;return true; }else if (err ==EOPNOTSUPP && !evsel->core.attr.exclude_guest && !evsel->exclude_GH) {
@@ -3851,7 +3868,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err,/* Apple M1 requires exclude_guest */ scnprintf (msg, msgsize,"Trying to fall back to excluding guest samples" ); evsel->core.attr.exclude_guest =1 ; - + evsel->fallenback_eopnotsupp = true;return true; } no_fallback:
tools/perf/util/evsel.h +2 -0
@@ -124,6 +124,8 @@ struct evsel {bool default_metricgroup;/* A member of the Default metricgroup */ bool default_show_events;/* If a default group member, show the event */ bool needs_uniquify; +bool fallenback_eacces; +bool fallenback_eopnotsupp;struct hashmap *per_pkg_mask;int err;int script_output_type;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v7 2/5 perf target: Constify simple check functions
In reply to Ian RogersAllow the target to be const in callers.
--- tools/perf/util/target.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/perf/util/target.h +6 -6
@@ -49,22 +49,22 @@ uid_t parse_uid(const char *str);int target__strerror (struct target *target,int errnum,char *buf,size_t buflen); -static inline bool target__has_task (struct target *target) +static inline bool target__has_task (const struct target *target) {return target->tid || target->pid; } -static inline bool target__has_cpu (struct target *target) +static inline bool target__has_cpu (const struct target *target) {return target->system_wide || target->cpu_list; } -static inline bool target__none (struct target *target) +static inline bool target__none (const struct target *target) {return !target__has_task (target) && !target__has_cpu (target); } -static inline bool target__enable_on_exec (struct target *target) +static inline bool target__enable_on_exec (const struct target *target) {/* * Normally enable_on_exec should be set if:
@@ -75,12 +75,12 @@ static inline bool target__enable_on_exec(struct target *target)return target__none (target) && !target->initial_delay; } -static inline bool target__has_per_thread (struct target *target) +static inline bool target__has_per_thread (const struct target *target) {return target->system_wide && target->per_thread; } -static inline bool target__uses_dummy_map (struct target *target) +static inline bool target__uses_dummy_map (const struct target *target) {bool use_dummy = false;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v7 3/5 perf evsel: Constify option arguments to config functions
In reply to Ian RogersThe options are used to configure the evsel but are not themselves configured. Make the arguments const to better capture this.
--- tools/perf/util/evsel.c | 20 ++++++++++---------- tools/perf/util/evsel.h | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-)
tools/perf/util/evsel.c +10 -10
@@ -1015,8 +1015,8 @@ uint16_t evsel__e_machine(struct evsel *evsel, uint32_t *e_flags)return perf_session__e_machine (session, e_flags); } -static void __evsel__config_callchain (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *param) +static void __evsel__config_callchain (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *param) {bool function =evsel__is_function_event (evsel);struct perf_event_attr *attr = &evsel->core.attr;
@@ -1080,14 +1080,14 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->defer_callchain =1 ; } -void evsel__config_callchain (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *param) +void evsel__config_callchain (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *param) {if (param->enabled)return __evsel__config_callchain (evsel, opts, param); } -static void evsel__reset_callgraph (struct evsel *evsel,struct callchain_param *param) +static void evsel__reset_callgraph (struct evsel *evsel,const struct callchain_param *param) {struct perf_event_attr *attr = &evsel->core.attr;
@@ -1106,7 +1106,7 @@ static void evsel__reset_callgraph(struct evsel *evsel, struct callchain_param *static void evsel__apply_ratio_to_prev (struct evsel *evsel,struct perf_event_attr *attr, -struct record_opts *opts, +const struct record_opts *opts,const char *buf) {struct perf_event_attr *prev_attr =NULL ;
@@ -1170,7 +1170,7 @@ static void evsel__apply_ratio_to_prev(struct evsel *evsel, }static void evsel__apply_config_terms (struct evsel *evsel, -struct record_opts *opts,bool track) +const struct record_opts *opts,bool track) {struct evsel_config_term *term;struct list_head *config_terms = &evsel->config_terms;
@@ -1445,7 +1445,7 @@ void __weak arch_evsel__apply_ratio_to_prev(struct evsel *evsel __maybe_unused, { } -static void evsel__set_default_freq_period (struct record_opts *opts, +static void evsel__set_default_freq_period (const struct record_opts *opts,struct perf_event_attr *attr) {if (opts->freq) {
@@ -1490,8 +1490,8 @@ bool evsel__is_offcpu_event(struct evsel *evsel)* enable/disable events specifically, as there's no * initial traced exec call. */ -void evsel__config (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *callchain) +void evsel__config (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *callchain) {struct evsel *leader =evsel__leader (evsel);struct perf_event_attr *attr = &evsel->core.attr;
tools/perf/util/evsel.h +4 -4
@@ -287,10 +287,10 @@ void evsel__set_priv_destructor(void (*destructor)(void *priv));struct callchain_param ; -void evsel__config (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *callchain); -void evsel__config_callchain (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *callchain); +void evsel__config (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *callchain); +void evsel__config_callchain (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *callchain);int __evsel__sample_size (u64 sample_type);void evsel__calc_id_pos (struct evsel *evsel);
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v7 4/5 perf callchain: Refactor callchain option parsing
In reply to Ian Rogersrecord_opts__parse_callchain is shared by builtin-record and builtin-trace, it is declared in callchain.h. Move the declaration to callchain.c for consistency with the header. In other cases make the option callback a small static stub that then calls into callchain.c.
Make the no argument '-g' callchain option just a short-cut for '--call-graph fp' so that there is consistency in how the arguments are handled. This requires the const char* string to be strdup-ed in __parse_callchain_report_opt. For consistency also make parse_callchain_record use strdup and remove some unnecessary casts. Also, be more explicit with comments about the '-g' behavior if there is a .perfconfig file setting.
--- tools/perf/builtin-record.c | 60 +++++------------------------- tools/perf/builtin-top.c | 20 ++++++---- tools/perf/builtin-trace.c | 9 ++++- tools/perf/util/callchain.c | 73 ++++++++++++++++++++++++++++++------- tools/perf/util/callchain.h | 12 ++---- 5 files changed, 94 insertions(+), 80 deletions(-)
tools/perf/builtin-record.c +10 -50
@@ -2975,65 +2975,25 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)return status; } -static void callchain_debug (struct callchain_param *callchain) -{ -static const char *str[CALLCHAIN_MAX ] = {"NONE" ,"FP" ,"DWARF" ,"LBR" }; - -pr_debug ("callchain: type %s\n" , str[callchain->record_mode]); - -if (callchain->record_mode ==CALLCHAIN_DWARF ) -pr_debug ("callchain: stack dump size %d\n" , - callchain->dump_size); -} - -int record_opts__parse_callchain (struct record_opts *record, -struct callchain_param *callchain, -const char *arg,bool unset) -{ -int ret; - callchain->enabled = !unset; - -/* --no-call-graph */ -if (unset) { - callchain->record_mode =CALLCHAIN_NONE ; -pr_debug ("callchain: disabled\n" ); -return 0 ; - } - - ret =parse_callchain_record_opt (arg, callchain); -if (!ret) { -/* Enable data address sampling for DWARF unwind. */ -if (callchain->record_mode ==CALLCHAIN_DWARF && - !record->record_data_mmap_set) - record->record_data_mmap = true; -callchain_debug (callchain); - } - -return ret; -} - -int record_parse_callchain_opt (const struct option *opt, +static int record_parse_callchain_opt (const struct option *opt,const char *arg,int unset) {return record_opts__parse_callchain (opt->value, &callchain_param, arg, unset); } -int record_callchain_opt (const struct option *opt, -const char *arg__maybe_unused , -int unset__maybe_unused ) +static int record_callchain_opt (const struct option *opt, +const char *arg__maybe_unused , +int unset) { -struct callchain_param *callchain = opt->value; - - callchain->enabled = true; - -if (callchain->record_mode ==CALLCHAIN_NONE ) - callchain->record_mode =CALLCHAIN_FP ; +/* The -g option only sets the callchain if not already configure by .perfconfig. */ +if (callchain_param.record_mode !=CALLCHAIN_NONE ) +return 0 ; -callchain_debug (callchain); -return 0 ; +return record_opts__parse_callchain (opt->value, &callchain_param,"fp" , unset); } +static int perf_record_config (const char *var,const char *value,void *cb) {struct record *rec = cb;
@@ -3525,7 +3485,7 @@ static struct option __record_options[] = {OPT_CALLBACK (0 ,"mmap-flush" , &record.opts,"number" ,"Minimal number of bytes that is extracted from mmap data pages (default: 1)" , record__mmap_flush_parse), -OPT_CALLBACK_NOOPT ('g' ,NULL , &callchain_param, +OPT_CALLBACK_NOOPT ('g' ,NULL , &record.opts,NULL ,"enables call-graph recording" , &record_callchain_opt), OPT_CALLBACK(0, "call-graph", &record.opts,
tools/perf/builtin-top.c +13 -7
@@ -1386,13 +1386,6 @@ static int __cmd_top(struct perf_top *top)return ret; } -static int -callchain_opt (const struct option *opt,const char *arg,int unset) -{ - symbol_conf.use_callchain = true; -return record_callchain_opt (opt, arg, unset); -} -static int parse_callchain_opt (const struct option *opt,const char *arg,int unset) {
@@ -1413,6 +1406,19 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)return parse_callchain_top_opt (arg); } +static int +callchain_opt (const struct option *opt,const char *arg__maybe_unused ,int unset) +{ +struct callchain_param *callchain = opt->value; + +/* The -g option only sets the callchain if not already configure by .perfconfig. */ +if (callchain->record_mode !=CALLCHAIN_NONE ) +return 0 ; + +return parse_callchain_opt (opt,"fp" , unset); +} + +static int perf_top_config (const char *var,const char *value,void *cb__maybe_unused ) {if (!strcmp (var,"top.call-graph" )) {
tools/perf/builtin-trace.c +8 -1
@@ -5300,6 +5300,13 @@ static int trace__parse_summary_mode(const struct option *opt, const char *str,return 0 ; } +static int trace_parse_callchain_opt (const struct option *opt, +const char *arg, +int unset) +{ +return record_opts__parse_callchain (opt->value, &callchain_param, arg, unset); +} +static int trace__config (const char *var,const char *value,void *arg) {struct trace *trace = arg;
@@ -5447,7 +5454,7 @@ int cmd_trace(int argc, const char **argv)OPT_BOOLEAN ('f' ,"force" , &trace.force,"don't complain, do it" ),OPT_CALLBACK (0 ,"call-graph" , &trace.opts,"record_mode[,record_size]" , record_callchain_help, - &record_parse_callchain_opt), + &trace_parse_callchain_opt),OPT_BOOLEAN (0 ,"libtraceevent_print" , &trace.libtraceevent_print,"Use libtraceevent to print the tracepoint arguments." ), OPT_BOOLEAN(0, "kernel-syscall-graph", &trace.kernel_syscallchains,
tools/perf/util/callchain.c +60 -13
135 lines not on this page · raw message
tools/perf/util/callchain.h +3 -9
@@ -9,11 +9,13 @@struct addr_location ;struct evsel ; +struct hist_entry ; +struct hists ;struct ip_callchain ;struct map ;struct perf_sample ; +struct record_opts ;struct thread ; -struct hists ;#define HELP_PAD "\t\t\t\t"
@@ -237,14 +239,6 @@ struct callchain_cursor *get_tls_callchain_cursor(void);int callchain_cursor__copy (struct callchain_cursor *dst,struct callchain_cursor *src); -struct option ; -struct hist_entry ; - -int record_parse_callchain_opt (const struct option *opt,const char *arg,int unset); -int record_callchain_opt (const struct option *opt,const char *arg,int unset); - -struct record_opts ; -int record_opts__parse_callchain (struct record_opts *record,struct callchain_param *callchain,const char *arg,bool unset);
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v7 5/5 perf evlist: Improve default event for s390
In reply to Ian RogersFrame pointer callchains are not supported on s390 and dwarf callchains are only supported on software events.
Switch the default event from the hardware 'cycles' event to the software 'cpu-clock' or 'task-clock' on s390 if callchains are enabled. Move the target initialization earlier in builtin-top so it is ready for use by evlist__new_default.
If frame pointer callchains are requested on s390 show a warning. Modify the '-g' option of perf top and perf record to default to dwarf callchains on s390.
--- tools/perf/builtin-record.c | 8 ++++++-- tools/perf/builtin-top.c | 23 ++++++++++++----------- tools/perf/tests/event_update.c | 4 +++- tools/perf/tests/expand-cgroup.c | 4 +++- tools/perf/tests/perf-record.c | 7 +++++-- tools/perf/tests/topology.c | 4 +++- tools/perf/util/evlist.c | 32 +++++++++++++++++++++----------- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 5 +++++ 9 files changed, 59 insertions(+), 30 deletions(-)
tools/perf/builtin-record.c +6 -2
@@ -55,6 +55,7 @@#include "asm/bug.h" #include "perf.h" #include "cputopo.h" +#include "dwarf-regs.h" #include <errno.h> #include <inttypes.h>
@@ -2990,7 +2991,9 @@ static int record_callchain_opt(const struct option *opt,if (callchain_param.record_mode !=CALLCHAIN_NONE )return 0 ; -return record_opts__parse_callchain (opt->value, &callchain_param,"fp" , unset); +return record_opts__parse_callchain (opt->value, &callchain_param, +EM_HOST !=EM_S390 ?"fp" :"dwarf" , + unset); }
@@ -4269,7 +4272,8 @@ int cmd_record(int argc, const char **argv) record.opts.tail_synthesize = true;if (rec->evlist->core.nr_entries ==0 ) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (&rec->opts.target, + callchain_param.enabled);if (!def_evlist) goto out;
tools/perf/builtin-top.c +12 -11
@@ -56,6 +56,7 @@#include "util/debug.h" #include "util/ordered-events.h" #include "util/pfm.h" +#include "dwarf-regs.h" #include <assert.h> #include <elf.h>
@@ -1415,7 +1416,7 @@ callchain_opt(const struct option *opt, const char *arg __maybe_unused, int unseif (callchain->record_mode !=CALLCHAIN_NONE )return 0 ; -return parse_callchain_opt (opt,"fp" , unset); +return parse_callchain_opt (opt,EM_HOST !=EM_S390 ?"fp" :"dwarf" , unset); }
@@ -1700,8 +1701,17 @@ int cmd_top(int argc, const char **argv)if (annotate_check_args () <0 ) goto out_delete_evlist; + status =target__validate (target); +if (status) { +target__strerror (target, status, errbuf,BUFSIZ ); +ui__warning ("%s\n" , errbuf); + } + +if (target__none (target)) + target->system_wide = true; +if (!top.evlist->core.nr_entries) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (target, callchain_param.enabled);if (!def_evlist) goto out_delete_evlist;
@@ -1794,12 +1804,6 @@ int cmd_top(int argc, const char **argv) goto out_delete_evlist; } - status =target__validate (target); -if (status) { -target__strerror (target, status, errbuf,BUFSIZ ); -ui__warning ("%s\n" , errbuf); - } -if (top.uid_str) {uid_t uid =parse_uid (top.uid_str);
@@ -1813,9 +1817,6 @@ int cmd_top(int argc, const char **argv) goto out_delete_evlist; } -if (target__none (target)) - target->system_wide = true; -if (evlist__create_maps (top.evlist, target) <0 ) {ui__error ("Couldn't create thread/CPU maps: %s\n" , errno ==ENOENT ?"No such process" :str_error_r (errno, errbuf,sizeof (errbuf)));
tools/perf/tests/event_update.c +3 -1
@@ -8,6 +8,7 @@#include "header.h" #include "machine.h" #include "util/synthetic-events.h" +#include "target.h" #include "tool.h" #include "tests.h" #include "debug.h"
@@ -81,7 +82,8 @@ static int test__event_update(struct test_suite *test __maybe_unused, int subtes {struct evsel *evsel;struct event_name tmp; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);
tools/perf/tests/expand-cgroup.c +3 -1
@@ -8,6 +8,7 @@#include "parse-events.h" #include "pmu-events/pmu-events.h" #include "pfm.h" +#include "target.h" #include <subcmd/parse-options.h> #include <stdio.h> #include <stdlib.h>
@@ -99,7 +100,8 @@ out: for (i = 0; i < nr_events; i++)static int expand_default_events (void ) {int ret; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);
tools/perf/tests/perf-record.c +5 -2
@@ -84,8 +84,11 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestCPU_ZERO_S (cpu_mask_size, cpu_mask);perf_sample__init (&sample,/*all=*/ false); -if (evlist ==NULL )/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ - evlist =evlist__new_default (); +if (evlist ==NULL ) {/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ +struct target target = {}; + + evlist =evlist__new_default (&target,/*sample_callchains=*/ false); + }if (evlist ==NULL ) {pr_debug ("Not enough memory to create evlist\n" );
tools/perf/tests/topology.c +3 -1
@@ -9,6 +9,7 @@#include "evlist.h" #include "debug.h" #include "pmus.h" +#include "target.h" #include <linux/err.h> #define TEMPL "/tmp/perf-test-XXXXXX"
@@ -37,11 +38,12 @@ static int session_write_header(char *path) .path = path, .mode = PERF_DATA_MODE_WRITE, }; +struct target target = {}; session =perf_session__new (&data,NULL );TEST_ASSERT_VAL ("can't get session" , !IS_ERR (session)); - session->evlist =evlist__new_default (); + session->evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("can't get evlist" , session->evlist); session->evlist->session = session;
tools/perf/util/evlist.c +21 -11
@@ -13,6 +13,7 @@#include "util/mmap.h" #include "thread_map.h" #include "target.h" +#include "dwarf-regs.h" #include "evlist.h" #include "evsel.h" #include "record.h"
@@ -98,38 +99,47 @@ struct evlist *evlist__new(void)return evlist; } -struct evlist *evlist__new_default (void ) +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains) {struct evlist *evlist =evlist__new ();bool can_profile_kernel;struct perf_pmu *pmu =NULL ; +struct evsel *evsel; +char buf[256 ]; +int err;if (!evlist)return NULL ; can_profile_kernel =perf_event_paranoid_check (1 ); -while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { -char buf[256 ]; -int err; - -snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, +if (EM_HOST ==EM_S390 && sample_callchains) { +snprintf (buf,sizeof (buf),"software/%s/%s" , +target__has_cpu (target) ?"cpu-clock" :"task-clock" , can_profile_kernel ?"P" :"Pu" ); err =parse_event (evlist, buf); -if (err) { -evlist__delete (evlist); -return NULL ; +if (err) + goto out_err; + }else { +while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { +snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, + can_profile_kernel ?"P" :"Pu" ); + err =parse_event (evlist, buf); +if (err) + goto out_err; } } +/* If there is only 1 event a sample identifier isn't necessary. */ if (evlist->core.nr_entries >1 ) { -struct evsel *evsel; -evlist__for_each_entry (evlist, evsel)evsel__set_sample_id (evsel,/*can_sample_identifier=*/ false); }return evlist; +out_err: +evlist__delete (evlist); +return NULL ; }struct evlist *evlist__new_dummy (void )
tools/perf/util/evlist.h +1 -1
@@ -104,7 +104,7 @@ struct evsel_str_handler { };struct evlist *evlist__new (void ); -struct evlist *evlist__new_default (void ); +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains);struct evlist *evlist__new_dummy (void );void evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus,struct perf_thread_map *threads);
tools/perf/util/evsel.c +5 -0
@@ -1021,6 +1021,11 @@ static void __evsel__config_callchain(struct evsel *evsel, const struct record_obool function =evsel__is_function_event (evsel);struct perf_event_attr *attr = &evsel->core.attr; +if (EM_HOST ==EM_S390 && param->record_mode ==CALLCHAIN_FP ) { +pr_warning_once ( +"Framepointer unwinding lacks kernel support. Use '--call-graph dwarf'\n" ); + } +evsel__set_sample_bit (evsel,CALLCHAIN ); attr->sample_max_stack = param->max_stack;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerv8 cover perf evsel fallback changes, better s390 defaults
In reply to Ian RogersDiscussion with Thomas Richter in:
https://lore.kernel.org/lkml/[email protected]/
showed that the evsel__fallback wasn't working for s390. These patches avoid the problematic frame pointer callchain on s390 and fix evsel__fallback from a range of problems when falling back to a software event. I simulated failures when developing the patches but they are untested other than that.
v8: Address sashiko review that target wasn't fully initialized for
perf record with '-u'. Ensure the callchain is enabled with '-g' and a .perfconfig setting. This don't impact testing so keeping Thomas' tested-by tags.
https://sashiko.dev/#/patchset/20260318175808.582009-1-irogers%40google.com
v7: In perf top, move the target uid handling back to after the evlist
is setup. A regression caught by Sashiko in:
https://sashiko.dev/#/patchset/20260317175642.161647-1-irogers%40google.com
https://lore.kernel.org/lkml/[email protected]/
v6: Sashiko noted that target wasn't fully set up when creating the
default evlist in perf top, so move it earlier. Fix const char* casting issues in __parse_callchain_report_opt. Make '-g' not override the .perfconfig setting again.
https://sashiko.dev/#/patchset/20260317055334.760347-1-irogers%40google.com
https://lore.kernel.org/lkml/[email protected]/
v5: Fix the value for the top option to match that of record. Tidy the
callchain parsing option callbacks. Based on AI review feedback:
https://sashiko.dev/#/patchset/20260317030601.567422-1-irogers%40google.com
https://lore.kernel.org/lkml/[email protected]/
v4: Changing the callchain parameter at configuration time means other
options aren't set the same as they would for --call-graph dwarf, for example the stack size. Switch to setting the callchain option on s390 to parameter parse time. For '-g' use '--call-graph dwarf' for s390. Other --call-graph options are parsed as normal, but a warning is generated when setting --call-graph fp for s390. Also fix that sample IDs aren't wanted when there is only 1 event in the evlist.
https://lore.kernel.org/lkml/[email protected]/
v3: Incorporate feedback about event and callchain behavior for s390:
https://lore.kernel.org/lkml/[email protected]/
https://lore.kernel.org/lkml/[email protected]/
v2: try exclude_callchain_user for s390 rather than fully disabling
the callchain. Fix a missed clearing of is_pmu_core if the software event fallback.
https://lore.kernel.org/lkml/[email protected]/
v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (5):
perf evsel: Improve falling back from cycles perf target: Constify simple check functions perf evsel: Constify option arguments to config functions perf callchain: Refactor callchain option parsing perf evlist: Improve default event for s390
tools/perf/builtin-record.c | 81 ++++++++++---------------------- tools/perf/builtin-top.c | 46 +++++++++++------- tools/perf/builtin-trace.c | 9 +++- tools/perf/tests/event_update.c | 4 +- tools/perf/tests/expand-cgroup.c | 4 +- tools/perf/tests/perf-record.c | 7 ++- tools/perf/tests/topology.c | 4 +- tools/perf/util/callchain.c | 73 +++++++++++++++++++++++----- tools/perf/util/callchain.h | 12 ++--- tools/perf/util/evlist.c | 32 ++++++++----- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 70 +++++++++++++++++---------- tools/perf/util/evsel.h | 10 ++-- tools/perf/util/target.h | 12 ++--- 14 files changed, 219 insertions(+), 147 deletions(-)
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v8 1/5 perf evsel: Improve falling back from cycles
Switch to using evsel__match rather than comparing perf_event_attr values, this is robust on hybrid architectures.
Ensure evsel->pmu matches the evsel->core.attr.
Remove exclude bits that get set in other fallback attempts when switching the event.
Log the event name with modifiers when switching the event on fallback.
--- tools/perf/util/evsel.c | 45 ++++++++++++++++++++++++++++------------- tools/perf/util/evsel.h | 2 ++ 2 files changed, 33 insertions(+), 14 deletions(-)
tools/perf/util/evsel.c +31 -14
@@ -3785,25 +3785,42 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, {int paranoid; -if ((err ==ENOENT || err ==ENXIO || err ==ENODEV ) && - evsel->core.attr.type ==PERF_TYPE_HARDWARE && - evsel->core.attr.config ==PERF_COUNT_HW_CPU_CYCLES ) { +if ((err ==ENODEV || err ==ENOENT || err ==ENXIO ) && +evsel__match (evsel,HARDWARE ,HW_CPU_CYCLES )) {/* -* If it's cycles then fall back to hrtimer based cpu-clock sw -* counter, which is always available even if no PMU support. -* -* PPC returns ENXIO until 2.6.37 (behavior changed with commit -* b0a873e). +* If it's the legacy hardware cycles event fails then fall back +* to hrtimer based cpu-clock sw counter, which is always +* available even if no PMU support. PPC returned ENXIO rather +* than ENODEV or ENOENT until 2.6.37. */ - evsel->core.attr.type =PERF_TYPE_SOFTWARE ; + evsel->pmu =perf_pmus__find_by_type (PERF_TYPE_SOFTWARE ); +assert (evsel->pmu);/* software is a "well-known" and can't fail PMU type. */ + +/* Configure the event. */ + evsel->core.attr.type =PERF_TYPE_SOFTWARE ; evsel->core.attr.config =target__has_cpu (target) ?PERF_COUNT_SW_CPU_CLOCK :PERF_COUNT_SW_TASK_CLOCK ; -scnprintf (msg, msgsize, -"The cycles event is not supported, trying to fall back to %s" , -target__has_cpu (target) ?"cpu-clock" :"task-clock" ); + evsel->core.is_pmu_core = false; + +/* Remove excludes for new event. */ +if (evsel->fallenback_eacces) { + evsel->core.attr.exclude_kernel =0 ; + evsel->core.attr.exclude_hv =0 ; + evsel->fallenback_eacces = false; + } +if (evsel->fallenback_eopnotsupp) { + evsel->core.attr.exclude_guest =0 ; + evsel->fallenback_eopnotsupp = false; + } +/* Name is recomputed by evsel__name. */ zfree (&evsel->name); + +/* Log message. */ +scnprintf (msg, msgsize, +"The cycles event is not supported, trying to fall back to %s" , +evsel__name (evsel));return true; }else if (err ==EACCES && !evsel->core.attr.exclude_kernel && (paranoid =perf_event_paranoid ()) >1 ) {
@@ -3830,7 +3847,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, " samples", paranoid); evsel->core.attr.exclude_kernel =1 ; evsel->core.attr.exclude_hv =1 ; - + evsel->fallenback_eacces = true;return true; }else if (err ==EOPNOTSUPP && !evsel->core.attr.exclude_guest && !evsel->exclude_GH) {
@@ -3851,7 +3868,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err,/* Apple M1 requires exclude_guest */ scnprintf (msg, msgsize,"Trying to fall back to excluding guest samples" ); evsel->core.attr.exclude_guest =1 ; - + evsel->fallenback_eopnotsupp = true;return true; } no_fallback:
tools/perf/util/evsel.h +2 -0
@@ -124,6 +124,8 @@ struct evsel {bool default_metricgroup;/* A member of the Default metricgroup */ bool default_show_events;/* If a default group member, show the event */ bool needs_uniquify; +bool fallenback_eacces; +bool fallenback_eopnotsupp;struct hashmap *per_pkg_mask;int err;int script_output_type;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v8 2/5 perf target: Constify simple check functions
In reply to Ian RogersAllow the target to be const in callers.
--- tools/perf/util/target.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/perf/util/target.h +6 -6
@@ -49,22 +49,22 @@ uid_t parse_uid(const char *str);int target__strerror (struct target *target,int errnum,char *buf,size_t buflen); -static inline bool target__has_task (struct target *target) +static inline bool target__has_task (const struct target *target) {return target->tid || target->pid; } -static inline bool target__has_cpu (struct target *target) +static inline bool target__has_cpu (const struct target *target) {return target->system_wide || target->cpu_list; } -static inline bool target__none (struct target *target) +static inline bool target__none (const struct target *target) {return !target__has_task (target) && !target__has_cpu (target); } -static inline bool target__enable_on_exec (struct target *target) +static inline bool target__enable_on_exec (const struct target *target) {/* * Normally enable_on_exec should be set if:
@@ -75,12 +75,12 @@ static inline bool target__enable_on_exec(struct target *target)return target__none (target) && !target->initial_delay; } -static inline bool target__has_per_thread (struct target *target) +static inline bool target__has_per_thread (const struct target *target) {return target->system_wide && target->per_thread; } -static inline bool target__uses_dummy_map (struct target *target) +static inline bool target__uses_dummy_map (const struct target *target) {bool use_dummy = false;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v8 3/5 perf evsel: Constify option arguments to config functions
In reply to Ian RogersThe options are used to configure the evsel but are not themselves configured. Make the arguments const to better capture this.
--- tools/perf/util/evsel.c | 20 ++++++++++---------- tools/perf/util/evsel.h | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-)
tools/perf/util/evsel.c +10 -10
@@ -1015,8 +1015,8 @@ uint16_t evsel__e_machine(struct evsel *evsel, uint32_t *e_flags)return perf_session__e_machine (session, e_flags); } -static void __evsel__config_callchain (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *param) +static void __evsel__config_callchain (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *param) {bool function =evsel__is_function_event (evsel);struct perf_event_attr *attr = &evsel->core.attr;
@@ -1080,14 +1080,14 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o attr->defer_callchain =1 ; } -void evsel__config_callchain (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *param) +void evsel__config_callchain (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *param) {if (param->enabled)return __evsel__config_callchain (evsel, opts, param); } -static void evsel__reset_callgraph (struct evsel *evsel,struct callchain_param *param) +static void evsel__reset_callgraph (struct evsel *evsel,const struct callchain_param *param) {struct perf_event_attr *attr = &evsel->core.attr;
@@ -1106,7 +1106,7 @@ static void evsel__reset_callgraph(struct evsel *evsel, struct callchain_param *static void evsel__apply_ratio_to_prev (struct evsel *evsel,struct perf_event_attr *attr, -struct record_opts *opts, +const struct record_opts *opts,const char *buf) {struct perf_event_attr *prev_attr =NULL ;
@@ -1170,7 +1170,7 @@ static void evsel__apply_ratio_to_prev(struct evsel *evsel, }static void evsel__apply_config_terms (struct evsel *evsel, -struct record_opts *opts,bool track) +const struct record_opts *opts,bool track) {struct evsel_config_term *term;struct list_head *config_terms = &evsel->config_terms;
@@ -1445,7 +1445,7 @@ void __weak arch_evsel__apply_ratio_to_prev(struct evsel *evsel __maybe_unused, { } -static void evsel__set_default_freq_period (struct record_opts *opts, +static void evsel__set_default_freq_period (const struct record_opts *opts,struct perf_event_attr *attr) {if (opts->freq) {
@@ -1490,8 +1490,8 @@ bool evsel__is_offcpu_event(struct evsel *evsel)* enable/disable events specifically, as there's no * initial traced exec call. */ -void evsel__config (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *callchain) +void evsel__config (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *callchain) {struct evsel *leader =evsel__leader (evsel);struct perf_event_attr *attr = &evsel->core.attr;
tools/perf/util/evsel.h +4 -4
@@ -287,10 +287,10 @@ void evsel__set_priv_destructor(void (*destructor)(void *priv));struct callchain_param ; -void evsel__config (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *callchain); -void evsel__config_callchain (struct evsel *evsel,struct record_opts *opts, -struct callchain_param *callchain); +void evsel__config (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *callchain); +void evsel__config_callchain (struct evsel *evsel,const struct record_opts *opts, +const struct callchain_param *callchain);int __evsel__sample_size (u64 sample_type);void evsel__calc_id_pos (struct evsel *evsel);
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v8 4/5 perf callchain: Refactor callchain option parsing
In reply to Ian Rogersrecord_opts__parse_callchain is shared by builtin-record and builtin-trace, it is declared in callchain.h. Move the declaration to callchain.c for consistency with the header. In other cases make the option callback a small static stub that then calls into callchain.c.
Make the no argument '-g' callchain option just a short-cut for '--call-graph fp' so that there is consistency in how the arguments are handled. This requires the const char* string to be strdup-ed in __parse_callchain_report_opt. For consistency also make parse_callchain_record use strdup and remove some unnecessary casts. Also, be more explicit about the '-g' behavior if there is a .perfconfig file setting.
--- tools/perf/builtin-record.c | 65 ++++++++------------------------- tools/perf/builtin-top.c | 25 +++++++++---- tools/perf/builtin-trace.c | 9 ++++- tools/perf/util/callchain.c | 73 ++++++++++++++++++++++++++++++------- tools/perf/util/callchain.h | 12 ++---- 5 files changed, 104 insertions(+), 80 deletions(-)
tools/perf/builtin-record.c +15 -50
@@ -2975,65 +2975,30 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)return status; } -static void callchain_debug (struct callchain_param *callchain) -{ -static const char *str[CALLCHAIN_MAX ] = {"NONE" ,"FP" ,"DWARF" ,"LBR" }; - -pr_debug ("callchain: type %s\n" , str[callchain->record_mode]); - -if (callchain->record_mode ==CALLCHAIN_DWARF ) -pr_debug ("callchain: stack dump size %d\n" , - callchain->dump_size); -} - -int record_opts__parse_callchain (struct record_opts *record, -struct callchain_param *callchain, -const char *arg,bool unset) -{ -int ret; - callchain->enabled = !unset; - -/* --no-call-graph */ -if (unset) { - callchain->record_mode =CALLCHAIN_NONE ; -pr_debug ("callchain: disabled\n" ); -return 0 ; - } - - ret =parse_callchain_record_opt (arg, callchain); -if (!ret) { -/* Enable data address sampling for DWARF unwind. */ -if (callchain->record_mode ==CALLCHAIN_DWARF && - !record->record_data_mmap_set) - record->record_data_mmap = true; -callchain_debug (callchain); - } - -return ret; -} - -int record_parse_callchain_opt (const struct option *opt, +static int record_parse_callchain_opt (const struct option *opt,const char *arg,int unset) {return record_opts__parse_callchain (opt->value, &callchain_param, arg, unset); } -int record_callchain_opt (const struct option *opt, -const char *arg__maybe_unused , -int unset__maybe_unused ) +static int record_callchain_opt (const struct option *opt, +const char *arg__maybe_unused , +int unset) { -struct callchain_param *callchain = opt->value; - - callchain->enabled = true; - -if (callchain->record_mode ==CALLCHAIN_NONE ) - callchain->record_mode =CALLCHAIN_FP ; +/* +* The -g option only sets the callchain if not already configured by +* .perfconfig. It does, however, enable it. +*/ +if (callchain_param.record_mode !=CALLCHAIN_NONE ) { + callchain_param.enabled = true; +return 0 ; + } -callchain_debug (callchain); -return 0 ; +return record_opts__parse_callchain (opt->value, &callchain_param,"fp" , unset); } +static int perf_record_config (const char *var,const char *value,void *cb) {struct record *rec = cb;
@@ -3525,7 +3490,7 @@ static struct option __record_options[] = {OPT_CALLBACK (0 ,"mmap-flush" , &record.opts,"number" ,"Minimal number of bytes that is extracted from mmap data pages (default: 1)" , record__mmap_flush_parse), -OPT_CALLBACK_NOOPT ('g' ,NULL , &callchain_param, +OPT_CALLBACK_NOOPT ('g' ,NULL , &record.opts,NULL ,"enables call-graph recording" , &record_callchain_opt), OPT_CALLBACK(0, "call-graph", &record.opts,
tools/perf/builtin-top.c +18 -7
@@ -1386,13 +1386,6 @@ static int __cmd_top(struct perf_top *top)return ret; } -static int -callchain_opt (const struct option *opt,const char *arg,int unset) -{ - symbol_conf.use_callchain = true; -return record_callchain_opt (opt, arg, unset); -} -static int parse_callchain_opt (const struct option *opt,const char *arg,int unset) {
@@ -1413,6 +1406,24 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)return parse_callchain_top_opt (arg); } +static int +callchain_opt (const struct option *opt,const char *arg__maybe_unused ,int unset) +{ +struct callchain_param *callchain = opt->value; + +/* +* The -g option only sets the callchain if not already configured by +* .perfconfig. It does, however, enable it. +*/ +if (callchain->record_mode !=CALLCHAIN_NONE ) { + callchain->enabled = true; +return 0 ; + } + +return parse_callchain_opt (opt,"fp" , unset); +} + +static int perf_top_config (const char *var,const char *value,void *cb__maybe_unused ) {if (!strcmp (var,"top.call-graph" )) {
tools/perf/builtin-trace.c +8 -1
@@ -5300,6 +5300,13 @@ static int trace__parse_summary_mode(const struct option *opt, const char *str,return 0 ; } +static int trace_parse_callchain_opt (const struct option *opt, +const char *arg, +int unset) +{ +return record_opts__parse_callchain (opt->value, &callchain_param, arg, unset); +} +static int trace__config (const char *var,const char *value,void *arg) {struct trace *trace = arg;
@@ -5447,7 +5454,7 @@ int cmd_trace(int argc, const char **argv)OPT_BOOLEAN ('f' ,"force" , &trace.force,"don't complain, do it" ),OPT_CALLBACK (0 ,"call-graph" , &trace.opts,"record_mode[,record_size]" , record_callchain_help, - &record_parse_callchain_opt), + &trace_parse_callchain_opt),OPT_BOOLEAN (0 ,"libtraceevent_print" , &trace.libtraceevent_print,"Use libtraceevent to print the tracepoint arguments." ), OPT_BOOLEAN(0, "kernel-syscall-graph", &trace.kernel_syscallchains,
tools/perf/util/callchain.c +60 -13
135 lines not on this page · raw message
tools/perf/util/callchain.h +3 -9
@@ -9,11 +9,13 @@struct addr_location ;struct evsel ; +struct hist_entry ; +struct hists ;struct ip_callchain ;struct map ;struct perf_sample ; +struct record_opts ;struct thread ; -struct hists ;#define HELP_PAD "\t\t\t\t"
@@ -237,14 +239,6 @@ struct callchain_cursor *get_tls_callchain_cursor(void);int callchain_cursor__copy (struct callchain_cursor *dst,struct callchain_cursor *src); -struct option ; -struct hist_entry ; - -int record_parse_callchain_opt (const struct option *opt,const char *arg,int unset); -int record_callchain_opt (const struct option *opt,const char *arg,int unset); - -struct record_opts ; -int record_opts__parse_callchain (struct record_opts *record,struct callchain_param *callchain,const char *arg,bool unset);
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Ian Rogers
reviewerPATCH v8 5/5 perf evlist: Improve default event for s390
In reply to Ian RogersFrame pointer callchains are not supported on s390 and dwarf callchains are only supported on software events.
Switch the default event from the hardware 'cycles' event to the software 'cpu-clock' or 'task-clock' on s390 if callchains are enabled. Move some of the target initialization earlier in builtin-top and builtin-record, so it is ready for use by evlist__new_default.
If frame pointer callchains are requested on s390 show a warning. Modify the '-g' option of perf top and perf record to default to dwarf callchains on s390.
--- tools/perf/builtin-record.c | 18 +++++++++++------- tools/perf/builtin-top.c | 23 ++++++++++++----------- tools/perf/tests/event_update.c | 4 +++- tools/perf/tests/expand-cgroup.c | 4 +++- tools/perf/tests/perf-record.c | 7 +++++-- tools/perf/tests/topology.c | 4 +++- tools/perf/util/evlist.c | 32 +++++++++++++++++++++----------- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 5 +++++ 9 files changed, 64 insertions(+), 35 deletions(-)
tools/perf/builtin-record.c +11 -7
@@ -55,6 +55,7 @@#include "asm/bug.h" #include "perf.h" #include "cputopo.h" +#include "dwarf-regs.h" #include <errno.h> #include <inttypes.h>
@@ -2995,7 +2996,9 @@ static int record_callchain_opt(const struct option *opt,return 0 ; } -return record_opts__parse_callchain (opt->value, &callchain_param,"fp" , unset); +return record_opts__parse_callchain (opt->value, &callchain_param, +EM_HOST !=EM_S390 ?"fp" :"dwarf" , + unset); }
@@ -4095,8 +4098,11 @@ int cmd_record(int argc, const char **argv)perf_debuginfod_setup (&record.debuginfod); -/* Make system wide (-a) the default target. */ -if (!argc &&target__none (&rec->opts.target)) +/* +* Use system wide (-a) for the default target (ie. when no +* workload). User ID filtering also implies system-wide. +*/ +if ((!argc &&target__none (&rec->opts.target)) || rec->uid_str) rec->opts.target.system_wide = true;if (nr_cgroups && !rec->opts.target.system_wide) {
@@ -4274,7 +4280,8 @@ int cmd_record(int argc, const char **argv) record.opts.tail_synthesize = true;if (rec->evlist->core.nr_entries ==0 ) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (&rec->opts.target, + callchain_param.enabled);if (!def_evlist) goto out;
@@ -4303,9 +4310,6 @@ int cmd_record(int argc, const char **argv) err =parse_uid_filter (rec->evlist, uid);if (err) goto out; - -/* User ID filtering implies system wide. */ - rec->opts.target.system_wide = true; }/* Enable ignoring missing threads when -p option is defined. */
tools/perf/builtin-top.c +12 -11
@@ -56,6 +56,7 @@#include "util/debug.h" #include "util/ordered-events.h" #include "util/pfm.h" +#include "dwarf-regs.h" #include <assert.h> #include <elf.h>
@@ -1420,7 +1421,7 @@ callchain_opt(const struct option *opt, const char *arg __maybe_unused, int unsereturn 0 ; } -return parse_callchain_opt (opt,"fp" , unset); +return parse_callchain_opt (opt,EM_HOST !=EM_S390 ?"fp" :"dwarf" , unset); }
@@ -1705,8 +1706,17 @@ int cmd_top(int argc, const char **argv)if (annotate_check_args () <0 ) goto out_delete_evlist; + status =target__validate (target); +if (status) { +target__strerror (target, status, errbuf,BUFSIZ ); +ui__warning ("%s\n" , errbuf); + } + +if (target__none (target)) + target->system_wide = true; +if (!top.evlist->core.nr_entries) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (target, callchain_param.enabled);if (!def_evlist) goto out_delete_evlist;
@@ -1799,12 +1809,6 @@ int cmd_top(int argc, const char **argv) goto out_delete_evlist; } - status =target__validate (target); -if (status) { -target__strerror (target, status, errbuf,BUFSIZ ); -ui__warning ("%s\n" , errbuf); - } -if (top.uid_str) {uid_t uid =parse_uid (top.uid_str);
@@ -1818,9 +1822,6 @@ int cmd_top(int argc, const char **argv) goto out_delete_evlist; } -if (target__none (target)) - target->system_wide = true; -if (evlist__create_maps (top.evlist, target) <0 ) {ui__error ("Couldn't create thread/CPU maps: %s\n" , errno ==ENOENT ?"No such process" :str_error_r (errno, errbuf,sizeof (errbuf)));
tools/perf/tests/event_update.c +3 -1
@@ -8,6 +8,7 @@#include "header.h" #include "machine.h" #include "util/synthetic-events.h" +#include "target.h" #include "tool.h" #include "tests.h" #include "debug.h"
@@ -81,7 +82,8 @@ static int test__event_update(struct test_suite *test __maybe_unused, int subtes {struct evsel *evsel;struct event_name tmp; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);
tools/perf/tests/expand-cgroup.c +3 -1
@@ -8,6 +8,7 @@#include "parse-events.h" #include "pmu-events/pmu-events.h" #include "pfm.h" +#include "target.h" #include <subcmd/parse-options.h> #include <stdio.h> #include <stdlib.h>
@@ -99,7 +100,8 @@ out: for (i = 0; i < nr_events; i++)static int expand_default_events (void ) {int ret; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);
tools/perf/tests/perf-record.c +5 -2
@@ -84,8 +84,11 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestCPU_ZERO_S (cpu_mask_size, cpu_mask);perf_sample__init (&sample,/*all=*/ false); -if (evlist ==NULL )/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ - evlist =evlist__new_default (); +if (evlist ==NULL ) {/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ +struct target target = {}; + + evlist =evlist__new_default (&target,/*sample_callchains=*/ false); + }if (evlist ==NULL ) {pr_debug ("Not enough memory to create evlist\n" );
tools/perf/tests/topology.c +3 -1
@@ -9,6 +9,7 @@#include "evlist.h" #include "debug.h" #include "pmus.h" +#include "target.h" #include <linux/err.h> #define TEMPL "/tmp/perf-test-XXXXXX"
@@ -37,11 +38,12 @@ static int session_write_header(char *path) .path = path, .mode = PERF_DATA_MODE_WRITE, }; +struct target target = {}; session =perf_session__new (&data,NULL );TEST_ASSERT_VAL ("can't get session" , !IS_ERR (session)); - session->evlist =evlist__new_default (); + session->evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("can't get evlist" , session->evlist); session->evlist->session = session;
tools/perf/util/evlist.c +21 -11
@@ -13,6 +13,7 @@#include "util/mmap.h" #include "thread_map.h" #include "target.h" +#include "dwarf-regs.h" #include "evlist.h" #include "evsel.h" #include "record.h"
@@ -98,38 +99,47 @@ struct evlist *evlist__new(void)return evlist; } -struct evlist *evlist__new_default (void ) +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains) {struct evlist *evlist =evlist__new ();bool can_profile_kernel;struct perf_pmu *pmu =NULL ; +struct evsel *evsel; +char buf[256 ]; +int err;if (!evlist)return NULL ; can_profile_kernel =perf_event_paranoid_check (1 ); -while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { -char buf[256 ]; -int err; - -snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, +if (EM_HOST ==EM_S390 && sample_callchains) { +snprintf (buf,sizeof (buf),"software/%s/%s" , +target__has_cpu (target) ?"cpu-clock" :"task-clock" , can_profile_kernel ?"P" :"Pu" ); err =parse_event (evlist, buf); -if (err) { -evlist__delete (evlist); -return NULL ; +if (err) + goto out_err; + }else { +while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { +snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, + can_profile_kernel ?"P" :"Pu" ); + err =parse_event (evlist, buf); +if (err) + goto out_err; } } +/* If there is only 1 event a sample identifier isn't necessary. */ if (evlist->core.nr_entries >1 ) { -struct evsel *evsel; -evlist__for_each_entry (evlist, evsel)evsel__set_sample_id (evsel,/*can_sample_identifier=*/ false); }return evlist; +out_err: +evlist__delete (evlist); +return NULL ; }struct evlist *evlist__new_dummy (void )
tools/perf/util/evlist.h +1 -1
@@ -104,7 +104,7 @@ struct evsel_str_handler { };struct evlist *evlist__new (void ); -struct evlist *evlist__new_default (void ); +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains);struct evlist *evlist__new_dummy (void );void evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus,struct perf_thread_map *threads);
tools/perf/util/evsel.c +5 -0
@@ -1021,6 +1021,11 @@ static void __evsel__config_callchain(struct evsel *evsel, const struct record_obool function =evsel__is_function_event (evsel);struct perf_event_attr *attr = &evsel->core.attr; +if (EM_HOST ==EM_S390 && param->record_mode ==CALLCHAIN_FP ) { +pr_warning_once ( +"Framepointer unwinding lacks kernel support. Use '--call-graph dwarf'\n" ); + } +evsel__set_sample_bit (evsel,CALLCHAIN ); attr->sample_max_stack = param->max_stack;
Signature · 1 line
2.53.0.851.ga537e3e6e9-goog
Re: [PATCH v8 5/5] perf evlist: Improve default event for s390
Quoted 324 lines · Ian Rogers
Frame pointer callchains are not supported on s390 and dwarf callchains are only supported on software events.
Switch the default event from the hardware 'cycles' event to the software 'cpu-clock' or 'task-clock' on s390 if callchains are enabled. Move some of the target initialization earlier in builtin-top and builtin-record, so it is ready for use by
evlist__new_default.If frame pointer callchains are requested on s390 show a warning. Modify the '-g' option of
perf topandperf recordto default to dwarf callchains on s390.Signed-off-by Ian Rogers <[email protected]>Tested-by Thomas Richter <[email protected]>--- tools/perf/builtin-record.c | 18 +++++++++++------- tools/perf/builtin-top.c | 23 ++++++++++++----------- tools/perf/tests/event_update.c | 4 +++- tools/perf/tests/expand-cgroup.c | 4 +++- tools/perf/tests/perf-record.c | 7 +++++-- tools/perf/tests/topology.c | 4 +++- tools/perf/util/evlist.c | 32 +++++++++++++++++++++----------- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 5 +++++ 9 files changed, 64 insertions(+), 35 deletions(-)tools/perf/builtin-record.c +11
-7@@ -55,6 +55,7 @@#include "asm/bug.h" #include "perf.h" #include "cputopo.h" +#include "dwarf-regs.h" #include <errno.h> #include <inttypes.h> @@ -2995,7 +2996,9 @@ static int record_callchain_opt(const struct option *opt,return 0 ; } -return record_opts__parse_callchain (opt->value, &callchain_param,"fp" , unset); +return record_opts__parse_callchain (opt->value, &callchain_param, +EM_HOST !=EM_S390 ?"fp" :"dwarf" , + unset); }@@ -4095,8 +4098,11 @@ int cmd_record(int argc, const char **argv)perf_debuginfod_setup (&record.debuginfod); -/* Make system wide (-a) the default target. */ -if (!argc &&target__none (&rec->opts.target)) +/* +* Use system wide (-a) for the default target (ie. when no +* workload). User ID filtering also implies system-wide. +*/ +if ((!argc &&target__none (&rec->opts.target)) || rec->uid_str) rec->opts.target.system_wide = true;if (nr_cgroups && !rec->opts.target.system_wide) {@@ -4274,7 +4280,8 @@ int cmd_record(int argc, const char **argv) record.opts.tail_synthesize = true;if (rec->evlist->core.nr_entries ==0 ) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (&rec->opts.target, + callchain_param.enabled);if (!def_evlist) goto out;@@ -4303,9 +4310,6 @@ int cmd_record(int argc, const char **argv) err =parse_uid_filter (rec->evlist, uid);if (err) goto out; - -/* User ID filtering implies system wide. */ - rec->opts.target.system_wide = true; }/* Enable ignoring missing threads when -p option is defined. */ tools/perf/builtin-top.c +12
-11@@ -56,6 +56,7 @@#include "util/debug.h" #include "util/ordered-events.h" #include "util/pfm.h" +#include "dwarf-regs.h" #include <assert.h> #include <elf.h> @@ -1420,7 +1421,7 @@ callchain_opt(const struct option *opt, const char *arg __maybe_unused, int unsereturn 0 ; } -return parse_callchain_opt (opt,"fp" , unset); +return parse_callchain_opt (opt,EM_HOST !=EM_S390 ?"fp" :"dwarf" , unset); }@@ -1705,8 +1706,17 @@ int cmd_top(int argc, const char **argv)if (annotate_check_args () <0 ) goto out_delete_evlist; + status =target__validate (target); +if (status) { +target__strerror (target, status, errbuf,BUFSIZ ); +ui__warning ("%s\n" , errbuf); + } + +if (target__none (target)) + target->system_wide = true; +if (!top.evlist->core.nr_entries) { -struct evlist *def_evlist =evlist__new_default (); +struct evlist *def_evlist =evlist__new_default (target, callchain_param.enabled);if (!def_evlist) goto out_delete_evlist;@@ -1799,12 +1809,6 @@ int cmd_top(int argc, const char **argv) goto out_delete_evlist; } - status =target__validate (target); -if (status) { -target__strerror (target, status, errbuf,BUFSIZ ); -ui__warning ("%s\n" , errbuf); - } -if (top.uid_str) {uid_t uid =parse_uid (top.uid_str);@@ -1818,9 +1822,6 @@ int cmd_top(int argc, const char **argv) goto out_delete_evlist; } -if (target__none (target)) - target->system_wide = true; -if (evlist__create_maps (top.evlist, target) <0 ) {ui__error ("Couldn't create thread/CPU maps: %s\n" , errno ==ENOENT ?"No such process" :str_error_r (errno, errbuf,sizeof (errbuf)));tools/perf/tests/event_update.c +3
-1@@ -8,6 +8,7 @@#include "header.h" #include "machine.h" #include "util/synthetic-events.h" +#include "target.h" #include "tool.h" #include "tests.h" #include "debug.h" @@ -81,7 +82,8 @@ static int test__event_update(struct test_suite *test __maybe_unused, int subtes {struct evsel *evsel;struct event_name tmp; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);tools/perf/tests/expand-cgroup.c +3
-1@@ -8,6 +8,7 @@#include "parse-events.h" #include "pmu-events/pmu-events.h" #include "pfm.h" +#include "target.h" #include <subcmd/parse-options.h> #include <stdio.h> #include <stdlib.h> @@ -99,7 +100,8 @@ out: for (i = 0; i < nr_events; i++)static int expand_default_events (void ) {int ret; -struct evlist *evlist =evlist__new_default (); +struct target target = {}; +struct evlist *evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("failed to get evlist" , evlist);tools/perf/tests/perf-record.c +5
-2@@ -84,8 +84,11 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestCPU_ZERO_S (cpu_mask_size, cpu_mask);perf_sample__init (&sample,/*all=*/ false); -if (evlist ==NULL )/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ - evlist =evlist__new_default (); +if (evlist ==NULL ) {/* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ +struct target target = {}; + + evlist =evlist__new_default (&target,/*sample_callchains=*/ false); + }if (evlist ==NULL ) {pr_debug ("Not enough memory to create evlist\n" );tools/perf/tests/topology.c +3
-1@@ -9,6 +9,7 @@#include "evlist.h" #include "debug.h" #include "pmus.h" +#include "target.h" #include <linux/err.h> #define TEMPL "/tmp/perf-test-XXXXXX"@@ -37,11 +38,12 @@ static int session_write_header(char *path) .path = path, .mode = PERF_DATA_MODE_WRITE, }; +struct target target = {}; session =perf_session__new (&data,NULL );TEST_ASSERT_VAL ("can't get session" , !IS_ERR (session)); - session->evlist =evlist__new_default (); + session->evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("can't get evlist" , session->evlist); session->evlist->session = session;tools/perf/util/evlist.c +21
-11@@ -13,6 +13,7 @@#include "util/mmap.h" #include "thread_map.h" #include "target.h" +#include "dwarf-regs.h" #include "evlist.h" #include "evsel.h" #include "record.h" @@ -98,38 +99,47 @@ struct evlist *evlist__new(void)return evlist; } -struct evlist *evlist__new_default (void ) +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains) {struct evlist *evlist =evlist__new ();bool can_profile_kernel;struct perf_pmu *pmu =NULL ; +struct evsel *evsel; +char buf[256 ]; +int err;if (!evlist)return NULL ; can_profile_kernel =perf_event_paranoid_check (1 ); -while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { -char buf[256 ]; -int err; - -snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, +if (EM_HOST ==EM_S390 && sample_callchains) { +snprintf (buf,sizeof (buf),"software/%s/%s" , +target__has_cpu (target) ?"cpu-clock" :"task-clock" , can_profile_kernel ?"P" :"Pu" ); err =parse_event (evlist, buf); -if (err) { -evlist__delete (evlist); -return NULL ; +if (err) + goto out_err; + }else { +while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { +snprintf (buf,sizeof (buf),"%s/cycles/%s" , pmu->name, + can_profile_kernel ?"P" :"Pu" ); + err =parse_event (evlist, buf); +if (err) + goto out_err; } } +/* If there is only 1 event a sample identifier isn't necessary. */ if (evlist->core.nr_entries >1 ) { -struct evsel *evsel; -evlist__for_each_entry (evlist, evsel)evsel__set_sample_id (evsel,/*can_sample_identifier=*/ false); }return evlist; +out_err: +evlist__delete (evlist); +return NULL ; }struct evlist *evlist__new_dummy (void )tools/perf/util/evlist.h +1
-1@@ -104,7 +104,7 @@ struct evsel_str_handler { };struct evlist *evlist__new (void ); -struct evlist *evlist__new_default (void ); +struct evlist *evlist__new_default (const struct target *target,bool sample_callchains);struct evlist *evlist__new_dummy (void );void evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus,struct perf_thread_map *threads);tools/perf/util/evsel.c +0
-0@@ -1021,6 +1021,11 @@ static void __evsel__config_callchain(struct evsel *evsel, const struct record_obool function =evsel__is_function_event (evsel);
tools/perf/util/evsel.c static void __evsel__config_callchain(struct evsel *evsel, const struct record_o · line 1031
Quoted 10 lines
tools/perf/util/evsel.c +5
-0struct perf_event_attr *attr = &evsel->core.attr; +if (EM_HOST ==EM_S390 && param->record_mode ==CALLCHAIN_FP ) { +pr_warning_once ( +"Framepointer unwinding lacks kernel support. Use '--call-graph dwarf'\n" ); + } +evsel__set_sample_bit (evsel,CALLCHAIN ); attr->sample_max_stack = param->max_stack;
Ian,
again Thanks very much.
Signature · 9 lines
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany -- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Wolfgang Wendt Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Ian Rogers
reviewerRe: [PATCH v8 0/5] perf evsel fallback changes, better s390 defaults
In reply to Ian RogersQuoted 8 lines · Ian Rogers
Discussion with Thomas Richter in:
https://lore.kernel.org/lkml/[email protected]/
showed that theevsel__fallbackwasn't working for s390. These patches avoid the problematic frame pointer callchain on s390 and fixevsel__fallbackfrom a range of problems when falling back to a software event. I simulated failures when developing the patches but they are untested other than that.
I think at this point I call it a day. Sashiko still has feedback that could justify a v9:
https://sashiko.dev/#/patchset/20260318234600.730340-1-irogers%40google.com
Specifically:
1) software PMUs may fail if sysfs isn't mounted. This isn't a real problem as "software" is a "well known" PMU that we create even if sysfs isn't mounted.
2) the handling of callchain in .perfconfig files isn't right, but the patches aren't making it any worse. I worry there could be several more patches if I start fixing things wrong with .perfconfig.
3) the possibility to add another NULL check for safety exists, but the code would already crash at the same point.
Apparently, the tendency of prompts to generate further refinements instead of providing all the problems at once is a known limitation of LLMs and the current prompting methods.
Thanks,
Ian
Quoted 70 lines
v8: Address sashiko review that target wasn't fully initialized for
perf recordwith '-u'. Ensure the callchain is enabled with '-g' and a .perfconfig setting. This don't impact testing so keeping Thomas' tested-by tags.
https://sashiko.dev/#/patchset/20260318175808.582009-1-irogers%40google.comv7: In perf top, move the target uid handling back to after the evlist
is setup. A regression caught by Sashiko in:
https://sashiko.dev/#/patchset/20260317175642.161647-1-irogers%40google.com
https://lore.kernel.org/lkml/[email protected]/v6: Sashiko noted that target wasn't fully set up when creating the
default evlist inperf top, so move it earlier. Fix const char* casting issues in__parse_callchain_report_opt. Make '-g' not override the .perfconfig setting again.
https://sashiko.dev/#/patchset/20260317055334.760347-1-irogers%40google.com
https://lore.kernel.org/lkml/[email protected]/v5: Fix the value for the top option to match that of record. Tidy the
callchain parsing option callbacks. Based on AI review feedback:
https://sashiko.dev/#/patchset/20260317030601.567422-1-irogers%40google.com
https://lore.kernel.org/lkml/[email protected]/v4: Changing the callchain parameter at configuration time means other
options aren't set the same as they would for--call-graph dwarf, for example the stack size. Switch to setting the callchain option on s390 to parameter parse time. For '-g' use '--call-graph dwarf' for s390. Other --call-graph options are parsed as normal, but a warning is generated when setting--call-graph fpfor s390. Also fix that sample IDs aren't wanted when there is only 1 event in the evlist.
https://lore.kernel.org/lkml/[email protected]/v3: Incorporate feedback about event and callchain behavior for s390:
https://lore.kernel.org/lkml/[email protected]/
https://lore.kernel.org/lkml/[email protected]/v2: try
exclude_callchain_userfor s390 rather than fully disabling
the callchain. Fix a missed clearing ofis_pmu_coreif the software event fallback.
https://lore.kernel.org/lkml/[email protected]/v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (5):
perf evsel: Improve falling back from cycles perf target: Constify simple check functions perf evsel: Constify option arguments to config functions perf callchain: Refactor callchain option parsing perf evlist: Improve default event for s390tools/perf/builtin-record.c | 81 ++++++++++---------------------- tools/perf/builtin-top.c | 46 +++++++++++------- tools/perf/builtin-trace.c | 9 +++- tools/perf/tests/event_update.c | 4 +- tools/perf/tests/expand-cgroup.c | 4 +- tools/perf/tests/perf-record.c | 7 ++- tools/perf/tests/topology.c | 4 +- tools/perf/util/callchain.c | 73 +++++++++++++++++++++++----- tools/perf/util/callchain.h | 12 ++--- tools/perf/util/evlist.c | 32 ++++++++----- tools/perf/util/evlist.h | 2 +- tools/perf/util/evsel.c | 70 +++++++++++++++++---------- tools/perf/util/evsel.h | 10 ++-- tools/perf/util/target.h | 12 ++--- 14 files changed, 219 insertions(+), 147 deletions(-)--
2.53.0.851.ga537e3e6e9-goog
Re: [PATCH v8 0/5] perf evsel fallback changes, better s390 defaults
Quoted 10 lines · Ian Rogers
Quoted 8 lines · Ian Rogers
Discussion with Thomas Richter in:
https://lore.kernel.org/lkml/[email protected]/
showed that theevsel__fallbackwasn't working for s390. These patches avoid the problematic frame pointer callchain on s390 and fixevsel__fallbackfrom a range of problems when falling back to a software event. I simulated failures when developing the patches but they are untested other than that.
Quoted 7 lines
I think at this point I call it a day. Sashiko still has feedback that could justify a v9:
https://sashiko.dev/#/patchset/20260318234600.730340-1-irogers%40google.com
Specifically:
1) software PMUs may fail if sysfs isn't mounted. This isn't a real problem as "software" is a "well known" PMU that we create even if sysfs isn't mounted.
I totally agree with you. Patch set 8 should be it. Honestly, if /sys (of sysfs) is not mounted, I guess perf tool is the least of the issues that arise. I believe this is now getting 'over-engineered'.
Quoted 3 lines
2) the handling of callchain in .perfconfig files isn't right, but the patches aren't making it any worse. I worry there could be several more patches if I start fixing things wrong with .perfconfig.
Correct, you can not fix everything in one patch set :-)
Quoted 9 lines
3) the possibility to add another NULL check for safety exists, but the code would already crash at the same point.
Apparently, the tendency of prompts to generate further refinements instead of providing all the problems at once is a known limitation of LLMs and the current prompting methods.Thanks,
Ian
my 2 cents....
Signature · 9 lines
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany -- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Wolfgang Wendt Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Re: [PATCH v8 0/5] perf evsel fallback changes, better s390 defaults
In reply to Ian RogersQuoted 9 lines · Ian Rogers
Discussion with Thomas Richter in:
https://lore.kernel.org/lkml/[email protected]/
showed that theevsel__fallbackwasn't working for s390. These patches avoid the problematic frame pointer callchain on s390 and fixevsel__fallbackfrom a range of problems when falling back to a software event. I simulated failures when developing the patches but they are untested other than that.[...]
Applied to perf-tools-next, thanks!
Best regards,
Namhyung