From d7b3ed3a8b2169087534738670d108489711f2d1 Mon Sep 17 00:00:00 2001 From: Andrii Nakryiko Date: Fri, 17 Dec 2021 14:23:49 -0800 Subject: [PATCH] libbpf-tools: update funclatency for libbpf 1.0 Switch to libbpf 1.0 mode and adapt libbpf API usage accordingly. Signed-off-by: Andrii Nakryiko --- libbpf-tools/funclatency.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/libbpf-tools/funclatency.c b/libbpf-tools/funclatency.c index 768e5c90..9e456db9 100644 --- a/libbpf-tools/funclatency.c +++ b/libbpf-tools/funclatency.c @@ -173,20 +173,18 @@ static int attach_kprobes(struct funclatency_bpf *obj) { long err; - obj->links.dummy_kprobe = - bpf_program__attach_kprobe(obj->progs.dummy_kprobe, false, - env.funcname); - err = libbpf_get_error(obj->links.dummy_kprobe); - if (err) { + obj->links.dummy_kprobe = bpf_program__attach_kprobe(obj->progs.dummy_kprobe, false, + env.funcname); + if (!obj->links.dummy_kprobe) { + err = -errno; warn("failed to attach kprobe: %ld\n", err); return -1; } - obj->links.dummy_kretprobe = - bpf_program__attach_kprobe(obj->progs.dummy_kretprobe, true, - env.funcname); - err = libbpf_get_error(obj->links.dummy_kretprobe); - if (err) { + obj->links.dummy_kretprobe = bpf_program__attach_kprobe(obj->progs.dummy_kretprobe, true, + env.funcname); + if (!obj->links.dummy_kretprobe) { + err = -errno; warn("failed to attach kretprobe: %ld\n", err); return -1; } @@ -227,8 +225,8 @@ static int attach_uprobes(struct funclatency_bpf *obj) obj->links.dummy_kprobe = bpf_program__attach_uprobe(obj->progs.dummy_kprobe, false, env.pid ?: -1, bin_path, func_off); - err = libbpf_get_error(obj->links.dummy_kprobe); - if (err) { + if (!obj->links.dummy_kprobe) { + err = -errno; warn("Failed to attach uprobe: %ld\n", err); goto out_binary; } @@ -236,8 +234,8 @@ static int attach_uprobes(struct funclatency_bpf *obj) obj->links.dummy_kretprobe = bpf_program__attach_uprobe(obj->progs.dummy_kretprobe, true, env.pid ?: -1, bin_path, func_off); - err = libbpf_get_error(obj->links.dummy_kretprobe); - if (err) { + if (!obj->links.dummy_kretprobe) { + err = -errno; warn("Failed to attach uretprobe: %ld\n", err); goto out_binary; } @@ -286,11 +284,7 @@ int main(int argc, char **argv) sigaction(SIGINT, &sigact, 0); - err = bump_memlock_rlimit(); - if (err) { - warn("failed to increase rlimit: %d\n", err); - return 1; - } + libbpf_set_strict_mode(LIBBPF_STRICT_ALL); obj = funclatency_bpf__open(); if (!obj) { -- 2.34.1