This patch added an option "merge_cus", which will permit
to merge all debug info cu's into one pahole cu.
For vmlinux built with clang thin-lto or lto, there exist
cross cu type references. For example, you could have
compile unit 1:
tag 10: type A
compile unit 2:
...
refer to type A (tag 10 in compile unit 1)
I only checked a few but have seen type A may be a simple type
like "unsigned char" or a complex type like an array of base types.
There are two different ways to resolve this issue:
(1). merge all compile units as one pahole cu so tags/types
can be resolved easily, or
(2). try to do on-demand type traversal in other debuginfo cu's
when we do die_process().
The method (2) is much more complicated so I picked method (1).
An option "merge_cus" is added to permit such an operation.
Merging cu's will create a single cu with lots of types, tags
and functions. For example with clang thin-lto built vmlinux,
I saw 9M entries in types table, 5.2M in tags table. The
below are pahole wallclock time for different hashbits:
command line: time pahole -J --merge_cus vmlinux
# of hashbits wallclock time in seconds
15 460
16 255
17 131
18 97
19 75
20 69
21 64
22 62
23 58
24 64
Note that the number of hashbits 24 makes performance worse
than 23. The reason could be that 23 hashbits can cover 8M
buckets (close to 9M for the number of entries in types table).
Higher number of hash bits allocates more memory and becomes
less cache efficient compared to 23 hashbits.
This patch picks # of hashbits 21 as the starting value
and will try to allocate memory based on that, if memory
allocation fails, we will go with less hashbits until
we reach hashbits 15 which is the default for
non merge-cu case.
Signed-off-by: Yonghong Song <yhs@xxxxxx>
---
dwarf_loader.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++
dwarves.h | 2 ++
pahole.c | 8 +++++
3 files changed, 100 insertions(+)
diff --git a/dwarf_loader.c b/dwarf_loader.c
index dc66df0..ed4f0da 100644
--- a/dwarf_loader.c
+++ b/dwarf_loader.c
@@ -51,6 +51,7 @@ struct strings *strings;
#endif
static uint32_t hashtags__bits = 15;
+static uint32_t max_hashtags__bits = 21;
uint32_t hashtags__fn(Dwarf_Off key)
{
@@ -2484,6 +2485,85 @@ static int cus__load_debug_types(struct cus *cus, struct conf_load *conf,
return 0;
}
+static int cus__merge_and_process_cu(struct cus *cus, struct conf_load *conf,
+ Dwfl_Module *mod, Dwarf *dw, Elf *elf,
+ const char *filename,
+ const unsigned char *build_id,
+ int build_id_len,
+ struct dwarf_cu *type_dcu)
+{
+ uint8_t pointer_size, offset_size;
+ struct dwarf_cu *dcu = NULL;
+ Dwarf_Off off = 0, noff;
+ struct cu *cu = NULL;
+ size_t cuhl;
+
+ /* Merge all cus */
+ while (dwarf_nextcu(dw, off, &noff, &cuhl, NULL, &pointer_size,
+ &offset_size) == 0) {
+ Dwarf_Die die_mem;
+ Dwarf_Die *cu_die = dwarf_offdie(dw, off + cuhl, &die_mem);
+
+ if (cu_die == NULL)
+ break;
+
+ if (cu == NULL) {
+ cu = cu__new("", pointer_size, build_id, build_id_len,
+ filename);
+ if (cu == NULL || cu__set_common(cu, conf, mod, elf) != 0)
+ return DWARF_CB_ABORT;
+
+ dcu = malloc(sizeof(struct dwarf_cu));
+ if (dcu == NULL)
+ return DWARF_CB_ABORT;
+
+ /* Merged cu tends to need a lot more memory.
+ * Let us start with max_hashtags__bits and
+ * go down to find a proper hashtag bit value.
+ */
+ uint32_t default_hbits = hashtags__bits;
+ for (hashtags__bits = max_hashtags__bits;
+ hashtags__bits >= default_hbits;
+ hashtags__bits--) {
+ if (dwarf_cu__init(dcu) == 0)
+ break;
+ }
+ if (hashtags__bits < default_hbits)
+ return DWARF_CB_ABORT;
+
+ dcu->cu = cu;
+ dcu->type_unit = type_dcu;
+ cu->priv = dcu;
+ cu->dfops = &dwarf__ops;
+ cu->language = attr_numeric(cu_die, DW_AT_language);
+ }
+
+ const uint16_t tag = dwarf_tag(cu_die);
+ if (tag != DW_TAG_compile_unit && tag != DW_TAG_type_unit) {
+ fprintf(stderr, "%s: DW_TAG_compile_unit or DW_TAG_type_unit expected got %s!\n",
+ __FUNCTION__, dwarf_tag_name(tag));
+ return DWARF_CB_ABORT;
+ }
+
+ Dwarf_Die child;
+ if (dwarf_child(cu_die, &child) == 0) {
+ if (die__process_unit(&child, cu) != 0)
+ return DWARF_CB_ABORT;
+ }
+
+ off = noff;
+ }
+
+ /* process merged cu */
+ if (cu__recode_dwarf_types(cu) != LSK__KEEPIT)
+ return DWARF_CB_ABORT;
+ if (finalize_cu_immediately(cus, cu, dcu, conf)
+ == LSK__STOP_LOADING)
+ return DWARF_CB_ABORT;
+
+ return 0;
+}
+
static int cus__load_module(struct cus *cus, struct conf_load *conf,
Dwfl_Module *mod, Dwarf *dw, Elf *elf,
const char *filename)
@@ -2518,6 +2598,15 @@ static int cus__load_module(struct cus *cus, struct conf_load *conf,
}
}
+ if (conf->merge_cus == true) {
+ res = cus__merge_and_process_cu(cus, conf, mod, dw, elf, filename,
+ build_id, build_id_len,
+ type_cu ? &type_dcu : NULL);
+ if (res != 0)
+ return res;
+ goto out;
+ }
+
while (dwarf_nextcu(dw, off, &noff, &cuhl, NULL, &pointer_size,
&offset_size) == 0) {
Dwarf_Die die_mem;
@@ -2557,6 +2646,7 @@ static int cus__load_module(struct cus *cus, struct conf_load *conf,
off = noff;
}
+out:
if (type_lsk == LSK__DELETE)
cu__delete(type_cu);
diff --git a/dwarves.h b/dwarves.h
index 98caf1a..29b518d 100644
--- a/dwarves.h
+++ b/dwarves.h
@@ -40,6 +40,7 @@ struct conf_fprintf;
* @extra_dbg_info - keep original debugging format extra info
* (e.g. DWARF's decl_{line,file}, id, etc)
* @fixup_silly_bitfields - Fixup silly things such as "int foo:32;"
+ * @merge_cus - Merge compile units except possible types_cu
* @get_addr_info - wheter to load DW_AT_location and other addr info
*/
struct conf_load {
@@ -50,6 +51,7 @@ struct conf_load {
bool extra_dbg_info;
bool fixup_silly_bitfields;
bool get_addr_info;
+ bool merge_cus;
struct conf_fprintf *conf_fprintf;
};
diff --git a/pahole.c b/pahole.c
index df6aa83..29fbe1d 100644
--- a/pahole.c
+++ b/pahole.c
@@ -827,6 +827,7 @@ ARGP_PROGRAM_VERSION_HOOK_DEF = dwarves_print_version;
#define ARGP_btf_base 321
#define ARGP_btf_gen_floats 322
#define ARGP_btf_gen_all 323
+#define ARGP_merge_cus 324
static const struct argp_option pahole__options[] = {
{
@@ -1151,6 +1152,11 @@ static const struct argp_option pahole__options[] = {
.key = ARGP_numeric_version,
.doc = "Print a numeric version, i.e. 119 instead of v1.19"
},
+ {
+ .name = "merge_cus",
+ .key = ARGP_merge_cus,
+ .doc = "Merge all cus (except possible types_cu)"
+ },
{
.name = NULL,
}
@@ -1270,6 +1276,8 @@ static error_t pahole__options_parser(int key, char *arg,
btf_gen_floats = true; break;
case ARGP_btf_gen_all:
btf_gen_floats = true; break;
+ case ARGP_merge_cus:
+ conf_load.merge_cus = true; break;
default:
return ARGP_ERR_UNKNOWN;
}
--
2.30.2
