From patchwork Wed Jun 7 01:43:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13269898 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 46C9DC7EE2F for ; Wed, 7 Jun 2023 01:45:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ukI2kGYq7N1q+XdEGf55zz6GcNPqSmce0HE6IsRt8K8=; b=djvTskWJ4Eik8i NmWMdDaNY85+1IFxH0H8ck8N7o8G4orgBV7GbTDrDxF774BEqw2d12duwpjGPKoK0SribdGK61KdK pkEE3wSJF2p3/grYki0d9QZj5h6+73Llm+W5u9gDT/zRc39LKlqa91nhTx7hXX9AC7sdO0GrHyr7q jwAG9IBwz2o/okQ4hqCTXZXAN8cEc6wcRjyz+uVWYwXi7uEYd9DZlimAVLhkc8UOM3Ap9pXNSkitv U17/3oyQ/mwo57IbB/ydQqc2e/k1HHBNgFWn4Tq37ICq2H87fOY+SLxUaI4E40AVXD1ix5NUfNOkk sVoJ/Spa9Xiuy3AxOGXA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6iEJ-003veb-0R; Wed, 07 Jun 2023 01:44:55 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q6iEG-003vR4-14 for linux-arm-kernel@lists.infradead.org; Wed, 07 Jun 2023 01:44:53 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-565a1788f3fso112805727b3.0 for ; Tue, 06 Jun 2023 18:44:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686102291; x=1688694291; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=zgqIPituhIYk4GIizxY3KBqP+afAEkk8xXOmxl125Mk=; b=HnLdkuQtOLiT90PWkVp4H9hTUlBzohal9FoA0h1VTSuaG0fk5pvARqH4bvHgys/ylI nRsDZkK7TbfaLa8CUo2/C5PtEdnHu+x93qHzuLuXBVAVvhcTk4ugH7TzHwkPsje7MQC4 gyzjNrEuroULpjcc2kN6XN5N6DNIGFBfuvplwllQvVv60KGWc6FaGoe3uRrquPJvUCFi uTj7M3KS3Jz1dtq4uxgDXKw5v8Ja6aV3pdnAmjBirRk+3PJIwvv5jd20AmeaNLWMTYh9 AURpNFIOcEe1ZqcFMqR4LBjq1xATPfqV+ZOdQ6TXjDkwjd0prtLgRPgsK3uJH3pue1cz sXhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686102291; x=1688694291; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zgqIPituhIYk4GIizxY3KBqP+afAEkk8xXOmxl125Mk=; b=CWncFHARIjvFck3Rk1wpG9c1DMOvNYSQ4CyNCaAyGDjLrQEI1WvHqeZeinVcoZvINJ adEfp0u4rCfh4F0Zyu8WyNvy4BYdJkXFKVwzlN/2oPg7YB/7YGKmKh1klO0tTcgXcF7V MDbTPG7s6c3rbtq4hKJVl7x2PdUlcjhb5tBFfyo8KacTXjkPdTzvlUbpao06GYlo+33c yr+TjJpeFAcEDK1DOHKIvH0AcrIXrm9wSBoNJpYMiyarZMIQimm0bnMJD7owIsmw4SWy NXC0Ulm9skqPTmUpFKBnuCVsyVz7NAIEjtZHevxtgsXEVx1RTfz8mqRnhsICG0hBbjA3 1XXw== X-Gm-Message-State: AC+VfDwyh5LZFBhEK2aordwmo5M7ZzaB2H+Ci+WyI79Lmtf/93Hk5HUe DW4gzbiChJUKLNjZQPl7psnE/tFB6kn9 X-Google-Smtp-Source: ACHHUZ4O6AqHNMvW/AUh8p8vB2lzYbCObW6eg5wkLZW8uV+HB7fb+IhNsrmQhwAoI3a975hTDPdyJQX5bokn X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3c35:209f:5d38:b7a1]) (user=irogers job=sendgmr) by 2002:a81:4112:0:b0:54f:93c0:4ba8 with SMTP id o18-20020a814112000000b0054f93c04ba8mr2061450ywa.2.1686102290861; Tue, 06 Jun 2023 18:44:50 -0700 (PDT) Date: Tue, 6 Jun 2023 18:43:51 -0700 In-Reply-To: <20230607014353.3172466-1-irogers@google.com> Message-Id: <20230607014353.3172466-19-irogers@google.com> Mime-Version: 1.0 References: <20230607014353.3172466-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v1 18/20] perf machine: Fix leak of kernel dso From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Suzuki K Poulose , "Naveen N. Rao" , Kan Liang , German Gomez , Ali Saidi , Jing Zhang , " =?utf-8?q?Martin_Li=C5=A1ka?= " , Athira Rajeev , Miguel Ojeda , ye xingchen , Liam Howlett , Dmitrii Dolgov <9erthalion6@gmail.com>, "Shawn M. Chapla" , Yang Jihong , K Prateek Nayak , Changbin Du , Ravi Bangoria , Sean Christopherson , Raul Silvera , Andi Kleen , "Steinar H. Gunderson" , Yuan Can , Brian Robbins , liuwenyu , Ivan Babrou , Fangrui Song , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, coresight@lists.linaro.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230606_184452_368716_D0F49279 X-CRM114-Status: GOOD ( 16.10 ) 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 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 --- 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); }