From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH 04/87] trace-cmd library: Fixed a memory leak on input handler close
Date: Wed, 28 Jul 2021 16:31:27 +0300 [thread overview]
Message-ID: <20210728133250.234140-5-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20210728133250.234140-1-tz.stoyanov@gmail.com>
When an input hanlder to a trace file is closed with tracecmd_close(),
the list with buffers is not freed. This leads to a memory leak. Added
logic to free that list.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
lib/trace-cmd/trace-input.c | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index d5ffafd7..f94a0073 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -3482,7 +3482,7 @@ void tracecmd_ref(struct tracecmd_input *handle)
*/
void tracecmd_close(struct tracecmd_input *handle)
{
- int cpu;
+ int i;
if (!handle)
return;
@@ -3495,21 +3495,21 @@ void tracecmd_close(struct tracecmd_input *handle)
if (--handle->ref)
return;
- for (cpu = 0; cpu < handle->cpus; cpu++) {
+ for (i = 0; i < handle->cpus; i++) {
/* The tracecmd_peek_data may have cached a record */
- free_next(handle, cpu);
- free_page(handle, cpu);
- if (handle->cpu_data && handle->cpu_data[cpu].kbuf) {
- kbuffer_free(handle->cpu_data[cpu].kbuf);
- if (handle->cpu_data[cpu].page_map)
- free_page_map(handle->cpu_data[cpu].page_map);
-
- if (handle->cpu_data[cpu].page_cnt)
+ free_next(handle, i);
+ free_page(handle, i);
+ if (handle->cpu_data && handle->cpu_data[i].kbuf) {
+ kbuffer_free(handle->cpu_data[i].kbuf);
+ if (handle->cpu_data[i].page_map)
+ free_page_map(handle->cpu_data[i].page_map);
+
+ if (handle->cpu_data[i].page_cnt)
tracecmd_warning("%d pages still allocated on cpu %d%s",
- handle->cpu_data[cpu].page_cnt, cpu,
- show_records(handle->cpu_data[cpu].pages,
- handle->cpu_data[cpu].nr_pages));
- free(handle->cpu_data[cpu].pages);
+ handle->cpu_data[i].page_cnt, i,
+ show_records(handle->cpu_data[i].pages,
+ handle->cpu_data[i].nr_pages));
+ free(handle->cpu_data[i].pages);
}
}
@@ -3520,6 +3520,11 @@ void tracecmd_close(struct tracecmd_input *handle)
free(handle->version);
close(handle->fd);
+ for (i = 0; i < handle->nr_buffers; i++)
+ free(handle->buffers[i].name);
+
+ free(handle->buffers);
+
tracecmd_free_hooks(handle->hooks);
handle->hooks = NULL;
--
2.31.1
next prev parent reply other threads:[~2021-07-28 13:33 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-28 13:31 [PATCH 00/87] Trace file version 7 Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 01/87] trace-cmd library: Read option id with correct endian Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 02/87] trace-cmd report: Fix typos in error messages Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 03/87] tarce-cmd library: Fix version string memory leak Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` Tzvetomir Stoyanov (VMware) [this message]
2021-07-28 13:31 ` [PATCH 05/87] trace-cmd library: Fix possible memory corruption on processing a trace buffer Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 06/87] trace-cmd library: Add constructor and destructor Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 07/87] trace-cmd library: Add cache functionality to network message handler Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 08/87] trace-cmd library: Add support for compression algorithms Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 09/87] trace-cmd list: Show supported " Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 10/87] trace-cmd library: Internal helpers for compressing data Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 11/87] trace-cmd library: Internal helpers for uncompressing data Tzvetomir Stoyanov (VMware)
2021-08-05 13:40 ` Steven Rostedt
2021-07-28 13:31 ` [PATCH 12/87] trace-cmd library: Define trace file version 7 Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 13/87] trace-cmd library: Refactor APIs for creating output handler Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 14/87] trace-cmd library: Reuse within the library the function that checks file state Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 15/87] trace-cmd library: New API to get the version of output handler Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 16/87] trace-cmd library: Inherit compression algorithm from input file Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 17/87] trace-cmd library: New API to configure compression on an output handler Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 18/87] trace-cmd record: Add compression to the trace context Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 19/87] trace-cmd library: Write compression header in the trace file Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 20/87] trace-cmd library: Compress part of " Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 21/87] trace-cmd library: Add internal helper functon for writing headers before file sections Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 22/87] trace-cmd library: Write header " Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 23/87] trace-cmd library: Refactor the logic for writing trace data in the file Tzvetomir Stoyanov (VMware)
2021-08-17 14:03 ` Steven Rostedt
2021-07-28 13:31 ` [PATCH 24/87] trace-cmd library: Add local helper function for data compression Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 25/87] trace-cmd library: Compress the trace data Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 26/87] tarce-cmd library: Add multiple options sections in trace file version 7 Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 27/87] trace-cmd library: Do not write CPU count section in trace files " Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 28/87] trace-cmd library: Move CPU flyrecord trace metadata into the buffer option, for trace file " Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 29/87] trace-cmd record: Append trace options after the trace data are written Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 30/87] trace-cmd library: Add section header before flyrecord trace data Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 31/87] trace-cmd library: Fit CPU latency trace data in the new trace file version 7 format Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 32/87] trace-cmd library: Do not write CPUs with empty trace data Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 33/87] trace-cmd library: Add macro to check file state on reading Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 34/87] trace-cmd library: Introduce sections in trace file reading logic Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 35/87] trace-cmd library: Initialize internal sections database on file read Tzvetomir Stoyanov (VMware)
2021-07-28 13:31 ` [PATCH 36/87] trace-cmd library: Use sections database when reading parts of the trace file Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 37/87] trace-cmd library: Set log size to the input tep handler when it is read from the file Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 38/87] trace-cmd library: Fix possible memory leak in read_ftrace_files() Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 39/87] trace-cmd library: Fix possible memory leak in read_event_files() Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 40/87] trace-cmd library: Fix possible memory leak in read_proc_kallsyms() Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 41/87] trace-cmd library: Fix possible memory leak in read_ftrace_printk() Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 42/87] trace-cmd library: Fix possible memory leak in read_and_parse_cmdlines() Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 43/87] trace-cmd library: Track maximum CPUs count in input handler Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 44/87] trace-cmd library: Set input handler default values in allocation function Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 45/87] trace-cmd library: Read headers from trace file version 7 Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 46/87] tarce-cmd library: Do not use local variables when reading CPU stat option Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 47/87] trace-cmd library: Read handle header and compression of the option section Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 48/87] trace-cmd library: Read extended BUFFER option Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 49/87] trace-cmd library: Handle the extended DONE option Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 50/87] trace-cmd library: Read compression header Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 51/87] trace-cmd library: Extend the input handler with trace data decompression context Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 52/87] trace-cmd library: Initialize CPU data decompression logic Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 53/87] trace-cmd library: Initialize CPU data for reading from version 7 trace files Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 54/87] trace-cmd library: Add logic for in-memory decompression Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 55/87] trace-cmd library: Handle latency trace in version 7 files Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 56/87] trace-cmd library: Handle buffer trace data init for " Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 57/87] trace-cmd report: Use the new latency API to read data Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 58/87] trace-cmd report: Close input file handlers on exit Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 59/87] trace-cmd report: Do not print empty buffer name Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 60/87] trace-cmd report: Init the top trace instance earlier Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 61/87] trace-cmd: Call additional APIs when creating trace file Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 62/87] trace-cmd dump: Add helpers for processing trace file version 7 Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 63/87] trace-cmd dump: Print compression header Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 64/87] trace-cmd dump: Add helpers for processing trace file sections Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 65/87] trace-cmd dump: Read recursively all options sections Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 66/87] trace-cmd dump: Read extended BUFFER option Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 67/87] trace-cmd dump: Dump sections Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 68/87] trace-cmd dump: Dump trace file version 7 Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 69/87] trace-cmd dump: Dump sections content Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 70/87] trace-cmd dump: Add new argument --sections Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 71/87] trace-cmd dump: Align better the output of flyrecord dump Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 72/87] trace-cmd library: Add zlib compression algorithm Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 73/87] trace-cmd library: Reuse local function that writes to output handler Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 74/87] trace-cmd library: Use output handler when copying data from input file Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 75/87] trace-cmd library: Handle version 7 files when copying headers between files Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 76/87] tarce-cmd library: Copy CPU count between trace files Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 77/87] tarce-cmd library: New API to copy buffer description " Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 78/87] tarce-cmd library: New API to copy options " Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 79/87] tarce-cmd library: New API to copy trace data " Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 80/87] trace-cmd library: Extend tracecmd_copy() API Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 81/87] trace-cmd library: Set correct CPU to the record, retrieved with tracecmd_peek_data Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 82/87] trace-cmd: Add new subcommand "convert" Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 83/87] trace-cmd report: Add new parameters for version 7 trace files Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 84/87] trace-cmd: Update bash completion Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 85/87] tarce-cmd: Man page for "trace-cmd convert" Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 86/87] tarce-cmd: Update record man page Tzvetomir Stoyanov (VMware)
2021-07-28 13:32 ` [PATCH 87/87] trace-cmd: Document trace file version 7 Tzvetomir Stoyanov (VMware)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210728133250.234140-5-tz.stoyanov@gmail.com \
--to=tz.stoyanov@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).