[PATCH v14 22/23] perf machine: Hold machines->lock for remaining guests rbtree accesses
From: Ian Rogers
Date: Tue Nov 17 2026 - 13:51:26 EST
Commit 1324aa051bed ("perf machine: Protect machines->guests rbtree with
a rw_semaphore") added machines->lock to protect machines->guests across
util/machine.c, but direct traversals and teardown of machines.guests in
util/aslr.c, util/build-id.c, and util/session.c were left unlocked.
Acquire down_read(&machines->lock) around the guest rbtree traversals in
aslr_tool__destroy_machines_priv(), perf_session__write_buildid_table(),
machines__for_each_dso(), perf_session__read_build_ids(),
perf_session__fprintf(), and perf_session__dsos_hit_all(), and hold
down_write(&aslr->machines.lock) when erasing remaining guests in
aslr_tool__delete().
Fixes: 1324aa051bed ("perf machine: Protect machines->guests rbtree with a rw_semaphore")
Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
---
tools/perf/util/aslr.c | 4 ++++
tools/perf/util/build-id.c | 8 ++++++++
tools/perf/util/session.c | 8 ++++++--
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/aslr.c b/tools/perf/util/aslr.c
index e365f807b021..f9ecb6d3f5fb 100644
--- a/tools/perf/util/aslr.c
+++ b/tools/perf/util/aslr.c
@@ -243,11 +243,13 @@ static void aslr_tool__destroy_machines_priv(struct machines *machines)
struct rb_node *nd;
aslr_tool__free_machine_priv(&machines->host);
+ down_read(&machines->lock);
for (nd = rb_first_cached(&machines->guests); nd; nd = rb_next(nd)) {
struct machine *machine = rb_entry(nd, struct machine, rb_node);
aslr_tool__free_machine_priv(machine);
}
+ up_read(&machines->lock);
}
static u64 aslr_tool__findnew_mapping(struct aslr_tool *aslr,
@@ -1363,12 +1365,14 @@ void aslr_tool__delete(struct perf_tool *tool)
aslr_tool__destroy_machines_priv(&aslr->machines);
machines__destroy_kernel_maps(&aslr->machines);
+ down_write(&aslr->machines.lock);
while ((nd = rb_first_cached(&aslr->machines.guests)) != NULL) {
struct machine *machine = rb_entry(nd, struct machine, rb_node);
rb_erase_cached(nd, &aslr->machines.guests);
machine__delete(machine);
}
+ up_write(&aslr->machines.lock);
machines__exit(&aslr->machines);
free(aslr);
diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
index 02233ef0eaff..c792448cc344 100644
--- a/tools/perf/util/build-id.c
+++ b/tools/perf/util/build-id.c
@@ -374,13 +374,16 @@ int perf_session__write_buildid_table(struct perf_session *session,
if (err)
return err;
+ down_read(&session->machines.lock);
for (nd = rb_first_cached(&session->machines.guests); nd;
nd = rb_next(nd)) {
struct machine *pos = rb_entry(nd, struct machine, rb_node);
+
err = machine__write_buildid_table(pos, fd);
if (err)
break;
}
+ up_read(&session->machines.lock);
return err;
}
@@ -926,12 +929,14 @@ machines__for_each_dso(struct machines *machines, machine__dso_t fn, void *priv)
int ret = machine__for_each_dso(&machines->host, fn, priv);
struct rb_node *nd;
+ down_read(&machines->lock);
for (nd = rb_first_cached(&machines->guests); nd;
nd = rb_next(nd)) {
struct machine *pos = rb_entry(nd, struct machine, rb_node);
ret |= machine__for_each_dso(pos, fn, priv);
}
+ up_read(&machines->lock);
return ret ? -1 : 0;
}
@@ -962,11 +967,14 @@ bool perf_session__read_build_ids(struct perf_session *session, bool with_hits)
struct rb_node *nd;
bool ret = machine__read_build_ids(&session->machines.host, with_hits);
+ down_read(&session->machines.lock);
for (nd = rb_first_cached(&session->machines.guests); nd;
nd = rb_next(nd)) {
struct machine *pos = rb_entry(nd, struct machine, rb_node);
+
ret |= machine__read_build_ids(pos, with_hits);
}
+ up_read(&session->machines.lock);
return ret;
}
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index a58b4fe44b62..4e11eabbbe6f 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -3965,11 +3965,13 @@ size_t perf_session__fprintf(struct perf_session *session, FILE *fp)
{
size_t ret = machine__fprintf(&session->machines.host, fp);
+ down_read(&session->machines.lock);
for (struct rb_node *nd = rb_first_cached(&session->machines.guests); nd; nd = rb_next(nd)) {
struct machine *pos = rb_entry(nd, struct machine, rb_node);
ret += machine__fprintf(pos, fp);
}
+ up_read(&session->machines.lock);
return ret;
}
@@ -4181,16 +4183,18 @@ int perf_session__dsos_hit_all(struct perf_session *session)
if (err)
return err;
+ down_read(&session->machines.lock);
for (nd = rb_first_cached(&session->machines.guests); nd;
nd = rb_next(nd)) {
struct machine *pos = rb_entry(nd, struct machine, rb_node);
err = machine__hit_all_dsos(pos);
if (err)
- return err;
+ break;
}
+ up_read(&session->machines.lock);
- return 0;
+ return err;
}
struct perf_env *perf_session__env(struct perf_session *session)
--
2.56.1.703.gf848ed807c-goog