BPF List
 help / color / mirror / Atom feed
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 05/10] libbpf: Verify BTF Sorting
Date: Mon,  8 Dec 2025 14:23:48 +0800	[thread overview]
Message-ID: <20251208062353.1702672-6-dolinux.peng@gmail.com> (raw)
In-Reply-To: <20251208062353.1702672-1-dolinux.peng@gmail.com>

From: pengdonglin <pengdonglin@xiaomi.com>

This patch checks whether the BTF is sorted by name in ascending
order. If sorted, binary search will be used when looking 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/lib/bpf/btf.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index 7f150c869bf6..a53d24704857 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -899,6 +899,49 @@ int btf__resolve_type(const struct btf *btf, __u32 type_id)
 	return type_id;
 }
 
+/*
+ * Assuming that types are sorted by name in ascending order.
+ */
+static int btf_compare_type_names(const void *a, const void *b, void *priv)
+{
+	struct btf *btf = (struct btf *)priv;
+	struct btf_type *ta = btf_type_by_id(btf, *(__u32 *)a);
+	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 void btf_check_sorted(struct btf *btf)
+{
+	const struct btf_type *t;
+	int i, k = 0, n;
+	__u32 sorted_start_id = 0;
+
+	if (btf->nr_types < 2)
+		return;
+
+	n = btf__type_cnt(btf) - 1;
+	for (i = btf->start_id; i < n; i++) {
+		k = i + 1;
+		if (btf_compare_type_names(&i, &k, btf) > 0)
+			return;
+		t = btf_type_by_id(btf, i);
+		if (sorted_start_id == 0 &&
+			!str_is_empty(btf__str_by_offset(btf, t->name_off)))
+			sorted_start_id = i;
+	}
+
+	t = btf_type_by_id(btf, k);
+	if (sorted_start_id == 0 &&
+		!str_is_empty(btf__str_by_offset(btf, t->name_off)))
+		sorted_start_id = k;
+	if (sorted_start_id)
+		btf->sorted_start_id = sorted_start_id;
+}
+
 static __s32 btf_find_by_name_bsearch(const struct btf *btf, const char *name,
 						__s32 start_id, __s32 end_id)
 {
@@ -935,7 +978,7 @@ static __s32 btf_find_by_name_kind(const struct btf *btf, int start_id,
 
 	if (start_id < btf->start_id) {
 		idx = btf_find_by_name_kind(btf->base_btf, start_id,
-			type_name, kind);
+					    type_name, kind);
 		if (idx >= 0)
 			return idx;
 		start_id = btf->start_id;
@@ -1147,6 +1190,7 @@ static struct btf *btf_new(const void *data, __u32 size, struct btf *base_btf, b
 	err = err ?: btf_sanity_check(btf);
 	if (err)
 		goto done;
+	btf_check_sorted(btf);
 
 done:
 	if (err) {
-- 
2.34.1


  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 ` [PATCH bpf-next v9 03/10] tools/resolve_btfids: Support BTF sorting feature Donglin Peng
2025-12-16 22:13   ` 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 ` Donglin Peng [this message]
2025-12-17  0:32   ` [PATCH bpf-next v9 05/10] libbpf: Verify BTF Sorting 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-6-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox