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 v2 4/5] selftests/bpf: add tests for BTF deduplication and sorting
Date: Mon, 20 Oct 2025 17:39:40 +0800 [thread overview]
Message-ID: <20251020093941.548058-5-dolinux.peng@gmail.com> (raw)
In-Reply-To: <20251020093941.548058-1-dolinux.peng@gmail.com>
Verify that BTF deduplication and sorting functionality works correctly
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>
---
tools/testing/selftests/bpf/prog_tests/btf.c | 171 +++++++++++++++++++
1 file changed, 171 insertions(+)
diff --git a/tools/testing/selftests/bpf/prog_tests/btf.c b/tools/testing/selftests/bpf/prog_tests/btf.c
index 8a9ba4292109..244f9d535bc2 100644
--- a/tools/testing/selftests/bpf/prog_tests/btf.c
+++ b/tools/testing/selftests/bpf/prog_tests/btf.c
@@ -8022,6 +8022,177 @@ static struct btf_dedup_test dedup_tests[] = {
BTF_STR_SEC("\0foo\0x\0y\0foo_ptr"),
},
},
+{
+ .descr = "dedup_sort: strings deduplication",
+ .input = {
+ .raw_types = {
+ BTF_TYPE_INT_ENC(NAME_NTH(1), BTF_INT_SIGNED, 0, 32, 4),
+ BTF_TYPE_INT_ENC(NAME_NTH(2), BTF_INT_SIGNED, 0, 64, 8),
+ BTF_TYPE_INT_ENC(NAME_NTH(3), BTF_INT_SIGNED, 0, 32, 4),
+ BTF_TYPE_INT_ENC(NAME_NTH(4), BTF_INT_SIGNED, 0, 64, 8),
+ BTF_TYPE_INT_ENC(NAME_NTH(5), BTF_INT_SIGNED, 0, 32, 4),
+ BTF_END_RAW,
+ },
+ BTF_STR_SEC("\0int\0long int\0int\0long int\0int"),
+ },
+ .expect = {
+ .raw_types = {
+ BTF_TYPE_INT_ENC(NAME_NTH(1), BTF_INT_SIGNED, 0, 32, 4),
+ BTF_TYPE_INT_ENC(NAME_NTH(2), BTF_INT_SIGNED, 0, 64, 8),
+ BTF_END_RAW,
+ },
+ BTF_STR_SEC("\0int\0long int"),
+ },
+ .opts = {
+ .sort_by_kind_name = true,
+ },
+},
+{
+ .descr = "dedup_sort: func/func_arg/var tags",
+ .input = {
+ .raw_types = {
+ /* int */
+ BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), /* [1] */
+ /* static int t */
+ BTF_VAR_ENC(NAME_NTH(1), 1, 0), /* [2] */
+ /* void f(int a1, int a2) */
+ BTF_FUNC_PROTO_ENC(0, 2), /* [3] */
+ BTF_FUNC_PROTO_ARG_ENC(NAME_NTH(2), 1),
+ BTF_FUNC_PROTO_ARG_ENC(NAME_NTH(3), 1),
+ BTF_FUNC_ENC(NAME_NTH(4), 3), /* [4] */
+ /* tag -> t */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 2, -1), /* [5] */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 2, -1), /* [6] */
+ /* tag -> func */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 4, -1), /* [7] */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 4, -1), /* [8] */
+ /* tag -> func arg a1 */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 4, 1), /* [9] */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 4, 1), /* [10] */
+ BTF_END_RAW,
+ },
+ BTF_STR_SEC("\0t\0a1\0a2\0f\0tag"),
+ },
+ .expect = {
+ .raw_types = {
+ BTF_FUNC_ENC(NAME_NTH(4), 7), /* [1] */
+ BTF_VAR_ENC(NAME_NTH(1), 6, 0), /* [2] */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 2, -1), /* [3] */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 1, -1), /* [4] */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 1, 1), /* [5] */
+ BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), /* [6] */
+ BTF_FUNC_PROTO_ENC(0, 2), /* [7] */
+ BTF_FUNC_PROTO_ARG_ENC(NAME_NTH(2), 6),
+ BTF_FUNC_PROTO_ARG_ENC(NAME_NTH(3), 6),
+ BTF_END_RAW,
+ },
+ BTF_STR_SEC("\0t\0a1\0a2\0f\0tag"),
+ },
+ .opts = {
+ .sort_by_kind_name = true,
+ },
+},
+{
+ .descr = "dedup_sort: func/func_param tags",
+ .input = {
+ .raw_types = {
+ /* int */
+ BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), /* [1] */
+ /* void f(int a1, int a2) */
+ BTF_FUNC_PROTO_ENC(0, 2), /* [2] */
+ BTF_FUNC_PROTO_ARG_ENC(NAME_NTH(1), 1),
+ BTF_FUNC_PROTO_ARG_ENC(NAME_NTH(2), 1),
+ BTF_FUNC_ENC(NAME_NTH(3), 2), /* [3] */
+ /* void f(int a1, int a2) */
+ BTF_FUNC_PROTO_ENC(0, 2), /* [4] */
+ BTF_FUNC_PROTO_ARG_ENC(NAME_NTH(1), 1),
+ BTF_FUNC_PROTO_ARG_ENC(NAME_NTH(2), 1),
+ BTF_FUNC_ENC(NAME_NTH(3), 4), /* [5] */
+ /* tag -> f: tag1, tag2 */
+ BTF_DECL_TAG_ENC(NAME_NTH(4), 3, -1), /* [6] */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 3, -1), /* [7] */
+ /* tag -> f/a2: tag1, tag2 */
+ BTF_DECL_TAG_ENC(NAME_NTH(4), 3, 1), /* [8] */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 3, 1), /* [9] */
+ /* tag -> f: tag1, tag3 */
+ BTF_DECL_TAG_ENC(NAME_NTH(4), 5, -1), /* [10] */
+ BTF_DECL_TAG_ENC(NAME_NTH(6), 5, -1), /* [11] */
+ /* tag -> f/a2: tag1, tag3 */
+ BTF_DECL_TAG_ENC(NAME_NTH(4), 5, 1), /* [12] */
+ BTF_DECL_TAG_ENC(NAME_NTH(6), 5, 1), /* [13] */
+ BTF_END_RAW,
+ },
+ BTF_STR_SEC("\0a1\0a2\0f\0tag1\0tag2\0tag3"),
+ },
+ .expect = {
+ .raw_types = {
+ BTF_FUNC_ENC(NAME_NTH(3), 9), /* [1] */
+ BTF_DECL_TAG_ENC(NAME_NTH(4), 1, -1), /* [2] */
+ BTF_DECL_TAG_ENC(NAME_NTH(4), 1, 1), /* [3] */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 1, -1), /* [4] */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 1, 1), /* [5] */
+ BTF_DECL_TAG_ENC(NAME_NTH(6), 1, -1), /* [6] */
+ BTF_DECL_TAG_ENC(NAME_NTH(6), 1, 1), /* [7] */
+ BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), /* [8] */
+ BTF_FUNC_PROTO_ENC(0, 2), /* [9] */
+ BTF_FUNC_PROTO_ARG_ENC(NAME_NTH(1), 8),
+ BTF_FUNC_PROTO_ARG_ENC(NAME_NTH(2), 8),
+ BTF_END_RAW,
+ },
+ BTF_STR_SEC("\0a1\0a2\0f\0tag1\0tag2\0tag3"),
+ },
+ .opts = {
+ .sort_by_kind_name = true,
+ },
+},
+{
+ .descr = "dedup_sort: struct/struct_member tags",
+ .input = {
+ .raw_types = {
+ /* int */
+ BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), /* [1] */
+ BTF_STRUCT_ENC(NAME_NTH(1), 2, 8), /* [2] */
+ BTF_MEMBER_ENC(NAME_NTH(2), 1, 0),
+ BTF_MEMBER_ENC(NAME_NTH(3), 1, 32),
+ BTF_STRUCT_ENC(NAME_NTH(1), 2, 8), /* [3] */
+ BTF_MEMBER_ENC(NAME_NTH(2), 1, 0),
+ BTF_MEMBER_ENC(NAME_NTH(3), 1, 32),
+ /* tag -> t: tag1, tag2 */
+ BTF_DECL_TAG_ENC(NAME_NTH(4), 2, -1), /* [4] */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 2, -1), /* [5] */
+ /* tag -> t/m2: tag1, tag2 */
+ BTF_DECL_TAG_ENC(NAME_NTH(4), 2, 1), /* [6] */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 2, 1), /* [7] */
+ /* tag -> t: tag1, tag3 */
+ BTF_DECL_TAG_ENC(NAME_NTH(4), 3, -1), /* [8] */
+ BTF_DECL_TAG_ENC(NAME_NTH(6), 3, -1), /* [9] */
+ /* tag -> t/m2: tag1, tag3 */
+ BTF_DECL_TAG_ENC(NAME_NTH(4), 3, 1), /* [10] */
+ BTF_DECL_TAG_ENC(NAME_NTH(6), 3, 1), /* [11] */
+ BTF_END_RAW,
+ },
+ BTF_STR_SEC("\0t\0m1\0m2\0tag1\0tag2\0tag3"),
+ },
+ .expect = {
+ .raw_types = {
+ BTF_STRUCT_ENC(NAME_NTH(1), 2, 8), /* [1] */
+ BTF_MEMBER_ENC(NAME_NTH(2), 8, 0),
+ BTF_MEMBER_ENC(NAME_NTH(3), 8, 32),
+ BTF_DECL_TAG_ENC(NAME_NTH(4), 1, -1), /* [2] */
+ BTF_DECL_TAG_ENC(NAME_NTH(4), 1, 1), /* [3] */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 1, -1), /* [4] */
+ BTF_DECL_TAG_ENC(NAME_NTH(5), 1, 1), /* [5] */
+ BTF_DECL_TAG_ENC(NAME_NTH(6), 1, -1), /* [6] */
+ BTF_DECL_TAG_ENC(NAME_NTH(6), 1, 1), /* [7] */
+ BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), /* [8] */
+ BTF_END_RAW,
+ },
+ BTF_STR_SEC("\0t\0m1\0m2\0tag1\0tag2\0tag3"),
+ },
+ .opts = {
+ .sort_by_kind_name = true,
+ },
+},
};
static int btf_type_size(const struct btf_type *t)
--
2.34.1
next prev parent reply other threads:[~2025-10-20 9:40 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-20 9:39 [RFC PATCH v2 0/5] Significantly Improve BTF Type Lookup Performance Donglin Peng
2025-10-20 9:39 ` [RFC PATCH v2 1/5] btf: search local BTF before base BTF Donglin Peng
2025-10-21 1:06 ` Eduard Zingerman
2025-10-21 8:31 ` Donglin Peng
2025-10-21 15:56 ` Eduard Zingerman
2025-10-22 3:08 ` Donglin Peng
2025-10-20 9:39 ` [RFC PATCH v2 2/5] btf: sort BTF types by kind and name to enable binary search Donglin Peng
2025-10-21 17:24 ` Alan Maguire
2025-10-22 4:47 ` Donglin Peng
2025-10-21 18:59 ` Eduard Zingerman
2025-10-22 3:02 ` Donglin Peng
2025-10-22 20:50 ` Eduard Zingerman
2025-10-23 10:35 ` Donglin Peng
2025-10-23 15:52 ` Alexei Starovoitov
2025-10-23 16:28 ` Andrii Nakryiko
2025-10-23 18:37 ` Alexei Starovoitov
2025-10-23 19:39 ` Andrii Nakryiko
2025-10-24 1:59 ` Donglin Peng
2025-10-24 2:23 ` Donglin Peng
2025-10-24 2:32 ` Eduard Zingerman
2025-10-24 3:04 ` Donglin Peng
2025-10-24 3:15 ` Eduard Zingerman
2025-10-24 3:19 ` Donglin Peng
2025-10-20 9:39 ` [RFC PATCH v2 3/5] libbpf: check if BTF is sorted " Donglin Peng
2025-10-20 9:39 ` Donglin Peng [this message]
2025-10-21 19:07 ` [RFC PATCH v2 4/5] selftests/bpf: add tests for BTF deduplication and sorting Eduard Zingerman
2025-10-23 11:20 ` Donglin Peng
2025-10-20 9:39 ` [RFC PATCH v2 5/5] btf: add CONFIG_BPF_SORT_BTF_BY_KIND_NAME Donglin Peng
2025-10-21 0:50 ` Eduard Zingerman
2025-10-21 8:33 ` Donglin Peng
2025-10-21 17:27 ` Alan Maguire
2025-10-22 1:15 ` 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=20251020093941.548058-5-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;
as well as URLs for NNTP newsgroup(s).