From: Alan Maguire <alan.maguire@oracle.com>
To: acme@kernel.org
Cc: andrii.nakryiko@gmail.com, ast@kernel.org, daniel@iogearbox.net,
jolsa@kernel.org, martin.lau@linux.dev, song@kernel.org,
yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org,
sdf@google.com, haoluo@google.com, mykolal@fb.com,
bpf@vger.kernel.org, Alan Maguire <alan.maguire@oracle.com>
Subject: [RFC dwarves 2/2] btf_encoder: learn BTF_KIND_MAX value from base BTF when generating split BTF
Date: Thu, 20 Jul 2023 21:14:43 +0100 [thread overview]
Message-ID: <20230720201443.224040-3-alan.maguire@oracle.com> (raw)
In-Reply-To: <20230720201443.224040-1-alan.maguire@oracle.com>
When creating module BTF, the module likely will not have a DWARF
specificiation of BTF_KIND_MAX, so look for it in the base BTF. For
vmlinux base BTF, the enumeration value is present, so the base BTF
can be checked to limit BTF kind representation.
Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
---
btf_encoder.c | 24 ++++++++++++++++++++++++
btf_encoder.h | 2 ++
pahole.c | 2 ++
3 files changed, 28 insertions(+)
diff --git a/btf_encoder.c b/btf_encoder.c
index 98c7529..269ed48 100644
--- a/btf_encoder.c
+++ b/btf_encoder.c
@@ -1901,3 +1901,27 @@ void dwarves__set_btf_kind_max(struct conf_load *conf_load, int btf_kind_max)
if (btf_kind_max < BTF_KIND_ENUM64)
conf_load->skip_encoding_btf_enum64 = true;
}
+
+void btf__set_btf_kind_max(struct conf_load *conf_load, struct btf *btf)
+{
+ __u32 id, type_cnt = btf__type_cnt(btf);
+
+ for (id = 1; id < type_cnt; id++) {
+ const struct btf_type *t = btf__type_by_id(btf, id);
+ const struct btf_enum *e;
+ __u16 vlen, i;
+
+ if (!t || !btf_is_enum(t))
+ continue;
+ vlen = btf_vlen(t);
+ e = btf_enum(t);
+ for (i = 0; i < vlen; e++, i++) {
+ const char *name = btf__name_by_offset(btf, e->name_off);
+
+ if (!name || strcmp(name, "BTF_KIND_MAX"))
+ continue;
+ dwarves__set_btf_kind_max(conf_load, e->val);
+ return;
+ }
+ }
+}
diff --git a/btf_encoder.h b/btf_encoder.h
index 34516bb..e5e12ef 100644
--- a/btf_encoder.h
+++ b/btf_encoder.h
@@ -27,4 +27,6 @@ struct btf *btf_encoder__btf(struct btf_encoder *encoder);
int btf_encoder__add_encoder(struct btf_encoder *encoder, struct btf_encoder *other);
+void btf__set_btf_kind_max(struct conf_load *conf_load, struct btf *btf);
+
#endif /* _BTF_ENCODER_H_ */
diff --git a/pahole.c b/pahole.c
index 6fc4ed6..542921a 100644
--- a/pahole.c
+++ b/pahole.c
@@ -3462,6 +3462,7 @@ int main(int argc, char *argv[])
base_btf_file, libbpf_get_error(conf_load.base_btf));
goto out;
}
+ btf__set_btf_kind_max(&conf_load, conf_load.base_btf);
if (!btf_encode && !ctf_encode) {
// Force "btf" since a btf_base is being informed
conf_load.format_path = "btf";
@@ -3505,6 +3506,7 @@ try_sole_arg_as_class_names:
base_btf_file, libbpf_get_error(conf_load.base_btf));
goto out;
}
+ btf__set_btf_kind_max(&conf_load, conf_load.base_btf);
}
}
--
2.39.3
prev parent reply other threads:[~2023-07-20 20:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-20 20:14 [RFC dwarves 0/2] dwarves: detect BTF kinds supported by kernel Alan Maguire
2023-07-20 20:14 ` [RFC dwarves 1/2] dwarves: auto-detect maximum kind supported by vmlinux Alan Maguire
2023-07-26 10:39 ` Jiri Olsa
2023-07-26 15:28 ` Alan Maguire
2023-07-27 15:47 ` Alexei Starovoitov
2023-07-20 20:14 ` Alan Maguire [this message]
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=20230720201443.224040-3-alan.maguire@oracle.com \
--to=alan.maguire@oracle.com \
--cc=acme@kernel.org \
--cc=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=martin.lau@linux.dev \
--cc=mykolal@fb.com \
--cc=sdf@google.com \
--cc=song@kernel.org \
--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).