From: Donglin Peng <dolinux.peng@gmail.com>
To: ast@kernel.org, andrii.nakryiko@gmail.com
Cc: eddyz87@gmail.com, zhangxiaoqin@xiaomi.com,
ihor.solodrai@linux.dev, linux-kernel@vger.kernel.org,
bpf@vger.kernel.org, pengdonglin <pengdonglin@xiaomi.com>,
Alan Maguire <alan.maguire@oracle.com>
Subject: [PATCH bpf-next v9 03/10] tools/resolve_btfids: Support BTF sorting feature
Date: Mon, 8 Dec 2025 14:23:46 +0800 [thread overview]
Message-ID: <20251208062353.1702672-4-dolinux.peng@gmail.com> (raw)
In-Reply-To: <20251208062353.1702672-1-dolinux.peng@gmail.com>
From: pengdonglin <pengdonglin@xiaomi.com>
This introduces a new BTF sorting phase that specifically sorts
BTF types by name in ascending order, so that the binary search
can be used to look up types.
Cc: Eduard Zingerman <eddyz87@gmail.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Alan Maguire <alan.maguire@oracle.com>
Cc: Ihor Solodrai <ihor.solodrai@linux.dev>
Cc: Xiaoqin Zhang <zhangxiaoqin@xiaomi.com>
Signed-off-by: pengdonglin <pengdonglin@xiaomi.com>
---
tools/bpf/resolve_btfids/main.c | 68 +++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/main.c
index e0e792017e77..b4ec3b556518 100644
--- a/tools/bpf/resolve_btfids/main.c
+++ b/tools/bpf/resolve_btfids/main.c
@@ -846,6 +846,71 @@ static int dump_raw_btf(struct btf *btf, const char *out_path)
return 0;
}
+/*
+ * Sort types by name in ascending order resulting in all
+ * anonymous types being placed before named types.
+ */
+static int cmp_type_names(const void *a, const void *b, void *priv)
+{
+ struct btf *btf = (struct btf *)priv;
+ const struct btf_type *ta = btf__type_by_id(btf, *(__u32 *)a);
+ const struct btf_type *tb = btf__type_by_id(btf, *(__u32 *)b);
+ const char *na, *nb;
+
+ na = btf__str_by_offset(btf, ta->name_off);
+ nb = btf__str_by_offset(btf, tb->name_off);
+ return strcmp(na, nb);
+}
+
+static int sort_btf_by_name(struct btf *btf)
+{
+ __u32 *permute_ids = NULL, *id_map = NULL;
+ int nr_types, i, err = 0;
+ __u32 start_id = 1, id;
+
+ if (btf__base_btf(btf))
+ start_id = btf__type_cnt(btf__base_btf(btf));
+ nr_types = btf__type_cnt(btf) - start_id;
+ if (nr_types < 2)
+ goto out;
+
+ permute_ids = calloc(nr_types, sizeof(*permute_ids));
+ if (!permute_ids) {
+ err = -ENOMEM;
+ goto out;
+ }
+
+ id_map = calloc(nr_types, sizeof(*id_map));
+ if (!id_map) {
+ err = -ENOMEM;
+ goto out;
+ }
+
+ for (i = 0, id = start_id; i < nr_types; i++, id++)
+ permute_ids[i] = id;
+
+ qsort_r(permute_ids, nr_types, sizeof(*permute_ids), cmp_type_names, btf);
+
+ for (i = 0; i < nr_types; i++) {
+ id = permute_ids[i] - start_id;
+ id_map[id] = i + start_id;
+ }
+
+ err = btf__permute(btf, id_map, nr_types, NULL);
+ if (err)
+ pr_err("FAILED: btf permute: %s\n", strerror(-err));
+
+out:
+ free(permute_ids);
+ free(id_map);
+ return err;
+}
+
+static int btf2btf(struct object *obj)
+{
+ return sort_btf_by_name(obj->btf);
+}
+
static inline int make_out_path(char *buf, const char *in_path, const char *suffix)
{
int len = snprintf(buf, PATH_MAX, "%s%s", in_path, suffix);
@@ -904,6 +969,9 @@ int main(int argc, const char **argv)
if (load_btf(&obj))
goto out;
+ if (btf2btf(&obj))
+ goto out;
+
if (elf_collect(&obj))
goto out;
--
2.34.1
next prev parent reply other threads:[~2025-12-08 6:24 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-08 6:23 [PATCH bpf-next v9 00/10] Improve the performance of BTF type lookups with binary search Donglin Peng
2025-12-08 6:23 ` [PATCH bpf-next v9 01/10] libbpf: Add BTF permutation support for type reordering Donglin Peng
2025-12-16 22:00 ` Eduard Zingerman
2025-12-16 22:47 ` Andrii Nakryiko
2025-12-17 3:30 ` Donglin Peng
2025-12-08 6:23 ` [PATCH bpf-next v9 02/10] selftests/bpf: Add test cases for btf__permute functionality Donglin Peng
2025-12-16 22:00 ` Eduard Zingerman
2025-12-08 6:23 ` Donglin Peng [this message]
2025-12-16 22:13 ` [PATCH bpf-next v9 03/10] tools/resolve_btfids: Support BTF sorting feature Eduard Zingerman
2025-12-08 6:23 ` [PATCH bpf-next v9 04/10] libbpf: Optimize type lookup with binary search for sorted BTF Donglin Peng
2025-12-16 23:38 ` Eduard Zingerman
2025-12-16 23:43 ` Eduard Zingerman
2025-12-17 2:46 ` Donglin Peng
2025-12-17 2:32 ` Donglin Peng
2025-12-17 2:34 ` Donglin Peng
2025-12-17 2:57 ` Eduard Zingerman
2025-12-08 6:23 ` [PATCH bpf-next v9 05/10] libbpf: Verify BTF Sorting Donglin Peng
2025-12-17 0:32 ` Eduard Zingerman
2025-12-17 3:19 ` Donglin Peng
2025-12-08 6:23 ` [PATCH bpf-next v9 06/10] btf: Optimize type lookup with binary search Donglin Peng
2025-12-08 6:23 ` [PATCH bpf-next v9 07/10] btf: Verify BTF Sorting Donglin Peng
2025-12-09 3:21 ` Donglin Peng
2025-12-17 0:41 ` Eduard Zingerman
2025-12-17 0:48 ` Eduard Zingerman
2025-12-17 3:26 ` Donglin Peng
2025-12-08 6:23 ` [PATCH bpf-next v9 08/10] bpf: Skip anonymous types in type lookup for performance Donglin Peng
2025-12-08 6:36 ` Donglin Peng
2025-12-17 6:55 ` Eduard Zingerman
2025-12-17 9:21 ` Donglin Peng
2025-12-17 17:29 ` Eduard Zingerman
2025-12-18 9:16 ` Donglin Peng
2025-12-08 6:23 ` [PATCH bpf-next v9 09/10] bpf: Optimize the performance of find_bpffs_btf_enums Donglin Peng
2025-12-17 6:58 ` Eduard Zingerman
2025-12-08 6:23 ` [PATCH bpf-next v9 10/10] libbpf: Optimize the performance of determine_ptr_size Donglin Peng
2025-12-17 7:06 ` Eduard Zingerman
2025-12-17 8:38 ` Donglin Peng
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=20251208062353.1702672-4-dolinux.peng@gmail.com \
--to=dolinux.peng@gmail.com \
--cc=alan.maguire@oracle.com \
--cc=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=eddyz87@gmail.com \
--cc=ihor.solodrai@linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=pengdonglin@xiaomi.com \
--cc=zhangxiaoqin@xiaomi.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.