OSDN Git Service

libbpf: Fix btf_dump's packed struct determination
authorAndrii Nakryiko <andrii@kernel.org>
Thu, 15 Dec 2022 18:36:05 +0000 (10:36 -0800)
committerDaniel Borkmann <daniel@iogearbox.net>
Thu, 15 Dec 2022 21:50:17 +0000 (22:50 +0100)
commit4fb877aaa179dcdb1676d55216482febaada457e
tree17ce55d66193e1aa5984838c09a2670888da45e3
parentb148c8b9b926e257a59c8eb2cd6fa3adfd443254
libbpf: Fix btf_dump's packed struct determination

Fix bug in btf_dump's logic of determining if a given struct type is
packed or not. The notion of "natural alignment" is not needed and is
even harmful in this case, so drop it altogether. The biggest difference
in btf_is_struct_packed() compared to its original implementation is
that we don't really use btf__align_of() to determine overall alignment
of a struct type (because it could be 1 for both packed and non-packed
struct, depending on specifci field definitions), and just use field's
actual alignment to calculate whether any field is requiring packing or
struct's size overall necessitates packing.

Add two simple test cases that demonstrate the difference this change
would make.

Fixes: ea2ce1ba99aa ("libbpf: Fix BTF-to-C converter's padding logic")
Reported-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/bpf/20221215183605.4149488-1-andrii@kernel.org
tools/lib/bpf/btf_dump.c
tools/testing/selftests/bpf/progs/btf_dump_test_case_packing.c