bpf: btf: refactor btf_int_bits_seq_show()

Refactor function btf_int_bits_seq_show() by creating
function btf_bitfield_seq_show() which has no dependence
on btf and btf_type. The function btf_bitfield_seq_show()
will be in later patch to directly dump bitfield member values.

Acked-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 8fa0bf1c33fdff712330d38f5d5a93a26354e59a..72caa799e82fe4543a46a85bacfa3eef7b654b34 100644 (file)
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -1068,26 +1068,16 @@ static void btf_int_log(struct btf_verifier_env *env,
                         btf_int_encoding_str(BTF_INT_ENCODING(int_data)));
 }
 
-static void btf_int_bits_seq_show(const struct btf *btf,
-                                 const struct btf_type *t,
-                                 void *data, u8 bits_offset,
-                                 struct seq_file *m)
+static void btf_bitfield_seq_show(void *data, u8 bits_offset,
+                                 u8 nr_bits, struct seq_file *m)
 {
        u16 left_shift_bits, right_shift_bits;
-       u32 int_data = btf_type_int(t);
-       u8 nr_bits = BTF_INT_BITS(int_data);
-       u8 total_bits_offset;
        u8 nr_copy_bytes;
        u8 nr_copy_bits;
        u64 print_num;
 
-       /*
-        * bits_offset is at most 7.
-        * BTF_INT_OFFSET() cannot exceed 64 bits.
-        */
-       total_bits_offset = bits_offset + BTF_INT_OFFSET(int_data);
-       data += BITS_ROUNDDOWN_BYTES(total_bits_offset);
-       bits_offset = BITS_PER_BYTE_MASKED(total_bits_offset);
+       data += BITS_ROUNDDOWN_BYTES(bits_offset);
+       bits_offset = BITS_PER_BYTE_MASKED(bits_offset);
        nr_copy_bits = nr_bits + bits_offset;
        nr_copy_bytes = BITS_ROUNDUP_BYTES(nr_copy_bits);
 
@@ -1107,6 +1097,23 @@ static void btf_int_bits_seq_show(const struct btf *btf,
        seq_printf(m, "0x%llx", print_num);
 }
 
+static void btf_int_bits_seq_show(const struct btf *btf,
+                                 const struct btf_type *t,
+                                 void *data, u8 bits_offset,
+                                 struct seq_file *m)
+{
+       u32 int_data = btf_type_int(t);
+       u8 nr_bits = BTF_INT_BITS(int_data);
+       u8 total_bits_offset;
+
+       /*
+        * bits_offset is at most 7.
+        * BTF_INT_OFFSET() cannot exceed 64 bits.
+        */
+       total_bits_offset = bits_offset + BTF_INT_OFFSET(int_data);
+       btf_bitfield_seq_show(data, total_bits_offset, nr_bits, m);
+}
+
 static void btf_int_seq_show(const struct btf *btf, const struct btf_type *t,
                             u32 type_id, void *data, u8 bits_offset,
                             struct seq_file *m)