libbpf: Fix dumping non-aligned __int128

Non-aligned integers are dumped as bitfields, which is supported for at
most 64-bit integers. Fix by using the same trick as
btf_dump_float_data(): copy non-aligned values to the local buffer.

Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211013160902.428340-4-iii@linux.ibm.com

diff --git a/tools/lib/bpf/btf_dump.c b/tools/lib/bpf/btf_dump.c
index 679bf34e3f47f075ef6320e54deaefd347bac016..e98c201f29b51bea3b18f3bb559438b7e9b17ba2 100644 (file)
--- a/tools/lib/bpf/btf_dump.c
+++ b/tools/lib/bpf/btf_dump.c
@@ -1670,9 +1670,10 @@ static int btf_dump_int_data(struct btf_dump *d,
 {
        __u8 encoding = btf_int_encoding(t);
        bool sign = encoding & BTF_INT_SIGNED;
+       char buf[16] __aligned(16);
        int sz = t->size;
 
-       if (sz == 0) {
+       if (sz == 0 || sz > sizeof(buf)) {
                pr_warn("unexpected size %d for id [%u]\n", sz, type_id);
                return -EINVAL;
        }
@@ -1680,8 +1681,10 @@ static int btf_dump_int_data(struct btf_dump *d,
        /* handle packed int data - accesses of integers not aligned on
         * int boundaries can cause problems on some platforms.
         */
-       if (!ptr_is_aligned(data, sz))
-               return btf_dump_bitfield_data(d, t, data, 0, 0);
+       if (!ptr_is_aligned(data, sz)) {
+               memcpy(buf, data, sz);
+               data = buf;
+       }
 
        switch (sz) {
        case 16: {