OpenE2K
/
dwarves
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

btf_loader: Support BTF_KIND_VAR 

Now the output for DWARF and BTF match, modulo warnings about some
BTF_KIND_ still not supported:

  [root@quaco tracebuffer]# pglobal -F dwarf -v bristot.o
  struct ____btf_map_tracebuffer__bristot ____btf_map_tracebuffer__bristot;; /* 0 */

  char                       _license[4];; /* 0 */

  int                        _version;; /* 0 */

  struct bpf_map     tracebuffer__bristot;; /* 0 */

  [root@quaco tracebuffer]# pglobal -F btf -v bristot.o
  BTF: idx: 17, off: 352, Unknown kind 15
  BTF: idx: 18, off: 364, Unknown kind 0
  BTF: idx: 19, off: 376, Unknown kind 15
  BTF: idx: 20, off: 388, Unknown kind 0
  BTF: idx: 21, off: 400, Unknown kind 15
  BTF: idx: 22, off: 412, Unknown kind 0
  BTF: idx: 23, off: 424, Unknown kind 15
  BTF: idx: 24, off: 436, Unknown kind 0
  struct ____btf_map_tracebuffer__bristot ____btf_map_tracebuffer__bristot;; /* 0 */

  char                       _license[4];; /* 0 */

  int                        _version;; /* 0 */

  struct bpf_map     tracebuffer__bristot;; /* 0 */

  [root@quaco tracebuffer]#

Cc: Andrii Nakryiko <andriin@fb.com>
Cc: Daniel Bristot de Oliveira <bristot@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Yonghong Song <yhs@fb.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2019-10-24 17:14:00 -03:00
parent 5965ce015e
commit a4ba2234ff
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
btf_loader.c
View File

@ -133,6 +133,19 @@ static struct class *class__new(strings_t name, size_t size)
return class;
}
static struct variable *variable__new(strings_t name, uint32_t linkage)
{
struct variable *var = tag__alloc(sizeof(*var));
if (var != NULL) {
var->external = linkage == BTF_VAR_GLOBAL_ALLOCATED;
var->name = name;
var->ip.tag.tag = DW_TAG_variable;
}
return var;
}
static int create_new_base_type(struct btf_elf *btfe, void *ptr, struct btf_type *tp, uint32_t id)
{
uint32_t *enc = ptr;
@ -336,6 +349,23 @@ static int create_new_typedef(struct btf_elf *btfe, struct btf_type *tp, uint64_
return 0;
}
static int create_new_variable(struct btf_elf *btfe, void *ptr, struct btf_type *tp,
uint64_t size, uint32_t id)
{
strings_t name = btf_elf__get32(btfe, &tp->name_off);
unsigned int type_id = btf_elf__get32(btfe, &tp->type);
struct btf_var *bvar = ptr;
uint32_t linkage = btf_elf__get32(btfe, &bvar->linkage);
struct variable *var = variable__new(name, linkage);
if (var == NULL)
return -ENOMEM;
var->ip.tag.type = type_id;
cu__add_tag_with_id(btfe->priv, &var->ip.tag, id);
return sizeof(*bvar);
}
static int create_new_tag(struct btf_elf *btfe, int type, struct btf_type *tp, uint32_t id)
{
unsigned int type_id = btf_elf__get32(btfe, &tp->type);
@ -406,6 +436,8 @@ static int btf_elf__load_types(struct btf_elf *btfe)
vlen = create_new_forward_decl(btfe, type_ptr, size, type_index);
} else if (type == BTF_KIND_TYPEDEF) {
vlen = create_new_typedef(btfe, type_ptr, size, type_index);
} else if (type == BTF_KIND_VAR) {
vlen = create_new_variable(btfe, ptr, type_ptr, size, type_index);
} else if (type == BTF_KIND_VOLATILE ||
type == BTF_KIND_PTR ||
type == BTF_KIND_CONST ||