From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Cc: bpf <bpf@vger.kernel.org>,
"Jakub Sitnicki" <jakub@cloudflare.com>,
"Song Liu" <songliubraving@fb.com>,
"Alexei Starovoitov" <ast@kernel.org>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Andrii Nakryiko" <andrii@kernel.org>,
"Martin KaFai Lau" <kafai@fb.com>, "Yonghong Song" <yhs@fb.com>,
"Jesper Dangaard Brouer" <brouer@redhat.com>,
"Toke Høiland-Jørgensen" <toke@redhat.com>,
Networking <netdev@vger.kernel.org>
Subject: Re: [PATCH bpf-next v4 7/8] selftests/bpf: Fix fd cleanup in sk_lookup test
Date: Wed, 20 Oct 2021 15:19:04 -0700 [thread overview]
Message-ID: <CAEf4Bzbg-GiH9qM_BcRbi=wKqFwh3txb04DaL2dhz8EM5GZhGQ@mail.gmail.com> (raw)
In-Reply-To: <20211020191526.2306852-8-memxor@gmail.com>
On Wed, Oct 20, 2021 at 12:15 PM Kumar Kartikeya Dwivedi
<memxor@gmail.com> wrote:
>
> Similar to the fix in commit:
> e31eec77e4ab ("bpf: selftests: Fix fd cleanup in get_branch_snapshot")
>
> We use designated initializer to set fds to -1 without breaking on
> future changes to MAX_SERVER constant denoting the array size.
>
> The particular close(0) occurs on non-reuseport tests, so it can be seen
> with -n 115/{2,3} but not 115/4. This can cause problems with future
> tests if they depend on BTF fd never being acquired as fd 0, breaking
> internal libbpf assumptions.
>
> Fixes: 0ab5539f8584 ("selftests/bpf: Tests for BPF_SK_LOOKUP attach point")
> Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
> Acked-by: Song Liu <songliubraving@fb.com>
> Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
> ---
> tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c b/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
> index aee41547e7f4..cbee46d2d525 100644
> --- a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
> +++ b/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
> @@ -598,7 +598,7 @@ static void query_lookup_prog(struct test_sk_lookup *skel)
>
> static void run_lookup_prog(const struct test *t)
> {
> - int server_fds[MAX_SERVERS] = { -1 };
> + int server_fds[] = { [0 ... MAX_SERVERS - 1] = -1 };
if you have this, why do you need early break logic below?
> int client_fd, reuse_conn_fd = -1;
> struct bpf_link *lookup_link;
> int i, err;
> @@ -663,8 +663,9 @@ static void run_lookup_prog(const struct test *t)
> if (reuse_conn_fd != -1)
> close(reuse_conn_fd);
> for (i = 0; i < ARRAY_SIZE(server_fds); i++) {
> - if (server_fds[i] != -1)
> - close(server_fds[i]);
> + if (server_fds[i] == -1)
> + break;
> + close(server_fds[i]);
> }
> bpf_link__destroy(lookup_link);
> }
> @@ -1053,7 +1054,7 @@ static void run_sk_assign(struct test_sk_lookup *skel,
> struct bpf_program *lookup_prog,
> const char *remote_ip, const char *local_ip)
> {
> - int server_fds[MAX_SERVERS] = { -1 };
> + int server_fds[] = { [0 ... MAX_SERVERS - 1] = -1 };
> struct bpf_sk_lookup ctx;
> __u64 server_cookie;
> int i, err;
> @@ -1097,8 +1098,9 @@ static void run_sk_assign(struct test_sk_lookup *skel,
>
> close_servers:
> for (i = 0; i < ARRAY_SIZE(server_fds); i++) {
> - if (server_fds[i] != -1)
> - close(server_fds[i]);
> + if (server_fds[i] == -1)
> + break;
> + close(server_fds[i]);
> }
> }
>
> --
> 2.33.1
>
next prev parent reply other threads:[~2021-10-20 22:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-20 19:15 [PATCH bpf-next v4 0/8] Typeless/weak ksym for gen_loader + misc fixups Kumar Kartikeya Dwivedi
2021-10-20 19:15 ` [PATCH bpf-next v4 1/8] bpf: Add bpf_kallsyms_lookup_name helper Kumar Kartikeya Dwivedi
2021-10-20 19:15 ` [PATCH bpf-next v4 2/8] libbpf: Add typeless ksym support to gen_loader Kumar Kartikeya Dwivedi
2021-10-20 19:15 ` [PATCH bpf-next v4 3/8] libbpf: Add weak " Kumar Kartikeya Dwivedi
2021-10-20 19:15 ` [PATCH bpf-next v4 4/8] libbpf: Ensure that BPF syscall fds are never 0, 1, or 2 Kumar Kartikeya Dwivedi
2021-10-20 22:09 ` Andrii Nakryiko
2021-10-20 22:33 ` Kumar Kartikeya Dwivedi
2021-10-20 23:02 ` Andrii Nakryiko
2021-10-20 19:15 ` [PATCH bpf-next v4 5/8] libbpf: Use O_CLOEXEC uniformly when opening fds Kumar Kartikeya Dwivedi
2021-10-20 19:15 ` [PATCH bpf-next v4 6/8] selftests/bpf: Add weak/typeless ksym test for light skeleton Kumar Kartikeya Dwivedi
2021-10-20 22:17 ` Andrii Nakryiko
2021-10-20 22:37 ` Kumar Kartikeya Dwivedi
2021-10-20 22:43 ` Andrii Nakryiko
2021-10-20 19:15 ` [PATCH bpf-next v4 7/8] selftests/bpf: Fix fd cleanup in sk_lookup test Kumar Kartikeya Dwivedi
2021-10-20 22:19 ` Andrii Nakryiko [this message]
2021-10-20 19:15 ` [PATCH bpf-next v4 8/8] selftests/bpf: Fix memory leak in test_ima Kumar Kartikeya Dwivedi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAEf4Bzbg-GiH9qM_BcRbi=wKqFwh3txb04DaL2dhz8EM5GZhGQ@mail.gmail.com' \
--to=andrii.nakryiko@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=jakub@cloudflare.com \
--cc=kafai@fb.com \
--cc=memxor@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=toke@redhat.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).