From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Roberto Sassu <roberto.sassu@huaweicloud.com>
Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
martin.lau@linux.dev, song@kernel.org, yhs@fb.com,
john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com,
haoluo@google.com, jolsa@kernel.org, mykolal@fb.com,
shuah@kernel.org, bpf@vger.kernel.org,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
Roberto Sassu <roberto.sassu@huawei.com>
Subject: Re: [RESEND][PATCH 4/6] libbpf: Introduce bpf_btf_get_fd_by_id_opts()
Date: Wed, 5 Oct 2022 16:06:43 -0700 [thread overview]
Message-ID: <CAEf4BzZm1iEPyr2Q3L+95JdC4H11dq1AGw1FiOH0XCRHaCzigg@mail.gmail.com> (raw)
In-Reply-To: <20221004131750.2306251-5-roberto.sassu@huaweicloud.com>
On Tue, Oct 4, 2022 at 6:18 AM Roberto Sassu
<roberto.sassu@huaweicloud.com> wrote:
>
> From: Roberto Sassu <roberto.sassu@huawei.com>
>
> Introduce bpf_btf_get_fd_by_id_opts(), for symmetry with
> bpf_map_get_fd_by_id_opts(), to let the caller pass the newly introduced
> data structure bpf_get_fd_opts. Keep the existing bpf_btf_get_fd_by_id(),
> and call bpf_btf_get_fd_by_id_opts() with NULL as opts argument, to prevent
> setting open_flags.
>
> Currently, the kernel does not support non-zero open_flags for
> bpf_btf_get_fd_by_id_opts(), and a call with them will result in an error
> returned by the bpf() system call. The caller should always pass zero
> open_flags.
>
> Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
> ---
> tools/lib/bpf/bpf.c | 12 +++++++++++-
> tools/lib/bpf/bpf.h | 2 ++
> tools/lib/bpf/libbpf.map | 1 +
> 3 files changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
> index 92464c2d1da7..f43e8c8afbd3 100644
> --- a/tools/lib/bpf/bpf.c
> +++ b/tools/lib/bpf/bpf.c
> @@ -980,19 +980,29 @@ int bpf_map_get_fd_by_id(__u32 id)
> return bpf_map_get_fd_by_id_opts(id, NULL);
> }
>
> -int bpf_btf_get_fd_by_id(__u32 id)
> +int bpf_btf_get_fd_by_id_opts(__u32 id,
> + const struct bpf_get_fd_opts *opts)
> {
> const size_t attr_sz = offsetofend(union bpf_attr, open_flags);
> union bpf_attr attr;
> int fd;
>
> + if (!OPTS_VALID(opts, bpf_get_fd_opts))
> + return libbpf_err(-EINVAL);
> +
> memset(&attr, 0, attr_sz);
> attr.btf_id = id;
> + attr.open_flags = OPTS_GET(opts, open_flags, 0);
>
> fd = sys_bpf_fd(BPF_BTF_GET_FD_BY_ID, &attr, attr_sz);
> return libbpf_err_errno(fd);
> }
>
> +int bpf_btf_get_fd_by_id(__u32 id)
> +{
> + return bpf_btf_get_fd_by_id_opts(id, NULL);
> +}
> +
> int bpf_link_get_fd_by_id(__u32 id)
> {
> const size_t attr_sz = offsetofend(union bpf_attr, open_flags);
> diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h
> index 595d342fb7f9..559af0b84299 100644
> --- a/tools/lib/bpf/bpf.h
> +++ b/tools/lib/bpf/bpf.h
> @@ -379,6 +379,8 @@ LIBBPF_API int bpf_prog_get_fd_by_id(__u32 id);
> LIBBPF_API int bpf_map_get_fd_by_id_opts(__u32 id,
> const struct bpf_get_fd_opts *opts);
> LIBBPF_API int bpf_map_get_fd_by_id(__u32 id);
> +LIBBPF_API int bpf_btf_get_fd_by_id_opts(__u32 id,
> + const struct bpf_get_fd_opts *opts);
It's subjective, but opts variants of APIs, being more "advanced"
usually are listed after their simpler non-opts variants. Can you
please add new _opts APIs after their non-opts variants?
> LIBBPF_API int bpf_btf_get_fd_by_id(__u32 id);
> LIBBPF_API int bpf_link_get_fd_by_id(__u32 id);
> LIBBPF_API int bpf_obj_get_info_by_fd(int bpf_fd, void *info, __u32 *info_len);
> diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map
> index c3604eaa220d..7011d5eec67b 100644
> --- a/tools/lib/bpf/libbpf.map
> +++ b/tools/lib/bpf/libbpf.map
> @@ -371,6 +371,7 @@ LIBBPF_1.0.0 {
>
> LIBBPF_1.1.0 {
> global:
> + bpf_btf_get_fd_by_id_opts;
> bpf_map_get_fd_by_id_opts;
> bpf_prog_get_fd_by_id_opts;
> user_ring_buffer__discard;
> --
> 2.25.1
>
next prev parent reply other threads:[~2022-10-05 23:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 13:17 [RESEND][PATCH 0/6] Add _opts variant for bpf_*_get_fd_by_id() Roberto Sassu
2022-10-04 13:17 ` [RESEND][PATCH 1/6] libbpf: Fix LIBBPF_1.0.0 declaration in libbpf.map Roberto Sassu
2022-10-05 23:02 ` Andrii Nakryiko
2022-10-04 13:17 ` [RESEND][PATCH 2/6] libbpf: Define bpf_get_fd_opts and introduce bpf_map_get_fd_by_id_opts() Roberto Sassu
2022-10-05 23:04 ` Andrii Nakryiko
2022-10-04 13:17 ` [RESEND][PATCH 3/6] libbpf: Introduce bpf_prog_get_fd_by_id_opts() Roberto Sassu
2022-10-04 13:17 ` [RESEND][PATCH 4/6] libbpf: Introduce bpf_btf_get_fd_by_id_opts() Roberto Sassu
2022-10-05 23:06 ` Andrii Nakryiko [this message]
2022-10-04 13:17 ` [RESEND][PATCH 5/6] libbpf: Introduce bpf_link_get_fd_by_id_opts() Roberto Sassu
2022-10-04 13:17 ` [RESEND][PATCH 6/6] selftests/bpf: Add tests for _opts variants of bpf_*_get_fd_by_id() Roberto Sassu
2022-10-05 23:13 ` Andrii Nakryiko
2022-10-05 23:14 ` [RESEND][PATCH 0/6] Add _opts variant for bpf_*_get_fd_by_id() 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=CAEf4BzZm1iEPyr2Q3L+95JdC4H11dq1AGw1FiOH0XCRHaCzigg@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=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=mykolal@fb.com \
--cc=roberto.sassu@huawei.com \
--cc=roberto.sassu@huaweicloud.com \
--cc=sdf@google.com \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=yhs@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).