netdev - Re: [PATCHv4 bpf-next 3/5] selftests/bpf: Add re-attach test to fexit

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAEf4BzYv_9Sa5Sa25-9s-9Fxasn9OuoRfggyOT9JcDcfrCkhEQ@mail.gmail.com>
Date:   Tue, 13 Apr 2021 14:55:32 -0700
From:   Andrii Nakryiko <andrii.nakryiko@...il.com>
To:     Jiri Olsa <jolsa@...nel.org>
Cc:     Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        Andrii Nakryiko <andriin@...com>,
        Networking <netdev@...r.kernel.org>, bpf <bpf@...r.kernel.org>,
        Martin KaFai Lau <kafai@...com>,
        Song Liu <songliubraving@...com>, Yonghong Song <yhs@...com>,
        John Fastabend <john.fastabend@...il.com>,
        KP Singh <kpsingh@...omium.org>,
        Toke Høiland-Jørgensen <toke@...hat.com>,
        Julia Lawall <julia.lawall@...ia.fr>
Subject: Re: [PATCHv4 bpf-next 3/5] selftests/bpf: Add re-attach test to fexit_test

On Mon, Apr 12, 2021 at 9:30 AM Jiri Olsa <jolsa@...nel.org> wrote:
>
> Adding the test to re-attach (detach/attach again) tracing
> fexit programs, plus check that already linked program can't
> be attached again.
>
> Also switching to ASSERT* macros.
>
> Signed-off-by: Jiri Olsa <jolsa@...nel.org>
> ---
>  .../selftests/bpf/prog_tests/fexit_test.c     | 51 +++++++++++++------
>  1 file changed, 36 insertions(+), 15 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/fexit_test.c b/tools/testing/selftests/bpf/prog_tests/fexit_test.c
> index 78d7a2765c27..c48e10c138bc 100644
> --- a/tools/testing/selftests/bpf/prog_tests/fexit_test.c
> +++ b/tools/testing/selftests/bpf/prog_tests/fexit_test.c
> @@ -3,35 +3,56 @@
>  #include <test_progs.h>
>  #include "fexit_test.skel.h"
>
> -void test_fexit_test(void)
> +static int fexit_test(struct fexit_test *fexit_skel)
>  {
> -       struct fexit_test *fexit_skel = NULL;
>         int err, prog_fd, i;
>         __u32 duration = 0, retval;
> +       struct bpf_link *link;
>         __u64 *result;
>
> -       fexit_skel = fexit_test__open_and_load();
> -       if (CHECK(!fexit_skel, "fexit_skel_load", "fexit skeleton failed\n"))
> -               goto cleanup;
> -
>         err = fexit_test__attach(fexit_skel);
> -       if (CHECK(err, "fexit_attach", "fexit attach failed: %d\n", err))
> -               goto cleanup;
> +       if (!ASSERT_OK(err, "fexit_attach"))
> +               return err;
> +
> +       /* Check that already linked program can't be attached again. */
> +       link = bpf_program__attach(fexit_skel->progs.test1);
> +       if (!ASSERT_ERR_PTR(link, "fexit_attach_link"))
> +               return -1;
>
>         prog_fd = bpf_program__fd(fexit_skel->progs.test1);
>         err = bpf_prog_test_run(prog_fd, 1, NULL, 0,
>                                 NULL, NULL, &retval, &duration);
> -       CHECK(err || retval, "test_run",
> -             "err %d errno %d retval %d duration %d\n",
> -             err, errno, retval, duration);
> +       ASSERT_OK(err || retval, "test_run");

same as in previous patch

With this fixed, feel free to add my ack to this and previous patch. Thanks!

>
>         result = (__u64 *)fexit_skel->bss;
> -       for (i = 0; i < 6; i++) {
> -               if (CHECK(result[i] != 1, "result",
> -                         "fexit_test%d failed err %lld\n", i + 1, result[i]))
> -                       goto cleanup;
> +       for (i = 0; i < sizeof(*fexit_skel->bss) / sizeof(__u64); i++) {
> +               if (!ASSERT_EQ(result[i], 1, "fexit_result"))
> +                       return -1;
>         }
>
> +       fexit_test__detach(fexit_skel);
> +
> +       /* zero results for re-attach test */
> +       memset(fexit_skel->bss, 0, sizeof(*fexit_skel->bss));
> +       return 0;
> +}
> +
> +void test_fexit_test(void)
> +{
> +       struct fexit_test *fexit_skel = NULL;
> +       int err;
> +
> +       fexit_skel = fexit_test__open_and_load();
> +       if (!ASSERT_OK_PTR(fexit_skel, "fexit_skel_load"))
> +               goto cleanup;
> +
> +       err = fexit_test(fexit_skel);
> +       if (!ASSERT_OK(err, "fexit_first_attach"))
> +               goto cleanup;
> +
> +       err = fexit_test(fexit_skel);
> +       ASSERT_OK(err, "fexit_second_attach");
> +
>  cleanup:
>         fexit_test__destroy(fexit_skel);
>  }
> --
> 2.30.2
>