Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
[linux-2.6-block.git] / tools / testing / selftests / bpf / test_btf.c
index f42b3396d6226dfec5fddf5d3a9a2d13c5c4ffb6..f570e0a39959ec3b87e8bae29366d72e1af5da97 100644 (file)
@@ -5,6 +5,8 @@
 #include <linux/btf.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
+#include <linux/filter.h>
+#include <linux/unistd.h>
 #include <bpf/bpf.h>
 #include <sys/resource.h>
 #include <libelf.h>
@@ -22,6 +24,9 @@
 #include "bpf_rlimit.h"
 #include "bpf_util.h"
 
+#define MAX_INSNS      512
+#define MAX_SUBPROGS   16
+
 static uint32_t pass_cnt;
 static uint32_t error_cnt;
 static uint32_t skip_cnt;
@@ -85,24 +90,38 @@ static int __base_pr(const char *format, ...)
 #define BTF_TYPEDEF_ENC(name, type) \
        BTF_TYPE_ENC(name, BTF_INFO_ENC(BTF_KIND_TYPEDEF, 0, 0), type)
 
-#define BTF_PTR_ENC(name, type) \
-       BTF_TYPE_ENC(name, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), type)
+#define BTF_PTR_ENC(type) \
+       BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), type)
+
+#define BTF_CONST_ENC(type) \
+       BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), type)
+
+#define BTF_FUNC_PROTO_ENC(ret_type, nargs) \
+       BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_FUNC_PROTO, 0, nargs), ret_type)
+
+#define BTF_FUNC_PROTO_ARG_ENC(name, type) \
+       (name), (type)
+
+#define BTF_FUNC_ENC(name, func_proto) \
+       BTF_TYPE_ENC(name, BTF_INFO_ENC(BTF_KIND_FUNC, 0, 0), func_proto)
 
 #define BTF_END_RAW 0xdeadbeef
 #define NAME_TBD 0xdeadb33f
 
-#define MAX_NR_RAW_TYPES 1024
+#define MAX_NR_RAW_U32 1024
 #define BTF_LOG_BUF_SIZE 65535
 
 static struct args {
        unsigned int raw_test_num;
        unsigned int file_test_num;
        unsigned int get_info_test_num;
+       unsigned int info_raw_test_num;
        bool raw_test;
        bool file_test;
        bool get_info_test;
        bool pprint_test;
        bool always_log;
+       bool info_raw_test;
 } args;
 
 static char btf_log_buf[BTF_LOG_BUF_SIZE];
@@ -118,7 +137,7 @@ struct btf_raw_test {
        const char *str_sec;
        const char *map_name;
        const char *err_str;
-       __u32 raw_types[MAX_NR_RAW_TYPES];
+       __u32 raw_types[MAX_NR_RAW_U32];
        __u32 str_sec_size;
        enum bpf_map_type map_type;
        __u32 key_size;
@@ -137,6 +156,9 @@ struct btf_raw_test {
        int str_len_delta;
 };
 
+#define BTF_STR_SEC(str) \
+       .str_sec = str, .str_sec_size = sizeof(str)
+
 static struct btf_raw_test raw_tests[] = {
 /* enum E {
  *     E0,
@@ -432,11 +454,11 @@ static struct btf_raw_test raw_tests[] = {
                /* const void* */       /* [3] */
                BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 2),
                /* typedef const void * const_void_ptr */
-               BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 3),
-               /* struct A { */        /* [4] */
+               BTF_TYPEDEF_ENC(NAME_TBD, 3),   /* [4] */
+               /* struct A { */        /* [5] */
                BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 1), sizeof(void *)),
                /* const_void_ptr m; */
-               BTF_MEMBER_ENC(NAME_TBD, 3, 0),
+               BTF_MEMBER_ENC(NAME_TBD, 4, 0),
                /* } */
                BTF_END_RAW,
        },
@@ -494,10 +516,10 @@ static struct btf_raw_test raw_tests[] = {
                BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 0),
                /* const void* */       /* [3] */
                BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 2),
-               /* typedef const void * const_void_ptr */       /* [4] */
-               BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 3),
-               /* const_void_ptr[4] */ /* [5] */
-               BTF_TYPE_ARRAY_ENC(3, 1, 4),
+               /* typedef const void * const_void_ptr */
+               BTF_TYPEDEF_ENC(NAME_TBD, 3),   /* [4] */
+               /* const_void_ptr[4] */
+               BTF_TYPE_ARRAY_ENC(4, 1, 4),    /* [5] */
                BTF_END_RAW,
        },
        .str_sec = "\0const_void_ptr",
@@ -1292,6 +1314,367 @@ static struct btf_raw_test raw_tests[] = {
        .err_str = "type != 0",
 },
 
+{
+       .descr = "typedef (invalid name, name_off = 0)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPEDEF_ENC(0, 1),                          /* [2] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0__int",
+       .str_sec_size = sizeof("\0__int"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "typedef_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "typedef (invalid name, invalid identifier)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPEDEF_ENC(NAME_TBD, 1),                   /* [2] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0__!int",
+       .str_sec_size = sizeof("\0__!int"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "typedef_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "ptr type (invalid name, name_off <> 0)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),          /* [1] */
+               BTF_TYPE_ENC(NAME_TBD,
+                            BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 1),      /* [2] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0__int",
+       .str_sec_size = sizeof("\0__int"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "ptr_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "volatile type (invalid name, name_off <> 0)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),          /* [1] */
+               BTF_TYPE_ENC(NAME_TBD,
+                            BTF_INFO_ENC(BTF_KIND_VOLATILE, 0, 0), 1), /* [2] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0__int",
+       .str_sec_size = sizeof("\0__int"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "volatile_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "const type (invalid name, name_off <> 0)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),          /* [1] */
+               BTF_TYPE_ENC(NAME_TBD,
+                            BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 1),    /* [2] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0__int",
+       .str_sec_size = sizeof("\0__int"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "const_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "restrict type (invalid name, name_off <> 0)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),          /* [1] */
+               BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 1),   /* [2] */
+               BTF_TYPE_ENC(NAME_TBD,
+                            BTF_INFO_ENC(BTF_KIND_RESTRICT, 0, 0), 2), /* [3] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0__int",
+       .str_sec_size = sizeof("\0__int"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "restrict_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "fwd type (invalid name, name_off = 0)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),          /* [1] */
+               BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_FWD, 0, 0), 0),   /* [2] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0__skb",
+       .str_sec_size = sizeof("\0__skb"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "fwd_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "fwd type (invalid name, invalid identifier)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),          /* [1] */
+               BTF_TYPE_ENC(NAME_TBD,
+                            BTF_INFO_ENC(BTF_KIND_FWD, 0, 0), 0),      /* [2] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0__!skb",
+       .str_sec_size = sizeof("\0__!skb"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "fwd_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "array type (invalid name, name_off <> 0)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),          /* [1] */
+               BTF_TYPE_ENC(NAME_TBD,
+                            BTF_INFO_ENC(BTF_KIND_ARRAY, 0, 0), 0),    /* [2] */
+               BTF_ARRAY_ENC(1, 1, 4),
+               BTF_END_RAW,
+       },
+       .str_sec = "\0__skb",
+       .str_sec_size = sizeof("\0__skb"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "array_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "struct type (name_off = 0)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),          /* [1] */
+               BTF_TYPE_ENC(0,
+                            BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 1), 4),   /* [2] */
+               BTF_MEMBER_ENC(NAME_TBD, 1, 0),
+               BTF_END_RAW,
+       },
+       .str_sec = "\0A",
+       .str_sec_size = sizeof("\0A"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "struct_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+},
+
+{
+       .descr = "struct type (invalid name, invalid identifier)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),          /* [1] */
+               BTF_TYPE_ENC(NAME_TBD,
+                            BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 1), 4),   /* [2] */
+               BTF_MEMBER_ENC(NAME_TBD, 1, 0),
+               BTF_END_RAW,
+       },
+       .str_sec = "\0A!\0B",
+       .str_sec_size = sizeof("\0A!\0B"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "struct_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "struct member (name_off = 0)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),          /* [1] */
+               BTF_TYPE_ENC(0,
+                            BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 1), 4),   /* [2] */
+               BTF_MEMBER_ENC(NAME_TBD, 1, 0),
+               BTF_END_RAW,
+       },
+       .str_sec = "\0A",
+       .str_sec_size = sizeof("\0A"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "struct_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+},
+
+{
+       .descr = "struct member (invalid name, invalid identifier)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),          /* [1] */
+               BTF_TYPE_ENC(NAME_TBD,
+                            BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 1), 4),   /* [2] */
+               BTF_MEMBER_ENC(NAME_TBD, 1, 0),
+               BTF_END_RAW,
+       },
+       .str_sec = "\0A\0B*",
+       .str_sec_size = sizeof("\0A\0B*"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "struct_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "enum type (name_off = 0)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),          /* [1] */
+               BTF_TYPE_ENC(0,
+                            BTF_INFO_ENC(BTF_KIND_ENUM, 0, 1),
+                            sizeof(int)),                              /* [2] */
+               BTF_ENUM_ENC(NAME_TBD, 0),
+               BTF_END_RAW,
+       },
+       .str_sec = "\0A\0B",
+       .str_sec_size = sizeof("\0A\0B"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "enum_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+},
+
+{
+       .descr = "enum type (invalid name, invalid identifier)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),          /* [1] */
+               BTF_TYPE_ENC(NAME_TBD,
+                            BTF_INFO_ENC(BTF_KIND_ENUM, 0, 1),
+                            sizeof(int)),                              /* [2] */
+               BTF_ENUM_ENC(NAME_TBD, 0),
+               BTF_END_RAW,
+       },
+       .str_sec = "\0A!\0B",
+       .str_sec_size = sizeof("\0A!\0B"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "enum_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "enum member (invalid name, name_off = 0)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),          /* [1] */
+               BTF_TYPE_ENC(0,
+                            BTF_INFO_ENC(BTF_KIND_ENUM, 0, 1),
+                            sizeof(int)),                              /* [2] */
+               BTF_ENUM_ENC(0, 0),
+               BTF_END_RAW,
+       },
+       .str_sec = "",
+       .str_sec_size = sizeof(""),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "enum_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "enum member (invalid name, invalid identifier)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),          /* [1] */
+               BTF_TYPE_ENC(0,
+                            BTF_INFO_ENC(BTF_KIND_ENUM, 0, 1),
+                            sizeof(int)),                              /* [2] */
+               BTF_ENUM_ENC(NAME_TBD, 0),
+               BTF_END_RAW,
+       },
+       .str_sec = "\0A!",
+       .str_sec_size = sizeof("\0A!"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "enum_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
 {
        .descr = "arraymap invalid btf key (a bit field)",
        .raw_types = {
@@ -1374,230 +1757,691 @@ static struct btf_raw_test raw_tests[] = {
        .map_create_err = true,
 },
 
-}; /* struct btf_raw_test raw_tests[] */
-
-static const char *get_next_str(const char *start, const char *end)
 {
-       return start < end - 1 ? start + 1 : NULL;
-}
+       .descr = "func proto (int (*)(int, unsigned int))",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* int (*)(int, unsigned int) */
+               BTF_FUNC_PROTO_ENC(1, 2),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(0, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(0, 2),
+               BTF_END_RAW,
+       },
+       .str_sec = "",
+       .str_sec_size = sizeof(""),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_proto_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+},
 
-static int get_type_sec_size(const __u32 *raw_types)
 {
-       int i;
-
-       for (i = MAX_NR_RAW_TYPES - 1;
-            i >= 0 && raw_types[i] != BTF_END_RAW;
-            i--)
-               ;
-
-       return i < 0 ? i : i * sizeof(raw_types[0]);
-}
+       .descr = "func proto (vararg)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* void (*)(int, unsigned int, ...) */
+               BTF_FUNC_PROTO_ENC(0, 3),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(0, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(0, 2),
+                       BTF_FUNC_PROTO_ARG_ENC(0, 0),
+               BTF_END_RAW,
+       },
+       .str_sec = "",
+       .str_sec_size = sizeof(""),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_proto_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+},
 
-static void *btf_raw_create(const struct btf_header *hdr,
-                           const __u32 *raw_types,
-                           const char *str,
-                           unsigned int str_sec_size,
-                           unsigned int *btf_size)
 {
-       const char *next_str = str, *end_str = str + str_sec_size;
-       unsigned int size_needed, offset;
-       struct btf_header *ret_hdr;
-       int i, type_sec_size;
-       uint32_t *ret_types;
-       void *raw_btf;
-
-       type_sec_size = get_type_sec_size(raw_types);
-       if (CHECK(type_sec_size < 0, "Cannot get nr_raw_types"))
-               return NULL;
-
-       size_needed = sizeof(*hdr) + type_sec_size + str_sec_size;
-       raw_btf = malloc(size_needed);
-       if (CHECK(!raw_btf, "Cannot allocate memory for raw_btf"))
-               return NULL;
-
-       /* Copy header */
-       memcpy(raw_btf, hdr, sizeof(*hdr));
-       offset = sizeof(*hdr);
-
-       /* Copy type section */
-       ret_types = raw_btf + offset;
-       for (i = 0; i < type_sec_size / sizeof(raw_types[0]); i++) {
-               if (raw_types[i] == NAME_TBD) {
-                       next_str = get_next_str(next_str, end_str);
-                       if (CHECK(!next_str, "Error in getting next_str")) {
-                               free(raw_btf);
-                               return NULL;
-                       }
-                       ret_types[i] = next_str - str;
-                       next_str += strlen(next_str);
-               } else {
-                       ret_types[i] = raw_types[i];
-               }
-       }
-       offset += type_sec_size;
-
-       /* Copy string section */
-       memcpy(raw_btf + offset, str, str_sec_size);
-
-       ret_hdr = (struct btf_header *)raw_btf;
-       ret_hdr->type_len = type_sec_size;
-       ret_hdr->str_off = type_sec_size;
-       ret_hdr->str_len = str_sec_size;
-
-       *btf_size = size_needed;
-
-       return raw_btf;
-}
+       .descr = "func proto (vararg with name)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* void (*)(int a, unsigned int b, ... c) */
+               BTF_FUNC_PROTO_ENC(0, 3),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 0),
+               BTF_END_RAW,
+       },
+       .str_sec = "\0a\0b\0c",
+       .str_sec_size = sizeof("\0a\0b\0c"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_proto_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid arg#3",
+},
 
-static int do_test_raw(unsigned int test_num)
 {
-       struct btf_raw_test *test = &raw_tests[test_num - 1];
-       struct bpf_create_map_attr create_attr = {};
-       int map_fd = -1, btf_fd = -1;
-       unsigned int raw_btf_size;
-       struct btf_header *hdr;
-       void *raw_btf;
-       int err;
-
-       fprintf(stderr, "BTF raw test[%u] (%s): ", test_num, test->descr);
-       raw_btf = btf_raw_create(&hdr_tmpl,
-                                test->raw_types,
-                                test->str_sec,
-                                test->str_sec_size,
-                                &raw_btf_size);
-
-       if (!raw_btf)
-               return -1;
-
-       hdr = raw_btf;
-
-       hdr->hdr_len = (int)hdr->hdr_len + test->hdr_len_delta;
-       hdr->type_off = (int)hdr->type_off + test->type_off_delta;
-       hdr->str_off = (int)hdr->str_off + test->str_off_delta;
-       hdr->str_len = (int)hdr->str_len + test->str_len_delta;
-
-       *btf_log_buf = '\0';
-       btf_fd = bpf_load_btf(raw_btf, raw_btf_size,
-                             btf_log_buf, BTF_LOG_BUF_SIZE,
-                             args.always_log);
-       free(raw_btf);
-
-       err = ((btf_fd == -1) != test->btf_load_err);
-       if (CHECK(err, "btf_fd:%d test->btf_load_err:%u",
-                 btf_fd, test->btf_load_err) ||
-           CHECK(test->err_str && !strstr(btf_log_buf, test->err_str),
-                 "expected err_str:%s", test->err_str)) {
-               err = -1;
-               goto done;
-       }
-
-       if (err || btf_fd == -1)
-               goto done;
-
-       create_attr.name = test->map_name;
-       create_attr.map_type = test->map_type;
-       create_attr.key_size = test->key_size;
-       create_attr.value_size = test->value_size;
-       create_attr.max_entries = test->max_entries;
-       create_attr.btf_fd = btf_fd;
-       create_attr.btf_key_type_id = test->key_type_id;
-       create_attr.btf_value_type_id = test->value_type_id;
-
-       map_fd = bpf_create_map_xattr(&create_attr);
-
-       err = ((map_fd == -1) != test->map_create_err);
-       CHECK(err, "map_fd:%d test->map_create_err:%u",
-             map_fd, test->map_create_err);
-
-done:
-       if (!err)
-               fprintf(stderr, "OK");
-
-       if (*btf_log_buf && (err || args.always_log))
-               fprintf(stderr, "\n%s", btf_log_buf);
-
-       if (btf_fd != -1)
-               close(btf_fd);
-       if (map_fd != -1)
-               close(map_fd);
-
-       return err;
-}
+       .descr = "func proto (arg after vararg)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* void (*)(int a, ..., unsigned int b) */
+               BTF_FUNC_PROTO_ENC(0, 3),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(0, 0),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
+               BTF_END_RAW,
+       },
+       .str_sec = "\0a\0b",
+       .str_sec_size = sizeof("\0a\0b"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_proto_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid arg#2",
+},
 
-static int test_raw(void)
 {
-       unsigned int i;
-       int err = 0;
-
-       if (args.raw_test_num)
-               return count_result(do_test_raw(args.raw_test_num));
-
-       for (i = 1; i <= ARRAY_SIZE(raw_tests); i++)
-               err |= count_result(do_test_raw(i));
-
-       return err;
-}
-
-struct btf_get_info_test {
-       const char *descr;
-       const char *str_sec;
-       __u32 raw_types[MAX_NR_RAW_TYPES];
-       __u32 str_sec_size;
-       int btf_size_delta;
-       int (*special_test)(unsigned int test_num);
-};
-
-static int test_big_btf_info(unsigned int test_num);
-static int test_btf_id(unsigned int test_num);
+       .descr = "func proto (CONST=>TYPEDEF=>PTR=>FUNC_PROTO)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* typedef void (*func_ptr)(int, unsigned int) */
+               BTF_TYPEDEF_ENC(NAME_TBD, 5),                   /* [3] */
+               /* const func_ptr */
+               BTF_CONST_ENC(3),                               /* [4] */
+               BTF_PTR_ENC(6),                                 /* [5] */
+               BTF_FUNC_PROTO_ENC(0, 2),                       /* [6] */
+                       BTF_FUNC_PROTO_ARG_ENC(0, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(0, 2),
+               BTF_END_RAW,
+       },
+       .str_sec = "\0func_ptr",
+       .str_sec_size = sizeof("\0func_ptr"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_proto_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+},
 
-const struct btf_get_info_test get_info_tests[] = {
 {
-       .descr = "== raw_btf_size+1",
+       .descr = "func proto (CONST=>TYPEDEF=>FUNC_PROTO)",
        .raw_types = {
-               /* int */                               /* [1] */
-               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               BTF_CONST_ENC(4),                               /* [3] */
+               BTF_TYPEDEF_ENC(NAME_TBD, 5),                   /* [4] */
+               BTF_FUNC_PROTO_ENC(0, 2),                       /* [5] */
+                       BTF_FUNC_PROTO_ARG_ENC(0, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(0, 2),
                BTF_END_RAW,
        },
-       .str_sec = "",
-       .str_sec_size = sizeof(""),
-       .btf_size_delta = 1,
+       .str_sec = "\0func_typedef",
+       .str_sec_size = sizeof("\0func_typedef"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_proto_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid type_id",
 },
+
 {
-       .descr = "== raw_btf_size-3",
+       .descr = "func proto (btf_resolve(arg))",
        .raw_types = {
-               /* int */                               /* [1] */
-               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               /* void (*)(const void *) */
+               BTF_FUNC_PROTO_ENC(0, 1),                       /* [2] */
+                       BTF_FUNC_PROTO_ARG_ENC(0, 3),
+               BTF_CONST_ENC(4),                               /* [3] */
+               BTF_PTR_ENC(0),                                 /* [4] */
                BTF_END_RAW,
        },
        .str_sec = "",
        .str_sec_size = sizeof(""),
-       .btf_size_delta = -3,
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_proto_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
 },
+
 {
-       .descr = "Large bpf_btf_info",
+       .descr = "func proto (Not all arg has name)",
        .raw_types = {
-               /* int */                               /* [1] */
-               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* void (*)(int, unsigned int b) */
+               BTF_FUNC_PROTO_ENC(0, 2),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(0, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
                BTF_END_RAW,
        },
-       .str_sec = "",
-       .str_sec_size = sizeof(""),
-       .special_test = test_big_btf_info,
+       .str_sec = "\0b",
+       .str_sec_size = sizeof("\0b"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_proto_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
 },
+
 {
-       .descr = "BTF ID",
+       .descr = "func proto (Bad arg name_off)",
        .raw_types = {
-               /* int */                               /* [1] */
-               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
-               /* unsigned int */                      /* [2] */
-               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* void (*)(int a, unsigned int <bad_name_off>) */
+               BTF_FUNC_PROTO_ENC(0, 2),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(0xffffffff, 2),
                BTF_END_RAW,
        },
-       .str_sec = "",
-       .str_sec_size = sizeof(""),
-       .special_test = test_btf_id,
+       .str_sec = "\0a",
+       .str_sec_size = sizeof("\0a"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_proto_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid arg#2",
 },
-};
+
+{
+       .descr = "func proto (Bad arg name)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* void (*)(int a, unsigned int !!!) */
+               BTF_FUNC_PROTO_ENC(0, 2),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
+               BTF_END_RAW,
+       },
+       .str_sec = "\0a\0!!!",
+       .str_sec_size = sizeof("\0a\0!!!"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_proto_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid arg#2",
+},
+
+{
+       .descr = "func proto (Invalid return type)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* <bad_ret_type> (*)(int, unsigned int) */
+               BTF_FUNC_PROTO_ENC(100, 2),                     /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(0, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(0, 2),
+               BTF_END_RAW,
+       },
+       .str_sec = "",
+       .str_sec_size = sizeof(""),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_proto_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid return type",
+},
+
+{
+       .descr = "func proto (with func name)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* void func_proto(int, unsigned int) */
+               BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_FUNC_PROTO, 0, 2), 0),     /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(0, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(0, 2),
+               BTF_END_RAW,
+       },
+       .str_sec = "\0func_proto",
+       .str_sec_size = sizeof("\0func_proto"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_proto_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "func proto (const void arg)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* void (*)(const void) */
+               BTF_FUNC_PROTO_ENC(0, 1),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(0, 4),
+               BTF_CONST_ENC(0),                               /* [4] */
+               BTF_END_RAW,
+       },
+       .str_sec = "",
+       .str_sec_size = sizeof(""),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_proto_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid arg#1",
+},
+
+{
+       .descr = "func (void func(int a, unsigned int b))",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* void (*)(int a, unsigned int b) */
+               BTF_FUNC_PROTO_ENC(0, 2),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
+               /* void func(int a, unsigned int b) */
+               BTF_FUNC_ENC(NAME_TBD, 3),                      /* [4] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0a\0b\0func",
+       .str_sec_size = sizeof("\0a\0b\0func"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+},
+
+{
+       .descr = "func (No func name)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* void (*)(int a, unsigned int b) */
+               BTF_FUNC_PROTO_ENC(0, 2),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
+               /* void <no_name>(int a, unsigned int b) */
+               BTF_FUNC_ENC(0, 3),                             /* [4] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0a\0b",
+       .str_sec_size = sizeof("\0a\0b"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "func (Invalid func name)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* void (*)(int a, unsigned int b) */
+               BTF_FUNC_PROTO_ENC(0, 2),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
+               /* void !!!(int a, unsigned int b) */
+               BTF_FUNC_ENC(NAME_TBD, 3),                      /* [4] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0a\0b\0!!!",
+       .str_sec_size = sizeof("\0a\0b\0!!!"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid name",
+},
+
+{
+       .descr = "func (Some arg has no name)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* void (*)(int a, unsigned int) */
+               BTF_FUNC_PROTO_ENC(0, 2),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(0, 2),
+               /* void func(int a, unsigned int) */
+               BTF_FUNC_ENC(NAME_TBD, 3),                      /* [4] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0a\0func",
+       .str_sec_size = sizeof("\0a\0func"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid arg#2",
+},
+
+{
+       .descr = "func (Non zero vlen)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),               /* [2] */
+               /* void (*)(int a, unsigned int b) */
+               BTF_FUNC_PROTO_ENC(0, 2),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
+               /* void func(int a, unsigned int b) */
+               BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_FUNC, 0, 2), 3),   /* [4] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0a\0b\0func",
+       .str_sec_size = sizeof("\0a\0b\0func"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "vlen != 0",
+},
+
+{
+       .descr = "func (Not referring to FUNC_PROTO)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_FUNC_ENC(NAME_TBD, 1),                      /* [2] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0func",
+       .str_sec_size = sizeof("\0func"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "func_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = sizeof(int),
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 4,
+       .btf_load_err = true,
+       .err_str = "Invalid type_id",
+},
+
+}; /* struct btf_raw_test raw_tests[] */
+
+static const char *get_next_str(const char *start, const char *end)
+{
+       return start < end - 1 ? start + 1 : NULL;
+}
+
+static int get_raw_sec_size(const __u32 *raw_types)
+{
+       int i;
+
+       for (i = MAX_NR_RAW_U32 - 1;
+            i >= 0 && raw_types[i] != BTF_END_RAW;
+            i--)
+               ;
+
+       return i < 0 ? i : i * sizeof(raw_types[0]);
+}
+
+static void *btf_raw_create(const struct btf_header *hdr,
+                           const __u32 *raw_types,
+                           const char *str,
+                           unsigned int str_sec_size,
+                           unsigned int *btf_size,
+                           const char **ret_next_str)
+{
+       const char *next_str = str, *end_str = str + str_sec_size;
+       unsigned int size_needed, offset;
+       struct btf_header *ret_hdr;
+       int i, type_sec_size;
+       uint32_t *ret_types;
+       void *raw_btf;
+
+       type_sec_size = get_raw_sec_size(raw_types);
+       if (CHECK(type_sec_size < 0, "Cannot get nr_raw_types"))
+               return NULL;
+
+       size_needed = sizeof(*hdr) + type_sec_size + str_sec_size;
+       raw_btf = malloc(size_needed);
+       if (CHECK(!raw_btf, "Cannot allocate memory for raw_btf"))
+               return NULL;
+
+       /* Copy header */
+       memcpy(raw_btf, hdr, sizeof(*hdr));
+       offset = sizeof(*hdr);
+
+       /* Copy type section */
+       ret_types = raw_btf + offset;
+       for (i = 0; i < type_sec_size / sizeof(raw_types[0]); i++) {
+               if (raw_types[i] == NAME_TBD) {
+                       next_str = get_next_str(next_str, end_str);
+                       if (CHECK(!next_str, "Error in getting next_str")) {
+                               free(raw_btf);
+                               return NULL;
+                       }
+                       ret_types[i] = next_str - str;
+                       next_str += strlen(next_str);
+               } else {
+                       ret_types[i] = raw_types[i];
+               }
+       }
+       offset += type_sec_size;
+
+       /* Copy string section */
+       memcpy(raw_btf + offset, str, str_sec_size);
+
+       ret_hdr = (struct btf_header *)raw_btf;
+       ret_hdr->type_len = type_sec_size;
+       ret_hdr->str_off = type_sec_size;
+       ret_hdr->str_len = str_sec_size;
+
+       *btf_size = size_needed;
+       if (ret_next_str)
+               *ret_next_str = next_str;
+
+       return raw_btf;
+}
+
+static int do_test_raw(unsigned int test_num)
+{
+       struct btf_raw_test *test = &raw_tests[test_num - 1];
+       struct bpf_create_map_attr create_attr = {};
+       int map_fd = -1, btf_fd = -1;
+       unsigned int raw_btf_size;
+       struct btf_header *hdr;
+       void *raw_btf;
+       int err;
+
+       fprintf(stderr, "BTF raw test[%u] (%s): ", test_num, test->descr);
+       raw_btf = btf_raw_create(&hdr_tmpl,
+                                test->raw_types,
+                                test->str_sec,
+                                test->str_sec_size,
+                                &raw_btf_size, NULL);
+
+       if (!raw_btf)
+               return -1;
+
+       hdr = raw_btf;
+
+       hdr->hdr_len = (int)hdr->hdr_len + test->hdr_len_delta;
+       hdr->type_off = (int)hdr->type_off + test->type_off_delta;
+       hdr->str_off = (int)hdr->str_off + test->str_off_delta;
+       hdr->str_len = (int)hdr->str_len + test->str_len_delta;
+
+       *btf_log_buf = '\0';
+       btf_fd = bpf_load_btf(raw_btf, raw_btf_size,
+                             btf_log_buf, BTF_LOG_BUF_SIZE,
+                             args.always_log);
+       free(raw_btf);
+
+       err = ((btf_fd == -1) != test->btf_load_err);
+       if (CHECK(err, "btf_fd:%d test->btf_load_err:%u",
+                 btf_fd, test->btf_load_err) ||
+           CHECK(test->err_str && !strstr(btf_log_buf, test->err_str),
+                 "expected err_str:%s", test->err_str)) {
+               err = -1;
+               goto done;
+       }
+
+       if (err || btf_fd == -1)
+               goto done;
+
+       create_attr.name = test->map_name;
+       create_attr.map_type = test->map_type;
+       create_attr.key_size = test->key_size;
+       create_attr.value_size = test->value_size;
+       create_attr.max_entries = test->max_entries;
+       create_attr.btf_fd = btf_fd;
+       create_attr.btf_key_type_id = test->key_type_id;
+       create_attr.btf_value_type_id = test->value_type_id;
+
+       map_fd = bpf_create_map_xattr(&create_attr);
+
+       err = ((map_fd == -1) != test->map_create_err);
+       CHECK(err, "map_fd:%d test->map_create_err:%u",
+             map_fd, test->map_create_err);
+
+done:
+       if (!err)
+               fprintf(stderr, "OK");
+
+       if (*btf_log_buf && (err || args.always_log))
+               fprintf(stderr, "\n%s", btf_log_buf);
+
+       if (btf_fd != -1)
+               close(btf_fd);
+       if (map_fd != -1)
+               close(map_fd);
+
+       return err;
+}
+
+static int test_raw(void)
+{
+       unsigned int i;
+       int err = 0;
+
+       if (args.raw_test_num)
+               return count_result(do_test_raw(args.raw_test_num));
+
+       for (i = 1; i <= ARRAY_SIZE(raw_tests); i++)
+               err |= count_result(do_test_raw(i));
+
+       return err;
+}
+
+struct btf_get_info_test {
+       const char *descr;
+       const char *str_sec;
+       __u32 raw_types[MAX_NR_RAW_U32];
+       __u32 str_sec_size;
+       int btf_size_delta;
+       int (*special_test)(unsigned int test_num);
+};
+
+static int test_big_btf_info(unsigned int test_num);
+static int test_btf_id(unsigned int test_num);
+
+const struct btf_get_info_test get_info_tests[] = {
+{
+       .descr = "== raw_btf_size+1",
+       .raw_types = {
+               /* int */                               /* [1] */
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
+               BTF_END_RAW,
+       },
+       .str_sec = "",
+       .str_sec_size = sizeof(""),
+       .btf_size_delta = 1,
+},
+{
+       .descr = "== raw_btf_size-3",
+       .raw_types = {
+               /* int */                               /* [1] */
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
+               BTF_END_RAW,
+       },
+       .str_sec = "",
+       .str_sec_size = sizeof(""),
+       .btf_size_delta = -3,
+},
+{
+       .descr = "Large bpf_btf_info",
+       .raw_types = {
+               /* int */                               /* [1] */
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
+               BTF_END_RAW,
+       },
+       .str_sec = "",
+       .str_sec_size = sizeof(""),
+       .special_test = test_big_btf_info,
+},
+{
+       .descr = "BTF ID",
+       .raw_types = {
+               /* int */                               /* [1] */
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
+               /* unsigned int */                      /* [2] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 32, 4),
+               BTF_END_RAW,
+       },
+       .str_sec = "",
+       .str_sec_size = sizeof(""),
+       .special_test = test_btf_id,
+},
+};
 
 static inline __u64 ptr_to_u64(const void *ptr)
 {
@@ -1621,7 +2465,7 @@ static int test_big_btf_info(unsigned int test_num)
                                 test->raw_types,
                                 test->str_sec,
                                 test->str_sec_size,
-                                &raw_btf_size);
+                                &raw_btf_size, NULL);
 
        if (!raw_btf)
                return -1;
@@ -1705,7 +2549,7 @@ static int test_btf_id(unsigned int test_num)
                                 test->raw_types,
                                 test->str_sec,
                                 test->str_sec_size,
-                                &raw_btf_size);
+                                &raw_btf_size, NULL);
 
        if (!raw_btf)
                return -1;
@@ -1843,7 +2687,7 @@ static int do_test_get_info(unsigned int test_num)
                                 test->raw_types,
                                 test->str_sec,
                                 test->str_sec_size,
-                                &raw_btf_size);
+                                &raw_btf_size, NULL);
 
        if (!raw_btf)
                return -1;
@@ -1864,629 +2708,1606 @@ static int do_test_get_info(unsigned int test_num)
                goto done;
        }
 
-       user_btf_size = (int)raw_btf_size + test->btf_size_delta;
-       expected_nbytes = min(raw_btf_size, user_btf_size);
-       if (raw_btf_size > expected_nbytes)
-               memset(user_btf + expected_nbytes, 0xff,
-                      raw_btf_size - expected_nbytes);
+       user_btf_size = (int)raw_btf_size + test->btf_size_delta;
+       expected_nbytes = min(raw_btf_size, user_btf_size);
+       if (raw_btf_size > expected_nbytes)
+               memset(user_btf + expected_nbytes, 0xff,
+                      raw_btf_size - expected_nbytes);
+
+       info_len = sizeof(info);
+       info.btf = ptr_to_u64(user_btf);
+       info.btf_size = user_btf_size;
+
+       ret = 0;
+       err = bpf_obj_get_info_by_fd(btf_fd, &info, &info_len);
+       if (CHECK(err || !info.id || info_len != sizeof(info) ||
+                 info.btf_size != raw_btf_size ||
+                 (ret = memcmp(raw_btf, user_btf, expected_nbytes)),
+                 "err:%d errno:%d info.id:%u info_len:%u sizeof(info):%lu raw_btf_size:%u info.btf_size:%u expected_nbytes:%u memcmp:%d",
+                 err, errno, info.id, info_len, sizeof(info),
+                 raw_btf_size, info.btf_size, expected_nbytes, ret)) {
+               err = -1;
+               goto done;
+       }
+
+       while (expected_nbytes < raw_btf_size) {
+               fprintf(stderr, "%u...", expected_nbytes);
+               if (CHECK(user_btf[expected_nbytes++] != 0xff,
+                         "user_btf[%u]:%x != 0xff", expected_nbytes - 1,
+                         user_btf[expected_nbytes - 1])) {
+                       err = -1;
+                       goto done;
+               }
+       }
+
+       fprintf(stderr, "OK");
+
+done:
+       if (*btf_log_buf && (err || args.always_log))
+               fprintf(stderr, "\n%s", btf_log_buf);
+
+       free(raw_btf);
+       free(user_btf);
+
+       if (btf_fd != -1)
+               close(btf_fd);
+
+       return err;
+}
+
+static int test_get_info(void)
+{
+       unsigned int i;
+       int err = 0;
+
+       if (args.get_info_test_num)
+               return count_result(do_test_get_info(args.get_info_test_num));
+
+       for (i = 1; i <= ARRAY_SIZE(get_info_tests); i++)
+               err |= count_result(do_test_get_info(i));
+
+       return err;
+}
+
+struct btf_file_test {
+       const char *file;
+       bool btf_kv_notfound;
+};
+
+static struct btf_file_test file_tests[] = {
+{
+       .file = "test_btf_haskv.o",
+},
+{
+       .file = "test_btf_nokv.o",
+       .btf_kv_notfound = true,
+},
+};
+
+static int file_has_btf_elf(const char *fn, bool *has_btf_ext)
+{
+       Elf_Scn *scn = NULL;
+       GElf_Ehdr ehdr;
+       int ret = 0;
+       int elf_fd;
+       Elf *elf;
+
+       if (CHECK(elf_version(EV_CURRENT) == EV_NONE,
+                 "elf_version(EV_CURRENT) == EV_NONE"))
+               return -1;
+
+       elf_fd = open(fn, O_RDONLY);
+       if (CHECK(elf_fd == -1, "open(%s): errno:%d", fn, errno))
+               return -1;
+
+       elf = elf_begin(elf_fd, ELF_C_READ, NULL);
+       if (CHECK(!elf, "elf_begin(%s): %s", fn, elf_errmsg(elf_errno()))) {
+               ret = -1;
+               goto done;
+       }
+
+       if (CHECK(!gelf_getehdr(elf, &ehdr), "!gelf_getehdr(%s)", fn)) {
+               ret = -1;
+               goto done;
+       }
+
+       while ((scn = elf_nextscn(elf, scn))) {
+               const char *sh_name;
+               GElf_Shdr sh;
+
+               if (CHECK(gelf_getshdr(scn, &sh) != &sh,
+                         "file:%s gelf_getshdr != &sh", fn)) {
+                       ret = -1;
+                       goto done;
+               }
+
+               sh_name = elf_strptr(elf, ehdr.e_shstrndx, sh.sh_name);
+               if (!strcmp(sh_name, BTF_ELF_SEC))
+                       ret = 1;
+               if (!strcmp(sh_name, BTF_EXT_ELF_SEC))
+                       *has_btf_ext = true;
+       }
+
+done:
+       close(elf_fd);
+       elf_end(elf);
+       return ret;
+}
+
+static int do_test_file(unsigned int test_num)
+{
+       const struct btf_file_test *test = &file_tests[test_num - 1];
+       const char *expected_fnames[] = {"_dummy_tracepoint",
+                                        "test_long_fname_1",
+                                        "test_long_fname_2"};
+       struct bpf_prog_info info = {};
+       struct bpf_object *obj = NULL;
+       struct bpf_func_info *finfo;
+       struct bpf_program *prog;
+       __u32 info_len, rec_size;
+       bool has_btf_ext = false;
+       struct btf *btf = NULL;
+       void *func_info = NULL;
+       struct bpf_map *map;
+       int i, err, prog_fd;
+
+       fprintf(stderr, "BTF libbpf test[%u] (%s): ", test_num,
+               test->file);
+
+       err = file_has_btf_elf(test->file, &has_btf_ext);
+       if (err == -1)
+               return err;
+
+       if (err == 0) {
+               fprintf(stderr, "SKIP. No ELF %s found", BTF_ELF_SEC);
+               skip_cnt++;
+               return 0;
+       }
+
+       obj = bpf_object__open(test->file);
+       if (CHECK(IS_ERR(obj), "obj: %ld", PTR_ERR(obj)))
+               return PTR_ERR(obj);
+
+       err = bpf_object__btf_fd(obj);
+       if (CHECK(err == -1, "bpf_object__btf_fd: -1"))
+               goto done;
+
+       prog = bpf_program__next(NULL, obj);
+       if (CHECK(!prog, "Cannot find bpf_prog")) {
+               err = -1;
+               goto done;
+       }
+
+       bpf_program__set_type(prog, BPF_PROG_TYPE_TRACEPOINT);
+       err = bpf_object__load(obj);
+       if (CHECK(err < 0, "bpf_object__load: %d", err))
+               goto done;
+       prog_fd = bpf_program__fd(prog);
+
+       map = bpf_object__find_map_by_name(obj, "btf_map");
+       if (CHECK(!map, "btf_map not found")) {
+               err = -1;
+               goto done;
+       }
+
+       err = (bpf_map__btf_key_type_id(map) == 0 || bpf_map__btf_value_type_id(map) == 0)
+               != test->btf_kv_notfound;
+       if (CHECK(err, "btf_key_type_id:%u btf_value_type_id:%u test->btf_kv_notfound:%u",
+                 bpf_map__btf_key_type_id(map), bpf_map__btf_value_type_id(map),
+                 test->btf_kv_notfound))
+               goto done;
+
+       if (!has_btf_ext)
+               goto skip;
+
+       /* get necessary program info */
+       info_len = sizeof(struct bpf_prog_info);
+       err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
+
+       if (CHECK(err == -1, "invalid get info (1st) errno:%d", errno)) {
+               fprintf(stderr, "%s\n", btf_log_buf);
+               err = -1;
+               goto done;
+       }
+       if (CHECK(info.nr_func_info != 3,
+                 "incorrect info.nr_func_info (1st) %d",
+                 info.nr_func_info)) {
+               err = -1;
+               goto done;
+       }
+       rec_size = info.func_info_rec_size;
+       if (CHECK(rec_size < 4,
+                 "incorrect info.func_info_rec_size (1st) %d\n", rec_size)) {
+               err = -1;
+               goto done;
+       }
+
+       func_info = malloc(info.nr_func_info * rec_size);
+       if (CHECK(!func_info, "out of memory")) {
+               err = -1;
+               goto done;
+       }
+
+       /* reset info to only retrieve func_info related data */
+       memset(&info, 0, sizeof(info));
+       info.nr_func_info = 3;
+       info.func_info_rec_size = rec_size;
+       info.func_info = ptr_to_u64(func_info);
+
+       err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
+
+       if (CHECK(err == -1, "invalid get info (2nd) errno:%d", errno)) {
+               fprintf(stderr, "%s\n", btf_log_buf);
+               err = -1;
+               goto done;
+       }
+       if (CHECK(info.nr_func_info != 3,
+                 "incorrect info.nr_func_info (2nd) %d",
+                 info.nr_func_info)) {
+               err = -1;
+               goto done;
+       }
+       if (CHECK(info.func_info_rec_size != rec_size,
+                 "incorrect info.func_info_rec_size (2nd) %d",
+                 info.func_info_rec_size)) {
+               err = -1;
+               goto done;
+       }
+
+       err = btf__get_from_id(info.btf_id, &btf);
+       if (CHECK(err, "cannot get btf from kernel, err: %d", err))
+               goto done;
 
-       info_len = sizeof(info);
-       info.btf = ptr_to_u64(user_btf);
-       info.btf_size = user_btf_size;
+       /* check three functions */
+       finfo = func_info;
+       for (i = 0; i < 3; i++) {
+               const struct btf_type *t;
+               const char *fname;
 
-       ret = 0;
-       err = bpf_obj_get_info_by_fd(btf_fd, &info, &info_len);
-       if (CHECK(err || !info.id || info_len != sizeof(info) ||
-                 info.btf_size != raw_btf_size ||
-                 (ret = memcmp(raw_btf, user_btf, expected_nbytes)),
-                 "err:%d errno:%d info.id:%u info_len:%u sizeof(info):%lu raw_btf_size:%u info.btf_size:%u expected_nbytes:%u memcmp:%d",
-                 err, errno, info.id, info_len, sizeof(info),
-                 raw_btf_size, info.btf_size, expected_nbytes, ret)) {
-               err = -1;
-               goto done;
-       }
+               t = btf__type_by_id(btf, finfo->type_id);
+               if (CHECK(!t, "btf__type_by_id failure: id %u",
+                         finfo->type_id)) {
+                       err = -1;
+                       goto done;
+               }
 
-       while (expected_nbytes < raw_btf_size) {
-               fprintf(stderr, "%u...", expected_nbytes);
-               if (CHECK(user_btf[expected_nbytes++] != 0xff,
-                         "user_btf[%u]:%x != 0xff", expected_nbytes - 1,
-                         user_btf[expected_nbytes - 1])) {
+               fname = btf__name_by_offset(btf, t->name_off);
+               err = strcmp(fname, expected_fnames[i]);
+               /* for the second and third functions in .text section,
+                * the compiler may order them either way.
+                */
+               if (i && err)
+                       err = strcmp(fname, expected_fnames[3 - i]);
+               if (CHECK(err, "incorrect fname %s", fname ? : "")) {
                        err = -1;
                        goto done;
                }
+
+               finfo = (void *)finfo + rec_size;
        }
 
+skip:
        fprintf(stderr, "OK");
 
 done:
-       if (*btf_log_buf && (err || args.always_log))
-               fprintf(stderr, "\n%s", btf_log_buf);
+       free(func_info);
+       bpf_object__close(obj);
+       return err;
+}
 
-       free(raw_btf);
-       free(user_btf);
+static int test_file(void)
+{
+       unsigned int i;
+       int err = 0;
 
-       if (btf_fd != -1)
-               close(btf_fd);
+       if (args.file_test_num)
+               return count_result(do_test_file(args.file_test_num));
+
+       for (i = 1; i <= ARRAY_SIZE(file_tests); i++)
+               err |= count_result(do_test_file(i));
 
        return err;
 }
 
-static int test_get_info(void)
+const char *pprint_enum_str[] = {
+       "ENUM_ZERO",
+       "ENUM_ONE",
+       "ENUM_TWO",
+       "ENUM_THREE",
+};
+
+struct pprint_mapv {
+       uint32_t ui32;
+       uint16_t ui16;
+       /* 2 bytes hole */
+       int32_t si32;
+       uint32_t unused_bits2a:2,
+               bits28:28,
+               unused_bits2b:2;
+       union {
+               uint64_t ui64;
+               uint8_t ui8a[8];
+       };
+       enum {
+               ENUM_ZERO,
+               ENUM_ONE,
+               ENUM_TWO,
+               ENUM_THREE,
+       } aenum;
+};
+
+static struct btf_raw_test pprint_test_template = {
+       .raw_types = {
+               /* unsighed char */                     /* [1] */
+               BTF_TYPE_INT_ENC(NAME_TBD, 0, 0, 8, 1),
+               /* unsigned short */                    /* [2] */
+               BTF_TYPE_INT_ENC(NAME_TBD, 0, 0, 16, 2),
+               /* unsigned int */                      /* [3] */
+               BTF_TYPE_INT_ENC(NAME_TBD, 0, 0, 32, 4),
+               /* int */                               /* [4] */
+               BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),
+               /* unsigned long long */                /* [5] */
+               BTF_TYPE_INT_ENC(NAME_TBD, 0, 0, 64, 8),
+               /* 2 bits */                            /* [6] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 2, 2),
+               /* 28 bits */                           /* [7] */
+               BTF_TYPE_INT_ENC(0, 0, 0, 28, 4),
+               /* uint8_t[8] */                        /* [8] */
+               BTF_TYPE_ARRAY_ENC(9, 1, 8),
+               /* typedef unsigned char uint8_t */     /* [9] */
+               BTF_TYPEDEF_ENC(NAME_TBD, 1),
+               /* typedef unsigned short uint16_t */   /* [10] */
+               BTF_TYPEDEF_ENC(NAME_TBD, 2),
+               /* typedef unsigned int uint32_t */     /* [11] */
+               BTF_TYPEDEF_ENC(NAME_TBD, 3),
+               /* typedef int int32_t */               /* [12] */
+               BTF_TYPEDEF_ENC(NAME_TBD, 4),
+               /* typedef unsigned long long uint64_t *//* [13] */
+               BTF_TYPEDEF_ENC(NAME_TBD, 5),
+               /* union (anon) */                      /* [14] */
+               BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_UNION, 0, 2), 8),
+               BTF_MEMBER_ENC(NAME_TBD, 13, 0),/* uint64_t ui64; */
+               BTF_MEMBER_ENC(NAME_TBD, 8, 0), /* uint8_t ui8a[8]; */
+               /* enum (anon) */                       /* [15] */
+               BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_ENUM, 0, 4), 4),
+               BTF_ENUM_ENC(NAME_TBD, 0),
+               BTF_ENUM_ENC(NAME_TBD, 1),
+               BTF_ENUM_ENC(NAME_TBD, 2),
+               BTF_ENUM_ENC(NAME_TBD, 3),
+               /* struct pprint_mapv */                /* [16] */
+               BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 8), 32),
+               BTF_MEMBER_ENC(NAME_TBD, 11, 0),        /* uint32_t ui32 */
+               BTF_MEMBER_ENC(NAME_TBD, 10, 32),       /* uint16_t ui16 */
+               BTF_MEMBER_ENC(NAME_TBD, 12, 64),       /* int32_t si32 */
+               BTF_MEMBER_ENC(NAME_TBD, 6, 96),        /* unused_bits2a */
+               BTF_MEMBER_ENC(NAME_TBD, 7, 98),        /* bits28 */
+               BTF_MEMBER_ENC(NAME_TBD, 6, 126),       /* unused_bits2b */
+               BTF_MEMBER_ENC(0, 14, 128),             /* union (anon) */
+               BTF_MEMBER_ENC(NAME_TBD, 15, 192),      /* aenum */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0unsigned char\0unsigned short\0unsigned int\0int\0unsigned long long\0uint8_t\0uint16_t\0uint32_t\0int32_t\0uint64_t\0ui64\0ui8a\0ENUM_ZERO\0ENUM_ONE\0ENUM_TWO\0ENUM_THREE\0pprint_mapv\0ui32\0ui16\0si32\0unused_bits2a\0bits28\0unused_bits2b\0aenum",
+       .str_sec_size = sizeof("\0unsigned char\0unsigned short\0unsigned int\0int\0unsigned long long\0uint8_t\0uint16_t\0uint32_t\0int32_t\0uint64_t\0ui64\0ui8a\0ENUM_ZERO\0ENUM_ONE\0ENUM_TWO\0ENUM_THREE\0pprint_mapv\0ui32\0ui16\0si32\0unused_bits2a\0bits28\0unused_bits2b\0aenum"),
+       .key_size = sizeof(unsigned int),
+       .value_size = sizeof(struct pprint_mapv),
+       .key_type_id = 3,       /* unsigned int */
+       .value_type_id = 16,    /* struct pprint_mapv */
+       .max_entries = 128 * 1024,
+};
+
+static struct btf_pprint_test_meta {
+       const char *descr;
+       enum bpf_map_type map_type;
+       const char *map_name;
+       bool ordered_map;
+       bool lossless_map;
+       bool percpu_map;
+} pprint_tests_meta[] = {
 {
-       unsigned int i;
-       int err = 0;
+       .descr = "BTF pretty print array",
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "pprint_test_array",
+       .ordered_map = true,
+       .lossless_map = true,
+       .percpu_map = false,
+},
 
-       if (args.get_info_test_num)
-               return count_result(do_test_get_info(args.get_info_test_num));
+{
+       .descr = "BTF pretty print hash",
+       .map_type = BPF_MAP_TYPE_HASH,
+       .map_name = "pprint_test_hash",
+       .ordered_map = false,
+       .lossless_map = true,
+       .percpu_map = false,
+},
 
-       for (i = 1; i <= ARRAY_SIZE(get_info_tests); i++)
-               err |= count_result(do_test_get_info(i));
+{
+       .descr = "BTF pretty print lru hash",
+       .map_type = BPF_MAP_TYPE_LRU_HASH,
+       .map_name = "pprint_test_lru_hash",
+       .ordered_map = false,
+       .lossless_map = false,
+       .percpu_map = false,
+},
+
+{
+       .descr = "BTF pretty print percpu array",
+       .map_type = BPF_MAP_TYPE_PERCPU_ARRAY,
+       .map_name = "pprint_test_percpu_array",
+       .ordered_map = true,
+       .lossless_map = true,
+       .percpu_map = true,
+},
+
+{
+       .descr = "BTF pretty print percpu hash",
+       .map_type = BPF_MAP_TYPE_PERCPU_HASH,
+       .map_name = "pprint_test_percpu_hash",
+       .ordered_map = false,
+       .lossless_map = true,
+       .percpu_map = true,
+},
+
+{
+       .descr = "BTF pretty print lru percpu hash",
+       .map_type = BPF_MAP_TYPE_LRU_PERCPU_HASH,
+       .map_name = "pprint_test_lru_percpu_hash",
+       .ordered_map = false,
+       .lossless_map = false,
+       .percpu_map = true,
+},
+
+};
+
+
+static void set_pprint_mapv(struct pprint_mapv *v, uint32_t i,
+                           int num_cpus, int rounded_value_size)
+{
+       int cpu;
+
+       for (cpu = 0; cpu < num_cpus; cpu++) {
+               v->ui32 = i + cpu;
+               v->si32 = -i;
+               v->unused_bits2a = 3;
+               v->bits28 = i;
+               v->unused_bits2b = 3;
+               v->ui64 = i;
+               v->aenum = i & 0x03;
+               v = (void *)v + rounded_value_size;
+       }
+}
+
+static int check_line(const char *expected_line, int nexpected_line,
+                     int expected_line_len, const char *line)
+{
+       if (CHECK(nexpected_line == expected_line_len,
+                 "expected_line is too long"))
+               return -1;
+
+       if (strcmp(expected_line, line)) {
+               fprintf(stderr, "unexpected pprint output\n");
+               fprintf(stderr, "expected: %s", expected_line);
+               fprintf(stderr, "    read: %s", line);
+               return -1;
+       }
+
+       return 0;
+}
+
+
+static int do_test_pprint(void)
+{
+       const struct btf_raw_test *test = &pprint_test_template;
+       struct bpf_create_map_attr create_attr = {};
+       bool ordered_map, lossless_map, percpu_map;
+       int err, ret, num_cpus, rounded_value_size;
+       struct pprint_mapv *mapv = NULL;
+       unsigned int key, nr_read_elems;
+       int map_fd = -1, btf_fd = -1;
+       unsigned int raw_btf_size;
+       char expected_line[255];
+       FILE *pin_file = NULL;
+       char pin_path[255];
+       size_t line_len = 0;
+       char *line = NULL;
+       uint8_t *raw_btf;
+       ssize_t nread;
+
+       fprintf(stderr, "%s......", test->descr);
+       raw_btf = btf_raw_create(&hdr_tmpl, test->raw_types,
+                                test->str_sec, test->str_sec_size,
+                                &raw_btf_size, NULL);
 
-       return err;
-}
+       if (!raw_btf)
+               return -1;
 
-struct btf_file_test {
-       const char *file;
-       bool btf_kv_notfound;
-};
+       *btf_log_buf = '\0';
+       btf_fd = bpf_load_btf(raw_btf, raw_btf_size,
+                             btf_log_buf, BTF_LOG_BUF_SIZE,
+                             args.always_log);
+       free(raw_btf);
 
-static struct btf_file_test file_tests[] = {
-{
-       .file = "test_btf_haskv.o",
-},
-{
-       .file = "test_btf_nokv.o",
-       .btf_kv_notfound = true,
-},
-};
+       if (CHECK(btf_fd == -1, "errno:%d", errno)) {
+               err = -1;
+               goto done;
+       }
 
-static int file_has_btf_elf(const char *fn)
-{
-       Elf_Scn *scn = NULL;
-       GElf_Ehdr ehdr;
-       int elf_fd;
-       Elf *elf;
-       int ret;
+       create_attr.name = test->map_name;
+       create_attr.map_type = test->map_type;
+       create_attr.key_size = test->key_size;
+       create_attr.value_size = test->value_size;
+       create_attr.max_entries = test->max_entries;
+       create_attr.btf_fd = btf_fd;
+       create_attr.btf_key_type_id = test->key_type_id;
+       create_attr.btf_value_type_id = test->value_type_id;
 
-       if (CHECK(elf_version(EV_CURRENT) == EV_NONE,
-                 "elf_version(EV_CURRENT) == EV_NONE"))
-               return -1;
+       map_fd = bpf_create_map_xattr(&create_attr);
+       if (CHECK(map_fd == -1, "errno:%d", errno)) {
+               err = -1;
+               goto done;
+       }
 
-       elf_fd = open(fn, O_RDONLY);
-       if (CHECK(elf_fd == -1, "open(%s): errno:%d", fn, errno))
-               return -1;
+       ret = snprintf(pin_path, sizeof(pin_path), "%s/%s",
+                      "/sys/fs/bpf", test->map_name);
 
-       elf = elf_begin(elf_fd, ELF_C_READ, NULL);
-       if (CHECK(!elf, "elf_begin(%s): %s", fn, elf_errmsg(elf_errno()))) {
-               ret = -1;
+       if (CHECK(ret == sizeof(pin_path), "pin_path %s/%s is too long",
+                 "/sys/fs/bpf", test->map_name)) {
+               err = -1;
                goto done;
        }
 
-       if (CHECK(!gelf_getehdr(elf, &ehdr), "!gelf_getehdr(%s)", fn)) {
-               ret = -1;
+       err = bpf_obj_pin(map_fd, pin_path);
+       if (CHECK(err, "bpf_obj_pin(%s): errno:%d.", pin_path, errno))
+               goto done;
+
+       percpu_map = test->percpu_map;
+       num_cpus = percpu_map ? bpf_num_possible_cpus() : 1;
+       rounded_value_size = round_up(sizeof(struct pprint_mapv), 8);
+       mapv = calloc(num_cpus, rounded_value_size);
+       if (CHECK(!mapv, "mapv allocation failure")) {
+               err = -1;
                goto done;
        }
 
-       while ((scn = elf_nextscn(elf, scn))) {
-               const char *sh_name;
-               GElf_Shdr sh;
+       for (key = 0; key < test->max_entries; key++) {
+               set_pprint_mapv(mapv, key, num_cpus, rounded_value_size);
+               bpf_map_update_elem(map_fd, &key, mapv, 0);
+       }
 
-               if (CHECK(gelf_getshdr(scn, &sh) != &sh,
-                         "file:%s gelf_getshdr != &sh", fn)) {
-                       ret = -1;
-                       goto done;
-               }
+       pin_file = fopen(pin_path, "r");
+       if (CHECK(!pin_file, "fopen(%s): errno:%d", pin_path, errno)) {
+               err = -1;
+               goto done;
+       }
 
-               sh_name = elf_strptr(elf, ehdr.e_shstrndx, sh.sh_name);
-               if (!strcmp(sh_name, BTF_ELF_SEC)) {
-                       ret = 1;
-                       goto done;
-               }
+       /* Skip lines start with '#' */
+       while ((nread = getline(&line, &line_len, pin_file)) > 0 &&
+              *line == '#')
+               ;
+
+       if (CHECK(nread <= 0, "Unexpected EOF")) {
+               err = -1;
+               goto done;
        }
 
-       ret = 0;
+       nr_read_elems = 0;
+       ordered_map = test->ordered_map;
+       lossless_map = test->lossless_map;
+       do {
+               struct pprint_mapv *cmapv;
+               ssize_t nexpected_line;
+               unsigned int next_key;
+               int cpu;
 
-done:
-       close(elf_fd);
-       elf_end(elf);
-       return ret;
-}
+               next_key = ordered_map ? nr_read_elems : atoi(line);
+               set_pprint_mapv(mapv, next_key, num_cpus, rounded_value_size);
+               cmapv = mapv;
 
-static int do_test_file(unsigned int test_num)
-{
-       const struct btf_file_test *test = &file_tests[test_num - 1];
-       struct bpf_object *obj = NULL;
-       struct bpf_program *prog;
-       struct bpf_map *map;
-       int err;
+               for (cpu = 0; cpu < num_cpus; cpu++) {
+                       if (percpu_map) {
+                               /* for percpu map, the format looks like:
+                                * <key>: {
+                                *      cpu0: <value_on_cpu0>
+                                *      cpu1: <value_on_cpu1>
+                                *      ...
+                                *      cpun: <value_on_cpun>
+                                * }
+                                *
+                                * let us verify the line containing the key here.
+                                */
+                               if (cpu == 0) {
+                                       nexpected_line = snprintf(expected_line,
+                                                                 sizeof(expected_line),
+                                                                 "%u: {\n",
+                                                                 next_key);
 
-       fprintf(stderr, "BTF libbpf test[%u] (%s): ", test_num,
-               test->file);
+                                       err = check_line(expected_line, nexpected_line,
+                                                        sizeof(expected_line), line);
+                                       if (err == -1)
+                                               goto done;
+                               }
 
-       err = file_has_btf_elf(test->file);
-       if (err == -1)
-               return err;
+                               /* read value@cpu */
+                               nread = getline(&line, &line_len, pin_file);
+                               if (nread < 0)
+                                       break;
+                       }
 
-       if (err == 0) {
-               fprintf(stderr, "SKIP. No ELF %s found", BTF_ELF_SEC);
-               skip_cnt++;
-               return 0;
-       }
+                       nexpected_line = snprintf(expected_line, sizeof(expected_line),
+                                                 "%s%u: {%u,0,%d,0x%x,0x%x,0x%x,"
+                                                 "{%lu|[%u,%u,%u,%u,%u,%u,%u,%u]},%s}\n",
+                                                 percpu_map ? "\tcpu" : "",
+                                                 percpu_map ? cpu : next_key,
+                                                 cmapv->ui32, cmapv->si32,
+                                                 cmapv->unused_bits2a,
+                                                 cmapv->bits28,
+                                                 cmapv->unused_bits2b,
+                                                 cmapv->ui64,
+                                                 cmapv->ui8a[0], cmapv->ui8a[1],
+                                                 cmapv->ui8a[2], cmapv->ui8a[3],
+                                                 cmapv->ui8a[4], cmapv->ui8a[5],
+                                                 cmapv->ui8a[6], cmapv->ui8a[7],
+                                                 pprint_enum_str[cmapv->aenum]);
 
-       obj = bpf_object__open(test->file);
-       if (CHECK(IS_ERR(obj), "obj: %ld", PTR_ERR(obj)))
-               return PTR_ERR(obj);
+                       err = check_line(expected_line, nexpected_line,
+                                        sizeof(expected_line), line);
+                       if (err == -1)
+                               goto done;
 
-       err = bpf_object__btf_fd(obj);
-       if (CHECK(err == -1, "bpf_object__btf_fd: -1"))
-               goto done;
+                       cmapv = (void *)cmapv + rounded_value_size;
+               }
 
-       prog = bpf_program__next(NULL, obj);
-       if (CHECK(!prog, "Cannot find bpf_prog")) {
-               err = -1;
-               goto done;
-       }
+               if (percpu_map) {
+                       /* skip the last bracket for the percpu map */
+                       nread = getline(&line, &line_len, pin_file);
+                       if (nread < 0)
+                               break;
+               }
 
-       bpf_program__set_type(prog, BPF_PROG_TYPE_TRACEPOINT);
-       err = bpf_object__load(obj);
-       if (CHECK(err < 0, "bpf_object__load: %d", err))
-               goto done;
+               nread = getline(&line, &line_len, pin_file);
+       } while (++nr_read_elems < test->max_entries && nread > 0);
 
-       map = bpf_object__find_map_by_name(obj, "btf_map");
-       if (CHECK(!map, "btf_map not found")) {
+       if (lossless_map &&
+           CHECK(nr_read_elems < test->max_entries,
+                 "Unexpected EOF. nr_read_elems:%u test->max_entries:%u",
+                 nr_read_elems, test->max_entries)) {
                err = -1;
                goto done;
        }
 
-       err = (bpf_map__btf_key_type_id(map) == 0 || bpf_map__btf_value_type_id(map) == 0)
-               != test->btf_kv_notfound;
-       if (CHECK(err, "btf_key_type_id:%u btf_value_type_id:%u test->btf_kv_notfound:%u",
-                 bpf_map__btf_key_type_id(map), bpf_map__btf_value_type_id(map),
-                 test->btf_kv_notfound))
+       if (CHECK(nread > 0, "Unexpected extra pprint output: %s", line)) {
+               err = -1;
                goto done;
+       }
 
-       fprintf(stderr, "OK");
+       err = 0;
 
 done:
-       bpf_object__close(obj);
+       if (mapv)
+               free(mapv);
+       if (!err)
+               fprintf(stderr, "OK");
+       if (*btf_log_buf && (err || args.always_log))
+               fprintf(stderr, "\n%s", btf_log_buf);
+       if (btf_fd != -1)
+               close(btf_fd);
+       if (map_fd != -1)
+               close(map_fd);
+       if (pin_file)
+               fclose(pin_file);
+       unlink(pin_path);
+       free(line);
+
+       return err;
+}
+
+static int test_pprint(void)
+{
+       unsigned int i;
+       int err = 0;
+
+       for (i = 0; i < ARRAY_SIZE(pprint_tests_meta); i++) {
+               pprint_test_template.descr = pprint_tests_meta[i].descr;
+               pprint_test_template.map_type = pprint_tests_meta[i].map_type;
+               pprint_test_template.map_name = pprint_tests_meta[i].map_name;
+               pprint_test_template.ordered_map = pprint_tests_meta[i].ordered_map;
+               pprint_test_template.lossless_map = pprint_tests_meta[i].lossless_map;
+               pprint_test_template.percpu_map = pprint_tests_meta[i].percpu_map;
+
+               err |= count_result(do_test_pprint());
+       }
+
        return err;
 }
 
-static int test_file(void)
+#define BPF_LINE_INFO_ENC(insn_off, file_off, line_off, line_num, line_col) \
+       (insn_off), (file_off), (line_off), ((line_num) << 10 | ((line_col) & 0x3ff))
+
+static struct prog_info_raw_test {
+       const char *descr;
+       const char *str_sec;
+       const char *err_str;
+       __u32 raw_types[MAX_NR_RAW_U32];
+       __u32 str_sec_size;
+       struct bpf_insn insns[MAX_INSNS];
+       __u32 prog_type;
+       __u32 func_info[MAX_SUBPROGS][2];
+       __u32 func_info_rec_size;
+       __u32 func_info_cnt;
+       __u32 line_info[MAX_NR_RAW_U32];
+       __u32 line_info_rec_size;
+       __u32 nr_jited_ksyms;
+       bool expected_prog_load_failure;
+} info_raw_tests[] = {
 {
-       unsigned int i;
-       int err = 0;
+       .descr = "func_type (main func + one sub)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),   /* [1] */
+               BTF_TYPE_INT_ENC(NAME_TBD, 0, 0, 32, 4),        /* [2] */
+               BTF_FUNC_PROTO_ENC(1, 2),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
+               BTF_FUNC_PROTO_ENC(1, 2),                       /* [4] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+               BTF_FUNC_ENC(NAME_TBD, 3),                      /* [5] */
+               BTF_FUNC_ENC(NAME_TBD, 4),                      /* [6] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0int\0unsigned int\0a\0b\0c\0d\0funcA\0funcB",
+       .str_sec_size = sizeof("\0int\0unsigned int\0a\0b\0c\0d\0funcA\0funcB"),
+       .insns = {
+               BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 1, 0, 2),
+               BPF_MOV64_IMM(BPF_REG_0, 1),
+               BPF_EXIT_INSN(),
+               BPF_MOV64_IMM(BPF_REG_0, 2),
+               BPF_EXIT_INSN(),
+       },
+       .prog_type = BPF_PROG_TYPE_TRACEPOINT,
+       .func_info = { {0, 5}, {3, 6} },
+       .func_info_rec_size = 8,
+       .func_info_cnt = 2,
+       .line_info = { BTF_END_RAW },
+},
 
-       if (args.file_test_num)
-               return count_result(do_test_file(args.file_test_num));
+{
+       .descr = "func_type (Incorrect func_info_rec_size)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),   /* [1] */
+               BTF_TYPE_INT_ENC(NAME_TBD, 0, 0, 32, 4),        /* [2] */
+               BTF_FUNC_PROTO_ENC(1, 2),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
+               BTF_FUNC_PROTO_ENC(1, 2),                       /* [4] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+               BTF_FUNC_ENC(NAME_TBD, 3),                      /* [5] */
+               BTF_FUNC_ENC(NAME_TBD, 4),                      /* [6] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0int\0unsigned int\0a\0b\0c\0d\0funcA\0funcB",
+       .str_sec_size = sizeof("\0int\0unsigned int\0a\0b\0c\0d\0funcA\0funcB"),
+       .insns = {
+               BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 1, 0, 2),
+               BPF_MOV64_IMM(BPF_REG_0, 1),
+               BPF_EXIT_INSN(),
+               BPF_MOV64_IMM(BPF_REG_0, 2),
+               BPF_EXIT_INSN(),
+       },
+       .prog_type = BPF_PROG_TYPE_TRACEPOINT,
+       .func_info = { {0, 5}, {3, 6} },
+       .func_info_rec_size = 4,
+       .func_info_cnt = 2,
+       .line_info = { BTF_END_RAW },
+       .expected_prog_load_failure = true,
+},
 
-       for (i = 1; i <= ARRAY_SIZE(file_tests); i++)
-               err |= count_result(do_test_file(i));
+{
+       .descr = "func_type (Incorrect func_info_cnt)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),   /* [1] */
+               BTF_TYPE_INT_ENC(NAME_TBD, 0, 0, 32, 4),        /* [2] */
+               BTF_FUNC_PROTO_ENC(1, 2),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
+               BTF_FUNC_PROTO_ENC(1, 2),                       /* [4] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+               BTF_FUNC_ENC(NAME_TBD, 3),                      /* [5] */
+               BTF_FUNC_ENC(NAME_TBD, 4),                      /* [6] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0int\0unsigned int\0a\0b\0c\0d\0funcA\0funcB",
+       .str_sec_size = sizeof("\0int\0unsigned int\0a\0b\0c\0d\0funcA\0funcB"),
+       .insns = {
+               BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 1, 0, 2),
+               BPF_MOV64_IMM(BPF_REG_0, 1),
+               BPF_EXIT_INSN(),
+               BPF_MOV64_IMM(BPF_REG_0, 2),
+               BPF_EXIT_INSN(),
+       },
+       .prog_type = BPF_PROG_TYPE_TRACEPOINT,
+       .func_info = { {0, 5}, {3, 6} },
+       .func_info_rec_size = 8,
+       .func_info_cnt = 1,
+       .line_info = { BTF_END_RAW },
+       .expected_prog_load_failure = true,
+},
 
-       return err;
-}
+{
+       .descr = "func_type (Incorrect bpf_func_info.insn_off)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),   /* [1] */
+               BTF_TYPE_INT_ENC(NAME_TBD, 0, 0, 32, 4),        /* [2] */
+               BTF_FUNC_PROTO_ENC(1, 2),                       /* [3] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
+               BTF_FUNC_PROTO_ENC(1, 2),                       /* [4] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 2),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+               BTF_FUNC_ENC(NAME_TBD, 3),                      /* [5] */
+               BTF_FUNC_ENC(NAME_TBD, 4),                      /* [6] */
+               BTF_END_RAW,
+       },
+       .str_sec = "\0int\0unsigned int\0a\0b\0c\0d\0funcA\0funcB",
+       .str_sec_size = sizeof("\0int\0unsigned int\0a\0b\0c\0d\0funcA\0funcB"),
+       .insns = {
+               BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 1, 0, 2),
+               BPF_MOV64_IMM(BPF_REG_0, 1),
+               BPF_EXIT_INSN(),
+               BPF_MOV64_IMM(BPF_REG_0, 2),
+               BPF_EXIT_INSN(),
+       },
+       .prog_type = BPF_PROG_TYPE_TRACEPOINT,
+       .func_info = { {0, 5}, {2, 6} },
+       .func_info_rec_size = 8,
+       .func_info_cnt = 2,
+       .line_info = { BTF_END_RAW },
+       .expected_prog_load_failure = true,
+},
 
-const char *pprint_enum_str[] = {
-       "ENUM_ZERO",
-       "ENUM_ONE",
-       "ENUM_TWO",
-       "ENUM_THREE",
-};
+{
+       .descr = "line_info (No subprog)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),   /* [1] */
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0int\0int a=1;\0int b=2;\0return a + b;\0return a + b;"),
+       .insns = {
+               BPF_MOV64_IMM(BPF_REG_0, 1),
+               BPF_MOV64_IMM(BPF_REG_1, 2),
+               BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_1),
+               BPF_EXIT_INSN(),
+       },
+       .prog_type = BPF_PROG_TYPE_TRACEPOINT,
+       .func_info_cnt = 0,
+       .line_info = {
+               BPF_LINE_INFO_ENC(0, 0, NAME_TBD, 1, 10),
+               BPF_LINE_INFO_ENC(1, 0, NAME_TBD, 2, 9),
+               BPF_LINE_INFO_ENC(2, 0, NAME_TBD, 3, 8),
+               BPF_LINE_INFO_ENC(3, 0, NAME_TBD, 4, 7),
+               BTF_END_RAW,
+       },
+       .line_info_rec_size = sizeof(struct bpf_line_info),
+       .nr_jited_ksyms = 1,
+},
 
-struct pprint_mapv {
-       uint32_t ui32;
-       uint16_t ui16;
-       /* 2 bytes hole */
-       int32_t si32;
-       uint32_t unused_bits2a:2,
-               bits28:28,
-               unused_bits2b:2;
-       union {
-               uint64_t ui64;
-               uint8_t ui8a[8];
-       };
-       enum {
-               ENUM_ZERO,
-               ENUM_ONE,
-               ENUM_TWO,
-               ENUM_THREE,
-       } aenum;
-};
+{
+       .descr = "line_info (No subprog. insn_off >= prog->len)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),   /* [1] */
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0int\0int a=1;\0int b=2;\0return a + b;\0return a + b;"),
+       .insns = {
+               BPF_MOV64_IMM(BPF_REG_0, 1),
+               BPF_MOV64_IMM(BPF_REG_1, 2),
+               BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_1),
+               BPF_EXIT_INSN(),
+       },
+       .prog_type = BPF_PROG_TYPE_TRACEPOINT,
+       .func_info_cnt = 0,
+       .line_info = {
+               BPF_LINE_INFO_ENC(0, 0, NAME_TBD, 1, 10),
+               BPF_LINE_INFO_ENC(1, 0, NAME_TBD, 2, 9),
+               BPF_LINE_INFO_ENC(2, 0, NAME_TBD, 3, 8),
+               BPF_LINE_INFO_ENC(3, 0, NAME_TBD, 4, 7),
+               BPF_LINE_INFO_ENC(4, 0, 0, 5, 6),
+               BTF_END_RAW,
+       },
+       .line_info_rec_size = sizeof(struct bpf_line_info),
+       .nr_jited_ksyms = 1,
+       .err_str = "line_info[4].insn_off",
+       .expected_prog_load_failure = true,
+},
 
-static struct btf_raw_test pprint_test_template = {
+{
+       .descr = "line_info (No subprog. zero tailing line_info",
        .raw_types = {
-               /* unsighed char */                     /* [1] */
-               BTF_TYPE_INT_ENC(NAME_TBD, 0, 0, 8, 1),
-               /* unsigned short */                    /* [2] */
-               BTF_TYPE_INT_ENC(NAME_TBD, 0, 0, 16, 2),
-               /* unsigned int */                      /* [3] */
-               BTF_TYPE_INT_ENC(NAME_TBD, 0, 0, 32, 4),
-               /* int */                               /* [4] */
-               BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),
-               /* unsigned long long */                /* [5] */
-               BTF_TYPE_INT_ENC(NAME_TBD, 0, 0, 64, 8),
-               /* 2 bits */                            /* [6] */
-               BTF_TYPE_INT_ENC(0, 0, 0, 2, 2),
-               /* 28 bits */                           /* [7] */
-               BTF_TYPE_INT_ENC(0, 0, 0, 28, 4),
-               /* uint8_t[8] */                        /* [8] */
-               BTF_TYPE_ARRAY_ENC(9, 1, 8),
-               /* typedef unsigned char uint8_t */     /* [9] */
-               BTF_TYPEDEF_ENC(NAME_TBD, 1),
-               /* typedef unsigned short uint16_t */   /* [10] */
-               BTF_TYPEDEF_ENC(NAME_TBD, 2),
-               /* typedef unsigned int uint32_t */     /* [11] */
-               BTF_TYPEDEF_ENC(NAME_TBD, 3),
-               /* typedef int int32_t */               /* [12] */
-               BTF_TYPEDEF_ENC(NAME_TBD, 4),
-               /* typedef unsigned long long uint64_t *//* [13] */
-               BTF_TYPEDEF_ENC(NAME_TBD, 5),
-               /* union (anon) */                      /* [14] */
-               BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_UNION, 0, 2), 8),
-               BTF_MEMBER_ENC(NAME_TBD, 13, 0),/* uint64_t ui64; */
-               BTF_MEMBER_ENC(NAME_TBD, 8, 0), /* uint8_t ui8a[8]; */
-               /* enum (anon) */                       /* [15] */
-               BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_ENUM, 0, 4), 4),
-               BTF_ENUM_ENC(NAME_TBD, 0),
-               BTF_ENUM_ENC(NAME_TBD, 1),
-               BTF_ENUM_ENC(NAME_TBD, 2),
-               BTF_ENUM_ENC(NAME_TBD, 3),
-               /* struct pprint_mapv */                /* [16] */
-               BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 8), 32),
-               BTF_MEMBER_ENC(NAME_TBD, 11, 0),        /* uint32_t ui32 */
-               BTF_MEMBER_ENC(NAME_TBD, 10, 32),       /* uint16_t ui16 */
-               BTF_MEMBER_ENC(NAME_TBD, 12, 64),       /* int32_t si32 */
-               BTF_MEMBER_ENC(NAME_TBD, 6, 96),        /* unused_bits2a */
-               BTF_MEMBER_ENC(NAME_TBD, 7, 98),        /* bits28 */
-               BTF_MEMBER_ENC(NAME_TBD, 6, 126),       /* unused_bits2b */
-               BTF_MEMBER_ENC(0, 14, 128),             /* union (anon) */
-               BTF_MEMBER_ENC(NAME_TBD, 15, 192),      /* aenum */
+               BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),   /* [1] */
                BTF_END_RAW,
        },
-       .str_sec = "\0unsigned char\0unsigned short\0unsigned int\0int\0unsigned long long\0uint8_t\0uint16_t\0uint32_t\0int32_t\0uint64_t\0ui64\0ui8a\0ENUM_ZERO\0ENUM_ONE\0ENUM_TWO\0ENUM_THREE\0pprint_mapv\0ui32\0ui16\0si32\0unused_bits2a\0bits28\0unused_bits2b\0aenum",
-       .str_sec_size = sizeof("\0unsigned char\0unsigned short\0unsigned int\0int\0unsigned long long\0uint8_t\0uint16_t\0uint32_t\0int32_t\0uint64_t\0ui64\0ui8a\0ENUM_ZERO\0ENUM_ONE\0ENUM_TWO\0ENUM_THREE\0pprint_mapv\0ui32\0ui16\0si32\0unused_bits2a\0bits28\0unused_bits2b\0aenum"),
-       .key_size = sizeof(unsigned int),
-       .value_size = sizeof(struct pprint_mapv),
-       .key_type_id = 3,       /* unsigned int */
-       .value_type_id = 16,    /* struct pprint_mapv */
-       .max_entries = 128 * 1024,
-};
+       BTF_STR_SEC("\0int\0int a=1;\0int b=2;\0return a + b;\0return a + b;"),
+       .insns = {
+               BPF_MOV64_IMM(BPF_REG_0, 1),
+               BPF_MOV64_IMM(BPF_REG_1, 2),
+               BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_1),
+               BPF_EXIT_INSN(),
+       },
+       .prog_type = BPF_PROG_TYPE_TRACEPOINT,
+       .func_info_cnt = 0,
+       .line_info = {
+               BPF_LINE_INFO_ENC(0, 0, NAME_TBD, 1, 10), 0,
+               BPF_LINE_INFO_ENC(1, 0, NAME_TBD, 2, 9), 0,
+               BPF_LINE_INFO_ENC(2, 0, NAME_TBD, 3, 8), 0,
+               BPF_LINE_INFO_ENC(3, 0, NAME_TBD, 4, 7), 0,
+               BTF_END_RAW,
+       },
+       .line_info_rec_size = sizeof(struct bpf_line_info) + sizeof(__u32),
+       .nr_jited_ksyms = 1,
+},
 
-static struct btf_pprint_test_meta {
-       const char *descr;
-       enum bpf_map_type map_type;
-       const char *map_name;
-       bool ordered_map;
-       bool lossless_map;
-       bool percpu_map;
-} pprint_tests_meta[] = {
 {
-       .descr = "BTF pretty print array",
-       .map_type = BPF_MAP_TYPE_ARRAY,
-       .map_name = "pprint_test_array",
-       .ordered_map = true,
-       .lossless_map = true,
-       .percpu_map = false,
+       .descr = "line_info (No subprog. nonzero tailing line_info)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),   /* [1] */
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0int\0int a=1;\0int b=2;\0return a + b;\0return a + b;"),
+       .insns = {
+               BPF_MOV64_IMM(BPF_REG_0, 1),
+               BPF_MOV64_IMM(BPF_REG_1, 2),
+               BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_1),
+               BPF_EXIT_INSN(),
+       },
+       .prog_type = BPF_PROG_TYPE_TRACEPOINT,
+       .func_info_cnt = 0,
+       .line_info = {
+               BPF_LINE_INFO_ENC(0, 0, NAME_TBD, 1, 10), 0,
+               BPF_LINE_INFO_ENC(1, 0, NAME_TBD, 2, 9), 0,
+               BPF_LINE_INFO_ENC(2, 0, NAME_TBD, 3, 8), 0,
+               BPF_LINE_INFO_ENC(3, 0, NAME_TBD, 4, 7), 1,
+               BTF_END_RAW,
+       },
+       .line_info_rec_size = sizeof(struct bpf_line_info) + sizeof(__u32),
+       .nr_jited_ksyms = 1,
+       .err_str = "nonzero tailing record in line_info",
+       .expected_prog_load_failure = true,
 },
 
 {
-       .descr = "BTF pretty print hash",
-       .map_type = BPF_MAP_TYPE_HASH,
-       .map_name = "pprint_test_hash",
-       .ordered_map = false,
-       .lossless_map = true,
-       .percpu_map = false,
+       .descr = "line_info (subprog)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),   /* [1] */
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0int\0int a=1+1;\0return func(a);\0b+=1;\0return b;"),
+       .insns = {
+               BPF_MOV64_IMM(BPF_REG_2, 1),
+               BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, 1),
+               BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+               BPF_CALL_REL(1),
+               BPF_EXIT_INSN(),
+               BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
+               BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),
+               BPF_EXIT_INSN(),
+       },
+       .prog_type = BPF_PROG_TYPE_TRACEPOINT,
+       .func_info_cnt = 0,
+       .line_info = {
+               BPF_LINE_INFO_ENC(0, 0, NAME_TBD, 1, 10),
+               BPF_LINE_INFO_ENC(2, 0, NAME_TBD, 2, 9),
+               BPF_LINE_INFO_ENC(5, 0, NAME_TBD, 3, 8),
+               BPF_LINE_INFO_ENC(7, 0, NAME_TBD, 4, 7),
+               BTF_END_RAW,
+       },
+       .line_info_rec_size = sizeof(struct bpf_line_info),
+       .nr_jited_ksyms = 2,
 },
 
 {
-       .descr = "BTF pretty print lru hash",
-       .map_type = BPF_MAP_TYPE_LRU_HASH,
-       .map_name = "pprint_test_lru_hash",
-       .ordered_map = false,
-       .lossless_map = false,
-       .percpu_map = false,
+       .descr = "line_info (subprog + func_info)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),   /* [1] */
+               BTF_FUNC_PROTO_ENC(1, 1),                       /* [2] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+               BTF_FUNC_ENC(NAME_TBD, 2),                      /* [3] */
+               BTF_FUNC_ENC(NAME_TBD, 2),                      /* [4] */
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0int\0x\0sub\0main\0int a=1+1;\0return func(a);\0b+=1;\0return b;"),
+       .insns = {
+               BPF_MOV64_IMM(BPF_REG_2, 1),
+               BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, 1),
+               BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+               BPF_CALL_REL(1),
+               BPF_EXIT_INSN(),
+               BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
+               BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),
+               BPF_EXIT_INSN(),
+       },
+       .prog_type = BPF_PROG_TYPE_TRACEPOINT,
+       .func_info_cnt = 2,
+       .func_info_rec_size = 8,
+       .func_info = { {0, 4}, {5, 3} },
+       .line_info = {
+               BPF_LINE_INFO_ENC(0, 0, NAME_TBD, 1, 10),
+               BPF_LINE_INFO_ENC(2, 0, NAME_TBD, 2, 9),
+               BPF_LINE_INFO_ENC(5, 0, NAME_TBD, 3, 8),
+               BPF_LINE_INFO_ENC(7, 0, NAME_TBD, 4, 7),
+               BTF_END_RAW,
+       },
+       .line_info_rec_size = sizeof(struct bpf_line_info),
+       .nr_jited_ksyms = 2,
 },
 
 {
-       .descr = "BTF pretty print percpu array",
-       .map_type = BPF_MAP_TYPE_PERCPU_ARRAY,
-       .map_name = "pprint_test_percpu_array",
-       .ordered_map = true,
-       .lossless_map = true,
-       .percpu_map = true,
+       .descr = "line_info (subprog. missing 1st func line info)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),   /* [1] */
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0int\0int a=1+1;\0return func(a);\0b+=1;\0return b;"),
+       .insns = {
+               BPF_MOV64_IMM(BPF_REG_2, 1),
+               BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, 1),
+               BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+               BPF_CALL_REL(1),
+               BPF_EXIT_INSN(),
+               BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
+               BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),
+               BPF_EXIT_INSN(),
+       },
+       .prog_type = BPF_PROG_TYPE_TRACEPOINT,
+       .func_info_cnt = 0,
+       .line_info = {
+               BPF_LINE_INFO_ENC(1, 0, NAME_TBD, 1, 10),
+               BPF_LINE_INFO_ENC(2, 0, NAME_TBD, 2, 9),
+               BPF_LINE_INFO_ENC(5, 0, NAME_TBD, 3, 8),
+               BPF_LINE_INFO_ENC(7, 0, NAME_TBD, 4, 7),
+               BTF_END_RAW,
+       },
+       .line_info_rec_size = sizeof(struct bpf_line_info),
+       .nr_jited_ksyms = 2,
+       .err_str = "missing bpf_line_info for func#0",
+       .expected_prog_load_failure = true,
 },
 
 {
-       .descr = "BTF pretty print percpu hash",
-       .map_type = BPF_MAP_TYPE_PERCPU_HASH,
-       .map_name = "pprint_test_percpu_hash",
-       .ordered_map = false,
-       .lossless_map = true,
-       .percpu_map = true,
+       .descr = "line_info (subprog. missing 2nd func line info)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),   /* [1] */
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0int\0int a=1+1;\0return func(a);\0b+=1;\0return b;"),
+       .insns = {
+               BPF_MOV64_IMM(BPF_REG_2, 1),
+               BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, 1),
+               BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+               BPF_CALL_REL(1),
+               BPF_EXIT_INSN(),
+               BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
+               BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),
+               BPF_EXIT_INSN(),
+       },
+       .prog_type = BPF_PROG_TYPE_TRACEPOINT,
+       .func_info_cnt = 0,
+       .line_info = {
+               BPF_LINE_INFO_ENC(0, 0, NAME_TBD, 1, 10),
+               BPF_LINE_INFO_ENC(2, 0, NAME_TBD, 2, 9),
+               BPF_LINE_INFO_ENC(6, 0, NAME_TBD, 3, 8),
+               BPF_LINE_INFO_ENC(7, 0, NAME_TBD, 4, 7),
+               BTF_END_RAW,
+       },
+       .line_info_rec_size = sizeof(struct bpf_line_info),
+       .nr_jited_ksyms = 2,
+       .err_str = "missing bpf_line_info for func#1",
+       .expected_prog_load_failure = true,
 },
 
 {
-       .descr = "BTF pretty print lru percpu hash",
-       .map_type = BPF_MAP_TYPE_LRU_PERCPU_HASH,
-       .map_name = "pprint_test_lru_percpu_hash",
-       .ordered_map = false,
-       .lossless_map = false,
-       .percpu_map = true,
+       .descr = "line_info (subprog. unordered insn offset)",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),   /* [1] */
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0int\0int a=1+1;\0return func(a);\0b+=1;\0return b;"),
+       .insns = {
+               BPF_MOV64_IMM(BPF_REG_2, 1),
+               BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, 1),
+               BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+               BPF_CALL_REL(1),
+               BPF_EXIT_INSN(),
+               BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
+               BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),
+               BPF_EXIT_INSN(),
+       },
+       .prog_type = BPF_PROG_TYPE_TRACEPOINT,
+       .func_info_cnt = 0,
+       .line_info = {
+               BPF_LINE_INFO_ENC(0, 0, NAME_TBD, 1, 10),
+               BPF_LINE_INFO_ENC(5, 0, NAME_TBD, 2, 9),
+               BPF_LINE_INFO_ENC(2, 0, NAME_TBD, 3, 8),
+               BPF_LINE_INFO_ENC(7, 0, NAME_TBD, 4, 7),
+               BTF_END_RAW,
+       },
+       .line_info_rec_size = sizeof(struct bpf_line_info),
+       .nr_jited_ksyms = 2,
+       .err_str = "Invalid line_info[2].insn_off",
+       .expected_prog_load_failure = true,
 },
 
 };
 
+static size_t probe_prog_length(const struct bpf_insn *fp)
+{
+       size_t len;
 
-static void set_pprint_mapv(struct pprint_mapv *v, uint32_t i,
-                           int num_cpus, int rounded_value_size)
+       for (len = MAX_INSNS - 1; len > 0; --len)
+               if (fp[len].code != 0 || fp[len].imm != 0)
+                       break;
+       return len + 1;
+}
+
+static __u32 *patch_name_tbd(const __u32 *raw_u32,
+                            const char *str, __u32 str_off,
+                            unsigned int str_sec_size,
+                            unsigned int *ret_size)
 {
-       int cpu;
+       int i, raw_u32_size = get_raw_sec_size(raw_u32);
+       const char *end_str = str + str_sec_size;
+       const char *next_str = str + str_off;
+       __u32 *new_u32 = NULL;
 
-       for (cpu = 0; cpu < num_cpus; cpu++) {
-               v->ui32 = i + cpu;
-               v->si32 = -i;
-               v->unused_bits2a = 3;
-               v->bits28 = i;
-               v->unused_bits2b = 3;
-               v->ui64 = i;
-               v->aenum = i & 0x03;
-               v = (void *)v + rounded_value_size;
+       if (raw_u32_size == -1)
+               return ERR_PTR(-EINVAL);
+
+       if (!raw_u32_size) {
+               *ret_size = 0;
+               return NULL;
+       }
+
+       new_u32 = malloc(raw_u32_size);
+       if (!new_u32)
+               return ERR_PTR(-ENOMEM);
+
+       for (i = 0; i < raw_u32_size / sizeof(raw_u32[0]); i++) {
+               if (raw_u32[i] == NAME_TBD) {
+                       next_str = get_next_str(next_str, end_str);
+                       if (CHECK(!next_str, "Error in getting next_str\n")) {
+                               free(new_u32);
+                               return ERR_PTR(-EINVAL);
+                       }
+                       new_u32[i] = next_str - str;
+                       next_str += strlen(next_str);
+               } else {
+                       new_u32[i] = raw_u32[i];
+               }
        }
+
+       *ret_size = raw_u32_size;
+       return new_u32;
 }
 
-static int check_line(const char *expected_line, int nexpected_line,
-                     int expected_line_len, const char *line)
+static int test_get_finfo(const struct prog_info_raw_test *test,
+                         int prog_fd)
 {
-       if (CHECK(nexpected_line == expected_line_len,
-                 "expected_line is too long"))
+       struct bpf_prog_info info = {};
+       struct bpf_func_info *finfo;
+       __u32 info_len, rec_size, i;
+       void *func_info = NULL;
+       int err;
+
+       /* get necessary lens */
+       info_len = sizeof(struct bpf_prog_info);
+       err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
+       if (CHECK(err == -1, "invalid get info (1st) errno:%d", errno)) {
+               fprintf(stderr, "%s\n", btf_log_buf);
+               return -1;
+       }
+       if (CHECK(info.nr_func_info != test->func_info_cnt,
+                 "incorrect info.nr_func_info (1st) %d",
+                 info.nr_func_info)) {
+               return -1;
+       }
+
+       rec_size = info.func_info_rec_size;
+       if (CHECK(rec_size < 8,
+                 "incorrect info.func_info_rec_size (1st) %d", rec_size)) {
                return -1;
+       }
 
-       if (strcmp(expected_line, line)) {
-               fprintf(stderr, "unexpected pprint output\n");
-               fprintf(stderr, "expected: %s", expected_line);
-               fprintf(stderr, "    read: %s", line);
+       if (!info.nr_func_info)
+               return 0;
+
+       func_info = malloc(info.nr_func_info * rec_size);
+       if (CHECK(!func_info, "out of memory"))
                return -1;
+
+       /* reset info to only retrieve func_info related data */
+       memset(&info, 0, sizeof(info));
+       info.nr_func_info = test->func_info_cnt;
+       info.func_info_rec_size = rec_size;
+       info.func_info = ptr_to_u64(func_info);
+       err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
+       if (CHECK(err == -1, "invalid get info (2nd) errno:%d", errno)) {
+               fprintf(stderr, "%s\n", btf_log_buf);
+               err = -1;
+               goto done;
+       }
+       if (CHECK(info.nr_func_info != test->func_info_cnt,
+                 "incorrect info.nr_func_info (2nd) %d",
+                 info.nr_func_info)) {
+               err = -1;
+               goto done;
+       }
+       if (CHECK(info.func_info_rec_size < 8,
+                 "incorrect info.func_info_rec_size (2nd) %d",
+                 info.func_info_rec_size)) {
+               err = -1;
+               goto done;
        }
 
-       return 0;
-}
+       if (CHECK(!info.func_info,
+                 "info.func_info == 0. kernel.kptr_restrict is set?")) {
+               err = -1;
+               goto done;
+       }
 
+       finfo = func_info;
+       for (i = 0; i < test->func_info_cnt; i++) {
+               if (CHECK(finfo->type_id != test->func_info[i][1],
+                         "incorrect func_type %u expected %u",
+                         finfo->type_id, test->func_info[i][1])) {
+                       err = -1;
+                       goto done;
+               }
+               finfo = (void *)finfo + rec_size;
+       }
 
-static int do_test_pprint(void)
-{
-       const struct btf_raw_test *test = &pprint_test_template;
-       struct bpf_create_map_attr create_attr = {};
-       bool ordered_map, lossless_map, percpu_map;
-       int err, ret, num_cpus, rounded_value_size;
-       struct pprint_mapv *mapv = NULL;
-       unsigned int key, nr_read_elems;
-       int map_fd = -1, btf_fd = -1;
-       unsigned int raw_btf_size;
-       char expected_line[255];
-       FILE *pin_file = NULL;
-       char pin_path[255];
-       size_t line_len = 0;
-       char *line = NULL;
-       uint8_t *raw_btf;
-       ssize_t nread;
+       err = 0;
 
-       fprintf(stderr, "%s......", test->descr);
-       raw_btf = btf_raw_create(&hdr_tmpl, test->raw_types,
-                                test->str_sec, test->str_sec_size,
-                                &raw_btf_size);
+done:
+       free(func_info);
+       return err;
+}
 
-       if (!raw_btf)
-               return -1;
+static int test_get_linfo(const struct prog_info_raw_test *test,
+                         const void *patched_linfo,
+                         __u32 cnt, int prog_fd)
+{
+       __u32 i, info_len, nr_jited_ksyms, nr_jited_func_lens;
+       __u64 *jited_linfo = NULL, *jited_ksyms = NULL;
+       __u32 rec_size, jited_rec_size, jited_cnt;
+       struct bpf_line_info *linfo = NULL;
+       __u32 cur_func_len, ksyms_found;
+       struct bpf_prog_info info = {};
+       __u32 *jited_func_lens = NULL;
+       __u64 cur_func_ksyms;
+       int err;
 
-       *btf_log_buf = '\0';
-       btf_fd = bpf_load_btf(raw_btf, raw_btf_size,
-                             btf_log_buf, BTF_LOG_BUF_SIZE,
-                             args.always_log);
-       free(raw_btf);
+       jited_cnt = cnt;
+       rec_size = sizeof(*linfo);
+       jited_rec_size = sizeof(*jited_linfo);
+       if (test->nr_jited_ksyms)
+               nr_jited_ksyms = test->nr_jited_ksyms;
+       else
+               nr_jited_ksyms = test->func_info_cnt;
+       nr_jited_func_lens = nr_jited_ksyms;
 
-       if (CHECK(btf_fd == -1, "errno:%d", errno)) {
+       info_len = sizeof(struct bpf_prog_info);
+       err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
+       if (CHECK(err == -1, "err:%d errno:%d", err, errno)) {
                err = -1;
                goto done;
        }
 
-       create_attr.name = test->map_name;
-       create_attr.map_type = test->map_type;
-       create_attr.key_size = test->key_size;
-       create_attr.value_size = test->value_size;
-       create_attr.max_entries = test->max_entries;
-       create_attr.btf_fd = btf_fd;
-       create_attr.btf_key_type_id = test->key_type_id;
-       create_attr.btf_value_type_id = test->value_type_id;
+       if (!info.jited_prog_len) {
+               /* prog is not jited */
+               jited_cnt = 0;
+               nr_jited_ksyms = 1;
+               nr_jited_func_lens = 1;
+       }
 
-       map_fd = bpf_create_map_xattr(&create_attr);
-       if (CHECK(map_fd == -1, "errno:%d", errno)) {
+       if (CHECK(info.nr_line_info != cnt ||
+                 info.nr_jited_line_info != jited_cnt ||
+                 info.nr_jited_ksyms != nr_jited_ksyms ||
+                 info.nr_jited_func_lens != nr_jited_func_lens ||
+                 (!info.nr_line_info && info.nr_jited_line_info),
+                 "info: nr_line_info:%u(expected:%u) nr_jited_line_info:%u(expected:%u) nr_jited_ksyms:%u(expected:%u) nr_jited_func_lens:%u(expected:%u)",
+                 info.nr_line_info, cnt,
+                 info.nr_jited_line_info, jited_cnt,
+                 info.nr_jited_ksyms, nr_jited_ksyms,
+                 info.nr_jited_func_lens, nr_jited_func_lens)) {
                err = -1;
                goto done;
        }
 
-       ret = snprintf(pin_path, sizeof(pin_path), "%s/%s",
-                      "/sys/fs/bpf", test->map_name);
-
-       if (CHECK(ret == sizeof(pin_path), "pin_path %s/%s is too long",
-                 "/sys/fs/bpf", test->map_name)) {
+       if (CHECK(info.line_info_rec_size < 16 ||
+                 info.jited_line_info_rec_size < 8,
+                 "info: line_info_rec_size:%u(userspace expected:%u) jited_line_info_rec_size:%u(userspace expected:%u)",
+                 info.line_info_rec_size, rec_size,
+                 info.jited_line_info_rec_size, jited_rec_size)) {
                err = -1;
                goto done;
        }
 
-       err = bpf_obj_pin(map_fd, pin_path);
-       if (CHECK(err, "bpf_obj_pin(%s): errno:%d.", pin_path, errno))
-               goto done;
+       if (!cnt)
+               return 0;
 
-       percpu_map = test->percpu_map;
-       num_cpus = percpu_map ? bpf_num_possible_cpus() : 1;
-       rounded_value_size = round_up(sizeof(struct pprint_mapv), 8);
-       mapv = calloc(num_cpus, rounded_value_size);
-       if (CHECK(!mapv, "mapv allocation failure")) {
+       rec_size = info.line_info_rec_size;
+       jited_rec_size = info.jited_line_info_rec_size;
+
+       memset(&info, 0, sizeof(info));
+
+       linfo = calloc(cnt, rec_size);
+       if (CHECK(!linfo, "!linfo")) {
                err = -1;
                goto done;
        }
+       info.nr_line_info = cnt;
+       info.line_info_rec_size = rec_size;
+       info.line_info = ptr_to_u64(linfo);
+
+       if (jited_cnt) {
+               jited_linfo = calloc(jited_cnt, jited_rec_size);
+               jited_ksyms = calloc(nr_jited_ksyms, sizeof(*jited_ksyms));
+               jited_func_lens = calloc(nr_jited_func_lens,
+                                        sizeof(*jited_func_lens));
+               if (CHECK(!jited_linfo || !jited_ksyms || !jited_func_lens,
+                         "jited_linfo:%p jited_ksyms:%p jited_func_lens:%p",
+                         jited_linfo, jited_ksyms, jited_func_lens)) {
+                       err = -1;
+                       goto done;
+               }
 
-       for (key = 0; key < test->max_entries; key++) {
-               set_pprint_mapv(mapv, key, num_cpus, rounded_value_size);
-               bpf_map_update_elem(map_fd, &key, mapv, 0);
+               info.nr_jited_line_info = jited_cnt;
+               info.jited_line_info_rec_size = jited_rec_size;
+               info.jited_line_info = ptr_to_u64(jited_linfo);
+               info.nr_jited_ksyms = nr_jited_ksyms;
+               info.jited_ksyms = ptr_to_u64(jited_ksyms);
+               info.nr_jited_func_lens = nr_jited_func_lens;
+               info.jited_func_lens = ptr_to_u64(jited_func_lens);
        }
 
-       pin_file = fopen(pin_path, "r");
-       if (CHECK(!pin_file, "fopen(%s): errno:%d", pin_path, errno)) {
+       err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
+
+       /*
+        * Only recheck the info.*line_info* fields.
+        * Other fields are not the concern of this test.
+        */
+       if (CHECK(err == -1 ||
+                 !info.line_info ||
+                 info.nr_line_info != cnt ||
+                 (jited_cnt && !info.jited_line_info) ||
+                 info.nr_jited_line_info != jited_cnt ||
+                 info.line_info_rec_size != rec_size ||
+                 info.jited_line_info_rec_size != jited_rec_size,
+                 "err:%d errno:%d info: nr_line_info:%u(expected:%u) nr_jited_line_info:%u(expected:%u) line_info_rec_size:%u(expected:%u) jited_linfo_rec_size:%u(expected:%u) line_info:%p jited_line_info:%p",
+                 err, errno,
+                 info.nr_line_info, cnt,
+                 info.nr_jited_line_info, jited_cnt,
+                 info.line_info_rec_size, rec_size,
+                 info.jited_line_info_rec_size, jited_rec_size,
+                 (void *)(long)info.line_info,
+                 (void *)(long)info.jited_line_info)) {
                err = -1;
                goto done;
        }
 
-       /* Skip lines start with '#' */
-       while ((nread = getline(&line, &line_len, pin_file)) > 0 &&
-              *line == '#')
-               ;
+       CHECK(linfo[0].insn_off, "linfo[0].insn_off:%u",
+             linfo[0].insn_off);
+       for (i = 1; i < cnt; i++) {
+               const struct bpf_line_info *expected_linfo;
 
-       if (CHECK(nread <= 0, "Unexpected EOF")) {
+               expected_linfo = patched_linfo + (i * test->line_info_rec_size);
+               if (CHECK(linfo[i].insn_off <= linfo[i - 1].insn_off,
+                         "linfo[%u].insn_off:%u <= linfo[%u].insn_off:%u",
+                         i, linfo[i].insn_off,
+                         i - 1, linfo[i - 1].insn_off)) {
+                       err = -1;
+                       goto done;
+               }
+               if (CHECK(linfo[i].file_name_off != expected_linfo->file_name_off ||
+                         linfo[i].line_off != expected_linfo->line_off ||
+                         linfo[i].line_col != expected_linfo->line_col,
+                         "linfo[%u] (%u, %u, %u) != (%u, %u, %u)", i,
+                         linfo[i].file_name_off,
+                         linfo[i].line_off,
+                         linfo[i].line_col,
+                         expected_linfo->file_name_off,
+                         expected_linfo->line_off,
+                         expected_linfo->line_col)) {
+                       err = -1;
+                       goto done;
+               }
+       }
+
+       if (!jited_cnt) {
+               fprintf(stderr, "not jited. skipping jited_line_info check. ");
+               err = 0;
+               goto done;
+       }
+
+       if (CHECK(jited_linfo[0] != jited_ksyms[0],
+                 "jited_linfo[0]:%lx != jited_ksyms[0]:%lx",
+                 (long)(jited_linfo[0]), (long)(jited_ksyms[0]))) {
                err = -1;
                goto done;
        }
 
-       nr_read_elems = 0;
-       ordered_map = test->ordered_map;
-       lossless_map = test->lossless_map;
-       do {
-               struct pprint_mapv *cmapv;
-               ssize_t nexpected_line;
-               unsigned int next_key;
-               int cpu;
+       ksyms_found = 1;
+       cur_func_len = jited_func_lens[0];
+       cur_func_ksyms = jited_ksyms[0];
+       for (i = 1; i < jited_cnt; i++) {
+               if (ksyms_found < nr_jited_ksyms &&
+                   jited_linfo[i] == jited_ksyms[ksyms_found]) {
+                       cur_func_ksyms = jited_ksyms[ksyms_found];
+                       cur_func_len = jited_ksyms[ksyms_found];
+                       ksyms_found++;
+                       continue;
+               }
 
-               next_key = ordered_map ? nr_read_elems : atoi(line);
-               set_pprint_mapv(mapv, next_key, num_cpus, rounded_value_size);
-               cmapv = mapv;
+               if (CHECK(jited_linfo[i] <= jited_linfo[i - 1],
+                         "jited_linfo[%u]:%lx <= jited_linfo[%u]:%lx",
+                         i, (long)jited_linfo[i],
+                         i - 1, (long)(jited_linfo[i - 1]))) {
+                       err = -1;
+                       goto done;
+               }
 
-               for (cpu = 0; cpu < num_cpus; cpu++) {
-                       if (percpu_map) {
-                               /* for percpu map, the format looks like:
-                                * <key>: {
-                                *      cpu0: <value_on_cpu0>
-                                *      cpu1: <value_on_cpu1>
-                                *      ...
-                                *      cpun: <value_on_cpun>
-                                * }
-                                *
-                                * let us verify the line containing the key here.
-                                */
-                               if (cpu == 0) {
-                                       nexpected_line = snprintf(expected_line,
-                                                                 sizeof(expected_line),
-                                                                 "%u: {\n",
-                                                                 next_key);
+               if (CHECK(jited_linfo[i] - cur_func_ksyms > cur_func_len,
+                         "jited_linfo[%u]:%lx - %lx > %u",
+                         i, (long)jited_linfo[i], (long)cur_func_ksyms,
+                         cur_func_len)) {
+                       err = -1;
+                       goto done;
+               }
+       }
 
-                                       err = check_line(expected_line, nexpected_line,
-                                                        sizeof(expected_line), line);
-                                       if (err == -1)
-                                               goto done;
-                               }
+       if (CHECK(ksyms_found != nr_jited_ksyms,
+                 "ksyms_found:%u != nr_jited_ksyms:%u",
+                 ksyms_found, nr_jited_ksyms)) {
+               err = -1;
+               goto done;
+       }
 
-                               /* read value@cpu */
-                               nread = getline(&line, &line_len, pin_file);
-                               if (nread < 0)
-                                       break;
-                       }
+       err = 0;
 
-                       nexpected_line = snprintf(expected_line, sizeof(expected_line),
-                                                 "%s%u: {%u,0,%d,0x%x,0x%x,0x%x,"
-                                                 "{%lu|[%u,%u,%u,%u,%u,%u,%u,%u]},%s}\n",
-                                                 percpu_map ? "\tcpu" : "",
-                                                 percpu_map ? cpu : next_key,
-                                                 cmapv->ui32, cmapv->si32,
-                                                 cmapv->unused_bits2a,
-                                                 cmapv->bits28,
-                                                 cmapv->unused_bits2b,
-                                                 cmapv->ui64,
-                                                 cmapv->ui8a[0], cmapv->ui8a[1],
-                                                 cmapv->ui8a[2], cmapv->ui8a[3],
-                                                 cmapv->ui8a[4], cmapv->ui8a[5],
-                                                 cmapv->ui8a[6], cmapv->ui8a[7],
-                                                 pprint_enum_str[cmapv->aenum]);
+done:
+       free(linfo);
+       free(jited_linfo);
+       free(jited_ksyms);
+       free(jited_func_lens);
+       return err;
+}
 
-                       err = check_line(expected_line, nexpected_line,
-                                        sizeof(expected_line), line);
-                       if (err == -1)
-                               goto done;
+static int do_test_info_raw(unsigned int test_num)
+{
+       const struct prog_info_raw_test *test = &info_raw_tests[test_num - 1];
+       unsigned int raw_btf_size, linfo_str_off, linfo_size;
+       int btf_fd = -1, prog_fd = -1, err = 0;
+       void *raw_btf, *patched_linfo = NULL;
+       const char *ret_next_str;
+       union bpf_attr attr = {};
+
+       fprintf(stderr, "BTF prog info raw test[%u] (%s): ", test_num, test->descr);
+       raw_btf = btf_raw_create(&hdr_tmpl, test->raw_types,
+                                test->str_sec, test->str_sec_size,
+                                &raw_btf_size, &ret_next_str);
 
-                       cmapv = (void *)cmapv + rounded_value_size;
-               }
+       if (!raw_btf)
+               return -1;
 
-               if (percpu_map) {
-                       /* skip the last bracket for the percpu map */
-                       nread = getline(&line, &line_len, pin_file);
-                       if (nread < 0)
-                               break;
-               }
+       *btf_log_buf = '\0';
+       btf_fd = bpf_load_btf(raw_btf, raw_btf_size,
+                             btf_log_buf, BTF_LOG_BUF_SIZE,
+                             args.always_log);
+       free(raw_btf);
 
-               nread = getline(&line, &line_len, pin_file);
-       } while (++nr_read_elems < test->max_entries && nread > 0);
+       if (CHECK(btf_fd == -1, "invalid btf_fd errno:%d", errno)) {
+               err = -1;
+               goto done;
+       }
 
-       if (lossless_map &&
-           CHECK(nr_read_elems < test->max_entries,
-                 "Unexpected EOF. nr_read_elems:%u test->max_entries:%u",
-                 nr_read_elems, test->max_entries)) {
+       if (*btf_log_buf && args.always_log)
+               fprintf(stderr, "\n%s", btf_log_buf);
+       *btf_log_buf = '\0';
+
+       linfo_str_off = ret_next_str - test->str_sec;
+       patched_linfo = patch_name_tbd(test->line_info,
+                                      test->str_sec, linfo_str_off,
+                                      test->str_sec_size, &linfo_size);
+       if (IS_ERR(patched_linfo)) {
+               fprintf(stderr, "error in creating raw bpf_line_info");
                err = -1;
                goto done;
        }
 
-       if (CHECK(nread > 0, "Unexpected extra pprint output: %s", line)) {
+       attr.prog_type = test->prog_type;
+       attr.insns = ptr_to_u64(test->insns);
+       attr.insn_cnt = probe_prog_length(test->insns);
+       attr.license = ptr_to_u64("GPL");
+       attr.prog_btf_fd = btf_fd;
+       attr.func_info_rec_size = test->func_info_rec_size;
+       attr.func_info_cnt = test->func_info_cnt;
+       attr.func_info = ptr_to_u64(test->func_info);
+       attr.log_buf = ptr_to_u64(btf_log_buf);
+       attr.log_size = BTF_LOG_BUF_SIZE;
+       attr.log_level = 1;
+       if (linfo_size) {
+               attr.line_info_rec_size = test->line_info_rec_size;
+               attr.line_info = ptr_to_u64(patched_linfo);
+               attr.line_info_cnt = linfo_size / attr.line_info_rec_size;
+       }
+
+       prog_fd = syscall(__NR_bpf, BPF_PROG_LOAD, &attr, sizeof(attr));
+       err = ((prog_fd == -1) != test->expected_prog_load_failure);
+       if (CHECK(err, "prog_fd:%d expected_prog_load_failure:%u errno:%d",
+                 prog_fd, test->expected_prog_load_failure, errno) ||
+           CHECK(test->err_str && !strstr(btf_log_buf, test->err_str),
+                 "expected err_str:%s", test->err_str)) {
                err = -1;
                goto done;
        }
 
-       err = 0;
+       if (prog_fd == -1)
+               goto done;
+
+       err = test_get_finfo(test, prog_fd);
+       if (err)
+               goto done;
+
+       err = test_get_linfo(test, patched_linfo, attr.line_info_cnt, prog_fd);
+       if (err)
+               goto done;
 
 done:
-       if (mapv)
-               free(mapv);
        if (!err)
                fprintf(stderr, "OK");
+
        if (*btf_log_buf && (err || args.always_log))
                fprintf(stderr, "\n%s", btf_log_buf);
+
        if (btf_fd != -1)
                close(btf_fd);
-       if (map_fd != -1)
-               close(map_fd);
-       if (pin_file)
-               fclose(pin_file);
-       unlink(pin_path);
-       free(line);
+       if (prog_fd != -1)
+               close(prog_fd);
+
+       if (!IS_ERR(patched_linfo))
+               free(patched_linfo);
 
        return err;
 }
 
-static int test_pprint(void)
+static int test_info_raw(void)
 {
        unsigned int i;
        int err = 0;
 
-       for (i = 0; i < ARRAY_SIZE(pprint_tests_meta); i++) {
-               pprint_test_template.descr = pprint_tests_meta[i].descr;
-               pprint_test_template.map_type = pprint_tests_meta[i].map_type;
-               pprint_test_template.map_name = pprint_tests_meta[i].map_name;
-               pprint_test_template.ordered_map = pprint_tests_meta[i].ordered_map;
-               pprint_test_template.lossless_map = pprint_tests_meta[i].lossless_map;
-               pprint_test_template.percpu_map = pprint_tests_meta[i].percpu_map;
+       if (args.info_raw_test_num)
+               return count_result(do_test_info_raw(args.info_raw_test_num));
 
-               err |= count_result(do_test_pprint());
-       }
+       for (i = 1; i <= ARRAY_SIZE(info_raw_tests); i++)
+               err |= count_result(do_test_info_raw(i));
 
        return err;
 }
 
 static void usage(const char *cmd)
 {
-       fprintf(stderr, "Usage: %s [-l] [[-r test_num (1 - %zu)] | [-g test_num (1 - %zu)] | [-f test_num (1 - %zu)] | [-p]]\n",
+       fprintf(stderr, "Usage: %s [-l] [[-r btf_raw_test_num (1 - %zu)] |\n"
+                       "\t[-g btf_get_info_test_num (1 - %zu)] |\n"
+                       "\t[-f btf_file_test_num (1 - %zu)] |\n"
+                       "\t[-k btf_prog_info_raw_test_num (1 - %zu)] |\n"
+                       "\t[-p (pretty print test)]]\n",
                cmd, ARRAY_SIZE(raw_tests), ARRAY_SIZE(get_info_tests),
-               ARRAY_SIZE(file_tests));
+               ARRAY_SIZE(file_tests), ARRAY_SIZE(info_raw_tests));
 }
 
 static int parse_args(int argc, char **argv)
 {
-       const char *optstr = "lpf:r:g:";
+       const char *optstr = "lpk:f:r:g:";
        int opt;
 
        while ((opt = getopt(argc, argv, optstr)) != -1) {
@@ -2509,6 +4330,10 @@ static int parse_args(int argc, char **argv)
                case 'p':
                        args.pprint_test = true;
                        break;
+               case 'k':
+                       args.info_raw_test_num = atoi(optarg);
+                       args.info_raw_test = true;
+                       break;
                case 'h':
                        usage(argv[0]);
                        exit(0);
@@ -2542,6 +4367,14 @@ static int parse_args(int argc, char **argv)
                return -1;
        }
 
+       if (args.info_raw_test_num &&
+           (args.info_raw_test_num < 1 ||
+            args.info_raw_test_num > ARRAY_SIZE(info_raw_tests))) {
+               fprintf(stderr, "BTF prog info raw test number must be [1 - %zu]\n",
+                       ARRAY_SIZE(info_raw_tests));
+               return -1;
+       }
+
        return 0;
 }
 
@@ -2574,13 +4407,17 @@ int main(int argc, char **argv)
        if (args.pprint_test)
                err |= test_pprint();
 
+       if (args.info_raw_test)
+               err |= test_info_raw();
+
        if (args.raw_test || args.get_info_test || args.file_test ||
-           args.pprint_test)
+           args.pprint_test || args.info_raw_test)
                goto done;
 
        err |= test_raw();
        err |= test_get_info();
        err |= test_file();
+       err |= test_info_raw();
 
 done:
        print_summary();