2020-07-09 11:52:52

by Lorenz Bauer

Subject: [PATCH bpf] selftests: bpf: fix detach from sockmap tests

Fix sockmap tests which rely on old bpf_prog_dispatch behaviour.
In the first case, the tests check that detaching without giving
a program succeeds. Since these are not the desired semantics,
invert the condition. In the second case, the clean up code doesn't
supply the necessary program fds.

Reported-by: Martin KaFai Lau <[email protected]>
Signed-off-by: Lorenz Bauer <[email protected]>
Fixes: bb0de3131f4c ("bpf: sockmap: Require attach_bpf_fd when detaching a program")
---
tools/testing/selftests/bpf/test_maps.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c
index 6a12a0e01e07..754cf611723e 100644
--- a/tools/testing/selftests/bpf/test_maps.c
+++ b/tools/testing/selftests/bpf/test_maps.c
@@ -789,19 +789,19 @@ static void test_sockmap(unsigned int tasks, void *data)
}

err = bpf_prog_detach(fd, BPF_SK_SKB_STREAM_PARSER);
- if (err) {
+ if (!err) {
printf("Failed empty parser prog detach\n");
goto out_sockmap;
}

err = bpf_prog_detach(fd, BPF_SK_SKB_STREAM_VERDICT);
- if (err) {
+ if (!err) {
printf("Failed empty verdict prog detach\n");
goto out_sockmap;
}

err = bpf_prog_detach(fd, BPF_SK_MSG_VERDICT);
- if (err) {
+ if (!err) {
printf("Failed empty msg verdict prog detach\n");
goto out_sockmap;
}
@@ -1090,19 +1090,19 @@ static void test_sockmap(unsigned int tasks, void *data)
assert(status == 0);
}

- err = bpf_prog_detach(map_fd_rx, __MAX_BPF_ATTACH_TYPE);
+ err = bpf_prog_detach2(parse_prog, map_fd_rx, __MAX_BPF_ATTACH_TYPE);
if (!err) {
printf("Detached an invalid prog type.\n");
goto out_sockmap;
}

- err = bpf_prog_detach(map_fd_rx, BPF_SK_SKB_STREAM_PARSER);
+ err = bpf_prog_detach2(parse_prog, map_fd_rx, BPF_SK_SKB_STREAM_PARSER);
if (err) {
printf("Failed parser prog detach\n");
goto out_sockmap;
}

- err = bpf_prog_detach(map_fd_rx, BPF_SK_SKB_STREAM_VERDICT);
+ err = bpf_prog_detach2(verdict_prog, map_fd_rx, BPF_SK_SKB_STREAM_VERDICT);
if (err) {
printf("Failed parser prog detach\n");
goto out_sockmap;
--
2.25.1

2020-07-09 18:24:18

by Jakub Sitnicki

Subject: Re: [PATCH bpf] selftests: bpf: fix detach from sockmap tests

On Thu, Jul 09, 2020 at 01:51 PM CEST, Lorenz Bauer wrote:
> Fix sockmap tests which rely on old bpf_prog_dispatch behaviour.
> In the first case, the tests check that detaching without giving
> a program succeeds. Since these are not the desired semantics,
> invert the condition. In the second case, the clean up code doesn't
> supply the necessary program fds.
>
> Reported-by: Martin KaFai Lau <[email protected]>
> Signed-off-by: Lorenz Bauer <[email protected]>
> Fixes: bb0de3131f4c ("bpf: sockmap: Require attach_bpf_fd when detaching a program")
> ---
> tools/testing/selftests/bpf/test_maps.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c
> index 6a12a0e01e07..754cf611723e 100644
> --- a/tools/testing/selftests/bpf/test_maps.c
> +++ b/tools/testing/selftests/bpf/test_maps.c
> @@ -789,19 +789,19 @@ static void test_sockmap(unsigned int tasks, void *data)
> }
>
> err = bpf_prog_detach(fd, BPF_SK_SKB_STREAM_PARSER);
> - if (err) {
> + if (!err) {
> printf("Failed empty parser prog detach\n");
> goto out_sockmap;
> }
>
> err = bpf_prog_detach(fd, BPF_SK_SKB_STREAM_VERDICT);
> - if (err) {
> + if (!err) {
> printf("Failed empty verdict prog detach\n");
> goto out_sockmap;
> }
>
> err = bpf_prog_detach(fd, BPF_SK_MSG_VERDICT);
> - if (err) {
> + if (!err) {
> printf("Failed empty msg verdict prog detach\n");
> goto out_sockmap;
> }
> @@ -1090,19 +1090,19 @@ static void test_sockmap(unsigned int tasks, void *data)
> assert(status == 0);
> }
>
> - err = bpf_prog_detach(map_fd_rx, __MAX_BPF_ATTACH_TYPE);
> + err = bpf_prog_detach2(parse_prog, map_fd_rx, __MAX_BPF_ATTACH_TYPE);
> if (!err) {
> printf("Detached an invalid prog type.\n");
> goto out_sockmap;
> }
>
> - err = bpf_prog_detach(map_fd_rx, BPF_SK_SKB_STREAM_PARSER);
> + err = bpf_prog_detach2(parse_prog, map_fd_rx, BPF_SK_SKB_STREAM_PARSER);
> if (err) {
> printf("Failed parser prog detach\n");
> goto out_sockmap;
> }
>
> - err = bpf_prog_detach(map_fd_rx, BPF_SK_SKB_STREAM_VERDICT);
> + err = bpf_prog_detach2(verdict_prog, map_fd_rx, BPF_SK_SKB_STREAM_VERDICT);
> if (err) {
> printf("Failed parser prog detach\n");
> goto out_sockmap;

Reviewed-by: Jakub Sitnicki <[email protected]>

2020-07-09 21:44:15

by Daniel Borkmann

Subject: Re: [PATCH bpf] selftests: bpf: fix detach from sockmap tests

On 7/9/20 1:51 PM, Lorenz Bauer wrote:
> Fix sockmap tests which rely on old bpf_prog_dispatch behaviour.
> In the first case, the tests check that detaching without giving
> a program succeeds. Since these are not the desired semantics,
> invert the condition. In the second case, the clean up code doesn't
> supply the necessary program fds.
>
> Reported-by: Martin KaFai Lau <[email protected]>
> Signed-off-by: Lorenz Bauer <[email protected]>
> Fixes: bb0de3131f4c ("bpf: sockmap: Require attach_bpf_fd when detaching a program")

Applied, thanks!