From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ian Rogers <irogers@google.com>
Cc: "Peter Zijlstra" <peterz@infradead.org>,
"Ingo Molnar" <mingo@redhat.com>,
"Namhyung Kim" <namhyung@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
"Alexander Shishkin" <alexander.shishkin@linux.intel.com>,
"Jiri Olsa" <jolsa@kernel.org>,
"Adrian Hunter" <adrian.hunter@intel.com>,
"Kan Liang" <kan.liang@linux.intel.com>,
"John Garry" <john.g.garry@oracle.com>,
"Will Deacon" <will@kernel.org>,
"James Clark" <james.clark@linaro.org>,
"Mike Leach" <mike.leach@linaro.org>,
"Leo Yan" <leo.yan@linux.dev>, guoren <guoren@kernel.org>,
"Paul Walmsley" <paul.walmsley@sifive.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Albert Ou" <aou@eecs.berkeley.edu>,
"Charlie Jenkins" <charlie@rivosinc.com>,
"Bibo Mao" <maobibo@loongson.cn>,
"Huacai Chen" <chenhuacai@kernel.org>,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Jiri Slaby" <jirislaby@kernel.org>,
"Björn Töpel" <bjorn@rivosinc.com>,
"Howard Chu" <howardchu95@gmail.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
"linux-csky@vger.kernel.org" <linux-csky@vger.kernel.org>,
linux-riscv@lists.infradead.org, "Arnd Bergmann" <arnd@arndb.de>
Subject: Re: [PATCH v6 13/13] perf trace: Fix BTF memory leak
Date: Tue, 18 Mar 2025 16:04:20 -0300 [thread overview]
Message-ID: <Z9nDtMyoARGiHAGg@x1> (raw)
In-Reply-To: <20250318033150.119174-14-irogers@google.com>
On Mon, Mar 17, 2025 at 08:31:50PM -0700, Ian Rogers wrote:
> Add missing btf__free in trace__exit.
>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/builtin-trace.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
> index a5f31472980b..d4bbb6a1e817 100644
> --- a/tools/perf/builtin-trace.c
> +++ b/tools/perf/builtin-trace.c
> @@ -5339,6 +5339,12 @@ static void trace__exit(struct trace *trace)
> zfree(&trace->syscalls.table);
> }
> zfree(&trace->perfconfig_events);
> +#ifdef HAVE_LIBBPF_SUPPORT
> + if (trace->btf != NULL) {
No need for the check, btf__free() does:
void btf__free(struct btf *btf)
{
if (IS_ERR_OR_NULL(btf))
return;
Up to Namhyung to turn this into the simpler:
btf__free(trace->btf);
trace->btf = NULL;
> + btf__free(trace->btf);
> + trace->btf = NULL;
> + }
> +#endif
> }
>
> #ifdef HAVE_BPF_SKEL
> --
> 2.49.0.rc1.451.g8f38331e32-goog
prev parent reply other threads:[~2025-03-18 19:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-18 3:31 [PATCH v6 00/13] perf: Support multiple system call tables in the build Ian Rogers
2025-03-18 3:31 ` [PATCH v6 01/13] perf dso: Move libunwind dso_data variables into ifdef Ian Rogers
2025-03-18 3:31 ` [PATCH v6 02/13] perf dso: kernel-doc for enum dso_binary_type Ian Rogers
2025-03-18 3:31 ` [PATCH v6 03/13] perf syscalltbl: Remove syscall_table.h Ian Rogers
2025-03-18 3:31 ` [PATCH v6 04/13] perf trace: Reorganize syscalls Ian Rogers
2025-03-18 3:31 ` [PATCH v6 05/13] perf syscalltbl: Remove struct syscalltbl Ian Rogers
2025-03-18 3:31 ` [PATCH v6 06/13] perf dso: Add support for reading the e_machine type for a dso Ian Rogers
2025-03-18 3:31 ` [PATCH v6 07/13] perf thread: Add support for reading the e_machine type for a thread Ian Rogers
2025-03-18 3:31 ` [PATCH v6 08/13] perf trace beauty: Add syscalltbl.sh generating all system call tables Ian Rogers
2025-03-18 3:31 ` [PATCH v6 09/13] perf syscalltbl: Use lookup table containing multiple architectures Ian Rogers
2025-03-18 3:31 ` [PATCH v6 10/13] perf build: Remove Makefile.syscalls Ian Rogers
2025-03-18 3:31 ` [PATCH v6 11/13] perf syscalltbl: Mask off ABI type for MIPS system calls Ian Rogers
2025-03-18 3:31 ` [PATCH v6 12/13] perf trace: Make syscall table stable Ian Rogers
2025-03-18 3:31 ` [PATCH v6 13/13] perf trace: Fix BTF memory leak Ian Rogers
2025-03-18 19:04 ` Arnaldo Carvalho de Melo [this message]
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=Z9nDtMyoARGiHAGg@x1 \
--to=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=aou@eecs.berkeley.edu \
--cc=arnd@arndb.de \
--cc=bjorn@rivosinc.com \
--cc=catalin.marinas@arm.com \
--cc=charlie@rivosinc.com \
--cc=chenhuacai@kernel.org \
--cc=guoren@kernel.org \
--cc=howardchu95@gmail.com \
--cc=irogers@google.com \
--cc=james.clark@linaro.org \
--cc=jirislaby@kernel.org \
--cc=john.g.garry@oracle.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=leo.yan@linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-csky@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=maobibo@loongson.cn \
--cc=mark.rutland@arm.com \
--cc=mike.leach@linaro.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=peterz@infradead.org \
--cc=will@kernel.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).