On Mon, May 13, 2024 at 1:29 PM Mykyta Yatsenko <mykyta.yatsenko5@xxxxxxxxx> wrote: > > From: Mykyta Yatsenko <yatsenko@xxxxxxxx> > > Sort bpftool c dump output; aiming to simplify vmlinux.h diffing and > forcing more natural type definitions ordering. > > Definitions are sorted first by their BTF kind ranks, then by their base > type name and by their own name. > > Type ranks > > Assign ranks to btf kinds (defined in function btf_type_rank) to set > next order: > 1. Anonymous enums/enums64 > 2. Named enums/enums64 > 3. Trivial types typedefs (ints, then floats) > 4. Structs/Unions > 5. Function prototypes > 6. Forward declarations > > Type rank is set to maximum for unnamed reference types, structs and > unions to avoid emitting those types early. They will be emitted as > part of the type chain starting with named type. > > Lexicographical ordering > > Each type is assigned a sort_name and own_name. > sort_name is the resolved name of the final base type for reference > types (typedef, pointer, array etc). Sorting by sort_name allows to > group typedefs of the same base type. sort_name for non-reference type > is the same as own_name. own_name is a direct name of particular type, > is used as final sorting step. > > Signed-off-by: Mykyta Yatsenko <yatsenko@xxxxxxxx> > --- > .../bpf/bpftool/Documentation/bpftool-btf.rst | 5 +- > tools/bpf/bpftool/bash-completion/bpftool | 3 + > tools/bpf/bpftool/btf.c | 138 +++++++++++++++++- > 3 files changed, 139 insertions(+), 7 deletions(-) > LGTM, tried it locally and it works well. In fact, see 6.8 kernel vs latest bpf-next/master (with basically the same config) comparison. It's quite minimal and easy to use to see what changes about some of the BPF internal types. Acked-by: Andrii Nakryiko <andrii@xxxxxxxxxx> Tested-by: Andrii Nakryiko <andrii@xxxxxxxxxx> [0] https://gist.github.com/anakryiko/8fd8ebf2aba73961ebd3cf6587de6822 [...]