From: Song Liu <liu.song.a23@gmail.com>
To: Andrii Nakryiko <andriin@fb.com>
Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com>,
Alexei Starovoitov <ast@fb.com>,
Daniel Borkmann <daniel@iogearbox.net>,
Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
Stanislav Fomichev <sdf@fomichev.me>,
Kernel Team <kernel-team@fb.com>
Subject: Re: [PATCH v3 bpf-next 7/9] selftests/bpf: switch test to new attach_perf_event API
Date: Fri, 28 Jun 2019 13:09:30 -0700 [thread overview]
Message-ID: <CAPhsuW4BL9x4F3FMDQNFRe6bcum+ruxJYN8jX2=nmDN7TTz=FQ@mail.gmail.com> (raw)
In-Reply-To: <20190628055303.1249758-8-andriin@fb.com>
On Thu, Jun 27, 2019 at 10:53 PM Andrii Nakryiko <andriin@fb.com> wrote:
>
> Use new bpf_program__attach_perf_event() in test previously relying on
> direct ioctl manipulations.
>
> Signed-off-by: Andrii Nakryiko <andriin@fb.com>
> Reviewed-by: Stanislav Fomichev <sdf@google.com>
Acked-by: Song Liu <songliubraving@fb.com>
> ---
> .../bpf/prog_tests/stacktrace_build_id_nmi.c | 31 +++++++++----------
> 1 file changed, 15 insertions(+), 16 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 1c1a2f75f3d8..9557b7dfb782 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
> @@ -17,6 +17,7 @@ static __u64 read_perf_max_sample_freq(void)
> void test_stacktrace_build_id_nmi(void)
> {
> int control_map_fd, stackid_hmap_fd, stackmap_fd, stack_amap_fd;
> + const char *prog_name = "tracepoint/random/urandom_read";
> const char *file = "./test_stacktrace_build_id.o";
> int err, pmu_fd, prog_fd;
> struct perf_event_attr attr = {
> @@ -25,7 +26,9 @@ void test_stacktrace_build_id_nmi(void)
> .config = PERF_COUNT_HW_CPU_CYCLES,
> };
> __u32 key, previous_key, val, duration = 0;
> + struct bpf_program *prog;
> struct bpf_object *obj;
> + struct bpf_link *link;
> char buf[256];
> int i, j;
> struct bpf_stack_build_id id_offs[PERF_MAX_STACK_DEPTH];
> @@ -39,6 +42,10 @@ void test_stacktrace_build_id_nmi(void)
> if (CHECK(err, "prog_load", "err %d errno %d\n", err, errno))
> return;
>
> + prog = bpf_object__find_program_by_title(obj, prog_name);
> + if (CHECK(!prog, "find_prog", "prog '%s' not found\n", prog_name))
> + goto close_prog;
> +
> pmu_fd = syscall(__NR_perf_event_open, &attr, -1 /* pid */,
> 0 /* cpu 0 */, -1 /* group id */,
> 0 /* flags */);
> @@ -47,15 +54,12 @@ void test_stacktrace_build_id_nmi(void)
> pmu_fd, errno))
> goto close_prog;
>
> - err = ioctl(pmu_fd, PERF_EVENT_IOC_ENABLE, 0);
> - if (CHECK(err, "perf_event_ioc_enable", "err %d errno %d\n",
> - err, errno))
> - goto close_pmu;
> -
> - err = ioctl(pmu_fd, PERF_EVENT_IOC_SET_BPF, prog_fd);
> - if (CHECK(err, "perf_event_ioc_set_bpf", "err %d errno %d\n",
> - err, errno))
> - goto disable_pmu;
> + link = bpf_program__attach_perf_event(prog, pmu_fd);
> + if (CHECK(IS_ERR(link), "attach_perf_event",
> + "err %ld\n", PTR_ERR(link))) {
> + close(pmu_fd);
> + goto close_prog;
> + }
>
> /* find map fds */
> control_map_fd = bpf_find_map(__func__, obj, "control_map");
> @@ -134,8 +138,7 @@ void test_stacktrace_build_id_nmi(void)
> * try it one more time.
> */
> if (build_id_matches < 1 && retry--) {
> - ioctl(pmu_fd, PERF_EVENT_IOC_DISABLE);
> - close(pmu_fd);
> + bpf_link__destroy(link);
> bpf_object__close(obj);
> printf("%s:WARN:Didn't find expected build ID from the map, retrying\n",
> __func__);
> @@ -154,11 +157,7 @@ void test_stacktrace_build_id_nmi(void)
> */
>
> disable_pmu:
> - ioctl(pmu_fd, PERF_EVENT_IOC_DISABLE);
> -
> -close_pmu:
> - close(pmu_fd);
> -
> + bpf_link__destroy(link);
> close_prog:
> bpf_object__close(obj);
> }
> --
> 2.17.1
>
next prev parent reply other threads:[~2019-06-28 20:09 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-28 5:52 [PATCH v3 bpf-next 0/9] libbpf: add bpf_link and tracing attach APIs Andrii Nakryiko
2019-06-28 5:52 ` [PATCH v3 bpf-next 1/9] libbpf: make libbpf_strerror_r agnostic to sign of error Andrii Nakryiko
2019-06-28 19:34 ` Song Liu
2019-06-28 5:52 ` [PATCH v3 bpf-next 2/9] libbpf: introduce concept of bpf_link Andrii Nakryiko
2019-06-28 16:02 ` Stanislav Fomichev
2019-06-28 16:42 ` Andrii Nakryiko
2019-06-28 17:45 ` Stanislav Fomichev
2019-06-28 17:49 ` Alexei Starovoitov
2019-06-28 17:55 ` Stanislav Fomichev
2019-06-28 19:37 ` Song Liu
2019-06-28 5:52 ` [PATCH v3 bpf-next 3/9] libbpf: add ability to attach/detach BPF program to perf event Andrii Nakryiko
2019-06-28 16:04 ` Stanislav Fomichev
2019-06-28 16:50 ` Andrii Nakryiko
2019-06-28 17:54 ` Stanislav Fomichev
2019-06-28 17:59 ` Andrii Nakryiko
2019-06-28 18:00 ` Stanislav Fomichev
2019-06-28 18:04 ` Andrii Nakryiko
2019-06-28 18:14 ` Stanislav Fomichev
2019-06-28 18:15 ` Andrii Nakryiko
2019-06-28 18:05 ` Stanislav Fomichev
2019-06-28 5:52 ` [PATCH v3 bpf-next 4/9] libbpf: add kprobe/uprobe attach API Andrii Nakryiko
2019-06-28 19:46 ` Song Liu
2019-06-28 19:59 ` Andrii Nakryiko
2019-06-28 20:09 ` Song Liu
2019-06-28 20:34 ` Andrii Nakryiko
2019-06-28 5:52 ` [PATCH v3 bpf-next 5/9] libbpf: add tracepoint " Andrii Nakryiko
2019-06-28 19:50 ` Song Liu
2019-06-28 20:13 ` Song Liu
2019-06-28 5:53 ` [PATCH v3 bpf-next 6/9] libbpf: add raw " Andrii Nakryiko
2019-06-28 19:54 ` Song Liu
2019-06-28 5:53 ` [PATCH v3 bpf-next 7/9] selftests/bpf: switch test to new attach_perf_event API Andrii Nakryiko
2019-06-28 20:09 ` Song Liu [this message]
2019-06-28 5:53 ` [PATCH v3 bpf-next 8/9] selftests/bpf: add kprobe/uprobe selftests Andrii Nakryiko
2019-06-28 20:10 ` Song Liu
2019-06-28 5:53 ` [PATCH v3 bpf-next 9/9] selftests/bpf: convert existing tracepoint tests to new APIs Andrii Nakryiko
2019-06-28 20:13 ` Song Liu
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='CAPhsuW4BL9x4F3FMDQNFRe6bcum+ruxJYN8jX2=nmDN7TTz=FQ@mail.gmail.com' \
--to=liu.song.a23@gmail.com \
--cc=andrii.nakryiko@gmail.com \
--cc=andriin@fb.com \
--cc=ast@fb.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
--cc=sdf@fomichev.me \
/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;
as well as URLs for NNTP newsgroup(s).