• A
    libbpf: Btf dedup identical struct test needs check for nested structs/arrays · f3c51fe0
    Alan Maguire 提交于
    When examining module BTF, it is common to see core kernel structures
    such as sk_buff, net_device duplicated in the module.  After adding
    debug messaging to BTF it turned out that much of the problem
    was down to the identical struct test failing during deduplication;
    sometimes the compiler adds identical structs.  However
    it turns out sometimes that type ids of identical struct members
    can also differ, even when the containing structs are still identical.
    
    To take an example, for struct sk_buff, debug messaging revealed
    that the identical struct matching was failing for the anon
    struct "headers"; specifically for the first field:
    
    __u8       __pkt_type_offset[0]; /*   128     0 */
    
    Looking at the code in BTF deduplication, we have code that guards
    against the possibility of identical struct definitions, down to
    type ids, and identical array definitions.  However in this case
    we have a struct which is being defined twice but does not have
    identical type ids since each duplicate struct has separate type
    ids for the above array member.   A similar problem (though not
    observed) could occur for struct-in-struct.
    
    The solution is to make the "identical struct" test check members
    not just for matching ids, but to also check if they in turn are
    identical structs or arrays.
    
    The results of doing this are quite dramatic (for some modules
    at least); I see the number of type ids drop from around 10000
    to just over 1000 in one module for example.
    
    For testing use latest pahole or apply [1], otherwise dedups
    can fail for the reasons described there.
    
    Also fix return type of btf_dedup_identical_arrays() as
    suggested by Andrii to match boolean return type used
    elsewhere.
    
    Fixes: efdd3eb8 ("libbpf: Accommodate DWARF/compiler bug with duplicated structs")
    Signed-off-by: NAlan Maguire <alan.maguire@oracle.com>
    Signed-off-by: NAndrii Nakryiko <andrii@kernel.org>
    Link: https://lore.kernel.org/bpf/1666622309-22289-1-git-send-email-alan.maguire@oracle.com
    
    [1] https://lore.kernel.org/bpf/1666364523-9648-1-git-send-email-alan.maguire
    f3c51fe0
btf.c 127.2 KB