This is a note to let you know that I've just added the patch titled
perf test shell stat_bpf_counters: Fix test on Intel
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
perf-test-shell-stat_bpf_counters-fix-test-on-intel.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 68ca249c964f520af7f8763e22f12bd26b57b870 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@xxxxxxxxxx>
Date: Fri, 25 Aug 2023 09:41:51 -0700
Subject: perf test shell stat_bpf_counters: Fix test on Intel
From: Namhyung Kim <namhyung@xxxxxxxxxx>
commit 68ca249c964f520af7f8763e22f12bd26b57b870 upstream.
As of now, bpf counters (bperf) don't support event groups. But the
default perf stat includes topdown metrics if supported (on recent Intel
machines) which require groups. That makes perf stat exiting.
$ sudo perf stat --bpf-counter true
bpf managed perf events do not yet support groups.
Actually the test explicitly uses cycles event only, but it missed to
pass the option when it checks the availability of the command.
Fixes: 2c0cb9f56020d2ea ("perf test: Add a shell test for 'perf stat --bpf-counters' new option")
Reviewed-by: Song Liu <song@xxxxxxxxxx>
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Cc: Ian Rogers <irogers@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: bpf@xxxxxxxxxxxxxxx
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/r/20230825164152.165610-2-namhyung@xxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/perf/tests/shell/stat_bpf_counters.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/tools/perf/tests/shell/stat_bpf_counters.sh
+++ b/tools/perf/tests/shell/stat_bpf_counters.sh
@@ -22,10 +22,10 @@ compare_number()
}
# skip if --bpf-counters is not supported
-if ! perf stat --bpf-counters true > /dev/null 2>&1; then
+if ! perf stat -e cycles --bpf-counters true > /dev/null 2>&1; then
if [ "$1" = "-v" ]; then
echo "Skipping: --bpf-counters not supported"
- perf --no-pager stat --bpf-counters true || true
+ perf --no-pager stat -e cycles --bpf-counters true || true
fi
exit 2
fi
Patches currently in stable-queue which might be from namhyung@xxxxxxxxxx are
queue-6.1/perf-hists-browser-fix-the-number-of-entries-for-e-key.patch
queue-6.1/perf-test-stat_bpf_counters_cgrp-fix-shellcheck-issu.patch
queue-6.1/perf-tools-handle-old-data-in-perf_record_attr.patch
queue-6.1/perf-test-stat_bpf_counters_cgrp-enhance-perf-stat-c.patch
queue-6.1/perf-hists-browser-fix-hierarchy-mode-header.patch
queue-6.1/perf-build-update-build-rule-for-generated-files.patch
queue-6.1/perf-top-don-t-pass-an-err_ptr-directly-to-perf_sess.patch
queue-6.1/perf-annotate-bpf-don-t-enclose-non-debug-code-with-.patch
queue-6.1/perf-trace-really-free-the-evsel-priv-area.patch
queue-6.1/perf-test-shell-stat_bpf_counters-fix-test-on-intel.patch
queue-6.1/perf-vendor-events-drop-stores_per_inst-metric-event.patch
queue-6.1/perf-vendor-events-drop-some-of-the-json-events-for-.patch
queue-6.1/perf-vendor-events-update-the-json-events-descriptio.patch
