selftest/bpf: fix btf_dump test under new clang
Subsystems (3)
PATCH 1/1 selftest/bpf: fix btf_dump test under new clang
From: Yucong Sun <[email protected]>
New clang version changed type name in dwarf from "long int" to "long", this is causing btf_dump tests to fail.
--- .../selftests/bpf/progs/btf_dump_test_case_bitfields.c | 10 +++++----- .../selftests/bpf/progs/btf_dump_test_case_packing.c | 4 ++-- .../selftests/bpf/progs/btf_dump_test_case_padding.c | 2 +- .../selftests/bpf/progs/btf_dump_test_case_syntax.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)
tools/testing/selftests/bpf/progs/btf_dump_test_case_bitfields.c +5 -5
@@ -11,7 +11,7 @@/* *struct bitfields_only_mixed_types { * int a: 3; -* long int b: 2; +* long b: 2; * _Bool c: 1; * enum { * A = 0,
@@ -27,7 +27,7 @@struct bitfields_only_mixed_types {int a:3 ; -long int b:2 ; +long b:2 ;bool c:1 ;/* it's really a _Bool type */ enum {A ,/* A = 0, dumper is very explicit */
@@ -44,8 +44,8 @@ struct bitfields_only_mixed_types {* char: 4; * int a: 4; * short b; -* long int c; -* long int d: 8; +* long c; +* long d: 8; * int e; * int f; *};
@@ -71,7 +71,7 @@ struct bitfield_mixed_with_others {*struct bitfield_flushed { * int a: 4; * long: 60; -* long int b: 16; +* long b: 16; *}; * */
tools/testing/selftests/bpf/progs/btf_dump_test_case_packing.c +2 -2
@@ -29,7 +29,7 @@ struct non_packed_fields {struct nested_packed { char: 4;int a:4 ; -long int b; +long b;struct {char c;int d;
@@ -44,7 +44,7 @@ union union_is_never_packed {union union_does_not_need_packing {struct { -long int a; +long a;int b; } __attribute__((packed));int c;
tools/testing/selftests/bpf/progs/btf_dump_test_case_padding.c +1 -1
@@ -9,7 +9,7 @@/* ----- START-EXPECTED-OUTPUT ----- */ struct padded_implicitly {int a; -long int b; +long b;char c; };
tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c +1 -1
@@ -189,7 +189,7 @@ struct struct_with_embedded_stuff {const char *d; } e;union { -volatile long int f; +volatile long f;void * restrict g; }; };
Signature · 1 line
2.30.2
Quoted 8 lines · Yucong Sun
From: Yucong Sun <[email protected]>
New clang version changed type name in dwarf from "long int" to "long", this is causing
btf_dumptests to fail.Signed-off-by Yucong Sun <[email protected]>---
Fixed the prefix to "selftests/bpf: ", applied to bpf-next. Thanks for a quick fix!
Also added the reference to the "offending" LLVM change you've sent me offline:
https://github.com/llvm/llvm-project/commit/f6a561c4d6754b13165a49990e8365d819f64c86
Quoted 6 lines
.../selftests/bpf/progs/btf_dump_test_case_bitfields.c | 10 +++++----- .../selftests/bpf/progs/btf_dump_test_case_packing.c | 4 ++-- .../selftests/bpf/progs/btf_dump_test_case_padding.c | 2 +- .../selftests/bpf/progs/btf_dump_test_case_syntax.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)
[...]
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 8 lines · On Fri, 8 Oct 2021 10:31:39 -0700 you wrote:
From: Yucong Sun <[email protected]>
New clang version changed type name in dwarf from "long int" to "long", this is causing
btf_dumptests to fail.Signed-off-by Yucong Sun <[email protected]>[...]
Here is the summary with links:
- [bpf-next] selftest/bpf: fix btf_dump test under new clang
https://git.kernel.org/bpf/bpf-next/c/7e3cbd3405cb
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html