Skip to content

Commit af954f7

Browse files
committed
perf tools: Check fallback error and order
The 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. Reviewed-by: James Clark <james.clark@linaro.org> Reviewed-by: Ravi Bangoria <ravi.bangoria@amd.com> Acked-by: Kan Liang <kan.liang@linux.intel.com> Cc: James Clark <james.clark@arm.com> Cc: Atish Patra <atishp@atishpatra.org> Cc: Mingwei Zhang <mizhang@google.com> Cc: Kajol Jain <kjain@linux.ibm.com> Cc: Thomas Richter <tmricht@linux.ibm.com> Cc: Palmer Dabbelt <palmer@rivosinc.com> Link: https://lore.kernel.org/r/20241016062359.264929-8-namhyung@kernel.org Signed-off-by: Namhyung Kim <namhyung@kernel.org>
1 parent 28398ce commit af954f7

File tree

1 file changed

+29
-9
lines changed

1 file changed

+29
-9
lines changed

tools/perf/util/evsel.c

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2143,9 +2143,9 @@ static void evsel__detect_missing_pmu_features(struct evsel *evsel)
21432143

21442144
/*
21452145
* Must probe features in the order they were added to the
2146-
* perf_event_attr interface. These are PMU specific limitation
2147-
* so we can detect with the given hardware event and stop on the
2148-
* first one succeeded.
2146+
* perf_event_attr interface. These are kernel core limitation but
2147+
* specific to PMUs with branch stack. So we can detect with the given
2148+
* hardware event and stop on the first one succeeded.
21492149
*/
21502150

21512151
/* Please add new feature detection here. */
@@ -2409,6 +2409,25 @@ static bool evsel__detect_missing_features(struct evsel *evsel)
24092409
return false;
24102410
}
24112411

2412+
static bool evsel__handle_error_quirks(struct evsel *evsel, int error)
2413+
{
2414+
/*
2415+
* AMD core PMU tries to forward events with precise_ip to IBS PMU
2416+
* implicitly. But IBS PMU has more restrictions so it can fail with
2417+
* supported event attributes. Let's forward it back to the core PMU
2418+
* by clearing precise_ip only if it's from precise_max (:P).
2419+
*/
2420+
if ((error == -EINVAL || error == -ENOENT) && x86__is_amd_cpu() &&
2421+
evsel->core.attr.precise_ip && evsel->precise_max) {
2422+
evsel->core.attr.precise_ip = 0;
2423+
pr_debug2_peo("removing precise_ip on AMD\n");
2424+
display_attr(&evsel->core.attr);
2425+
return true;
2426+
}
2427+
2428+
return false;
2429+
}
2430+
24122431
static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus,
24132432
struct perf_thread_map *threads,
24142433
int start_cpu_map_idx, int end_cpu_map_idx)
@@ -2527,9 +2546,6 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus,
25272546
return 0;
25282547

25292548
try_fallback:
2530-
if (evsel__precise_ip_fallback(evsel))
2531-
goto retry_open;
2532-
25332549
if (evsel__ignore_missing_thread(evsel, perf_cpu_map__nr(cpus),
25342550
idx, threads, thread, err)) {
25352551
/* We just removed 1 thread, so lower the upper nthreads limit. */
@@ -2546,11 +2562,15 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus,
25462562
if (err == -EMFILE && rlimit__increase_nofile(&set_rlimit))
25472563
goto retry_open;
25482564

2549-
if (err != -EINVAL || idx > 0 || thread > 0)
2550-
goto out_close;
2565+
if (err == -EOPNOTSUPP && evsel__precise_ip_fallback(evsel))
2566+
goto retry_open;
25512567

2552-
if (evsel__detect_missing_features(evsel))
2568+
if (err == -EINVAL && evsel__detect_missing_features(evsel))
25532569
goto fallback_missing_features;
2570+
2571+
if (evsel__handle_error_quirks(evsel, err))
2572+
goto retry_open;
2573+
25542574
out_close:
25552575
if (err)
25562576
threads->err_thread = thread;

0 commit comments

Comments
 (0)