On 12/11/2023 05:57, Jiri Olsa wrote: > On Fri, Nov 10, 2023 at 11:02:56AM +0000, Alan Maguire wrote: >> For pahole v1.26 and later, --btf_features is used to specify BTF >> features for encoding. Since it tolerates unknown features, no >> further version checking will be needed when adding new features. >> Add crc, kind_layout features. > > hi, > this commit got merged: > 72d091846de9 kbuild: avoid too many execution of scripts/pahole-flags.sh > > so this change needs rebase > yep, just sent out a v4 https://lore.kernel.org/bpf/20231112124834.388735-1-alan.maguire@xxxxxxxxxx/ It both rebases and fixes a few issues in libpf kind layout encoding I found during testing, so v3 had other issues aside from the mismerge. Sorry for the noise! Alan > jirka > >> >> Signed-off-by: Alan Maguire <alan.maguire@xxxxxxxxxx> >> --- >> scripts/pahole-flags.sh | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh >> index 728d55190d97..30a3e270308b 100755 >> --- a/scripts/pahole-flags.sh >> +++ b/scripts/pahole-flags.sh >> @@ -26,5 +26,8 @@ fi >> if [ "${pahole_ver}" -ge "125" ]; then >> extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_inconsistent_proto --btf_gen_optimized" >> fi >> +if [ "${pahole_ver}" -ge "126" ]; then >> + extra_paholeopt="-j --lang_exclude=rust --btf_features=encode_force,var,float,decl_tag,type_tag,enum64,optimized_func,consistent_func,crc,kind_layout" >> +fi >> >> echo ${extra_paholeopt} >> -- >> 2.31.1 >>
