diff options
| author | Ian Rogers <irogers@google.com> | 2025-06-24 12:03:24 -0700 |
|---|---|---|
| committer | Namhyung Kim <namhyung@kernel.org> | 2025-07-02 19:05:27 -0700 |
| commit | e793e2c0f188fb7a7998224f14241c0d87df5249 (patch) | |
| tree | cbc1080a3b827151f39bca664a1c74c363c728b1 /tools/perf | |
| parent | perf hwmon_pmu: Hold path rather than fd (diff) | |
| download | linux-e793e2c0f188fb7a7998224f14241c0d87df5249.tar.gz linux-e793e2c0f188fb7a7998224f14241c0d87df5249.zip | |
perf dso: With ref count checking, avoid dso_data holding dso live
With the dso_data embedded in a dso there is a reference counted
pointer to the dso rather than using container_of with reference count
checking. This data can hold the dso live meaning that no dso__put
ever deletes it. Add a check for this case and close the dso_data when
it happens. There isn't an infinite loop as the dso_data clears the
file descriptor prior to putting on the dso.
Signed-off-by: Ian Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20250624190326.2038704-5-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/dso.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 057fcf4225ac..c6c1637e098c 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -1612,6 +1612,10 @@ struct dso *dso__get(struct dso *dso) void dso__put(struct dso *dso) { +#ifdef REFCNT_CHECKING + if (dso && dso__data(dso) && refcount_read(&RC_CHK_ACCESS(dso)->refcnt) == 2) + dso__data_close(dso); +#endif if (dso && refcount_dec_and_test(&RC_CHK_ACCESS(dso)->refcnt)) dso__delete(dso); else |