From patchwork Wed Jun 7 01:43:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13269897 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 ABC87C7EE29 for ; Wed, 7 Jun 2023 01:45:12 +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=DkmIt3IEHUUFlSnAx0RuIy64x4t74cbFR4UG0kqCnyI=; b=mD+G/fO2O9IikH AdGEn9iKeeyjGJ014tN/F6FVPxyBqMDiGhlbr7Xu3W5nEIPKtLWhsaTitcbFsU/QDgsk7icr/oURU ytYE3y+RvwAwdVUbKvgihe4AvBeA6uKMe4DqVCvAO92UEnBGifUbdq/69z8cbSVEyzUbIEpRP9Too T8UQGrbJIp4zvDijPuhxq+h/GqHUs6Ah+nEaOomY7kcWUNDc62PQib6Bz60tKZ2bdjY4NHwoWoYfZ owiqLpL+abv5RTvbAtEtpCDritLJMUkuAMhw6LYdgHSES+Z85OIx4uFm7CxiDTF9obYaMg7esYKvS oRb3Gt9Y1FlevBFHpiNA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6iEE-003vcN-1I; Wed, 07 Jun 2023 01:44:50 +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 1q6iEB-003vb0-1V for linux-arm-kernel@lists.infradead.org; Wed, 07 Jun 2023 01:44:48 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5659c7dad06so114449357b3.0 for ; Tue, 06 Jun 2023 18:44:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686102286; x=1688694286; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=jfxVqcu2CXJndLVaHRwEEUAL5AeHKV2fgnyhsas076A=; b=HUfSQYFHc6NzgRtveDwEiUbyhktBsnvEdmsauf2233GDNNnfVG1TYxxa7EjJX3Sx+Z CQsoBZEg80xJ6LrEofzgA+rdH4bQztLYYJPbRr2rK/O70x5M4CKnwnzL9lLDWh4Qr++l +0XKydeAO7155XrCImjn85cHagz96SF/1gevNGDDCFWLhodHO63uMJJJBSa/mtKE9KAw QGnCINd289qakFmco2iQOlJF4LjJbFFAG7ygNcZRfFVdd7c+8Ez1gmK2Ry4wc0iOi+PQ Noiux4Veb78XAZ8VNWueFKK0fzyqCx0dhwKUn+NOBov8iv25aligiEFfoRfZJ6RznmNi i0Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686102286; x=1688694286; 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=jfxVqcu2CXJndLVaHRwEEUAL5AeHKV2fgnyhsas076A=; b=j1fOxvbQCbZtq5zugbX03TDZ549Hwa9+02y0ZddYjNknPIHwKwaR3HzYRcNqyCUx3B hoRAKDl/R+p7yMtZqu6+LQmFj62aqiLuMC+IiEMuxI38vb+94qgmC1ZsjaYo1CeB0ocM mi6OdsNSMUJ89k+kqo1X9GVhSbUbv2+5VlR6x5TrJwxTA8Mzoei6X5RoBECZC+fzik4u PASlv6Ia0NJmz+z6ykKmsq5RPQqvsy/hlYKhEP3UoVlfWzMvkHU6xKH8RwjDhSjaFVMg hM0g5BfcgRPhWpVSCHJJrn5/s1i9Fs8+BBjo9Ou0QCXnagwjMudd6JS+zWG3BUFJA5un SNHA== X-Gm-Message-State: AC+VfDzKC84SfTRCqsRNjKJulNOA8J8Ml/gQJHVJPp5C8vAx4HFEOLqp UXuDLnD3Lp0X9wBulsr8vHti4Aa4Ekhv X-Google-Smtp-Source: ACHHUZ71vO0aUgfwYH60RkozvkP/e7xil66buUKML1mj0DHqVFthPBVqwFyqTn+6yi3Vhy6a0q8bdiSdn4hj X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3c35:209f:5d38:b7a1]) (user=irogers job=sendgmr) by 2002:a05:6902:1823:b0:bb1:446f:1d00 with SMTP id cf35-20020a056902182300b00bb1446f1d00mr2113685ybb.10.1686102286405; Tue, 06 Jun 2023 18:44:46 -0700 (PDT) Date: Tue, 6 Jun 2023 18:43:49 -0700 In-Reply-To: <20230607014353.3172466-1-irogers@google.com> Message-Id: <20230607014353.3172466-17-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 16/20] perf symbol-elf: Correct holding a reference 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_184447_500787_ABCCBF8E X-CRM114-Status: GOOD ( 15.04 ) 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 If a reference is held, don't put it as this will confuse reference count checking. Signed-off-by: Ian Rogers --- tools/perf/util/symbol-elf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 63882a4db5c7..e6493d1cc251 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -1389,11 +1389,11 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map, /* Ensure maps are correctly ordered */ if (kmaps) { int err; + struct map *tmp = map__get(map); - map__get(map); maps__remove(kmaps, map); err = maps__insert(kmaps, map); - map__put(map); + map__put(tmp); if (err) return err; }