From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Menglong Dong <menglong8.dong@gmail.com>,
dwarves@vger.kernel.org, bpf@vger.kernel.org,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andriin@fb.com>, Yonghong Song <yhs@fb.com>,
Song Liu <songliubraving@fb.com>,
Alan Maguire <alan.maguire@oracle.com>,
Eduard Zingerman <eddyz87@gmail.com>,
Ihor Solodrai <ihor.solodrai@linux.dev>
Subject: [RFC dwarves] btf_encoder: Remove duplicates from functions entries
Date: Thu, 17 Jul 2025 17:25:12 +0200 [thread overview]
Message-ID: <20250717152512.488022-1-jolsa@kernel.org> (raw)
Menglong reported issue where we can have function in BTF which has
multiple addresses in kallsysm [1].
Rather than filtering this in runtime, let's teach pahole to remove
such functions.
Removing duplicate records from functions entries that have more
at least one different address. This way btf_encoder__find_function
won't find such functions and they won't be added in BTF.
In my setup it removed 428 functions out of 77141.
[1] https://lore.kernel.org/bpf/20250710070835.260831-1-dongml2@chinatelecom.cn/
Reported-by: Menglong Dong <menglong8.dong@gmail.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
Alan,
I'd like to test this in the pahole CI, is there a way to manualy trigger it?
thanks,
jirka
---
btf_encoder.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/btf_encoder.c b/btf_encoder.c
index 16739066caae..a25fe2f8bfb1 100644
--- a/btf_encoder.c
+++ b/btf_encoder.c
@@ -99,6 +99,7 @@ struct elf_function {
size_t prefixlen;
bool kfunc;
uint32_t kfunc_flags;
+ unsigned long addr;
};
struct elf_secinfo {
@@ -1469,6 +1470,7 @@ static void elf_functions__collect_function(struct elf_functions *functions, GEl
func = &functions->entries[functions->cnt];
func->name = name;
+ func->addr = sym->st_value;
if (strchr(name, '.')) {
const char *suffix = strchr(name, '.');
@@ -2143,6 +2145,40 @@ int btf_encoder__encode(struct btf_encoder *encoder, struct conf_load *conf)
return err;
}
+/*
+ * Remove name duplicates from functions->entries that have
+ * at least 2 different addresses.
+ */
+static void functions_remove_dups(struct elf_functions *functions)
+{
+ struct elf_function *n = &functions->entries[0];
+ bool matched = false, diff = false;
+ int i, j;
+
+ for (i = 0, j = 1; i < functions->cnt && j < functions->cnt; i++, j++) {
+ struct elf_function *a = &functions->entries[i];
+ struct elf_function *b = &functions->entries[j];
+
+ if (!strcmp(a->name, b->name)) {
+ matched = true;
+ diff |= a->addr != b->addr;
+ continue;
+ }
+
+ /*
+ * Keep only not-matched entries and last one of the matched/duplicates
+ * ones if all of the matched entries had the same address.
+ **/
+ if (!matched || !diff)
+ *n++ = *a;
+ matched = diff = false;
+ }
+
+ if (!matched || !diff)
+ *n++ = functions->entries[functions->cnt - 1];
+ functions->cnt = n - &functions->entries[0];
+}
+
static int elf_functions__collect(struct elf_functions *functions)
{
uint32_t nr_symbols = elf_symtab__nr_symbols(functions->symtab);
@@ -2168,6 +2204,7 @@ static int elf_functions__collect(struct elf_functions *functions)
if (functions->cnt) {
qsort(functions->entries, functions->cnt, sizeof(*functions->entries), functions_cmp);
+ functions_remove_dups(functions);
} else {
err = 0;
goto out_free;
--
2.50.1
next reply other threads:[~2025-07-17 15:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-17 15:25 Jiri Olsa [this message]
2025-07-21 11:41 ` [RFC dwarves] btf_encoder: Remove duplicates from functions entries Alan Maguire
2025-07-21 14:27 ` Jiri Olsa
2025-07-21 14:32 ` Nick Alcock
2025-07-21 23:27 ` Ihor Solodrai
2025-07-22 10:45 ` Alan Maguire
2025-07-22 22:58 ` Ihor Solodrai
2025-07-23 11:22 ` Jiri Olsa
2025-07-24 17:54 ` Alan Maguire
2025-07-24 21:26 ` Ihor Solodrai
2025-07-22 10:54 ` Jiri Olsa
2025-07-22 16:07 ` Ihor Solodrai
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=20250717152512.488022-1-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=acme@kernel.org \
--cc=alan.maguire@oracle.com \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=dwarves@vger.kernel.org \
--cc=eddyz87@gmail.com \
--cc=ihor.solodrai@linux.dev \
--cc=menglong8.dong@gmail.com \
--cc=songliubraving@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