perf annotate-data: Set bitfield member offset and size properly
Namhyung Kim
maintainerPATCH 1/1 perf annotate-data: Set bitfield member offset and size properly
The bitfield members might not have DW_AT_data_member_location. Let's use DW_AT_data_bit_offset to set the member offset correct. Also use DW_AT_bit_size for the name like in a C program.
Before:
Annotate type: 'struct sk_buff' (1 samples)
Percent Offset Size Field
- 100.00 0 232 struct sk_buff {
+ 0.00 0 24 union ;
+ 0.00 24 8 union ;
+ 0.00 32 8 union ;
0.00 40 48 char[] cb;
+ 0.00 88 16 union ;
0.00 104 8 long unsigned int _nfct;
100.00 112 4 unsigned int len;
0.00 116 4 unsigned int data_len;
0.00 120 2 __u16 mac_len;
0.00 122 2 __u16 hdr_len;
0.00 124 2 __u16 queue_mapping;
0.00 126 0 __u8[] __cloned_offset;
0.00 0 1 __u8 cloned;
0.00 0 1 __u8 nohdr;
0.00 0 1 __u8 fclone;
0.00 0 1 __u8 peeked;
0.00 0 1 __u8 head_frag;
0.00 0 1 __u8 pfmemalloc;
0.00 0 1 __u8 pp_recycle;
0.00 127 1 __u8 active_extensions;
+ 0.00 128 60 union ;
0.00 188 4 sk_buff_data_t tail;
0.00 192 4 sk_buff_data_t end;
0.00 200 8 unsigned char* head;After:
Annotate type: 'struct sk_buff' (1 samples)
Percent Offset Size Field
- 100.00 0 232 struct sk_buff {
+ 0.00 0 24 union ;
+ 0.00 24 8 union ;
+ 0.00 32 8 union ;
0.00 40 48 char[] cb
+ 0.00 88 16 union ;
0.00 104 8 long unsigned int _nfct;
100.00 112 4 unsigned int len;
0.00 116 4 unsigned int data_len;
0.00 120 2 __u16 mac_len;
0.00 122 2 __u16 hdr_len;
0.00 124 2 __u16 queue_mapping;
0.00 126 0 __u8[] __cloned_offset;
0.00 126 1 __u8 cloned:1;
0.00 126 1 __u8 nohdr:1;
0.00 126 1 __u8 fclone:2;
0.00 126 1 __u8 peeked:1;
0.00 126 1 __u8 head_frag:1;
0.00 126 1 __u8 pfmemalloc:1;
0.00 126 1 __u8 pp_recycle:1;
0.00 127 1 __u8 active_extensions;
+ 0.00 128 60 union ;
0.00 188 4 sk_buff_data_t tail;
0.00 192 4 sk_buff_data_t end;
0.00 200 8 unsigned char* head;Cc Athira Rajeev <[email protected]>
Signed-off-by Namhyung Kim <[email protected]>
--- tools/perf/util/annotate-data.c | 34 +++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-)
tools/perf/util/annotate-data.c +28 -6
@@ -202,7 +202,7 @@ static int __add_member_cb(Dwarf_Die *die, void *arg)struct annotated_member *parent = arg;struct annotated_member *member;Dwarf_Die member_type, die_mem; -Dwarf_Word size, loc; +Dwarf_Word size, loc, bit_size =0 ;Dwarf_Attribute attr;struct strbuf sb;int tag;
@@ -226,15 +226,37 @@ static int __add_member_cb(Dwarf_Die *die, void *arg)if (dwarf_aggregate_size (&die_mem, &size) <0 ) size =0 ; -if (!dwarf_attr_integrate (die, DW_AT_data_member_location, &attr)) - loc =0 ; -else +if (dwarf_attr_integrate (die, DW_AT_data_member_location, &attr))dwarf_formudata (&attr, &loc); +else { +/* bitfield member */ +if (dwarf_attr_integrate (die, DW_AT_data_bit_offset, &attr) && +dwarf_formudata (&attr, &loc) ==0 ) + loc /=8 ; +else + loc =0 ; + +if (dwarf_attr_integrate (die, DW_AT_bit_size, &attr) && +dwarf_formudata (&attr, &bit_size) ==0 ) + size = (bit_size +7 ) /8 ; + } member->type_name =strbuf_detach (&sb,NULL );/* member->var_name can be NULL */ -if (dwarf_diename (die)) - member->var_name =strdup (dwarf_diename (die)); +if (dwarf_diename (die)) { +if (bit_size) { +if (asprintf (&member->var_name,"%s:%ld" , +dwarf_diename (die), (long )bit_size) <0 ) + member->var_name =NULL ; + }else { + member->var_name =strdup (dwarf_diename (die)); + } + +if (member->var_name ==NULL ) { +free (member); +return DIE_FIND_CB_END ; + } + } member->size = size; member->offset = loc + parent->offset;INIT_LIST_HEAD (&member->children);
Signature · 1 line
2.46.0.76.ge559c4bf1a-goog