From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B6194C35FF3 for ; Tue, 18 Mar 2025 19:06:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gBPFZ9MJJ2BlTIgby1B4ljgRZ2rg9833H+1Y5tnXDeQ=; b=q4fdJaYjt26wU2ykZXtMU4Ggqz bpr9Nu/8LZ/+aZwn+4itKUp/9xsKUBWoHxXy84nRjIa4RdlCnX+GI8DM+Kbz+xeb8tNJAa3XdNGk0 PF3L0586AY+xQC1Ys59okcCrI6hdhPkdjk16pgGZmyljGTcC2ru9IQibw8ocHqZ9Z5OQHX+ENauZi tyV7lC1siHMUheEhPkR0DknvOkjF2C8s/SiDISrUBFkEZsThMCKD8J/qdGVmzHmUxReo/NyRVySm6 8JYYWGBghkQryjrlHxfRB33xot7/2xFJ/a9a6LEfSZxMXoCdNVfIJj8c5Tt52Z9fA8Ty2SiWQ1q1u PYQwDBHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tucGQ-00000006slQ-1Lmh; Tue, 18 Mar 2025 19:06:10 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tucEi-00000006sY0-2nsN; Tue, 18 Mar 2025 19:04:25 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 7DAEA5C588D; Tue, 18 Mar 2025 19:02:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9514CC4CEDD; Tue, 18 Mar 2025 19:04:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742324663; bh=q8oOp41cHl33YfGvOaDk6/xbHYWsX2yx6+8wUa0yDHg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=AEJkeNyn8a4ZrsAPb8DRhFNwI2U050JwzDRxBsfpmEsMpvv9kTob/NUbhpWIIugn5 4cpDRdE+pN1pJ0QvBuA3rlcH/Qzak7OZmUVOQ5BJcb1p1n5t8NKwnY8YseJ93ATUyY YyUqD3Np3LvcrBf+IlDFQB90KXtymd4mnuXx1vS56gFlTS+M2KoOS09izWC03RpDVq x6MNaW+CiHXW5tYTHhFn+hC0XYyo//h7PKFixoeb0hJOK2BGF0WNebgpWo5u1gN2VQ LABMVs/ujFoE9y9A57vJnVsPaa+W/SSmd4GIumkSbtXvoLjYoZOZvE736hJPm49vd7 vs3CB19du7HEw== Date: Tue, 18 Mar 2025 16:04:20 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , guoren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Charlie Jenkins , Bibo Mao , Huacai Chen , Catalin Marinas , Jiri Slaby , =?iso-8859-1?Q?Bj=F6rn_T=F6pel?= , Howard Chu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, "linux-csky@vger.kernel.org" , linux-riscv@lists.infradead.org, Arnd Bergmann Subject: Re: [PATCH v6 13/13] perf trace: Fix BTF memory leak Message-ID: References: <20250318033150.119174-1-irogers@google.com> <20250318033150.119174-14-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250318033150.119174-14-irogers@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250318_120424_750180_E20A4ACD X-CRM114-Status: GOOD ( 15.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 > --- > 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