From: Stephane Eranian <eranian@google.com>
To: linux-kernel@vger.kernel.org
Cc: peterz@infradead.org, kim.phillips@amd.com, acme@redhat.com,
jolsa@redhat.com, songliubraving@fb.com, rafael@kernel.org,
ravi.bangoria@amd.com, sandipan.das@amd.com
Subject: [PATCH v7 12/13] perf tools: Improve error handling of AMD Branch Sampling
Date: Tue, 22 Mar 2022 15:15:16 -0700 [thread overview]
Message-ID: <20220322221517.2510440-13-eranian@google.com> (raw)
In-Reply-To: <20220322221517.2510440-1-eranian@google.com>
Improve the error message printed by perf when perf_event_open() fails on
AMD Zen3 when using the branch sampling feature. In the case of EINVAL, there
are two main reasons: frequency mode or period is smaller than the depth of
the branch sampling buffer (16). The patch checks the parameters of the call
and tries to print a relevant message to explain the error:
$ perf record -b -e cpu/branch-brs/ -c 10 ls
Error:
AMD Branch Sampling does not support sampling period smaller than what is reported in /sys/devices/cpu/caps/branches.
$ perf record -b -e cpu/branch-brs/ ls
Error:
AMD Branch Sampling does not support frequency mode sampling, must pass a fixed sampling period via -c option or cpu/branch-brs,period=xxxx/.
Signed-off-by: Stephane Eranian <eranian@google.com>
[Rebased on commit 9fe8895a27a84 ("perf env: Add perf_env__cpuid, perf_env__{nr_}pmu_mappings")]
Signed-off-by: Kim Phillips <kim.phillips@amd.com>
---
tools/perf/util/evsel.c | 43 ++++++++++++++++++++++++++++++-----------
1 file changed, 32 insertions(+), 11 deletions(-)
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index e8ff7a4bd490..03f720a85764 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -2858,6 +2858,16 @@ static bool is_amd_ibs(struct evsel *evsel)
|| (evsel->pmu_name && !strncmp(evsel->pmu_name, "ibs", 3));
}
+static bool is_amd_brs_event(struct evsel *evsel)
+{
+ return (evsel->core.attr.config & 0xff) == 0xc4;
+}
+
+static bool has_amd_brs(struct evsel *evsel)
+{
+ return (evsel->core.attr.sample_type & PERF_SAMPLE_BRANCH_STACK);
+}
+
int evsel__open_strerror(struct evsel *evsel, struct target *target,
int err, char *msg, size_t size)
{
@@ -2947,6 +2957,28 @@ int evsel__open_strerror(struct evsel *evsel, struct target *target,
"We found oprofile daemon running, please stop it and try again.");
break;
case EINVAL:
+ if (is_amd(arch, cpuid)) {
+ if (is_amd_ibs(evsel)) {
+ if (evsel->core.attr.exclude_kernel)
+ return scnprintf(msg, size,
+ "AMD IBS can't exclude kernel events. Try running at a higher privilege level.");
+ if (!evsel->core.system_wide)
+ return scnprintf(msg, size,
+ "AMD IBS may only be available in system-wide/per-cpu mode. Try using -a, or -C and workload affinity");
+ }
+ if (has_amd_brs(evsel)) {
+ if (!is_amd_brs_event(evsel))
+ return scnprintf(msg, size,
+ "AMD Branch Sampling can only be used with the cpu/branch-brs,period=xxxx/ event or equivalent encodings.");
+ if (evsel->core.attr.freq)
+ return scnprintf(msg, size,
+ "AMD Branch Sampling does not support frequency mode sampling, must pass a fixed sampling period via -c option or cpu/branch-brs,period=xxxx/.");
+ /* another reason is that the period is too small */
+ return scnprintf(msg, size,
+ "AMD Branch Sampling does not support sampling period smaller than what is reported in /sys/devices/cpu/caps/branches.");
+ }
+ }
+
if (evsel->core.attr.sample_type & PERF_SAMPLE_CODE_PAGE_SIZE && perf_missing_features.code_page_size)
return scnprintf(msg, size, "Asking for the code page size isn't supported by this kernel.");
if (evsel->core.attr.sample_type & PERF_SAMPLE_DATA_PAGE_SIZE && perf_missing_features.data_page_size)
@@ -2963,17 +2995,6 @@ int evsel__open_strerror(struct evsel *evsel, struct target *target,
return scnprintf(msg, size,
"Invalid event (%s) in per-thread mode, enable system wide with '-a'.",
evsel__name(evsel));
- if (is_amd(arch, cpuid)) {
- if (is_amd_ibs(evsel)) {
- if (evsel->core.attr.exclude_kernel)
- return scnprintf(msg, size,
- "AMD IBS can't exclude kernel events. Try running at a higher privilege level.");
- if (!evsel->core.system_wide)
- return scnprintf(msg, size,
- "AMD IBS may only be available in system-wide/per-cpu mode. Try using -a, or -C and workload affinity");
- }
- }
-
break;
case ENODATA:
return scnprintf(msg, size, "Cannot collect data source with the load latency event alone. "
--
2.35.1.894.gb6a874cedc-goog
next prev parent reply other threads:[~2022-03-22 22:16 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-22 22:15 [PATCH v7 00/13] perf/x86/amd: Add AMD Fam19h Branch Sampling support Stephane Eranian
2022-03-22 22:15 ` [PATCH v7 01/13] perf/core: add perf_clear_branch_entry_bitfields() helper Stephane Eranian
2022-04-05 8:36 ` [tip: perf/core] perf/core: Add " tip-bot2 for Stephane Eranian
2022-03-22 22:15 ` [PATCH v7 02/13] x86/cpufeatures: add AMD Fam19h Branch Sampling feature Stephane Eranian
2022-04-05 8:36 ` [tip: perf/core] x86/cpufeatures: Add " tip-bot2 for Stephane Eranian
2022-03-22 22:15 ` [PATCH v7 03/13] perf/x86/amd: add AMD Fam19h Branch Sampling support Stephane Eranian
2022-04-05 8:36 ` [tip: perf/core] perf/x86/amd: Add " tip-bot2 for Stephane Eranian
2022-03-22 22:15 ` [PATCH v7 04/13] perf/x86/amd: add branch-brs helper event for Fam19h BRS Stephane Eranian
2022-04-05 8:36 ` [tip: perf/core] perf/x86/amd: Add " tip-bot2 for Stephane Eranian
2022-03-22 22:15 ` [PATCH v7 05/13] perf/x86/amd: enable branch sampling priv level filtering Stephane Eranian
2022-04-05 8:36 ` [tip: perf/core] perf/x86/amd: Enable " tip-bot2 for Stephane Eranian
2022-03-22 22:15 ` [PATCH v7 06/13] perf/x86/amd: add AMD branch sampling period adjustment Stephane Eranian
2022-04-05 8:36 ` [tip: perf/core] perf/x86/amd: Add " tip-bot2 for Stephane Eranian
2022-03-22 22:15 ` [PATCH v7 07/13] perf/x86/amd: make Zen3 branch sampling opt-in Stephane Eranian
2022-04-05 8:36 ` [tip: perf/core] perf/x86/amd: Make " tip-bot2 for Stephane Eranian
2022-03-22 22:15 ` [PATCH v7 08/13] ACPI: add perf low power callback Stephane Eranian
2022-04-05 8:36 ` [tip: perf/core] ACPI: Add " tip-bot2 for Stephane Eranian
2022-03-22 22:15 ` [PATCH v7 09/13] perf/x86/amd: add idle hooks for branch sampling Stephane Eranian
2022-04-05 8:36 ` [tip: perf/core] perf/x86/amd: Add " tip-bot2 for Stephane Eranian
2022-03-22 22:15 ` [PATCH v7 10/13] perf tools: fix NULL point in evsel__env() Stephane Eranian
2022-03-23 19:01 ` Kim Phillips
2022-03-25 18:27 ` Arnaldo Carvalho de Melo
2022-03-25 20:02 ` Stephane Eranian
2022-03-22 22:15 ` [PATCH v7 11/13] perf tools: Improve IBS error handling Stephane Eranian
2022-03-25 21:46 ` Arnaldo Carvalho de Melo
2022-03-25 21:53 ` Arnaldo Carvalho de Melo
2022-03-22 22:15 ` Stephane Eranian [this message]
2022-03-22 22:15 ` [PATCH v7 13/13] perf report: add addr_from/addr_to sort dimensions Stephane Eranian
2022-03-24 14:59 ` [PATCH v7 00/13] perf/x86/amd: Add AMD Fam19h Branch Sampling support Peter Zijlstra
2022-03-25 5:31 ` Stephane Eranian
2022-03-25 8:28 ` Peter Zijlstra
2022-03-29 21:58 ` Stephane Eranian
2022-03-29 23:47 ` Stephane Eranian
2022-03-30 11:01 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220322221517.2510440-13-eranian@google.com \
--to=eranian@google.com \
--cc=acme@redhat.com \
--cc=jolsa@redhat.com \
--cc=kim.phillips@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rafael@kernel.org \
--cc=ravi.bangoria@amd.com \
--cc=sandipan.das@amd.com \
--cc=songliubraving@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®