| Message ID | 20200616100512.2168860-7-jolsa@kernel.org |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | bpf: Add d_path helper | expand |
On Tue, Jun 16, 2020 at 3:06 AM Jiri Olsa <jolsa@kernel.org> wrote: > > There's no need for it. > > Signed-off-by: Jiri Olsa <jolsa@kernel.org> > --- It matches bpf_verifier_ops->btf_struct_access, though, which, I think, actually allows write access for some special cases. So I think we should keep it. > include/linux/bpf.h | 1 - > kernel/bpf/btf.c | 3 +-- > kernel/bpf/verifier.c | 2 +- > net/ipv4/bpf_tcp_ca.c | 2 +- > 4 files changed, 3 insertions(+), 5 deletions(-) > [...]
On Thu, Jun 18, 2020 at 08:58:06PM -0700, Andrii Nakryiko wrote: > On Tue, Jun 16, 2020 at 3:06 AM Jiri Olsa <jolsa@kernel.org> wrote: > > > > There's no need for it. > > > > Signed-off-by: Jiri Olsa <jolsa@kernel.org> > > --- > > It matches bpf_verifier_ops->btf_struct_access, though, which, I > think, actually allows write access for some special cases. So I think > we should keep it. ok, will keep it jirka > > > include/linux/bpf.h | 1 - > > kernel/bpf/btf.c | 3 +-- > > kernel/bpf/verifier.c | 2 +- > > net/ipv4/bpf_tcp_ca.c | 2 +- > > 4 files changed, 3 insertions(+), 5 deletions(-) > > > > [...] >
diff --git a/include/linux/bpf.h b/include/linux/bpf.h index f18c23dcc858..b7d3b5f3dc09 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -1282,7 +1282,6 @@ bool btf_ctx_access(int off, int size, enum bpf_access_type type, struct bpf_insn_access_aux *info); int btf_struct_access(struct bpf_verifier_log *log, const struct btf_type *t, int off, int size, - enum bpf_access_type atype, u32 *next_btf_id); int btf_resolve_helper_id(struct bpf_verifier_log *log, const struct bpf_func_proto *fn, int); diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index aea7b2cc8d26..304369a4c2e2 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -3831,7 +3831,6 @@ bool btf_ctx_access(int off, int size, enum bpf_access_type type, int btf_struct_access(struct bpf_verifier_log *log, const struct btf_type *t, int off, int size, - enum bpf_access_type atype, u32 *next_btf_id) { u32 i, moff, mtrue_end, msize = 0, total_nelems = 0; @@ -3880,7 +3879,7 @@ int btf_struct_access(struct bpf_verifier_log *log, goto error; off = (off - moff) % elem_type->size; - return btf_struct_access(log, elem_type, off, size, atype, + return btf_struct_access(log, elem_type, off, size, next_btf_id); error: diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 5c7bbaac81ef..b553e4523bd3 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -3175,7 +3175,7 @@ static int check_ptr_to_btf_access(struct bpf_verifier_env *env, return -EACCES; } - ret = btf_struct_access(&env->log, t, off, size, atype, + ret = btf_struct_access(&env->log, t, off, size, &btf_id); } diff --git a/net/ipv4/bpf_tcp_ca.c b/net/ipv4/bpf_tcp_ca.c index e3939f76b024..c6aab9389ac4 100644 --- a/net/ipv4/bpf_tcp_ca.c +++ b/net/ipv4/bpf_tcp_ca.c @@ -130,7 +130,7 @@ static int bpf_tcp_ca_btf_struct_access(struct bpf_verifier_log *log, size_t end; if (atype == BPF_READ) - return btf_struct_access(log, t, off, size, atype, next_btf_id); + return btf_struct_access(log, t, off, size, next_btf_id); if (t != tcp_sock_type) { bpf_log(log, "only read is supported\n");
There's no need for it. Signed-off-by: Jiri Olsa <jolsa@kernel.org> --- include/linux/bpf.h | 1 - kernel/bpf/btf.c | 3 +-- kernel/bpf/verifier.c | 2 +- net/ipv4/bpf_tcp_ca.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-)