[PATCH v4 10/23] perf db-export: Store symbol database IDs in a hashmap

From: Ian Rogers

Date: Fri Nov 13 2026 - 13:10:55 EST


Currently, db-export reserves sizeof(u64) bytes ahead of every allocated
struct symbol via symbol_conf.priv_size and accesses the database ID at
a negative offset via symbol__priv(). This adds 8 bytes to every loaded
symbol across all DSOs even when only a subset of symbols are exported,
and relies on negative-offset pointer arithmetic ahead of struct symbol.

Store exported symbol database IDs in an on-demand sym_db_ids hashmap in
struct db_export keyed by struct dso_symbol * instead of using
symbol__priv(), and retain exported struct dso references in db_export
until db_export__exit() so exported DSO and symbol database IDs remain
valid across the export session.

Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
---
tools/perf/util/db-export.c | 126 ++++++++++++++++++++++++++++++++----
tools/perf/util/db-export.h | 16 +++++
2 files changed, 129 insertions(+), 13 deletions(-)

diff --git a/tools/perf/util/db-export.c b/tools/perf/util/db-export.c
index 6a5db62cd58b..e7b807e968cf 100644
--- a/tools/perf/util/db-export.c
+++ b/tools/perf/util/db-export.c
@@ -4,21 +4,46 @@
* Copyright (c) 2014, Intel Corporation.
*/

+#include "db-export.h"
+
#include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
#include <stdlib.h>
+#include <string.h>
+
+#include <linux/err.h>
+#include <linux/zalloc.h>

+#include "call-path.h"
+#include "callchain.h"
+#include "comm.h"
#include "dso.h"
+#include "event.h"
#include "evsel.h"
+#include "hashmap.h"
#include "machine.h"
-#include "thread.h"
-#include "comm.h"
-#include "symbol.h"
#include "map.h"
-#include "event.h"
+#include "map_symbol.h"
+#include "symbol.h"
#include "thread-stack.h"
-#include "callchain.h"
-#include "call-path.h"
-#include "db-export.h"
+#include "thread.h"
+
+static size_t dso_sym_hash(long key, void *ctx __maybe_unused)
+{
+ const struct dso_symbol *ds = (const struct dso_symbol *)key;
+ const void *dso_ptr = ds->dso ? RC_CHK_ACCESS(ds->dso) : NULL;
+
+ return (size_t)dso_ptr ^ (size_t)ds->sym;
+}
+
+static bool dso_sym_equal(long key1, long key2, void *ctx __maybe_unused)
+{
+ const struct dso_symbol *ds1 = (const struct dso_symbol *)key1;
+ const struct dso_symbol *ds2 = (const struct dso_symbol *)key2;
+
+ return ds1->sym == ds2->sym && RC_CHK_EQUAL(ds1->dso, ds2->dso);
+}

int db_export__init(struct db_export *dbe)
{
@@ -28,6 +53,26 @@ int db_export__init(struct db_export *dbe)

void db_export__exit(struct db_export *dbe)
{
+ if (dbe->sym_db_ids) {
+ struct hashmap_entry *entry;
+ size_t bkt;
+
+ hashmap__for_each_entry(dbe->sym_db_ids, entry, bkt) {
+ struct dso_symbol *key = (void *)entry->pkey;
+
+ dso_symbol__exit(key);
+ free(key);
+ }
+ hashmap__free(dbe->sym_db_ids);
+ dbe->sym_db_ids = NULL;
+ }
+ for (size_t i = 0; i < dbe->dsos_cnt; i++) {
+ dso__set_db_id(dbe->dsos[i], 0);
+ dso__put(dbe->dsos[i]);
+ }
+ zfree(&dbe->dsos);
+ dbe->dsos_cnt = 0;
+ dbe->dsos_alloc = 0;
call_return_processor__free(dbe->crp);
dbe->crp = NULL;
}
@@ -148,6 +193,18 @@ int db_export__dso(struct db_export *dbe, struct dso *dso,
if (dso__db_id(dso))
return 0;

+ if (dbe->dsos_cnt == dbe->dsos_alloc) {
+ size_t new_alloc = dbe->dsos_alloc ? dbe->dsos_alloc * 2 : 16;
+ struct dso **new_dsos = realloc(dbe->dsos,
+ new_alloc * sizeof(*new_dsos));
+
+ if (!new_dsos)
+ return -ENOMEM;
+ dbe->dsos = new_dsos;
+ dbe->dsos_alloc = new_alloc;
+ }
+
+ dbe->dsos[dbe->dsos_cnt++] = dso__get(dso);
dso__set_db_id(dso, ++dbe->dso_last_db_id);

if (dbe->export_dso)
@@ -156,15 +213,60 @@ int db_export__dso(struct db_export *dbe, struct dso *dso,
return 0;
}

+/*
+ * Return the database export ID assigned to (@dso, @sym) in @dbe->sym_db_ids,
+ * or 0 if @sym has not been exported yet.
+ */
+u64 db_export__symbol_db_id(struct db_export *dbe, struct dso *dso,
+ struct symbol *sym)
+{
+ struct dso_symbol key = {
+ .dso = dso,
+ .sym = sym,
+ };
+ long db_id = 0;
+
+ if (sym && dbe->sym_db_ids)
+ hashmap__find(dbe->sym_db_ids, &key, &db_id);
+ return (u64)db_id;
+}
+
int db_export__symbol(struct db_export *dbe, struct symbol *sym,
struct dso *dso)
{
- u64 *sym_db_id = symbol__priv(sym);
+ struct dso_symbol src = {
+ .dso = dso,
+ .sym = sym,
+ };
+ struct dso_symbol *key;
+ long db_id;

- if (*sym_db_id)
+ if (db_export__symbol_db_id(dbe, dso, sym))
return 0;

- *sym_db_id = ++dbe->symbol_last_db_id;
+ if (!dbe->sym_db_ids) {
+ dbe->sym_db_ids =
+ hashmap__new(dso_sym_hash, dso_sym_equal, NULL);
+ if (IS_ERR(dbe->sym_db_ids)) {
+ int err = PTR_ERR(dbe->sym_db_ids);
+
+ dbe->sym_db_ids = NULL;
+ return err;
+ }
+ }
+
+ key = malloc(sizeof(*key));
+ if (!key)
+ return -ENOMEM;
+
+ dso_symbol__copy(key, &src);
+ db_id = dbe->symbol_last_db_id + 1;
+ if (hashmap__add(dbe->sym_db_ids, key, db_id)) {
+ dso_symbol__exit(key);
+ free(key);
+ return -ENOMEM;
+ }
+ dbe->symbol_last_db_id = db_id;

if (dbe->export_symbol)
return dbe->export_symbol(dbe, sym, dso);
@@ -192,12 +294,10 @@ static int db_ids_from_al(struct db_export *dbe, struct addr_location *al,
}

if (al->sym) {
- u64 *db_id = symbol__priv(al->sym);
-
err = db_export__symbol(dbe, al->sym, dso);
if (err)
return err;
- *sym_db_id = *db_id;
+ *sym_db_id = db_export__symbol_db_id(dbe, dso, al->sym);
*offset = al->addr - al->sym->start;
}
}
diff --git a/tools/perf/util/db-export.h b/tools/perf/util/db-export.h
index 1abbfd398e3a..c56037644d62 100644
--- a/tools/perf/util/db-export.h
+++ b/tools/perf/util/db-export.h
@@ -21,6 +21,8 @@ struct call_return_processor;
struct call_path_root;
struct call_path;
struct call_return;
+struct hashmap;
+struct symbol;

struct export_sample {
union perf_event *event;
@@ -63,6 +65,18 @@ struct db_export {
u64 th_in_id, u64 comm_in_id, int flags);
struct call_return_processor *crp;
struct call_path_root *cpr;
+ /**
+ * @sym_db_ids: Hashmap mapping heap-allocated struct dso_symbol * keys
+ * to their exported 64-bit database IDs, pinning each symbol's DSO.
+ */
+ struct hashmap *sym_db_ids;
+ /**
+ * @dsos: Exported DSOs retained so dso__db_id(dso) remains valid until
+ * db_export__exit().
+ */
+ struct dso **dsos;
+ size_t dsos_cnt;
+ size_t dsos_alloc;
u64 evsel_last_db_id;
u64 machine_last_db_id;
u64 thread_last_db_id;
@@ -90,6 +104,8 @@ int db_export__comm_thread(struct db_export *dbe, struct comm *comm,
struct thread *thread);
int db_export__dso(struct db_export *dbe, struct dso *dso,
struct machine *machine);
+u64 db_export__symbol_db_id(struct db_export *dbe, struct dso *dso,
+ struct symbol *sym);
int db_export__symbol(struct db_export *dbe, struct symbol *sym,
struct dso *dso);
int db_export__branch_type(struct db_export *dbe, u32 branch_type,
--
2.56.1.703.gf848ed807c-goog