From 24d723699fbeeb8686acabc09ecefcceb749b9e0 Mon Sep 17 00:00:00 2001 From: Andrii Nakryiko Date: Fri, 17 Dec 2021 14:17:46 -0800 Subject: [PATCH] libbpf-tools: update biolatency for libbpf 1.0 Switch to libbpf 1.0 mode and adapt libbpf API usage accordingly. Signed-off-by: Andrii Nakryiko --- libbpf-tools/biolatency.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/libbpf-tools/biolatency.c b/libbpf-tools/biolatency.c index ab309a67..dc8f23b2 100644 --- a/libbpf-tools/biolatency.c +++ b/libbpf-tools/biolatency.c @@ -256,14 +256,9 @@ int main(int argc, char **argv) if (err) return err; + libbpf_set_strict_mode(LIBBPF_STRICT_ALL); libbpf_set_print(libbpf_print_fn); - err = bump_memlock_rlimit(); - if (err) { - fprintf(stderr, "failed to increase rlimit: %d\n", err); - return 1; - } - obj = biolatency_bpf__open(); if (!obj) { fprintf(stderr, "failed to open BPF object\n"); @@ -313,25 +308,22 @@ int main(int argc, char **argv) } if (env.queued) { - obj->links.block_rq_insert = - bpf_program__attach(obj->progs.block_rq_insert); - err = libbpf_get_error(obj->links.block_rq_insert); - if (err) { + obj->links.block_rq_insert = bpf_program__attach(obj->progs.block_rq_insert); + if (!obj->links.block_rq_insert) { + err = -errno; fprintf(stderr, "failed to attach: %s\n", strerror(-err)); goto cleanup; } } - obj->links.block_rq_issue = - bpf_program__attach(obj->progs.block_rq_issue); - err = libbpf_get_error(obj->links.block_rq_issue); - if (err) { + obj->links.block_rq_issue = bpf_program__attach(obj->progs.block_rq_issue); + if (!obj->links.block_rq_issue) { + err = -errno; fprintf(stderr, "failed to attach: %s\n", strerror(-err)); goto cleanup; } - obj->links.block_rq_complete = - bpf_program__attach(obj->progs.block_rq_complete); - err = libbpf_get_error(obj->links.block_rq_complete); - if (err) { + obj->links.block_rq_complete = bpf_program__attach(obj->progs.block_rq_complete); + if (!obj->links.block_rq_complete) { + err = -errno; fprintf(stderr, "failed to attach: %s\n", strerror(-err)); goto cleanup; } -- 2.34.1