[PATCH bpf-next v4 17/17] selftests/bpf: Cover the arena type tag in bpftool C dumps

[Ihor Solodrai <ihor.solodrai@linux.dev>]

bpftool prints the plain "arena" type tag as __bpf_arena. Add an
arena-tagged pointer to the BTF behind the bpftool C dump goldens and
expect __bpf_arena in its place.

Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
---
 .../selftests/bpf/bpftool_btf_dump_sorted.expected     |  2 ++
 .../selftests/bpf/bpftool_btf_dump_unsorted.expected   |  2 ++
 .../selftests/bpf/prog_tests/bpftool_btf_dump.c        | 10 +++++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/bpf/bpftool_btf_dump_sorted.expected b/tools/testing/selftests/bpf/bpftool_btf_dump_sorted.expected
index 0ecf53b29042..2370a60ca7c5 100644
--- a/tools/testing/selftests/bpf/bpftool_btf_dump_sorted.expected
+++ b/tools/testing/selftests/bpf/bpftool_btf_dump_sorted.expected
@@ -41,6 +41,8 @@ enum {
 	E0 = 1,
 };
 
+typedef int __bpf_arena *arena_ptr;
+
 struct __sk_buff {
 	int len;
 	union {
diff --git a/tools/testing/selftests/bpf/bpftool_btf_dump_unsorted.expected b/tools/testing/selftests/bpf/bpftool_btf_dump_unsorted.expected
index 24a8db96eab0..540a073c410f 100644
--- a/tools/testing/selftests/bpf/bpftool_btf_dump_unsorted.expected
+++ b/tools/testing/selftests/bpf/bpftool_btf_dump_unsorted.expected
@@ -76,6 +76,8 @@ struct bpf_nf_ctx {
 	int f;
 } __bpf_relocatable;
 
+typedef int __bpf_arena *arena_ptr;
+
 
 /* BPF kfuncs */
 #ifndef BPF_NO_KFUNC_PROTOTYPES
diff --git a/tools/testing/selftests/bpf/prog_tests/bpftool_btf_dump.c b/tools/testing/selftests/bpf/prog_tests/bpftool_btf_dump.c
index 3cda90062fc6..ce37aee5f288 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpftool_btf_dump.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpftool_btf_dump.c
@@ -32,6 +32,7 @@
  *	};
  *	struct bpf_tcp_sock { int snd_cwnd; };
  *	struct bpf_nf_ctx { int f; };
+ *	typedef int __arena *arena_ptr;
  */
 static struct btf *mk_btf(void)
 {
@@ -73,6 +74,10 @@ static struct btf *mk_btf(void)
 	btf__add_struct(btf, "bpf_nf_ctx", 4);
 	btf__add_field(btf, "f", 1, 0, 0);
 
+	btf__add_type_tag(btf, "arena", 1);
+	btf__add_ptr(btf, 13);
+	btf__add_typedef(btf, "arena_ptr", 14);
+
 	VALIDATE_RAW_BTF(
 		btf,
 		"[1] INT 'int' size=4 bits_offset=0 nr_bits=32 encoding=SIGNED",
@@ -99,7 +104,10 @@ static struct btf *mk_btf(void)
 		"[11] STRUCT 'bpf_tcp_sock' size=4 vlen=1\n"
 		"\t'snd_cwnd' type_id=1 bits_offset=0",
 		"[12] STRUCT 'bpf_nf_ctx' size=4 vlen=1\n"
-		"\t'f' type_id=1 bits_offset=0");
+		"\t'f' type_id=1 bits_offset=0",
+		"[13] TYPE_TAG 'arena' type_id=1",
+		"[14] PTR '(anon)' type_id=13",
+		"[15] TYPEDEF 'arena_ptr' type_id=14");
 
 	return btf;
 }
-- 
2.56.0