From: Yonghong Song <yhs@fb.com>
To: Florent Revest <revest@chromium.org>, <bpf@vger.kernel.org>
Cc: <ast@kernel.org>, <daniel@iogearbox.net>, <andrii@kernel.org>,
<kpsingh@chromium.org>, <revest@google.com>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH bpf-next 2/2] bpf: Add a selftest for the tracing bpf_get_socket_cookie
Date: Thu, 26 Nov 2020 23:56:23 -0800 [thread overview]
Message-ID: <8b0529f0-5f1e-b403-2772-7a56c44a3a55@fb.com> (raw)
In-Reply-To: <20201126170212.1749137-2-revest@google.com>
On 11/26/20 9:02 AM, Florent Revest 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@google.com>
> ---
> .../selftests/bpf/progs/socket_cookie_prog.c | 41 ++++++++++++++++---
> .../selftests/bpf/test_socket_cookie.c | 18 +++++---
Do you think it is possible to migrate test_socket_cookie.c to
selftests/bpf/prog_tests so it can be part of test_progs so
it will be regularly exercised?
> 2 files changed, 49 insertions(+), 10 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/progs/socket_cookie_prog.c b/tools/testing/selftests/bpf/progs/socket_cookie_prog.c
> index 0cb5656a22b0..a11026aeaaf1 100644
> --- a/tools/testing/selftests/bpf/progs/socket_cookie_prog.c
> +++ b/tools/testing/selftests/bpf/progs/socket_cookie_prog.c
> @@ -1,11 +1,13 @@
> // SPDX-License-Identifier: GPL-2.0
> // Copyright (c) 2018 Facebook
>
[...]
> diff --git a/tools/testing/selftests/bpf/test_socket_cookie.c b/tools/testing/selftests/bpf/test_socket_cookie.c
> index ca7ca87e91aa..0d955c65a4f8 100644
> --- a/tools/testing/selftests/bpf/test_socket_cookie.c
> +++ b/tools/testing/selftests/bpf/test_socket_cookie.c
> @@ -133,6 +133,7 @@ static int run_test(int cgfd)
> struct bpf_prog_load_attr attr;
> struct bpf_program *prog;
> struct bpf_object *pobj;
> + struct bpf_link *link;
> const char *prog_name;
> int server_fd = -1;
> int client_fd = -1;
> @@ -153,11 +154,18 @@ static int run_test(int cgfd)
> bpf_object__for_each_program(prog, pobj) {
> prog_name = bpf_program__section_name(prog);
>
> - if (libbpf_attach_type_by_name(prog_name, &attach_type))
> - goto err;
> -
> - err = bpf_prog_attach(bpf_program__fd(prog), cgfd, attach_type,
> - BPF_F_ALLOW_OVERRIDE);
> + if (bpf_program__is_tracing(prog)) {
> + link = bpf_program__attach(prog);
> + err = !link;
> + continue;
> + } else {
> + if (libbpf_attach_type_by_name(prog_name, &attach_type))
> + goto err;
> +
> + err = bpf_prog_attach(bpf_program__fd(prog), cgfd,
> + attach_type,
> + BPF_F_ALLOW_OVERRIDE);
> + }
> if (err) {
> log_err("Failed to attach prog %s", prog_name);
> goto out;
>
next prev parent reply other threads:[~2020-11-27 7:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-26 17:02 [PATCH bpf-next 1/2] bpf: Expose bpf_get_socket_cookie to tracing programs Florent Revest
2020-11-26 17:02 ` [PATCH bpf-next 2/2] bpf: Add a selftest for the tracing bpf_get_socket_cookie Florent Revest
2020-11-27 7:56 ` Yonghong Song [this message]
2020-11-27 9:17 ` Florent Revest
2020-12-02 1:01 ` Andrii Nakryiko
2020-11-27 8:08 ` [PATCH bpf-next 1/2] bpf: Expose bpf_get_socket_cookie to tracing programs Yonghong Song
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=8b0529f0-5f1e-b403-2772-7a56c44a3a55@fb.com \
--to=yhs@fb.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