libbpf: Allow version suffixes (___smth) for struct_ops types

[linux-2.6-microblaze.git] / tools / lib / bpf / libbpf.c

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 6c2979f..e2a4c40 100644 (file)
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -948,7 +948,7 @@ static int find_btf_by_prefix_kind(const struct btf *btf, const char *prefix,
                                   const char *name, __u32 kind);
 
 static int
-find_struct_ops_kern_types(struct bpf_object *obj, const char *tname,
+find_struct_ops_kern_types(struct bpf_object *obj, const char *tname_raw,
                           struct module_btf **mod_btf,
                           const struct btf_type **type, __u32 *type_id,
                           const struct btf_type **vtype, __u32 *vtype_id,
@@ -958,8 +958,12 @@ find_struct_ops_kern_types(struct bpf_object *obj, const char *tname,
        const struct btf_member *kern_data_member;
        struct btf *btf;
        __s32 kern_vtype_id, kern_type_id;
+       char tname[256];
        __u32 i;
 
+       snprintf(tname, sizeof(tname), "%.*s",
+                (int)bpf_core_essential_name_len(tname_raw), tname_raw);
+
        kern_type_id = find_ksym_btf_id(obj, tname, BTF_KIND_STRUCT,
                                        &btf, mod_btf);
        if (kern_type_id < 0) {