From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Florent Revest <revest@chromium.org>
Cc: bpf <bpf@vger.kernel.org>, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
KP Singh <kpsingh@chromium.org>,
Florent Revest <revest@google.com>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH bpf-next v5 3/4] selftests/bpf: Integrate the socket_cookie test to test_progs
Date: Fri, 22 Jan 2021 12:32:38 -0800 [thread overview]
Message-ID: <CAEf4BzY8kv5rWVjr_x5hcyd9DH7sKOGLHWBXwfhoLdK9JD6rSA@mail.gmail.com> (raw)
In-Reply-To: <CABRcYm+gWJcsFxqriUMHeu3sFFLWWRGy=_wQ5R6hNoYu92c0PQ@mail.gmail.com>
On Fri, Jan 22, 2021 at 6:35 AM Florent Revest <revest@chromium.org> wrote:
>
> On Thu, Jan 21, 2021 at 8:55 AM Andrii Nakryiko
> <andrii.nakryiko@gmail.com> wrote:
> >
> > On Tue, Jan 19, 2021 at 8:00 AM Florent Revest <revest@chromium.org> wrote:
> > >
> > > Currently, the selftest for the BPF socket_cookie helpers is built and
> > > run independently from test_progs. It's easy to forget and hard to
> > > maintain.
> > >
> > > This patch moves the socket cookies test into prog_tests/ and vastly
> > > simplifies its logic by:
> > > - rewriting the loading code with BPF skeletons
> > > - rewriting the server/client code with network helpers
> > > - rewriting the cgroup code with test__join_cgroup
> > > - rewriting the error handling code with CHECKs
> > >
> > > Signed-off-by: Florent Revest <revest@chromium.org>
> > > ---
> >
> > Few nits below regarding skeleton and ASSERT_xxx usage.
> >
> > > tools/testing/selftests/bpf/Makefile | 3 +-
> > > .../selftests/bpf/prog_tests/socket_cookie.c | 82 +++++++
> > > .../selftests/bpf/progs/socket_cookie_prog.c | 2 -
> > > .../selftests/bpf/test_socket_cookie.c | 208 ------------------
> >
> > please also update .gitignore
>
> Good catch!
>
> > > 4 files changed, 83 insertions(+), 212 deletions(-)
> > > create mode 100644 tools/testing/selftests/bpf/prog_tests/socket_cookie.c
> > > delete mode 100644 tools/testing/selftests/bpf/test_socket_cookie.c
> > >
> >
> > [...]
> >
> > > +
> > > + skel = socket_cookie_prog__open_and_load();
> > > + if (CHECK(!skel, "socket_cookie_prog__open_and_load",
> > > + "skeleton open_and_load failed\n"))
> >
> > nit: ASSERT_PTR_OK
>
> Ah great, I find the ASSERT semantic much easier to follow than CHECKs.
>
> > > + return;
> > > +
> > > + cgroup_fd = test__join_cgroup("/socket_cookie");
> > > + if (CHECK(cgroup_fd < 0, "join_cgroup", "cgroup creation failed\n"))
> > > + goto destroy_skel;
> > > +
> > > + set_link = bpf_program__attach_cgroup(skel->progs.set_cookie,
> > > + cgroup_fd);
> >
> > you can use skel->links->set_cookie here and it will be auto-destroyed
> > when the whole skeleton is destroyed. More simplification.
>
> Sick. :)
>
> > > + if (CHECK(IS_ERR(set_link), "set-link-cg-attach", "err %ld\n",
> > > + PTR_ERR(set_link)))
> > > + goto close_cgroup_fd;
> > > +
> > > + update_link = bpf_program__attach_cgroup(skel->progs.update_cookie,
> > > + cgroup_fd);
> >
> > same as above, no need to maintain your link outside of skeleton
> >
> >
> > > + if (CHECK(IS_ERR(update_link), "update-link-cg-attach", "err %ld\n",
> > > + PTR_ERR(update_link)))
> > > + goto free_set_link;
> > > +
> > > + server_fd = start_server(AF_INET6, SOCK_STREAM, "::1", 0, 0);
> > > + if (CHECK(server_fd < 0, "start_server", "errno %d\n", errno))
> > > + goto free_update_link;
> > > +
> > > + client_fd = connect_to_fd(server_fd, 0);
> > > + if (CHECK(client_fd < 0, "connect_to_fd", "errno %d\n", errno))
> > > + goto close_server_fd;
> >
> > nit: ASSERT_OK is nicer (here and in few other places)
>
> Did you mean ASSERT_OK for the two following err checks ?
>
> ASSERT_OK does not seem right for a fd check where we want fd to be
> positive. ASSERT_OK does: "bool ___ok = ___res == 0;"
>
> I will keep my "CHECK(fd < 0" but maybe there could be an
> ASSERT_POSITIVE that does "bool ___ok = ___res >= 0;"
Ah, I missed that it's returning FD, sorry. For FD we'd have to add
the ASSERT_GEQ(fd, 0, "blah") variant. So yeah, stick to CHECK for
now.
>
> > > +
> > > + err = bpf_map_lookup_elem(bpf_map__fd(skel->maps.socket_cookies),
> > > + &client_fd, &val);
> > > + if (CHECK(err, "map_lookup", "err %d errno %d\n", err, errno))
> > > + goto close_client_fd;
> > > +
> > > + err = getsockname(client_fd, (struct sockaddr *)&addr, &addr_len);
> > > + if (CHECK(err, "getsockname", "Can't get client local addr\n"))
> > > + goto close_client_fd;
> > > +
> > > + cookie_expected_value = (ntohs(addr.sin6_port) << 8) | 0xFF;
> > > + CHECK(val.cookie_value != cookie_expected_value, "",
> > > + "Unexpected value in map: %x != %x\n", val.cookie_value,
> > > + cookie_expected_value);
> >
> > nit: ASSERT_NEQ is nicer
>
> Indeed.
>
> > > +
> > > +close_client_fd:
> > > + close(client_fd);
> > > +close_server_fd:
> > > + close(server_fd);
> > > +free_update_link:
> > > + bpf_link__destroy(update_link);
> > > +free_set_link:
> > > + bpf_link__destroy(set_link);
> > > +close_cgroup_fd:
> > > + close(cgroup_fd);
> > > +destroy_skel:
> > > + socket_cookie_prog__destroy(skel);
> > > +}
> >
> > [...]
next prev parent reply other threads:[~2021-01-22 20:37 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-19 15:59 [PATCH bpf-next v5 1/4] bpf: Be less specific about socket cookies guarantees Florent Revest
2021-01-19 15:59 ` [PATCH bpf-next v5 2/4] bpf: Expose bpf_get_socket_cookie to tracing programs Florent Revest
2021-01-20 16:56 ` KP Singh
2021-01-19 15:59 ` [PATCH bpf-next v5 3/4] selftests/bpf: Integrate the socket_cookie test to test_progs Florent Revest
2021-01-20 16:58 ` KP Singh
2021-01-21 7:55 ` Andrii Nakryiko
2021-01-22 14:35 ` Florent Revest
2021-01-22 20:32 ` Andrii Nakryiko [this message]
2021-01-19 15:59 ` [PATCH bpf-next v5 4/4] selftests/bpf: Add a selftest for the tracing bpf_get_socket_cookie Florent Revest
2021-01-20 17:07 ` KP Singh
2021-01-20 19:03 ` Alexei Starovoitov
2021-01-20 19:06 ` Florent Revest
2021-01-22 15:34 ` Florent Revest
2021-01-23 20:45 ` Yonghong Song
2021-01-26 18:00 ` Florent Revest
2021-01-20 13:14 ` [PATCH bpf-next v5 1/4] bpf: Be less specific about socket cookies guarantees KP Singh
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=CAEf4BzY8kv5rWVjr_x5hcyd9DH7sKOGLHWBXwfhoLdK9JD6rSA@mail.gmail.com \
--to=andrii.nakryiko@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kpsingh@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=revest@chromium.org \
--cc=revest@google.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).