Skip to content

Commit fcd1ed8

Browse files
alan-maguireanakryiko
authored andcommitted
kbuild,bpf: Switch to using --btf_features for pahole v1.26 and later
The btf_features list can be used for pahole v1.26 and later - it is useful because if a feature is not yet implemented it will not exit with a failure message. This will allow us to add feature requests to the pahole options without having to check pahole versions in future; if the version of pahole supports the feature it will be added. Signed-off-by: Alan Maguire <[email protected]> Signed-off-by: Andrii Nakryiko <[email protected]> Tested-by: Eduard Zingerman <[email protected]> Acked-by: Andrii Nakryiko <[email protected]> Link: https://lore.kernel.org/bpf/[email protected]
1 parent 0d03a4d commit fcd1ed8

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

scripts/Makefile.btf

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
pahole-ver := $(CONFIG_PAHOLE_VERSION)
44
pahole-flags-y :=
55

6+
ifeq ($(call test-le, $(pahole-ver), 125),y)
7+
68
# pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars
79
ifeq ($(call test-le, $(pahole-ver), 121),y)
810
pahole-flags-$(call test-ge, $(pahole-ver), 118) += --skip_encoding_btf_vars
@@ -12,8 +14,17 @@ pahole-flags-$(call test-ge, $(pahole-ver), 121) += --btf_gen_floats
1214

1315
pahole-flags-$(call test-ge, $(pahole-ver), 122) += -j
1416

15-
pahole-flags-$(CONFIG_PAHOLE_HAS_LANG_EXCLUDE) += --lang_exclude=rust
17+
ifeq ($(pahole-ver), 125)
18+
pahole-flags-y += --skip_encoding_btf_inconsistent_proto --btf_gen_optimized
19+
endif
20+
21+
else
1622

17-
pahole-flags-$(call test-ge, $(pahole-ver), 125) += --skip_encoding_btf_inconsistent_proto --btf_gen_optimized
23+
# Switch to using --btf_features for v1.26 and later.
24+
pahole-flags-$(call test-ge, $(pahole-ver), 126) = -j --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func
25+
26+
endif
27+
28+
pahole-flags-$(CONFIG_PAHOLE_HAS_LANG_EXCLUDE) += --lang_exclude=rust
1829

1930
export PAHOLE_FLAGS := $(pahole-flags-y)

0 commit comments

Comments
 (0)