| From a7783676c60dd90a6f4c26bcb9be03dc5703b74e Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Mon, 13 Apr 2020 11:25:32 -0700 |
| Subject: [PATCH 1/2] Revert "selftests/bpf: Skip perf hw events test if the |
| setup disabled it" |
| |
| This reverts commit da43712a7262891317883d4b3a909fb18dac4b1d. |
| --- |
| .../selftests/bpf/prog_tests/stacktrace_build_id_nmi.c | 8 ++------ |
| 1 file changed, 2 insertions(+), 6 deletions(-) |
| |
| diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c |
| index 1735faf17536..f62aa0eb959b 100644 |
| --- a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c |
| +++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c |
| @@ -49,12 +49,8 @@ void test_stacktrace_build_id_nmi(void) |
| pmu_fd = syscall(__NR_perf_event_open, &attr, -1 /* pid */, |
| 0 /* cpu 0 */, -1 /* group id */, |
| 0 /* flags */); |
| - if (pmu_fd < 0 && errno == ENOENT) { |
| - printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n", __func__); |
| - test__skip(); |
| - goto cleanup; |
| - } |
| - if (CHECK(pmu_fd < 0, "perf_event_open", "err %d errno %d\n", |
| + if (CHECK(pmu_fd < 0, "perf_event_open", |
| + "err %d errno %d. Does the test host support PERF_COUNT_HW_CPU_CYCLES?\n", |
| pmu_fd, errno)) |
| goto close_prog; |
| |
| -- |
| 2.26.0 |
| |