btf: support typedef DW_TAG_LLVM_annotation
v2 cover btf: support typedef DW_TAG_LLVM_annotation
Latest llvm is able to generate DW_TAG_LLVM_annotation for typedef declarations. Latest bpf-next supports BTF_KIND_DECL_TAG for typedef declarations. This patch implemented dwarf DW_TAG_LLVM_annotation to btf BTF_KIND_DECL_TAG conversion. Patch 1 is for dwarf_loader to process DW_TAG_LLVM_annotation tags. Patch 2 is for the dwarf->btf conversion.
Changelog:
v1 -> v2:
- change some "if" statements to "switch" statement.
Yonghong Song (2):
dwarf_loader: support typedef DW_TAG_LLVM_annotation
btf_encoder: generate BTF_KIND_DECL_TAGs for typedef btf_decl_tag
attributes
btf_encoder.c | 17 ++++++++++++++--- dwarf_loader.c | 7 ++----- 2 files changed, 16 insertions(+), 8 deletions(-)
Signature · 1 line
2.30.2
PATCH v2 1/2 dwarf_loader: support typedef DW_TAG_LLVM_annotation
llvm commit ([1]) added support for btf_decl_tag attribute with typedef declaration. Eventually, DW_TAG_LLVM_annotation tag may appear inside dwarf typedef declaration tag.
kernel support for typedef BTF_KIND_DECL_TAG support is introduced in [2]. There is no additional libbpf change needed as the previous libbpf BTF_KIND_DECL_TAG support is generic enough to cover new typedef use cases.
This patch added parsing of DW_TAG_LLVM_annotation for dwarf typedef decl.
$ cat t.c
$ clang -O2 -g -c t.c
$ llvm-dwarfdump --debug-info t.o
......
0x00000033: DW_TAG_typedef
DW_AT_type (0x00000051 "structure ")
DW_AT_name ("__t")
DW_AT_decl_file ("/home/yhs/t.c")
DW_AT_decl_line (3) 0x0000003e: DW_TAG_LLVM_annotation
DW_AT_name ("btf_decl_tag")
DW_AT_const_value ("tag1")
0x00000047: DW_TAG_LLVM_annotation
DW_AT_name ("btf_decl_tag")
DW_AT_const_value ("tag2")
0x00000050: NULLPreviously, pahole will issue a warning if typedef tag contains any child tag. I removed this warning since it is not true any more. Note that dwarf standard doesn't prevent typedef decl tag from having nested tags. In the future if we need to process any tag inside typedef tag, we can just add code to process it.
[1] https://reviews.llvm.org/D110127
[2] https://lore.kernel.org/bpf/[email protected]
--- dwarf_loader.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
dwarf_loader.c +2 -5
@@ -1296,11 +1296,8 @@ static struct tag *die__create_new_typedef(Dwarf_Die *die, struct cu *cu, structif (tdef ==NULL )return NULL ; -if (dwarf_haschildren (die)) { -struct dwarf_tag *dtag = tdef->namespace.tag.priv; -fprintf (stderr,"%s: DW_TAG_typedef %llx WITH children!\n" , - __func__, (unsigned long long )dtag->id); - } +if (add_child_llvm_annotations (die,-1 , conf, &tdef->namespace.annots)) +return NULL ;return &tdef->namespace.tag; }
Signature · 1 line
2.30.2
PATCH v2 2/2 btf_encoder: generate BTF_KIND_DECL_TAGs for typedef btf_decl_tag attributes
In reply to Yonghong SongEmit BTF BTF_KIND_DECL_TAGs for btf_decl_tag attributes attached to typedef declarations. The following is a simple example:
$ cat t.c
#define __tag1 __attribute__((btf_decl_tag("tag1")))
#define __tag2 __attribute__((btf_decl_tag("tag2")))
typedef struct { int a; int b; } __t __tag1 __tag2;
__t g;
$ clang -O2 -g -c t.c
$ pahole -JV t.o
btf_encoder__new: 't.o' doesn't have '.data..percpu' section
Found 0 per-CPU variables!
File t.o:
[1] TYPEDEF __t type_id=2
[2] STRUCT (anon) size=8
a type_id=3 bits_offset=0
b type_id=3 bits_offset=32
[3] INT int size=4 nr_bits=32 encoding=SIGNED
[4] DECL_TAG tag1 type_id=1 component_idx=-1
[5] DECL_TAG tag2 type_id=1 component_idx=-1--- btf_encoder.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
btf_encoder.c +14 -3
@@ -1438,9 +1438,21 @@ int btf_encoder__encode_cu(struct btf_encoder *encoder, struct cu *cu)cu__for_each_type (cu, core_id, pos) {struct namespace *ns; +const char *tag_name; -if (pos->tag != DW_TAG_structure_type && pos->tag != DW_TAG_union_type) +switch (pos->tag) { +case DW_TAG_structure_type: + tag_name ="struct" ; +break ; +case DW_TAG_union_type: + tag_name ="union" ; +break ; +case DW_TAG_typedef: + tag_name ="typedef" ; +break ; +default :continue ; + } btf_type_id = type_id_off + core_id; ns =tag__namespace (pos);
@@ -1448,8 +1460,7 @@ int btf_encoder__encode_cu(struct btf_encoder *encoder, struct cu *cu) tag_type_id =btf_encoder__add_decl_tag (encoder, annot->value, btf_type_id, annot->component_idx);if (tag_type_id <0 ) {fprintf (stderr,"error: failed to encode tag '%s' to %s '%s' with component_idx %d\n" , - annot->value, pos->tag == DW_TAG_structure_type ?"struct" :"union" , -namespace__name (ns), annot->component_idx); + annot->value, tag_name,namespace__name (ns), annot->component_idx); goto out; } }
Signature · 1 line
2.30.2
Quoted 8 lines · Yonghong Song
Latest llvm is able to generate
DW_TAG_LLVM_annotationfor typedef declarations. Latest bpf-next supportsBTF_KIND_DECL_TAGfor typedef declarations. This patch implemented dwarfDW_TAG_LLVM_annotationto btfBTF_KIND_DECL_TAGconversion. Patch 1 is fordwarf_loaderto processDW_TAG_LLVM_annotationtags. Patch 2 is for thedwarf->btfconversion.
Quoted 4 lines
Changelog:
v1 -> v2:
- change some "if" statements to "switch" statement.
LGTM.
Quoted 12 lines
Yonghong Song (2):
dwarf_loader: support typedefDW_TAG_LLVM_annotation
btf_encoder: generateBTF_KIND_DECL_TAGsfor typedefbtf_decl_tag
attributesbtf_encoder.c | 17 ++++++++++++++--- dwarf_loader.c | 7 ++----- 2 files changed, 16 insertions(+), 8 deletions(-)--
2.30.2
Quoted 9 lines · Andrii Nakryiko
Quoted 8 lines · Yonghong Song
Latest llvm is able to generate
DW_TAG_LLVM_annotationfor typedef declarations. Latest bpf-next supportsBTF_KIND_DECL_TAGfor typedef declarations. This patch implemented dwarfDW_TAG_LLVM_annotationto btfBTF_KIND_DECL_TAGconversion. Patch 1 is fordwarf_loaderto processDW_TAG_LLVM_annotationtags. Patch 2 is for thedwarf->btfconversion.
Quoted 8 lines
Quoted 4 lines
Changelog:
v1 -> v2:
- change some "if" statements to "switch" statement.LGTM.
Acked-by Andrii Nakryiko <[email protected]>
Arnaldo, did you get chance to look at this patch set?
Quoted 13 lines
Quoted 13 lines
Yonghong Song (2):
dwarf_loader: support typedefDW_TAG_LLVM_annotation
btf_encoder: generateBTF_KIND_DECL_TAGsfor typedefbtf_decl_tag
attributesbtf_encoder.c | 17 ++++++++++++++--- dwarf_loader.c | 7 ++----- 2 files changed, 16 insertions(+), 8 deletions(-)--
2.30.2
Em Tue, Nov 09, 2021 at 09:23:30PM -0800, Yonghong Song escreveu:
Quoted 17 lines · Andrii Nakryiko
Quoted 14 lines · Yonghong Song
Quoted 12 lines
Latest llvm is able to generate
DW_TAG_LLVM_annotationfor typedef declarations. Latest bpf-next supportsBTF_KIND_DECL_TAGfor typedef declarations. This patch implemented dwarfDW_TAG_LLVM_annotationto btfBTF_KIND_DECL_TAGconversion. Patch 1 is fordwarf_loaderto processDW_TAG_LLVM_annotationtags. Patch 2 is for thedwarf->btfconversion.Changelog:
v1 -> v2:
- change some "if" statements to "switch" statement.
Quoted 5 lines
Quoted 3 lines
LGTM.
Acked-by Andrii Nakryiko <[email protected]>Arnaldo, did you get chance to look at this patch set?
Yeah, I've merged and put it in the tmp.master branch so that libbpf's CI can have a go on it.
I'm also updating my clang/llvm build to test it.
Thanks,
- Arnaldo
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Yonghong Song (2):
dwarf_loader: support typedefDW_TAG_LLVM_annotation
btf_encoder: generateBTF_KIND_DECL_TAGsfor typedefbtf_decl_tag
attributesbtf_encoder.c | 17 ++++++++++++++--- dwarf_loader.c | 7 ++----- 2 files changed, 16 insertions(+), 8 deletions(-)--
2.30.2
Signature · 1 line
- Arnaldo
Quoted 20 lines · Arnaldo Carvalho de Melo
Em Tue, Nov 09, 2021 at 09:23:30PM -0800, Yonghong Song escreveu:
Quoted 19 lines · Andrii Nakryiko
Quoted 16 lines · Yonghong Song
Quoted 8 lines
Latest llvm is able to generate
DW_TAG_LLVM_annotationfor typedef declarations. Latest bpf-next supportsBTF_KIND_DECL_TAGfor typedef declarations. This patch implemented dwarfDW_TAG_LLVM_annotationto btfBTF_KIND_DECL_TAGconversion. Patch 1 is fordwarf_loaderto processDW_TAG_LLVM_annotationtags. Patch 2 is for thedwarf->btfconversion.Quoted 4 lines
Changelog:
v1 -> v2:
- change some "if" statements to "switch" statement.LGTM.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Acked-by Andrii Nakryiko <[email protected]>Arnaldo, did you get chance to look at this patch set?
Yeah, I've merged and put it in the tmp.master branch so that libbpf's CI can have a go on it.
I'm also updating my clang/llvm build to test it.
Great! Thanks.
Quoted 19 lines
Thanks,
- Arnaldo
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Yonghong Song (2):
dwarf_loader: support typedefDW_TAG_LLVM_annotation
btf_encoder: generateBTF_KIND_DECL_TAGsfor typedefbtf_decl_tag
attributesbtf_encoder.c | 17 ++++++++++++++--- dwarf_loader.c | 7 ++----- 2 files changed, 16 insertions(+), 8 deletions(-)--
2.30.2