diff options
| author | Andrii Nakryiko <[email protected]> | 2021-03-19 14:14:44 -0700 |
|---|---|---|
| committer | Andrii Nakryiko <[email protected]> | 2021-03-19 14:14:44 -0700 |
| commit | e75b513ec6e545ce54c2f50e99fbd77e38911630 (patch) | |
| tree | 84185c1e0dc413e343ecfa48e0b8b5b237069707 | |
| parent | eddbe8e6521401003e37e7848ef72e75c10ee2aa (diff) | |
| parent | f118aac651d87c1811d2abd940f73c45c16b29d7 (diff) | |
Merge branch 'libbpf: Fix BTF dump of pointer-to-array-of-struct'
Jean-Philippe Brucker says:
====================
Fix an issue with the libbpf BTF dump, see patch 1 for details.
Since [v1] I added the selftest in patch 2, though I couldn't figure out
a way to make it independent from the order in which debug info is
issued by the compiler.
[v1]: https://lore.kernel.org/bpf/[email protected]/
====================
Signed-off-by: Andrii Nakryiko <[email protected]>
| -rw-r--r-- | tools/lib/bpf/btf_dump.c | 2 | ||||
| -rw-r--r-- | tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tools/lib/bpf/btf_dump.c b/tools/lib/bpf/btf_dump.c index 2f9d685bd522..0911aea4cdbe 100644 --- a/tools/lib/bpf/btf_dump.c +++ b/tools/lib/bpf/btf_dump.c @@ -462,7 +462,7 @@ static int btf_dump_order_type(struct btf_dump *d, __u32 id, bool through_ptr) return err; case BTF_KIND_ARRAY: - return btf_dump_order_type(d, btf_array(t)->type, through_ptr); + return btf_dump_order_type(d, btf_array(t)->type, false); case BTF_KIND_STRUCT: case BTF_KIND_UNION: { diff --git a/tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c b/tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c index 31975c96e2c9..3ac0c9afc35a 100644 --- a/tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c +++ b/tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c @@ -174,6 +174,12 @@ struct struct_in_struct { }; }; +struct struct_in_array {}; + +struct struct_in_array_typed {}; + +typedef struct struct_in_array_typed struct_in_array_t[2]; + struct struct_with_embedded_stuff { int a; struct { @@ -203,6 +209,8 @@ struct struct_with_embedded_stuff { } r[5]; struct struct_in_struct s[10]; int t[11]; + struct struct_in_array (*u)[2]; + struct_in_array_t *v; }; struct root_struct { |