From: Eduard Zingerman <eddyz87@gmail.com>
To: dwarves@vger.kernel.org, arnaldo.melo@gmail.com
Cc: bpf@vger.kernel.org, kernel-team@fb.com, ast@kernel.org,
daniel@iogearbox.net, andrii@kernel.org, yhs@fb.com,
jemarch@gnu.org, david.faust@oracle.com, mykolal@fb.com,
Eduard Zingerman <eddyz87@gmail.com>
Subject: [PATCH v3 dwarves 6/6] btf_encoder: skip type tags for VAR entry types
Date: Wed, 24 May 2023 03:18:25 +0300 [thread overview]
Message-ID: <20230524001825.2688661-7-eddyz87@gmail.com> (raw)
In-Reply-To: <20230524001825.2688661-1-eddyz87@gmail.com>
Kernel does not expect VAR entries to have types starting from
BTF_TYPE_TAG. Specifically, the code like below will be rejected:
struct rq __percpu runqueues;
...
rq = (struct rq *)bpf_per_cpu_ptr(&runqueues, cpu);
... rq->cpu ... // rq type is now PTR_TO_BTF_ID
The access to 'rq->cpu' would be checked by a call to
kernel/bpf/btf.c:btf_struct_access() which invokes btf_struct_walk(),
using rq's type as a starting point. The btf_struct_walk() wants the
first type in a chain to be STRUCT or UNION and does not skip modifiers.
Before introduction of support for 'btf:type_tag' such situations were
not possible, as TYPE_TAG entries were always preceded by PTR entries.
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
---
btf_encoder.c | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/btf_encoder.c b/btf_encoder.c
index 65f6e71..300d9c2 100644
--- a/btf_encoder.c
+++ b/btf_encoder.c
@@ -1498,6 +1498,19 @@ static bool ftype__has_arg_names(const struct ftype *ftype)
return true;
}
+static type_id_t skip_btf_type_tags(struct cu *cu, type_id_t id)
+{
+ for (;;) {
+ struct tag *tag = cu__type(cu, id);
+
+ if (tag == NULL || tag->tag != DW_TAG_LLVM_annotation)
+ break;
+ id = tag->type;
+ }
+
+ return id;
+}
+
static int btf_encoder__encode_cu_variables(struct btf_encoder *encoder)
{
struct cu *cu = encoder->cu;
@@ -1583,7 +1596,22 @@ static int btf_encoder__encode_cu_variables(struct btf_encoder *encoder)
continue;
}
- type = var->ip.tag.type + encoder->type_id_off;
+ /* Kernel does not expect VAR entries to have types starting from BTF_TYPE_TAG.
+ * Specifically, the code like below will be rejected:
+ *
+ * struct rq __percpu runqueues;
+ * ...
+ * rq = (struct rq *)bpf_per_cpu_ptr(&runqueues, cpu);
+ * ... rq->cpu ... // rq type is now PTR_TO_BTF_ID
+ *
+ * The access to 'rq->cpu' would be checked by a call to
+ * kernel/bpf/btf.c:btf_struct_access() which invokes btf_struct_walk(),
+ * using rq's type as a starting point. The btf_struct_walk() wants the
+ * first type in a chain to be STRUCT or UNION and does not skip modifiers.
+ *
+ * Thus, call skip_btf_type_tags() here.
+ */
+ type = skip_btf_type_tags(cu, var->ip.tag.type) + encoder->type_id_off;
linkage = var->external ? BTF_VAR_GLOBAL_ALLOCATED : BTF_VAR_STATIC;
if (encoder->verbose) {
--
2.40.1
next prev parent reply other threads:[~2023-05-24 0:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-24 0:18 [PATCH v3 dwarves 0/6] Support for new btf_type_tag encoding Eduard Zingerman
2023-05-24 0:18 ` [PATCH v3 dwarves 1/6] dwarves.h: expose ptr_table interface Eduard Zingerman
2023-05-24 0:18 ` [PATCH v3 dwarves 2/6] dwarf_loader: Track unspecified types in a separate list Eduard Zingerman
2023-05-24 0:18 ` [PATCH v3 dwarves 3/6] dwarf_loader: handle btf_type_tag w/o special pointer type Eduard Zingerman
2023-05-24 0:18 ` [PATCH v3 dwarves 4/6] dwarf_loader: support btf:type_tag DW_TAG_LLVM_annotation Eduard Zingerman
2023-05-24 0:18 ` [PATCH v3 dwarves 5/6] dwarf_loader: move type tags before CVR qualifiers when necessary Eduard Zingerman
2023-05-24 0:18 ` Eduard Zingerman [this message]
2023-05-25 0:13 ` [PATCH v3 dwarves 0/6] Support for new btf_type_tag encoding Eduard Zingerman
2023-05-26 0:06 ` Eduard Zingerman
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=20230524001825.2688661-7-eddyz87@gmail.com \
--to=eddyz87@gmail.com \
--cc=andrii@kernel.org \
--cc=arnaldo.melo@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=david.faust@oracle.com \
--cc=dwarves@vger.kernel.org \
--cc=jemarch@gnu.org \
--cc=kernel-team@fb.com \
--cc=mykolal@fb.com \
--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).