From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
To: davem@davemloft.net
Cc: daniel@iogearbox.net, andrii@kernel.org,
john.fastabend@gmail.com, bpf@vger.kernel.org,
kernel-team@fb.com
Subject: [PATCH v3 bpf-next 10/17] bpf: Add bpf_btf_find_by_name_kind() helper.
Date: Wed, 5 May 2021 20:44:58 -0700 [thread overview]
Message-ID: <20210506034505.25979-11-alexei.starovoitov@gmail.com> (raw)
In-Reply-To: <20210506034505.25979-1-alexei.starovoitov@gmail.com>
From: Alexei Starovoitov <ast@kernel.org>
Add new helper:
long bpf_btf_find_by_name_kind(char *name, int name_sz, u32 kind, int flags)
Description
Find BTF type with given name and kind in vmlinux BTF or in module's BTFs.
Return
Returns btf_id and btf_obj_fd in lower and upper 32 bits.
It will be used by loader program to find btf_id to attach the program to
and to find btf_ids of ksyms.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---
include/linux/bpf.h | 1 +
include/uapi/linux/bpf.h | 7 ++++
kernel/bpf/btf.c | 62 ++++++++++++++++++++++++++++++++++
kernel/bpf/syscall.c | 2 ++
tools/include/uapi/linux/bpf.h | 7 ++++
5 files changed, 79 insertions(+)
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 7fd53380c981..9dc44ba97584 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -1974,6 +1974,7 @@ extern const struct bpf_func_proto bpf_get_socket_ptr_cookie_proto;
extern const struct bpf_func_proto bpf_task_storage_get_proto;
extern const struct bpf_func_proto bpf_task_storage_delete_proto;
extern const struct bpf_func_proto bpf_for_each_map_elem_proto;
+extern const struct bpf_func_proto bpf_btf_find_by_name_kind_proto;
const struct bpf_func_proto *bpf_tracing_func_proto(
enum bpf_func_id func_id, const struct bpf_prog *prog);
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index de58a714ed36..3cc07351c1cf 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -4748,6 +4748,12 @@ union bpf_attr {
* Execute bpf syscall with given arguments.
* Return
* A syscall result.
+ *
+ * long bpf_btf_find_by_name_kind(char *name, int name_sz, u32 kind, int flags)
+ * Description
+ * Find BTF type with given name and kind in vmlinux BTF or in module's BTFs.
+ * Return
+ * Returns btf_id and btf_obj_fd in lower and upper 32 bits.
*/
#define __BPF_FUNC_MAPPER(FN) \
FN(unspec), \
@@ -4917,6 +4923,7 @@ union bpf_attr {
FN(for_each_map_elem), \
FN(snprintf), \
FN(sys_bpf), \
+ FN(btf_find_by_name_kind), \
/* */
/* integer value in 'imm' field of BPF_CALL instruction selects which helper
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index fbf6c06a9d62..85716327c375 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -6085,3 +6085,65 @@ struct module *btf_try_get_module(const struct btf *btf)
return res;
}
+
+BPF_CALL_4(bpf_btf_find_by_name_kind, char *, name, int, name_sz, u32, kind, int, flags)
+{
+ struct btf *btf;
+ long ret;
+
+ if (flags)
+ return -EINVAL;
+
+ if (name_sz <= 1 || name[name_sz - 1])
+ return -EINVAL;
+
+ btf = bpf_get_btf_vmlinux();
+ if (IS_ERR(btf))
+ return PTR_ERR(btf);
+
+ ret = btf_find_by_name_kind(btf, name, kind);
+ /* ret is never zero, since btf_find_by_name_kind returns
+ * positive btf_id or negative error.
+ */
+ if (ret < 0) {
+ struct btf *mod_btf;
+ int id;
+
+ /* If name is not found in vmlinux's BTF then search in module's BTFs */
+ spin_lock_bh(&btf_idr_lock);
+ idr_for_each_entry(&btf_idr, mod_btf, id) {
+ if (!btf_is_module(mod_btf))
+ continue;
+ /* linear search could be slow hence unlock/lock
+ * the IDR to avoiding holding it for too long
+ */
+ btf_get(mod_btf);
+ spin_unlock_bh(&btf_idr_lock);
+ ret = btf_find_by_name_kind(mod_btf, name, kind);
+ if (ret > 0) {
+ int btf_obj_fd;
+
+ btf_obj_fd = __btf_new_fd(mod_btf);
+ if (btf_obj_fd < 0) {
+ btf_put(mod_btf);
+ return btf_obj_fd;
+ }
+ return ret | (((u64)btf_obj_fd) << 32);
+ }
+ spin_lock_bh(&btf_idr_lock);
+ btf_put(mod_btf);
+ }
+ spin_unlock_bh(&btf_idr_lock);
+ }
+ return ret;
+}
+
+const struct bpf_func_proto bpf_btf_find_by_name_kind_proto = {
+ .func = bpf_btf_find_by_name_kind,
+ .gpl_only = false,
+ .ret_type = RET_INTEGER,
+ .arg1_type = ARG_PTR_TO_MEM,
+ .arg2_type = ARG_CONST_SIZE,
+ .arg3_type = ARG_ANYTHING,
+ .arg4_type = ARG_ANYTHING,
+};
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index da7dc2406470..f93ff2ebf96d 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -4584,6 +4584,8 @@ syscall_prog_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
switch (func_id) {
case BPF_FUNC_sys_bpf:
return &bpf_sys_bpf_proto;
+ case BPF_FUNC_btf_find_by_name_kind:
+ return &bpf_btf_find_by_name_kind_proto;
default:
return tracing_prog_func_proto(func_id, prog);
}
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index 6c8e178d8ffa..8a892231a1ae 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -4748,6 +4748,12 @@ union bpf_attr {
* Execute bpf syscall with given arguments.
* Return
* A syscall result.
+ *
+ * long bpf_btf_find_by_name_kind(char *name, int name_sz, u32 kind, int flags)
+ * Description
+ * Find BTF type with given name and kind in vmlinux BTF or in module's BTFs.
+ * Return
+ * Returns btf_id and btf_obj_fd in lower and upper 32 bits.
*/
#define __BPF_FUNC_MAPPER(FN) \
FN(unspec), \
@@ -4917,6 +4923,7 @@ union bpf_attr {
FN(for_each_map_elem), \
FN(snprintf), \
FN(sys_bpf), \
+ FN(btf_find_by_name_kind), \
/* */
/* integer value in 'imm' field of BPF_CALL instruction selects which helper
--
2.30.2
next prev parent reply other threads:[~2021-05-06 3:45 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-06 3:44 [PATCH v3 bpf-next 00/17] bpf: syscall program, FD array, loader program, light skeleton Alexei Starovoitov
2021-05-06 3:44 ` [PATCH v3 bpf-next 01/17] bpf: Introduce bpf_sys_bpf() helper and program type Alexei Starovoitov
2021-05-06 3:44 ` [PATCH v3 bpf-next 02/17] bpf: Introduce bpfptr_t user/kernel pointer Alexei Starovoitov
2021-05-06 3:44 ` [PATCH v3 bpf-next 03/17] bpf: Prepare bpf syscall to be used from kernel and user space Alexei Starovoitov
2021-05-06 3:44 ` [PATCH v3 bpf-next 04/17] libbpf: Support for syscall program type Alexei Starovoitov
2021-05-06 3:44 ` [PATCH v3 bpf-next 05/17] selftests/bpf: Test " Alexei Starovoitov
2021-05-06 3:44 ` [PATCH v3 bpf-next 06/17] bpf: Make btf_load command to be bpfptr_t compatible Alexei Starovoitov
2021-05-06 3:44 ` [PATCH v3 bpf-next 07/17] selftests/bpf: Test for btf_load command Alexei Starovoitov
2021-05-06 3:44 ` [PATCH v3 bpf-next 08/17] bpf: Introduce fd_idx Alexei Starovoitov
2021-05-06 3:44 ` [PATCH v3 bpf-next 09/17] libbpf: Support for fd_idx Alexei Starovoitov
2021-05-06 3:44 ` Alexei Starovoitov [this message]
2021-05-06 3:44 ` [PATCH v3 bpf-next 11/17] bpf: Add bpf_sys_close() helper Alexei Starovoitov
2021-05-06 3:45 ` [PATCH v3 bpf-next 12/17] libbpf: Change the order of data and text relocations Alexei Starovoitov
2021-05-06 3:45 ` [PATCH v3 bpf-next 13/17] libbpf: Add bpf_object pointer to kernel_supports() Alexei Starovoitov
2021-05-06 3:45 ` [PATCH v3 bpf-next 14/17] libbpf: Generate loader program out of BPF ELF file Alexei Starovoitov
2021-05-06 3:45 ` [PATCH v3 bpf-next 15/17] libbpf: Use fd_array only with gen_loader Alexei Starovoitov
2021-05-06 3:45 ` [PATCH v3 bpf-next 16/17] bpftool: Use syscall/loader program in "prog load" and "gen skeleton" command Alexei Starovoitov
2021-05-06 3:45 ` [PATCH v3 bpf-next 17/17] selftests/bpf: Convert few tests to light skeleton Alexei Starovoitov
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=20210506034505.25979-11-alexei.starovoitov@gmail.com \
--to=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).