.err_str = "Invalid type_size",
 },
 
+{
+       .descr = "tag test #1, struct/member, well-formed",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_STRUCT_ENC(0, 2, 8),                        /* [2] */
+               BTF_MEMBER_ENC(NAME_TBD, 1, 0),
+               BTF_MEMBER_ENC(NAME_TBD, 1, 32),
+               BTF_TAG_ENC(NAME_TBD, 2, -1),
+               BTF_TAG_ENC(NAME_TBD, 2, 0),
+               BTF_TAG_ENC(NAME_TBD, 2, 1),
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0m1\0m2\0tag1\0tag2\0tag3"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "tag_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = 8,
+       .key_type_id = 1,
+       .value_type_id = 2,
+       .max_entries = 1,
+},
+{
+       .descr = "tag test #2, union/member, well-formed",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_UNION_ENC(NAME_TBD, 2, 4),                  /* [2] */
+               BTF_MEMBER_ENC(NAME_TBD, 1, 0),
+               BTF_MEMBER_ENC(NAME_TBD, 1, 0),
+               BTF_TAG_ENC(NAME_TBD, 2, -1),
+               BTF_TAG_ENC(NAME_TBD, 2, 0),
+               BTF_TAG_ENC(NAME_TBD, 2, 1),
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0t\0m1\0m2\0tag1\0tag2\0tag3"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "tag_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = 4,
+       .key_type_id = 1,
+       .value_type_id = 2,
+       .max_entries = 1,
+},
+{
+       .descr = "tag test #3, variable, well-formed",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_VAR_ENC(NAME_TBD, 1, 0),                    /* [2] */
+               BTF_VAR_ENC(NAME_TBD, 1, 1),                    /* [3] */
+               BTF_TAG_ENC(NAME_TBD, 2, -1),
+               BTF_TAG_ENC(NAME_TBD, 3, -1),
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0local\0global\0tag1\0tag2"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "tag_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = 4,
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 1,
+},
+{
+       .descr = "tag test #4, func/parameter, well-formed",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_FUNC_PROTO_ENC(0, 2),                       /* [2] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+               BTF_FUNC_ENC(NAME_TBD, 2),                      /* [3] */
+               BTF_TAG_ENC(NAME_TBD, 3, -1),
+               BTF_TAG_ENC(NAME_TBD, 3, 0),
+               BTF_TAG_ENC(NAME_TBD, 3, 1),
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0arg1\0arg2\0f\0tag1\0tag2\0tag3"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "tag_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = 4,
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 1,
+},
+{
+       .descr = "tag test #5, invalid value",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_VAR_ENC(NAME_TBD, 1, 0),                    /* [2] */
+               BTF_TAG_ENC(0, 2, -1),
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0local\0tag"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "tag_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = 4,
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 1,
+       .btf_load_err = true,
+       .err_str = "Invalid value",
+},
+{
+       .descr = "tag test #6, invalid target type",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_TAG_ENC(NAME_TBD, 1, -1),
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0tag1"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "tag_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = 4,
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 1,
+       .btf_load_err = true,
+       .err_str = "Invalid type",
+},
+{
+       .descr = "tag test #7, invalid vlen",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_VAR_ENC(NAME_TBD, 1, 0),                    /* [2] */
+               BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_TAG, 0, 1), 2), (0),
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0local\0tag1"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "tag_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = 4,
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 1,
+       .btf_load_err = true,
+       .err_str = "vlen != 0",
+},
+{
+       .descr = "tag test #8, invalid kflag",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_VAR_ENC(NAME_TBD, 1, 0),                    /* [2] */
+               BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_TAG, 1, 0), 2), (-1),
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0local\0tag1"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "tag_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = 4,
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 1,
+       .btf_load_err = true,
+       .err_str = "Invalid btf_info kind_flag",
+},
+{
+       .descr = "tag test #9, var, invalid component_idx",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_VAR_ENC(NAME_TBD, 1, 0),                    /* [2] */
+               BTF_TAG_ENC(NAME_TBD, 2, 0),
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0local\0tag"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "tag_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = 4,
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 1,
+       .btf_load_err = true,
+       .err_str = "Invalid component_idx",
+},
+{
+       .descr = "tag test #10, struct member, invalid component_idx",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_STRUCT_ENC(0, 2, 8),                        /* [2] */
+               BTF_MEMBER_ENC(NAME_TBD, 1, 0),
+               BTF_MEMBER_ENC(NAME_TBD, 1, 32),
+               BTF_TAG_ENC(NAME_TBD, 2, 2),
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0m1\0m2\0tag"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "tag_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = 8,
+       .key_type_id = 1,
+       .value_type_id = 2,
+       .max_entries = 1,
+       .btf_load_err = true,
+       .err_str = "Invalid component_idx",
+},
+{
+       .descr = "tag test #11, func parameter, invalid component_idx",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_FUNC_PROTO_ENC(0, 2),                       /* [2] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+               BTF_FUNC_ENC(NAME_TBD, 2),                      /* [3] */
+               BTF_TAG_ENC(NAME_TBD, 3, 2),
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0arg1\0arg2\0f\0tag"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "tag_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = 4,
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 1,
+       .btf_load_err = true,
+       .err_str = "Invalid component_idx",
+},
+{
+       .descr = "tag test #12, < -1 component_idx",
+       .raw_types = {
+               BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
+               BTF_FUNC_PROTO_ENC(0, 2),                       /* [2] */
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+                       BTF_FUNC_PROTO_ARG_ENC(NAME_TBD, 1),
+               BTF_FUNC_ENC(NAME_TBD, 2),                      /* [3] */
+               BTF_TAG_ENC(NAME_TBD, 3, -2),
+               BTF_END_RAW,
+       },
+       BTF_STR_SEC("\0arg1\0arg2\0f\0tag"),
+       .map_type = BPF_MAP_TYPE_ARRAY,
+       .map_name = "tag_type_check_btf",
+       .key_size = sizeof(int),
+       .value_size = 4,
+       .key_type_id = 1,
+       .value_type_id = 1,
+       .max_entries = 1,
+       .btf_load_err = true,
+       .err_str = "Invalid component_idx",
+},
+
 }; /* struct btf_raw_test raw_tests[] */
 
 static const char *get_next_str(const char *start, const char *end)
                return base_size + sizeof(struct btf_var);
        case BTF_KIND_DATASEC:
                return base_size + vlen * sizeof(struct btf_var_secinfo);
+       case BTF_KIND_TAG:
+               return base_size + sizeof(struct btf_tag);
        default:
                fprintf(stderr, "Unsupported BTF_KIND:%u\n", kind);
                return -EINVAL;