bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Andrii Nakryiko <andrii@kernel.org>,
	john fastabend <john.fastabend@gmail.com>,
	bpf <bpf@vger.kernel.org>, Kernel Team <kernel-team@fb.com>
Subject: Re: [PATCH v4 bpf-next 07/22] selftests/bpf: Test for btf_load command.
Date: Tue, 11 May 2021 15:45:28 -0700	[thread overview]
Message-ID: <CAEf4BzbJDRAVmjPSk6XWcfxuLUvymouN4G+-UYM1G9f=2pX-yA@mail.gmail.com> (raw)
In-Reply-To: <20210508034837.64585-8-alexei.starovoitov@gmail.com>

On Fri, May 7, 2021 at 8:48 PM Alexei Starovoitov
<alexei.starovoitov@gmail.com> wrote:
>
> From: Alexei Starovoitov <ast@kernel.org>
>
> Improve selftest to check that btf_load is working from bpf program.
>
> Signed-off-by: Alexei Starovoitov <ast@kernel.org>
> ---
>  tools/testing/selftests/bpf/progs/syscall.c | 48 +++++++++++++++++++++
>  1 file changed, 48 insertions(+)
>

[...]

>  SEC("syscall")
>  int bpf_prog(struct args *ctx)
>  {
> @@ -33,6 +73,8 @@ int bpf_prog(struct args *ctx)
>                 .map_type = BPF_MAP_TYPE_HASH,
>                 .key_size = 8,
>                 .value_size = 8,
> +               .btf_key_type_id = 1,
> +               .btf_value_type_id = 2,
>         };
>         static union bpf_attr map_update_attr = { .map_fd = 1, };
>         static __u64 key = 12;
> @@ -43,7 +85,13 @@ int bpf_prog(struct args *ctx)
>         };
>         int ret;
>
> +       ret = btf_load();

Maybe let's move patch #11 (bpf_sys_close() helper) in front of these
selftests and call bpf_sys_close() appropriately on error and (if
success) after map is created?



> +       if (ret < 0)
> +               return ret;
> +
>         map_create_attr.max_entries = ctx->max_entries;
> +       map_create_attr.btf_fd = ret;
> +
>         prog_load_attr.license = (long) license;
>         prog_load_attr.insns = (long) insns;
>         prog_load_attr.log_buf = ctx->log_buf;
> --
> 2.30.2
>

  reply	other threads:[~2021-05-11 22:45 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-08  3:48 [PATCH v4 bpf-next 00/22] bpf: syscall program, FD array, loader program, light skeleton Alexei Starovoitov
2021-05-08  3:48 ` [PATCH v4 bpf-next 01/22] bpf: Introduce bpf_sys_bpf() helper and program type Alexei Starovoitov
2021-05-08  3:48 ` [PATCH v4 bpf-next 02/22] bpf: Introduce bpfptr_t user/kernel pointer Alexei Starovoitov
2021-05-11 22:23   ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 03/22] bpf: Prepare bpf syscall to be used from kernel and user space Alexei Starovoitov
2021-05-11 22:31   ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 04/22] libbpf: Support for syscall program type Alexei Starovoitov
2021-05-08  3:48 ` [PATCH v4 bpf-next 05/22] selftests/bpf: Test " Alexei Starovoitov
2021-05-11 22:36   ` Andrii Nakryiko
2021-05-11 22:44     ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 06/22] bpf: Make btf_load command to be bpfptr_t compatible Alexei Starovoitov
2021-05-11 22:41   ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 07/22] selftests/bpf: Test for btf_load command Alexei Starovoitov
2021-05-11 22:45   ` Andrii Nakryiko [this message]
2021-05-12  4:04     ` Alexei Starovoitov
2021-05-12 18:00       ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 08/22] bpf: Introduce fd_idx Alexei Starovoitov
2021-05-11 22:47   ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 09/22] libbpf: Support for fd_idx Alexei Starovoitov
2021-05-11 22:57   ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 10/22] bpf: Add bpf_btf_find_by_name_kind() helper Alexei Starovoitov
2021-05-11 23:02   ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 11/22] bpf: Add bpf_sys_close() helper Alexei Starovoitov
2021-05-08  3:48 ` [PATCH v4 bpf-next 12/22] libbpf: Change the order of data and text relocations Alexei Starovoitov
2021-05-11 23:06   ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 13/22] libbpf: Add bpf_object pointer to kernel_supports() Alexei Starovoitov
2021-05-08  3:48 ` [PATCH v4 bpf-next 14/22] libbpf: Generate loader program out of BPF ELF file Alexei Starovoitov
2021-05-11 23:22   ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 15/22] libbpf: Use fd_array only with gen_loader Alexei Starovoitov
2021-05-11 23:24   ` Andrii Nakryiko
2021-05-12  4:17     ` Alexei Starovoitov
2021-05-12 18:11       ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 16/22] libbpf: Cleanup temp FDs when intermediate sys_bpf fails Alexei Starovoitov
2021-05-11 23:34   ` Andrii Nakryiko
2021-05-12  4:33     ` Alexei Starovoitov
2021-05-08  3:48 ` [PATCH v4 bpf-next 17/22] libbpf: Introduce bpf_map__get_initial_value() Alexei Starovoitov
2021-05-11 23:39   ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 18/22] bpftool: Use syscall/loader program in "prog load" and "gen skeleton" command Alexei Starovoitov
2021-05-12  4:17   ` Andrii Nakryiko
2021-05-12 18:43     ` Alexei Starovoitov
2021-05-12 18:55       ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 19/22] selftests/bpf: Convert few tests to light skeleton Alexei Starovoitov
2021-05-12  4:19   ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 20/22] selftests/bpf: Convert atomics test " Alexei Starovoitov
2021-05-12  4:21   ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 21/22] selftests/bpf: Convert test printk to use rodata Alexei Starovoitov
2021-05-12  4:23   ` Andrii Nakryiko
2021-05-08  3:48 ` [PATCH v4 bpf-next 22/22] selftests/bpf: Convert test trace_printk to lskel Alexei Starovoitov
2021-05-12  4:24   ` Andrii Nakryiko

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='CAEf4BzbJDRAVmjPSk6XWcfxuLUvymouN4G+-UYM1G9f=2pX-yA@mail.gmail.com' \
    --to=andrii.nakryiko@gmail.com \
    --cc=alexei.starovoitov@gmail.com \
    --cc=andrii@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=john.fastabend@gmail.com \
    --cc=kernel-team@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).