| From 070ec557d832788092e2f5a573115b4c2be38290 Mon Sep 17 00:00:00 2001 |
| From: Hangbin Liu <liuhangbin@gmail.com> |
| Date: Fri, 17 Jan 2020 18:06:56 +0800 |
| Subject: [PATCH] selftests/bpf: Skip perf hw events test if the setup disabled |
| it |
| |
| commit f1c3656c6d9c147d07d16614455aceb34932bdeb upstream. |
| |
| The same with commit 4e59afbbed96 ("selftests/bpf: skip nmi test when perf |
| hw events are disabled"), it would make more sense to skip the |
| test_stacktrace_build_id_nmi test if the setup (e.g. virtual machines) has |
| disabled hardware perf events. |
| |
| Fixes: 13790d1cc72c ("bpf: add selftest for stackmap with build_id in NMI context") |
| Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> |
| Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> |
| Acked-by: John Fastabend <john.fastabend@gmail.com> |
| Link: https://lore.kernel.org/bpf/20200117100656.10359-1-liuhangbin@gmail.com |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| 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 1c1a2f75f3d8..0fea91b0afa4 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 |
| @@ -42,8 +42,12 @@ 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 (CHECK(pmu_fd < 0, "perf_event_open", |
| - "err %d errno %d. Does the test host support PERF_COUNT_HW_CPU_CYCLES?\n", |
| + 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", |
| pmu_fd, errno)) |
| goto close_prog; |
| |
| -- |
| 2.7.4 |
| |