linux-perf-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ian Rogers <irogers@google.com>
To: "John Garry" <john.g.garry@oracle.com>,
	"Will Deacon" <will@kernel.org>,
	"James Clark" <james.clark@arm.com>,
	"Mike Leach" <mike.leach@linaro.org>,
	"Leo Yan" <leo.yan@linaro.org>,
	"Peter Zijlstra" <peterz@infradead.org>,
	"Ingo Molnar" <mingo@redhat.com>,
	"Arnaldo Carvalho de Melo" <acme@kernel.org>,
	"Mark Rutland" <mark.rutland@arm.com>,
	"Alexander Shishkin" <alexander.shishkin@linux.intel.com>,
	"Jiri Olsa" <jolsa@kernel.org>,
	"Namhyung Kim" <namhyung@kernel.org>,
	"Ian Rogers" <irogers@google.com>,
	"Adrian Hunter" <adrian.hunter@intel.com>,
	"Suzuki K Poulose" <suzuki.poulose@arm.com>,
	"Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>,
	"Kan Liang" <kan.liang@linux.intel.com>,
	"German Gomez" <german.gomez@arm.com>,
	"Ali Saidi" <alisaidi@amazon.com>,
	"Jing Zhang" <renyu.zj@linux.alibaba.com>,
	"Martin Liška" <mliska@suse.cz>,
	"Athira Rajeev" <atrajeev@linux.vnet.ibm.com>,
	"Miguel Ojeda" <ojeda@kernel.org>,
	"ye xingchen" <ye.xingchen@zte.com.cn>,
	"Liam Howlett" <liam.howlett@oracle.com>,
	"Dmitrii Dolgov" <9erthalion6@gmail.com>,
	"Shawn M. Chapla" <schapla@codeweavers.com>,
	"Yang Jihong" <yangjihong1@huawei.com>,
	"K Prateek Nayak" <kprateek.nayak@amd.com>,
	"Changbin Du" <changbin.du@huawei.com>,
	"Ravi Bangoria" <ravi.bangoria@amd.com>,
	"Sean Christopherson" <seanjc@google.com>,
	"Raul Silvera" <rsilvera@google.com>,
	"Andi Kleen" <ak@linux.intel.com>,
	"Steinar H. Gunderson" <sesse@google.com>,
	"Yuan Can" <yuancan@huawei.com>,
	"Brian Robbins" <brianrob@linux.microsoft.com>,
	liuwenyu <liuwenyu7@huawei.com>,
	"Ivan Babrou" <ivan@cloudflare.com>,
	"Fangrui Song" <maskray@google.com>,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-perf-users@vger.kernel.org, coresight@lists.linaro.org
Subject: [PATCH v1 18/20] perf machine: Fix leak of kernel dso
Date: Tue,  6 Jun 2023 18:43:51 -0700	[thread overview]
Message-ID: <20230607014353.3172466-19-irogers@google.com> (raw)
In-Reply-To: <20230607014353.3172466-1-irogers@google.com>

The kernel dso may be found by searching dsos or allocating if not
found. The allocation returns with a reference count of 2, once for
the dsos list and once for the returned value. The list search has a
reference count of 1, once for the dsos list. To make the reference
counts consistent, increase the dsos list search reference count to 2
with a dso__get, and do a put when the scope ends for either the
allocated or found dso.

This issue was found with leak sanitizer and reference count checking.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/util/machine.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 46af5e9748c9..f8e6c07f0048 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1868,7 +1868,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine,
 				continue;
 
 
-			kernel = dso;
+			kernel = dso__get(dso);
 			break;
 		}
 
@@ -1913,6 +1913,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine,
 			 */
 			dso__load(kernel, machine__kernel_map(machine));
 		}
+		dso__put(kernel);
 	} else if (perf_event__is_extra_kernel_mmap(machine, xm)) {
 		return machine__process_extra_kernel_map(machine, xm);
 	}
-- 
2.41.0.rc0.172.g3f132b7071-goog


  parent reply	other threads:[~2023-06-07  1:46 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-07  1:43 [PATCH v1 00/20] Reference count checking for thread Ian Rogers
2023-06-07  1:43 ` [PATCH v1 01/20] perf thread: Remove notion of dead threads Ian Rogers
2023-06-07  1:43 ` [PATCH v1 02/20] perf thread: Make threads rbtree non-invasive Ian Rogers
2023-06-07  1:43 ` [PATCH v1 03/20] perf thread: Add accessor functions for thread Ian Rogers
2023-06-07  1:43 ` [PATCH v1 04/20] perf maps: Make delete static, always use put Ian Rogers
2023-06-07  1:43 ` [PATCH v1 05/20] perf addr_location: Move to its own header Ian Rogers
2023-06-07  1:43 ` [PATCH v1 06/20] perf addr_location: Add init/exit/copy functions Ian Rogers
2023-06-07  1:43 ` [PATCH v1 07/20] perf thread: Add reference count checking Ian Rogers
2023-06-07  1:43 ` [PATCH v1 08/20] perf machine: Make delete_threads part of machine__exit Ian Rogers
2023-06-07  1:43 ` [PATCH v1 09/20] perf report: Avoid thread leak Ian Rogers
2023-06-07  1:43 ` [PATCH v1 10/20] perf header: Ensure bitmaps are freed Ian Rogers
2023-06-07  1:43 ` [PATCH v1 11/20] perf stat: Avoid evlist leak Ian Rogers
2023-06-07  1:43 ` [PATCH v1 12/20] perf intel-pt: Fix missed put and leak Ian Rogers
2023-06-07  1:43 ` [PATCH v1 13/20] perf evlist: Free stats in all evlist destruction Ian Rogers
2023-06-07  1:43 ` [PATCH v1 14/20] perf python: Avoid 2 leak sanitizer issues Ian Rogers
2023-06-07  1:43 ` [PATCH v1 15/20] perf jit: Fix two thread leaks Ian Rogers
2023-06-07  1:43 ` [PATCH v1 16/20] perf symbol-elf: Correct holding a reference Ian Rogers
2023-06-07  1:43 ` [PATCH v1 17/20] perf maps: Fix overlapping memory leak Ian Rogers
2023-06-07  1:43 ` Ian Rogers [this message]
2023-06-07  1:43 ` [PATCH v1 19/20] perf machine: Don't leak module maps Ian Rogers
2023-06-07  1:43 ` [PATCH v1 20/20] perf map/maps/thread: Changes to reference counting Ian Rogers
2023-06-07  7:07 ` [PATCH v1 00/20] Reference count checking for thread Ian Rogers

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=20230607014353.3172466-19-irogers@google.com \
    --to=irogers@google.com \
    --cc=9erthalion6@gmail.com \
    --cc=acme@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=ak@linux.intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=alisaidi@amazon.com \
    --cc=atrajeev@linux.vnet.ibm.com \
    --cc=brianrob@linux.microsoft.com \
    --cc=changbin.du@huawei.com \
    --cc=coresight@lists.linaro.org \
    --cc=german.gomez@arm.com \
    --cc=ivan@cloudflare.com \
    --cc=james.clark@arm.com \
    --cc=john.g.garry@oracle.com \
    --cc=jolsa@kernel.org \
    --cc=kan.liang@linux.intel.com \
    --cc=kprateek.nayak@amd.com \
    --cc=leo.yan@linaro.org \
    --cc=liam.howlett@oracle.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=liuwenyu7@huawei.com \
    --cc=mark.rutland@arm.com \
    --cc=maskray@google.com \
    --cc=mike.leach@linaro.org \
    --cc=mingo@redhat.com \
    --cc=mliska@suse.cz \
    --cc=namhyung@kernel.org \
    --cc=naveen.n.rao@linux.vnet.ibm.com \
    --cc=ojeda@kernel.org \
    --cc=peterz@infradead.org \
    --cc=ravi.bangoria@amd.com \
    --cc=renyu.zj@linux.alibaba.com \
    --cc=rsilvera@google.com \
    --cc=schapla@codeweavers.com \
    --cc=seanjc@google.com \
    --cc=sesse@google.com \
    --cc=suzuki.poulose@arm.com \
    --cc=will@kernel.org \
    --cc=yangjihong1@huawei.com \
    --cc=ye.xingchen@zte.com.cn \
    --cc=yuancan@huawei.com \
    /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).