Skip to contentSkip to conversation

perf trace: Fix some more memory leaks

PATCH Applied Ian Rogers 4 participants 6 messages Apr 1, 2025 – May 9, 2025 perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/1 perf trace: Fix some more memory leaks

The files.max is the maximum valid fd in the files array and so freeing the values needs to be inclusive of the max value.

Add missing thread__put of the found parent thread in thread__e_machine.

---
 tools/perf/builtin-trace.c | 3 ++-
 tools/perf/util/thread.c   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
tools/perf/builtin-trace.c +2 -1
index 58a2ce3ff2db..c02ea4e8b270 100644
@@ -1657,7 +1657,7 @@ static const size_t trace__entry_str_size = 2048;
 
 static void thread_trace__free_files(struct thread_trace *ttrace)
 {
-	for (int i = 0; i < ttrace->files.max; ++i) {
+	for (int i = 0; i <= ttrace->files.max; ++i) {
 		struct file *file = ttrace->files.table + i;
 		zfree(&file->pathname);
 	}
@@ -1703,6 +1703,7 @@ static int trace__set_fd_pathname(struct thread *thread, int fd, const char *pat
 
 	if (file != NULL) {
 		struct stat st;
+
 		if (stat(pathname, &st) == 0)
 			file->dev_maj = major(st.st_rdev);
 		file->pathname = strdup(pathname);
tools/perf/util/thread.c +1 -0
index 89585f53c1d5..415c0e5d1e75 100644
@@ -471,6 +471,7 @@ uint16_t thread__e_machine(struct thread *thread, struct machine *machine)
 
 		if (parent) {
 			e_machine = thread__e_machine(parent, machine);
+			thread__put(parent);
 			thread__set_e_machine(thread, e_machine);
 			return e_machine;
 		}
Signature · 1 line
2.49.0.504.g3bcea36a83-goog
maintainer Applied
#2 lore raw
In reply to Ian Rogers
Quoted 5 lines · Ian Rogers

The files.max is the maximum valid fd in the files array and so freeing the values needs to be inclusive of the max value.

Add missing thread__put of the found parent thread in thread__e_machine.

Split it into:

⬢ [acme@toolbx perf-tools-next]$ git log --oneline -2
7900938850645ed4 (HEAD -> perf-tools-next) perf trace: Add missing thread__put() in thread__e_machine() 8830091383b03498 perf trace: Free the files.max entry in files->table
⬢ [acme@toolbx perf-tools-next]$

So that git --oneline is more descriptive, etc.

Thanks, applied to perf-tools-next,

- Arnaldo

Quoted 42 lines
---
 tools/perf/builtin-trace.c | 3 ++-
 tools/perf/util/thread.c   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
tools/perf/builtin-trace.c +2 -1
index 58a2ce3ff2db..c02ea4e8b270 100644
@@ -1657,7 +1657,7 @@ static const size_t trace__entry_str_size = 2048;
 
 static void thread_trace__free_files(struct thread_trace *ttrace)
 {
-	for (int i = 0; i < ttrace->files.max; ++i) {
+	for (int i = 0; i <= ttrace->files.max; ++i) {
 		struct file *file = ttrace->files.table + i;
 		zfree(&file->pathname);
 	}
@@ -1703,6 +1703,7 @@ static int trace__set_fd_pathname(struct thread *thread, int fd, const char *pat
 
 	if (file != NULL) {
 		struct stat st;
+
 		if (stat(pathname, &st) == 0)
 			file->dev_maj = major(st.st_rdev);
 		file->pathname = strdup(pathname);
tools/perf/util/thread.c +1 -0
index 89585f53c1d5..415c0e5d1e75 100644
@@ -471,6 +471,7 @@ uint16_t thread__e_machine(struct thread *thread, struct machine *machine)
 
 		if (parent) {
 			e_machine = thread__e_machine(parent, machine);
+			thread__put(parent);
 			thread__set_e_machine(thread, e_machine);
 			return e_machine;
 		}
Signature · 1 line
2.49.0.504.g3bcea36a83-goog
maintainer
#3 lore raw
Quoted 9 lines · Arnaldo Carvalho de Melo
Quoted 5 lines · Ian Rogers

The files.max is the maximum valid fd in the files array and so freeing the values needs to be inclusive of the max value.

Add missing thread__put of the found parent thread in thread__e_machine.

Split it into:

Quoted 8 lines

⬢ [acme@toolbx perf-tools-next]$ git log --oneline -2
7900938850645ed4 (HEAD -> perf-tools-next) perf trace: Add missing thread__put() in thread__e_machine() 8830091383b03498 perf trace: Free the files.max entry in files->table
⬢ [acme@toolbx perf-tools-next]$

So that git --oneline is more descriptive, etc.

Thanks, applied to perf-tools-next,

PTAL this one as well.

https://lore.kernel.org/r/[email protected]

Thanks,
Namhyung

#4 lore raw
Quoted 15 lines · Namhyung Kim
Quoted 14 lines · Arnaldo Carvalho de Melo
Quoted 5 lines · Ian Rogers

The files.max is the maximum valid fd in the files array and so freeing the values needs to be inclusive of the max value.

Add missing thread__put of the found parent thread in thread__e_machine.

Split it into:

⬢ [acme@toolbx perf-tools-next]$ git log --oneline -2
7900938850645ed4 (HEAD -> perf-tools-next) perf trace: Add missing thread__put() in thread__e_machine() 8830091383b03498 perf trace: Free the files.max entry in files->table
⬢ [acme@toolbx perf-tools-next]$

Quoted 7 lines
Quoted 3 lines

So that git --oneline is more descriptive, etc.

Thanks, applied to perf-tools-next,

PTAL this one as well.

https://lore.kernel.org/r/[email protected]

Split into two patches, as one fixes one long standing problem (from 2017:

perf trace: Fix leaks of 'struct thread' in set_filter_loop_pids()

I've found some leaks from 'perf trace -a'.

It seems there are more leaks but this is what I can find for now.

Fixes 082ab9a18e532864 ("perf trace: Filter out 'sshd' in the tracer ancestry in syswide tracing")

But the other fixes a more recent bug:

perf trace: Fix leaks of 'struct thread' in fprintf_sys_enter()

I've found some leaks from 'perf trace -a'.

It seems there are more leaks but this is what I can find for now.

Fixes 70351029b55677eb ("perf thread: Add support for reading the e_machine type for a thread")

- Arnaldo

maintainer
#5 lore raw
Quoted 39 lines · Arnaldo Carvalho de Melo
Quoted 15 lines · Namhyung Kim
Quoted 14 lines · Arnaldo Carvalho de Melo
Quoted 5 lines · Ian Rogers

The files.max is the maximum valid fd in the files array and so freeing the values needs to be inclusive of the max value.

Add missing thread__put of the found parent thread in thread__e_machine.

Split it into:

⬢ [acme@toolbx perf-tools-next]$ git log --oneline -2
7900938850645ed4 (HEAD -> perf-tools-next) perf trace: Add missing thread__put() in thread__e_machine() 8830091383b03498 perf trace: Free the files.max entry in files->table
⬢ [acme@toolbx perf-tools-next]$

Quoted 7 lines
Quoted 3 lines

So that git --oneline is more descriptive, etc.

Thanks, applied to perf-tools-next,

PTAL this one as well.

https://lore.kernel.org/r/[email protected]

Split into two patches, as one fixes one long standing problem (from 2017:

perf trace: Fix leaks of 'struct thread' in set_filter_loop_pids()

I've found some leaks from 'perf trace -a'.

It seems there are more leaks but this is what I can find for now.

Fixes 082ab9a18e532864 ("perf trace: Filter out 'sshd' in the tracer ancestry in syswide tracing")

But the other fixes a more recent bug:

perf trace: Fix leaks of 'struct thread' in fprintf_sys_enter()

Quoted 7 lines

I've found some leaks from 'perf trace -a'.

It seems there are more leaks but this is what I can find for now.

Fixes 70351029b55677eb ("perf thread: Add support for reading the e_machine type for a thread")

- Arnaldo

Thanks for doing this!
Namhyung