From: KP Singh <kpsingh@kernel.org>
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>,
Florent Revest <revest@google.com>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH bpf-next v5 4/4] selftests/bpf: Add a selftest for the tracing bpf_get_socket_cookie
Date: Wed, 20 Jan 2021 18:07:52 +0100 [thread overview]
Message-ID: <CACYkzJ6fNvYCO4cnU2XispQkF-_3yToDGgB=aRRd9m+qy0gpWA@mail.gmail.com> (raw)
In-Reply-To: <20210119155953.803818-4-revest@chromium.org>
On Tue, Jan 19, 2021 at 5:00 PM Florent Revest <revest@chromium.org> wrote:
>
> This builds up on the existing socket cookie test which checks whether
> the bpf_get_socket_cookie helpers provide the same value in
> cgroup/connect6 and sockops programs for a socket created by the
> userspace part of the test.
>
> Adding a tracing program to the existing objects requires a different
> attachment strategy and different headers.
>
> Signed-off-by: Florent Revest <revest@chromium.org>
Acked-by: KP Singh <kpsingh@kernel.org>
(one minor note, doesn't really need fixing as a part of this though)
> ---
> .../selftests/bpf/prog_tests/socket_cookie.c | 24 +++++++----
> .../selftests/bpf/progs/socket_cookie_prog.c | 41 ++++++++++++++++---
> 2 files changed, 52 insertions(+), 13 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/socket_cookie.c b/tools/testing/selftests/bpf/prog_tests/socket_cookie.c
> index 53d0c44e7907..e5c5e2ea1deb 100644
> --- a/tools/testing/selftests/bpf/prog_tests/socket_cookie.c
> +++ b/tools/testing/selftests/bpf/prog_tests/socket_cookie.c
> @@ -15,8 +15,8 @@ struct socket_cookie {
>
> void test_socket_cookie(void)
> {
> + struct bpf_link *set_link, *update_sockops_link, *update_tracing_link;
> socklen_t addr_len = sizeof(struct sockaddr_in6);
> - struct bpf_link *set_link, *update_link;
> int server_fd, client_fd, cgroup_fd;
> struct socket_cookie_prog *skel;
> __u32 cookie_expected_value;
> @@ -39,15 +39,21 @@ void test_socket_cookie(void)
> PTR_ERR(set_link)))
> goto close_cgroup_fd;
>
> - update_link = bpf_program__attach_cgroup(skel->progs.update_cookie,
> - cgroup_fd);
> - if (CHECK(IS_ERR(update_link), "update-link-cg-attach", "err %ld\n",
> - PTR_ERR(update_link)))
> + update_sockops_link = bpf_program__attach_cgroup(
> + skel->progs.update_cookie_sockops, cgroup_fd);
> + if (CHECK(IS_ERR(update_sockops_link), "update-sockops-link-cg-attach",
> + "err %ld\n", PTR_ERR(update_sockops_link)))
> goto free_set_link;
>
> + update_tracing_link = bpf_program__attach(
> + skel->progs.update_cookie_tracing);
> + if (CHECK(IS_ERR(update_tracing_link), "update-tracing-link-attach",
> + "err %ld\n", PTR_ERR(update_tracing_link)))
> + goto free_update_sockops_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;
> + goto free_update_tracing_link;
>
> client_fd = connect_to_fd(server_fd, 0);
> if (CHECK(client_fd < 0, "connect_to_fd", "errno %d\n", errno))
> @@ -71,8 +77,10 @@ void test_socket_cookie(void)
> close(client_fd);
> close_server_fd:
> close(server_fd);
> -free_update_link:
> - bpf_link__destroy(update_link);
> +free_update_tracing_link:
> + bpf_link__destroy(update_tracing_link);
I don't think this need to block submission unless there are other
issues but the
bpf_link__destroy can just be called in a single cleanup label because
it handles null or
erroneous inputs:
int bpf_link__destroy(struct bpf_link *link)
{
int err = 0;
if (IS_ERR_OR_NULL(link))
return 0;
[...]
next prev parent reply other threads:[~2021-01-20 17:13 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
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 [this message]
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='CACYkzJ6fNvYCO4cnU2XispQkF-_3yToDGgB=aRRd9m+qy0gpWA@mail.gmail.com' \
--to=kpsingh@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--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).