mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-24 14:25:26 -04:00
selftests/bpf: Turn on libbpf 1.0 mode and fix all IS_ERR checks
Turn ony libbpf 1.0 mode. Fix all the explicit IS_ERR checks that now will be broken because libbpf returns NULL on error (and sets errno). Fix ASSERT_OK_PTR and ASSERT_ERR_PTR to work for both old mode and new modes and use them throughout selftests. This is trivial to do by using libbpf_get_error() API that all libbpf users are supposed to use, instead of IS_ERR checks. A bunch of checks also did explicit -1 comparison for various fd-returning APIs. Such checks are replaced with >= 0 or < 0 cases. There were also few misuses of bpf_object__find_map_by_name() in test_maps. Those are fixed in this patch as well. Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Acked-by: John Fastabend <john.fastabend@gmail.com> Acked-by: Toke Høiland-Jørgensen <toke@redhat.com> Link: https://lore.kernel.org/bpf/20210525035935.1461796-3-andrii@kernel.org
This commit is contained in:
committed by
Alexei Starovoitov
parent
5981881d21
commit
bad2e478af
@@ -82,6 +82,8 @@ int main(int argc, char **argv)
|
||||
cpu_set_t cpuset;
|
||||
__u32 key = 0;
|
||||
|
||||
libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
|
||||
|
||||
CPU_ZERO(&cpuset);
|
||||
CPU_SET(0, &cpuset);
|
||||
pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
|
||||
@@ -116,7 +118,7 @@ int main(int argc, char **argv)
|
||||
|
||||
pb_opts.sample_cb = dummyfn;
|
||||
pb = perf_buffer__new(bpf_map__fd(perf_map), 8, &pb_opts);
|
||||
if (IS_ERR(pb))
|
||||
if (!pb)
|
||||
goto err;
|
||||
|
||||
pthread_create(&tid, NULL, poller_thread, pb);
|
||||
@@ -163,7 +165,6 @@ err:
|
||||
bpf_prog_detach(cg_fd, BPF_CGROUP_SOCK_OPS);
|
||||
close(cg_fd);
|
||||
cleanup_cgroup_environment();
|
||||
if (!IS_ERR_OR_NULL(pb))
|
||||
perf_buffer__free(pb);
|
||||
perf_buffer__free(pb);
|
||||
return error;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user