On 12/13/18 1:19 PM, Andrey Ignatov wrote:
> Semantic of netns_id argument of bpf_sk_lookup_tcp and bpf_sk_lookup_udp
> was changed (fixed) in f71c6143c203. Corresponding changes have to be
> applied to all call sites in selftests. The patch fixes corresponding
> call sites in test_sock_addr test: pass BPF_F_CURRENT_NETNS instead of 0
> in netns_id argument.
>
> Fixes: f71c6143c203 ("bpf: Support sk lookup in netns with id 0")
> Reported-by: Yonghong Song <y...@fb.com>
> Signed-off-by: Andrey Ignatov <r...@fb.com>
Thanks for the fix!
Tested-by: Yonghong Song <y...@fb.com>
> ---
> tools/testing/selftests/bpf/connect4_prog.c | 6 ++++--
> tools/testing/selftests/bpf/connect6_prog.c | 6 ++++--
> 2 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/connect4_prog.c
> b/tools/testing/selftests/bpf/connect4_prog.c
> index b8395f3c43e9..1fd244d35ba9 100644
> --- a/tools/testing/selftests/bpf/connect4_prog.c
> +++ b/tools/testing/selftests/bpf/connect4_prog.c
> @@ -35,9 +35,11 @@ int connect_v4_prog(struct bpf_sock_addr *ctx)
> if (ctx->type != SOCK_STREAM && ctx->type != SOCK_DGRAM)
> return 0;
> else if (ctx->type == SOCK_STREAM)
> - sk = bpf_sk_lookup_tcp(ctx, &tuple, sizeof(tuple.ipv4), 0, 0);
> + sk = bpf_sk_lookup_tcp(ctx, &tuple, sizeof(tuple.ipv4),
> + BPF_F_CURRENT_NETNS, 0);
> else
> - sk = bpf_sk_lookup_udp(ctx, &tuple, sizeof(tuple.ipv4), 0, 0);
> + sk = bpf_sk_lookup_udp(ctx, &tuple, sizeof(tuple.ipv4),
> + BPF_F_CURRENT_NETNS, 0);
>
> if (!sk)
> return 0;
> diff --git a/tools/testing/selftests/bpf/connect6_prog.c
> b/tools/testing/selftests/bpf/connect6_prog.c
> index 25f5dc7b7aa0..26397ab7b3c7 100644
> --- a/tools/testing/selftests/bpf/connect6_prog.c
> +++ b/tools/testing/selftests/bpf/connect6_prog.c
> @@ -47,9 +47,11 @@ int connect_v6_prog(struct bpf_sock_addr *ctx)
> if (ctx->type != SOCK_STREAM && ctx->type != SOCK_DGRAM)
> return 0;
> else if (ctx->type == SOCK_STREAM)
> - sk = bpf_sk_lookup_tcp(ctx, &tuple, sizeof(tuple.ipv6), 0, 0);
> + sk = bpf_sk_lookup_tcp(ctx, &tuple, sizeof(tuple.ipv6),
> + BPF_F_CURRENT_NETNS, 0);
> else
> - sk = bpf_sk_lookup_udp(ctx, &tuple, sizeof(tuple.ipv6), 0, 0);
> + sk = bpf_sk_lookup_udp(ctx, &tuple, sizeof(tuple.ipv6),
> + BPF_F_CURRENT_NETNS, 0);
>
> if (!sk)
> return 0;
>
