btf_encoder: Teach pahole to store percpu variables in vmlinux BTF.
PATCH v2 1/1 btf_encoder: Teach pahole to store percpu variables in vmlinux BTF.
On SMP systems, the global percpu variables are placed in a speical '.data..percpu' section, which is stored in a segment whose initial address is set to 0, the addresses of per-CPU variables are relative positive addresses [1].
This patch extracts these variables from vmlinux and places them with their type information in BTF. More specifically, when we encode BTF, we find the shndx of the '.data..percpu' section and then traverse the symbol table to find those global objects which are in this section. For each of these objects, we push a BTF_KIND_VAR into the types buffer, and a BTF_VAR_SECINFO into another buffer, percpu_secinfo. When all the CUs have finished processing, we push a BTF_KIND_DATASEC into the types buffer, followed by the percpu_secinfo's content, that is, an array of BTF_VAR_SECINFOs.
In a v5.7-rc7 linux kernel, I was able to extract 294 such variables. The space overhead is small.
Testing:
Before:
$ readelf -SW vmlinux | grep BTF [25] .BTF PROGBITS ffffffff821a905c 13a905c 2d2bf8 00 A 0 0 1
After:
$ pahole -J vmlinux $ readelf -SW vmlinux | grep BTF [25] .BTF PROGBITS ffffffff821a905c 13a905c 2d5bca 00 A 0 0 1
Common percpu vars can be found in the BTF section.
$ bpftool btf dump file vmlinux | grep runqueues [14098] VAR 'runqueues' type_id=13725, linkage=global-alloc
$ bpftool btf dump file vmlinux | grep 'cpu_stopper' [17592] STRUCT 'cpu_stopper' size=72 vlen=5 [17612] VAR 'cpu_stopper' type_id=17592, linkage=static
$ bpftool btf dump file vmlinux | grep ' DATASEC ' [63652] DATASEC '.data..percpu' size=0 vlen=294
References:
[1] https://lwn.net/Articles/531148/
--- btf_encoder.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++ dwarves.c | 6 +++ dwarves.h | 2 + libbtf.c | 86 ++++++++++++++++++++++++++++++++++ libbtf.h | 7 +++ pahole.c | 1 + 6 files changed, 227 insertions(+)
btf_encoder.c +125 -0
@@ -168,6 +168,27 @@ int btf_encoder__encode()return err; } + +#define HASHADDR__BITS 8 +#define HASHADDR__SIZE (1UL << HASHADDR__BITS) +#define hashaddr__fn (key) hash_64(key, HASHADDR__BITS) + +static struct variable *hashaddr__find_variable (const struct hlist_head hashtable[], +const uint64_t addr) +{ +struct variable *variable; +struct hlist_node *pos; +uint16_t bucket =hashaddr__fn (addr); +const struct hlist_head *head = &hashtable[bucket]; + +hlist_for_each_entry (variable, pos, head, tool_hnode) { +if (variable->ip.addr == addr) +return variable; + } + +return NULL ; +} +int cu__encode_btf (struct cu *cu,int verbose) {bool add_index_type = false;
@@ -176,6 +197,13 @@ int cu__encode_btf(struct cu *cu, int verbose)struct function *fn;struct tag *pos;int err =0 ; +GElf_Shdr shdr; +uint32_t percpu_ndx; +struct hlist_head hash_addr[HASHADDR__SIZE ]; +struct variable *var; +bool has_global_var = false; +struct elf_symtab *symtab; +GElf_Sym sym;if (btfe &&strcmp (btfe->filename, cu->filename)) { err =btf_encoder__encode ();
@@ -241,6 +269,103 @@ int cu__encode_btf(struct cu *cu, int verbose) } } +/* find ".data..percpu" section's ndx */ +Elf_Scn *percpu_sec =elf_section_by_name (btfe->elf, &btfe->ehdr, &shdr, +".data..percpu" ,NULL ); +if (percpu_sec ==NULL ) + goto out; + + percpu_ndx =elf_ndxscn (percpu_sec); +if (percpu_ndx ==0 ) + goto out; + +/* cache variables' addresses, preparing for searching in symtab. */ +for (core_id =0 ; core_id <HASHADDR__SIZE ; ++core_id) +INIT_HLIST_HEAD (&hash_addr[core_id]); + +cu__for_each_variable (cu, core_id, pos) { + var =tag__variable (pos); +if (var->declaration) +continue ; +/* percpu variables are allocated in global space */ +if (variable__scope (var) !=VSCOPE_GLOBAL ) +continue ; + has_global_var = true; +struct hlist_head *head = &hash_addr[hashaddr__fn (var->ip.addr)]; +hlist_add_head (&var->tool_hnode, head); + } +if (!has_global_var) + goto out; + +/* search within symtab for percpu variables */ + symtab =elf_symtab__new (NULL , btfe->elf, &btfe->ehdr); +if (!symtab) + goto out; + +elf_symtab__for_each_symbol (symtab, core_id, sym) { +uint32_t linkage, type, size, offset; +int32_t btf_var_id, btf_var_secinfo_id; +uint64_t addr; + +/* compare a symbol's shndx to determine if it's a percpu variable */ +if (elf_sym__section (&sym) != percpu_ndx) +continue ; + + addr =elf_sym__value (&sym); +/* +* Store only those symbols that have allocated space in the percpu section. +* This excludes the following three types of symbols: +* +* 1. __ADDRESSABLE(sym), which are forcely emitted as symbols. +* 2. __UNIQUE_ID(prefix), which are introduced to generate unique ids. +* 3. __exitcall(fn), functions which are labeled as exit calls. +* +* In addition, the variables defined using DEFINE_PERCPU_FIRST are +* also not included, which currently includes: +* +* 1. fixed_percpu_data +*/ +if (!addr) +continue ; + var =hashaddr__find_variable (hash_addr, addr); +if (var ==NULL ) +continue ; + +/* add a BTF_KIND_VAR in btfe->types */ + linkage = var->external ?BTF_VAR_GLOBAL_ALLOCATED :BTF_VAR_STATIC ; + type = var->ip.tag.type + type_id_off; + btf_var_id =btf_elf__add_var_type (btfe, type, var->name, linkage); +if (btf_var_id <0 ) { + err =-1 ; +printf ("error: failed to encode variable '%s'\n" , +variable__name (var, cu)); +break ; + } + +/* +* add a BTF_VAR_SECINFO in btfe->percpu_secinfo, which will be added into +* btfe->types later when we add BTF_VAR_DATASEC. +*/ + size =variable__type_size (var, cu); + type = btf_var_id; +/* +* Percpu variables are stored in a segment whose initial address is set to +* 0, so their addresses are also offsets. +* +* See https://lwn.net/Articles/531148/ +*/ + offset = addr; + btf_var_secinfo_id =btf_elf__add_var_secinfo (&btfe->percpu_secinfo, + type, offset, size); +if (btf_var_secinfo_id <0 ) { + err =-1 ; +printf ("error: failed to encode var secinfo '%s'\n" , +variable__name (var, cu)); +break ; + } + } + +elf_symtab__delete (symtab); out:if (err)btf_elf__delete (btfe);
dwarves.c +6 -0
@@ -978,6 +978,12 @@ const char *variable__type_name(const struct variable *var,return tag !=NULL ?tag__name (tag, cu, bf, len,NULL ) :NULL ; } +uint32_t variable__type_size (const struct variable *var,const struct cu *cu) +{ +const struct tag *tag =cu__type (cu, var->ip.tag.type); +return tag !=NULL ?tag__size (tag, cu) :0 ; +} +void class_member__delete (struct class_member *member,struct cu *cu) {obstack_free (&cu->obstack, member);
dwarves.h +2 -0
@@ -672,6 +672,8 @@ const char *variable__name(const struct variable *var, const struct cu *cu);const char *variable__type_name (const struct variable *var,const struct cu *cu,char *bf,size_t len); +uint32_t variable__type_size (const struct variable *var,const struct cu *cu); +struct lexblock {struct ip_tag ip;struct list_head tags;
libbtf.c +86 -0
104 lines not on this page · raw message
libbtf.h +7 -0
@@ -22,6 +22,7 @@ struct btf_elf {GElf_Ehdr ehdr;struct gobuffer types;struct gobuffer *strings; +struct gobuffer percpu_secinfo;char *filename;size_t size;int swapped;
@@ -55,6 +56,12 @@ int32_t btf_elf__add_enum(struct btf_elf *btf, uint32_t name, uint32_t size,int btf_elf__add_enum_val (struct btf_elf *btf,uint32_t name,int32_t value);int32_t btf_elf__add_func_proto (struct btf_elf *btf,struct ftype *ftype,uint32_t type_id_off); +int32_t btf_elf__add_var_type (struct btf_elf *btfe,uint32_t type,uint32_t name_off, +uint32_t linkage); +int32_t btf_elf__add_var_secinfo (struct gobuffer *buf,uint32_t type, +uint32_t offset,uint32_t size); +int32_t btf_elf__add_datasec_type (struct btf_elf *btfe,const char * section_name, +struct gobuffer *var_secinfo_buf);void btf_elf__set_strings (struct btf_elf *btf,struct gobuffer *strings);int btf_elf__encode (struct btf_elf *btf,uint8_t flags);
pahole.c +1 -0
@@ -1084,6 +1084,7 @@ static error_t pahole__options_parser(int key, char *arg,case 'i' : find_containers =1 ; class_name = arg;break ;case 'J' : btf_encode =1 ; + conf_load.get_addr_info = true; no_bitfield_type_recode = true;break ;case 'l' : conf.show_first_biggest_size_base_type_member =1 ;break ;case 'M' : conf.show_only_data_members =1 ;break ;
Signature · 1 line
2.27.0.rc2.251.g90737beb825-goog
A message that is not in the archive (sent off-list or not yet received): 20200603172244.100562-1-haoluo-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org
Em Wed, Jun 03, 2020 at 10:22:44AM -0700, Hao Luo escreveu:
Quoted 58 lines
On SMP systems, the global percpu variables are placed in a speical '.data..percpu' section, which is stored in a segment whose initial address is set to 0, the addresses of per-CPU variables are relative positive addresses [1].
This patch extracts these variables from vmlinux and places them with their type information in BTF. More specifically, when we encode BTF, we find the shndx of the '.data..percpu' section and then traverse the symbol table to find those global objects which are in this section. For each of these objects, we push a
BTF_KIND_VARinto the types buffer, and aBTF_VAR_SECINFOinto another buffer,percpu_secinfo. When all the CUs have finished processing, we push aBTF_KIND_DATASECinto the types buffer, followed by the percpu_secinfo's content, that is, an array ofBTF_VAR_SECINFOs.In a v5.7-rc7 linux kernel, I was able to extract 294 such variables. The space overhead is small.
Testing:
Before:
$ readelf -SW vmlinux | grep BTF [25] .BTF PROGBITS ffffffff821a905c 13a905c 2d2bf8 00 A 0 0 1After:
$ pahole -J vmlinux $ readelf -SW vmlinux | grep BTF [25] .BTF PROGBITS ffffffff821a905c 13a905c 2d5bca 00 A 0 0 1Common percpu vars can be found in the BTF section.
$ bpftool btf dump file vmlinux | grep runqueues [14098] VAR 'runqueues' type_id=13725, linkage=global-alloc$ bpftool btf dump file vmlinux | grep 'cpu_stopper' [17592] STRUCT 'cpu_stopper' size=72 vlen=5 [17612] VAR 'cpu_stopper' type_id=17592, linkage=static$ bpftool btf dump file vmlinux | grep ' DATASEC ' [63652] DATASEC '.data..percpu' size=0 vlen=294References:
[1] https://lwn.net/Articles/531148/Signed-off-by Hao Luo <[email protected]>--- btf_encoder.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++ dwarves.c | 6 +++ dwarves.h | 2 + libbtf.c | 86 ++++++++++++++++++++++++++++++++++ libbtf.h | 7 +++ pahole.c | 1 + 6 files changed, 227 insertions(+)btf_encoder.c +0
-0
btf_encoder.c int btf_encoder__encode() · line 174
Quoted 7 lines
btf_encoder.c +4
-0@@ -168,6 +168,27 @@ int btf_encoder__encode()return err; } + +#define HASHADDR__BITS 8 +#define HASHADDR__SIZE (1UL << HASHADDR__BITS) +#define hashaddr__fn (key) hash_64(key, HASHADDR__BITS)
Yeah, that is in the ctf_encoder.c, I have to move them to a central location, so its fair you, for the sake of doing it as fast as possible, do it locally.
Quoted 58 lines
btf_encoder.c +44
-0+static struct variable *hashaddr__find_variable (const struct hlist_head hashtable[], +const uint64_t addr) +{ +struct variable *variable; +struct hlist_node *pos; +uint16_t bucket =hashaddr__fn (addr); +const struct hlist_head *head = &hashtable[bucket]; + +hlist_for_each_entry (variable, pos, head, tool_hnode) { +if (variable->ip.addr == addr) +return variable; + } + +return NULL ; +} +int cu__encode_btf (struct cu *cu,int verbose) {bool add_index_type = false;@@ -176,6 +197,13 @@ int cu__encode_btf(struct cu *cu, int verbose)struct function *fn;struct tag *pos;int err =0 ; +GElf_Shdr shdr; +uint32_t percpu_ndx; +struct hlist_head hash_addr[HASHADDR__SIZE ]; +struct variable *var; +bool has_global_var = false; +struct elf_symtab *symtab; +GElf_Sym sym;if (btfe &&strcmp (btfe->filename, cu->filename)) { err =btf_encoder__encode ();@@ -241,6 +269,103 @@ int cu__encode_btf(struct cu *cu, int verbose) } } +/* find ".data..percpu" section's ndx */ +Elf_Scn *percpu_sec =elf_section_by_name (btfe->elf, &btfe->ehdr, &shdr, +".data..percpu" ,NULL ); +if (percpu_sec ==NULL ) + goto out; + + percpu_ndx =elf_ndxscn (percpu_sec); +if (percpu_ndx ==0 ) + goto out; + +/* cache variables' addresses, preparing for searching in symtab. */ +for (core_id =0 ; core_id <HASHADDR__SIZE ; ++core_id) +INIT_HLIST_HEAD (&hash_addr[core_id]); + +cu__for_each_variable (cu, core_id, pos) { + var =tag__variable (pos); +if (var->declaration) +continue ; +/* percpu variables are allocated in global space */ +if (variable__scope (var) !=VSCOPE_GLOBAL ) +continue ;
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 302
Quoted 10 lines
btf_encoder.c +10
-0+ has_global_var = true; +struct hlist_head *head = &hash_addr[hashaddr__fn (var->ip.addr)]; +hlist_add_head (&var->tool_hnode, head); + } +if (!has_global_var) + goto out; + +/* search within symtab for percpu variables */ + symtab =elf_symtab__new (NULL , btfe->elf, &btfe->ehdr); +if (!symtab)
Some error message is in need here?
Quoted 17 lines
btf_encoder.c +17
-0+ goto out; + +elf_symtab__for_each_symbol (symtab, core_id, sym) { +uint32_t linkage, type, size, offset; +int32_t btf_var_id, btf_var_secinfo_id; +uint64_t addr; + +/* compare a symbol's shndx to determine if it's a percpu variable */ +if (elf_sym__section (&sym) != percpu_ndx) +continue ; + + addr =elf_sym__value (&sym); +/* +* Store only those symbols that have allocated space in the percpu section. +* This excludes the following three types of symbols: +* +* 1. __ADDRESSABLE(sym), which are forcely emitted as symbols.
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 329
Quoted 10 lines
btf_encoder.c +10
-0+* 2. __UNIQUE_ID(prefix), which are introduced to generate unique ids. +* 3. __exitcall(fn), functions which are labeled as exit calls. +* +* In addition, the variables defined using DEFINE_PERCPU_FIRST are +* also not included, which currently includes: +* +* 1. fixed_percpu_data +*/ +if (!addr) +continue ;
Perhaps some more verbose debug message here so that we can debug what is not being added and why?
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 331
Quoted 2 lines
btf_encoder.c +2
-0+ var =hashaddr__find_variable (hash_addr, addr); +if (var ==NULL )
Debug message
Quoted 221 lines
btf_encoder.c +37
-0+continue ; + +/* add a BTF_KIND_VAR in btfe->types */ + linkage = var->external ?BTF_VAR_GLOBAL_ALLOCATED :BTF_VAR_STATIC ; + type = var->ip.tag.type + type_id_off; + btf_var_id =btf_elf__add_var_type (btfe, type, var->name, linkage); +if (btf_var_id <0 ) { + err =-1 ; +printf ("error: failed to encode variable '%s'\n" , +variable__name (var, cu)); +break ; + } + +/* +* add a BTF_VAR_SECINFO in btfe->percpu_secinfo, which will be added into +* btfe->types later when we add BTF_VAR_DATASEC. +*/ + size =variable__type_size (var, cu); + type = btf_var_id; +/* +* Percpu variables are stored in a segment whose initial address is set to +* 0, so their addresses are also offsets. +* +* See https://lwn.net/Articles/531148/ +*/ + offset = addr; + btf_var_secinfo_id =btf_elf__add_var_secinfo (&btfe->percpu_secinfo, + type, offset, size); +if (btf_var_secinfo_id <0 ) { + err =-1 ; +printf ("error: failed to encode var secinfo '%s'\n" , +variable__name (var, cu)); +break ; + } + } + +elf_symtab__delete (symtab); out:if (err)btf_elf__delete (btfe);dwarves.c +6
-0@@ -978,6 +978,12 @@ const char *variable__type_name(const struct variable *var,return tag !=NULL ?tag__name (tag, cu, bf, len,NULL ) :NULL ; } +uint32_t variable__type_size (const struct variable *var,const struct cu *cu) +{ +const struct tag *tag =cu__type (cu, var->ip.tag.type); +return tag !=NULL ?tag__size (tag, cu) :0 ; +} +void class_member__delete (struct class_member *member,struct cu *cu) {obstack_free (&cu->obstack, member);dwarves.h +2
-0@@ -672,6 +672,8 @@ const char *variable__name(const struct variable *var, const struct cu *cu);const char *variable__type_name (const struct variable *var,const struct cu *cu,char *bf,size_t len); +uint32_t variable__type_size (const struct variable *var,const struct cu *cu); +struct lexblock {struct ip_tag ip;struct list_head tags;libbtf.c +86
-0@@ -46,6 +46,11 @@ struct btf_array_type {struct btf_array array; }; +struct btf_var_type { +struct btf_type type; +struct btf_var var; +}; +uint8_t btf_elf__verbose;uint32_t btf_elf__get32 (struct btf_elf *btfe,uint32_t *p)@@ -613,6 +618,84 @@ int32_t btf_elf__add_func_proto(struct btf_elf *btfe, struct ftype *ftype, uint3return type_id; } +int32_t btf_elf__add_var_type (struct btf_elf *btfe,uint32_t type,uint32_t name_off, +uint32_t linkage) +{ +struct btf_var_type t; + + t.type.name_off = name_off; + t.type.info =BTF_INFO_ENCODE (BTF_KIND_VAR ,0 ,0 ); + t.type.type = type; + + t.var.linkage = linkage; + + ++btfe->type_index; +if (gobuffer__add (&btfe->types, &t.type,sizeof (t)) <0 ) { +btf_elf__log_type (btfe, &t.type, true, true, +"type=%u name=%s Error in adding gobuffer" , + t.type.type,btf_elf__name_in_gobuf (btfe, t.type.name_off)); +return -1 ; + } + +btf_elf__log_type (btfe, &t.type, false, false,"type=%u name=%s" , + t.type.type,btf_elf__name_in_gobuf (btfe, t.type.name_off)); + +return btfe->type_index; +} + +int32_t btf_elf__add_var_secinfo (struct gobuffer *buf,uint32_t type, +uint32_t offset,uint32_t size) +{ +struct btf_var_secinfo si = { + .type = type, + .offset = offset, + .size = size, + }; +return gobuffer__add (buf, &si,sizeof (si)); +} + +extern struct strings *strings; + +int32_t btf_elf__add_datasec_type (struct btf_elf *btfe,const char *section_name, +struct gobuffer *var_secinfo_buf) +{ +struct btf_type type; +size_t sz =gobuffer__size (var_secinfo_buf); +uint16_t nr_var_secinfo = sz /sizeof (struct btf_var_secinfo ); +uint32_t name_off; + +/* +* dwarves doesn't store section names in its string table, +* so we have to add it by ourselves. +*/ + name_off =strings__add (strings, section_name); + + type.name_off = name_off; + type.info =BTF_INFO_ENCODE (BTF_KIND_DATASEC ,0 , nr_var_secinfo); + type.size =0 ; + + ++btfe->type_index; +if (gobuffer__add (&btfe->types, &type,sizeof (type)) <0 ) { +btf_elf__log_type (btfe, &type, true, true, +"name=%s vlen=%u Error in adding datasec" , +btf_elf__name_in_gobuf (btfe, type.name_off), + nr_var_secinfo); +return -1 ; + } +if (gobuffer__add (&btfe->types, var_secinfo_buf->entries, sz) <0 ) { +btf_elf__log_type (btfe, &type, true, true, +"name=%s vlen=%u Error in adding var_secinfo" , +btf_elf__name_in_gobuf (btfe, type.name_off), + nr_var_secinfo); +return -1 ; + } + +btf_elf__log_type (btfe, &type, false, false,"type=datasec name=%s" , +btf_elf__name_in_gobuf (btfe, type.name_off)); + +return btfe->type_index; +} +static int btf_elf__write (const char *filename,struct btf *btf) {GElf_Shdr shdr_mem, *shdr;@@ -727,6 +810,9 @@ int btf_elf__encode(struct btf_elf *btfe, uint8_t flags)if (gobuffer__size (&btfe->types) ==0 )return 0 ; +if (gobuffer__size (&btfe->percpu_secinfo) !=0 ) +btf_elf__add_datasec_type (btfe,".data..percpu" , &btfe->percpu_secinfo); + btfe->size =sizeof (*hdr) + (gobuffer__size (&btfe->types) +gobuffer__size (btfe->strings)); btfe->data =zalloc (btfe->size);libbtf.h +7
-0@@ -22,6 +22,7 @@ struct btf_elf {GElf_Ehdr ehdr;struct gobuffer types;struct gobuffer *strings; +struct gobuffer percpu_secinfo;char *filename;size_t size;int swapped;@@ -55,6 +56,12 @@ int32_t btf_elf__add_enum(struct btf_elf *btf, uint32_t name, uint32_t size,int btf_elf__add_enum_val (struct btf_elf *btf,uint32_t name,int32_t value);int32_t btf_elf__add_func_proto (struct btf_elf *btf,struct ftype *ftype,uint32_t type_id_off); +int32_t btf_elf__add_var_type (struct btf_elf *btfe,uint32_t type,uint32_t name_off, +uint32_t linkage); +int32_t btf_elf__add_var_secinfo (struct gobuffer *buf,uint32_t type, +uint32_t offset,uint32_t size); +int32_t btf_elf__add_datasec_type (struct btf_elf *btfe,const char * section_name, +struct gobuffer *var_secinfo_buf);void btf_elf__set_strings (struct btf_elf *btf,struct gobuffer *strings);int btf_elf__encode (struct btf_elf *btf,uint8_t flags);pahole.c +1
-0@@ -1084,6 +1084,7 @@ static error_t pahole__options_parser(int key, char *arg,case 'i' : find_containers =1 ; class_name = arg;break ;case 'J' : btf_encode =1 ; + conf_load.get_addr_info = true; no_bitfield_type_recode = true;break ;case 'l' : conf.show_first_biggest_size_base_type_member =1 ;break ;case 'M' : conf.show_only_data_members =1 ;break ;Signature · 1 line
2.27.0.rc2.251.g90737beb825-goog
Signature · 1 line
- Arnaldo
A message that is not in the archive (sent off-list or not yet received): CA+khW7jkjaf0xjU5CYt3AXSNKkwKVNz5=cz=3kpWLuFMBS+ZaA@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): CA+khW7jkjaf0xjU5CYt3AXSNKkwKVNz5=cz=3kpWLuFMBS+ZaA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Em Wed, Jun 03, 2020 at 01:02:26PM -0700, Hao Luo escreveu:
Quoted 77 lines
Quoted 64 lines · Arnaldo Carvalho de Melo
Em Wed, Jun 03, 2020 at 10:22:44AM -0700, Hao Luo escreveu:
Quoted 15 lines
On SMP systems, the global percpu variables are placed in a speical '.data..percpu' section, which is stored in a segment whose initial address is set to 0, the addresses of per-CPU variables are relative positive addresses [1].
This patch extracts these variables from vmlinux and places them with their type information in BTF. More specifically, when we encode BTF, we find the shndx of the '.data..percpu' section and then traverse the symbol table to find those global objects which are in this section. For each of these objects, we push a
BTF_KIND_VARinto the types buffer, and aBTF_VAR_SECINFOinto another buffer,percpu_secinfo. When all the CUs have finished processing, we push aBTF_KIND_DATASECinto the types buffer, followed by the percpu_secinfo's content, that is, an array ofBTF_VAR_SECINFOs.Quoted 8 lines
In a v5.7-rc7 linux kernel, I was able to extract 294 such variables. The space overhead is small.
Testing:
Before:
$ readelf -SW vmlinux | grep BTF [25] .BTF PROGBITS ffffffff821a905c 13a905c 2d2bf800 A 0 0 1
Quoted 5 lines
After:
$ pahole -J vmlinux $ readelf -SW vmlinux | grep BTF [25] .BTF PROGBITS ffffffff821a905c 13a905c 2d5bca00 A 0 0 1
Quoted 33 lines
Common percpu vars can be found in the BTF section.
$ bpftool btf dump file vmlinux | grep runqueues [14098] VAR 'runqueues' type_id=13725, linkage=global-alloc$ bpftool btf dump file vmlinux | grep 'cpu_stopper' [17592] STRUCT 'cpu_stopper' size=72 vlen=5 [17612] VAR 'cpu_stopper' type_id=17592, linkage=static$ bpftool btf dump file vmlinux | grep ' DATASEC ' [63652] DATASEC '.data..percpu' size=0 vlen=294References:
[1] https://lwn.net/Articles/531148/Signed-off-by Hao Luo <[email protected]>--- btf_encoder.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++ dwarves.c | 6 +++ dwarves.h | 2 + libbtf.c | 86 ++++++++++++++++++++++++++++++++++ libbtf.h | 7 +++ pahole.c | 1 + 6 files changed, 227 insertions(+)btf_encoder.c +0
-0@@ -168,6 +168,27 @@ int btf_encoder__encode()return err; }Quoted 9 lines
btf_encoder.c int btf_encoder__encode() · line 174
Quoted 4 lines
btf_encoder.c +4
-0+ +#define HASHADDR__BITS 8 +#define HASHADDR__SIZE (1UL << HASHADDR__BITS) +#define hashaddr__fn (key) hash_64(key, HASHADDR__BITS)Yeah, that is in the
ctf_encoder.c, I have to move them to a central location, so its fair you, for the sake of doing it as fast as possible, do it locally.
Quoted 2 lines
Arnaldo, could you advise on where is the best place to put these macros? I can do it as a preparatory patch in the next iteration. Thanks!
That was my initial thoughts, after looking at this a bit I'm not convinced this should be made common amongst the encoders, so I'd say nevermind, lets continue with how you patch uses it, sorry for the disturbance.
Just address the debug messages suggestions you acked, and lets wait for Andrii's comments.
- Arnaldo
Quoted 392 lines
Quoted 73 lines
btf_encoder.c int btf_encoder__encode() · line 175
Quoted 1 line
btf_encoder.c +1
-0+static struct variable *hashaddr__find_variable(const struct hlist_headhashtable[],
Quoted 33 lines
btf_encoder.c +22
-0+ const uint64_t addr) +{ +struct variable *variable; +struct hlist_node *pos; +uint16_t bucket =hashaddr__fn (addr); +const struct hlist_head *head = &hashtable[bucket]; + +hlist_for_each_entry (variable, pos, head, tool_hnode) { +if (variable->ip.addr == addr) +return variable; + } + +return NULL ; +} +int cu__encode_btf (struct cu *cu,int verbose) {bool add_index_type = false;@@ -176,6 +197,13 @@ int cu__encode_btf(struct cu *cu, int verbose)struct function *fn;struct tag *pos;int err =0 ; +GElf_Shdr shdr; +uint32_t percpu_ndx; +struct hlist_head hash_addr[HASHADDR__SIZE ]; +struct variable *var; +bool has_global_var = false; +struct elf_symtab *symtab; +GElf_Sym sym;if (btfe &&strcmp (btfe->filename, cu->filename)) { err =btf_encoder__encode ();btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 273
Quoted 5 lines
btf_encoder.c +2
-0@@ -241,6 +269,103 @@ int cu__encode_btf(struct cu *cu, int verbose) } } +/* find ".data..percpu" section's ndx */ + Elf_Scn *percpu_sec = elf_section_by_name(btfe->elf, &btfe->ehdr,&shdr,
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose)
Quoted 9 lines
btf_encoder.c +9
-0+ ".data..percpu", NULL); +if (percpu_sec ==NULL ) + goto out; + + percpu_ndx =elf_ndxscn (percpu_sec); +if (percpu_ndx ==0 ) + goto out; + +/* cache variables' addresses, preparing for searching in symtab. */
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose)
Quoted 12 lines
btf_encoder.c +12
-0+for (core_id =0 ; core_id <HASHADDR__SIZE ; ++core_id) +INIT_HLIST_HEAD (&hash_addr[core_id]); + +cu__for_each_variable (cu, core_id, pos) { + var =tag__variable (pos); +if (var->declaration) +continue ; +/* percpu variables are allocated in global space */ +if (variable__scope (var) !=VSCOPE_GLOBAL ) +continue ; + has_global_var = true; + struct hlist_head *head =&hash_addr[hashaddr__fn(var->ip.addr)];
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 302
Quoted 8 lines
btf_encoder.c +8
-0+hlist_add_head (&var->tool_hnode, head); + } +if (!has_global_var) + goto out; + +/* search within symtab for percpu variables */ + symtab =elf_symtab__new (NULL , btfe->elf, &btfe->ehdr); +if (!symtab)Quoted 2 lines
Some error message is in need here?
Ack. Will do.
Quoted 35 lines
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose)
Quoted 9 lines
btf_encoder.c +8
-0+ goto out; + +elf_symtab__for_each_symbol (symtab, core_id, sym) { +uint32_t linkage, type, size, offset; +int32_t btf_var_id, btf_var_secinfo_id; +uint64_t addr; + +/* compare a symbol's shndx to determine if it's a percpu variable */
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose)
Quoted 6 lines
btf_encoder.c +6
-0+if (elf_sym__section (&sym) != percpu_ndx) +continue ; + + addr =elf_sym__value (&sym); +/* +* Store only those symbols that have allocated space in the percpu section.
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose)
Quoted 3 lines
btf_encoder.c +3
-0+* This excludes the following three types of symbols: +* +* 1. __ADDRESSABLE(sym), which are forcely emitted as symbols.
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 320
Quoted 1 line
btf_encoder.c +1
-0+* 2. __UNIQUE_ID(prefix), which are introduced to generate unique ids.
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 321
Quoted 1 line
btf_encoder.c +1
-0+* 3. __exitcall(fn), functions which are labeled as exit calls.
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 323
Quoted 2 lines
btf_encoder.c +2
-0+* +* In addition, the variables defined using
DEFINE_PERCPU_FIRSTarebtf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 329
Quoted 6 lines
btf_encoder.c +6
-0+* also not included, which currently includes: +* +* 1. fixed_percpu_data +*/ +if (!addr) +continue ;Quoted 3 lines
Perhaps some more verbose debug message here so that we can debug what is not being added and why?
Ack.
Quoted 6 lines
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 331
Quoted 3 lines
btf_encoder.c +2
-0+ var =hashaddr__find_variable (hash_addr, addr); +if (var ==NULL )Debug message
Ack.
Quoted 261 lines
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose)
Quoted 5 lines
btf_encoder.c +4
-0+continue ; + +/* add a BTF_KIND_VAR in btfe->types */ + linkage = var->external ? BTF_VAR_GLOBAL_ALLOCATED :
BTF_VAR_STATIC;btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 337
Quoted 2 lines
btf_encoder.c +2
-0+ type = var->ip.tag.type + type_id_off; + btf_var_id = btf_elf__add_var_type(btfe, type, var->name,linkage);
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose)
Quoted 9 lines
btf_encoder.c +9
-0+if (btf_var_id <0 ) { + err =-1 ; +printf ("error: failed to encode variable '%s'\n" , +variable__name (var, cu)); +break ; + } + +/* +* add a BTF_VAR_SECINFO in btfe->percpu_secinfo, which will be added into
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose)
Quoted 6 lines
btf_encoder.c +6
-0+* btfe->types later when we add BTF_VAR_DATASEC. +*/ + size =variable__type_size (var, cu); + type = btf_var_id; +/* +* Percpu variables are stored in a segment whose initial address is set to
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose)
Quoted 6 lines
btf_encoder.c +6
-0+* 0, so their addresses are also offsets. +* +* See https://lwn.net/Articles/531148/ +*/ + offset = addr; + btf_var_secinfo_id =btf_elf__add_var_secinfo(&btfe->percpu_secinfo,
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 359
Quoted 1 line
btf_encoder.c +1
-0+ type,offset, size);
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose)
Quoted 3 lines
btf_encoder.c +3
-0+if (btf_var_secinfo_id <0 ) { + err =-1 ; + printf("error: failed to encode var secinfo'%s'\n",
dwarves.c const char *variable__type_name(const struct
Quoted 14 lines
btf_encoder.c +6
-0+ variable__name(var, cu)); +break ; + } + } + +elf_symtab__delete (symtab); out:if (err)btf_elf__delete (btfe);dwarves.c +0
-0@@ -978,6 +978,12 @@ const char *variable__type_name(const structvariable *var,
dwarves.c const char *variable__type_name(const struct variable *var,
Quoted 4 lines
dwarves.c +1
-0return tag !=NULL ?tag__name (tag, cu, bf, len,NULL ) :NULL ; } +uint32_t variable__type_size(const struct variable *var, const structcu *cu)
dwarves.h const char *variable__name(const struct variable
Quoted 13 lines
dwarves.c +5
-0+{ +const struct tag *tag =cu__type (cu, var->ip.tag.type); +return tag !=NULL ?tag__size (tag, cu) :0 ; +} +void class_member__delete (struct class_member *member,struct cu *cu) {obstack_free (&cu->obstack, member);dwarves.h +0
-0@@ -672,6 +672,8 @@ const char *variable__name(const struct variable*var, const struct cu *cu);
dwarves.h const char *variable__name(const struct variable *var, const struct cu *cu);
Quoted 4 lines
dwarves.h +1
-0const char *variable__type_name (const struct variable *var,const struct cu *cu,char *bf,size_t len); +uint32_t variable__type_size(const struct variable *var, const structcu *cu);
libbtf.c int32_t btf_elf__add_func_proto(struct btf_elf
Quoted 21 lines
dwarves.h +1
-0+struct lexblock {struct ip_tag ip;struct list_head tags;libbtf.c +5
-0@@ -46,6 +46,11 @@ struct btf_array_type {struct btf_array array; }; +struct btf_var_type { +struct btf_type type; +struct btf_var var; +}; +uint8_t btf_elf__verbose;uint32_t btf_elf__get32 (struct btf_elf *btfe,uint32_t *p)@@ -613,6 +618,84 @@ int32_t btf_elf__add_func_proto(struct btf_elf*btfe, struct ftype *ftype, uint3
libbtf.c int32_t btf_elf__add_func_proto(struct btf_elf *btfe, struct ftype *ftype, uint3
Quoted 4 lines
libbtf.c +1
-0return type_id; } +int32_t btf_elf__add_var_type(struct btf_elf *btfe, uint32_t type,
uint32_tname_off,Quoted 4 lines
libbtf.c +4
-0+ uint32_t linkage) +{ +struct btf_var_type t; +libbtf.c int32_t btf_elf__add_func_proto(struct btf_elf *btfe, struct ftype *ftype, uint3
Quoted 10 lines
libbtf.c +10
-0+ t.type.name_off = name_off; + t.type.info =BTF_INFO_ENCODE (BTF_KIND_VAR ,0 ,0 ); + t.type.type = type; + + t.var.linkage = linkage; + + ++btfe->type_index; +if (gobuffer__add (&btfe->types, &t.type,sizeof (t)) <0 ) { + btf_elf__log_type(btfe, &t.type, true, true, + "type=%u name=%s Error in addinggobuffer",
libbtf.c int32_t btf_elf__add_func_proto(struct btf_elf · line 636
Quoted 1 line
libbtf.c +1
-0+ t.type.type,
btf_elf__name_in_gobuf(btfe, t.type.name_off));libbtf.c int32_t btf_elf__add_func_proto(struct btf_elf *btfe, struct ftype *ftype, uint3
Quoted 5 lines
libbtf.c +5
-0+return -1 ; + } + + btf_elf__log_type(btfe, &t.type, false, false, "type=%u name=%s", + t.type.type, btf_elf__name_in_gobuf(btfe,t.type.name_off));
Quoted 8 lines
libbtf.c +8
-0+ +return btfe->type_index; +} + +int32_t btf_elf__add_var_secinfo (struct gobuffer *buf,uint32_t type, +uint32_t offset,uint32_t size) +{ +struct btf_var_secinfo si = {libbtf.c int32_t btf_elf__add_func_proto(struct btf_elf *btfe, struct ftype *ftype, uint3
Quoted 10 lines
libbtf.c +10
-0+ .type = type, + .offset = offset, + .size = size, + }; +return gobuffer__add (buf, &si,sizeof (si)); +} + +extern struct strings *strings; + +int32_t btf_elf__add_datasec_type(struct btf_elf *btfe, const char
*section_name,Quoted 11 lines
libbtf.c +11
-0+ struct gobuffer *var_secinfo_buf) +{ +struct btf_type type; +size_t sz =gobuffer__size (var_secinfo_buf); +uint16_t nr_var_secinfo = sz /sizeof (struct btf_var_secinfo ); +uint32_t name_off; + +/* +* dwarves doesn't store section names in its string table, +* so we have to add it by ourselves. +*/ libbtf.c int32_t btf_elf__add_func_proto(struct btf_elf *btfe, struct ftype *ftype, uint3
Quoted 10 lines
libbtf.c +10
-0+ name_off =strings__add (strings, section_name); + + type.name_off = name_off; + type.info =BTF_INFO_ENCODE (BTF_KIND_DATASEC ,0 , nr_var_secinfo); + type.size =0 ; + + ++btfe->type_index; +if (gobuffer__add (&btfe->types, &type,sizeof (type)) <0 ) { + btf_elf__log_type(btfe, &type, true, true, + "name=%s vlen=%u Error in addingdatasec",
libbtf.c int32_t btf_elf__add_func_proto(struct btf_elf · line 681
Quoted 1 line
libbtf.c +1
-0+ btf_elf__name_in_gobuf(btfe,type.name_off),
libbtf.c int32_t btf_elf__add_func_proto(struct btf_elf *btfe, struct ftype *ftype, uint3
Quoted 4 lines
libbtf.c +4
-0+ nr_var_secinfo); +return -1 ; + } +if (gobuffer__add (&btfe->types, var_secinfo_buf->entries, sz) <0 ){
libbtf.c int32_t btf_elf__add_func_proto(struct btf_elf · line 687
Quoted 2 lines
libbtf.c +2
-0+ btf_elf__log_type(btfe, &type, true, true, + "name=%s vlen=%u Error in adding
var_secinfo",libbtf.c int32_t btf_elf__add_func_proto(struct btf_elf · line 688
Quoted 1 line
libbtf.c +1
-0+ btf_elf__name_in_gobuf(btfe,type.name_off),
libbtf.c int32_t btf_elf__add_func_proto(struct btf_elf *btfe, struct ftype *ftype, uint3
Quoted 5 lines
libbtf.c +5
-0+ nr_var_secinfo); +return -1 ; + } + + btf_elf__log_type(btfe, &type, false, false, "type=datasecname=%s",
libbtf.c int btf_elf__encode(struct btf_elf *btfe, uint8_t
Quoted 9 lines
libbtf.c +5
-0+ btf_elf__name_in_gobuf(btfe, type.name_off)); + +return btfe->type_index; +} +static int btf_elf__write (const char *filename,struct btf *btf) {GElf_Shdr shdr_mem, *shdr;@@ -727,6 +810,9 @@ int btf_elf__encode(struct btf_elf *btfe, uint8_tflags)
libbtf.c int btf_elf__encode(struct btf_elf *btfe, uint8_t flags)
Quoted 5 lines
libbtf.c +2
-0if (gobuffer__size (&btfe->types) ==0 )return 0 ; +if (gobuffer__size (&btfe->percpu_secinfo) !=0 ) + btf_elf__add_datasec_type(btfe, ".data..percpu",
&btfe->percpu_secinfo);libbtf.c int btf_elf__encode(struct btf_elf *btfe, uint8_t · line 816
Quoted 2 lines
libbtf.c +1
-0+ btfe->size = sizeof(*hdr) + (gobuffer__size(&btfe->types) +
gobuffer__size(btfe->strings));libbtf.h int32_t btf_elf__add_enum(struct btf_elf *btf,
Quoted 15 lines
libbtf.c +0
-0btfe->data =zalloc (btfe->size);libbtf.h +1
-0@@ -22,6 +22,7 @@ struct btf_elf {GElf_Ehdr ehdr;struct gobuffer types;struct gobuffer *strings; +struct gobuffer percpu_secinfo;char *filename;size_t size;int swapped;@@ -55,6 +56,12 @@ int32_t btf_elf__add_enum(struct btf_elf *btf,
uint32_tname,uint32_tsize,libbtf.h int32_t btf_elf__add_enum(struct btf_elf *btf, · line 56
Quoted 1 line
libbtf.h +0
-0int btf_elf__add_enum_val(struct btf_elf *btf, uint32_t name, int32_tvalue);
libbtf.h int32_t btf_elf__add_enum(struct btf_elf *btf, · line 57
Quoted 1 line
libbtf.h +0
-0int32_t btf_elf__add_func_proto(struct btf_elf *btf, struct ftype*ftype,
libbtf.h int32_t btf_elf__add_enum(struct btf_elf *btf, · line 59
Quoted 2 lines
libbtf.h +1
-0uint32_t type_id_off); +int32_t btf_elf__add_var_type(struct btf_elf *btfe, uint32_t type,
uint32_tname_off,libbtf.h int32_t btf_elf__add_enum(struct btf_elf *btf, uint32_t name, uint32_t size,
Quoted 4 lines
libbtf.h +4
-0+ uint32_t linkage); +int32_t btf_elf__add_var_secinfo (struct gobuffer *buf,uint32_t type, +uint32_t offset,uint32_t size); +int32_t btf_elf__add_datasec_type(struct btf_elf *btfe, const char *
section_name,libbtf.h int32_t btf_elf__add_enum(struct btf_elf *btf, · line 65
Quoted 2 lines
libbtf.h +1
-0+ struct gobuffer *var_secinfo_buf); void btf_elf__set_strings(struct btf_elf *btf, struct gobuffer*strings);
pahole.c static error_t pahole__options_parser(int key,
Quoted 7 lines
libbtf.h +0
-0int btf_elf__encode (struct btf_elf *btf,uint8_t flags);pahole.c +0
-0@@ -1084,6 +1084,7 @@ static error_t pahole__options_parser(int key,char *arg,
pahole.c static error_t pahole__options_parser(int key, char *arg,
Quoted 6 lines
pahole.c +1
-0case 'i' : find_containers =1 ; class_name = arg;break ;case 'J' : btf_encode =1 ; + conf_load.get_addr_info = true; no_bitfield_type_recode = true;break ;case 'l' : conf.show_first_biggest_size_base_type_member =1 ;break;
Quoted 4 lines
pahole.c +0
-1case 'M' : conf.show_only_data_members =1 ;break ; --2.27.0.rc2.251.g90737beb825-goog
--
- Arnaldo
Signature · 1 line
- Arnaldo
Em Wed, Jun 03, 2020 at 10:22:44AM -0700, Hao Luo escreveu:
Quoted 15 lines
On SMP systems, the global percpu variables are placed in a speical '.data..percpu' section, which is stored in a segment whose initial address is set to 0, the addresses of per-CPU variables are relative positive addresses [1].
This patch extracts these variables from vmlinux and places them with their type information in BTF. More specifically, when we encode BTF, we find the shndx of the '.data..percpu' section and then traverse the symbol table to find those global objects which are in this section. For each of these objects, we push a
BTF_KIND_VARinto the types buffer, and aBTF_VAR_SECINFOinto another buffer,percpu_secinfo. When all the CUs have finished processing, we push aBTF_KIND_DATASECinto the types buffer, followed by the percpu_secinfo's content, that is, an array ofBTF_VAR_SECINFOs.
Quoted 2 lines
In a v5.7-rc7 linux kernel, I was able to extract 294 such variables. The space overhead is small.
Please state what you changed from v1 to v2,
- Arnaldo
Quoted 366 lines
Testing:
Before:
$ readelf -SW vmlinux | grep BTF [25] .BTF PROGBITS ffffffff821a905c 13a905c 2d2bf8 00 A 0 0 1After:
$ pahole -J vmlinux $ readelf -SW vmlinux | grep BTF [25] .BTF PROGBITS ffffffff821a905c 13a905c 2d5bca 00 A 0 0 1Common percpu vars can be found in the BTF section.
$ bpftool btf dump file vmlinux | grep runqueues [14098] VAR 'runqueues' type_id=13725, linkage=global-alloc$ bpftool btf dump file vmlinux | grep 'cpu_stopper' [17592] STRUCT 'cpu_stopper' size=72 vlen=5 [17612] VAR 'cpu_stopper' type_id=17592, linkage=static$ bpftool btf dump file vmlinux | grep ' DATASEC ' [63652] DATASEC '.data..percpu' size=0 vlen=294References:
[1] https://lwn.net/Articles/531148/Signed-off-by Hao Luo <[email protected]>--- btf_encoder.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++ dwarves.c | 6 +++ dwarves.h | 2 + libbtf.c | 86 ++++++++++++++++++++++++++++++++++ libbtf.h | 7 +++ pahole.c | 1 + 6 files changed, 227 insertions(+)btf_encoder.c +125
-0@@ -168,6 +168,27 @@ int btf_encoder__encode()return err; } + +#define HASHADDR__BITS 8 +#define HASHADDR__SIZE (1UL << HASHADDR__BITS) +#define hashaddr__fn (key) hash_64(key, HASHADDR__BITS) + +static struct variable *hashaddr__find_variable (const struct hlist_head hashtable[], +const uint64_t addr) +{ +struct variable *variable; +struct hlist_node *pos; +uint16_t bucket =hashaddr__fn (addr); +const struct hlist_head *head = &hashtable[bucket]; + +hlist_for_each_entry (variable, pos, head, tool_hnode) { +if (variable->ip.addr == addr) +return variable; + } + +return NULL ; +} +int cu__encode_btf (struct cu *cu,int verbose) {bool add_index_type = false;@@ -176,6 +197,13 @@ int cu__encode_btf(struct cu *cu, int verbose)struct function *fn;struct tag *pos;int err =0 ; +GElf_Shdr shdr; +uint32_t percpu_ndx; +struct hlist_head hash_addr[HASHADDR__SIZE ]; +struct variable *var; +bool has_global_var = false; +struct elf_symtab *symtab; +GElf_Sym sym;if (btfe &&strcmp (btfe->filename, cu->filename)) { err =btf_encoder__encode ();@@ -241,6 +269,103 @@ int cu__encode_btf(struct cu *cu, int verbose) } } +/* find ".data..percpu" section's ndx */ +Elf_Scn *percpu_sec =elf_section_by_name (btfe->elf, &btfe->ehdr, &shdr, +".data..percpu" ,NULL ); +if (percpu_sec ==NULL ) + goto out; + + percpu_ndx =elf_ndxscn (percpu_sec); +if (percpu_ndx ==0 ) + goto out; + +/* cache variables' addresses, preparing for searching in symtab. */ +for (core_id =0 ; core_id <HASHADDR__SIZE ; ++core_id) +INIT_HLIST_HEAD (&hash_addr[core_id]); + +cu__for_each_variable (cu, core_id, pos) { + var =tag__variable (pos); +if (var->declaration) +continue ; +/* percpu variables are allocated in global space */ +if (variable__scope (var) !=VSCOPE_GLOBAL ) +continue ; + has_global_var = true; +struct hlist_head *head = &hash_addr[hashaddr__fn (var->ip.addr)]; +hlist_add_head (&var->tool_hnode, head); + } +if (!has_global_var) + goto out; + +/* search within symtab for percpu variables */ + symtab =elf_symtab__new (NULL , btfe->elf, &btfe->ehdr); +if (!symtab) + goto out; + +elf_symtab__for_each_symbol (symtab, core_id, sym) { +uint32_t linkage, type, size, offset; +int32_t btf_var_id, btf_var_secinfo_id; +uint64_t addr; + +/* compare a symbol's shndx to determine if it's a percpu variable */ +if (elf_sym__section (&sym) != percpu_ndx) +continue ; + + addr =elf_sym__value (&sym); +/* +* Store only those symbols that have allocated space in the percpu section. +* This excludes the following three types of symbols: +* +* 1. __ADDRESSABLE(sym), which are forcely emitted as symbols. +* 2. __UNIQUE_ID(prefix), which are introduced to generate unique ids. +* 3. __exitcall(fn), functions which are labeled as exit calls. +* +* In addition, the variables defined using DEFINE_PERCPU_FIRST are +* also not included, which currently includes: +* +* 1. fixed_percpu_data +*/ +if (!addr) +continue ; + var =hashaddr__find_variable (hash_addr, addr); +if (var ==NULL ) +continue ; + +/* add a BTF_KIND_VAR in btfe->types */ + linkage = var->external ?BTF_VAR_GLOBAL_ALLOCATED :BTF_VAR_STATIC ; + type = var->ip.tag.type + type_id_off; + btf_var_id =btf_elf__add_var_type (btfe, type, var->name, linkage); +if (btf_var_id <0 ) { + err =-1 ; +printf ("error: failed to encode variable '%s'\n" , +variable__name (var, cu)); +break ; + } + +/* +* add a BTF_VAR_SECINFO in btfe->percpu_secinfo, which will be added into +* btfe->types later when we add BTF_VAR_DATASEC. +*/ + size =variable__type_size (var, cu); + type = btf_var_id; +/* +* Percpu variables are stored in a segment whose initial address is set to +* 0, so their addresses are also offsets. +* +* See https://lwn.net/Articles/531148/ +*/ + offset = addr; + btf_var_secinfo_id =btf_elf__add_var_secinfo (&btfe->percpu_secinfo, + type, offset, size); +if (btf_var_secinfo_id <0 ) { + err =-1 ; +printf ("error: failed to encode var secinfo '%s'\n" , +variable__name (var, cu)); +break ; + } + } + +elf_symtab__delete (symtab); out:if (err)btf_elf__delete (btfe);dwarves.c +6
-0@@ -978,6 +978,12 @@ const char *variable__type_name(const struct variable *var,return tag !=NULL ?tag__name (tag, cu, bf, len,NULL ) :NULL ; } +uint32_t variable__type_size (const struct variable *var,const struct cu *cu) +{ +const struct tag *tag =cu__type (cu, var->ip.tag.type); +return tag !=NULL ?tag__size (tag, cu) :0 ; +} +void class_member__delete (struct class_member *member,struct cu *cu) {obstack_free (&cu->obstack, member);dwarves.h +2
-0@@ -672,6 +672,8 @@ const char *variable__name(const struct variable *var, const struct cu *cu);const char *variable__type_name (const struct variable *var,const struct cu *cu,char *bf,size_t len); +uint32_t variable__type_size (const struct variable *var,const struct cu *cu); +struct lexblock {struct ip_tag ip;struct list_head tags;libbtf.c +86
-0@@ -46,6 +46,11 @@ struct btf_array_type {struct btf_array array; }; +struct btf_var_type { +struct btf_type type; +struct btf_var var; +}; +uint8_t btf_elf__verbose;uint32_t btf_elf__get32 (struct btf_elf *btfe,uint32_t *p)@@ -613,6 +618,84 @@ int32_t btf_elf__add_func_proto(struct btf_elf *btfe, struct ftype *ftype, uint3return type_id; } +int32_t btf_elf__add_var_type (struct btf_elf *btfe,uint32_t type,uint32_t name_off, +uint32_t linkage) +{ +struct btf_var_type t; + + t.type.name_off = name_off; + t.type.info =BTF_INFO_ENCODE (BTF_KIND_VAR ,0 ,0 ); + t.type.type = type; + + t.var.linkage = linkage; + + ++btfe->type_index; +if (gobuffer__add (&btfe->types, &t.type,sizeof (t)) <0 ) { +btf_elf__log_type (btfe, &t.type, true, true, +"type=%u name=%s Error in adding gobuffer" , + t.type.type,btf_elf__name_in_gobuf (btfe, t.type.name_off)); +return -1 ; + } + +btf_elf__log_type (btfe, &t.type, false, false,"type=%u name=%s" , + t.type.type,btf_elf__name_in_gobuf (btfe, t.type.name_off)); + +return btfe->type_index; +} + +int32_t btf_elf__add_var_secinfo (struct gobuffer *buf,uint32_t type, +uint32_t offset,uint32_t size) +{ +struct btf_var_secinfo si = { + .type = type, + .offset = offset, + .size = size, + }; +return gobuffer__add (buf, &si,sizeof (si)); +} + +extern struct strings *strings; + +int32_t btf_elf__add_datasec_type (struct btf_elf *btfe,const char *section_name, +struct gobuffer *var_secinfo_buf) +{ +struct btf_type type; +size_t sz =gobuffer__size (var_secinfo_buf); +uint16_t nr_var_secinfo = sz /sizeof (struct btf_var_secinfo ); +uint32_t name_off; + +/* +* dwarves doesn't store section names in its string table, +* so we have to add it by ourselves. +*/ + name_off =strings__add (strings, section_name); + + type.name_off = name_off; + type.info =BTF_INFO_ENCODE (BTF_KIND_DATASEC ,0 , nr_var_secinfo); + type.size =0 ; + + ++btfe->type_index; +if (gobuffer__add (&btfe->types, &type,sizeof (type)) <0 ) { +btf_elf__log_type (btfe, &type, true, true, +"name=%s vlen=%u Error in adding datasec" , +btf_elf__name_in_gobuf (btfe, type.name_off), + nr_var_secinfo); +return -1 ; + } +if (gobuffer__add (&btfe->types, var_secinfo_buf->entries, sz) <0 ) { +btf_elf__log_type (btfe, &type, true, true, +"name=%s vlen=%u Error in adding var_secinfo" , +btf_elf__name_in_gobuf (btfe, type.name_off), + nr_var_secinfo); +return -1 ; + } + +btf_elf__log_type (btfe, &type, false, false,"type=datasec name=%s" , +btf_elf__name_in_gobuf (btfe, type.name_off)); + +return btfe->type_index; +} +static int btf_elf__write (const char *filename,struct btf *btf) {GElf_Shdr shdr_mem, *shdr;@@ -727,6 +810,9 @@ int btf_elf__encode(struct btf_elf *btfe, uint8_t flags)if (gobuffer__size (&btfe->types) ==0 )return 0 ; +if (gobuffer__size (&btfe->percpu_secinfo) !=0 ) +btf_elf__add_datasec_type (btfe,".data..percpu" , &btfe->percpu_secinfo); + btfe->size =sizeof (*hdr) + (gobuffer__size (&btfe->types) +gobuffer__size (btfe->strings)); btfe->data =zalloc (btfe->size);libbtf.h +7
-0@@ -22,6 +22,7 @@ struct btf_elf {GElf_Ehdr ehdr;struct gobuffer types;struct gobuffer *strings; +struct gobuffer percpu_secinfo;char *filename;size_t size;int swapped;@@ -55,6 +56,12 @@ int32_t btf_elf__add_enum(struct btf_elf *btf, uint32_t name, uint32_t size,int btf_elf__add_enum_val (struct btf_elf *btf,uint32_t name,int32_t value);int32_t btf_elf__add_func_proto (struct btf_elf *btf,struct ftype *ftype,uint32_t type_id_off); +int32_t btf_elf__add_var_type (struct btf_elf *btfe,uint32_t type,uint32_t name_off, +uint32_t linkage); +int32_t btf_elf__add_var_secinfo (struct gobuffer *buf,uint32_t type, +uint32_t offset,uint32_t size); +int32_t btf_elf__add_datasec_type (struct btf_elf *btfe,const char * section_name, +struct gobuffer *var_secinfo_buf);void btf_elf__set_strings (struct btf_elf *btf,struct gobuffer *strings);int btf_elf__encode (struct btf_elf *btf,uint8_t flags);pahole.c +1
-0@@ -1084,6 +1084,7 @@ static error_t pahole__options_parser(int key, char *arg,case 'i' : find_containers =1 ; class_name = arg;break ;case 'J' : btf_encode =1 ; + conf_load.get_addr_info = true; no_bitfield_type_recode = true;break ;case 'l' : conf.show_first_biggest_size_base_type_member =1 ;break ;case 'M' : conf.show_only_data_members =1 ;break ;Signature · 1 line
2.27.0.rc2.251.g90737beb825-goog
Signature · 1 line
- Arnaldo
Quoted 39 lines · Hao Luo
On SMP systems, the global percpu variables are placed in a speical '.data..percpu' section, which is stored in a segment whose initial address is set to 0, the addresses of per-CPU variables are relative positive addresses [1].
This patch extracts these variables from vmlinux and places them with their type information in BTF. More specifically, when we encode BTF, we find the shndx of the '.data..percpu' section and then traverse the symbol table to find those global objects which are in this section. For each of these objects, we push a
BTF_KIND_VARinto the types buffer, and aBTF_VAR_SECINFOinto another buffer,percpu_secinfo. When all the CUs have finished processing, we push aBTF_KIND_DATASECinto the types buffer, followed by the percpu_secinfo's content, that is, an array ofBTF_VAR_SECINFOs.In a v5.7-rc7 linux kernel, I was able to extract 294 such variables. The space overhead is small.
Testing:
Before:
$ readelf -SW vmlinux | grep BTF [25] .BTF PROGBITS ffffffff821a905c 13a905c 2d2bf8 00 A 0 0 1After:
$ pahole -J vmlinux $ readelf -SW vmlinux | grep BTF [25] .BTF PROGBITS ffffffff821a905c 13a905c 2d5bca 00 A 0 0 1Common percpu vars can be found in the BTF section.
$ bpftool btf dump file vmlinux | grep runqueues [14098] VAR 'runqueues' type_id=13725, linkage=global-alloc$ bpftool btf dump file vmlinux | grep 'cpu_stopper' [17592] STRUCT 'cpu_stopper' size=72 vlen=5 [17612] VAR 'cpu_stopper' type_id=17592, linkage=static
Quoted 7 lines
$ bpftool btf dump file vmlinux | grep ' DATASEC ' [63652] DATASEC '.data..percpu' size=0 vlen=294References:
[1] https://lwn.net/Articles/531148/Signed-off-by Hao Luo <[email protected]>---
It all looks good to me, very minor things below only.
Few questions for you:
1. Have you tried building kernel with these global variables and checking that kernel can self-validate it correctly?
2. It's not explicitly stated, but right now within struct and datasec, all offsets are in a sorted order by offset, can you please check that this is preserved for per-cpu variables withing .data..percpu data section?
3. As an experiment, can you please try to estimate how much data would be to encode all of the variables, not just per-cpu ones? E.g., you can do it very hacky by appending them to single percpu datasec, but for all variables across all data sections. That would give us a good idea if it's feasible to have all kernel global variables available eventually.
Thanks!
Quoted 8 lines
btf_encoder.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++ dwarves.c | 6 +++ dwarves.h | 2 + libbtf.c | 86 ++++++++++++++++++++++++++++++++++ libbtf.h | 7 +++ pahole.c | 1 + 6 files changed, 227 insertions(+)
[...]
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 294
Quoted 9 lines
btf_encoder.c +9
-0+cu__for_each_variable (cu, core_id, pos) { + var =tag__variable (pos); +if (var->declaration) +continue ; +/* percpu variables are allocated in global space */ +if (variable__scope (var) !=VSCOPE_GLOBAL ) +continue ; + has_global_var = true; +struct hlist_head *head = &hash_addr[hashaddr__fn (var->ip.addr)];
variable declarations in C89 should be at the top of the block, separate from statements.
Quoted 25 lines
btf_encoder.c +25
-0+hlist_add_head (&var->tool_hnode, head); + } +if (!has_global_var) + goto out; + +/* search within symtab for percpu variables */ + symtab =elf_symtab__new (NULL , btfe->elf, &btfe->ehdr); +if (!symtab) + goto out; + +elf_symtab__for_each_symbol (symtab, core_id, sym) { +uint32_t linkage, type, size, offset; +int32_t btf_var_id, btf_var_secinfo_id; +uint64_t addr; + +/* compare a symbol's shndx to determine if it's a percpu variable */ +if (elf_sym__section (&sym) != percpu_ndx) +continue ; + + addr =elf_sym__value (&sym); +/* +* Store only those symbols that have allocated space in the percpu section. +* This excludes the following three types of symbols: +* +* 1. __ADDRESSABLE(sym), which are forcely emitted as symbols.
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 329
Quoted 10 lines
btf_encoder.c +10
-0+* 2. __UNIQUE_ID(prefix), which are introduced to generate unique ids. +* 3. __exitcall(fn), functions which are labeled as exit calls. +* +* In addition, the variables defined using DEFINE_PERCPU_FIRST are +* also not included, which currently includes: +* +* 1. fixed_percpu_data +*/ +if (!addr) +continue ;
offset == 0 is always invalid for per-cpu variables?
Quoted 16 lines
btf_encoder.c +16
-0+ var =hashaddr__find_variable (hash_addr, addr); +if (var ==NULL ) +continue ; + +/* add a BTF_KIND_VAR in btfe->types */ + linkage = var->external ?BTF_VAR_GLOBAL_ALLOCATED :BTF_VAR_STATIC ; + type = var->ip.tag.type + type_id_off; + btf_var_id =btf_elf__add_var_type (btfe, type, var->name, linkage); +if (btf_var_id <0 ) { + err =-1 ; +printf ("error: failed to encode variable '%s'\n" , +variable__name (var, cu)); +break ; + } + +/*
[...]
libbtf.c int btf_elf__encode(struct btf_elf *btfe, uint8_t flags) · line 814
Quoted 9 lines
static int
btf_elf__write(const char *filename, struct btf *btf){ GElf_Shdr shdr_mem, *shdr;libbtf.c +2
-0@@ -727,6 +810,9 @@ int btf_elf__encode(struct btf_elf *btfe, uint8_t flags)if (gobuffer__size (&btfe->types) ==0 )return 0 ; +if (gobuffer__size (&btfe->percpu_secinfo) !=0 ) +btf_elf__add_datasec_type (btfe,".data..percpu" , &btfe->percpu_secinfo);
would probably be better to extract ".data..percpu" into a constant and use it everywhere
Quoted 4 lines
libbtf.c +1
-0+ btfe->size =sizeof (*hdr) + (gobuffer__size (&btfe->types) +gobuffer__size (btfe->strings)); btfe->data =zalloc (btfe->size);
[...]
A message that is not in the archive (sent off-list or not yet received): CA+khW7iBTxjAMbbTNk6XyTJzuBK5C-VQ6Z6cz_2nHSn5+D2-MQ@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): CA+khW7iBTxjAMbbTNk6XyTJzuBK5C-VQ6Z6cz_2nHSn5+D2-MQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Quoted 53 lines · Hao Luo
Quoted 49 lines · Andrii Nakryiko
Quoted 46 lines · Hao Luo
On SMP systems, the global percpu variables are placed in a speical '.data..percpu' section, which is stored in a segment whose initial address is set to 0, the addresses of per-CPU variables are relative positive addresses [1].
This patch extracts these variables from vmlinux and places them with their type information in BTF. More specifically, when we encode BTF, we find the shndx of the '.data..percpu' section and then traverse the symbol table to find those global objects which are in this section. For each of these objects, we push a
BTF_KIND_VARinto the types buffer, and aBTF_VAR_SECINFOinto another buffer,percpu_secinfo. When all the CUs have finished processing, we push aBTF_KIND_DATASECinto the types buffer, followed by the percpu_secinfo's content, that is, an array ofBTF_VAR_SECINFOs.In a v5.7-rc7 linux kernel, I was able to extract 294 such variables. The space overhead is small.
Testing:
Before:
$ readelf -SW vmlinux | grep BTF [25] .BTF PROGBITS ffffffff821a905c 13a905c 2d2bf8 00 A 0 0 1After:
$ pahole -J vmlinux $ readelf -SW vmlinux | grep BTF [25] .BTF PROGBITS ffffffff821a905c 13a905c 2d5bca 00 A 0 0 1Common percpu vars can be found in the BTF section.
$ bpftool btf dump file vmlinux | grep runqueues [14098] VAR 'runqueues' type_id=13725, linkage=global-alloc$ bpftool btf dump file vmlinux | grep 'cpu_stopper' [17592] STRUCT 'cpu_stopper' size=72 vlen=5 [17612] VAR 'cpu_stopper' type_id=17592, linkage=static$ bpftool btf dump file vmlinux | grep ' DATASEC ' [63652] DATASEC '.data..percpu' size=0 vlen=294References:
[1] https://lwn.net/Articles/531148/Signed-off-by Hao Luo <[email protected]>---
Quoted 8 lines
Quoted 5 lines
It all looks good to me, very minor things below only.
Few questions for you:
1. Have you tried building kernel with these global variables and checking that kernel can self-validate it correctly?Do you mean running selftests? I haven't run selftests but do have built and booted, it looked good.
Well yeah, anything that relies on kernel to recognize its own BTF properly (so tp_btf or fentry/fexit programs, for instance).
Quoted 9 lines
Quoted 6 lines
2. It's not explicitly stated, but right now within struct and datasec, all offsets are in a sorted order by offset, can you please check that this is preserved for per-cpu variables withing .data..percpu data section?
No problem, I can add a qsort before copying all
var_secinfos. Right now it seems it doesn't follow any particular order.
Sounds good, thanks.
Quoted 11 lines
Quoted 8 lines
3. As an experiment, can you please try to estimate how much data would be to encode all of the variables, not just per-cpu ones? E.g., you can do it very hacky by appending them to single percpu datasec, but for all variables across all data sections. That would give us a good idea if it's feasible to have all kernel global variables available eventually.
I tried encoding all the global object-type symbols (including static vars and globally allocated vars). There are a total of 27516 such symbols. The .BTF size is
0x41499e, in comparison, it was0x2d2c10. The space increase is around 1.3Mb. The build time is roughly the same. So I think this is totally affordable.
I see, that's quite a bump, but not unreasonable. Let's add it later as needed, though.
Quoted 77 lines
I think 4 sections are of interest: .data..percpu, .data, .rodata and .bss. I can encode the rest of the sections the same way as .data..percpu. But, compared to .data..percpu, the other three contain a lot more unconventional symbols mixed with some useful variables.
Maybe, add them in future patches upon request, if this change looks good? Any comments?
Quoted 25 lines
Thanks!
Quoted 8 lines
btf_encoder.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++ dwarves.c | 6 +++ dwarves.h | 2 + libbtf.c | 86 ++++++++++++++++++++++++++++++++++ libbtf.h | 7 +++ pahole.c | 1 + 6 files changed, 227 insertions(+)[...]
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 294
Quoted 9 lines
btf_encoder.c +9
-0+cu__for_each_variable (cu, core_id, pos) { + var =tag__variable (pos); +if (var->declaration) +continue ; +/* percpu variables are allocated in global space */ +if (variable__scope (var) !=VSCOPE_GLOBAL ) +continue ; + has_global_var = true; +struct hlist_head *head = &hash_addr[hashaddr__fn (var->ip.addr)];Quoted 2 lines
variable declarations in C89 should be at the top of the block, separate from statements.
Ack. Will fix.
Quoted 31 lines
Quoted 31 lines
btf_encoder.c +29
-0+hlist_add_head (&var->tool_hnode, head); + } +if (!has_global_var) + goto out; + +/* search within symtab for percpu variables */ + symtab =elf_symtab__new (NULL , btfe->elf, &btfe->ehdr); +if (!symtab) + goto out; + +elf_symtab__for_each_symbol (symtab, core_id, sym) { +uint32_t linkage, type, size, offset; +int32_t btf_var_id, btf_var_secinfo_id; +uint64_t addr; + +/* compare a symbol's shndx to determine if it's a percpu variable */ +if (elf_sym__section (&sym) != percpu_ndx) +continue ; + + addr =elf_sym__value (&sym); +/* +* Store only those symbols that have allocated space in the percpu section. +* This excludes the following three types of symbols: +* +* 1. __ADDRESSABLE(sym), which are forcely emitted as symbols. +* 2. __UNIQUE_ID(prefix), which are introduced to generate unique ids. +* 3. __exitcall(fn), functions which are labeled as exit calls. +* +* In addition, the variables defined using DEFINE_PERCPU_FIRST are Quoted 8 lines
btf_encoder.c int cu__encode_btf(struct cu *cu, int verbose) · line 329
Quoted 6 lines
btf_encoder.c +6
-0+* also not included, which currently includes: +* +* 1. fixed_percpu_data +*/ +if (!addr) +continue ;offset == 0 is always invalid for per-cpu variables?
Quoted 1 line
On
x86_64, the first area is always forirq_stack. On other architectures, this seems not necessary as I didn't see anywhere usedDEFINE_PERCPU_FIRSTlikex86_64. But I don't have a non-x86 64 machine to check right now.
I was asking because it seemed arbitrary to ignore one symbol that happened to be at offset 0.
Quoted 46 lines
Quoted 29 lines
Quoted 19 lines
btf_encoder.c +16
-0+ var =hashaddr__find_variable (hash_addr, addr); +if (var ==NULL ) +continue ; + +/* add a BTF_KIND_VAR in btfe->types */ + linkage = var->external ?BTF_VAR_GLOBAL_ALLOCATED :BTF_VAR_STATIC ; + type = var->ip.tag.type + type_id_off; + btf_var_id =btf_elf__add_var_type (btfe, type, var->name, linkage); +if (btf_var_id <0 ) { + err =-1 ; +printf ("error: failed to encode variable '%s'\n" , +variable__name (var, cu)); +break ; + } + +/* [...]
Quoted 7 lines
static int
btf_elf__write(const char *filename, struct btf *btf){ GElf_Shdr shdr_mem, *shdr;libbtf.c +0
-0@@ -727,6 +810,9 @@ int btf_elf__encode(struct btf_elf *btfe, uint8_t flags)if (gobuffer__size (&btfe->types) ==0 )return 0 ;Quoted 5 lines
libbtf.c int btf_elf__encode(struct btf_elf *btfe, uint8_t flags) · line 814
Quoted 2 lines
libbtf.c +2
-0+if (gobuffer__size (&btfe->percpu_secinfo) !=0 ) +btf_elf__add_datasec_type (btfe,".data..percpu" , &btfe->percpu_secinfo);would probably be better to extract ".data..percpu" into a constant and use it everywhere
Indeed. I'll add that.
Quoted 8 lines
Quoted 6 lines
libbtf.c +1
-0+ btfe->size =sizeof (*hdr) + (gobuffer__size (&btfe->types) +gobuffer__size (btfe->strings)); btfe->data =zalloc (btfe->size);[...]