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 06/17] bpf: Make btf_load command to be bpfptr_t compatible.
Date: Wed, 5 May 2021 20:44:54 -0700 [thread overview]
Message-ID: <20210506034505.25979-7-alexei.starovoitov@gmail.com> (raw)
In-Reply-To: <20210506034505.25979-1-alexei.starovoitov@gmail.com>
From: Alexei Starovoitov <ast@kernel.org>
Similar to prog_load make btf_load command to be availble to
bpf_prog_type_syscall program.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---
include/linux/btf.h | 2 +-
kernel/bpf/btf.c | 8 ++++----
kernel/bpf/syscall.c | 7 ++++---
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/include/linux/btf.h b/include/linux/btf.h
index 3bac66e0183a..94a0c976c90f 100644
--- a/include/linux/btf.h
+++ b/include/linux/btf.h
@@ -21,7 +21,7 @@ extern const struct file_operations btf_fops;
void btf_get(struct btf *btf);
void btf_put(struct btf *btf);
-int btf_new_fd(const union bpf_attr *attr);
+int btf_new_fd(const union bpf_attr *attr, bpfptr_t uattr);
struct btf *btf_get_by_fd(int fd);
int btf_get_info_by_fd(const struct btf *btf,
const union bpf_attr *attr,
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 0600ed325fa0..fbf6c06a9d62 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -4257,7 +4257,7 @@ static int btf_parse_hdr(struct btf_verifier_env *env)
return 0;
}
-static struct btf *btf_parse(void __user *btf_data, u32 btf_data_size,
+static struct btf *btf_parse(bpfptr_t btf_data, u32 btf_data_size,
u32 log_level, char __user *log_ubuf, u32 log_size)
{
struct btf_verifier_env *env = NULL;
@@ -4306,7 +4306,7 @@ static struct btf *btf_parse(void __user *btf_data, u32 btf_data_size,
btf->data = data;
btf->data_size = btf_data_size;
- if (copy_from_user(data, btf_data, btf_data_size)) {
+ if (copy_from_bpfptr(data, btf_data, btf_data_size)) {
err = -EFAULT;
goto errout;
}
@@ -5780,12 +5780,12 @@ static int __btf_new_fd(struct btf *btf)
return anon_inode_getfd("btf", &btf_fops, btf, O_RDONLY | O_CLOEXEC);
}
-int btf_new_fd(const union bpf_attr *attr)
+int btf_new_fd(const union bpf_attr *attr, bpfptr_t uattr)
{
struct btf *btf;
int ret;
- btf = btf_parse(u64_to_user_ptr(attr->btf),
+ btf = btf_parse(make_bpfptr(attr->btf, uattr.is_kernel),
attr->btf_size, attr->btf_log_level,
u64_to_user_ptr(attr->btf_log_buf),
attr->btf_log_size);
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 28387fe149ba..415865c49dd4 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -3842,7 +3842,7 @@ static int bpf_obj_get_info_by_fd(const union bpf_attr *attr,
#define BPF_BTF_LOAD_LAST_FIELD btf_log_level
-static int bpf_btf_load(const union bpf_attr *attr)
+static int bpf_btf_load(const union bpf_attr *attr, bpfptr_t uattr)
{
if (CHECK_ATTR(BPF_BTF_LOAD))
return -EINVAL;
@@ -3850,7 +3850,7 @@ static int bpf_btf_load(const union bpf_attr *attr)
if (!bpf_capable())
return -EPERM;
- return btf_new_fd(attr);
+ return btf_new_fd(attr, uattr);
}
#define BPF_BTF_GET_FD_BY_ID_LAST_FIELD btf_id
@@ -4471,7 +4471,7 @@ static int __sys_bpf(int cmd, bpfptr_t uattr, unsigned int size)
err = bpf_raw_tracepoint_open(&attr);
break;
case BPF_BTF_LOAD:
- err = bpf_btf_load(&attr);
+ err = bpf_btf_load(&attr, uattr);
break;
case BPF_BTF_GET_FD_BY_ID:
err = bpf_btf_get_fd_by_id(&attr);
@@ -4552,6 +4552,7 @@ BPF_CALL_3(bpf_sys_bpf, int, cmd, void *, attr, u32, attr_size)
case BPF_MAP_UPDATE_ELEM:
case BPF_MAP_FREEZE:
case BPF_PROG_LOAD:
+ case BPF_BTF_LOAD:
break;
/* case BPF_PROG_TEST_RUN:
* is not part of this list to prevent recursive test_run
--
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 ` Alexei Starovoitov [this message]
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 ` [PATCH v3 bpf-next 10/17] bpf: Add bpf_btf_find_by_name_kind() helper Alexei Starovoitov
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-7-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).