From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Ian Rogers <irogers@google.com>, Jiri Olsa <jolsa@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
James Clark <james.clark@linaro.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-perf-users@vger.kernel.org
Subject: Re: [PATCH 2/4] perf timechart: Fix memory leaks during record
Date: Fri, 5 Jun 2026 20:23:04 -0300 [thread overview]
Message-ID: <aiNaWPG8sTp_WLh-@x1> (raw)
In-Reply-To: <20260605231155.2415760-3-namhyung@kernel.org>
On Fri, Jun 05, 2026 at 04:11:53PM -0700, Namhyung Kim wrote:
> The command line options can be passed without copy as their lifetime is
> limited within the same function.
From a quick look:
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
- Arnaldo
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
> tools/perf/builtin-timechart.c | 33 ++++++++++++++++++++++-----------
> 1 file changed, 22 insertions(+), 11 deletions(-)
>
> diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
> index 7c4ace51302e260c..d56adb41dcf9bb69 100644
> --- a/tools/perf/builtin-timechart.c
> +++ b/tools/perf/builtin-timechart.c
> @@ -1582,6 +1582,8 @@ static void timechart__release(struct timechart *tchart)
> free(c);
> c = next_comm;
> }
> +
> + free(p);
> p = next_pid;
> }
>
> @@ -1820,6 +1822,7 @@ static int timechart__io_record(int argc, const char **argv, const char *output_
> "syscalls:sys_exit_select",
> };
> unsigned int poll_events_nr = ARRAY_SIZE(poll_events);
> + int ret;
>
> rec_argc = common_args_nr +
> disk_events_nr * 4 +
> @@ -1838,7 +1841,7 @@ static int timechart__io_record(int argc, const char **argv, const char *output_
>
> p = rec_argv;
> for (i = 0; i < common_args_nr; i++)
> - *p++ = strdup(common_args[i]);
> + *p++ = common_args[i];
>
> for (i = 0; i < disk_events_nr; i++) {
> if (!is_valid_tracepoint(disk_events[i])) {
> @@ -1847,7 +1850,7 @@ static int timechart__io_record(int argc, const char **argv, const char *output_
> }
>
> *p++ = "-e";
> - *p++ = strdup(disk_events[i]);
> + *p++ = disk_events[i];
> *p++ = "--filter";
> *p++ = filter;
> }
> @@ -1858,7 +1861,7 @@ static int timechart__io_record(int argc, const char **argv, const char *output_
> }
>
> *p++ = "-e";
> - *p++ = strdup(net_events[i]);
> + *p++ = net_events[i];
> *p++ = "--filter";
> *p++ = filter;
> }
> @@ -1869,7 +1872,7 @@ static int timechart__io_record(int argc, const char **argv, const char *output_
> }
>
> *p++ = "-e";
> - *p++ = strdup(poll_events[i]);
> + *p++ = poll_events[i];
> *p++ = "--filter";
> *p++ = filter;
> }
> @@ -1877,7 +1880,11 @@ static int timechart__io_record(int argc, const char **argv, const char *output_
> for (i = 0; i < (unsigned int)argc; i++)
> *p++ = argv[i];
>
> - return cmd_record(rec_argc, rec_argv);
> + ret = cmd_record(rec_argc, rec_argv);
> +
> + free(rec_argv);
> + free(filter);
> + return ret;
> }
>
>
> @@ -1888,6 +1895,7 @@ static int timechart__record(struct timechart *tchart, int argc, const char **ar
> const char **rec_argv;
> const char **p;
> unsigned int record_elems;
> + int ret;
>
> const char * const common_args[] = {
> "record", "-a", "-R", "-c", "1", "-o", output_data,
> @@ -1952,24 +1960,27 @@ static int timechart__record(struct timechart *tchart, int argc, const char **ar
>
> p = rec_argv;
> for (i = 0; i < common_args_nr; i++)
> - *p++ = strdup(common_args[i]);
> + *p++ = common_args[i];
>
> for (i = 0; i < backtrace_args_no; i++)
> - *p++ = strdup(backtrace_args[i]);
> + *p++ = backtrace_args[i];
>
> for (i = 0; i < tasks_args_nr; i++)
> - *p++ = strdup(tasks_args[i]);
> + *p++ = tasks_args[i];
>
> for (i = 0; i < power_args_nr; i++)
> - *p++ = strdup(power_args[i]);
> + *p++ = power_args[i];
>
> for (i = 0; i < old_power_args_nr; i++)
> - *p++ = strdup(old_power_args[i]);
> + *p++ = old_power_args[i];
>
> for (j = 0; j < (unsigned int)argc; j++)
> *p++ = argv[j];
>
> - return cmd_record(rec_argc, rec_argv);
> + ret = cmd_record(rec_argc, rec_argv);
> +
> + free(rec_argv);
> + return ret;
> }
>
> static int
> --
> 2.54.0.1032.g2f8565e1d1-goog
next prev parent reply other threads:[~2026-06-05 23:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-05 23:11 [PATCH 0/4] perf timechart: Fix memory leaks Namhyung Kim
2026-06-05 23:11 ` [PATCH 1/4] perf timechart: Release event samples at the end Namhyung Kim
2026-06-05 23:21 ` Arnaldo Carvalho de Melo
2026-06-05 23:31 ` Namhyung Kim
2026-06-05 23:23 ` sashiko-bot
2026-06-05 23:32 ` Namhyung Kim
2026-06-05 23:11 ` [PATCH 2/4] perf timechart: Fix memory leaks during record Namhyung Kim
2026-06-05 23:21 ` sashiko-bot
2026-06-05 23:23 ` Arnaldo Carvalho de Melo [this message]
2026-06-05 23:11 ` [PATCH 3/4] perf timechart: Fix memory leaks in draw_wakeups() Namhyung Kim
2026-06-05 23:17 ` sashiko-bot
2026-06-05 23:20 ` Namhyung Kim
2026-06-05 23:11 ` [PATCH 4/4] perf test: Update perf timechart test Namhyung Kim
2026-06-05 23:19 ` [PATCH 0/4] perf timechart: Fix memory leaks Arnaldo Carvalho de Melo
2026-06-05 23:28 ` Namhyung Kim
2026-06-05 23:41 ` Arnaldo Carvalho de Melo
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=aiNaWPG8sTp_WLh-@x1 \
--to=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=irogers@google.com \
--cc=james.clark@linaro.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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