perf tools: Do not set attr.exclude_guest by default (v5)
Namhyung Kim
maintainercover perf tools: Do not set attr.exclude_guest by default (v5)
Hello,
I found perf tools set exclude_guest bit inconsistently. It used to set the bit but now the default event for perf record doesn't. So I'm wondering why we want the bit in the first place.
Actually it's not good for PMUs don't support any exclusion like AMD IBS because it disables new features after the exclude_guest due to the missing feature detection logic.
v5 changes)
* fix instruction:P failure on AMD (Ravi)
* add per-pmu exclude_guest test again (Ravi)
* add precise_max subtest to perf record shell test
v4) https://lore.kernel.org/lkml/[email protected]
* handle EOPNOTSUPP error in compatible way (Kan)
* drop --exclude-guest option in perf stat
* not to separate exclude_hv fallback
* rename to exclude_GH_default (Kan)
* drop the RFC from the subject
v3) https://lore.kernel.org/lkml/[email protected]/
* move exclude_guest fallback to the front
* fix precise_max handling on AMD
* simplify the default event for perf record
v2) https://lore.kernel.org/lkml/[email protected]/
* update the missing feature detection logic
* separate exclude_hv fallback
* add new fallback for exclude_guest
v1) https://lore.kernel.org/lkml/[email protected]/
AFAIK it doesn't matter for the most cases but perf kvm. If users need to set the bit, they can still use :H modifier. For vPMU pass- through or Apple M1, it'd add the exclude_guest during the fallback logic.
Also the kernel feature detection logic should be separated from the exclude bit tests since it depends on the PMU implementation rather than the core kernel features. So I changed it to use a software event for the detection and factor out some hw-specific checks.
The code is available at 'perf/exclude-v5' branch ingit://git.kernel.org/pub/scm/linux/kernel/git/namhyung/linux-perf.git
Thanks,
Namhyung
Namhyung Kim (9):
perf tools: Add fallback for exclude_guest
perf tools: Don't set attr.exclude_guest by default perf tools: Simplify evsel__add_modifier()
perf tools: Do not set exclude_guest for precise_ip perf tools: Detect missing kernel features properly perf tools: Move x86__is_amd_cpu() to util/env.c
perf tools: Check fallback error and order
perf record: Just use "cycles:P" as the default event perf test: Add precise_max subtest to the perf record shell test
tools/perf/arch/x86/util/Build | 1 - tools/perf/arch/x86/util/env.c | 19 - tools/perf/arch/x86/util/env.h | 7 - tools/perf/arch/x86/util/pmu.c | 2 +- tools/perf/builtin-kvm.c | 1 + tools/perf/builtin-record.c | 4 +- tools/perf/builtin-stat.c | 18 +- tools/perf/dlfilters/dlfilter-test-api-v0.c | 2 +- tools/perf/dlfilters/dlfilter-test-api-v2.c | 2 +- tools/perf/tests/attr/test-record-dummy-C0 | 2 +- tools/perf/tests/parse-events.c | 30 +- tools/perf/tests/shell/record.sh | 25 ++ tools/perf/tests/shell/stat.sh | 2 +- tools/perf/util/env.c | 23 + tools/perf/util/env.h | 4 + tools/perf/util/evsel.c | 457 +++++++++++++++----- tools/perf/util/evsel.h | 1 - tools/perf/util/parse-events.c | 6 +- tools/perf/util/pmu.h | 4 + tools/perf/util/util.c | 10 +- tools/perf/util/util.h | 3 + 21 files changed, 452 insertions(+), 171 deletions(-) delete mode 100644 tools/perf/arch/x86/util/env.c delete mode 100644 tools/perf/arch/x86/util/env.h
base-commit: ea2ead4224fd3899f6dadd4c1fc526f32ec2246c
Signature · 1 line
2.47.0.rc1.288.g06298d1525-goog
Namhyung Kim
maintainerPATCH v5 1/9 perf tools: Add fallback for exclude_guest
Commit 7b100989b4f6bce70 ("perf evlist: Remove __evlist__add_default") changed to parse "cycles:P" event instead of creating a new cycles event for perf record. But it also changed the way how modifiers are handled so it doesn't set the exclude_guest bit by default.
It seems Apple M1 PMU requires exclude_guest set and returns EOPNOTSUPP if not. Let's add a fallback so that it can work with default events.
Also update perf stat hybrid tests to handle possible u or H modifiers.
--- tools/perf/builtin-stat.c | 18 +++++++++++++++--- tools/perf/tests/shell/stat.sh | 2 +- tools/perf/util/evsel.c | 21 +++++++++++++++++++++ 3 files changed, 37 insertions(+), 4 deletions(-)
tools/perf/builtin-stat.c +15 -3
@@ -640,8 +640,7 @@ static enum counter_recovery stat_handle_error(struct evsel *counter)* (behavior changed with commit b0a873e). */ if (errno ==EINVAL || errno ==ENOSYS || - errno ==ENOENT || errno ==EOPNOTSUPP || - errno ==ENXIO ) { + errno ==ENOENT || errno ==ENXIO ) {if (verbose >0 )ui__warning ("%s event is not supported by the kernel.\n" ,evsel__name (counter));
@@ -659,7 +658,7 @@ static enum counter_recovery stat_handle_error(struct evsel *counter)if (verbose >0 )ui__warning ("%s\n" , msg);return COUNTER_RETRY ; - }else if (target__has_per_thread (&target) && + }else if (target__has_per_thread (&target) && errno !=EOPNOTSUPP && evsel_list->core.threads && evsel_list->core.threads->err_thread !=-1 ) {/*
@@ -680,6 +679,19 @@ static enum counter_recovery stat_handle_error(struct evsel *counter)return COUNTER_SKIP ; } +if (errno ==EOPNOTSUPP ) { +if (verbose >0 ) { +ui__warning ("%s event is not supported by the kernel.\n" , +evsel__name (counter)); + } + counter->supported = false; + counter->errored = true; + +if ((evsel__leader (counter) != counter) || + !(counter->core.leader->nr_members >1 )) +return COUNTER_SKIP ; + } +evsel__open_strerror (counter, &target, errno, msg,sizeof (msg));ui__error ("%s\n" , msg);
tools/perf/tests/shell/stat.sh +1 -1
@@ -185,7 +185,7 @@ test_hybrid() { fi # Run default Perf stat - cycles_events=$(perf stat -- true 2>&1 | grep -E "/cycles/| cycles " | wc -l) + cycles_events=$(perf stat -- true 2>&1 | grep -E "/cycles/[uH]*| cycles[:uH]* " -c) if [ "$pmus" -ne "$cycles_events" ] then
tools/perf/util/evsel.c +21 -0
@@ -3037,6 +3037,27 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, evsel->core.attr.exclude_kernel =1 ; evsel->core.attr.exclude_hv =1 ; +return true; + }else if (err ==EOPNOTSUPP && !evsel->core.attr.exclude_guest && + !evsel->exclude_GH) { +const char *name =evsel__name (evsel); +char *new_name; +const char *sep =":" ; + +/* Is there already the separator in the name. */ +if (strchr (name,'/' ) || + (strchr (name,':' ) && !evsel->is_libpfm_event)) + sep ="" ; + +if (asprintf (&new_name,"%s%sH" , name, sep) <0 ) +return false; + +free (evsel->name); + evsel->name = new_name; +/* Apple M1 requires exclude_guest */ +scnprintf (msg, msgsize,"trying to fall back to excluding guest samples" ); + evsel->core.attr.exclude_guest =1 ; +return true; }
Signature · 1 line
2.47.0.rc1.288.g06298d1525-goog
Namhyung Kim
maintainerPATCH v5 2/9 perf tools: Don't set attr.exclude_guest by default
In reply to Namhyung KimThe exclude_guest in the event attribute is to limit profiling in the host environment. But I'm not sure why we want to set it by default cause we don't care about it in most cases and I feel like it just makes new PMU implementation complicated.
Of course it's useful for perf kvm command so I added the exclude_GH_default variable to preserve the old behavior for perf kvm and other commands like perf record and stat won't set the exclude bit. This is helpful for AMD IBS case since having exclude_guest bit will clear new feature bit due to the missing feature check logic.
$ sysctl kernel.perf_event_paranoid kernel.perf_event_paranoid = 0
$ perf record -W -e ibs_op// -vv true 2>&1 | grep switching switching off PERF_FORMAT_LOST support switching off weight struct support switching off bpf_event switching off ksymbol switching off cloexec flag switching off mmap2 switching off exclude_guest, exclude_host
Intestingly, I found it sets the exclude_bit if "u" modifier is used. I don't know why but it's neither intuitive nor consistent. Let's remove the bit there too.
--- tools/perf/builtin-kvm.c | 1 + tools/perf/tests/attr/test-record-dummy-C0 | 2 +- tools/perf/tests/parse-events.c | 18 +++++++++--------- tools/perf/util/parse-events.c | 2 +- tools/perf/util/util.c | 10 ++++++++-- tools/perf/util/util.h | 3 +++ 6 files changed, 23 insertions(+), 13 deletions(-)
tools/perf/builtin-kvm.c +1 -0
@@ -2147,6 +2147,7 @@ int cmd_kvm(int argc, const char **argv) "buildid-list", "stat", NULL };const char *kvm_usage[] = {NULL ,NULL }; + exclude_GH_default = true; perf_host =0 ; perf_guest =1 ;
tools/perf/tests/attr/test-record-dummy-C0 +1 -1
@@ -37,7 +37,7 @@ precise_ip=0 mmap_data=0 sample_id_all=1 exclude_host=0 -exclude_guest=1 +exclude_guest=0 exclude_callchain_kernel=0 exclude_callchain_user=0 mmap2=1
tools/perf/tests/parse-events.c +9 -9
@@ -932,7 +932,7 @@ static int test__group2(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel);TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));
@@ -947,7 +947,7 @@ static int test__group2(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel);TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);if (evsel__has_leader (evsel, leader))
@@ -1072,7 +1072,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel);TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));
@@ -1222,7 +1222,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel);TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));
@@ -1437,7 +1437,7 @@ static int test__leader_sample1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel);TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);
@@ -1453,7 +1453,7 @@ static int test__leader_sample1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel);TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));
@@ -1468,7 +1468,7 @@ static int test__leader_sample1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel);TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);
@@ -1497,7 +1497,7 @@ static int test__leader_sample2(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel);TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);
@@ -1513,7 +1513,7 @@ static int test__leader_sample2(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel);TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);
tools/perf/util/parse-events.c +1 -1
@@ -1740,7 +1740,7 @@ static int parse_events__modifier_list(struct parse_events_state *parse_state,if (mod.user) {if (!exclude) exclude = eu = ek = eh =1 ; -if (!exclude_GH && !perf_guest) +if (!exclude_GH && !perf_guest && exclude_GH_default) eG =1 ; eu =0 ; }
tools/perf/util/util.c +8 -2
@@ -78,17 +78,23 @@ bool sysctl__nmi_watchdog_enabled(void)bool test_attr__enabled; +bool exclude_GH_default; +bool perf_host = true;bool perf_guest = false;void event_attr_init (struct perf_event_attr *attr) { +/* to capture ABI version */ + attr->size =sizeof (*attr); + +if (!exclude_GH_default) +return ; +if (!perf_host) attr->exclude_host =1 ;if (!perf_guest) attr->exclude_guest =1 ; -/* to capture ABI version */ - attr->size =sizeof (*attr); }int mkdir_p (char *path,mode_t mode)
tools/perf/util/util.h +3 -0
@@ -21,6 +21,9 @@ extern const char perf_more_info_string[];extern const char *input_name; +/* This will control if perf_{host,guest} will set attr.exclude_{host,guest}. */ +extern bool exclude_GH_default; +extern bool perf_host;extern bool perf_guest;
Signature · 1 line
2.47.0.rc1.288.g06298d1525-goog
Namhyung Kim
maintainerPATCH v5 3/9 perf tools: Simplify evsel__add_modifier()
In reply to Namhyung KimSince it doesn't set the exclude_guest, no need to special handle the bit and simply show only if one of host or guest bit is set. Now the default event name might not have :H prefix anymore so change the dlfilter test not to compare the ":" at the end.
--- tools/perf/dlfilters/dlfilter-test-api-v0.c | 2 +- tools/perf/dlfilters/dlfilter-test-api-v2.c | 2 +- tools/perf/util/evsel.c | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-)
tools/perf/dlfilters/dlfilter-test-api-v0.c +1 -1
@@ -220,7 +220,7 @@ static int check_sample(struct filter_data *d, const struct perf_dlfilter_sampleCHECK_SAMPLE (raw_callchain_nr);CHECK (!sample->raw_callchain); -#define EVENT_NAME "branches:" +#define EVENT_NAME "branches"CHECK (!strncmp (sample->event,EVENT_NAME ,strlen (EVENT_NAME )));return 0 ;
tools/perf/dlfilters/dlfilter-test-api-v2.c +1 -1
@@ -235,7 +235,7 @@ static int check_sample(struct filter_data *d, const struct perf_dlfilter_sampleCHECK_SAMPLE (raw_callchain_nr);CHECK (!sample->raw_callchain); -#define EVENT_NAME "branches:" +#define EVENT_NAME "branches"CHECK (!strncmp (sample->event,EVENT_NAME ,strlen (EVENT_NAME )));return 0 ;
tools/perf/util/evsel.c +1 -4
@@ -517,7 +517,6 @@ static int evsel__add_modifiers(struct evsel *evsel, char *bf, size_t size) {int colon =0 , r =0 ;struct perf_event_attr *attr = &evsel->core.attr; -bool exclude_guest_default = false;#define MOD_PRINT (context, mod) do { \ if (!attr->exclude_##context) { \
@@ -529,17 +528,15 @@ static int evsel__add_modifiers(struct evsel *evsel, char *bf, size_t size)MOD_PRINT (kernel,'k' );MOD_PRINT (user,'u' );MOD_PRINT (hv,'h' ); - exclude_guest_default = true; }if (attr->precise_ip) {if (!colon) colon = ++r; r +=scnprintf (bf + r, size - r,"%.*s" , attr->precise_ip,"ppp" ); - exclude_guest_default = true; } -if (attr->exclude_host || attr->exclude_guest == exclude_guest_default) { +if (attr->exclude_host || attr->exclude_guest) {MOD_PRINT (host,'H' );MOD_PRINT (guest,'G' ); }
Signature · 1 line
2.47.0.rc1.288.g06298d1525-goog
Namhyung Kim
maintainerPATCH v5 4/9 perf tools: Do not set exclude_guest for precise_ip
In reply to Namhyung KimIt seems perf sets the exclude_guest bit because of Intel PEBS implementation which uses a virtual address. IIUC now kernel disables PEBS when it goes to the guest mode regardless of this bit so we don't need to set it explicitly. At least for the other archs/vendors.
I found the commit 1342798cc13e set the exclude_guest for precise_ip in the tool and the commit 20b279ddb38c added kernel side enforcement which was reverted by commit a706d965dcfd later.
Actually it doesn't set the exclude_guest for the default event (cycles:P) already.
$ grep -m1 vendor /proc/cpuinfo vendor_id : GenuineIntel
$ perf record -e cycles:P true [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.002 MB perf.data (9 samples) ]
$ perf evlist -v | tr ',' '\n' | grep -e exclude -e precise precise_ip: 3
But having lower 'p' modifier set the bit for some reason.
$ perf record -e cycles:pp true [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.002 MB perf.data (9 samples) ]
$ perf evlist -v | tr ',' '\n' | grep -e exclude -e precise precise_ip: 2 exclude_guest: 1
Actually AMD IBS suffers from this because it doesn't support excludes and having this bit effectively disables new features in the current implementation (due to the missing feature check).
$ grep -m1 vendor /proc/cpuinfo vendor_id : AuthenticAMD
$ perf record -W -e cycles:p -vv true 2>&1 | grep switching switching off PERF_FORMAT_LOST support switching off weight struct support switching off bpf_event switching off ksymbol switching off cloexec flag switching off mmap2 switching off exclude_guest, exclude_host
By not setting exclude_guest, we can fix this inconsistency and the troubles.
--- tools/perf/tests/parse-events.c | 12 ++++-------- tools/perf/util/parse-events.c | 4 ---- 2 files changed, 4 insertions(+), 12 deletions(-)
tools/perf/tests/parse-events.c +4 -8
@@ -898,8 +898,7 @@ static int test__group1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel);TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); -/* use of precise requires exclude_guest */ -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==2 );TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));
@@ -1016,9 +1015,8 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel);TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); -/* use of precise requires exclude_guest */ TEST_ASSERT_VAL ("wrong exclude guest" , - evsel->core.attr.exclude_guest); + !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong precise_ip",
@@ -1103,8 +1101,7 @@ static int test__group4(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel);TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); -/* use of precise requires exclude_guest */ -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==1 );TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);
@@ -1122,8 +1119,7 @@ static int test__group4(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel);TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); -/* use of precise requires exclude_guest */ -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==2 );TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));
tools/perf/util/parse-events.c +0 -4
@@ -1733,10 +1733,6 @@ static int parse_events__modifier_list(struct parse_events_state *parse_state,int exclude = eu | ek | eh;int exclude_GH = group ? evsel->exclude_GH :0 ; -if (mod.precise) { -/* use of precise requires exclude_guest */ - eG =1 ; - }if (mod.user) {if (!exclude) exclude = eu = ek = eh =1 ;
Signature · 1 line
2.47.0.rc1.288.g06298d1525-goog
Namhyung Kim
maintainerPATCH v5 5/9 perf tools: Detect missing kernel features properly
In reply to Namhyung KimThe evsel__detect_missing_features() is to check if the attributes of the evsel is supported or not. But it checks the attribute based on the given evsel, it might miss something if the attr doesn't have the bit or give incorrect results if the event is special.
Also it maintains the order of the feature that was added to the kernel which means it can assume older features should be supported once it detects the current feature is working. To minimized the confusion and to accurately check the kernel features, I think it's better to use a software event and go through all the features at once.
Also make the function static since it's only used in evsel.c.
--- tools/perf/util/evsel.c | 403 ++++++++++++++++++++++++++++++---------- tools/perf/util/evsel.h | 1 - tools/perf/util/pmu.h | 4 + 3 files changed, 307 insertions(+), 101 deletions(-)
tools/perf/util/evsel.c +303 -100
@@ -19,6 +19,7 @@#include <linux/zalloc.h> #include <sys/ioctl.h> #include <sys/resource.h> +#include <sys/syscall.h> #include <sys/types.h> #include <dirent.h> #include <stdlib.h>
@@ -1964,125 +1965,327 @@ int evsel__prepare_open(struct evsel *evsel, struct perf_cpu_map *cpus,return err; } -bool evsel__detect_missing_features (struct evsel *evsel) +static bool has_attr_feature (struct perf_event_attr *attr,unsigned long flags) { +int fd =syscall (SYS_perf_event_open, attr,/*pid=*/ 0 ,/*cpu=*/ -1 , +/*group_fd=*/ -1 , flags); +close (fd); + +if (fd <0 ) { + attr->exclude_kernel =1 ; + + fd =syscall (SYS_perf_event_open, attr,/*pid=*/ 0 ,/*cpu=*/ -1 , +/*group_fd=*/ -1 , flags); +close (fd); + } + +if (fd <0 ) { + attr->exclude_hv =1 ; + + fd =syscall (SYS_perf_event_open, attr,/*pid=*/ 0 ,/*cpu=*/ -1 , +/*group_fd=*/ -1 , flags); +close (fd); + } + +if (fd <0 ) { + attr->exclude_guest =1 ; + + fd =syscall (SYS_perf_event_open, attr,/*pid=*/ 0 ,/*cpu=*/ -1 , +/*group_fd=*/ -1 , flags); +close (fd); + } + + attr->exclude_kernel =0 ; + attr->exclude_guest =0 ; + attr->exclude_hv =0 ; + +return fd >=0 ; +} + +static void evsel__detect_missing_pmu_features (struct evsel *evsel) +{ +struct perf_event_attr attr = { + .type = evsel->core.attr.type, + .config = evsel->core.attr.config, + .disabled =1 , + }; +struct perf_pmu *pmu = evsel->pmu; +int old_errno; + + old_errno = errno; + +if (pmu ==NULL ) + pmu = evsel->pmu =evsel__find_pmu (evsel); + +if (pmu ==NULL || pmu->missing_features.checked) + goto out; +/* * Must probe features in the order they were added to the -* perf_event_attr interface. +* perf_event_attr interface. These are PMU specific limitation +* so we can detect with the given hardware event and stop on the +* first one succeeded. */ -if (!perf_missing_features.inherit_sample_read && - evsel->core.attr.inherit && (evsel->core.attr.sample_type &PERF_SAMPLE_READ )) { - perf_missing_features.inherit_sample_read = true; -pr_debug2 ("Using PERF_SAMPLE_READ / :S modifier is not compatible with inherit, falling back to no-inherit.\n" ); -return true; - }else if (!perf_missing_features.branch_counters && - (evsel->core.attr.branch_sample_type &PERF_SAMPLE_BRANCH_COUNTERS )) { - perf_missing_features.branch_counters = true; -pr_debug2 ("switching off branch counters support\n" ); + +/* Please add new feature detection here. */ + + attr.exclude_guest =1 ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + pmu->missing_features.exclude_guest = true; +pr_debug2 ("switching off exclude_guest for PMU %s\n" , pmu->name); + +found: + pmu->missing_features.checked = true; +out: + errno = old_errno; +} + +static void evsel__detect_missing_brstack_features (struct evsel *evsel) +{ +static bool detection_done = false; +struct perf_event_attr attr = { + .type = evsel->core.attr.type, + .config = evsel->core.attr.config, + .disabled =1 , + .sample_type =PERF_SAMPLE_BRANCH_STACK , + .sample_period =1000 , + }; +int old_errno; + +if (detection_done) +return ; + + old_errno = errno; + +/* +* Must probe features in the order they were added to the +* perf_event_attr interface. These are PMU specific limitation +* so we can detect with the given hardware event and stop on the +* first one succeeded. +*/ + +/* Please add new feature detection here. */ + + attr.branch_sample_type =PERF_SAMPLE_BRANCH_COUNTERS ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.branch_counters = true; +pr_debug2 ("switching off branch counters support\n" ); + + attr.branch_sample_type =PERF_SAMPLE_BRANCH_HW_INDEX ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.branch_hw_idx = true; +pr_debug2 ("switching off branch HW index support\n" ); + + attr.branch_sample_type =PERF_SAMPLE_BRANCH_NO_CYCLES |PERF_SAMPLE_BRANCH_NO_FLAGS ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.lbr_flags = true; +pr_debug2_peo ("switching off branch sample type no (cycles/flags)\n" ); + +found: + detection_done = true; + errno = old_errno; +} + +static bool evsel__detect_missing_features (struct evsel *evsel) +{ +static bool detection_done = false; +struct perf_event_attr attr = { + .type =PERF_TYPE_SOFTWARE , + .config =PERF_COUNT_SW_TASK_CLOCK , + .disabled =1 , + }; +int old_errno; + +evsel__detect_missing_pmu_features (evsel); + +if (evsel__has_br_stack (evsel)) +evsel__detect_missing_brstack_features (evsel); + +if (detection_done) + goto check; + + old_errno = errno; + +/* +* Must probe features in the order they were added to the +* perf_event_attr interface. These are kernel core limitation +* not PMU-specific so we can detect with a software event and +* stop on the first one succeeded. +*/ + +/* Please add new feature detection here. */ + + attr.inherit = true; + attr.sample_type =PERF_SAMPLE_READ ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.inherit_sample_read = true; +pr_debug2 ("Using PERF_SAMPLE_READ / :S modifier is not compatible with inherit, falling back to no-inherit.\n" ); + attr.inherit = false; + attr.sample_type =0 ; + + attr.read_format =PERF_FORMAT_LOST ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.read_lost = true; +pr_debug2 ("switching off PERF_FORMAT_LOST support\n" ); + attr.read_format =0 ; + + attr.sample_type =PERF_SAMPLE_WEIGHT_STRUCT ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.weight_struct = true; +pr_debug2 ("switching off weight struct support\n" ); + attr.sample_type =0 ; + + attr.sample_type =PERF_SAMPLE_CODE_PAGE_SIZE ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.code_page_size = true; +pr_debug2_peo ("Kernel has no PERF_SAMPLE_CODE_PAGE_SIZE support\n" ); + attr.sample_type =0 ; + + attr.sample_type =PERF_SAMPLE_DATA_PAGE_SIZE ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.data_page_size = true; +pr_debug2_peo ("Kernel has no PERF_SAMPLE_DATA_PAGE_SIZE support\n" ); + attr.sample_type =0 ; + + attr.cgroup =1 ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.cgroup = true; +pr_debug2_peo ("Kernel has no cgroup sampling support\n" ); + attr.cgroup =0 ; + + attr.aux_output =1 ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.aux_output = true; +pr_debug2_peo ("Kernel has no attr.aux_output support\n" ); + attr.aux_output =0 ; + + attr.bpf_event =1 ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.bpf = true; +pr_debug2_peo ("switching off bpf_event\n" ); + attr.bpf_event =0 ; + + attr.ksymbol =1 ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.ksymbol = true; +pr_debug2_peo ("switching off ksymbol\n" ); + attr.ksymbol =0 ; + + attr.write_backward =1 ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.write_backward = true; +pr_debug2_peo ("switching off write_backward\n" ); + attr.write_backward =0 ; + + attr.use_clockid =1 ; + attr.clockid =CLOCK_MONOTONIC ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.clockid = true; +pr_debug2_peo ("switching off clockid\n" ); + attr.use_clockid =0 ; + attr.clockid =0 ; + +if (has_attr_feature (&attr,/*flags=*/ PERF_FLAG_FD_CLOEXEC )) + goto found; + perf_missing_features.cloexec = true; +pr_debug2_peo ("switching off cloexec flag\n" ); + + attr.mmap2 =1 ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.mmap2 = true; +pr_debug2_peo ("switching off mmap2\n" ); + attr.mmap2 =0 ; + +/* set this unconditionally? */ + perf_missing_features.sample_id_all = true; +pr_debug2_peo ("switching off sample_id_all\n" ); + + attr.inherit =1 ; + attr.read_format =PERF_FORMAT_GROUP ; +if (has_attr_feature (&attr,/*flags=*/ 0 )) + goto found; + perf_missing_features.group_read = true; +pr_debug2_peo ("switching off group read\n" ); + attr.inherit =0 ; + attr.read_format =0 ; + +found: + detection_done = true; + errno = old_errno; + +check: +if (evsel->core.attr.inherit && + (evsel->core.attr.sample_type &PERF_SAMPLE_READ ) && + perf_missing_features.inherit_sample_read)return true; - }else if (!perf_missing_features.read_lost && - (evsel->core.attr.read_format &PERF_FORMAT_LOST )) { - perf_missing_features.read_lost = true; -pr_debug2 ("switching off PERF_FORMAT_LOST support\n" ); + +if ((evsel->core.attr.branch_sample_type &PERF_SAMPLE_BRANCH_COUNTERS ) && + perf_missing_features.branch_counters)return true; - }else if (!perf_missing_features.weight_struct && - (evsel->core.attr.sample_type &PERF_SAMPLE_WEIGHT_STRUCT )) { - perf_missing_features.weight_struct = true; -pr_debug2 ("switching off weight struct support\n" ); + +if ((evsel->core.attr.read_format &PERF_FORMAT_LOST ) && + perf_missing_features.read_lost)return true; - }else if (!perf_missing_features.code_page_size && - (evsel->core.attr.sample_type &PERF_SAMPLE_CODE_PAGE_SIZE )) { - perf_missing_features.code_page_size = true; -pr_debug2_peo ("Kernel has no PERF_SAMPLE_CODE_PAGE_SIZE support, bailing out\n" ); -return false; - }else if (!perf_missing_features.data_page_size && - (evsel->core.attr.sample_type &PERF_SAMPLE_DATA_PAGE_SIZE )) { - perf_missing_features.data_page_size = true; -pr_debug2_peo ("Kernel has no PERF_SAMPLE_DATA_PAGE_SIZE support, bailing out\n" ); -return false; - }else if (!perf_missing_features.cgroup && evsel->core.attr.cgroup) { - perf_missing_features.cgroup = true; -pr_debug2_peo ("Kernel has no cgroup sampling support, bailing out\n" ); -return false; - }else if (!perf_missing_features.branch_hw_idx && - (evsel->core.attr.branch_sample_type &PERF_SAMPLE_BRANCH_HW_INDEX )) { - perf_missing_features.branch_hw_idx = true; -pr_debug2 ("switching off branch HW index support\n" ); + +if ((evsel->core.attr.sample_type &PERF_SAMPLE_WEIGHT_STRUCT ) && + perf_missing_features.weight_struct)return true; - }else if (!perf_missing_features.aux_output && evsel->core.attr.aux_output) { - perf_missing_features.aux_output = true; -pr_debug2_peo ("Kernel has no attr.aux_output support, bailing out\n" ); -return false; - }else if (!perf_missing_features.bpf && evsel->core.attr.bpf_event) { - perf_missing_features.bpf = true; -pr_debug2_peo ("switching off bpf_event\n" ); + +if (evsel->core.attr.use_clockid && evsel->core.attr.clockid !=CLOCK_MONOTONIC && + !perf_missing_features.clockid) { + perf_missing_features.clockid_wrong = true;return true; - }else if (!perf_missing_features.ksymbol && evsel->core.attr.ksymbol) { - perf_missing_features.ksymbol = true; -pr_debug2_peo ("switching off ksymbol\n" ); + } + +if (evsel->core.attr.use_clockid && perf_missing_features.clockid)return true; - }else if (!perf_missing_features.write_backward && evsel->core.attr.write_backward) { - perf_missing_features.write_backward = true; -pr_debug2_peo ("switching off write_backward\n" ); -return false; - }else if (!perf_missing_features.clockid_wrong && evsel->core.attr.use_clockid) { - perf_missing_features.clockid_wrong = true; -pr_debug2_peo ("switching off clockid\n" ); + +if ((evsel->open_flags &PERF_FLAG_FD_CLOEXEC ) && + perf_missing_features.cloexec)return true; - }else if (!perf_missing_features.clockid && evsel->core.attr.use_clockid) { - perf_missing_features.clockid = true; -pr_debug2_peo ("switching off use_clockid\n" ); + +if (evsel->core.attr.mmap2 && perf_missing_features.mmap2)return true; - }else if (!perf_missing_features.cloexec && (evsel->open_flags &PERF_FLAG_FD_CLOEXEC )) { - perf_missing_features.cloexec = true; -pr_debug2_peo ("switching off cloexec flag\n" ); + +if ((evsel->core.attr.branch_sample_type & (PERF_SAMPLE_BRANCH_NO_FLAGS | +PERF_SAMPLE_BRANCH_NO_CYCLES )) && + perf_missing_features.lbr_flags)return true; - }else if (!perf_missing_features.mmap2 && evsel->core.attr.mmap2) { - perf_missing_features.mmap2 = true; -pr_debug2_peo ("switching off mmap2\n" ); + +if (evsel->core.attr.inherit && (evsel->core.attr.read_format &PERF_FORMAT_GROUP ) && + perf_missing_features.group_read)return true; - }else if (evsel->core.attr.exclude_guest || evsel->core.attr.exclude_host) { -if (evsel->pmu ==NULL ) - evsel->pmu =evsel__find_pmu (evsel); - -if (evsel->pmu) - evsel->pmu->missing_features.exclude_guest = true; -else { -/* we cannot find PMU, disable attrs now */ - evsel->core.attr.exclude_host = false; - evsel->core.attr.exclude_guest = false; - } -if (evsel->exclude_GH) { -pr_debug2_peo ("PMU has no exclude_host/guest support, bailing out\n" ); -return false; - } -if (!perf_missing_features.exclude_guest) { - perf_missing_features.exclude_guest = true; -pr_debug2_peo ("switching off exclude_guest, exclude_host\n" ); - } +if (evsel->core.attr.ksymbol && perf_missing_features.ksymbol)return true; - }else if (!perf_missing_features.sample_id_all) { - perf_missing_features.sample_id_all = true; -pr_debug2_peo ("switching off sample_id_all\n" ); + +if (evsel->core.attr.bpf_event && perf_missing_features.bpf)return true; - }else if (!perf_missing_features.lbr_flags && - (evsel->core.attr.branch_sample_type & - (PERF_SAMPLE_BRANCH_NO_CYCLES | -PERF_SAMPLE_BRANCH_NO_FLAGS ))) { - perf_missing_features.lbr_flags = true; -pr_debug2_peo ("switching off branch sample type no (cycles/flags)\n" ); + +if ((evsel->core.attr.branch_sample_type &PERF_SAMPLE_BRANCH_HW_INDEX ) && + perf_missing_features.branch_hw_idx)return true; - }else if (!perf_missing_features.group_read && - evsel->core.attr.inherit && - (evsel->core.attr.read_format &PERF_FORMAT_GROUP ) && -evsel__is_group_leader (evsel)) { - perf_missing_features.group_read = true; -pr_debug2_peo ("switching off group read\n" ); + +if (evsel->core.attr.sample_id_all && perf_missing_features.sample_id_all)return true; - }else { -return false; - } + +return false; } static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus,
tools/perf/util/evsel.h +0 -1
@@ -343,7 +343,6 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus,void evsel__close (struct evsel *evsel);int evsel__prepare_open (struct evsel *evsel,struct perf_cpu_map *cpus,struct perf_thread_map *threads); -bool evsel__detect_missing_features (struct evsel *evsel);bool evsel__precise_ip_fallback (struct evsel *evsel);
tools/perf/util/pmu.h +4 -0
@@ -170,6 +170,10 @@ struct perf_pmu {* exclude_host. */ bool exclude_guest; +/** +* @checked: Are the missing features checked? +*/ +bool checked; } missing_features;/**
Signature · 1 line
2.47.0.rc1.288.g06298d1525-goog
Namhyung Kim
maintainerPATCH v5 6/9 perf tools: Move x86__is_amd_cpu() to util/env.c
In reply to Namhyung KimIt can be called from non-x86 platform so let's move it to the general util directory. Also add a new helper perf_env__is_x86_amd_cpu() so that it can be called with an existing perf_env as well.
--- tools/perf/arch/x86/util/Build | 1 - tools/perf/arch/x86/util/env.c | 19 ------------------- tools/perf/arch/x86/util/env.h | 7 ------- tools/perf/arch/x86/util/pmu.c | 2 +- tools/perf/util/env.c | 23 +++++++++++++++++++++++ tools/perf/util/env.h | 4 ++++ 6 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 tools/perf/arch/x86/util/env.c delete mode 100644 tools/perf/arch/x86/util/env.h
tools/perf/arch/x86/util/Build +0 -1
@@ -10,7 +10,6 @@ perf-util-y += evlist.o perf-util-y += mem-events.o perf-util-y += evsel.o perf-util-y += iostat.o -perf-util-y += env.o perf-util-$(CONFIG_DWARF) += dwarf-regs.o perf-util-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o
tools/perf/arch/x86/util/env.c deleted +0 -19
@@ -1,19 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include "linux/string.h" -#include "util/env.h" -#include "env.h" - -bool x86__is_amd_cpu (void ) -{ -struct perf_env env = { .total_mem =0 , }; -static int is_amd;/* 0: Uninitialized, 1: Yes, -1: No */ - -if (is_amd) - goto ret; - -perf_env__cpuid (&env); - is_amd = env.cpuid &&strstarts (env.cpuid,"AuthenticAMD" ) ?1 :-1 ; -perf_env__exit (&env); -ret: -return is_amd >=1 ? true : false; -}
tools/perf/arch/x86/util/env.h deleted +0 -7
@@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _X86_ENV_H -#define _X86_ENV_H - -bool x86__is_amd_cpu (void ); - -#endif /* _X86_ENV_H */
tools/perf/arch/x86/util/pmu.c +1 -1
@@ -16,7 +16,7 @@#include "../../../util/fncache.h" #include "../../../util/pmus.h" #include "mem-events.h" -#include "env.h" +#include "util/env.h" void perf_pmu__arch_init (struct perf_pmu *pmu__maybe_unused ) {
tools/perf/util/env.c +23 -0
@@ -5,6 +5,7 @@#include "util/header.h" #include "linux/compiler.h" #include <linux/ctype.h> +#include <linux/string.h> #include <linux/zalloc.h> #include "cgroup.h" #include <errno.h>
@@ -639,3 +640,25 @@ void perf_env__find_br_cntr_info(struct perf_env *env, env->pmu_caps->br_cntr_width; } } + +bool perf_env__is_x86_amd_cpu (struct perf_env *env) +{ +static int is_amd;/* 0: Uninitialized, 1: Yes, -1: No */ + +if (is_amd ==0 ) + is_amd = env->cpuid &&strstarts (env->cpuid,"AuthenticAMD" ) ?1 :-1 ; + +return is_amd >=1 ? true : false; +} + +bool x86__is_amd_cpu (void ) +{ +struct perf_env env = { .total_mem =0 , }; +bool is_amd; + +perf_env__cpuid (&env); + is_amd =perf_env__is_x86_amd_cpu (&env); +perf_env__exit (&env); + +return is_amd; +}
tools/perf/util/env.h +4 -0
@@ -195,4 +195,8 @@ bool perf_env__has_pmu_mapping(struct perf_env *env, const char *pmu_name);void perf_env__find_br_cntr_info (struct perf_env *env,unsigned int *nr,unsigned int *width); + +bool x86__is_amd_cpu (void ); +bool perf_env__is_x86_amd_cpu (struct perf_env *env); +#endif /* __PERF_ENV_H */
Signature · 1 line
2.47.0.rc1.288.g06298d1525-goog
Namhyung Kim
maintainerPATCH v5 7/9 perf tools: Check fallback error and order
In reply to Namhyung KimThe perf_event_open might fail due to various reasons, so blindly reducing precise_ip level might not be the best way to deal with it.
It seems the kernel return -EOPNOTSUPP when PMU doesn't support the given precise level. Let's try again with the correct error code.
This caused a problem on AMD, as it stops on precise_ip of 2 for IBS but user events with exclude_kernel=1 cannot make progress. Let's add the evsel__handle_error_quirks() to this case specially. I plan to work on the kernel side to improve this situation but it'd still need some special handling for IBS.
--- tools/perf/util/evsel.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-)
tools/perf/util/evsel.c +29 -9
@@ -2060,9 +2060,9 @@ static void evsel__detect_missing_brstack_features(struct evsel *evsel)/* * Must probe features in the order they were added to the -* perf_event_attr interface. These are PMU specific limitation -* so we can detect with the given hardware event and stop on the -* first one succeeded. +* perf_event_attr interface. These are kernel core limitation but +* specific to PMUs with branch stack. So we can detect with the given +* hardware event and stop on the first one succeeded. */ /* Please add new feature detection here. */
@@ -2288,6 +2288,25 @@ static bool evsel__detect_missing_features(struct evsel *evsel)return false; } +static bool evsel__handle_error_quirks (struct evsel *evsel,int error) +{ +/* +* AMD core PMU tries to forward events with precise_ip to IBS PMU +* implicitly. But IBS PMU has more restrictions so it can fail with +* supported event attributes. Let's forward it back to the core PMU +* by clearing precise_ip only if it's from precise_max (:P). +*/ +if ((error == -EINVAL || error == -ENOENT ) &&x86__is_amd_cpu () && + evsel->core.attr.precise_ip && evsel->precise_max) { + evsel->core.attr.precise_ip =0 ; +pr_debug2_peo ("removing precise_ip on AMD\n" ); +display_attr (&evsel->core.attr); +return true; + } + +return false; +} +static int evsel__open_cpu (struct evsel *evsel,struct perf_cpu_map *cpus,struct perf_thread_map *threads,int start_cpu_map_idx,int end_cpu_map_idx)
@@ -2408,9 +2427,6 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus,return 0 ; try_fallback: -if (evsel__precise_ip_fallback (evsel)) - goto retry_open; -if (evsel__ignore_missing_thread (evsel,perf_cpu_map__nr (cpus), idx, threads, thread, err)) {/* We just removed 1 thread, so lower the upper nthreads limit. */
@@ -2427,11 +2443,15 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus,if (err == -EMFILE &&rlimit__increase_nofile (&set_rlimit)) goto retry_open; -if (err != -EINVAL || idx >0 || thread >0 ) - goto out_close; +if (err == -EOPNOTSUPP &&evsel__precise_ip_fallback (evsel)) + goto retry_open; -if (evsel__detect_missing_features (evsel)) +if (err == -EINVAL &&evsel__detect_missing_features (evsel)) goto fallback_missing_features; + +if (evsel__handle_error_quirks (evsel, err)) + goto retry_open; + out_close:if (err) threads->err_thread = thread;
Signature · 1 line
2.47.0.rc1.288.g06298d1525-goog
Namhyung Kim
maintainerPATCH v5 8/9 perf record: Just use "cycles:P" as the default event
In reply to Namhyung KimThe fallback logic can add ":u" modifier if needed.
--- tools/perf/builtin-record.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
tools/perf/builtin-record.c +1 -3
@@ -4157,9 +4157,7 @@ int cmd_record(int argc, const char **argv) record.opts.tail_synthesize = true;if (rec->evlist->core.nr_entries ==0 ) { -bool can_profile_kernel =perf_event_paranoid_check (1 ); - - err =parse_event (rec->evlist, can_profile_kernel ?"cycles:P" :"cycles:Pu" ); + err =parse_event (rec->evlist,"cycles:P" );if (err) goto out; }
Signature · 1 line
2.47.0.rc1.288.g06298d1525-goog
Namhyung Kim
maintainerPATCH v5 9/9 perf test: Add precise_max subtest to the perf record shell test
In reply to Namhyung KimIt's a very simply test just to run with cycles:P and instructions:P events.
--- tools/perf/tests/shell/record.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
tools/perf/tests/shell/record.sh +25 -0
@@ -271,6 +271,30 @@ test_topdown_leader_sampling() { echo "Topdown leader sampling test [Success]" } +test_precise_max() { + echo "precise_max attribute test" + if ! perf stat -e "cycles,instructions" true 2> /dev/null + then + echo "precise_max attribute [Skipped no hardware events]" + return + fi + # Just to make sure it doesn't fail + if ! perf record -o "${perfdata}" -e "cycles:P" true 2> /dev/null + then + echo "precise_max attribute [Failed cycles:P event]" + err=1 + return + fi + # On AMD, cycles and instructions events are treated differently + if ! perf record -o "${perfdata}" -e "instructions:P" true 2> /dev/null + then + echo "precise_max attribute [Failed instructions:P event]" + err=1 + return + fi + echo "precise_max attribute test [Success]" +} + # raise the limit of file descriptors to minimum if [[ $default_fd_limit -lt $min_fd_limit ]]; then ulimit -Sn $min_fd_limit
@@ -284,6 +308,7 @@ test_branch_counter test_cgroup test_leader_sampling test_topdown_leader_sampling +test_precise_max # restore the default value ulimit -Sn $default_fd_limit
Signature · 1 line
2.47.0.rc1.288.g06298d1525-goog
Quoted 11 lines · Namhyung Kim
Hello,
I found perf tools set
exclude_guestbit inconsistently. It used to set the bit but now the default event for perf record doesn't. So I'm wondering why we want the bit in the first place.Actually it's not good for PMUs don't support any exclusion like AMD IBS because it disables new features after the
exclude_guestdue to the missing feature detection logic.[...]
Applied to perf-tools-next, thanks!
Best regards,
Namhyung