| Message ID | 20220421130104.1582053-1-asavkov@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 920fd5e1771db8b338d4145c2d30d60bf0bcce99 |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next] selftests/bpf: fix attach tests retcode checks | expand |
On Thu, Apr 21, 2022 at 9:01 PM Artem Savkov <asavkov@redhat.com> wrote: > > Switching to libbpf 1.0 API broke test_sock and test_sysctl as they > check for return of bpf_prog_attach to be exactly -1. Switch the check > to '< 0' instead. > > Fixes: b858ba8c52b6 ("selftests/bpf: Use libbpf 1.0 API mode instead of RLIMIT_MEMLOCK") > Signed-off-by: Artem Savkov <asavkov@redhat.com> Reviewed-by: Yafang Shao <laoar.shao@gmail.com> > --- > tools/testing/selftests/bpf/test_sock.c | 2 +- > tools/testing/selftests/bpf/test_sysctl.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/bpf/test_sock.c b/tools/testing/selftests/bpf/test_sock.c > index 6c4494076bbf..810c3740b2cc 100644 > --- a/tools/testing/selftests/bpf/test_sock.c > +++ b/tools/testing/selftests/bpf/test_sock.c > @@ -492,7 +492,7 @@ static int run_test_case(int cgfd, const struct sock_test *test) > goto err; > } > > - if (attach_sock_prog(cgfd, progfd, test->attach_type) == -1) { > + if (attach_sock_prog(cgfd, progfd, test->attach_type) < 0) { > if (test->result == ATTACH_REJECT) > goto out; > else > diff --git a/tools/testing/selftests/bpf/test_sysctl.c b/tools/testing/selftests/bpf/test_sysctl.c > index 5bae25ca19fb..57620e7c9048 100644 > --- a/tools/testing/selftests/bpf/test_sysctl.c > +++ b/tools/testing/selftests/bpf/test_sysctl.c > @@ -1560,7 +1560,7 @@ static int run_test_case(int cgfd, struct sysctl_test *test) > goto err; > } > > - if (bpf_prog_attach(progfd, cgfd, atype, BPF_F_ALLOW_OVERRIDE) == -1) { > + if (bpf_prog_attach(progfd, cgfd, atype, BPF_F_ALLOW_OVERRIDE) < 0) { > if (test->result == ATTACH_REJECT) > goto out; > else > -- > 2.35.1 >
Hello: This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <daniel@iogearbox.net>: On Thu, 21 Apr 2022 15:01:04 +0200 you wrote: > Switching to libbpf 1.0 API broke test_sock and test_sysctl as they > check for return of bpf_prog_attach to be exactly -1. Switch the check > to '< 0' instead. > > Fixes: b858ba8c52b6 ("selftests/bpf: Use libbpf 1.0 API mode instead of RLIMIT_MEMLOCK") > Signed-off-by: Artem Savkov <asavkov@redhat.com> > > [...] Here is the summary with links: - [bpf-next] selftests/bpf: fix attach tests retcode checks https://git.kernel.org/bpf/bpf-next/c/920fd5e1771d You are awesome, thank you!
diff --git a/tools/testing/selftests/bpf/test_sock.c b/tools/testing/selftests/bpf/test_sock.c index 6c4494076bbf..810c3740b2cc 100644 --- a/tools/testing/selftests/bpf/test_sock.c +++ b/tools/testing/selftests/bpf/test_sock.c @@ -492,7 +492,7 @@ static int run_test_case(int cgfd, const struct sock_test *test) goto err; } - if (attach_sock_prog(cgfd, progfd, test->attach_type) == -1) { + if (attach_sock_prog(cgfd, progfd, test->attach_type) < 0) { if (test->result == ATTACH_REJECT) goto out; else diff --git a/tools/testing/selftests/bpf/test_sysctl.c b/tools/testing/selftests/bpf/test_sysctl.c index 5bae25ca19fb..57620e7c9048 100644 --- a/tools/testing/selftests/bpf/test_sysctl.c +++ b/tools/testing/selftests/bpf/test_sysctl.c @@ -1560,7 +1560,7 @@ static int run_test_case(int cgfd, struct sysctl_test *test) goto err; } - if (bpf_prog_attach(progfd, cgfd, atype, BPF_F_ALLOW_OVERRIDE) == -1) { + if (bpf_prog_attach(progfd, cgfd, atype, BPF_F_ALLOW_OVERRIDE) < 0) { if (test->result == ATTACH_REJECT) goto out; else
Switching to libbpf 1.0 API broke test_sock and test_sysctl as they check for return of bpf_prog_attach to be exactly -1. Switch the check to '< 0' instead. Fixes: b858ba8c52b6 ("selftests/bpf: Use libbpf 1.0 API mode instead of RLIMIT_MEMLOCK") Signed-off-by: Artem Savkov <asavkov@redhat.com> --- tools/testing/selftests/bpf/test_sock.c | 2 +- tools/testing/selftests/bpf/test_sysctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)