From: Donglin Peng <dolinux.peng@gmail.com>
To: ast@kernel.org
Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org,
Donglin Peng <dolinux.peng@gmail.com>,
Eduard Zingerman <eddyz87@gmail.com>,
Andrii Nakryiko <andrii.nakryiko@gmail.com>,
Alan Maguire <alan.maguire@oracle.com>,
Song Liu <song@kernel.org>, pengdonglin <pengdonglin@xiaomi.com>
Subject: [RFC PATCH v4 6/7] btf: Add lazy sorting validation for binary search
Date: Tue, 4 Nov 2025 21:40:32 +0800 [thread overview]
Message-ID: <20251104134033.344807-7-dolinux.peng@gmail.com> (raw)
In-Reply-To: <20251104134033.344807-1-dolinux.peng@gmail.com>
From: pengdonglin <pengdonglin@xiaomi.com>
Implement lazy validation of BTF type ordering to enable efficient
binary search for sorted BTF while maintaining linear search fallback
for unsorted cases.
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: Song Liu <song@kernel.org>
Signed-off-by: pengdonglin <pengdonglin@xiaomi.com>
Signed-off-by: Donglin Peng <dolinux.peng@gmail.com>
---
kernel/bpf/btf.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index da35d8636b9b..c76d77fd30a7 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -192,6 +192,8 @@
*/
#define BTF_MAX_SIZE (16 * 1024 * 1024)
+#define BTF_NEED_SORT_CHECK ((u32)-1)
+
#define for_each_member_from(i, from, struct_type, member) \
for (i = from, member = btf_type_member(struct_type) + from; \
i < btf_type_vlen(struct_type); \
@@ -550,6 +552,65 @@ u32 btf_nr_types(const struct btf *btf)
return total;
}
+static int btf_compare_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;
+
+ if (!ta->name_off && tb->name_off)
+ return 1;
+ if (ta->name_off && !tb->name_off)
+ return -1;
+ if (!ta->name_off && !tb->name_off)
+ return 0;
+
+ na = btf_name_by_offset(btf, ta->name_off);
+ nb = btf_name_by_offset(btf, tb->name_off);
+ return strcmp(na, nb);
+}
+
+/* Verifies BTF type ordering by name and counts named types.
+ *
+ * Checks that types are sorted in ascending order with named types
+ * before anonymous ones. If verified, sets nr_sorted_types to the
+ * number of named types.
+ */
+static void btf_check_sorted(struct btf *btf, int start_id)
+{
+ const struct btf_type *t;
+ int i, n, nr_sorted_types;
+
+ if (likely(btf->nr_sorted_types != BTF_NEED_SORT_CHECK))
+ return;
+
+ btf->nr_sorted_types = 0;
+
+ if (btf->nr_types < 2)
+ return;
+
+ nr_sorted_types = 0;
+ n = btf_nr_types(btf);
+ for (n--, i = start_id; i < n; i++) {
+ int k = i + 1;
+
+ if (btf_compare_type_names(&i, &k, btf) > 0)
+ return;
+
+ t = btf_type_by_id(btf, k);
+ if (t->name_off)
+ nr_sorted_types++;
+ }
+
+ t = btf_type_by_id(btf, start_id);
+ if (t->name_off)
+ nr_sorted_types++;
+
+ if (nr_sorted_types)
+ btf->nr_sorted_types = nr_sorted_types;
+}
+
/* Find BTF types with matching names within the [left, right] index range.
* On success, updates *left and *right to the boundaries of the matching range
* and returns the leftmost matching index.
@@ -617,6 +678,8 @@ s32 btf_find_by_name_kind(const struct btf *btf, const char *name, u8 kind)
err = btf_find_by_name_kind(base_btf, name, kind);
if (err == -ENOENT) {
+ btf_check_sorted((struct btf *)btf, btf_start_id(btf));
+
if (btf->nr_sorted_types) {
/* binary search */
s32 l, r;
@@ -5882,6 +5945,7 @@ static struct btf *btf_parse(const union bpf_attr *attr, bpfptr_t uattr, u32 uat
goto errout;
}
env->btf = btf;
+ btf->nr_sorted_types = BTF_NEED_SORT_CHECK;
data = kvmalloc(attr->btf_size, GFP_KERNEL | __GFP_NOWARN);
if (!data) {
@@ -6301,6 +6365,7 @@ static struct btf *btf_parse_base(struct btf_verifier_env *env, const char *name
btf->data = data;
btf->data_size = data_size;
btf->kernel_btf = true;
+ btf->nr_sorted_types = BTF_NEED_SORT_CHECK;
snprintf(btf->name, sizeof(btf->name), "%s", name);
err = btf_parse_hdr(env);
@@ -6418,6 +6483,7 @@ static struct btf *btf_parse_module(const char *module_name, const void *data,
btf->start_id = base_btf->nr_types;
btf->start_str_off = base_btf->hdr.str_len;
btf->kernel_btf = true;
+ btf->nr_sorted_types = BTF_NEED_SORT_CHECK;
snprintf(btf->name, sizeof(btf->name), "%s", module_name);
btf->data = kvmemdup(data, data_size, GFP_KERNEL | __GFP_NOWARN);
--
2.34.1
next prev parent reply other threads:[~2025-11-04 13:41 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-04 13:40 [RFC PATCH v4 0/7] libbpf: BTF performance optimizations with permutation and binary search Donglin Peng
2025-11-04 13:40 ` [RFC PATCH v4 1/7] libbpf: Extract BTF type remapping logic into helper function Donglin Peng
2025-11-04 23:16 ` Eduard Zingerman
2025-11-05 0:11 ` Andrii Nakryiko
2025-11-05 0:36 ` Eduard Zingerman
2025-11-05 0:57 ` Andrii Nakryiko
2025-11-05 1:23 ` Eduard Zingerman
2025-11-05 18:20 ` Andrii Nakryiko
2025-11-05 19:41 ` Eduard Zingerman
2025-11-06 17:09 ` Andrii Nakryiko
2025-11-04 13:40 ` [RFC PATCH v4 2/7] libbpf: Add BTF permutation support for type reordering Donglin Peng
2025-11-04 23:45 ` Eduard Zingerman
2025-11-05 11:31 ` Donglin Peng
2025-11-05 0:11 ` Andrii Nakryiko
2025-11-05 0:16 ` Eduard Zingerman
2025-11-05 1:04 ` Andrii Nakryiko
2025-11-05 1:20 ` Eduard Zingerman
2025-11-05 13:19 ` Donglin Peng
2025-11-05 18:32 ` Andrii Nakryiko
2025-11-05 18:23 ` Andrii Nakryiko
2025-11-05 19:23 ` Eduard Zingerman
2025-11-06 17:21 ` Andrii Nakryiko
2025-11-07 2:36 ` Donglin Peng
2025-11-07 17:43 ` Andrii Nakryiko
2025-11-05 12:52 ` Donglin Peng
2025-11-05 18:29 ` Andrii Nakryiko
2025-11-06 7:31 ` Donglin Peng
2025-11-06 17:12 ` Andrii Nakryiko
2025-11-07 1:39 ` Donglin Peng
2025-11-04 13:40 ` [RFC PATCH v4 3/7] libbpf: Optimize type lookup with binary search for sorted BTF Donglin Peng
2025-11-04 14:15 ` bot+bpf-ci
2025-11-05 0:06 ` Eduard Zingerman
2025-11-05 0:11 ` Andrii Nakryiko
2025-11-05 0:19 ` Eduard Zingerman
2025-11-05 0:54 ` Andrii Nakryiko
2025-11-05 1:17 ` Eduard Zingerman
2025-11-05 13:48 ` Donglin Peng
2025-11-05 16:52 ` Eduard Zingerman
2025-11-06 6:10 ` Donglin Peng
2025-11-05 18:11 ` Andrii Nakryiko
2025-11-06 7:49 ` Donglin Peng
2025-11-06 17:31 ` Andrii Nakryiko
2025-11-07 4:57 ` Donglin Peng
2025-11-07 17:01 ` Andrii Nakryiko
2025-11-10 2:04 ` Donglin Peng
2025-11-04 13:40 ` [RFC PATCH v4 4/7] libbpf: Implement lazy sorting validation for binary search optimization Donglin Peng
2025-11-05 0:29 ` Eduard Zingerman
2025-11-04 13:40 ` [RFC PATCH v4 5/7] btf: Optimize type lookup with binary search Donglin Peng
2025-11-04 17:14 ` Alexei Starovoitov
2025-11-05 13:22 ` Donglin Peng
2025-11-04 13:40 ` Donglin Peng [this message]
2025-11-04 13:40 ` [RFC PATCH v4 7/7] selftests/bpf: Add test cases for btf__permute functionality Donglin Peng
2025-11-05 0:41 ` 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=20251104134033.344807-7-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=linux-kernel@vger.kernel.org \
--cc=pengdonglin@xiaomi.com \
--cc=song@kernel.org \
/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