From: Martin KaFai Lau <kafai@fb.com>
To: <bpf@vger.kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
David Miller <davem@davemloft.net>, <kernel-team@fb.com>,
<netdev@vger.kernel.org>
Subject: [PATCH bpf-next 02/13] bpf: Avoid storing modifier to info->btf_id
Date: Fri, 13 Dec 2019 16:47:41 -0800 [thread overview]
Message-ID: <20191214004741.1652332-1-kafai@fb.com> (raw)
In-Reply-To: <20191214004737.1652076-1-kafai@fb.com>
info->btf_id expects the btf_id of a struct, so it should
store the final result after skipping modifiers (if any).
It also takes this chanace to add a missing newline in one of the
bpf_log() messages.
Signed-off-by: Martin KaFai Lau <kafai@fb.com>
---
kernel/bpf/btf.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 7d40da240891..88359a4bccb0 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -3696,7 +3696,6 @@ bool btf_ctx_access(int off, int size, enum bpf_access_type type,
/* this is a pointer to another type */
info->reg_type = PTR_TO_BTF_ID;
- info->btf_id = t->type;
if (tgt_prog) {
ret = btf_translate_to_vmlinux(log, btf, t, tgt_prog->type);
@@ -3707,10 +3706,14 @@ bool btf_ctx_access(int off, int size, enum bpf_access_type type,
return false;
}
}
+
+ info->btf_id = t->type;
t = btf_type_by_id(btf, t->type);
/* skip modifiers */
- while (btf_type_is_modifier(t))
+ while (btf_type_is_modifier(t)) {
+ info->btf_id = t->type;
t = btf_type_by_id(btf, t->type);
+ }
if (!btf_type_is_struct(t)) {
bpf_log(log,
"func '%s' arg%d type %s is not a struct\n",
@@ -3736,7 +3739,7 @@ int btf_struct_access(struct bpf_verifier_log *log,
again:
tname = __btf_name_by_offset(btf_vmlinux, t->name_off);
if (!btf_type_is_struct(t)) {
- bpf_log(log, "Type '%s' is not a struct", tname);
+ bpf_log(log, "Type '%s' is not a struct\n", tname);
return -EINVAL;
}
--
2.17.1
next prev parent reply other threads:[~2019-12-14 0:47 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-14 0:47 [PATCH bpf-next 00/13] Introduce BPF STRUCT_OPS Martin KaFai Lau
2019-12-14 0:47 ` [PATCH bpf-next 01/13] bpf: Save PTR_TO_BTF_ID register state when spilling to stack Martin KaFai Lau
2019-12-16 19:48 ` Yonghong Song
2019-12-14 0:47 ` Martin KaFai Lau [this message]
2019-12-16 21:34 ` [PATCH bpf-next 02/13] bpf: Avoid storing modifier to info->btf_id Yonghong Song
2019-12-14 0:47 ` [PATCH bpf-next 03/13] bpf: Add enum support to btf_ctx_access() Martin KaFai Lau
2019-12-16 21:36 ` Yonghong Song
2019-12-14 0:47 ` [PATCH bpf-next 04/13] bpf: Support bitfield read access in btf_struct_access Martin KaFai Lau
2019-12-16 22:05 ` Yonghong Song
2019-12-14 0:47 ` [PATCH bpf-next 05/13] bpf: Introduce BPF_PROG_TYPE_STRUCT_OPS Martin KaFai Lau
2019-12-17 6:14 ` Yonghong Song
2019-12-18 16:41 ` Martin Lau
2019-12-14 0:47 ` [PATCH bpf-next 06/13] bpf: Introduce BPF_MAP_TYPE_STRUCT_OPS Martin KaFai Lau
2019-12-17 7:48 ` [Potential Spoof] " Yonghong Song
2019-12-20 7:22 ` Martin Lau
2019-12-20 16:52 ` Martin Lau
2019-12-20 18:41 ` Andrii Nakryiko
2019-12-14 0:47 ` [PATCH bpf-next 07/13] bpf: tcp: Support tcp_congestion_ops in bpf Martin KaFai Lau
2019-12-17 17:36 ` Yonghong Song
2019-12-14 0:47 ` [PATCH bpf-next 08/13] bpf: Add BPF_FUNC_tcp_send_ack helper Martin KaFai Lau
2019-12-17 17:41 ` Yonghong Song
2019-12-14 0:47 ` [PATCH bpf-next 09/13] bpf: Add BPF_FUNC_jiffies Martin KaFai Lau
2019-12-14 1:59 ` Eric Dumazet
2019-12-14 19:25 ` Neal Cardwell
2019-12-16 19:30 ` Martin Lau
2019-12-17 8:26 ` Jakub Sitnicki
2019-12-17 18:22 ` Martin Lau
2019-12-17 21:04 ` Eric Dumazet
2019-12-18 9:03 ` Jakub Sitnicki
2019-12-16 19:14 ` Martin Lau
2019-12-16 19:33 ` Eric Dumazet
2019-12-16 21:17 ` Martin Lau
2019-12-16 23:08 ` Alexei Starovoitov
2019-12-17 0:34 ` Eric Dumazet
2019-12-14 0:48 ` [PATCH bpf-next 10/13] bpf: Synch uapi bpf.h to tools/ Martin KaFai Lau
2019-12-14 0:48 ` [PATCH bpf-next 11/13] bpf: libbpf: Add STRUCT_OPS support Martin KaFai Lau
2019-12-18 3:07 ` Andrii Nakryiko
2019-12-18 7:03 ` Martin Lau
2019-12-18 7:20 ` Martin Lau
2019-12-18 16:36 ` Andrii Nakryiko
2019-12-18 16:34 ` Andrii Nakryiko
2019-12-18 17:33 ` Martin Lau
2019-12-18 18:14 ` Andrii Nakryiko
2019-12-18 20:19 ` Martin Lau
2019-12-19 8:53 ` Toke Høiland-Jørgensen
2019-12-19 20:49 ` Andrii Nakryiko
2019-12-20 10:16 ` Toke Høiland-Jørgensen
2019-12-20 17:34 ` Andrii Nakryiko
2019-12-14 0:48 ` [PATCH bpf-next 12/13] bpf: Add bpf_dctcp example Martin KaFai Lau
2019-12-14 0:48 ` [PATCH bpf-next 13/13] bpf: Add bpf_cubic example Martin KaFai Lau
2019-12-14 2:26 ` [PATCH bpf-next 00/13] Introduce BPF STRUCT_OPS Eric Dumazet
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=20191214004741.1652332-1-kafai@fb.com \
--to=kafai@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
/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).